Skip to contentSkip to conversation

amdgpu/jpeg: fix deepsleep register for jpeg 5_0_0 and 5_0_2

PATCH In review David (Ming Qiang) Wu 2 participants 2 messages Apr 2

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

PATCH v4 1/1 amdgpu/jpeg: fix deepsleep register for jpeg 5_0_0 and 5_0_2

PCTL0__MMHUB_DEEPSLEEP_IB is 0x69004 on MMHUB 4,1,0 and and 0x60804 on MMHUB 4,2,0. 0x62a04 is on MMHUB 1,8,0/1.

The DS bits are adjusted to cover more JPEG engines and MMHUB version.

---
 drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c | 52 +++++++++++++++++++++---
 1 file changed, 46 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c +46 -6
index 4b4aa9553624..82abe181c730 100644
@@ -736,15 +736,35 @@ static void jpeg_v4_0_3_dec_ring_set_wptr(struct amdgpu_ring *ring)
  */
 void jpeg_v4_0_3_dec_ring_insert_start(struct amdgpu_ring *ring)
 {
-	if (!amdgpu_sriov_vf(ring->adev)) {
+	struct amdgpu_device *adev = ring->adev;
+
+	if (!amdgpu_sriov_vf(adev)) {
+		int jpeg_inst = GET_INST(JPEG, ring->me);
+		uint32_t value = 0x80004000; /* default DS14 */
+
 		amdgpu_ring_write(ring, PACKETJ(regUVD_JRBC_EXTERNAL_REG_INTERNAL_OFFSET,
 			0, 0, PACKETJ_TYPE0));
-		amdgpu_ring_write(ring, 0x62a04); /* PCTL0_MMHUB_DEEPSLEEP_IB */
+
+		/* PCTL0__MMHUB_DEEPSLEEP_IB could be different on different mmhub version */
+		switch (amdgpu_ip_version(adev, MMHUB_HWIP, 0)) {
+		case IP_VERSION(4, 1, 0):
+			amdgpu_ring_write(ring, 0x69004);
+			value = 0x80010000;
+			break;
+		case IP_VERSION(4, 2, 0):
+			amdgpu_ring_write(ring, 0x60804);
+			if (jpeg_inst & 1)
+				value = 0x80010000;
+			break;
+		default:
+			amdgpu_ring_write(ring, 0x62a04);
+			break;
+		}
 
 		amdgpu_ring_write(ring,
 				  PACKETJ(JRBC_DEC_EXTERNAL_REG_WRITE_ADDR, 0,
 					  0, PACKETJ_TYPE0));
-		amdgpu_ring_write(ring, 0x80004000);
+		amdgpu_ring_write(ring, value);
 	}
 }
 
@@ -757,15 +777,35 @@ void jpeg_v4_0_3_dec_ring_insert_start(struct amdgpu_ring *ring)
  */
 void jpeg_v4_0_3_dec_ring_insert_end(struct amdgpu_ring *ring)
 {
-	if (!amdgpu_sriov_vf(ring->adev)) {
+	struct amdgpu_device *adev = ring->adev;
+
+	if (!amdgpu_sriov_vf(adev)) {
+		int jpeg_inst = GET_INST(JPEG, ring->me);
+		uint32_t value = 0x00004000; /* default DS14 */
+
 		amdgpu_ring_write(ring, PACKETJ(regUVD_JRBC_EXTERNAL_REG_INTERNAL_OFFSET,
 			0, 0, PACKETJ_TYPE0));
-		amdgpu_ring_write(ring, 0x62a04);
+
+		/* PCTL0__MMHUB_DEEPSLEEP_IB could be different on different mmhub version */
+		switch (amdgpu_ip_version(adev, MMHUB_HWIP, 0)) {
+		case IP_VERSION(4, 1, 0):
+			amdgpu_ring_write(ring, 0x69004);
+			value = 0x00010000;
+			break;
+		case IP_VERSION(4, 2, 0):
+			amdgpu_ring_write(ring, 0x60804);
+			if (jpeg_inst & 1)
+				value = 0x00010000;
+			break;
+		default:
+			amdgpu_ring_write(ring, 0x62a04);
+			break;
+		}
 
 		amdgpu_ring_write(ring,
 				  PACKETJ(JRBC_DEC_EXTERNAL_REG_WRITE_ADDR, 0,
 					  0, PACKETJ_TYPE0));
-		amdgpu_ring_write(ring, 0x00004000);
+		amdgpu_ring_write(ring, value);
 	}
 }
 
Signature · 1 line
2.43.0
maintainer Reviewed-by on v4 1/1
#1 lore raw

[Public]

Quoted 9 lines

-----Original Message-----
From: Wu, David <[email protected]>
Sent: Thursday, April 2, 2026 5:44 PM
To: [email protected]; Deucher, Alexander <[email protected]>; Lazar, Lijo <[email protected]>
Cc: Liu, Leo <[email protected]>
Subject: [PATCH V4] amdgpu/jpeg: fix deepsleep register for jpeg 5_0_0 and 5_0_2

Quoted 6 lines

PCTL0__MMHUB_DEEPSLEEP_IB is 0x69004 on MMHUB 4,1,0 and and 0x60804 on MMHUB 4,2,0. 0x62a04 is on MMHUB 1,8,0/1.

The DS bits are adjusted to cover more JPEG engines and MMHUB version.

Quoted 97 lines
---
 drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c | 52
+++++++++++++++++++++---
 1 file changed, 46 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c +6 -2
index 4b4aa9553624..82abe181c730 100644
@@ -736,15 +736,35 @@ static void jpeg_v4_0_3_dec_ring_set_wptr(struct
 amdgpu_ring *ring)
  */
 void jpeg_v4_0_3_dec_ring_insert_start(struct amdgpu_ring *ring)  {
-     if (!amdgpu_sriov_vf(ring->adev)) {
+     struct amdgpu_device *adev = ring->adev;
+
+     if (!amdgpu_sriov_vf(adev)) {
+             int jpeg_inst = GET_INST(JPEG, ring->me);
+             uint32_t value = 0x80004000; /* default DS14 */
+
              amdgpu_ring_write(ring,
 PACKETJ(regUVD_JRBC_EXTERNAL_REG_INTERNAL_OFFSET,
                      0, 0, PACKETJ_TYPE0));
-             amdgpu_ring_write(ring, 0x62a04); /*

PCTL0_MMHUB_DEEPSLEEP_IB */

drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c +2 -0
+
+             /* PCTL0__MMHUB_DEEPSLEEP_IB could be different on

different mmhub version */

drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c +14 -0
+             switch (amdgpu_ip_version(adev, MMHUB_HWIP, 0)) {
+             case IP_VERSION(4, 1, 0):
+                     amdgpu_ring_write(ring, 0x69004);
+                     value = 0x80010000;
+                     break;
+             case IP_VERSION(4, 2, 0):
+                     amdgpu_ring_write(ring, 0x60804);
+                     if (jpeg_inst & 1)
+                             value = 0x80010000;
+                     break;
+             default:
+                     amdgpu_ring_write(ring, 0x62a04);
+                     break;
+             }
 
              amdgpu_ring_write(ring,

PACKETJ(JRBC_DEC_EXTERNAL_REG_WRITE_ADDR, 0,

                                        0, PACKETJ_TYPE0));
drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c +9 -3
-             amdgpu_ring_write(ring, 0x80004000);
+             amdgpu_ring_write(ring, value);
      }
 }
@@ -757,15 +777,35 @@ void jpeg_v4_0_3_dec_ring_insert_start(struct
 amdgpu_ring *ring)
  */
 void jpeg_v4_0_3_dec_ring_insert_end(struct amdgpu_ring *ring)  {
-     if (!amdgpu_sriov_vf(ring->adev)) {
+     struct amdgpu_device *adev = ring->adev;
+
+     if (!amdgpu_sriov_vf(adev)) {
+             int jpeg_inst = GET_INST(JPEG, ring->me);
+             uint32_t value = 0x00004000; /* default DS14 */
+
              amdgpu_ring_write(ring,
 PACKETJ(regUVD_JRBC_EXTERNAL_REG_INTERNAL_OFFSET,
                      0, 0, PACKETJ_TYPE0));
-             amdgpu_ring_write(ring, 0x62a04);
+
+             /* PCTL0__MMHUB_DEEPSLEEP_IB could be different on

different mmhub version */

drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c +14 -0
+             switch (amdgpu_ip_version(adev, MMHUB_HWIP, 0)) {
+             case IP_VERSION(4, 1, 0):
+                     amdgpu_ring_write(ring, 0x69004);
+                     value = 0x00010000;
+                     break;
+             case IP_VERSION(4, 2, 0):
+                     amdgpu_ring_write(ring, 0x60804);
+                     if (jpeg_inst & 1)
+                             value = 0x00010000;
+                     break;
+             default:
+                     amdgpu_ring_write(ring, 0x62a04);
+                     break;
+             }
 
              amdgpu_ring_write(ring,

PACKETJ(JRBC_DEC_EXTERNAL_REG_WRITE_ADDR, 0,

                                        0, PACKETJ_TYPE0));
drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c +1 -2
-             amdgpu_ring_write(ring, 0x00004000);
+             amdgpu_ring_write(ring, value);
      }
 }
 
--

2.43.0