Commit 5d97dde4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull drm fixes from Dave Airlie:
 "Weekly fixes, msm and xe are the two main ones, with a bunch of
  scattered fixes including a largish revert in mgag200, then amdgpu,
  vmwgfx and scattering of other minor ones.

  All seems pretty regular.

  msm:
   - Display:
      - move CRTC resource assignment to atomic_check otherwise to make
        consecutive calls to atomic_check() consistent
      - fix rounding / sign-extension issues with pclk calculation in
        case of DSC
      - cleanups to drop incorrect null checks in dpu snapshots
      - fix to use kvzalloc in dpu snapshot to avoid allocation issues
        in heavily loaded system cases
      - Fix to not program merge_3d block if dual LM is not being used
      - Fix to not flush merge_3d block if its not enabled otherwise
        this leads to false timeouts
   - GPU:
      - a7xx: add a fence wait before SMMU table update

  xe:
   - New workaround to Xe2 (Aradhya)
   - Fix unbalanced rpm put (Matthew Auld)
   - Remove fragile lock optimization (Matthew Brost)
   - Fix job release, delegating it to the drm scheduler (Matthew Brost)
   - Fix timestamp bit width for Xe2 (Lucas)
   - Fix external BO's dma-resv usag (Matthew Brost)
   - Fix returning success for timeout in wait_token (Nirmoy)
   - Initialize fence to avoid it being detected as signaled (Matthew
     Auld)
   - Improve cache flush for BMG (Matthew Auld)
   - Don't allow hflip for tile4 framebuffer on Xe2 (Juha-Pekka)

  amdgpu:
   - SR-IOV fix
   - CS chunk handling fix
   - MES fixes
   - SMU13 fixes

  amdkfd:
   - VRAM usage reporting fix

  radeon:
   - Fix possible_clones handling

  i915:
   - Two DP bandwidth related MST fixes

  ast:
   - Clear EDID on unplugged connectors

  host1x:
   - Fix boot on Tegra186
   - Set DMA parameters

  mgag200:
   - Revert VBLANK support

  panel:
   - himax-hx83192: Adjust power and gamma

  qaic:
   - Sgtable loop fixes

  vmwgfx:
   - Limit display layout allocatino size
   - Handle allocation errors in connector checks
   - Clean up KMS code for 2d-only setup
   - Report surface-check errors correctly
   - Remove NULL test around kvfree()"

* tag 'drm-fixes-2024-10-18' of https://gitlab.freedesktop.org/drm/kernel: (45 commits)
  drm/ast: vga: Clear EDID if no display is connected
  drm/ast: sil164: Clear EDID if no display is connected
  Revert "drm/mgag200: Add vblank support"
  drm/amdgpu/swsmu: default to fullscreen 3D profile for dGPUs
  drm/i915/display: Don't allow tile4 framebuffer to do hflip on display20 or greater
  drm/xe/bmg: improve cache flushing behaviour
  drm/xe/xe_sync: initialise ufence.signalled
  drm/xe/ufence: ufence can be signaled right after wait_woken
  drm/xe: Use bookkeep slots for external BO's in exec IOCTL
  drm/xe/query: Increase timestamp width
  drm/xe: Don't free job in TDR
  drm/xe: Take job list lock in xe_sched_add_pending_job
  drm/xe: fix unbalanced rpm put() with declare_wedged()
  drm/xe: fix unbalanced rpm put() with fence_fini()
  drm/xe/xe2lpg: Extend Wa_15016589081 for xe2lpg
  drm/i915/dp_mst: Don't require DSC hblank quirk for a non-DSC compatible mode
  drm/i915/dp_mst: Handle error during DSC BW overhead/slice calculation
  drm/msm/a6xx+: Insert a fence wait before SMMU table update
  drm/msm/dpu: don't always program merge_3d block
  drm/msm/dpu: Don't always set merge_3d pending flush
  ...
parents b1b46751 83f00078

drivers/accel/qaic/qaic_control.c

