Commit 92de1de5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-2018-12-14' of git://anongit.freedesktop.org/drm/drm 

Pull drm fixes from Dave Airlie:
 "While I hoped things would calm down, the world hasn't joined with me,
  but it's a few things scattered over a wide area. The i915 workarounds
  regression fix is probably the largest, the rest are more usual sized.
  We also get some new AMD PCI IDs.

  There is also a patch in here to MAINTAINERS to added Daniel as an
  official DRM toplevel co-maintainer, he's decided he wants to step up
  and share the glory, and he'll likely process next weeks fixes while
  I'm away on holidays.

  Summary:

  amdgpu:

   - some new PCI IDs

   - fixed firmware image updates

   - power management fixes

   - locking warning fix

  nouveau:

   - framebuffer flushing fix

   - memory leak fix

   - tegra device init regression fix

  vmwgfx:

   - OOM kernel memory fix

   - excess return in function fix

  i915:

   - the biggest fix is a regression fix where workarounds weren't
     getting reapplied after a gpu hang causing further crashing, this
     fixes the workaround application to make it happen again

   - GPU hang fixes for Braswell and some GEN3 GPUs

   - GVT fix for broadwell tiling

  rockchip:

   - revert to fix a regression causing a WARN on shutdown

  mediatek:

   - avoid crash attaching to non-existant bridges"

* tag 'drm-fixes-2018-12-14' of git://anongit.freedesktop.org/drm/drm: (23 commits)
  drm/vmwgfx: Protect from excessive execbuf kernel memory allocations v3
  MAINTAINERS: Daniel for drm co-maintainer
  drm/amdgpu: drop fclk/gfxclk ratio setting
  drm/vmwgfx: remove redundant return ret statement
  drm/i915: Flush GPU relocs harder for gen3
  drm/i915: Allocate a common scratch page
  drm/i915/execlists: Apply a full mb before execution for Braswell
  drm/nouveau/kms: Fix memory leak in nv50_mstm_del()
  drm/nouveau/kms/nv50-: also flush fb writes when rewinding push buffer
  drm/amdgpu: Fix DEBUG_LOCKS_WARN_ON(depth <= 0) in amdgpu_ctx.lock
  Revert "drm/rockchip: Allow driver to be shutdown on reboot/kexec"
  drm/nouveau/drm/nouveau: tegra: Call nouveau_drm_device_init()
  drm/amdgpu/powerplay: Apply avfs cks-off voltages on VI
  drm/amdgpu: update SMC firmware image for polaris10 variants
  drm/amdkfd: add new vega20 pci id
  drm/amdkfd: add new vega10 pci ids
  drm/amdgpu: add some additional vega20 pci ids
  drm/amdgpu: add some additional vega10 pci ids
  drm/amdgpu: update smu firmware images for VI variants (v2)
  drm/i915: Introduce per-engine workarounds
  ...
parents 880b9df1 1df07a7f

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -4847,6 +4847,7 @@ F: include/uapi/drm/vmwgfx_drm.h 


DRM DRIVERS

M:	David Airlie <airlied@linux.ie>

M:	Daniel Vetter <daniel@ffwll.ch>

L:	dri-devel@lists.freedesktop.org

T:	git git://anongit.freedesktop.org/drm/drm

B:	https://bugs.freedesktop.org/

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

+30 −6
Original line number Diff line number Diff line
@@ -330,7 +330,9 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device, 
			case CHIP_TOPAZ:

				if (((adev->pdev->device == 0x6900) && (adev->pdev->revision == 0x81)) ||

				    ((adev->pdev->device == 0x6900) && (adev->pdev->revision == 0x83)) ||

				    ((adev->pdev->device == 0x6907) && (adev->pdev->revision == 0x87))) {

				    ((adev->pdev->device == 0x6907) && (adev->pdev->revision == 0x87)) ||

				    ((adev->pdev->device == 0x6900) && (adev->pdev->revision == 0xD1)) ||

				    ((adev->pdev->device == 0x6900) && (adev->pdev->revision == 0xD3))) {

					info->is_kicker = true;

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

				} else
@@ -351,7 +353,6 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device, 
				if (type == CGS_UCODE_ID_SMU) {

					if (((adev->pdev->device == 0x67ef) &&

					     ((adev->pdev->revision == 0xe0) ||

					      (adev->pdev->revision == 0xe2) ||

					      (adev->pdev->revision == 0xe5))) ||

					    ((adev->pdev->device == 0x67ff) &&

					     ((adev->pdev->revision == 0xcf) ||
@@ -359,8 +360,13 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device, 
					      (adev->pdev->revision == 0xff)))) {

						info->is_kicker = true;

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

					} else

					} else if ((adev->pdev->device == 0x67ef) &&

						   (adev->pdev->revision == 0xe2)) {

						info->is_kicker = true;

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

					} else {

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

					}

				} else if (type == CGS_UCODE_ID_SMU_SK) {

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

				}
