Commit 04d505de authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-next-5.15-2021-07-29' of... 

Merge tag 'amd-drm-next-5.15-2021-07-29' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-next

amd-drm-next-5.15-2021-07-29:

amdgpu:
- VCN/JPEG power down sequencing fixes
- Various navi pcie link handling fixes
- Clockgating fixes
- Yellow Carp fixes
- Beige Goby fixes
- Misc code cleanups
- S0ix fixes
- SMU i2c bus rework
- EEPROM handling rework
- PSP ucode handling cleanup
- SMU error handling rework
- AMD HDMI freesync fixes
- USB PD firmware update rework
- MMIO based vram access rework
- Misc display fixes
- Backlight fixes
- Add initial Cyan Skillfish support
- Overclocking fixes suspend/resume

amdkfd:
- Sysfs leak fix
- Add counters for vm faults and migration
- GPUVM TLB optimizations

radeon:
- Misc fixes

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

From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210730033455.3852-1-alexander.deucher@amd.com
parents f1b79965 544dcd74

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -15481,6 +15481,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/Makefile

+4 −2
Original line number Diff line number Diff line
@@ -57,7 +57,8 @@ amdgpu-y += amdgpu_device.o amdgpu_kms.o \ 
	amdgpu_xgmi.o amdgpu_csa.o amdgpu_ras.o amdgpu_vm_cpu.o \

	amdgpu_vm_sdma.o amdgpu_discovery.o amdgpu_ras_eeprom.o amdgpu_nbio.o \

	amdgpu_umc.o smu_v11_0_i2c.o amdgpu_fru_eeprom.o amdgpu_rap.o \

	amdgpu_fw_attestation.o amdgpu_securedisplay.o amdgpu_hdp.o

	amdgpu_fw_attestation.o amdgpu_securedisplay.o amdgpu_hdp.o \

	amdgpu_eeprom.o



amdgpu-$(CONFIG_PROC_FS) += amdgpu_fdinfo.o
@@ -75,7 +76,7 @@ amdgpu-y += \ 
	vega20_reg_init.o nbio_v7_4.o nbio_v2_3.o nv.o navi10_reg_init.o navi14_reg_init.o \

	arct_reg_init.o navi12_reg_init.o mxgpu_nv.o sienna_cichlid_reg_init.o vangogh_reg_init.o \

	nbio_v7_2.o dimgrey_cavefish_reg_init.o hdp_v4_0.o hdp_v5_0.o aldebaran_reg_init.o aldebaran.o \

	beige_goby_reg_init.o yellow_carp_reg_init.o

	beige_goby_reg_init.o yellow_carp_reg_init.o cyan_skillfish_reg_init.o



# add DF block

amdgpu-y += \
@@ -111,6 +112,7 @@ amdgpu-y += \ 
	psp_v3_1.o \

	psp_v10_0.o \

	psp_v11_0.o \

	psp_v11_0_8.o \

	psp_v12_0.o \

	psp_v13_0.o

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+8 −3
Original line number Diff line number Diff line
@@ -1108,8 +1108,13 @@ void amdgpu_device_fini_sw(struct amdgpu_device *adev); 


int amdgpu_gpu_wait_for_idle(struct amdgpu_device *adev);



void amdgpu_device_mm_access(struct amdgpu_device *adev, loff_t pos,

			     void *buf, size_t size, bool write);

size_t amdgpu_device_aper_access(struct amdgpu_device *adev, loff_t pos,

				 void *buf, size_t size, bool write);



void amdgpu_device_vram_access(struct amdgpu_device *adev, loff_t pos,

			       uint32_t *buf, size_t size, bool write);

			       void *buf, size_t size, bool write);

uint32_t amdgpu_device_rreg(struct amdgpu_device *adev,

			    uint32_t reg, uint32_t acc_flags);

