drm/amdgpu: cleanup amdgpu_ih_process a bit more

[sfrench/cifs-2.6.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_irq.c

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
index 8bfb3dab46f711029018729db41bbf808c34261e..af4c3b1af3223647e218a99ef23129beaac41b39 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
@@ -130,29 +130,6 @@ void amdgpu_irq_disable_all(struct amdgpu_device *adev)
        spin_unlock_irqrestore(&adev->irq.lock, irqflags);
 }
 
-/**
- * amdgpu_irq_callback - callback from the IH ring
- *
- * @adev: amdgpu device pointer
- * @ih: amdgpu ih ring
- *
- * Callback from IH ring processing to handle the entry at the current position
- * and advance the read pointer.
- */
-static void amdgpu_irq_callback(struct amdgpu_device *adev,
-                               struct amdgpu_ih_ring *ih)
-{
-       u32 ring_index = ih->rptr >> 2;
-       struct amdgpu_iv_entry entry;
-
-       entry.iv_entry = (const uint32_t *)&ih->ring[ring_index];
-       amdgpu_ih_decode_iv(adev, &entry);
-
-       trace_amdgpu_iv(ih - &adev->irq.ih, &entry);
-
-       amdgpu_irq_dispatch(adev, &entry);
-}
-
 /**
  * amdgpu_irq_handler - IRQ handler
  *
@@ -170,7 +147,7 @@ irqreturn_t amdgpu_irq_handler(int irq, void *arg)
        struct amdgpu_device *adev = dev->dev_private;
        irqreturn_t ret;
 
-       ret = amdgpu_ih_process(adev, &adev->irq.ih, amdgpu_irq_callback);
+       ret = amdgpu_ih_process(adev, &adev->irq.ih);
        if (ret == IRQ_HANDLED)
                pm_runtime_mark_last_busy(dev->dev);
        return ret;
@@ -188,7 +165,7 @@ static void amdgpu_irq_handle_ih1(struct work_struct *work)
        struct amdgpu_device *adev = container_of(work, struct amdgpu_device,
                                                  irq.ih1_work);
 
-       amdgpu_ih_process(adev, &adev->irq.ih1, amdgpu_irq_callback);
+       amdgpu_ih_process(adev, &adev->irq.ih1);
 }
 
 /**
@@ -203,7 +180,7 @@ static void amdgpu_irq_handle_ih2(struct work_struct *work)
        struct amdgpu_device *adev = container_of(work, struct amdgpu_device,
                                                  irq.ih2_work);
 
-       amdgpu_ih_process(adev, &adev->irq.ih2, amdgpu_irq_callback);
+       amdgpu_ih_process(adev, &adev->irq.ih2);
 }
 
 /**
@@ -394,14 +371,23 @@ int amdgpu_irq_add_id(struct amdgpu_device *adev,
  * Dispatches IRQ to IP blocks.
  */
 void amdgpu_irq_dispatch(struct amdgpu_device *adev,
-                        struct amdgpu_iv_entry *entry)
+                        struct amdgpu_ih_ring *ih)
 {
-       unsigned client_id = entry->client_id;
-       unsigned src_id = entry->src_id;
+       u32 ring_index = ih->rptr >> 2;
+       struct amdgpu_iv_entry entry;
+       unsigned client_id, src_id;
        struct amdgpu_irq_src *src;
        bool handled = false;
        int r;
 
+       entry.iv_entry = (const uint32_t *)&ih->ring[ring_index];
+       amdgpu_ih_decode_iv(adev, &entry);
+
+       trace_amdgpu_iv(ih - &adev->irq.ih, &entry);
+
+       client_id = entry.client_id;
+       src_id = entry.src_id;
+
        if (client_id >= AMDGPU_IRQ_CLIENTID_MAX) {
                DRM_DEBUG("Invalid client_id in IV: %d\n", client_id);
 
@@ -416,7 +402,7 @@ void amdgpu_irq_dispatch(struct amdgpu_device *adev,
                          client_id, src_id);
 
        } else if ((src = adev->irq.client[client_id].sources[src_id])) {
-               r = src->funcs->process(adev, src, entry);
+               r = src->funcs->process(adev, src, &entry);
                if (r < 0)
                        DRM_ERROR("error processing interrupt (%d)\n", r);
                else if (r)
@@ -428,7 +414,7 @@ void amdgpu_irq_dispatch(struct amdgpu_device *adev,
 
        /* Send it to amdkfd as well if it isn't already handled */
        if (!handled)
-               amdgpu_amdkfd_interrupt(adev, entry->iv_entry);
+               amdgpu_amdkfd_interrupt(adev, entry.iv_entry);
 }
 
 /**