Skip to contentSkip to conversation

drm/amdgpu/jpeg5: reprogram doorbell setting after power up for each playback

PATCH In review Sonny Jiang 3 participants 3 messages Jun 18, 2024 – Jun 19, 2024

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/amdgpu/jpeg5: reprogram doorbell setting after power up for each playback

From: Sonny Jiang <[email protected]>

Doorbell needs to be configured after power up during each playback

---
 drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c +4 -4
index 68ef29bc70e2..e766b9463759 100644
@@ -137,10 +137,6 @@ static int jpeg_v5_0_0_hw_init(void *handle)
 	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;
@@ -314,6 +310,10 @@ static int jpeg_v5_0_0_start(struct amdgpu_device *adev)
 		JPEG_SYS_INT_EN__DJRBC0_MASK,
 		~JPEG_SYS_INT_EN__DJRBC0_MASK);
 
+	WREG32_SOC15(VCN, 0, regVCN_JPEG_DB_CTRL,
+		ring->doorbell_index << VCN_JPEG_DB_CTRL__OFFSET__SHIFT |
+		VCN_JPEG_DB_CTRL__EN_MASK);
+
 	WREG32_SOC15(JPEG, 0, regUVD_LMI_JRBC_RB_VMID, 0);
 	WREG32_SOC15(JPEG, 0, regUVD_JRBC_RB_CNTL, (0x00000001L | 0x00000002L));
 	WREG32_SOC15(JPEG, 0, regUVD_LMI_JRBC_RB_64BIT_BAR_LOW,
Signature · 1 line
2.45.1
Acked-by on v1 1/1
#1 lore raw
Quoted 6 lines · Sonny Jiang

From: Sonny Jiang <[email protected]>

Doorbell needs to be configured after power up during each playback

Quoted 33 lines
---
 drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c +4 -5
index 68ef29bc70e2..e766b9463759 100644
@@ -137,10 +137,6 @@ static int jpeg_v5_0_0_hw_init(void *handle)
        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;
@@ -314,6 +310,10 @@ static int jpeg_v5_0_0_start(struct amdgpu_device *adev)
                JPEG_SYS_INT_EN__DJRBC0_MASK,
                ~JPEG_SYS_INT_EN__DJRBC0_MASK);
 
+       WREG32_SOC15(VCN, 0, regVCN_JPEG_DB_CTRL,
+               ring->doorbell_index << VCN_JPEG_DB_CTRL__OFFSET__SHIFT |
+               VCN_JPEG_DB_CTRL__EN_MASK);
+
        WREG32_SOC15(JPEG, 0, regUVD_LMI_JRBC_RB_VMID, 0);
        WREG32_SOC15(JPEG, 0, regUVD_JRBC_RB_CNTL, (0x00000001L | 0x00000002L));
        WREG32_SOC15(JPEG, 0, regUVD_LMI_JRBC_RB_64BIT_BAR_LOW,
--

2.45.1

Reviewed-by on v1 1/1
#2 lore raw
In reply to Sonny Jiang

[AMD Official Use Only - AMD Internal Distribution Only]

-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Sonny Jiang
Sent: Wednesday, June 19, 2024 12:40 AM
To: [email protected]
Cc: Jiang, Sonny <[email protected]>
Subject: [PATCH] drm/amdgpu/jpeg5: reprogram doorbell setting after power up for each playback

Caution: This message originated from an External Source. Use proper caution when opening attachments, clicking links, or responding.

From: Sonny Jiang <[email protected]>

Doorbell needs to be configured after power up during each playback

---
 drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c +4 -4
index 68ef29bc70e2..e766b9463759 100644
@@ -137,10 +137,6 @@ static int jpeg_v5_0_0_hw_init(void *handle)
        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;
@@ -314,6 +310,10 @@ static int jpeg_v5_0_0_start(struct amdgpu_device *adev)
                JPEG_SYS_INT_EN__DJRBC0_MASK,
                ~JPEG_SYS_INT_EN__DJRBC0_MASK);
 
+       WREG32_SOC15(VCN, 0, regVCN_JPEG_DB_CTRL,
+               ring->doorbell_index << VCN_JPEG_DB_CTRL__OFFSET__SHIFT |
+               VCN_JPEG_DB_CTRL__EN_MASK);
+
        WREG32_SOC15(JPEG, 0, regUVD_LMI_JRBC_RB_VMID, 0);
        WREG32_SOC15(JPEG, 0, regUVD_JRBC_RB_CNTL, (0x00000001L | 0x00000002L));
        WREG32_SOC15(JPEG, 0, regUVD_LMI_JRBC_RB_64BIT_BAR_LOW,

--
2.45.1