amd-drm-fixes-6.2-2023-02-15: amdgpu: - Fix GC11.x suspend warning - Fix display warning
Unified · Split
| @@ -4268,6 +4268,9 @@ exit: · 4267 unmodified lines | ||
| 4268 | 4268 | } |
| 4269 | 4269 | adev->in_suspend = false; |
| 4270 | 4270 | |
| 4271 | + if (adev->enable_mes) | |
| 4272 | + amdgpu_mes_self_test(adev); | |
| 4273 | + | |
| 4271 | 4274 | if (amdgpu_acpi_smart_shift_update(dev, AMDGPU_SS_DEV_D0)) |
| 4272 | 4275 | DRM_WARN("smart shift update failed\n"); |
| 4273 | 4276 | |
| @@ -1344,7 +1344,7 @@ static int mes_v11_0_late_init(void *handle) · 1343 unmodified lines | ||
| 1344 | 1344 | struct amdgpu_device *adev = (struct amdgpu_device *)handle; |
| 1345 | 1345 | |
| 1346 | 1346 | /* it's only intended for use in mes_self_test case, not for s0ix and reset */ |
| 1347 | − if (!amdgpu_in_reset(adev) && !adev->in_s0ix && | |
| 1347 | + if (!amdgpu_in_reset(adev) && !adev->in_s0ix && !adev->in_suspend && | |
| 1348 | 1348 | (adev->ip_versions[GC_HWIP][0] != IP_VERSION(11, 0, 3))) |
| 1349 | 1349 | amdgpu_mes_self_test(adev); |
| 1350 | 1350 | |
| @@ -9658,7 +9658,11 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev, · 9657 unmodified lines | ||
| 9658 | 9658 | * `dcn10_can_pipe_disable_cursor`). By now, all modified planes are in |
| 9659 | 9659 | * atomic state, so call drm helper to normalize zpos. |
| 9660 | 9660 | */ |
| 9661 | − drm_atomic_normalize_zpos(dev, state); | |
| 9661 | + ret = drm_atomic_normalize_zpos(dev, state); | |
| 9662 | + if (ret) { | |
| 9663 | + drm_dbg(dev, "drm_atomic_normalize_zpos() failed\n"); | |
| 9664 | + goto fail; | |
| 9665 | + } | |
| 9662 | 9666 | |
| 9663 | 9667 | /* Remove exiting planes if they are modified */ |
| 9664 | 9668 | for_each_oldnew_plane_in_state_reverse(state, plane, old_plane_state, new_plane_state, i) { |