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

Commit bd5d7428 authored Jan 09, 2017 by Linus Torvalds

Merge tag 'drm-fixes-for-v4.10-rc4' of git://people.freedesktop.org/~airlied/linux

Pull drm fixes from Dave Airlie:
 "amdgpu, radeon, msm, meson, tilcdc, drm fixes.

  Just back online for a couple of days, gathered up the remaining fixes
  pull requests.

  This contains fixes for a few ARM platforms (msm, tilcdc, meson), and
  one core atomic fix. The AMD pull has some new hardware support
  (Polaris12) in it, but this is pretty limited to just hw enablement
  and shouldn't cause any problems"

* tag 'drm-fixes-for-v4.10-rc4' of git://people.freedesktop.org/~airlied/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
  drm/meson: Fix CVBS VDAC disable
  drm/meson: Fix CVBS initialization when HDMI is configured by bootloader
  drm: Clean up planes in atomic commit helper failure path
  drm: tilcdc: simplify the recovery from sync lost error on rev1
  drm/meson: Fix plane atomic check when no crtc for the plane
  drm/msm: Verify that MSM_SUBMIT_BO_FLAGS are set
  drm/msm: Put back the vaddr in submit_reloc()
  drm/msm: Ensure that the hardware write pointer is valid

parents 756a7334 6edd870b

MAINTAINERS

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -4117,7 +4117,7 @@ F: drivers/gpu/drm/cirrus/
	RADEON and AMDGPU DRM DRIVERS		RADEON and AMDGPU DRM DRIVERS
	M: Alex Deucher <alexander.deucher@amd.com>		M: Alex Deucher <alexander.deucher@amd.com>
	M: Christian König <christian.koenig@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		T: git git://people.freedesktop.org/~agd5f/linux
	S: Supported		S: Supported
	F: drivers/gpu/drm/radeon/		F: drivers/gpu/drm/radeon/

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

+3 −0

Original line number	Original line	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)		else if (type == CGS_UCODE_ID_SMU_SK)
	strcpy(fw_name, "amdgpu/polaris10_smc_sk.bin");		strcpy(fw_name, "amdgpu/polaris10_smc_sk.bin");
	break;		break;
			case CHIP_POLARIS12:
			strcpy(fw_name, "amdgpu/polaris12_smc.bin");
			break;
	default:		default:
	DRM_ERROR("SMC firmware not supported\n");		DRM_ERROR("SMC firmware not supported\n");
	return -EINVAL;		return -EINVAL;

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

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -73,6 +73,7 @@ static const char *amdgpu_asic_name[] = {
	"STONEY",		"STONEY",
	"POLARIS10",		"POLARIS10",
	"POLARIS11",		"POLARIS11",
			"POLARIS12",
	"LAST",		"LAST",
	};		};

	@@ -1277,6 +1278,7 @@ static int amdgpu_early_init(struct amdgpu_device *adev)
	case CHIP_FIJI:		case CHIP_FIJI:
	case CHIP_POLARIS11:		case CHIP_POLARIS11:
	case CHIP_POLARIS10:		case CHIP_POLARIS10:
			case CHIP_POLARIS12:
	case CHIP_CARRIZO:		case CHIP_CARRIZO:
	case CHIP_STONEY:		case CHIP_STONEY:
	if (adev->asic_type == CHIP_CARRIZO \|\| adev->asic_type == 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	Original line	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, 0x67CA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS10},
	{0x1002, 0x67CC, 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},		{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}		{0, 0, 0}
	};		};

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

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -98,6 +98,7 @@ static int amdgpu_pp_early_init(void *handle)
	switch (adev->asic_type) {		switch (adev->asic_type) {
	case CHIP_POLARIS11:		case CHIP_POLARIS11:
	case CHIP_POLARIS10:		case CHIP_POLARIS10:
			case CHIP_POLARIS12:
	case CHIP_TONGA:		case CHIP_TONGA:
	case CHIP_FIJI:		case CHIP_FIJI:
	case CHIP_TOPAZ:		case CHIP_TOPAZ: