On Thu, Jan 16, 2014 at 07:56:54PM +0200, Imre Deak wrote:
> Atm, we don't print these events for all platforms and for VLV/G4X we
> also print them for DP AUX completion events which is unnecessary spam.
> Fix both issues.
>
> Signed-off-by: Imre Deak <imre.deak@xxxxxxxxx>
Both merged, thanks.
Aside: Paulo asked me to go back to explicit ack mails again. Since I
don't really care either way I'll do that. Worst case I need to start
scripting it a bit ;-)
Cheers, Daniel
> ---
> drivers/gpu/drm/i915/i915_irq.c | 12 +++---------
> 1 file changed, 3 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
> index 6d11e25..6e1c2ff 100644
> --- a/drivers/gpu/drm/i915/i915_irq.c
> +++ b/drivers/gpu/drm/i915/i915_irq.c
> @@ -1230,6 +1230,9 @@ static inline void intel_hpd_irq_handler(struct drm_device *dev,
> if (!hotplug_trigger)
> return;
>
> + DRM_DEBUG_DRIVER("hotplug event received, stat 0x%08x\n",
> + hotplug_trigger);
> +
> spin_lock(&dev_priv->irq_lock);
> for (i = 1; i < HPD_NUM_PINS; i++) {
>
> @@ -1468,9 +1471,6 @@ static irqreturn_t valleyview_irq_handler(int irq, void *arg)
> u32 hotplug_status = I915_READ(PORT_HOTPLUG_STAT);
> u32 hotplug_trigger = hotplug_status & HOTPLUG_INT_STATUS_I915;
>
> - DRM_DEBUG_DRIVER("hotplug event received, stat 0x%08x\n",
> - hotplug_status);
> -
> intel_hpd_irq_handler(dev, hotplug_trigger, hpd_status_i915);
>
> if (hotplug_status & DP_AUX_CHANNEL_MASK_INT_STATUS_G4X)
> @@ -3407,9 +3407,6 @@ static irqreturn_t i915_irq_handler(int irq, void *arg)
> u32 hotplug_status = I915_READ(PORT_HOTPLUG_STAT);
> u32 hotplug_trigger = hotplug_status & HOTPLUG_INT_STATUS_I915;
>
> - DRM_DEBUG_DRIVER("hotplug event received, stat 0x%08x\n",
> - hotplug_status);
> -
> intel_hpd_irq_handler(dev, hotplug_trigger, hpd_status_i915);
>
> I915_WRITE(PORT_HOTPLUG_STAT, hotplug_status);
> @@ -3657,9 +3654,6 @@ static irqreturn_t i965_irq_handler(int irq, void *arg)
> HOTPLUG_INT_STATUS_G4X :
> HOTPLUG_INT_STATUS_I915);
>
> - DRM_DEBUG_DRIVER("hotplug event received, stat 0x%08x\n",
> - hotplug_status);
> -
> intel_hpd_irq_handler(dev, hotplug_trigger,
> IS_G4X(dev) ? hpd_status_g4x : hpd_status_i915);
>
> --
> 1.8.4
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
