mirror of
https://github.com/nxp-imx/linux-imx.git
synced 2025-07-11 20:05:22 +02:00
drm/amdgpu: Add lock around VF RLCG interface
[ Upstream commit e864180ee4
]
flush_gpu_tlb may be called from another thread while
device_gpu_recover is running.
Both of these threads access registers through the VF
RLCG interface during VF Full Access. Add a lock around this interface
to prevent race conditions between these threads.
Signed-off-by: Victor Skvortsov <victor.skvortsov@amd.com>
Reviewed-by: Zhigang Luo <zhigang.luo@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
641dac6417
commit
1adb5ebe20
|
@ -3561,6 +3561,7 @@ int amdgpu_device_init(struct amdgpu_device *adev,
|
||||||
mutex_init(&adev->grbm_idx_mutex);
|
mutex_init(&adev->grbm_idx_mutex);
|
||||||
mutex_init(&adev->mn_lock);
|
mutex_init(&adev->mn_lock);
|
||||||
mutex_init(&adev->virt.vf_errors.lock);
|
mutex_init(&adev->virt.vf_errors.lock);
|
||||||
|
mutex_init(&adev->virt.rlcg_reg_lock);
|
||||||
hash_init(adev->mn_hash);
|
hash_init(adev->mn_hash);
|
||||||
mutex_init(&adev->psp.mutex);
|
mutex_init(&adev->psp.mutex);
|
||||||
mutex_init(&adev->notifier_lock);
|
mutex_init(&adev->notifier_lock);
|
||||||
|
|
|
@ -1003,6 +1003,9 @@ static u32 amdgpu_virt_rlcg_reg_rw(struct amdgpu_device *adev, u32 offset, u32 v
|
||||||
scratch_reg1 = (void __iomem *)adev->rmmio + 4 * reg_access_ctrl->scratch_reg1;
|
scratch_reg1 = (void __iomem *)adev->rmmio + 4 * reg_access_ctrl->scratch_reg1;
|
||||||
scratch_reg2 = (void __iomem *)adev->rmmio + 4 * reg_access_ctrl->scratch_reg2;
|
scratch_reg2 = (void __iomem *)adev->rmmio + 4 * reg_access_ctrl->scratch_reg2;
|
||||||
scratch_reg3 = (void __iomem *)adev->rmmio + 4 * reg_access_ctrl->scratch_reg3;
|
scratch_reg3 = (void __iomem *)adev->rmmio + 4 * reg_access_ctrl->scratch_reg3;
|
||||||
|
|
||||||
|
mutex_lock(&adev->virt.rlcg_reg_lock);
|
||||||
|
|
||||||
if (reg_access_ctrl->spare_int)
|
if (reg_access_ctrl->spare_int)
|
||||||
spare_int = (void __iomem *)adev->rmmio + 4 * reg_access_ctrl->spare_int;
|
spare_int = (void __iomem *)adev->rmmio + 4 * reg_access_ctrl->spare_int;
|
||||||
|
|
||||||
|
@ -1058,6 +1061,9 @@ static u32 amdgpu_virt_rlcg_reg_rw(struct amdgpu_device *adev, u32 offset, u32 v
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = readl(scratch_reg0);
|
ret = readl(scratch_reg0);
|
||||||
|
|
||||||
|
mutex_unlock(&adev->virt.rlcg_reg_lock);
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -263,6 +263,8 @@ struct amdgpu_virt {
|
||||||
|
|
||||||
/* the ucode id to signal the autoload */
|
/* the ucode id to signal the autoload */
|
||||||
uint32_t autoload_ucode_id;
|
uint32_t autoload_ucode_id;
|
||||||
|
|
||||||
|
struct mutex rlcg_reg_lock;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct amdgpu_video_codec_info;
|
struct amdgpu_video_codec_info;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user