Skip to content

Commit

Permalink
drm/i915: don't touch the PF regs if the power well is down
Browse files Browse the repository at this point in the history
This solves some "unclaimed register" messages when booting the
machine with eDP attached.

V2: Rebase and add the comment requested by Daniel.

Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
Paulo Zanoni authored and Daniel Vetter committed Apr 18, 2013
1 parent 15d199e commit f7708f7
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions drivers/gpu/drm/i915/intel_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -3599,9 +3599,13 @@ static void haswell_crtc_disable(struct drm_crtc *crtc)

intel_ddi_disable_transcoder_func(dev_priv, cpu_transcoder);

/* Disable PF */
I915_WRITE(PF_CTL(pipe), 0);
I915_WRITE(PF_WIN_SZ(pipe), 0);
/* XXX: Once we have proper panel fitter state tracking implemented with
* hardware state read/check support we should switch to only disable
* the panel fitter when we know it's used. */
if (intel_using_power_well(dev)) {
I915_WRITE(PF_CTL(pipe), 0);
I915_WRITE(PF_WIN_SZ(pipe), 0);
}

intel_ddi_disable_pipe_clock(intel_crtc);

Expand Down

0 comments on commit f7708f7

Please sign in to comment.