openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/i915: Move lowfreq_avail around a bit in ilk/hsw_crtc_mode_set 

Now this really should be in the pipe config somewhere, but till now
it isn't. We can at least move it up a bit next to all the other pll
code since intel_dp_set_m_n really doesn't depend upon this.

This is just prep work so that moving all the hw frobbing code from
->crtc_mode_set to ->crtc_enable is clean.

v2: Do the same for haswell while at it, not just for ivb.

Reviewed-by: Shobhit Kumar <shobhit.kumar@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Daniel Vetter 2014-04-24 23:55:07 +02:00
parent 5b18e57c3e
commit 644cef3467
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpu/drm/i915/intel_display.c
View File

@ -6890,14 +6890,14 @@ static int ironlake_crtc_mode_set(struct drm_crtc *crtc,
} else } else
intel_put_shared_dpll(intel_crtc); intel_put_shared_dpll(intel_crtc);
if (intel_crtc->config.has_dp_encoder)
intel_dp_set_m_n(intel_crtc);
if (is_lvds && has_reduced_clock && i915.powersave) if (is_lvds && has_reduced_clock && i915.powersave)
intel_crtc->lowfreq_avail = true; intel_crtc->lowfreq_avail = true;
else else
intel_crtc->lowfreq_avail = false; intel_crtc->lowfreq_avail = false;
if (intel_crtc->config.has_dp_encoder)
intel_dp_set_m_n(intel_crtc);
intel_set_pipe_timings(intel_crtc); intel_set_pipe_timings(intel_crtc);
if (intel_crtc->config.has_pch_encoder) { if (intel_crtc->config.has_pch_encoder) {
@ -7388,11 +7388,11 @@ static int haswell_crtc_mode_set(struct drm_crtc *crtc,
return -EINVAL; return -EINVAL;
intel_ddi_pll_enable(intel_crtc); intel_ddi_pll_enable(intel_crtc);
intel_crtc->lowfreq_avail = false;
if (intel_crtc->config.has_dp_encoder) if (intel_crtc->config.has_dp_encoder)
intel_dp_set_m_n(intel_crtc); intel_dp_set_m_n(intel_crtc);
intel_crtc->lowfreq_avail = false;
intel_set_pipe_timings(intel_crtc); intel_set_pipe_timings(intel_crtc);
if (intel_crtc->config.has_pch_encoder) { if (intel_crtc->config.has_pch_encoder) {