Commit ee7360fc authored by David (Ming Qiang) Wu's avatar David (Ming Qiang) Wu Committed by Alex Deucher
Browse files

drm/amdgpu: read back register after written for VCN v4.0.5 

On VCN v4.0.5 there is a race condition where the WPTR is not
updated after starting from idle when doorbell is used. Adding
register read-back after written at function end is to ensure
all register writes are done before they can be used.

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/12528


Signed-off-by: default avatarDavid (Ming Qiang) Wu <David.Wu3@amd.com>
Reviewed-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Tested-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarRuijing Dong <ruijing.dong@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
(cherry picked from commit 07c9db09)
Cc: stable@vger.kernel.org
parent fe14c0f0

drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c

+8 −0
Original line number Diff line number Diff line
@@ -1023,6 +1023,10 @@ static int vcn_v4_0_5_start_dpg_mode(struct amdgpu_vcn_inst *vinst, 
			ring->doorbell_index << VCN_RB1_DB_CTRL__OFFSET__SHIFT |

			VCN_RB1_DB_CTRL__EN_MASK);



	/* Keeping one read-back to ensure all register writes are done, otherwise

	 * it may introduce race conditions */

	RREG32_SOC15(VCN, inst_idx, regVCN_RB1_DB_CTRL);



	return 0;

}
@@ -1205,6 +1209,10 @@ static int vcn_v4_0_5_start(struct amdgpu_vcn_inst *vinst) 
	WREG32_SOC15(VCN, i, regVCN_RB_ENABLE, tmp);

	fw_shared->sq.queue_mode &= ~(FW_QUEUE_RING_RESET | FW_QUEUE_DPG_HOLD_OFF);



	/* Keeping one read-back to ensure all register writes are done, otherwise

	 * it may introduce race conditions */

	RREG32_SOC15(VCN, i, regVCN_RB_ENABLE);



	return 0;

}