diff options
| author | Dmitry Torokhov <[email protected]> | 2022-12-12 18:47:03 +0000 |
|---|---|---|
| committer | Dmitry Torokhov <[email protected]> | 2022-12-12 18:47:03 +0000 |
| commit | e291c116f60f3c1ca98090f0f8e7c77e658562fb (patch) | |
| tree | 2fbe810f2a6f8b29f1cdaefd87b24debbfa0ec07 /drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | |
| parent | Input: raydium_ts_i2c - fix memory leak in raydium_i2c_send() (diff) | |
| parent | Input: elants_i2c - delay longer with reset asserted (diff) | |
| download | kernel-e291c116f60f3c1ca98090f0f8e7c77e658562fb.tar.gz kernel-e291c116f60f3c1ca98090f0f8e7c77e658562fb.zip | |
Merge branch 'next' into for-linus
Prepare input updates for 6.2 merge window.
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c index d3558c34d406..3e316b013fd9 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c @@ -405,6 +405,9 @@ bool amdgpu_ring_soft_recovery(struct amdgpu_ring *ring, unsigned int vmid, { ktime_t deadline = ktime_add_us(ktime_get(), 10000); + if (!(ring->adev->amdgpu_reset_level_mask & AMDGPU_RESET_LEVEL_SOFT_RECOVERY)) + return false; + if (amdgpu_sriov_vf(ring->adev) || !ring->funcs->soft_recovery || !fence) return false; |