leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/i915: Name the lrc irq handler correctly

Browse Source 
We consistently use the _irq_handler postfix for functions called in
hardirq context. Especially when it's a non-static function hardirq is
a crazy enough calling context to warrant this level of ocd. So rename
it.

Cc: Thomas Daniel <thomas.daniel@intel.com>
Reviewed-by: Thomas Daniel <thomas.daniel@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
This commit is contained in:
Daniel Vetter 2014-12-10 17:41:43 +01:00
parent 1a2520582e
commit 3f7531c3b3
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpu/drm/i915/i915_irq.c
View File

@ -1385,14 +1385,14 @@ static irqreturn_t gen8_gt_irq_handler(struct drm_device *dev,
if (rcs & GT_RENDER_USER_INTERRUPT) if (rcs & GT_RENDER_USER_INTERRUPT)
notify_ring(dev, ring); notify_ring(dev, ring);
if (rcs & GT_CONTEXT_SWITCH_INTERRUPT) if (rcs & GT_CONTEXT_SWITCH_INTERRUPT)
intel_execlists_handle_ctx_events(ring); intel_lrc_irq_handler(ring);
bcs = tmp >> GEN8_BCS_IRQ_SHIFT; bcs = tmp >> GEN8_BCS_IRQ_SHIFT;
ring = &dev_priv->ring[BCS]; ring = &dev_priv->ring[BCS];
if (bcs & GT_RENDER_USER_INTERRUPT) if (bcs & GT_RENDER_USER_INTERRUPT)
notify_ring(dev, ring); notify_ring(dev, ring);
if (bcs & GT_CONTEXT_SWITCH_INTERRUPT) if (bcs & GT_CONTEXT_SWITCH_INTERRUPT)
intel_execlists_handle_ctx_events(ring); intel_lrc_irq_handler(ring);
} else } else
DRM_ERROR("The master control interrupt lied (GT0)!\n"); DRM_ERROR("The master control interrupt lied (GT0)!\n");
} }
@ -1408,14 +1408,14 @@ static irqreturn_t gen8_gt_irq_handler(struct drm_device *dev,
if (vcs & GT_RENDER_USER_INTERRUPT) if (vcs & GT_RENDER_USER_INTERRUPT)
notify_ring(dev, ring); notify_ring(dev, ring);
if (vcs & GT_CONTEXT_SWITCH_INTERRUPT) if (vcs & GT_CONTEXT_SWITCH_INTERRUPT)
intel_execlists_handle_ctx_events(ring); intel_lrc_irq_handler(ring);
vcs = tmp >> GEN8_VCS2_IRQ_SHIFT; vcs = tmp >> GEN8_VCS2_IRQ_SHIFT;
ring = &dev_priv->ring[VCS2]; ring = &dev_priv->ring[VCS2];
if (vcs & GT_RENDER_USER_INTERRUPT) if (vcs & GT_RENDER_USER_INTERRUPT)
notify_ring(dev, ring); notify_ring(dev, ring);
if (vcs & GT_CONTEXT_SWITCH_INTERRUPT) if (vcs & GT_CONTEXT_SWITCH_INTERRUPT)
intel_execlists_handle_ctx_events(ring); intel_lrc_irq_handler(ring);
} else } else
DRM_ERROR("The master control interrupt lied (GT1)!\n"); DRM_ERROR("The master control interrupt lied (GT1)!\n");
} }
@ -1442,7 +1442,7 @@ static irqreturn_t gen8_gt_irq_handler(struct drm_device *dev,
if (vcs & GT_RENDER_USER_INTERRUPT) if (vcs & GT_RENDER_USER_INTERRUPT)
notify_ring(dev, ring); notify_ring(dev, ring);
if (vcs & GT_CONTEXT_SWITCH_INTERRUPT) if (vcs & GT_CONTEXT_SWITCH_INTERRUPT)
intel_execlists_handle_ctx_events(ring); intel_lrc_irq_handler(ring);
} else } else
DRM_ERROR("The master control interrupt lied (GT3)!\n"); DRM_ERROR("The master control interrupt lied (GT3)!\n");
} }

4
drivers/gpu/drm/i915/intel_lrc.c
View File

@ -474,13 +474,13 @@ static bool execlists_check_remove_request(struct intel_engine_cs *ring,
} }
/** /**
* intel_execlists_handle_ctx_events() - handle Context Switch interrupts * intel_lrc_irq_handler() - handle Context Switch interrupts
* @ring: Engine Command Streamer to handle. * @ring: Engine Command Streamer to handle.
* *
* Check the unread Context Status Buffers and manage the submission of new * Check the unread Context Status Buffers and manage the submission of new
* contexts to the ELSP accordingly. * contexts to the ELSP accordingly.
*/ */
void intel_execlists_handle_ctx_events(struct intel_engine_cs *ring) void intel_lrc_irq_handler(struct intel_engine_cs *ring)
{ {
struct drm_i915_private *dev_priv = ring->dev->dev_private; struct drm_i915_private *dev_priv = ring->dev->dev_private;
u32 status_pointer; u32 status_pointer;

2
drivers/gpu/drm/i915/intel_lrc.h
View File

@ -112,7 +112,7 @@ struct intel_ctx_submit_request {
int elsp_submitted; int elsp_submitted;
}; };
void intel_execlists_handle_ctx_events(struct intel_engine_cs *ring); void intel_lrc_irq_handler(struct intel_engine_cs *ring);
void intel_execlists_retire_requests(struct intel_engine_cs *ring); void intel_execlists_retire_requests(struct intel_engine_cs *ring);
#endif /* _INTEL_LRC_H_ */ #endif /* _INTEL_LRC_H_ */