diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-12-10 11:41:43 -0500 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-12-15 03:54:05 -0500 |
commit | 3f7531c3b37d232122d5b7c8564d4ea800adaa88 (patch) | |
tree | f7a866a1d05c7362ca6a95e502f1587509630bfb /drivers/gpu/drm/i915 | |
parent | 1a2520582ec7e7f802a4a22b6ff6db8e49cf6929 (diff) |
drm/i915: Name the lrc irq handler correctly
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>
Diffstat (limited to 'drivers/gpu/drm/i915')
-rw-r--r-- | drivers/gpu/drm/i915/i915_irq.c | 10 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/intel_lrc.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/intel_lrc.h | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index e6a1db36928e..e3dd2d62c992 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c | |||
@@ -1385,14 +1385,14 @@ static irqreturn_t gen8_gt_irq_handler(struct drm_device *dev, | |||
1385 | if (rcs & GT_RENDER_USER_INTERRUPT) | 1385 | if (rcs & GT_RENDER_USER_INTERRUPT) |
1386 | notify_ring(dev, ring); | 1386 | notify_ring(dev, ring); |
1387 | if (rcs & GT_CONTEXT_SWITCH_INTERRUPT) | 1387 | if (rcs & GT_CONTEXT_SWITCH_INTERRUPT) |
1388 | intel_execlists_handle_ctx_events(ring); | 1388 | intel_lrc_irq_handler(ring); |
1389 | 1389 | ||
1390 | bcs = tmp >> GEN8_BCS_IRQ_SHIFT; | 1390 | bcs = tmp >> GEN8_BCS_IRQ_SHIFT; |
1391 | ring = &dev_priv->ring[BCS]; | 1391 | ring = &dev_priv->ring[BCS]; |
1392 | if (bcs & GT_RENDER_USER_INTERRUPT) | 1392 | if (bcs & GT_RENDER_USER_INTERRUPT) |
1393 | notify_ring(dev, ring); | 1393 | notify_ring(dev, ring); |
1394 | if (bcs & GT_CONTEXT_SWITCH_INTERRUPT) | 1394 | if (bcs & GT_CONTEXT_SWITCH_INTERRUPT) |
1395 | intel_execlists_handle_ctx_events(ring); | 1395 | intel_lrc_irq_handler(ring); |
1396 | } else | 1396 | } else |
1397 | DRM_ERROR("The master control interrupt lied (GT0)!\n"); | 1397 | DRM_ERROR("The master control interrupt lied (GT0)!\n"); |
1398 | } | 1398 | } |
@@ -1408,14 +1408,14 @@ static irqreturn_t gen8_gt_irq_handler(struct drm_device *dev, | |||
1408 | if (vcs & GT_RENDER_USER_INTERRUPT) | 1408 | if (vcs & GT_RENDER_USER_INTERRUPT) |
1409 | notify_ring(dev, ring); | 1409 | notify_ring(dev, ring); |
1410 | if (vcs & GT_CONTEXT_SWITCH_INTERRUPT) | 1410 | if (vcs & GT_CONTEXT_SWITCH_INTERRUPT) |
1411 | intel_execlists_handle_ctx_events(ring); | 1411 | intel_lrc_irq_handler(ring); |
1412 | 1412 | ||
1413 | vcs = tmp >> GEN8_VCS2_IRQ_SHIFT; | 1413 | vcs = tmp >> GEN8_VCS2_IRQ_SHIFT; |
1414 | ring = &dev_priv->ring[VCS2]; | 1414 | ring = &dev_priv->ring[VCS2]; |
1415 | if (vcs & GT_RENDER_USER_INTERRUPT) | 1415 | if (vcs & GT_RENDER_USER_INTERRUPT) |
1416 | notify_ring(dev, ring); | 1416 | notify_ring(dev, ring); |
1417 | if (vcs & GT_CONTEXT_SWITCH_INTERRUPT) | 1417 | if (vcs & GT_CONTEXT_SWITCH_INTERRUPT) |
1418 | intel_execlists_handle_ctx_events(ring); | 1418 | intel_lrc_irq_handler(ring); |
1419 | } else | 1419 | } else |
1420 | DRM_ERROR("The master control interrupt lied (GT1)!\n"); | 1420 | DRM_ERROR("The master control interrupt lied (GT1)!\n"); |
1421 | } | 1421 | } |
@@ -1442,7 +1442,7 @@ static irqreturn_t gen8_gt_irq_handler(struct drm_device *dev, | |||
1442 | if (vcs & GT_RENDER_USER_INTERRUPT) | 1442 | if (vcs & GT_RENDER_USER_INTERRUPT) |
1443 | notify_ring(dev, ring); | 1443 | notify_ring(dev, ring); |
1444 | if (vcs & GT_CONTEXT_SWITCH_INTERRUPT) | 1444 | if (vcs & GT_CONTEXT_SWITCH_INTERRUPT) |
1445 | intel_execlists_handle_ctx_events(ring); | 1445 | intel_lrc_irq_handler(ring); |
1446 | } else | 1446 | } else |
1447 | DRM_ERROR("The master control interrupt lied (GT3)!\n"); | 1447 | DRM_ERROR("The master control interrupt lied (GT3)!\n"); |
1448 | } | 1448 | } |
diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c index a82020ea9d0a..89b5577afe71 100644 --- a/drivers/gpu/drm/i915/intel_lrc.c +++ b/drivers/gpu/drm/i915/intel_lrc.c | |||
@@ -474,13 +474,13 @@ static bool execlists_check_remove_request(struct intel_engine_cs *ring, | |||
474 | } | 474 | } |
475 | 475 | ||
476 | /** | 476 | /** |
477 | * intel_execlists_handle_ctx_events() - handle Context Switch interrupts | 477 | * intel_lrc_irq_handler() - handle Context Switch interrupts |
478 | * @ring: Engine Command Streamer to handle. | 478 | * @ring: Engine Command Streamer to handle. |
479 | * | 479 | * |
480 | * Check the unread Context Status Buffers and manage the submission of new | 480 | * Check the unread Context Status Buffers and manage the submission of new |
481 | * contexts to the ELSP accordingly. | 481 | * contexts to the ELSP accordingly. |
482 | */ | 482 | */ |
483 | void intel_execlists_handle_ctx_events(struct intel_engine_cs *ring) | 483 | void intel_lrc_irq_handler(struct intel_engine_cs *ring) |
484 | { | 484 | { |
485 | struct drm_i915_private *dev_priv = ring->dev->dev_private; | 485 | struct drm_i915_private *dev_priv = ring->dev->dev_private; |
486 | u32 status_pointer; | 486 | u32 status_pointer; |
diff --git a/drivers/gpu/drm/i915/intel_lrc.h b/drivers/gpu/drm/i915/intel_lrc.h index 14b216b9be7f..960fcbd2c98a 100644 --- a/drivers/gpu/drm/i915/intel_lrc.h +++ b/drivers/gpu/drm/i915/intel_lrc.h | |||
@@ -112,7 +112,7 @@ struct intel_ctx_submit_request { | |||
112 | int elsp_submitted; | 112 | int elsp_submitted; |
113 | }; | 113 | }; |
114 | 114 | ||
115 | void intel_execlists_handle_ctx_events(struct intel_engine_cs *ring); | 115 | void intel_lrc_irq_handler(struct intel_engine_cs *ring); |
116 | void intel_execlists_retire_requests(struct intel_engine_cs *ring); | 116 | void intel_execlists_retire_requests(struct intel_engine_cs *ring); |
117 | 117 | ||
118 | #endif /* _INTEL_LRC_H_ */ | 118 | #endif /* _INTEL_LRC_H_ */ |