drm/i915: Random irq stuff
Subsystems (2)
cover drm/i915: Random irq stuff
From: Ville Syrjälä <[email protected]>
I ws poking around the irq code a bit and these things caught my eye. If someone really wants to keep dev_priv->irq_received, I'm fine with dropping that patch, but I figured I'd test the ice a bit.
Ville Syrjälä (3):
drm/i915: Cancel the hotplug re-enable timer on BDW drm/i915: Make irq_received bool
drm/i915: Kill dev_priv->irq_received
drivers/gpu/drm/i915/i915_debugfs.c | 2 -- drivers/gpu/drm/i915/i915_drv.h | 2 -- drivers/gpu/drm/i915/i915_irq.c | 32 +++----------------------------- 3 files changed, 3 insertions(+), 33 deletions(-)
Signature · 6 lines
1.8.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/3 drm/i915: Cancel the hotplug re-enable timer on BDW
From: Ville Syrjälä <[email protected]>
We forgot to cancel the hotplug re-enable timer in gen8_irq_uninstall().
--- drivers/gpu/drm/i915/i915_irq.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/i915/i915_irq.c +2 -0
@@ -3001,6 +3001,8 @@ static void gen8_irq_uninstall(struct drm_device *dev)if (!dev_priv)return ; +del_timer_sync (&dev_priv->hotplug_reenable_timer); +atomic_set (&dev_priv->irq_received,0 );I915_WRITE (GEN8_MASTER_IRQ ,0 );
Signature · 6 lines
1.8.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 1/3] drm/i915: Cancel the hotplug re-enable timer on BDW
Quoted 14 lines · On Fri, Jan 17, 2014 at 11:35:14AM +0200, [email protected] wrote:
From: Ville Syrjälä <[email protected]>
We forgot to cancel the hotplug re-enable timer in
gen8_irq_uninstall().Signed-off-by Ville Syrjälä <[email protected]>--- drivers/gpu/drm/i915/i915_irq.c | 2 ++ 1 file changed, 2 insertions(+)drivers/gpu/drm/i915/i915_irq.c +0
-0
drivers/gpu/drm/i915/i915_irq.c static void gen8_irq_uninstall(struct drm_device *dev) · line 3004
Quoted 4 lines
drivers/gpu/drm/i915/i915_irq.c +1
-0@@ -3001,6 +3001,8 @@ static void gen8_irq_uninstall(struct drm_device *dev)if (!dev_priv)return ; +del_timer_sync (&dev_priv->hotplug_reenable_timer);
I'd rather this was
intel_hpd_irq_uninstall(struct drm_device *dev)
{
del_timer_sync(&to_i915(dev)->hotplug_reenable_timer);
}that each genX_irq_uninstall() routine called.
And s/i915_reenable_hotplug_timer_func/intel_hpd_irq_reenable/ -Chris
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre
PATCH 1/1 drm/i915: Add intel_hpd_irq_uninstall()
From: Ville Syrjälä <[email protected]>
Add intel_hpd_irq_uninstall() which will cancel the hotplug re-enable timer.
Also s/i915_reenable_hotplug_timer_func/intel_hpd_irq_reenable/
--- drivers/gpu/drm/i915/i915_irq.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/i915_irq.c +12 -7
@@ -909,6 +909,11 @@ static void i915_hotplug_work_func(struct work_struct *work)drm_kms_helper_hotplug_event (dev); } +static void intel_hpd_irq_uninstall (struct drm_i915_private *dev_priv) +{ +del_timer_sync (&dev_priv->hotplug_reenable_timer); +} +static void ironlake_rps_change_irq_handler (struct drm_device *dev) {drm_i915_private_t *dev_priv = dev->dev_private;
@@ -3001,7 +3006,7 @@ static void gen8_irq_uninstall(struct drm_device *dev)if (!dev_priv)return ; -del_timer_sync (&dev_priv->hotplug_reenable_timer); +intel_hpd_irq_uninstall (dev_priv);atomic_set (&dev_priv->irq_received,0 );
@@ -3045,7 +3050,7 @@ static void valleyview_irq_uninstall(struct drm_device *dev)if (!dev_priv)return ; -del_timer_sync (&dev_priv->hotplug_reenable_timer); +intel_hpd_irq_uninstall (dev_priv);for_each_pipe (pipe)I915_WRITE (PIPESTAT (pipe),0xffff );
@@ -3068,7 +3073,7 @@ static void ironlake_irq_uninstall(struct drm_device *dev)if (!dev_priv)return ; -del_timer_sync (&dev_priv->hotplug_reenable_timer); +intel_hpd_irq_uninstall (dev_priv);I915_WRITE (HWSTAM ,0xffffffff );
@@ -3472,7 +3477,7 @@ static void i915_irq_uninstall(struct drm_device * dev)drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;int pipe; -del_timer_sync (&dev_priv->hotplug_reenable_timer); +intel_hpd_irq_uninstall (dev_priv);if (I915_HAS_HOTPLUG (dev)) {I915_WRITE (PORT_HOTPLUG_EN ,0 );
@@ -3731,7 +3736,7 @@ static void i965_irq_uninstall(struct drm_device * dev)if (!dev_priv)return ; -del_timer_sync (&dev_priv->hotplug_reenable_timer); +intel_hpd_irq_uninstall (dev_priv);I915_WRITE (PORT_HOTPLUG_EN ,0 );I915_WRITE (PORT_HOTPLUG_STAT ,I915_READ (PORT_HOTPLUG_STAT ));
@@ -3748,7 +3753,7 @@ static void i965_irq_uninstall(struct drm_device * dev)I915_WRITE (IIR ,I915_READ (IIR )); } -static void i915_reenable_hotplug_timer_func (unsigned long data) +static void intel_hpd_irq_reenable (unsigned long data) {drm_i915_private_t *dev_priv = (drm_i915_private_t *)data;struct drm_device *dev = dev_priv->dev;
@@ -3795,7 +3800,7 @@ void intel_irq_init(struct drm_device *dev)setup_timer (&dev_priv->gpu_error.hangcheck_timer, i915_hangcheck_elapsed, (unsigned long ) dev); -setup_timer (&dev_priv->hotplug_reenable_timer, i915_reenable_hotplug_timer_func, +setup_timer (&dev_priv->hotplug_reenable_timer, intel_hpd_irq_reenable, (unsigned long ) dev_priv);pm_qos_add_request (&dev_priv->pm_qos,PM_QOS_CPU_DMA_LATENCY ,PM_QOS_DEFAULT_VALUE );
Signature · 6 lines
1.8.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] drm/i915: Add intel_hpd_irq_uninstall()
Quoted 9 lines · On Fri, Jan 17, 2014 at 01:43:51PM +0200, [email protected] wrote:
From: Ville Syrjälä <[email protected]>
Add
intel_hpd_irq_uninstall()which will cancel the hotplug re-enable timer.Also s/i915_reenable_hotplug_timer_func/intel_hpd_irq_reenable/
Suggested-by Chris Wilson <[email protected]>Signed-off-by Ville Syrjälä <[email protected]>
-Chris
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre
PATCH 2/3 drm/i915: Make irq_received bool
In reply to [email protected]From: Ville Syrjälä <[email protected]>
irq_received is used as a boolean in i965_irq_handler(), so make it bool. This also makes i965_irq_handler() closer to i915_irq_handler().
--- drivers/gpu/drm/i915/i915_irq.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/i915_irq.c +2 -4
@@ -3606,7 +3606,6 @@ static irqreturn_t i965_irq_handler(int irq, void *arg)u32 iir, new_iir;u32 pipe_stats[I915_MAX_PIPES ];unsigned long irqflags; -int irq_received;int ret =IRQ_NONE , pipe;u32 flip_mask = I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT |
@@ -3617,10 +3616,9 @@ static irqreturn_t i965_irq_handler(int irq, void *arg) iir =I915_READ (IIR );for (;;) { +bool irq_received = (iir & ~flip_mask) !=0 ;bool blc_event = false; - irq_received = (iir & ~flip_mask) !=0 ; -/* Can't rely on pipestat interrupt bit in iir as it might * have been cleared after the pipestat interrupt was received. * It doesn't set the bit in iir again, but it still produces
@@ -3642,7 +3640,7 @@ static irqreturn_t i965_irq_handler(int irq, void *arg)DRM_DEBUG_DRIVER ("pipe %c underrun\n" ,pipe_name (pipe));I915_WRITE (reg, pipe_stats[pipe]); - irq_received =1 ; + irq_received = true; } }spin_unlock_irqrestore (&dev_priv->irq_lock, irqflags);
Signature · 6 lines
1.8.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/3] drm/i915: Make irq_received bool
Quoted 6 lines · On Fri, Jan 17, 2014 at 11:35:15AM +0200, [email protected] wrote:
From: Ville Syrjälä <[email protected]>
irq_receivedis used as a boolean ini965_irq_handler(), so make it bool. This also makesi965_irq_handler()closer toi915_irq_handler().Signed-off-by Ville Syrjälä <[email protected]>
-Chris
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre
PATCH 3/3 drm/i915: Kill dev_priv->irq_received
In reply to [email protected]From: Ville Syrjälä <[email protected]>
Not sure anyone cares about this information. I suppose most people would just look at /proc/interrupts instead.
--- drivers/gpu/drm/i915/i915_debugfs.c | 2 -- drivers/gpu/drm/i915/i915_drv.h | 2 -- drivers/gpu/drm/i915/i915_irq.c | 26 -------------------------- 3 files changed, 30 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +0 -2
@@ -716,8 +716,6 @@ static int i915_interrupt_info(struct seq_file *m, void *data)seq_printf (m,"Graphics Interrupt mask: %08x\n" ,I915_READ (GTIMR )); } -seq_printf (m,"Interrupts received: %d\n" , -atomic_read (&dev_priv->irq_received));for_each_ring (ring, dev_priv, i) {if (INTEL_INFO (dev)->gen >=6 ) { seq_printf(m,
drivers/gpu/drm/i915/i915_drv.h +0 -2
@@ -1389,8 +1389,6 @@ typedef struct drm_i915_private {drm_dma_handle_t *status_page_dmah;struct resource mch_res; -atomic_t irq_received; -/* protects the irq masks */ spinlock_t irq_lock;
drivers/gpu/drm/i915/i915_irq.c +0 -26
@@ -1419,8 +1419,6 @@ static irqreturn_t valleyview_irq_handler(int irq, void *arg)int pipe;u32 pipe_stats[I915_MAX_PIPES ]; -atomic_inc (&dev_priv->irq_received); -while (true) { iir =I915_READ (VLV_IIR ); gt_iir =I915_READ (GTIIR );
@@ -1732,8 +1730,6 @@ static irqreturn_t ironlake_irq_handler(int irq, void *arg)u32 de_iir, gt_iir, de_ier, sde_ier =0 ;irqreturn_t ret =IRQ_NONE ; -atomic_inc (&dev_priv->irq_received); -/* We get interrupts on unclaimed registers, so check for this before we * do any I915_{READ,WRITE}. */ intel_uncore_check_errors (dev);
@@ -1802,8 +1798,6 @@ static irqreturn_t gen8_irq_handler(int irq, void *arg)uint32_t tmp =0 ;enum pipe pipe; -atomic_inc (&dev_priv->irq_received); - master_ctl =I915_READ (GEN8_MASTER_IRQ ); master_ctl &= ~GEN8_MASTER_IRQ_CONTROL ;if (!master_ctl)
@@ -2626,8 +2620,6 @@ static void ironlake_irq_preinstall(struct drm_device *dev) {drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; -atomic_set (&dev_priv->irq_received,0 ); -I915_WRITE (HWSTAM ,0xeffe );I915_WRITE (DEIMR ,0xffffffff );
@@ -2644,8 +2636,6 @@ static void valleyview_irq_preinstall(struct drm_device *dev)drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;int pipe; -atomic_set (&dev_priv->irq_received,0 ); -/* VLV magic */ I915_WRITE (VLV_IMR ,0 );I915_WRITE (RING_IMR (RENDER_RING_BASE ),0 );
@@ -2675,8 +2665,6 @@ static void gen8_irq_preinstall(struct drm_device *dev)struct drm_i915_private *dev_priv = dev->dev_private;int pipe; -atomic_set (&dev_priv->irq_received,0 ); -I915_WRITE (GEN8_MASTER_IRQ ,0 );POSTING_READ (GEN8_MASTER_IRQ );
@@ -3003,8 +2991,6 @@ static void gen8_irq_uninstall(struct drm_device *dev)del_timer_sync (&dev_priv->hotplug_reenable_timer); -atomic_set (&dev_priv->irq_received,0 ); -I915_WRITE (GEN8_MASTER_IRQ ,0 );#define GEN8_IRQ_FINI_NDX (type, which) do { \
@@ -3097,8 +3083,6 @@ static void i8xx_irq_preinstall(struct drm_device * dev)drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;int pipe; -atomic_set (&dev_priv->irq_received,0 ); -for_each_pipe (pipe)I915_WRITE (PIPESTAT (pipe),0 );I915_WRITE16 (IMR ,0xffff );
@@ -3183,8 +3167,6 @@ static irqreturn_t i8xx_irq_handler(int irq, void *arg)I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT |I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT ; -atomic_inc (&dev_priv->irq_received); - iir =I915_READ16 (IIR );if (iir ==0 )return IRQ_NONE ;
@@ -3262,8 +3244,6 @@ static void i915_irq_preinstall(struct drm_device * dev)drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;int pipe; -atomic_set (&dev_priv->irq_received,0 ); -if (I915_HAS_HOTPLUG (dev)) {I915_WRITE (PORT_HOTPLUG_EN ,0 );I915_WRITE (PORT_HOTPLUG_STAT ,I915_READ (PORT_HOTPLUG_STAT ));
@@ -3369,8 +3349,6 @@ static irqreturn_t i915_irq_handler(int irq, void *arg)I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT ;int pipe, ret =IRQ_NONE ; -atomic_inc (&dev_priv->irq_received); - iir =I915_READ (IIR ); do { bool irq_received = (iir & ~flip_mask) != 0;
@@ -3496,8 +3474,6 @@ static void i965_irq_preinstall(struct drm_device * dev)drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;int pipe; -atomic_set (&dev_priv->irq_received,0 ); -I915_WRITE (PORT_HOTPLUG_EN ,0 );I915_WRITE (PORT_HOTPLUG_STAT ,I915_READ (PORT_HOTPLUG_STAT ));
@@ -3611,8 +3587,6 @@ static irqreturn_t i965_irq_handler(int irq, void *arg)I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT |I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT ; -atomic_inc (&dev_priv->irq_received); - iir =I915_READ (IIR );for (;;) {
Signature · 6 lines
1.8.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 3/3] drm/i915: Kill dev_priv->irq_received
Quoted 6 lines · On Fri, Jan 17, 2014 at 11:35:16AM +0200, [email protected] wrote:
From: Ville Syrjälä <[email protected]>
Not sure anyone cares about this information. I suppose most people would just look at
/proc/interruptsinstead.Signed-off-by Ville Syrjälä <[email protected]>
-Chris
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre
Re: [PATCH 3/3] drm/i915: Kill dev_priv->irq_received
Quoted 8 lines · Chris Wilson
Quoted 6 lines · On Fri, Jan 17, 2014 at 11:35:16AM +0200, [email protected] wrote:
From: Ville Syrjälä <[email protected]>
Not sure anyone cares about this information. I suppose most people would just look at
/proc/interruptsinstead.Signed-off-by Ville Syrjälä <[email protected]>Acked-by Chris Wilson <[email protected]>
All three patches merged, thanks.
-Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
Re: [PATCH 3/3] drm/i915: Kill dev_priv->irq_received
In reply to Chris WilsonQuoted 8 lines · Chris Wilson
Quoted 6 lines · On Fri, Jan 17, 2014 at 11:35:16AM +0200, [email protected] wrote:
From: Ville Syrjälä <[email protected]>
Not sure anyone cares about this information. I suppose most people would just look at
/proc/interruptsinstead.Signed-off-by Ville Syrjälä <[email protected]>Acked-by Chris Wilson <[email protected]>
Darn. Should not have readily agreed, I actually do use in my pmu. Can I easily get at (from within i915.ko) the /proc/interrupts counter instead? -Chris
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre
Re: [PATCH 3/3] drm/i915: Kill dev_priv->irq_received
Quoted 4 lines · Chris Wilson
Quoted 3 lines · Chris Wilson
Quoted 2 lines · On Fri, Jan 17, 2014 at 11:35:16AM +0200, [email protected] wrote:
From: Ville Syrjälä <[email protected]>
Quoted 8 lines
Quoted 5 lines
Quoted 4 lines
Not sure anyone cares about this information. I suppose most people would just look at
/proc/interruptsinstead.Signed-off-by Ville Syrjälä <[email protected]>Acked-by Chris Wilson <[email protected]>Darn. Should not have readily agreed, I actually do use in my pmu. Can I easily get at (from within i915.ko) the
/proc/interruptscounter instead?
Not sure. irq_to_desc() maybe?
Signature · 2 lines
Ville Syrjälä Intel OTC
Re: [PATCH 3/3] drm/i915: Kill dev_priv->irq_received
Quoted 8 lines · Ville Syrjälä
Quoted 7 lines · Chris Wilson
Quoted 6 lines · Chris Wilson
Quoted 5 lines · On Fri, Jan 17, 2014 at 11:35:16AM +0200, [email protected] wrote:
From: Ville Syrjälä <[email protected]>
Not sure anyone cares about this information. I suppose most people would just look at
/proc/interruptsinstead.
Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
Quoted 1 line
Signed-off-by Ville Syrjälä <[email protected]>Acked-by Chris Wilson <[email protected]>Darn. Should not have readily agreed, I actually do use in my pmu. Can I easily get at (from within i915.ko) the
/proc/interruptscounter instead?Not sure.
irq_to_desc()maybe?
And drm_dev_to_irq().
-Chris
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre