History

Merge tag 'amd-drm-fixes-6.2-2023-02-15' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes

amd-drm-fixes-6.2-2023-02-15: amdgpu: - Fix GC11.x suspend warning - Fix display warning

Dave Airlie committed 3 years ago

Commit caa068c2 parents ceaa837 2a002993 files · +9 −2Browse files

Unified · Split

3 files
  1. drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +3 −0
  2. drivers/gpu/drm/amd/amdgpu/mes_v11_0.c +1 −1
  3. drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +5 −1
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c+3−0
@@ -4268,6 +4268,9 @@ exit: · 4267 unmodified lines
4268 }4268 }
4269 adev->in_suspend = false;4269 adev->in_suspend = false;
4270 4270
4271 if (adev->enable_mes)
4272 amdgpu_mes_self_test(adev);
4273
4271 if (amdgpu_acpi_smart_shift_update(dev, AMDGPU_SS_DEV_D0))4274 if (amdgpu_acpi_smart_shift_update(dev, AMDGPU_SS_DEV_D0))
4272 DRM_WARN("smart shift update failed\n");4275 DRM_WARN("smart shift update failed\n");
4273 4276
drivers/gpu/drm/amd/amdgpu/mes_v11_0.c+1−1
@@ -1344,7 +1344,7 @@ static int mes_v11_0_late_init(void *handle) · 1343 unmodified lines
1344 struct amdgpu_device *adev = (struct amdgpu_device *)handle;1344 struct amdgpu_device *adev = (struct amdgpu_device *)handle;
1345 1345
1346 /* it's only intended for use in mes_self_test case, not for s0ix and reset */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 (adev->ip_versions[GC_HWIP][0] != IP_VERSION(11, 0, 3)))1348 (adev->ip_versions[GC_HWIP][0] != IP_VERSION(11, 0, 3)))
1349 amdgpu_mes_self_test(adev);1349 amdgpu_mes_self_test(adev);
1350 1350
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c+5−1
@@ -9658,7 +9658,11 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev, · 9657 unmodified lines
9658 * `dcn10_can_pipe_disable_cursor`). By now, all modified planes are in9658 * `dcn10_can_pipe_disable_cursor`). By now, all modified planes are in
9659 * atomic state, so call drm helper to normalize zpos.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 /* Remove exiting planes if they are modified */9667 /* Remove exiting planes if they are modified */
9664 for_each_oldnew_plane_in_state_reverse(state, plane, old_plane_state, new_plane_state, i) {9668 for_each_oldnew_plane_in_state_reverse(state, plane, old_plane_state, new_plane_state, i) {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t