Commit 2cf5a401 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-2023-03-17' of git://anongit.freedesktop.org/drm/drm 

Pull drm fixes from Dave Airlie:
 "Seems like a pretty regular rc3, i915 and amdgpu with the usual
  selection of fixes, then a scattering of fixes across misc drivers and
  other areas:

  accel:
   - build fix for accel

  edid:
   - fix info leak in edid

  ttm:
   - fix NULL ptr deref
   - reference counting fix

  i915:
   - Fix hwmon PL1 power limit enabling
   - Fix audio ELD handling for DP MST
   - Fix PSR io and wake line calculations
   - Fix DG2 HDMI modes with 267.30 and 319.89 MHz pixel clocks
   - Fix SSEU subslice out-of-bounds access
   - Fix misuse of non-idle barriers as fence trackers

  amdgpu:
   - SMU 13 update
   - RDNA2 suspend/resume fix when overclocking is enabled
   - SRIOV VCN fixes
   - HDCP suspend/resume fix
   - Fix drm polling splat regression
   - Fix dirty rectangle tracking for PSR
   - Fix vangogh regression on certain BIOSes
   - Misc display fixes
   - Suspend/resume IOMMU regression fix

  amdkfd:
   - Fix BO offset for multi-VMA page migration
   - Fix a possible double free
   - Fix potential use after free
   - Fix process cleanup on module exit

  bridge:
   - fix returned array size name documentation

  fbdev:
   - ref-counting fix for fbdev deferred I/O

  virtio:
   - dma sync fix

  shmem-helper:
   - error path fix

  msm:
   - shrinker blocking fix

  panfrost:
   - shrinker rpm fix

  chipsfb:
   - fix error code

  meson:
   - fix 1px pink line
   - fix regulator interaction

  sun4i:
   - fix missing component unbind"

* tag 'drm-fixes-2023-03-17' of git://anongit.freedesktop.org/drm/drm: (38 commits)
  drm/ttm: drop extra ttm_bo_put in ttm_bo_cleanup_refs
  drm/amdgpu: Don't resume IOMMU after incomplete init
  drm/amdkfd: Fixed kfd_process cleanup on module exit.
  drm/amd/display: disconnect MPCC only on OTG change
  drm/amd/display: Fix DP MST sinks removal issue
  drm/amd/display: Do not set DRR on pipe Commit
  drm/amd/display: Remove OTG DIV register write for Virtual signals.
  drm/meson: dw-hdmi: Fix devm_regulator_*get_enable*() conversion again
  drm/bridge: Fix returned array size name for atomic_get_input_bus_fmts kdoc
  drm/amdgpu/vcn: Disable indirect SRAM on Vangogh broken BIOSes
  drm/amdgpu/nv: fix codec array for SR_IOV
  drm/amd/display: Write to correct dirty_rect
  drm/amdgpu: move poll enabled/disable into non DC path
  drm/amd/display: Fix HDCP failing to enable after suspend
  drm/amdkfd: fix potential kgd_mem UAFs
  drm/amdgpu/vcn: custom video info caps for sriov
  drm/amd/pm: Fix sienna cichlid incorrect OD volage after resume
  drm/amd/pm: bump SMU 13.0.4 driver_if header version
  drm/amdkfd: fix a potential double free in pqm_create_queue
  drm/amdkfd: Get prange->offset after svm_range_vram_node_new
  ...
parents 7622976c c00133a9

drivers/accel/Makefile

+2 −2
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only



obj-y	+= habanalabs/

obj-y	+= ivpu/
 
obj-$(CONFIG_DRM_ACCEL_HABANALABS)	+= habanalabs/

obj-$(CONFIG_DRM_ACCEL_IVPU)		+= ivpu/

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

+0 −4
Original line number Diff line number Diff line
@@ -4145,8 +4145,6 @@ int amdgpu_device_suspend(struct drm_device *dev, bool fbcon) 
	if (amdgpu_acpi_smart_shift_update(dev, AMDGPU_SS_DEV_D3))

		DRM_WARN("smart shift update failed\n");



	drm_kms_helper_poll_disable(dev);



	if (fbcon)

		drm_fb_helper_set_suspend_unlocked(adev_to_drm(adev)->fb_helper, true);
