On Wed, Mar 06, 2013 at 08:03:21PM -0300, Paulo Zanoni wrote: > From: Paulo Zanoni <paulo.r.zanoni at intel.com> > > This fixes "unclaimed register" messages when the power well is > disabled and there's a GPU hang. > > Signed-off-by: Paulo Zanoni <paulo.r.zanoni at intel.com> > --- > drivers/gpu/drm/i915/i915_irq.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c > index 29b1bb1..aefc674 100644 > --- a/drivers/gpu/drm/i915/i915_irq.c > +++ b/drivers/gpu/drm/i915/i915_irq.c > @@ -129,6 +129,9 @@ i915_pipe_enabled(struct drm_device *dev, int pipe) > enum transcoder cpu_transcoder = intel_pipe_to_cpu_transcoder(dev_priv, > pipe); > > + if (intel_power_well_is_down(dev) && cpu_transcoder != TRANSCODER_EDP) > + return false; > + > return I915_READ(PIPECONF(cpu_transcoder)) & PIPECONF_ENABLE; Again I vote for I915_READ_NOCHECK instead. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
