drm/amdgpu/jpeg2.5: Remove JPEG_ENC_MASK from clock ungating
Subsystems (2)
PATCH 1/2 drm/amdgpu/jpeg2.5: Remove JPEG_ENC_MASK from clock ungating
Remove JPEG_ENC_MASK from clock ungating since MJPEG encoder hasn't been support yet.
--- drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 1 - 1 file changed, 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c +0 -1
@@ -268,7 +268,6 @@ static void jpeg_v2_5_disable_clock_gating(struct amdgpu_device* adev, int inst) data =RREG32_SOC15 (JPEG , inst, mmJPEG_CGC_GATE); data &= ~(JPEG_CGC_GATE__JPEG_DEC_MASK |JPEG_CGC_GATE__JPEG2_DEC_MASK - |JPEG_CGC_GATE__JPEG_ENC_MASK |JPEG_CGC_GATE__JMCIF_MASK |JPEG_CGC_GATE__JRBBM_MASK );WREG32_SOC15 (JPEG , inst, mmJPEG_CGC_GATE, data);
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/2 drm/amdgpu/vcn2.5: Remove old DPG workaround
SCRATCH2 is used to keep decode wptr as a workaround which fix a hardware DPG decode wptr update bug for vcn2.5 beforehand.
--- drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 9 --------- 1 file changed, 9 deletions(-)
drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c +0 -9
@@ -1453,11 +1453,6 @@ static int vcn_v2_5_pause_dpg_mode(struct amdgpu_device *adev,WREG32_SOC15 (VCN , inst_idx, mmUVD_RB_WPTR2,lower_32_bits (ring->wptr)); fw_shared->multi_queue.encode_lowlatency_queue_mode &= ~FW_QUEUE_RING_RESET ; - fw_shared->multi_queue.decode_queue_mode |=FW_QUEUE_RING_RESET ; -WREG32_SOC15 (VCN , inst_idx, mmUVD_RBC_RB_WPTR, -RREG32_SOC15 (VCN , inst_idx, mmUVD_SCRATCH2) &0x7FFFFFFF ); - fw_shared->multi_queue.decode_queue_mode &= ~FW_QUEUE_RING_RESET ; -/* Unstall DPG */ WREG32_P (SOC15_REG_OFFSET (VCN , inst_idx, mmUVD_POWER_STATUS),0 , ~UVD_POWER_STATUS__STALL_DPG_POWER_UP_MASK );
@@ -1519,10 +1514,6 @@ static void vcn_v2_5_dec_ring_set_wptr(struct amdgpu_ring *ring) {struct amdgpu_device *adev = ring->adev; -if (adev->pg_flags &AMD_PG_SUPPORT_VCN_DPG ) -WREG32_SOC15 (VCN , ring->me, mmUVD_SCRATCH2, -lower_32_bits (ring->wptr) |0x80000000 ); -if (ring->use_doorbell) { adev->wb.wb[ring->wptr_offs] =lower_32_bits (ring->wptr);WDOORBELL32 (ring->doorbell_index,lower_32_bits (ring->wptr));
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
RE: [PATCH 2/2] drm/amdgpu/vcn2.5: Remove old DPG workaround
The 2 patches are:
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of James Zhu
Sent: May 19, 2020 10:42 AM
To: [email protected]
Cc: Zhu, James <[email protected]>
Subject: [PATCH 2/2] drm/amdgpu/vcn2.5: Remove old DPG workaround
SCRATCH2 is used to keep decode wptr as a workaround which fix a hardware DPG decode wptr update bug for vcn2.5 beforehand.
--- drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 9 --------- 1 file changed, 9 deletions(-)
drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c +0 -10
@@ -1453,11 +1453,6 @@ static int vcn_v2_5_pause_dpg_mode(struct amdgpu_device *adev,WREG32_SOC15 (VCN , inst_idx, mmUVD_RB_WPTR2,lower_32_bits (ring->wptr)); fw_shared->multi_queue.encode_lowlatency_queue_mode &= ~FW_QUEUE_RING_RESET ; - fw_shared->multi_queue.decode_queue_mode |=FW_QUEUE_RING_RESET ; -WREG32_SOC15 (VCN , inst_idx, mmUVD_RBC_RB_WPTR, -RREG32_SOC15 (VCN , inst_idx, mmUVD_SCRATCH2) &0x7FFFFFFF ); - fw_shared->multi_queue.decode_queue_mode &= ~FW_QUEUE_RING_RESET ; -/* Unstall DPG */ WREG32_P (SOC15_REG_OFFSET (VCN , inst_idx, mmUVD_POWER_STATUS),0 , ~UVD_POWER_STATUS__STALL_DPG_POWER_UP_MASK );
@@ -1519,10 +1514,6 @@ static void vcn_v2_5_dec_ring_set_wptr(struct amdgpu_ring *ring) {struct amdgpu_device *adev = ring->adev; -if (adev->pg_flags &AMD_PG_SUPPORT_VCN_DPG ) -WREG32_SOC15 (VCN , ring->me, mmUVD_SCRATCH2, -lower_32_bits (ring->wptr) |0x80000000 ); -if (ring->use_doorbell) { adev->wb.wb[ring->wptr_offs] =lower_32_bits (ring->wptr);WDOORBELL32 (ring->doorbell_index,lower_32_bits (ring->wptr)); --
2.7.4
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=02%7C01%7Cleo.liu%40amd.com%7C285abea632d14d797dc808d7fc02c54d%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637254961773506391&sdata=isg1c3TJ392Qeos%2ByhO4zopT3Y%2BWA4G9VGKBd1pLT8M%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx