Commit 132d7c8a authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-fixes-5.9-2020-09-30' of... 

Merge tag 'amd-drm-fixes-5.9-2020-09-30' of git://people.freedesktop.org/~agd5f/linux

 into drm-fixes

amd-drm-fixes-5.9-2020-09-30:

amdgpu:
- Fix potential double free in userptr handling
- Sienna Cichlid and Navy Flounder udpates
- Add Sienna Cichlid PCI IDs
- Drop experimental flag for navi12
- Raven fixes
- Renoir fixes
- HDCP fix
- DCN3 fix for clang and older versions of gcc
- Fix a runtime pm refcount issue

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200930161326.4243-1-alexander.deucher@amd.com
parents 6f4fc18f 95433a13

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

+2 −8
Original line number Diff line number Diff line
@@ -80,8 +80,6 @@ MODULE_FIRMWARE("amdgpu/renoir_gpu_info.bin"); 
MODULE_FIRMWARE("amdgpu/navi10_gpu_info.bin");

MODULE_FIRMWARE("amdgpu/navi14_gpu_info.bin");

MODULE_FIRMWARE("amdgpu/navi12_gpu_info.bin");

MODULE_FIRMWARE("amdgpu/sienna_cichlid_gpu_info.bin");

MODULE_FIRMWARE("amdgpu/navy_flounder_gpu_info.bin");



#define AMDGPU_RESUME_MS		2000
@@ -1600,6 +1598,8 @@ static int amdgpu_device_parse_gpu_info_fw(struct amdgpu_device *adev) 
	case CHIP_CARRIZO:

	case CHIP_STONEY:

	case CHIP_VEGA20:

	case CHIP_SIENNA_CICHLID:

	case CHIP_NAVY_FLOUNDER:

	default:

		return 0;

	case CHIP_VEGA10:
@@ -1631,12 +1631,6 @@ static int amdgpu_device_parse_gpu_info_fw(struct amdgpu_device *adev) 
	case CHIP_NAVI12:

		chip_name = "navi12";

		break;

	case CHIP_SIENNA_CICHLID:

		chip_name = "sienna_cichlid";

		break;

	case CHIP_NAVY_FLOUNDER:

		chip_name = "navy_flounder";

		break;

	}



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

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

+1 −1
Original line number Diff line number Diff line
@@ -297,7 +297,7 @@ int amdgpu_display_crtc_set_config(struct drm_mode_set *set, 
	   take the current one */

	if (active && !adev->have_disp_power_ref) {

		adev->have_disp_power_ref = true;

		goto out;

		return ret;

	}

	/* if we have no active crtcs, then drop the power ref

	   we got before */

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

+10 −2
Original line number Diff line number Diff line
@@ -1044,8 +1044,16 @@ static const struct pci_device_id pciidlist[] = { 
	{0x1002, 0x1636, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RENOIR|AMD_IS_APU},



	/* Navi12 */

	{0x1002, 0x7360, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_NAVI12|AMD_EXP_HW_SUPPORT},

	{0x1002, 0x7362, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_NAVI12|AMD_EXP_HW_SUPPORT},

	{0x1002, 0x7360, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_NAVI12},

	{0x1002, 0x7362, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_NAVI12},



	/* Sienna_Cichlid */

	{0x1002, 0x73A0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SIENNA_CICHLID},

	{0x1002, 0x73A2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SIENNA_CICHLID},

	{0x1002, 0x73A3, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SIENNA_CICHLID},

	{0x1002, 0x73AB, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SIENNA_CICHLID},

	{0x1002, 0x73AE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SIENNA_CICHLID},

	{0x1002, 0x73BF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SIENNA_CICHLID},



	{0, 0, 0}

};

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

+1 −0
Original line number Diff line number Diff line
@@ -1076,6 +1076,7 @@ static int amdgpu_ttm_tt_pin_userptr(struct ttm_tt *ttm) 


release_sg:

	kfree(ttm->sg);

	ttm->sg = NULL;

	return r;

}

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

+3 −0
Original line number Diff line number Diff line
@@ -3595,6 +3595,9 @@ static void gfx_v10_0_check_gfxoff_flag(struct amdgpu_device *adev) 
		if (!gfx_v10_0_navi10_gfxoff_should_enable(adev))

			adev->pm.pp_feature &= ~PP_GFXOFF_MASK;

		break;

	case CHIP_NAVY_FLOUNDER:

		adev->pm.pp_feature &= ~PP_GFXOFF_MASK;

		break;

	default:

		break;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE