Commit 79a899e3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-2024-08-24' of https://gitlab.freedesktop.org/drm/kernel 

Pull drm fixes from Dave Airlie:
 "Weekly fixes. xe and msm are the major groups, with
  amdgpu/i915/nouveau having smaller bits. xe has a bunch of hw
  workaround fixes that were found to be missing, so that is why there
  are a bunch of scattered fixes, and one larger one. But overall size
  doesn't look too out of the ordinary.

  msm:
   - virtual plane fixes:
      - drop yuv on hw where not supported
      - csc vs yuv format fix
      - rotation fix
   - fix fb cleanup on close
   - reset phy before link training
   - fix visual corruption at 4K
   - fix NULL ptr crash on hotplug
   - simplify debug macros
   - sc7180 fix
   - adreno firmware name error path fix

  amdgpu:
   - GFX10 firmware loading fix
   - SDMA 5.2 fix
   - Debugfs parameter validation fix
   - eGPU hotplug fix

  i915:
   - fix HDCP timeouts

  nouveau:
   - fix SG_DEBUG crash

  xe:
   - Fix OA format masks which were breaking build with gcc-5
   - Fix opregion leak (Lucas)
   - Fix OA sysfs entry (Ashutosh)
   - Fix VM dma-resv lock (Brost)
   - Fix tile fini sequence (Brost)
   - Prevent UAF around preempt fence (Auld)
   - Fix DGFX display suspend/resume (Maarten)
   - Many Xe/Xe2 critical workarounds (Auld, Ngai-Mint, Bommu, Tejas, Daniele)
   - Fix devm/drmm issues (Daniele)
   - Fix missing workqueue destroy in xe_gt_pagefault (Stuart)
   - Drop HW fence pointer to HW fence ctx (Brost)
   - Free job before xe_exec_queue_put (Brost)"

* tag 'drm-fixes-2024-08-24' of https://gitlab.freedesktop.org/drm/kernel: (35 commits)
  drm/xe: Free job before xe_exec_queue_put
  drm/xe: Drop HW fence pointer to HW fence ctx
  drm/xe: Fix missing workqueue destroy in xe_gt_pagefault
  drm/amdgpu: fix eGPU hotplug regression
  drm/amdgpu: Validate TA binary size
  drm/amdgpu/sdma5.2: limit wptr workaround to sdma 5.2.1
  drm/amdgpu: fixing rlc firmware loading failure issue
  drm/xe/uc: Use devm to register cleanup that includes exec_queues
  drm/xe: use devm instead of drmm for managed bo
  drm/xe/xe2hpg: Add Wa_14021821874
  drm/xe: fix WA 14018094691
  drm/xe/xe2: Add Wa_15015404425
  drm/xe/xe2: Make subsequent L2 flush sequential
  drm/xe/xe2lpg: Extend workaround 14021402888
  drm/xe/xe2lpm: Extend Wa_16021639441
  drm/xe/bmg: implement Wa_16023588340
  drm/xe/oa/uapi: Make bit masks unsigned
  drm/xe/display: Make display suspend/resume work on discrete
  drm/xe: prevent UAF around preempt fence
  drm/xe: Fix tile fini sequence
  ...
parents d5afaf91 76f46186

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

+1 −1
Original line number Diff line number Diff line
@@ -278,7 +278,7 @@ static int amdgpu_discovery_read_binary_from_mem(struct amdgpu_device *adev, 
			msg = RREG32(mmMP0_SMN_C2PMSG_33);

			if (msg & 0x80000000)

				break;

			usleep_range(1000, 1100);

			msleep(1);

		}

	}

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

+3 −0
Original line number Diff line number Diff line
@@ -166,6 +166,9 @@ static ssize_t ta_if_load_debugfs_write(struct file *fp, const char *buf, size_t 
	if (ret)

		return -EFAULT;



	if (ta_bin_len > PSP_1_MEG)

		return -EINVAL;



	copy_pos += sizeof(uint32_t);



	ta_bin = kzalloc(ta_bin_len, GFP_KERNEL);

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

+3 −2
Original line number Diff line number Diff line
@@ -4116,6 +4116,7 @@ static void gfx_v10_0_check_gfxoff_flag(struct amdgpu_device *adev) 


static int gfx_v10_0_init_microcode(struct amdgpu_device *adev)

{

	char fw_name[53];

	char ucode_prefix[30];

	const char *wks = "";

	int err;
@@ -4149,8 +4150,8 @@ static int gfx_v10_0_init_microcode(struct amdgpu_device *adev) 
	amdgpu_gfx_cp_init_microcode(adev, AMDGPU_UCODE_ID_CP_CE);



	if (!amdgpu_sriov_vf(adev)) {

		err = amdgpu_ucode_request(adev, &adev->gfx.rlc_fw,

					   "amdgpu/%s_rlc.bin", ucode_prefix);

		snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_rlc.bin", ucode_prefix);

		err = request_firmware(&adev->gfx.rlc_fw, fw_name, adev->dev);

		if (err)

			goto out;

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

+10 −8
Original line number Diff line number Diff line
@@ -176,6 +176,7 @@ static void sdma_v5_2_ring_set_wptr(struct amdgpu_ring *ring) 
		DRM_DEBUG("calling WDOORBELL64(0x%08x, 0x%016llx)\n",

				ring->doorbell_index, ring->wptr << 2);

		WDOORBELL64(ring->doorbell_index, ring->wptr << 2);

		if (amdgpu_ip_version(adev, SDMA0_HWIP, 0) == IP_VERSION(5, 2, 1)) {

			/* SDMA seems to miss doorbells sometimes when powergating kicks in.

			 * Updating the wptr directly will wake it. This is only safe because

			 * we disallow gfxoff in begin_use() and then allow it again in end_use().
@@ -184,6 +185,7 @@ static void sdma_v5_2_ring_set_wptr(struct amdgpu_ring *ring) 
			       lower_32_bits(ring->wptr << 2));

			WREG32(sdma_v5_2_get_reg_offset(adev, ring->me, mmSDMA0_GFX_RB_WPTR_HI),

			       upper_32_bits(ring->wptr << 2));

		}

	} else {

		DRM_DEBUG("Not using doorbell -- "

				"mmSDMA%i_GFX_RB_WPTR == 0x%08x "

drivers/gpu/drm/i915/display/intel_dp_hdcp.c

+3 −1
Original line number Diff line number Diff line
@@ -39,7 +39,9 @@ static u32 transcoder_to_stream_enc_status(enum transcoder cpu_transcoder) 
static void intel_dp_hdcp_wait_for_cp_irq(struct intel_connector *connector,

					  int timeout)

{

	struct intel_hdcp *hdcp = &connector->hdcp;

	struct intel_digital_port *dig_port = intel_attached_dig_port(connector);

	struct intel_dp *dp = &dig_port->dp;

	struct intel_hdcp *hdcp = &dp->attached_connector->hdcp;

	long ret;



#define C (hdcp->cp_irq_count_cached != atomic_read(&hdcp->cp_irq_count))