@@ -375,17 +381,35 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device, 
					      (adev->pdev->revision == 0xe7) ||

					      (adev->pdev->revision == 0xef))) ||

					    ((adev->pdev->device == 0x6fdf) &&

					     (adev->pdev->revision == 0xef))) {

					     ((adev->pdev->revision == 0xef) ||

					      (adev->pdev->revision == 0xff)))) {

						info->is_kicker = true;

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

					} else

					} else if ((adev->pdev->device == 0x67df) &&

						   ((adev->pdev->revision == 0xe1) ||

						    (adev->pdev->revision == 0xf7))) {

						info->is_kicker = true;

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

					} else {

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

					}

				} else if (type == CGS_UCODE_ID_SMU_SK) {

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

				}

				break;

			case CHIP_POLARIS12:

				if (((adev->pdev->device == 0x6987) &&

				     ((adev->pdev->revision == 0xc0) ||

				      (adev->pdev->revision == 0xc3))) ||

				    ((adev->pdev->device == 0x6981) &&

				     ((adev->pdev->revision == 0x00) ||

				      (adev->pdev->revision == 0x01) ||

				      (adev->pdev->revision == 0x10)))) {

					info->is_kicker = true;

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

				} else {

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

				}

				break;

			case CHIP_VEGAM:

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

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

+2 −2
Original line number Diff line number Diff line
@@ -124,14 +124,14 @@ static int amdgpu_cs_parser_init(struct amdgpu_cs_parser *p, union drm_amdgpu_cs 
		goto free_chunk;

	}



	mutex_lock(&p->ctx->lock);



	/* skip guilty context job */

	if (atomic_read(&p->ctx->guilty) == 1) {

		ret = -ECANCELED;

		goto free_chunk;

	}



	mutex_lock(&p->ctx->lock);



	/* get chunks */

	chunk_array_user = u64_to_user_ptr(cs->in.chunks);

	if (copy_from_user(chunk_array, chunk_array_user,

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

+7 −0
Original line number Diff line number Diff line
@@ -872,7 +872,13 @@ static const struct pci_device_id pciidlist[] = { 
	{0x1002, 0x6864, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA10},

	{0x1002, 0x6867, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA10},

	{0x1002, 0x6868, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA10},

	{0x1002, 0x6869, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA10},

	{0x1002, 0x686a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA10},

	{0x1002, 0x686b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA10},

	{0x1002, 0x686c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA10},

	{0x1002, 0x686d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA10},

	{0x1002, 0x686e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA10},

	{0x1002, 0x686f, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA10},

	{0x1002, 0x687f, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA10},

	/* Vega 12 */

	{0x1002, 0x69A0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA12},
@@ -885,6 +891,7 @@ static const struct pci_device_id pciidlist[] = { 
	{0x1002, 0x66A1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA20},

	{0x1002, 0x66A2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA20},

	{0x1002, 0x66A3, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA20},

	{0x1002, 0x66A4, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA20},

	{0x1002, 0x66A7, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA20},

	{0x1002, 0x66AF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VEGA20},

	/* Raven */

drivers/gpu/drm/amd/amdkfd/kfd_device.c

+7 −0
Original line number Diff line number Diff line
@@ -337,12 +337,19 @@ static const struct kfd_deviceid supported_devices[] = { 
	{ 0x6864, &vega10_device_info },	/* Vega10 */

	{ 0x6867, &vega10_device_info },	/* Vega10 */

	{ 0x6868, &vega10_device_info },	/* Vega10 */

	{ 0x6869, &vega10_device_info },	/* Vega10 */

	{ 0x686A, &vega10_device_info },	/* Vega10 */

	{ 0x686B, &vega10_device_info },	/* Vega10 */

	{ 0x686C, &vega10_vf_device_info },	/* Vega10  vf*/

	{ 0x686D, &vega10_device_info },	/* Vega10 */

	{ 0x686E, &vega10_device_info },	/* Vega10 */

	{ 0x686F, &vega10_device_info },	/* Vega10 */

	{ 0x687F, &vega10_device_info },	/* Vega10 */

	{ 0x66a0, &vega20_device_info },	/* Vega20 */

	{ 0x66a1, &vega20_device_info },	/* Vega20 */

	{ 0x66a2, &vega20_device_info },	/* Vega20 */

	{ 0x66a3, &vega20_device_info },	/* Vega20 */

	{ 0x66a4, &vega20_device_info },	/* Vega20 */

	{ 0x66a7, &vega20_device_info },	/* Vega20 */

	{ 0x66af, &vega20_device_info }		/* Vega20 */

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE