summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSonny Jiang <sonny.jiang@amd.com>2023-10-17 21:12:14 +0300
committerAlex Deucher <alexander.deucher@amd.com>2024-02-13 00:13:39 +0300
commit75a178926c995a58fcb0c20e75decef4c3719cb6 (patch)
tree99631b84edd4f6cecb1daa27adeef133b4a8d6a2
parent785e53a83be17abb05b54fa6163684786c099af0 (diff)
downloadlinux-75a178926c995a58fcb0c20e75decef4c3719cb6.tar.xz
drm/amdgpu/jpeg5: Enable doorbell
Add doorbell for JPEG5 Signed-off-by: Sonny Jiang <sonny.jiang@amd.com> Reviewed-by: Leo Liu <leo.liu@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c b/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c
index 71c28cc06605..e70200f97555 100644
--- a/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c
@@ -85,7 +85,7 @@ static int jpeg_v5_0_0_sw_init(void *handle)
return r;
ring = adev->jpeg.inst->ring_dec;
- ring->use_doorbell = false;
+ ring->use_doorbell = true;
ring->doorbell_index = (adev->doorbell_index.vcn.vcn_ring0_1 << 1) + 1;
ring->vm_hub = AMDGPU_MMHUB0(0);
@@ -134,6 +134,13 @@ static int jpeg_v5_0_0_hw_init(void *handle)
struct amdgpu_ring *ring = adev->jpeg.inst->ring_dec;
int r;
+ adev->nbio.funcs->vcn_doorbell_range(adev, ring->use_doorbell,
+ (adev->doorbell_index.vcn.vcn_ring0_1 << 1), 0);
+
+ WREG32_SOC15(VCN, 0, regVCN_JPEG_DB_CTRL,
+ ring->doorbell_index << VCN_JPEG_DB_CTRL__OFFSET__SHIFT |
+ VCN_JPEG_DB_CTRL__EN_MASK);
+
r = amdgpu_ring_test_helper(ring);
if (r)
return r;