diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.19.8/1273-Revert-drm-amdgpu-Delete-user-queue-doorbell-variabl.patch')
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.19.8/1273-Revert-drm-amdgpu-Delete-user-queue-doorbell-variabl.patch | 80 |
1 files changed, 80 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.19.8/1273-Revert-drm-amdgpu-Delete-user-queue-doorbell-variabl.patch b/common/recipes-kernel/linux/linux-yocto-4.19.8/1273-Revert-drm-amdgpu-Delete-user-queue-doorbell-variabl.patch new file mode 100644 index 00000000..58d77e50 --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.19.8/1273-Revert-drm-amdgpu-Delete-user-queue-doorbell-variabl.patch @@ -0,0 +1,80 @@ +From 24120b1574415965183f9cf8ed360bb6c908c18e Mon Sep 17 00:00:00 2001 +From: Yong Zhao <Yong.Zhao@amd.com> +Date: Tue, 19 Feb 2019 11:21:41 -0500 +Subject: [PATCH 1273/2940] Revert "drm/amdgpu: Delete user queue doorbell + variables" + +This reverts commit 9006c6bd9059cb9807fa863bafc1d776222cb61b. + +Change-Id: I92be80cd78886e7ad840cab6ce718cd6ad973dd6 +Signed-off-by: Yong Zhao <Yong.Zhao@amd.com> +Acked-by: Alex Deucher <alexander.deucher@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 insertions(+) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h +index 5587fac671bb..68959b923f89 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h +@@ -48,6 +48,8 @@ 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,6 +113,8 @@ 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, +@@ -178,6 +182,10 @@ 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 5e9e53143a8e..a8e92638a2e8 100644 +--- a/drivers/gpu/drm/amd/amdgpu/vega10_reg_init.c ++++ b/drivers/gpu/drm/amd/amdgpu/vega10_reg_init.c +@@ -67,6 +67,8 @@ 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 fb6398e38be9..0db84386252a 100644 +--- a/drivers/gpu/drm/amd/amdgpu/vega20_reg_init.c ++++ b/drivers/gpu/drm/amd/amdgpu/vega20_reg_init.c +@@ -65,6 +65,8 @@ 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 + |