@@ -4243,8 +4241,6 @@ int amdgpu_device_resume(struct drm_device *dev, bool fbcon) 
	if (fbcon)

		drm_fb_helper_set_suspend_unlocked(adev_to_drm(adev)->fb_helper, false);



	drm_kms_helper_poll_enable(dev);



	amdgpu_ras_resume(adev);



	if (adev->mode_info.num_crtc) {

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

+4 −0
Original line number Diff line number Diff line
@@ -1618,6 +1618,8 @@ int amdgpu_display_suspend_helper(struct amdgpu_device *adev) 
	struct drm_connector_list_iter iter;

	int r;



	drm_kms_helper_poll_disable(dev);



	/* turn off display hw */

	drm_modeset_lock_all(dev);

	drm_connector_list_iter_begin(dev, &iter);
@@ -1694,6 +1696,8 @@ int amdgpu_display_resume_helper(struct amdgpu_device *adev) 


	drm_modeset_unlock_all(dev);



	drm_kms_helper_poll_enable(dev);



	return 0;

}

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

+19 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 


#include <linux/firmware.h>

#include <linux/module.h>

#include <linux/dmi.h>

#include <linux/pci.h>

#include <linux/debugfs.h>

#include <drm/drm_drv.h>
@@ -114,6 +115,24 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev) 
	    (adev->pg_flags & AMD_PG_SUPPORT_VCN_DPG))

		adev->vcn.indirect_sram = true;



	/*

	 * Some Steam Deck's BIOS versions are incompatible with the

	 * indirect SRAM mode, leading to amdgpu being unable to get

	 * properly probed (and even potentially crashing the kernel).

	 * Hence, check for these versions here - notice this is

	 * restricted to Vangogh (Deck's APU).

	 */

	if (adev->ip_versions[UVD_HWIP][0] == IP_VERSION(3, 0, 2)) {

		const char *bios_ver = dmi_get_system_info(DMI_BIOS_VERSION);



		if (bios_ver && (!strncmp("F7A0113", bios_ver, 7) ||

		     !strncmp("F7A0114", bios_ver, 7))) {

			adev->vcn.indirect_sram = false;

			dev_info(adev->dev,

				"Steam Deck quirk: indirect SRAM disabled on BIOS %s\n", bios_ver);

		}

	}



	hdr = (const struct common_firmware_header *)adev->vcn.fw->data;

	adev->vcn.fw_version = le32_to_cpu(hdr->ucode_version);

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

+4 −0
Original line number Diff line number Diff line
@@ -124,6 +124,8 @@ enum AMDGIM_FEATURE_FLAG { 
	AMDGIM_FEATURE_PP_ONE_VF = (1 << 4),

	/* Indirect Reg Access enabled */

	AMDGIM_FEATURE_INDIRECT_REG_ACCESS = (1 << 5),

	/* AV1 Support MODE*/

	AMDGIM_FEATURE_AV1_SUPPORT = (1 << 6),

};



enum AMDGIM_REG_ACCESS_FLAG {
@@ -322,6 +324,8 @@ static inline bool is_virtual_machine(void) 
	((!amdgpu_in_reset(adev)) && adev->virt.tdr_debug)

#define amdgpu_sriov_is_normal(adev) \

	((!amdgpu_in_reset(adev)) && (!adev->virt.tdr_debug))

#define amdgpu_sriov_is_av1_support(adev) \

	((adev)->virt.gim_feature & AMDGIM_FEATURE_AV1_SUPPORT)

bool amdgpu_virt_mmio_blocked(struct amdgpu_device *adev);

void amdgpu_virt_init_setting(struct amdgpu_device *adev);

void amdgpu_virt_kiq_reg_write_reg_wait(struct amdgpu_device *adev,