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

Merge tag 'amd-drm-fixes-5.12-2021-03-03' of... 

Merge tag 'amd-drm-fixes-5.12-2021-03-03' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-fixes

amd-drm-fixes-5.12-2021-03-03:

amdgpu:
- S0ix fix
- Handle new NV12 SKU
- Misc power fixes
- Display uninitialized value fix
- PCIE debugfs register access fix

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

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

+2 −1
Original line number Diff line number Diff line
@@ -903,10 +903,11 @@ void amdgpu_acpi_fini(struct amdgpu_device *adev) 
 */

bool amdgpu_acpi_is_s0ix_supported(struct amdgpu_device *adev)

{

#if defined(CONFIG_AMD_PMC)

	if (acpi_gbl_FADT.flags & ACPI_FADT_LOW_POWER_S0) {

		if (adev->flags & AMD_IS_APU)

			return true;

	}



#endif

	return false;

}

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

+2 −2
Original line number Diff line number Diff line
@@ -357,7 +357,7 @@ static ssize_t amdgpu_debugfs_regs_pcie_read(struct file *f, char __user *buf, 
	while (size) {

		uint32_t value;



		value = RREG32_PCIE(*pos >> 2);

		value = RREG32_PCIE(*pos);

		r = put_user(value, (uint32_t *)buf);

		if (r) {

			pm_runtime_mark_last_busy(adev_to_drm(adev)->dev);
@@ -424,7 +424,7 @@ static ssize_t amdgpu_debugfs_regs_pcie_write(struct file *f, const char __user 
			return r;

		}



		WREG32_PCIE(*pos >> 2, value);

		WREG32_PCIE(*pos, value);



		result += 4;

		buf += 4;

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

+0 −2
Original line number Diff line number Diff line
@@ -173,8 +173,6 @@ int amdgpu_driver_load_kms(struct amdgpu_device *adev, unsigned long flags) 
		switch (adev->asic_type) {

		case CHIP_VEGA20:

		case CHIP_ARCTURUS:

		case CHIP_SIENNA_CICHLID:

		case CHIP_NAVY_FLOUNDER:

			/* enable runpm if runpm=1 */

			if (amdgpu_runtime_pm > 0)

				adev->runpm = true;

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

+4 −2
Original line number Diff line number Diff line
@@ -558,7 +558,8 @@ static bool nv_is_headless_sku(struct pci_dev *pdev) 
{

	if ((pdev->device == 0x731E &&

	    (pdev->revision == 0xC6 || pdev->revision == 0xC7)) ||

	    (pdev->device == 0x7340 && pdev->revision == 0xC9))

	    (pdev->device == 0x7340 && pdev->revision == 0xC9)  ||

	    (pdev->device == 0x7360 && pdev->revision == 0xC7))

		return true;

	return false;

}
@@ -634,6 +635,7 @@ int nv_set_ip_blocks(struct amdgpu_device *adev) 
		if (adev->firmware.load_type == AMDGPU_FW_LOAD_DIRECT &&

		    !amdgpu_sriov_vf(adev))

			amdgpu_device_ip_block_add(adev, &smu_v11_0_ip_block);

		if (!nv_is_headless_sku(adev->pdev))

		        amdgpu_device_ip_block_add(adev, &vcn_v2_0_ip_block);

		if (!amdgpu_sriov_vf(adev))

			amdgpu_device_ip_block_add(adev, &jpeg_v2_0_ip_block);

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

+1 −1
Original line number Diff line number Diff line
@@ -530,7 +530,7 @@ bool dm_helpers_dp_write_dsc_enable( 
{

	uint8_t enable_dsc = enable ? 1 : 0;

	struct amdgpu_dm_connector *aconnector;

	uint8_t ret;

	uint8_t ret = 0;



	if (!stream)

		return false;