Commit 0068dc8c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-2021-10-08' of git://anongit.freedesktop.org/drm/drm 

Pull drm fixes from Dave Airlie:
 "I've returned from my tropical island retreat, even managed to bring
  one of my kids on a dive with some turtles. Thanks to Daniel for doing
  last week's work.

  Otherwise this is the weekly fixes pull, it's a bit bigger because the
  vc4 reverts in your tree caused some problems with fixes in the
  drm-misc tree so it got left out last week, so this week has the misc
  fixes rebased without the vc4 pieces.

  Otherwise it's i915, amdgpu with the usual fixes and a scattering over
  other drivers.

  I expect things should calm down a bit more next week.

  core:
   - Kconfig fix for fb_simple vs simpledrm.

  i915:
   - Fix RKL HDMI audio
   - Fix runtime pm imbalance on i915_gem_shrink() error path
   - Fix Type-C port access before hw/sw state sync
   - Fix VBT backlight struct version/size check
   - Fix VT-d async flip on SKL/BXT with plane stretch workaround

  amdgpu:
   - DCN 3.1 DP alt mode fixes
   - S0ix gfxoff fix
   - Fix DRM_AMD_DC_SI dependencies
   - PCIe DPC handling fix
   - DCN 3.1 scaling fix
   - Documentation fix

  amdkfd:
   - Fix potential memory leak
   - IOMMUv2 init fixes

  vc4 (there were some hdmi fixes but things got reverted, sort it out
       later):
   - compiler fix

  nouveau:
   - Cursor fix
   - Fix ttm buffer moves for ampere gpu's by adding minimal
     acceleration support.
   - memory leak fixes

  rockchip:
   - crtc/clk fixup

  panel:
   - ili9341 Fix DT bindings indent
   - y030xx067a - yellow tint init seq fix

  gbefb:
   - Fix gbefb when built with COMPILE_TEST"

* tag 'drm-fixes-2021-10-08' of git://anongit.freedesktop.org/drm/drm: (33 commits)
  drm/amd/display: Fix detection of 4 lane for DPALT
  drm/amd/display: Limit display scaling to up to 4k for DCN 3.1
  drm/amd/display: Skip override for preferred link settings during link training
  drm/nouveau/debugfs: fix file release memory leak
  drm/nouveau/kms/nv50-: fix file release memory leak
  drm/nouveau: avoid a use-after-free when BO init fails
  DRM: delete DRM IRQ legacy midlayer docs
  video: fbdev: gbefb: Only instantiate device when built for IP32
  fbdev: simplefb: fix Kconfig dependencies
  drm/panel: abt-y030xx067a: yellow tint fix
  dt-bindings: panel: ili9341: correct indentation
  drm/nouveau/fifo/ga102: initialise chid on return from channel creation
  drm/rockchip: Update crtc fixup to account for fractional clk change
  drm/nouveau/ga102-: support ttm buffer moves via copy engine
  drm/nouveau/kms/tu102-: delay enabling cursor until after assign_windows
  drm/sun4i: dw-hdmi: Fix HDMI PHY clock setup
  drm/vc4: hdmi: Remove unused struct
  drm/kmb: Enable alpha blended second plane
  drm/amdgpu: handle the case of pci_channel_io_frozen only in amdgpu_pci_resume
  drm/amdgpu: init iommu after amdkfd device init
  ...
parents 1da38549 bf79045e

Documentation/gpu/amdgpu.rst

+2 −2
Original line number Diff line number Diff line
@@ -300,8 +300,8 @@ pcie_replay_count 
.. kernel-doc:: drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

   :doc: pcie_replay_count



+GPU SmartShift Information

============================

GPU SmartShift Information

==========================



GPU SmartShift information via sysfs

Documentation/gpu/drm-internals.rst

+0 −9
Original line number Diff line number Diff line
@@ -111,15 +111,6 @@ Component Helper Usage 
.. kernel-doc:: drivers/gpu/drm/drm_drv.c

   :doc: component helper usage recommendations



IRQ Helper Library

~~~~~~~~~~~~~~~~~~



.. kernel-doc:: drivers/gpu/drm/drm_irq.c

   :doc: irq helpers



.. kernel-doc:: drivers/gpu/drm/drm_irq.c

   :export:



Memory Manager Initialization

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+1 −0
Original line number Diff line number Diff line
@@ -1087,6 +1087,7 @@ struct amdgpu_device { 


	bool                            no_hw_access;

	struct pci_saved_state          *pci_state;

	pci_channel_state_t		pci_channel_state;



	struct amdgpu_reset_control     *reset_cntl;

};

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

+1 −0
Original line number Diff line number Diff line
@@ -563,6 +563,7 @@ kfd_mem_dmaunmap_userptr(struct kgd_mem *mem, 


	dma_unmap_sgtable(adev->dev, ttm->sg, direction, 0);

	sg_free_table(ttm->sg);

	kfree(ttm->sg);

	ttm->sg = NULL;

}

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

+10 −4
Original line number Diff line number Diff line
@@ -2394,10 +2394,6 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev) 
	if (r)

		goto init_failed;



	r = amdgpu_amdkfd_resume_iommu(adev);

	if (r)

		goto init_failed;



	r = amdgpu_device_ip_hw_init_phase1(adev);

	if (r)

		goto init_failed;
@@ -2436,6 +2432,10 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev) 
	if (!adev->gmc.xgmi.pending_reset)

		amdgpu_amdkfd_device_init(adev);



	r = amdgpu_amdkfd_resume_iommu(adev);

	if (r)

		goto init_failed;



	amdgpu_fru_get_product_info(adev);



init_failed:
@@ -5399,6 +5399,8 @@ pci_ers_result_t amdgpu_pci_error_detected(struct pci_dev *pdev, pci_channel_sta 
		return PCI_ERS_RESULT_DISCONNECT;

	}



	adev->pci_channel_state = state;



	switch (state) {

	case pci_channel_io_normal:

		return PCI_ERS_RESULT_CAN_RECOVER;
@@ -5541,6 +5543,10 @@ void amdgpu_pci_resume(struct pci_dev *pdev) 


	DRM_INFO("PCI error: resume callback!!\n");



	/* Only continue execution for the case of pci_channel_io_frozen */

	if (adev->pci_channel_state != pci_channel_io_frozen)

		return;



	for (i = 0; i < AMDGPU_MAX_RINGS; ++i) {

		struct amdgpu_ring *ring = adev->rings[i];