Commit 839e0f04 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-2019-10-18' of git://anongit.freedesktop.org/drm/drm 

Pull drm fixes from Dave Airlie:
 "This is this weeks fixes for drm.

  The dma-resv one is probably the more important one a fair few people
  have reported it, besides that it's a couple of panfrost, a few i915
  and a few amdgpu fixes.

  One radeon patch to fix some ppc64 related issues caused an x86
  regression so is getting reverted for now.

  Summary:

  dma-resv:
   - shared fences for lima/panfrost

  ttm:
   - prefault regression fix
   - lifetime fix

  panfrost:
   - stopped job timeout fix
   - missing register values

  amdgpu:
   - smu7 powerplay fix
   - bail earlier for cik/si detection
   - navi SDMA fix

  radeon:
   - revert a ppc64 shutdown fix that broke x86

  i915:
   - VBT information handling fix
   - Circular locking fix
   - preemption vs resubmission virtual requests fix"

* tag 'drm-fixes-2019-10-18' of git://anongit.freedesktop.org/drm/drm:
  drm/i915: Fixup preempt-to-busy vs resubmission of a virtual request
  drm/i915/userptr: Never allow userptr into the mappable GGTT
  drm/i915: Favor last VBT child device with conflicting AUX ch/DDC pin
  drm/i915/execlists: Refactor -EIO markup of hung requests
  drm/panfrost: Handle resetting on timeout better
  drm/panfrost: Add missing GPU feature registers
  drm/ttm: fix handling in ttm_bo_add_mem_to_lru
  drm/ttm: Restore ttm prefaulting
  drm/ttm: fix busy reference in ttm_mem_evict_first
  drm/amdgpu/sdma5: fix mask value of POLL_REGMEM packet for pipe sync
  drm/amdgpu: Bail earlier when amdgpu.cik_/si_support is not set to 1
  Revert "drm/radeon: Fix EEH during kexec"
  drm/msm/dsi: Implement reset correctly
  dma-buf/resv: fix exclusive fence get
  drm/edid: Add 6 bpc quirk for SDC panel in Lenovo G50
  drm/tiny: Kconfig: Remove always-y THERMAL dep. from TINYDRM_REPAPER
  drm/amdgpu/powerplay: fix typo in mvdd table setup
parents 84629d43 5c1e34b5

drivers/dma-buf/dma-resv.c

+1 −1
Original line number Diff line number Diff line
@@ -471,7 +471,7 @@ unlock: 
	if (pfence_excl)

		*pfence_excl = fence_excl;

	else if (fence_excl)

		shared[++shared_count] = fence_excl;

		shared[shared_count++] = fence_excl;



	if (!shared_count) {

		kfree(shared);

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

+35 −0
Original line number Diff line number Diff line
@@ -1048,6 +1048,41 @@ static int amdgpu_pci_probe(struct pci_dev *pdev, 
		return -ENODEV;

	}



#ifdef CONFIG_DRM_AMDGPU_SI

	if (!amdgpu_si_support) {

		switch (flags & AMD_ASIC_MASK) {

		case CHIP_TAHITI:

		case CHIP_PITCAIRN:

		case CHIP_VERDE:

		case CHIP_OLAND:

		case CHIP_HAINAN:

			dev_info(&pdev->dev,

				 "SI support provided by radeon.\n");

			dev_info(&pdev->dev,

				 "Use radeon.si_support=0 amdgpu.si_support=1 to override.\n"

				);

			return -ENODEV;

		}

	}

#endif

#ifdef CONFIG_DRM_AMDGPU_CIK

	if (!amdgpu_cik_support) {

		switch (flags & AMD_ASIC_MASK) {

		case CHIP_KAVERI:

		case CHIP_BONAIRE:

		case CHIP_HAWAII:

		case CHIP_KABINI:

		case CHIP_MULLINS:

			dev_info(&pdev->dev,

				 "CIK support provided by radeon.\n");

			dev_info(&pdev->dev,

				 "Use radeon.cik_support=0 amdgpu.cik_support=1 to override.\n"

				);

			return -ENODEV;

		}

	}

#endif



	/* Get rid of things like offb */

	ret = drm_fb_helper_remove_conflicting_pci_framebuffers(pdev, 0, "amdgpudrmfb");

	if (ret)

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

+0 −35
Original line number Diff line number Diff line
@@ -144,41 +144,6 @@ int amdgpu_driver_load_kms(struct drm_device *dev, unsigned long flags) 
	struct amdgpu_device *adev;

	int r, acpi_status;



#ifdef CONFIG_DRM_AMDGPU_SI

	if (!amdgpu_si_support) {

		switch (flags & AMD_ASIC_MASK) {

		case CHIP_TAHITI:

		case CHIP_PITCAIRN:

		case CHIP_VERDE:

		case CHIP_OLAND:

		case CHIP_HAINAN:

			dev_info(dev->dev,

				 "SI support provided by radeon.\n");

			dev_info(dev->dev,

				 "Use radeon.si_support=0 amdgpu.si_support=1 to override.\n"

				);

			return -ENODEV;

		}

	}

#endif

#ifdef CONFIG_DRM_AMDGPU_CIK

	if (!amdgpu_cik_support) {

		switch (flags & AMD_ASIC_MASK) {

		case CHIP_KAVERI:

		case CHIP_BONAIRE:

		case CHIP_HAWAII:

		case CHIP_KABINI:

		case CHIP_MULLINS:

			dev_info(dev->dev,

				 "CIK support provided by radeon.\n");

			dev_info(dev->dev,

				 "Use radeon.cik_support=0 amdgpu.cik_support=1 to override.\n"

				);

			return -ENODEV;

		}

	}

#endif



	adev = kzalloc(sizeof(struct amdgpu_device), GFP_KERNEL);

	if (adev == NULL) {

		return -ENOMEM;

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

+1 −1
Original line number Diff line number Diff line
@@ -1129,7 +1129,7 @@ static void sdma_v5_0_ring_emit_pipeline_sync(struct amdgpu_ring *ring) 
	amdgpu_ring_write(ring, addr & 0xfffffffc);

	amdgpu_ring_write(ring, upper_32_bits(addr) & 0xffffffff);

	amdgpu_ring_write(ring, seq); /* reference */

	amdgpu_ring_write(ring, 0xfffffff); /* mask */

	amdgpu_ring_write(ring, 0xffffffff); /* mask */

	amdgpu_ring_write(ring, SDMA_PKT_POLL_REGMEM_DW5_RETRY_COUNT(0xfff) |

			  SDMA_PKT_POLL_REGMEM_DW5_INTERVAL(4)); /* retry count, poll interval */

}

drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c

+1 −1
Original line number Diff line number Diff line
@@ -655,7 +655,7 @@ static int polaris10_populate_smc_mvdd_table(struct pp_hwmgr *hwmgr, 
			count = SMU_MAX_SMIO_LEVELS;

		for (level = 0; level < count; level++) {

			table->SmioTable2.Pattern[level].Voltage =

				PP_HOST_TO_SMC_US(data->mvdd_voltage_table.entries[count].value * VOLTAGE_SCALE);

				PP_HOST_TO_SMC_US(data->mvdd_voltage_table.entries[level].value * VOLTAGE_SCALE);

			/* Index into DpmTable.Smio. Drive bits from Smio entry to get this voltage level.*/

			table->SmioTable2.Pattern[level].Smio =

				(uint8_t) level;

CRA Git | Maintained and supported by SUSTech CRA and CCSE