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

Merge tag 'amd-drm-fixes-5.14-2021-07-28' of... 

Merge tag 'amd-drm-fixes-5.14-2021-07-28' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-fixes

amd-drm-fixes-5.14-2021-07-28:

amdgpu:
- Fix resource leak in an error path
- Avoid stack contents exposure in error path
- pmops check fix for S0ix vs S3
- DCN 2.1 display fixes
- DCN 2.0 display fix
- Backlight control fix for laptops with HDR panels
- Maintainers updates

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210729025817.4145-1-alexander.deucher@amd.com
parents 80c7917d ec30ce41

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -15468,6 +15468,8 @@ M: Pan, Xinhui <Xinhui.Pan@amd.com> 
L:	amd-gfx@lists.freedesktop.org

S:	Supported

T:	git https://gitlab.freedesktop.org/agd5f/linux.git

B:	https://gitlab.freedesktop.org/drm/amd/-/issues

C:	irc://irc.oftc.net/radeon

F:	drivers/gpu/drm/amd/

F:	drivers/gpu/drm/radeon/

F:	include/uapi/drm/amdgpu_drm.h

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

+2 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <linux/slab.h>

#include <linux/power_supply.h>

#include <linux/pm_runtime.h>

#include <linux/suspend.h>

#include <acpi/video.h>

#include <acpi/actbl.h>
@@ -1042,7 +1043,7 @@ bool amdgpu_acpi_is_s0ix_supported(struct amdgpu_device *adev) 
#if defined(CONFIG_AMD_PMC) || defined(CONFIG_AMD_PMC_MODULE)

	if (acpi_gbl_FADT.flags & ACPI_FADT_LOW_POWER_S0) {

		if (adev->flags & AMD_IS_APU)

			return true;

			return pm_suspend_target_state == PM_SUSPEND_TO_IDLE;

	}

#endif

	return false;

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

+2 −6
Original line number Diff line number Diff line
@@ -3504,13 +3504,13 @@ int amdgpu_device_init(struct amdgpu_device *adev, 
	r = amdgpu_device_get_job_timeout_settings(adev);

	if (r) {

		dev_err(adev->dev, "invalid lockup_timeout parameter syntax\n");

		goto failed_unmap;

		return r;

	}



	/* early init functions */

	r = amdgpu_device_ip_early_init(adev);

	if (r)

		goto failed_unmap;

		return r;



	/* doorbell bar mapping and doorbell index init*/

	amdgpu_device_doorbell_init(adev);
@@ -3736,10 +3736,6 @@ int amdgpu_device_init(struct amdgpu_device *adev, 
failed:

	amdgpu_vf_error_trans_all(adev);



failed_unmap:

	iounmap(adev->rmmio);

	adev->rmmio = NULL;



	return r;

}

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

+3 −4
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ static int psp_v12_0_init_microcode(struct psp_context *psp) 


	err = psp_init_asd_microcode(psp, chip_name);

	if (err)

		goto out;

		return err;



	snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_ta.bin", chip_name);

	err = request_firmware(&adev->psp.ta_fw, fw_name, adev->dev);
@@ -80,7 +80,7 @@ static int psp_v12_0_init_microcode(struct psp_context *psp) 
	} else {

		err = amdgpu_ucode_validate(adev->psp.ta_fw);

		if (err)

			goto out2;

			goto out;



		ta_hdr = (const struct ta_firmware_header_v1_0 *)

				 adev->psp.ta_fw->data;
@@ -105,10 +105,9 @@ static int psp_v12_0_init_microcode(struct psp_context *psp) 


	return 0;



out2:

out:

	release_firmware(adev->psp.ta_fw);

	adev->psp.ta_fw = NULL;

out:

	if (err) {

		dev_err(adev->dev,

			"psp v12.0: Failed to load firmware \"%s\"\n",

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

+2 −2
Original line number Diff line number Diff line
@@ -2429,9 +2429,9 @@ static void update_connector_ext_caps(struct amdgpu_dm_connector *aconnector) 
	max_cll = conn_base->hdr_sink_metadata.hdmi_type1.max_cll;

	min_cll = conn_base->hdr_sink_metadata.hdmi_type1.min_cll;



	if (caps->ext_caps->bits.oled == 1 ||

	if (caps->ext_caps->bits.oled == 1 /*||

	    caps->ext_caps->bits.sdr_aux_backlight_control == 1 ||

	    caps->ext_caps->bits.hdr_aux_backlight_control == 1)

	    caps->ext_caps->bits.hdr_aux_backlight_control == 1*/)

		caps->aux_support = true;



	if (amdgpu_backlight == 0)