Commit 8b556dde authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-fixes-6.17-2025-09-03' of... 

Merge tag 'amd-drm-fixes-6.17-2025-09-03' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-fixes

amd-drm-fixes-6.17-2025-09-03:

amdgpu:
- UserQ fixes
- MES 11 fix
- eDP/LVDS fix
- Fix non-DC audio clean up
- Fix duplicate cursor issue
- Fix error path in PSP init

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

From: Alex Deucher <alexander.deucher@amd.com>
Link: https://lore.kernel.org/r/20250903221656.251254-1-alexander.deucher@amd.com
parents 40bcf6ec 467e00b3

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

+1 −1
Original line number Diff line number Diff line
@@ -448,7 +448,7 @@ static int psp_sw_init(struct amdgpu_ip_block *ip_block) 
	psp->cmd = kzalloc(sizeof(struct psp_gfx_cmd_resp), GFP_KERNEL);

	if (!psp->cmd) {

		dev_err(adev->dev, "Failed to allocate memory to command buffer!\n");

		ret = -ENOMEM;

		return -ENOMEM;

	}



	adev->psp.xgmi_context.supports_extended_data =

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

+0 −5
Original line number Diff line number Diff line
@@ -1462,17 +1462,12 @@ static int dce_v10_0_audio_init(struct amdgpu_device *adev) 


static void dce_v10_0_audio_fini(struct amdgpu_device *adev)

{

	int i;



	if (!amdgpu_audio)

		return;



	if (!adev->mode_info.audio.enabled)

		return;



	for (i = 0; i < adev->mode_info.audio.num_pins; i++)

		dce_v10_0_audio_enable(adev, &adev->mode_info.audio.pin[i], false);



	adev->mode_info.audio.enabled = false;

}

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

+0 −5
Original line number Diff line number Diff line
@@ -1511,17 +1511,12 @@ static int dce_v11_0_audio_init(struct amdgpu_device *adev) 


static void dce_v11_0_audio_fini(struct amdgpu_device *adev)

{

	int i;



	if (!amdgpu_audio)

		return;



	if (!adev->mode_info.audio.enabled)

		return;



	for (i = 0; i < adev->mode_info.audio.num_pins; i++)

		dce_v11_0_audio_enable(adev, &adev->mode_info.audio.pin[i], false);



	adev->mode_info.audio.enabled = false;

}

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

+0 −5
Original line number Diff line number Diff line
@@ -1451,17 +1451,12 @@ static int dce_v6_0_audio_init(struct amdgpu_device *adev) 


static void dce_v6_0_audio_fini(struct amdgpu_device *adev)

{

	int i;



	if (!amdgpu_audio)

		return;



	if (!adev->mode_info.audio.enabled)

		return;



	for (i = 0; i < adev->mode_info.audio.num_pins; i++)

		dce_v6_0_audio_enable(adev, &adev->mode_info.audio.pin[i], false);



	adev->mode_info.audio.enabled = false;

}

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

+0 −5
Original line number Diff line number Diff line
@@ -1443,17 +1443,12 @@ static int dce_v8_0_audio_init(struct amdgpu_device *adev) 


static void dce_v8_0_audio_fini(struct amdgpu_device *adev)

{

	int i;



	if (!amdgpu_audio)

		return;



	if (!adev->mode_info.audio.enabled)

		return;



	for (i = 0; i < adev->mode_info.audio.num_pins; i++)

		dce_v8_0_audio_enable(adev, &adev->mode_info.audio.pin[i], false);



	adev->mode_info.audio.enabled = false;

}