+1 −1
Original line number Diff line number Diff line
@@ -496,7 +496,7 @@ static int encode_addr_size_pairs(struct dma_xfer *xfer, struct wrapper_list *wr 
	nents = sgt->nents;

	nents_dma = nents;

	*size = QAIC_MANAGE_EXT_MSG_LENGTH - msg_hdr_len - sizeof(**out_trans);

	for_each_sgtable_sg(sgt, sg, i) {

	for_each_sgtable_dma_sg(sgt, sg, i) {

		*size -= sizeof(*asp);

		/* Save 1K for possible follow-up transactions. */

		if (*size < SZ_1K) {

drivers/accel/qaic/qaic_data.c

+3 −3
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ static int clone_range_of_sgt_for_slice(struct qaic_device *qdev, struct sg_tabl 
	nents = 0;



	size = size ? size : PAGE_SIZE;

	for (sg = sgt_in->sgl; sg; sg = sg_next(sg)) {

	for_each_sgtable_dma_sg(sgt_in, sg, j) {

		len = sg_dma_len(sg);



		if (!len)
@@ -221,7 +221,7 @@ static int clone_range_of_sgt_for_slice(struct qaic_device *qdev, struct sg_tabl 


	/* copy relevant sg node and fix page and length */

	sgn = sgf;

	for_each_sgtable_sg(sgt, sg, j) {

	for_each_sgtable_dma_sg(sgt, sg, j) {

		memcpy(sg, sgn, sizeof(*sg));

		if (sgn == sgf) {

			sg_dma_address(sg) += offf;
@@ -301,7 +301,7 @@ static int encode_reqs(struct qaic_device *qdev, struct bo_slice *slice, 
	 * fence.

	 */

	dev_addr = req->dev_addr;

	for_each_sgtable_sg(slice->sgt, sg, i) {

	for_each_sgtable_dma_sg(slice->sgt, sg, i) {

		slice->reqs[i].cmd = cmd;

		slice->reqs[i].src_addr = cpu_to_le64(slice->dir == DMA_TO_DEVICE ?

						      sg_dma_address(sg) : dev_addr);

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

+1 −1
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ static int amdgpu_cs_pass1(struct amdgpu_cs_parser *p, 


			/* Only a single BO list is allowed to simplify handling. */

			if (p->bo_list)

				ret = -EINVAL;

				goto free_partial_kdata;



			ret = amdgpu_cs_p1_bo_handles(p, p->chunks[i].kdata);

			if (ret)

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

+4 −7
Original line number Diff line number Diff line
@@ -1635,11 +1635,9 @@ int amdgpu_gfx_sysfs_isolation_shader_init(struct amdgpu_device *adev) 
{

	int r;



	if (!amdgpu_sriov_vf(adev)) {

	r = device_create_file(adev->dev, &dev_attr_enforce_isolation);

	if (r)

		return r;

	}



	r = device_create_file(adev->dev, &dev_attr_run_cleaner_shader);

	if (r)
@@ -1650,7 +1648,6 @@ int amdgpu_gfx_sysfs_isolation_shader_init(struct amdgpu_device *adev) 


void amdgpu_gfx_sysfs_isolation_shader_fini(struct amdgpu_device *adev)

{

	if (!amdgpu_sriov_vf(adev))

	device_remove_file(adev->dev, &dev_attr_enforce_isolation);

	device_remove_file(adev->dev, &dev_attr_run_cleaner_shader);

}

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

+3 −2
Original line number Diff line number Diff line
@@ -1203,8 +1203,10 @@ int amdgpu_mes_add_ring(struct amdgpu_device *adev, int gang_id, 


	r = amdgpu_ring_init(adev, ring, 1024, NULL, 0,

			     AMDGPU_RING_PRIO_DEFAULT, NULL);

	if (r)

	if (r) {

		amdgpu_mes_unlock(&adev->mes);

		goto clean_up_memory;

	}



	amdgpu_mes_ring_to_queue_props(adev, ring, &qprops);
@@ -1237,7 +1239,6 @@ int amdgpu_mes_add_ring(struct amdgpu_device *adev, int gang_id, 
	amdgpu_ring_fini(ring);

clean_up_memory:

	kfree(ring);

	amdgpu_mes_unlock(&adev->mes);

	return r;

}