diff options
| author | Dave Airlie <airlied@redhat.com> | 2022-12-22 04:02:55 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2022-12-22 04:02:56 +0300 |
| commit | fe8f5b2f7bec504021b395d24f7efca415d21e2b (patch) | |
| tree | 8bc3f5af75129a39e6147f7f57335149acb5a603 /drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | |
| parent | 38624d2c972e7692ca59d0d3b97741a3313addb3 (diff) | |
| parent | c1c4a8b217213c1924eabf4f28385bbee9cc50c1 (diff) | |
| download | linux-fe8f5b2f7bec504021b395d24f7efca415d21e2b.tar.xz | |
Merge tag 'amd-drm-fixes-6.2-2022-12-21' of https://gitlab.freedesktop.org/agd5f/linux into drm-next
amd-drm-fixes-6.2-2022-12-21:
amdgpu:
- Avoid large variable on the stack
- S0ix fixes
- SMU 13.x fixes
- VCN fix
- Add missing fence reference
amdkfd:
- Fix init vm error handling
- Fix double release of compute pasid
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221221205828.6093-1-alexander.deucher@amd.com
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/mes_v11_0.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c b/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c index 5459366f49ff..970b066b37bb 100644 --- a/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c +++ b/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c @@ -1342,7 +1342,8 @@ static int mes_v11_0_late_init(void *handle) { struct amdgpu_device *adev = (struct amdgpu_device *)handle; - if (!amdgpu_in_reset(adev) && + /* it's only intended for use in mes_self_test case, not for s0ix and reset */ + if (!amdgpu_in_reset(adev) && !adev->in_s0ix && (adev->ip_versions[GC_HWIP][0] != IP_VERSION(11, 0, 3))) amdgpu_mes_self_test(adev); |