[PATCH 1/2] drm/i915: g4x/vlv: fix dp aux interrupt mask

[PATCH 1/2] drm/i915: g4x/vlv: fix dp aux interrupt mask

[Imre Deak]

Fix typo possibly leading to timed out DP aux transactions on ports C,D.

Introduced in:

Commmit 4aeebd7443e36b0a40032e518a9338f48bd27efc
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date:   Thu Oct 31 09:53:36 2013 +0100

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=72210
Signed off-by: Imre Deak <imre.deak@intel.com>
---
 drivers/gpu/drm/i915/i915_reg.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 76126e0..84365cd 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -2138,7 +2138,8 @@
 #define   DP_AUX_CHANNEL_D_INT_STATUS_G4X	(1 << 6)
 #define   DP_AUX_CHANNEL_C_INT_STATUS_G4X	(1 << 5)
 #define   DP_AUX_CHANNEL_B_INT_STATUS_G4X	(1 << 4)
-#define   DP_AUX_CHANNEL_MASK_INT_STATUS_G4X	(1 << 4)
+#define   DP_AUX_CHANNEL_MASK_INT_STATUS_G4X	(7 << 4)
+
 /* SDVO is different across gen3/4 */
 #define   SDVOC_HOTPLUG_INT_STATUS_G4X		(1 << 3)
 #define   SDVOB_HOTPLUG_INT_STATUS_G4X		(1 << 2)
-- 
1.8.4

[PATCH 2/2] drm/i915: clean up HPD IRQ debug printing

[Imre Deak]

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@intel.com>
---
 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

Re: [PATCH 2/2] drm/i915: clean up HPD IRQ debug printing

[Daniel Vetter]

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@intel.com>

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@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch