Commit 4731d5e8 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-fixes-6.15-2025-05-22' of... 

Merge tag 'amd-drm-fixes-6.15-2025-05-22' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-fixes

amd-drm-fixes-6.15-2025-05-22:

amdgpu:
- Hibernate fix

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Alex Deucher <alexander.deucher@amd.com>
Link: https://lore.kernel.org/r/20250522183941.9606-1-alexander.deucher@amd.com
parents 79061ca8 7e7cb7a1

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

+0 −5
Original line number Diff line number Diff line
@@ -3469,11 +3469,6 @@ static int dm_resume(struct amdgpu_ip_block *ip_block) 


		return 0;

	}



	/* leave display off for S4 sequence */

	if (adev->in_s4)

		return 0;



	/* Recreate dc_state - DC invalidates it when setting power state to S3. */

	dc_state_release(dm_state->context);

	dm_state->context = dc_state_create(dm->dc, NULL);