Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6edd870b authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-fixes-4.10' of git://people.freedesktop.org/~agd5f/linux into drm-fixes 

Fixes for 4.10:
- Polaris 12 support
- Add new amd-gfx mailing list to MAINTAINERS file
- UVD clockgating fix
- SI dpm fixes

* 'drm-fixes-4.10' of git://people.freedesktop.org/~agd5f/linux:
  drm/amdgpu: drop verde dpm quirks
  drm/radeon: drop verde dpm quirks
  drm/radeon: update smc firmware selection for SI
  drm/amdgpu: update si kicker smc firmware
  drm/amd/powerplay: extend smu's response timeout time.
  drm/amdgpu: remove static integer for uvd pp state
  drm/amd/amdgpu: add Polaris12 PCI ID
  drm/amdgpu/powerplay: add Polaris12 support
  drm/amd/amdgpu: add Polaris12 support (v3)
  MAINTAINERS: Update mailing list for radeon and amdgpu
parents 6906407e 7192c54a

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -4117,7 +4117,7 @@ F: drivers/gpu/drm/cirrus/ 
RADEON and AMDGPU DRM DRIVERS

M:	Alex Deucher <alexander.deucher@amd.com>

M:	Christian König <christian.koenig@amd.com>

L:	dri-devel@lists.freedesktop.org

L:	amd-gfx@lists.freedesktop.org

T:	git git://people.freedesktop.org/~agd5f/linux

S:	Supported

F:	drivers/gpu/drm/radeon/

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

+3 −0
Original line number Diff line number Diff line
@@ -840,6 +840,9 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device, 
				else if (type == CGS_UCODE_ID_SMU_SK)

					strcpy(fw_name, "amdgpu/polaris10_smc_sk.bin");

				break;

			case CHIP_POLARIS12:

				strcpy(fw_name, "amdgpu/polaris12_smc.bin");

				break;

			default:

				DRM_ERROR("SMC firmware not supported\n");

				return -EINVAL;

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

+2 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ static const char *amdgpu_asic_name[] = { 
	"STONEY",

	"POLARIS10",

	"POLARIS11",

	"POLARIS12",

	"LAST",

};
@@ -1277,6 +1278,7 @@ static int amdgpu_early_init(struct amdgpu_device *adev) 
	case CHIP_FIJI:

	case CHIP_POLARIS11:

	case CHIP_POLARIS10:

	case CHIP_POLARIS12:

	case CHIP_CARRIZO:

	case CHIP_STONEY:

		if (adev->asic_type == CHIP_CARRIZO || adev->asic_type == CHIP_STONEY)

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

+7 −0
Original line number Diff line number Diff line
@@ -418,6 +418,13 @@ static const struct pci_device_id pciidlist[] = { 
	{0x1002, 0x67CA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS10},

	{0x1002, 0x67CC, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS10},

	{0x1002, 0x67CF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS10},

	/* Polaris12 */

	{0x1002, 0x6980, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS12},

	{0x1002, 0x6981, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS12},

	{0x1002, 0x6985, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS12},

	{0x1002, 0x6986, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS12},

	{0x1002, 0x6987, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS12},

	{0x1002, 0x699F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS12},



	{0, 0, 0}

};

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

+1 −0
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ static int amdgpu_pp_early_init(void *handle) 
	switch (adev->asic_type) {

	case CHIP_POLARIS11:

	case CHIP_POLARIS10:

	case CHIP_POLARIS12:

	case CHIP_TONGA:

	case CHIP_FIJI:

	case CHIP_TOPAZ: