Commit 9608c7b7 authored Sep 15, 2023 by Linus Torvalds

Merge tag 'drm-fixes-2023-09-15' of git://anongit.freedesktop.org/drm/drm

Pull drm fixes from Dave Airlie:
 "Regular rc2 fixes pull, mostly made up of amdgpu stuff, one i915, and
  a bunch of others, one vkms locking violation is reverted.

  connector:
   - doc fix

  exec:
   - workaround lockdep issue

  tests:
   - fix a UAF

  vkms:
   - revert hrtimer fix

  fbdev:
   - g364fb: fix build failure with mips

  i915:
   - Only check eDP HPD when AUX CH is shared.

  amdgpu:
   - GC 9.4.3 fixes
   - Fix white screen issues with S/G display on system with >= 64G of ram
   - Replay fixes
   - SMU 13.0.6 fixes
   - AUX backlight fix
   - NBIO 4.3 SR-IOV fixes for HDP
   - RAS fixes
   - DP MST resume fix
   - Fix segfault on systems with no vbios
   - DPIA fixes

  amdkfd:
   - CWSR grace period fix
   - Unaligned doorbell fix
   - CRIU fix for GFX11
   - Add missing TLB flush on gfx10 and newer

  radeon:
   - make fence wait in suballocator uninterrruptable

  gm12u320:
   - Fix the timeout usage for usb_bulk_msg()"

* tag 'drm-fixes-2023-09-15' of git://anongit.freedesktop.org/drm/drm: (29 commits)
  drm/tests: helpers: Avoid a driver uaf
  Revert "drm/vkms: Fix race-condition between the hrtimer and the atomic commit"
  drm/amdkfd: Insert missing TLB flush on GFX10 and later
  drm/i915: Only check eDP HPD when AUX CH is shared
  drm/amd/display: Fix 2nd DPIA encoder Assignment
  drm/amd/display: Add DPIA Link Encoder Assignment Fix
  drm/amd/display: fix replay_mode kernel-doc warning
  drm/amdgpu: Handle null atom context in VBIOS info ioctl
  drm/amdkfd: Checkpoint and restore queues on GFX11
  drm/amd/display: Adjust the MST resume flow
  drm/amdgpu: fallback to old RAS error message for aqua_vanjaram
  drm/amdgpu/nbio4.3: set proper rmmio_remap.reg_offset for SR-IOV
  drm/amdgpu/soc21: don't remap HDP registers for SR-IOV
  drm/amd/display: Don't check registers, if using AUX BL control
  drm/amdgpu: fix retry loop test
  drm/amd/display: Add dirty rect support for Replay
  Revert "drm/amd: Disable S/G for APUs when 64GB or more host memory"
  drm/amd/display: fix the white screen issue when >= 64GB DRAM
  drm/amdkfd: Update CU masking for GFX 9.4.3
  drm/amdkfd: Update cache info reporting for GFX v9.4.3
  ...

parents e42bebf6 c3c9acb8

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

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1293,7 +1293,6 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev,
	void amdgpu_device_pci_config_reset(struct amdgpu_device *adev);		void amdgpu_device_pci_config_reset(struct amdgpu_device *adev);
	int amdgpu_device_pci_reset(struct amdgpu_device *adev);		int amdgpu_device_pci_reset(struct amdgpu_device *adev);
	bool amdgpu_device_need_post(struct amdgpu_device *adev);		bool amdgpu_device_need_post(struct amdgpu_device *adev);
	bool amdgpu_sg_display_supported(struct amdgpu_device *adev);
	bool amdgpu_device_pcie_dynamic_switching_supported(void);		bool amdgpu_device_pcie_dynamic_switching_supported(void);
	bool amdgpu_device_should_use_aspm(struct amdgpu_device *adev);		bool amdgpu_device_should_use_aspm(struct amdgpu_device *adev);
	bool amdgpu_device_aspm_support_quirk(void);		bool amdgpu_device_aspm_support_quirk(void);

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -478,7 +478,7 @@ void amdgpu_amdkfd_get_cu_info(struct amdgpu_device adev, struct kfd_cu_info c
	cu_info->cu_active_number = acu_info.number;		cu_info->cu_active_number = acu_info.number;
	cu_info->cu_ao_mask = acu_info.ao_cu_mask;		cu_info->cu_ao_mask = acu_info.ao_cu_mask;
	memcpy(&cu_info->cu_bitmap[0], &acu_info.bitmap[0],		memcpy(&cu_info->cu_bitmap[0], &acu_info.bitmap[0],
	sizeof(acu_info.bitmap));		sizeof(cu_info->cu_bitmap));
	cu_info->num_shader_engines = adev->gfx.config.max_shader_engines;		cu_info->num_shader_engines = adev->gfx.config.max_shader_engines;
	cu_info->num_shader_arrays_per_engine = adev->gfx.config.max_sh_per_se;		cu_info->num_shader_arrays_per_engine = adev->gfx.config.max_sh_per_se;
	cu_info->num_cu_per_sh = adev->gfx.config.max_cu_per_sh;		cu_info->num_cu_per_sh = adev->gfx.config.max_cu_per_sh;

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

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -980,8 +980,7 @@ void kgd_gfx_v10_build_grace_period_packet_info(struct amdgpu_device *adev,
	uint32_t wait_times,		uint32_t wait_times,
	uint32_t grace_period,		uint32_t grace_period,
	uint32_t *reg_offset,		uint32_t *reg_offset,
	uint32_t *reg_data,		uint32_t *reg_data)
	uint32_t inst)
	{		{
	*reg_data = wait_times;		*reg_data = wait_times;

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

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -55,5 +55,4 @@ void kgd_gfx_v10_build_grace_period_packet_info(struct amdgpu_device *adev,
	uint32_t wait_times,		uint32_t wait_times,
	uint32_t grace_period,		uint32_t grace_period,
	uint32_t *reg_offset,		uint32_t *reg_offset,
	uint32_t *reg_data,		uint32_t *reg_data);
	uint32_t inst);

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

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -1103,8 +1103,7 @@ void kgd_gfx_v9_build_grace_period_packet_info(struct amdgpu_device *adev,
	uint32_t wait_times,		uint32_t wait_times,
	uint32_t grace_period,		uint32_t grace_period,
	uint32_t *reg_offset,		uint32_t *reg_offset,
	uint32_t *reg_data,		uint32_t *reg_data)
	uint32_t inst)
	{		{
	*reg_data = wait_times;		*reg_data = wait_times;

	@@ -1120,8 +1119,7 @@ void kgd_gfx_v9_build_grace_period_packet_info(struct amdgpu_device *adev,
	SCH_WAVE,		SCH_WAVE,
	grace_period);		grace_period);

	*reg_offset = SOC15_REG_OFFSET(GC, GET_INST(GC, inst),		*reg_offset = SOC15_REG_OFFSET(GC, 0, mmCP_IQ_WAIT_TIME2);
	mmCP_IQ_WAIT_TIME2);
	}		}

	void kgd_gfx_v9_program_trap_handler_settings(struct amdgpu_device *adev,		void kgd_gfx_v9_program_trap_handler_settings(struct amdgpu_device *adev,