Commit b3948ad1 authored by Yunxiang Li's avatar Yunxiang Li Committed by Alex Deucher
Browse files

drm/amdgpu: add skip_hw_access checks for sriov 



Accessing registers via host is missing the check for skip_hw_access and
the lockdep check that comes with it.

Signed-off-by: default avatarYunxiang Li <Yunxiang.Li@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent bac640dd

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

+9 −0
Original line number Diff line number Diff line
@@ -979,6 +979,9 @@ u32 amdgpu_virt_rlcg_reg_rw(struct amdgpu_device *adev, u32 offset, u32 v, u32 f 
		return 0;

	}



	if (amdgpu_device_skip_hw_access(adev))

		return 0;



	reg_access_ctrl = &adev->gfx.rlc.reg_access_ctrl[xcc_id];

	scratch_reg0 = (void __iomem *)adev->rmmio + 4 * reg_access_ctrl->scratch_reg0;

	scratch_reg1 = (void __iomem *)adev->rmmio + 4 * reg_access_ctrl->scratch_reg1;
@@ -1055,6 +1058,9 @@ void amdgpu_sriov_wreg(struct amdgpu_device *adev, 
{

	u32 rlcg_flag;



	if (amdgpu_device_skip_hw_access(adev))

		return;



	if (!amdgpu_sriov_runtime(adev) &&

		amdgpu_virt_get_rlcg_reg_access_flag(adev, acc_flags, hwip, true, &rlcg_flag)) {

		amdgpu_virt_rlcg_reg_rw(adev, offset, value, rlcg_flag, xcc_id);
@@ -1072,6 +1078,9 @@ u32 amdgpu_sriov_rreg(struct amdgpu_device *adev, 
{

	u32 rlcg_flag;



	if (amdgpu_device_skip_hw_access(adev))

		return 0;



	if (!amdgpu_sriov_runtime(adev) &&

		amdgpu_virt_get_rlcg_reg_access_flag(adev, acc_flags, hwip, false, &rlcg_flag))

		return amdgpu_virt_rlcg_reg_rw(adev, offset, 0, rlcg_flag, xcc_id);