Commit caa068c9 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-fixes-6.2-2023-02-15' of... 

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

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230216041122.7714-1-alexander.deucher@amd.com
parents ceaa837f 2a00299e

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

+3 −0
Original line number Diff line number Diff line
@@ -4268,6 +4268,9 @@ int amdgpu_device_resume(struct drm_device *dev, bool fbcon) 
	}

	adev->in_suspend = false;



	if (adev->enable_mes)

		amdgpu_mes_self_test(adev);



	if (amdgpu_acpi_smart_shift_update(dev, AMDGPU_SS_DEV_D0))

		DRM_WARN("smart shift update failed\n");

drivers/gpu/drm/amd/amdgpu/mes_v11_0.c

+1 −1
Original line number Diff line number Diff line
@@ -1344,7 +1344,7 @@ static int mes_v11_0_late_init(void *handle) 
	struct amdgpu_device *adev = (struct amdgpu_device *)handle;



	/* it's only intended for use in mes_self_test case, not for s0ix and reset */

	if (!amdgpu_in_reset(adev) && !adev->in_s0ix &&

	if (!amdgpu_in_reset(adev) && !adev->in_s0ix && !adev->in_suspend &&

	    (adev->ip_versions[GC_HWIP][0] != IP_VERSION(11, 0, 3)))

		amdgpu_mes_self_test(adev);

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+5 −1
Original line number Diff line number Diff line
@@ -9658,7 +9658,11 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev, 
	 * `dcn10_can_pipe_disable_cursor`). By now, all modified planes are in

	 * atomic state, so call drm helper to normalize zpos.

	 */

	drm_atomic_normalize_zpos(dev, state);

	ret = drm_atomic_normalize_zpos(dev, state);

	if (ret) {

		drm_dbg(dev, "drm_atomic_normalize_zpos() failed\n");

		goto fail;

	}



	/* Remove exiting planes if they are modified */

	for_each_oldnew_plane_in_state_reverse(state, plane, old_plane_state, new_plane_state, i) {