Commit 1e8e515e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-2022-09-02' of git://anongit.freedesktop.org/drm/drm 

Pull drm fixes from Dave Airlie:
 "Regular fixes pull. One core dma-buf fix, then two weeks of i915
  fixes, a lot of amdgpu fixes mostly for new IP, and a bunch of msm
  fixes, mostly modesetting ones.

  Nothing seems too bad at this point.

  dma-buf/dma-resv:
   - Fence-handling fix

  i915:
   - GVT fixes including fix for a CommetLake regression in mmio table
     and misc doc and typo fixes
   - Fix CCS handling
   - Fix for guc requests after reset
   - Display DSI related fixes
   - Display backlight related fixes
   - Fix for a null pointer dereference
   - HDMI related quirk for ECS Liva Q2 with GLK graphics
   - Skip wm/ddb readout for disabled pipes

  amdgpu:
   - FRU error message fix
   - MES 11 updates
   - DCN 3.2.x fixes
   - DCN 3.1.4 fixes
   - Fix possible use after free in CS IOCTL
   - SMU 13.0.x fixes
   - Fix iolink reporting on devices with direct connections to CPU
   - GFX10 tap delay firmware fixes

  msm:
   - Fix for inconsistent indenting in msm_dsi_dphy_timing_calc_v3().
   - Fix to make eDP the first connector in the connected list.
   - Fix to populate intf_cfg correctly before calling reset_intf_cfg().
   - Specify the correct number of DSI regulators for SDM660.
   - Specify the correct number of DSI regulators for MSM8996.
   - Fix for removing DP_RECOVERED_CLOCK_OUT_EN bit for tps4 link training
   - Fix probe-deferral crash in gpu devfreq
   - Fix gpu debugfs deadlock"

* tag 'drm-fixes-2022-09-02' of git://anongit.freedesktop.org/drm/drm: (51 commits)
  drm/amd/amdgpu: skip ucode loading if ucode_size == 0
  drm/amdgpu: only init tap_delay ucode when it's included in ucode binary
  drm/amd/display: Fix black flash when switching from ODM2to1 to ODMBypass
  drm/amd/display: Fix check for stream and plane
  drm/amd/display: Re-initialize viewport after pipe merge
  drm/amd/display: Use correct plane for CAB cursor size allocation
  drm/amdgpu: ensure no PCIe peer access for CPU XGMI iolinks
  drm/amd/pm: bump SMU 13.0.0 driver_if header version
  drm/amd/pm: use vbios carried pptable for all SMU13.0.7 SKUs
  drm/amd/pm: use vbios carried pptable for those supported SKUs
  drm/amd/display: fix wrong register access
  drm/amd/display: use actual cursor size instead of max for CAB allocation
  drm/amd/display: disable display fresh from MALL on an edge case for DCN321
  drm/amd/display: Fix CAB cursor size allocation for DCN32/321
  drm/amd/display: Missing HPO instance added
  drm/amd/display: set dig fifo read start level to 7 before dig fifo reset
  drm/amdgpu: Fix use-after-free in amdgpu_cs_ioctl
  drm/amd/display: Fix OTG H timing reset for dcn314
  drm/amd/display: Fix DCN32 DPSTREAMCLK_CNTL programming
  drm/amdgpu: Update mes_v11_api_def.h
  ...
parents 0b3acd1c bfe632f6

drivers/dma-buf/dma-resv.c

+2 −1
Original line number Diff line number Diff line
@@ -295,7 +295,8 @@ void dma_resv_add_fence(struct dma_resv *obj, struct dma_fence *fence, 
		enum dma_resv_usage old_usage;



		dma_resv_list_entry(fobj, i, obj, &old, &old_usage);

		if ((old->context == fence->context && old_usage >= usage) ||

		if ((old->context == fence->context && old_usage >= usage &&

		     dma_fence_is_later(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_device.c

+2 −1
Original line number Diff line number Diff line
@@ -5524,7 +5524,8 @@ bool amdgpu_device_is_peer_accessible(struct amdgpu_device *adev, 
		~*peer_adev->dev->dma_mask : ~((1ULL << 32) - 1);

	resource_size_t aper_limit =

		adev->gmc.aper_base + adev->gmc.aper_size - 1;

	bool p2p_access = !(pci_p2pdma_distance_many(adev->pdev,

	bool p2p_access = !adev->gmc.xgmi.connected_to_cpu &&

			  !(pci_p2pdma_distance_many(adev->pdev,

					&peer_adev->dev, 1, true) < 0);



	return pcie_p2p && p2p_access && (adev->gmc.visible_vram_size &&

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

+7 −2
Original line number Diff line number Diff line
@@ -66,10 +66,15 @@ static bool is_fru_eeprom_supported(struct amdgpu_device *adev) 
		return true;

	case CHIP_SIENNA_CICHLID:

		if (strnstr(atom_ctx->vbios_version, "D603",

		    sizeof(atom_ctx->vbios_version))) {

			if (strnstr(atom_ctx->vbios_version, "D603GLXE",

			    sizeof(atom_ctx->vbios_version)))

			return true;

				return false;

			else

				return true;

		} else {

			return false;

		}

	default:

		return false;

	}

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

+4 −1
Original line number Diff line number Diff line
@@ -159,6 +159,9 @@ void amdgpu_job_free(struct amdgpu_job *job) 
	amdgpu_sync_free(&job->sync);

	amdgpu_sync_free(&job->sched_sync);



	if (!job->hw_fence.ops)

		kfree(job);

	else

		dma_fence_put(&job->hw_fence);

}

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

+1 −1
Original line number Diff line number Diff line
@@ -2401,7 +2401,7 @@ static int psp_load_smu_fw(struct psp_context *psp) 
static bool fw_load_skip_check(struct psp_context *psp,

			       struct amdgpu_firmware_info *ucode)

{

	if (!ucode->fw)

	if (!ucode->fw || !ucode->ucode_size)

		return true;



	if (ucode->ucode_id == AMDGPU_UCODE_ID_SMC &&