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

Merge tag 'amd-drm-fixes-5.14-2021-08-05' of... 

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

 into drm-fixes

amd-drm-fixes-5.14-2021-08-05:

amdgpu:
- Fix potential out-of-bounds read when updating GPUVM mapping
- Renoir powergating fix
- Yellow Carp updates
- 8K fix for navi1x
- Beige Goby updates and new DIDs
- Fix DMUB firmware version output
- EDP fix
- pmops config fix

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

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

+1 −1
Original line number Diff line number Diff line
@@ -1040,7 +1040,7 @@ void amdgpu_acpi_detect(void) 
 */

bool amdgpu_acpi_is_s0ix_supported(struct amdgpu_device *adev)

{

#if defined(CONFIG_AMD_PMC) || defined(CONFIG_AMD_PMC_MODULE)

#if IS_ENABLED(CONFIG_AMD_PMC) && IS_ENABLED(CONFIG_PM_SLEEP)

	if (acpi_gbl_FADT.flags & ACPI_FADT_LOW_POWER_S0) {

		if (adev->flags & AMD_IS_APU)

			return pm_suspend_target_state == PM_SUSPEND_TO_IDLE;

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

+7 −0
Original line number Diff line number Diff line
@@ -1213,6 +1213,13 @@ static const struct pci_device_id pciidlist[] = { 
	{0x1002, 0x740F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ALDEBARAN|AMD_EXP_HW_SUPPORT},

	{0x1002, 0x7410, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ALDEBARAN|AMD_EXP_HW_SUPPORT},



	/* BEIGE_GOBY */

	{0x1002, 0x7420, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BEIGE_GOBY},

	{0x1002, 0x7421, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BEIGE_GOBY},

	{0x1002, 0x7422, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BEIGE_GOBY},

	{0x1002, 0x7423, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BEIGE_GOBY},

	{0x1002, 0x743F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BEIGE_GOBY},



	{0, 0, 0}

};

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

+2 −1
Original line number Diff line number Diff line
@@ -54,11 +54,12 @@ static inline void amdgpu_res_first(struct ttm_resource *res, 
{

	struct drm_mm_node *node;



	if (!res) {

	if (!res || res->mem_type == TTM_PL_SYSTEM) {

		cur->start = start;

		cur->size = size;

		cur->remaining = size;

		cur->node = NULL;

		WARN_ON(res && start + size > res->num_pages << PAGE_SHIFT);

		return;

	}

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

+20 −1
Original line number Diff line number Diff line
@@ -1295,6 +1295,16 @@ static bool is_raven_kicker(struct amdgpu_device *adev) 
		return false;

}



static bool check_if_enlarge_doorbell_range(struct amdgpu_device *adev)

{

	if ((adev->asic_type == CHIP_RENOIR) &&

	    (adev->gfx.me_fw_version >= 0x000000a5) &&

	    (adev->gfx.me_feature_version >= 52))

		return true;

	else

		return false;

}



static void gfx_v9_0_check_if_need_gfxoff(struct amdgpu_device *adev)

{

	if (gfx_v9_0_should_disable_gfxoff(adev->pdev))
@@ -3675,6 +3685,15 @@ static int gfx_v9_0_kiq_init_register(struct amdgpu_ring *ring) 
	if (ring->use_doorbell) {

		WREG32_SOC15(GC, 0, mmCP_MEC_DOORBELL_RANGE_LOWER,

					(adev->doorbell_index.kiq * 2) << 2);

		/* If GC has entered CGPG, ringing doorbell > first page

		 * doesn't wakeup GC. Enlarge CP_MEC_DOORBELL_RANGE_UPPER to

		 * workaround this issue. And this change has to align with firmware

		 * update.

		 */

		if (check_if_enlarge_doorbell_range(adev))

			WREG32_SOC15(GC, 0, mmCP_MEC_DOORBELL_RANGE_UPPER,

					(adev->doorbell.size - 4));

		else

			WREG32_SOC15(GC, 0, mmCP_MEC_DOORBELL_RANGE_UPPER,

					(adev->doorbell_index.userqueue_end * 2) << 2);

	}

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

+1 −1
Original line number Diff line number Diff line
@@ -1548,6 +1548,7 @@ static int dm_dmub_sw_init(struct amdgpu_device *adev) 
	}



	hdr = (const struct dmcub_firmware_header_v1_0 *)adev->dm.dmub_fw->data;

	adev->dm.dmcub_fw_version = le32_to_cpu(hdr->header.ucode_version);



	if (adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) {

		adev->firmware.ucode[AMDGPU_UCODE_ID_DMCUB].ucode_id =
@@ -1561,7 +1562,6 @@ static int dm_dmub_sw_init(struct amdgpu_device *adev) 
			 adev->dm.dmcub_fw_version);

	}



	adev->dm.dmcub_fw_version = le32_to_cpu(hdr->header.ucode_version);



	adev->dm.dmub_srv = kzalloc(sizeof(*adev->dm.dmub_srv), GFP_KERNEL);

	dmub_srv = adev->dm.dmub_srv;