diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.19.8/1242-drm-amdgpu-Delete-user-queue-doorbell-variables.patch')
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.19.8/1242-drm-amdgpu-Delete-user-queue-doorbell-variables.patch | 78 |
1 files changed, 78 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.19.8/1242-drm-amdgpu-Delete-user-queue-doorbell-variables.patch b/common/recipes-kernel/linux/linux-yocto-4.19.8/1242-drm-amdgpu-Delete-user-queue-doorbell-variables.patch new file mode 100644 index 00000000..d4161d94 --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.19.8/1242-drm-amdgpu-Delete-user-queue-doorbell-variables.patch @@ -0,0 +1,78 @@ +From 6065d607c99b9e6bc2ef763e1d83c1faae4bf1df Mon Sep 17 00:00:00 2001 +From: Yong Zhao <Yong.Zhao@amd.com> +Date: Fri, 1 Feb 2019 18:36:21 -0500 +Subject: [PATCH 1242/2940] drm/amdgpu: Delete user queue doorbell variables + +They are no longer used, so delete them to avoid confusion. + +Change-Id: I3cf23fe7110ff88f53c0c279b2b4ec8d1a53b87c +Signed-off-by: Yong Zhao <Yong.Zhao@amd.com> +Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h | 8 -------- + drivers/gpu/drm/amd/amdgpu/vega10_reg_init.c | 2 -- + drivers/gpu/drm/amd/amdgpu/vega20_reg_init.c | 2 -- + 3 files changed, 12 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h +index 1cfec06f81d4..43546500ec26 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h +@@ -48,8 +48,6 @@ struct amdgpu_doorbell_index { + uint32_t mec_ring5; + uint32_t mec_ring6; + uint32_t mec_ring7; +- uint32_t userqueue_start; +- uint32_t userqueue_end; + uint32_t gfx_ring0; + uint32_t sdma_engine[8]; + uint32_t ih; +@@ -111,8 +109,6 @@ typedef enum _AMDGPU_VEGA20_DOORBELL_ASSIGNMENT + AMDGPU_VEGA20_DOORBELL_MEC_RING5 = 0x008, + AMDGPU_VEGA20_DOORBELL_MEC_RING6 = 0x009, + AMDGPU_VEGA20_DOORBELL_MEC_RING7 = 0x00A, +- AMDGPU_VEGA20_DOORBELL_USERQUEUE_START = 0x00B, +- AMDGPU_VEGA20_DOORBELL_USERQUEUE_END = 0x08A, + AMDGPU_VEGA20_DOORBELL_GFX_RING0 = 0x08B, + /* SDMA:256~335*/ + AMDGPU_VEGA20_DOORBELL_sDMA_ENGINE0 = 0x100, +@@ -176,10 +172,6 @@ typedef enum _AMDGPU_DOORBELL64_ASSIGNMENT + AMDGPU_DOORBELL64_MEC_RING6 = 0x09, + AMDGPU_DOORBELL64_MEC_RING7 = 0x0a, + +- /* User queue doorbell range (128 doorbells) */ +- AMDGPU_DOORBELL64_USERQUEUE_START = 0x0b, +- AMDGPU_DOORBELL64_USERQUEUE_END = 0x8a, +- + /* Graphics engine */ + AMDGPU_DOORBELL64_GFX_RING0 = 0x8b, + +diff --git a/drivers/gpu/drm/amd/amdgpu/vega10_reg_init.c b/drivers/gpu/drm/amd/amdgpu/vega10_reg_init.c +index 4b5d60ea3e78..62f49c895314 100644 +--- a/drivers/gpu/drm/amd/amdgpu/vega10_reg_init.c ++++ b/drivers/gpu/drm/amd/amdgpu/vega10_reg_init.c +@@ -67,8 +67,6 @@ void vega10_doorbell_index_init(struct amdgpu_device *adev) + adev->doorbell_index.mec_ring5 = AMDGPU_DOORBELL64_MEC_RING5; + adev->doorbell_index.mec_ring6 = AMDGPU_DOORBELL64_MEC_RING6; + adev->doorbell_index.mec_ring7 = AMDGPU_DOORBELL64_MEC_RING7; +- adev->doorbell_index.userqueue_start = AMDGPU_DOORBELL64_USERQUEUE_START; +- adev->doorbell_index.userqueue_end = AMDGPU_DOORBELL64_USERQUEUE_END; + adev->doorbell_index.gfx_ring0 = AMDGPU_DOORBELL64_GFX_RING0; + adev->doorbell_index.sdma_engine[0] = AMDGPU_DOORBELL64_sDMA_ENGINE0; + adev->doorbell_index.sdma_engine[1] = AMDGPU_DOORBELL64_sDMA_ENGINE1; +diff --git a/drivers/gpu/drm/amd/amdgpu/vega20_reg_init.c b/drivers/gpu/drm/amd/amdgpu/vega20_reg_init.c +index 53716c593b2b..1271e1702ad4 100644 +--- a/drivers/gpu/drm/amd/amdgpu/vega20_reg_init.c ++++ b/drivers/gpu/drm/amd/amdgpu/vega20_reg_init.c +@@ -65,8 +65,6 @@ void vega20_doorbell_index_init(struct amdgpu_device *adev) + adev->doorbell_index.mec_ring5 = AMDGPU_VEGA20_DOORBELL_MEC_RING5; + adev->doorbell_index.mec_ring6 = AMDGPU_VEGA20_DOORBELL_MEC_RING6; + adev->doorbell_index.mec_ring7 = AMDGPU_VEGA20_DOORBELL_MEC_RING7; +- adev->doorbell_index.userqueue_start = AMDGPU_VEGA20_DOORBELL_USERQUEUE_START; +- adev->doorbell_index.userqueue_end = AMDGPU_VEGA20_DOORBELL_USERQUEUE_END; + adev->doorbell_index.gfx_ring0 = AMDGPU_VEGA20_DOORBELL_GFX_RING0; + adev->doorbell_index.sdma_engine[0] = AMDGPU_VEGA20_DOORBELL_sDMA_ENGINE0; + adev->doorbell_index.sdma_engine[1] = AMDGPU_VEGA20_DOORBELL_sDMA_ENGINE1; +-- +2.17.1 + |