diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3007-drm-amdgpu-set-sdma-irq-src-num-according-to-sdma-in.patch')
-rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3007-drm-amdgpu-set-sdma-irq-src-num-according-to-sdma-in.patch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3007-drm-amdgpu-set-sdma-irq-src-num-according-to-sdma-in.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3007-drm-amdgpu-set-sdma-irq-src-num-according-to-sdma-in.patch new file mode 100644 index 00000000..229684fc --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3007-drm-amdgpu-set-sdma-irq-src-num-according-to-sdma-in.patch @@ -0,0 +1,49 @@ +From 6b5a0a993fde6c15a756a9e85618f22d9a928c54 Mon Sep 17 00:00:00 2001 +From: Hawking Zhang <Hawking.Zhang@amd.com> +Date: Fri, 19 Jul 2019 19:09:38 +0800 +Subject: [PATCH 3007/4256] drm/amdgpu: set sdma irq src num according to sdma + instances + +Otherwise, it will cause driver access non-existing sdma registers +in gpu reset code path + +Change-Id: I1c218985d8c0c883f9c36a21d2c58c3654c7acc1 +Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com> +Reviewed-by: Le Ma <Le.Ma@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 17 +++++++++++++++-- + 1 file changed, 15 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +index 48d4597ef9f6..2ddeff86aaea 100644 +--- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +@@ -2415,10 +2415,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; + } + +-- +2.17.1 + |