OSDN Git Service

drm/amdgpu: set sdma irq src num according to sdma instances
authorHawking Zhang <Hawking.Zhang@amd.com>
Fri, 19 Jul 2019 11:09:38 +0000 (19:09 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Mon, 22 Jul 2019 19:57:31 +0000 (14:57 -0500)
Otherwise, it will cause driver access non-existing sdma registers
in gpu reset code path

Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: Le Ma <Le.Ma@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c

index 921a6dd..dd8f520 100644 (file)
@@ -2416,10 +2416,23 @@ static const struct amdgpu_irq_src_funcs sdma_v4_0_ecc_irq_funcs = {
 
 static void sdma_v4_0_set_irq_funcs(struct amdgpu_device *adev)
 {
-       adev->sdma.trap_irq.num_types = AMDGPU_SDMA_IRQ_LAST;
+       switch (adev->sdma.num_instances) {
+       case 1:
+               adev->sdma.trap_irq.num_types = AMDGPU_SDMA_IRQ_INSTANCE1;
+               adev->sdma.ecc_irq.num_types = AMDGPU_SDMA_IRQ_INSTANCE1;
+               break;
+       case 8:
+               adev->sdma.trap_irq.num_types = AMDGPU_SDMA_IRQ_LAST;
+               adev->sdma.ecc_irq.num_types = AMDGPU_SDMA_IRQ_LAST;
+               break;
+       case 2:
+       default:
+               adev->sdma.trap_irq.num_types = AMDGPU_SDMA_IRQ_INSTANCE2;
+               adev->sdma.ecc_irq.num_types = AMDGPU_SDMA_IRQ_INSTANCE2;
+               break;
+       }
        adev->sdma.trap_irq.funcs = &sdma_v4_0_trap_irq_funcs;
        adev->sdma.illegal_inst_irq.funcs = &sdma_v4_0_illegal_inst_irq_funcs;
-       adev->sdma.ecc_irq.num_types = AMDGPU_SDMA_IRQ_LAST;
        adev->sdma.ecc_irq.funcs = &sdma_v4_0_ecc_irq_funcs;
 }