Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux

[linux.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 7e7acd47ec783c8841ddc5136c6ac50a4e704490..a6b7e367a8607694da3965ac664d2081c7f97dde 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
@@ -33,6 +33,7 @@
 #include "amdgpu_ih.h"
 #include "atom.h"
 #include "amdgpu_connectors.h"
+#include "amdgpu_trace.h"
 
 #include <linux/pm_runtime.h>
 
@@ -315,9 +316,10 @@ int amdgpu_irq_add_id(struct amdgpu_device *adev,
                return -EINVAL;
 
        if (!adev->irq.client[client_id].sources) {
-               adev->irq.client[client_id].sources = kcalloc(AMDGPU_MAX_IRQ_SRC_ID,
-                                                             sizeof(struct amdgpu_irq_src),
-                                                             GFP_KERNEL);
+               adev->irq.client[client_id].sources =
+                       kcalloc(AMDGPU_MAX_IRQ_SRC_ID,
+                               sizeof(struct amdgpu_irq_src *),
+                               GFP_KERNEL);
                if (!adev->irq.client[client_id].sources)
                        return -ENOMEM;
        }
@@ -356,6 +358,8 @@ void amdgpu_irq_dispatch(struct amdgpu_device *adev,
        struct amdgpu_irq_src *src;
        int r;
 
+       trace_amdgpu_iv(entry);
+
        if (client_id >= AMDGPU_IH_CLIENTID_MAX) {
                DRM_DEBUG("Invalid client_id in IV: %d\n", client_id);
                return;