void amdgpu_device_wreg(struct amdgpu_device *adev,
@@ -1385,12 +1390,12 @@ int amdgpu_acpi_smart_shift_update(struct drm_device *dev, enum amdgpu_ss ss_sta 
int amdgpu_acpi_pcie_notify_device_ready(struct amdgpu_device *adev);



void amdgpu_acpi_get_backlight_caps(struct amdgpu_dm_backlight_caps *caps);

bool amdgpu_acpi_is_s0ix_supported(struct amdgpu_device *adev);

bool amdgpu_acpi_is_s0ix_active(struct amdgpu_device *adev);

void amdgpu_acpi_detect(void);

#else

static inline int amdgpu_acpi_init(struct amdgpu_device *adev) { return 0; }

static inline void amdgpu_acpi_fini(struct amdgpu_device *adev) { }

static inline bool amdgpu_acpi_is_s0ix_supported(struct amdgpu_device *adev) { return false; }

static inline bool amdgpu_acpi_is_s0ix_active(struct amdgpu_device *adev) { return false; }

static inline void amdgpu_acpi_detect(void) { }

static inline bool amdgpu_acpi_is_power_shift_control_supported(void) { return false; }

static inline int amdgpu_acpi_power_shift_control(struct amdgpu_device *adev,

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

+26 −28
Original line number Diff line number Diff line
@@ -160,17 +160,28 @@ static int acp_poweron(struct generic_pm_domain *genpd) 
	return 0;

}



static struct device *get_mfd_cell_dev(const char *device_name, int r)

static int acp_genpd_add_device(struct device *dev, void *data)

{

	char auto_dev_name[25];

	struct device *dev;

	struct generic_pm_domain *gpd = data;

	int ret;



	snprintf(auto_dev_name, sizeof(auto_dev_name),

		 "%s.%d.auto", device_name, r);

	dev = bus_find_device_by_name(&platform_bus_type, NULL, auto_dev_name);

	dev_info(dev, "device %s added to pm domain\n", auto_dev_name);

	ret = pm_genpd_add_device(gpd, dev);

	if (ret)

		dev_err(dev, "Failed to add dev to genpd %d\n", ret);



	return ret;

}



static int acp_genpd_remove_device(struct device *dev, void *data)

{

	int ret;



	ret = pm_genpd_remove_device(dev);

	if (ret)

		dev_err(dev, "Failed to remove dev from genpd %d\n", ret);



	return dev;

	/* Continue to remove */

	return 0;

}



/**
@@ -181,11 +192,10 @@ static struct device *get_mfd_cell_dev(const char *device_name, int r) 
 */

static int acp_hw_init(void *handle)

{

	int r, i;

	int r;

	uint64_t acp_base;

	u32 val = 0;

	u32 count = 0;

	struct device *dev;

	struct i2s_platform_data *i2s_pdata = NULL;



	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
@@ -341,15 +351,10 @@ static int acp_hw_init(void *handle) 
	if (r)

		goto failure;



	for (i = 0; i < ACP_DEVS ; i++) {

		dev = get_mfd_cell_dev(adev->acp.acp_cell[i].name, i);

		r = pm_genpd_add_device(&adev->acp.acp_genpd->gpd, dev);

		if (r) {

			dev_err(dev, "Failed to add dev to genpd\n");

	r = device_for_each_child(adev->acp.parent, &adev->acp.acp_genpd->gpd,

				  acp_genpd_add_device);

	if (r)

		goto failure;

		}

	}





	/* Assert Soft reset of ACP */

	val = cgs_read_register(adev->acp.cgs_device, mmACP_SOFT_RESET);
@@ -410,10 +415,8 @@ static int acp_hw_init(void *handle) 
 */

static int acp_hw_fini(void *handle)

{

	int i, ret;

	u32 val = 0;

	u32 count = 0;

	struct device *dev;

	struct amdgpu_device *adev = (struct amdgpu_device *)handle;



	/* return early if no ACP */
@@ -458,13 +461,8 @@ static int acp_hw_fini(void *handle) 
		udelay(100);

	}



	for (i = 0; i < ACP_DEVS ; i++) {

		dev = get_mfd_cell_dev(adev->acp.acp_cell[i].name, i);

		ret = pm_genpd_remove_device(dev);

		/* If removal fails, dont giveup and try rest */

		if (ret)

			dev_err(dev, "remove dev from genpd failed\n");

	}

	device_for_each_child(adev->acp.parent, NULL,

			      acp_genpd_remove_device);



	mfd_remove_devices(adev->acp.parent);

	kfree(adev->acp.acp_res);

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

+6 −5
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>
@@ -853,8 +854,8 @@ int amdgpu_acpi_init(struct amdgpu_device *adev) 
		if (amdgpu_device_has_dc_support(adev)) {

#if defined(CONFIG_DRM_AMD_DC)

			struct amdgpu_display_manager *dm = &adev->dm;

			if (dm->backlight_dev)

				atif->bd = dm->backlight_dev;

			if (dm->backlight_dev[0])

				atif->bd = dm->backlight_dev[0];

#endif

		} else {

			struct drm_encoder *tmp;
@@ -1031,18 +1032,18 @@ void amdgpu_acpi_detect(void) 
}



/**

 * amdgpu_acpi_is_s0ix_supported

 * amdgpu_acpi_is_s0ix_active

 *

 * @adev: amdgpu_device_pointer

 *

 * returns true if supported, false if not.

 */

bool amdgpu_acpi_is_s0ix_supported(struct amdgpu_device *adev)

bool amdgpu_acpi_is_s0ix_active(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;