Commit b1e51588 authored Dec 02, 2023 by Linus Torvalds

Merge tag 'drm-fixes-2023-12-01' of git://anongit.freedesktop.org/drm/drm

Pull drm fixes from Dave Airlie:
 "Weekly fixes, mostly amdgpu fixes with a scattering of nouveau, i915,
  and a couple of reverts. Hopefully it will quieten down in coming
  weeks.

  drm:
   - Revert unexport of prime helpers for fd/handle conversion

  dma_resv:
   - Do not double add fences in dma_resv_add_fence.

  gpuvm:
   - Fix GPUVM license identifier.

  i915:
   - Mark internal GSC engine with reserved uabi class
   - Take VGA converters into account in eDP probe
   - Fix intel_pre_plane_updates() call to ensure workarounds get applied

  panel:
   - Revert panel fixes as they require exporting device_is_dependent.

  nouveau:
   - fix oversized allocations in new vm path
   - fix zero-length array
   - remove a stray lock

  nt36523:
   - Fix error check for nt36523.

  amdgpu:
   - DMUB fix
   - DCN 3.5 fixes
   - XGMI fix
   - DCN 3.2 fixes
   - Vangogh suspend fix
   - NBIO 7.9 fix
   - GFX11 golden register fix
   - Backlight fix
   - NBIO 7.11 fix
   - IB test overflow fix
   - DCN 3.1.4 fixes
   - fix a runtime pm ref count
   - Retimer fix
   - ABM fix
   - DCN 3.1.5 fix
   - Fix AGP addressing
   - Fix possible memory leak in SMU error path
   - Make sure PME is enabled in D3
   - Fix possible NULL pointer dereference in debugfs
   - EEPROM fix
   - GC 9.4.3 fix

  amdkfd:
   - IP version check fix
   - Fix memory leak in pqm_uninit()"

* tag 'drm-fixes-2023-12-01' of git://anongit.freedesktop.org/drm/drm: (53 commits)
  Revert "drm/prime: Unexport helpers for fd/handle conversion"
  drm/amdgpu: Use another offset for GC 9.4.3 remap
  drm/amd/display: Fix some HostVM parameters in DML
  drm/amdkfd: Free gang_ctx_bo and wptr_bo in pqm_uninit
  drm/amdgpu: Update EEPROM I2C address for smu v13_0_0
  drm/amd/display: Allow DTBCLK disable for DCN35
  drm/amdgpu: Fix cat debugfs amdgpu_regs_didt causes kernel null pointer
  drm/amd: Enable PCIe PME from D3
  drm/amd/pm: fix a memleak in aldebaran_tables_init
  drm/amdgpu: fix AGP addressing when GART is not at 0
  drm/amd/display: update dcn315 lpddr pstate latency
  drm/amd/display: fix ABM disablement
  drm/amd/display: Fix black screen on video playback with embedded panel
  drm/amd/display: Fix conversions between bytes and KB
  drm/amdkfd: Use common function for IP version check
  drm/amd/display: Remove config update
  drm/amd/display: Update DCN35 clock table policy
  drm/amd/display: force toggle rate wa for first link training for a retimer
  drm/amdgpu: correct the amdgpu runtime dereference usage count
  drm/amd/display: Update min Z8 residency time to 2100 for DCN314
  ...

parents c9a925b7 908f6064

drivers/dma-buf/dma-resv.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -301,7 +301,7 @@ void dma_resv_add_fence(struct dma_resv obj, struct dma_fence fence,

		dma_resv_list_entry(fobj, i, obj, &old, &old_usage);
		if ((old->context == fence->context && old_usage >= usage &&
		dma_fence_is_later(fence, old)) \|\|
		dma_fence_is_later_or_same(fence, old)) \|\|
		dma_fence_is_signaled(old)) {
		dma_resv_list_set(fobj, i, fence, usage);
		dma_fence_put(old);

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -547,7 +547,7 @@ int amdgpu_amdkfd_get_xgmi_bandwidth_mbytes(struct amdgpu_device *dst,
		struct amdgpu_device adev = dst, peer_adev;
		int num_links;

		if (adev->asic_type != CHIP_ALDEBARAN)
		if (amdgpu_ip_version(adev, GC_HWIP, 0) < IP_VERSION(9, 4, 2))
		return 0;

		if (src)

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -638,6 +638,9 @@ static ssize_t amdgpu_debugfs_regs_didt_read(struct file f, char __user buf,
		if (size & 0x3 \|\| *pos & 0x3)
		return -EINVAL;

		if (!adev->didt_rreg)
		return -EOPNOTSUPP;

		r = pm_runtime_get_sync(adev_to_drm(adev)->dev);
		if (r < 0) {
		pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);
		@@ -694,6 +697,9 @@ static ssize_t amdgpu_debugfs_regs_didt_write(struct file *f, const char __user
		if (size & 0x3 \|\| *pos & 0x3)
		return -EINVAL;

		if (!adev->didt_wreg)
		return -EOPNOTSUPP;

		r = pm_runtime_get_sync(adev_to_drm(adev)->dev);
		if (r < 0) {
		pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -4538,6 +4538,10 @@ int amdgpu_device_suspend(struct drm_device *dev, bool fbcon)
		if (amdgpu_sriov_vf(adev))
		amdgpu_virt_release_full_gpu(adev, false);

		r = amdgpu_dpm_notify_rlc_state(adev, false);
		if (r)
		return r;

		return 0;
		}

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

+3 −6

Original line number	Diff line number	Diff line
		@@ -340,14 +340,11 @@ int amdgpu_display_crtc_set_config(struct drm_mode_set *set,
		adev->have_disp_power_ref = true;
		return ret;
		}
		/* if we have no active crtcs, then drop the power ref
		* we got before
		/* if we have no active crtcs, then go to
		* drop the power ref we got before
		*/
		if (!active && adev->have_disp_power_ref) {
		pm_runtime_put_autosuspend(dev->dev);
		if (!active && adev->have_disp_power_ref)
		adev->have_disp_power_ref = false;
		}

		out:
		/* drop the power reference we got coming in here */
		pm_runtime_put_autosuspend(dev->dev);