Commit a4849f60 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-2021-11-26' of git://anongit.freedesktop.org/drm/drm 

Pull drm fixes from Dave Airlie:
 "No idea if turkey comes before pull request processing, but here's the
  regular week's fixes. A bunch for amdgpu, nouveau adds support for a
  new GPU (like a PCI ID addition), and a scattering of fixes across
  i915/hyperv/aspeed/vc4.

  Specifics:

  amdgpu:
   - SRIOV fixes
   - dma-buf double free fix
   - Display fixes for GPU resets
   - Fix DSC powergating regression
   - GPU TSC fixes
   - Interrupt handler overflow fixes
   - Endian fix in IP discovery table handling
   - Aldebaran ASPM fix
   - Fix overclocking regression on older asics
   - Backlight/ACPI fix

  amdkfd:
   - SVM fixes
   - VMA removal race fix

  hyperv:
   - removal fix

  aspeed:
   - vga_pw sysfs file fix

  vc4:
   - error checking fix

  nouveau:
   - support GA106
   - fix a few error checks

  i915:
   - fix wakeref handling around PXP suspend"

* tag 'drm-fixes-2021-11-26' of git://anongit.freedesktop.org/drm/drm: (25 commits)
  drm/amd/display: update bios scratch when setting backlight
  drm/amdgpu/pm: fix powerplay OD interface
  drm/amdgpu: Skip ASPM programming on aldebaran
  drm/amdgpu: fix byteorder error in amdgpu discovery
  drm/amdgpu: enable Navi retry fault wptr overflow
  drm/amdgpu: enable Navi 48-bit IH timestamp counter
  drm/amdkfd: simplify drain retry fault
  drm/amdkfd: handle VMA remove race
  drm/amdkfd: process exit and retry fault race
  drm/amdgpu: IH process reset count when restart
  drm/amdgpu/gfx9: switch to golden tsc registers for renoir+
  drm/amdgpu/gfx10: add wraparound gpu counter check for APUs as well
  drm/amdgpu: move kfd post_reset out of reset_sriov function
  drm/amd/display: Fixed DSC would not PG after removing DSC stream
  drm/amd/display: Reset link encoder assignments for GPU reset
  drm/amd/display: Set plane update flags for all planes in reset
  drm/amd/display: Fix DPIA outbox timeout after GPU reset
  drm/amdgpu: Fix double free of dmabuf
  drm/amdgpu: Fix MMIO HDP flush on SRIOV
  drm/i915/gt: Hold RPM wakelock during PXP suspend
  ...
parents 8ced7ca3 fc026c8b

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ VERSION = 5 
PATCHLEVEL = 16

SUBLEVEL = 0

EXTRAVERSION = -rc2

NAME = Trick or Treat

NAME = Gobble Gobble



# *DOCUMENTATION*

# To see a list of typical targets execute "make help"

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

+0 −6
Original line number Diff line number Diff line
@@ -646,12 +646,6 @@ kfd_mem_attach_dmabuf(struct amdgpu_device *adev, struct kgd_mem *mem, 
	if (IS_ERR(gobj))

		return PTR_ERR(gobj);



	/* Import takes an extra reference on the dmabuf. Drop it now to

	 * avoid leaking it. We only need the one reference in

	 * kgd_mem->dmabuf.

	 */

	dma_buf_put(mem->dmabuf);



	*bo = gem_to_amdgpu_bo(gobj);

	(*bo)->flags |= AMDGPU_GEM_CREATE_PREEMPTIBLE;

	(*bo)->parent = amdgpu_bo_ref(mem->bo);

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

+12 −0
Original line number Diff line number Diff line
@@ -1569,6 +1569,18 @@ void amdgpu_atombios_scratch_regs_engine_hung(struct amdgpu_device *adev, 
	WREG32(adev->bios_scratch_reg_offset + 3, tmp);

}



void amdgpu_atombios_scratch_regs_set_backlight_level(struct amdgpu_device *adev,

						      u32 backlight_level)

{

	u32 tmp = RREG32(adev->bios_scratch_reg_offset + 2);



	tmp &= ~ATOM_S2_CURRENT_BL_LEVEL_MASK;

	tmp |= (backlight_level << ATOM_S2_CURRENT_BL_LEVEL_SHIFT) &

		ATOM_S2_CURRENT_BL_LEVEL_MASK;



	WREG32(adev->bios_scratch_reg_offset + 2, tmp);

}



bool amdgpu_atombios_scratch_need_asic_init(struct amdgpu_device *adev)

{

	u32 tmp = RREG32(adev->bios_scratch_reg_offset + 7);

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

+2 −0
Original line number Diff line number Diff line
@@ -185,6 +185,8 @@ bool amdgpu_atombios_has_gpu_virtualization_table(struct amdgpu_device *adev); 
void amdgpu_atombios_scratch_regs_lock(struct amdgpu_device *adev, bool lock);

void amdgpu_atombios_scratch_regs_engine_hung(struct amdgpu_device *adev,

					      bool hung);

void amdgpu_atombios_scratch_regs_set_backlight_level(struct amdgpu_device *adev,

						      u32 backlight_level);

bool amdgpu_atombios_scratch_need_asic_init(struct amdgpu_device *adev);



void amdgpu_atombios_copy_swap(u8 *dst, u8 *src, u8 num_bytes, bool to_le);

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

+3 −4
Original line number Diff line number Diff line
@@ -4316,7 +4316,6 @@ static int amdgpu_device_reset_sriov(struct amdgpu_device *adev, 


	amdgpu_irq_gpu_reset_resume_helper(adev);

	r = amdgpu_ib_ring_tests(adev);

	amdgpu_amdkfd_post_reset(adev);



error:

	if (!r && adev->virt.gim_feature & AMDGIM_FEATURE_GIM_FLR_VRAMLOST) {
@@ -5089,7 +5088,7 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev, 


	tmp_vram_lost_counter = atomic_read(&((adev)->vram_lost_counter));

	/* Actual ASIC resets if needed.*/

	/* TODO Implement XGMI hive reset logic for SRIOV */

	/* Host driver will handle XGMI hive reset for SRIOV */

	if (amdgpu_sriov_vf(adev)) {

		r = amdgpu_device_reset_sriov(adev, job ? false : true);

		if (r)
@@ -5149,8 +5148,8 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev, 


skip_sched_resume:

	list_for_each_entry(tmp_adev, device_list_handle, reset_list) {

		/* unlock kfd: SRIOV would do it separately */

		if (!need_emergency_restart && !amdgpu_sriov_vf(tmp_adev))

		/* unlock kfd */

		if (!need_emergency_restart)

	                amdgpu_amdkfd_post_reset(tmp_adev);



		/* kfd_post_reset will do nothing if kfd device is not initialized,