| Message ID | 1366313746-3659-7-git-send-email-przanoni@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Apr 18, 2013 at 04:35:45PM -0300, Paulo Zanoni wrote: > From: Paulo Zanoni <paulo.r.zanoni@intel.com> > > This fixes "unclaimed register" messages when the power well is > disabled and there's a GPU hang. > > v2: Use the new intel_display_power_enabled(). > > Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> > --- > drivers/gpu/drm/i915/i915_irq.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c > index 932e7f8..fda2998 100644 > --- a/drivers/gpu/drm/i915/i915_irq.c > +++ b/drivers/gpu/drm/i915/i915_irq.c > @@ -184,6 +184,10 @@ i915_pipe_enabled(struct drm_device *dev, int pipe) > enum transcoder cpu_transcoder = intel_pipe_to_cpu_transcoder(dev_priv, > pipe); > > + if (cpu_transcoder != TRANSCODER_EDP && > + !intel_display_power_enabled(dev, POWER_DOMAIN_OTHER)) > + return false; > + Same remark as in patch 3, I'd rather have a simplified logic asking explicitely if the transcoder we're checking is powered.
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 932e7f8..fda2998 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -184,6 +184,10 @@ i915_pipe_enabled(struct drm_device *dev, int pipe) enum transcoder cpu_transcoder = intel_pipe_to_cpu_transcoder(dev_priv, pipe); + if (cpu_transcoder != TRANSCODER_EDP && + !intel_display_power_enabled(dev, POWER_DOMAIN_OTHER)) + return false; + return I915_READ(PIPECONF(cpu_transcoder)) & PIPECONF_ENABLE; }