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

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

Pull drm fixes from Dave Airlie:
 "As per usual xe/amdgpu are the leaders, with some i915 and then a
  bunch of scattered fixes. There are a bunch of stability fixes for
  some older amdgpu cards.

  draw:
   - Avoid color truncation

  gpuvm:
   - Avoid kernel-doc warning

  sched:
   - Avoid double free

  i915:
   - Skip GuC communication warning if reset is in progress
   - Couple frontbuffer related fixes
   - Deactivate PSR only on LNL and when selective fetch enabled

  xe:
   - Increase global invalidation timeout to handle some workloads
   - Fix NPD while evicting BOs in an array of VM binds
   - Fix resizable BAR to account for possibly needing to move BARs
     other than the LMEMBAR
   - Fix error handling in xe_migrate_init()
   - Fix atomic fault handling with mixed mappings or if the page is
     already in VRAM
   - Enable media samplers power gating for platforms before Xe2
   - Fix de-registering exec queue from GuC when unbinding
   - Ensure data migration to system if indicated by madvise with SVM
   - Fix kerneldoc for kunit change
   - Always account for cacheline alignment on migration
   - Drop bogus assertion on eviction

  amdgpu:
   - Backlight fix
   - SI fixes
   - CIK fix
   - Make CE support debug only
   - IP discovery fix
   - Ring reset fixes
   - GPUVM fault memory barrier fix
   - Drop unused structures in amdgpu_drm.h
   - JPEG debugfs fix
   - VRAM handling fixes for GPUs without VRAM
   - GC 12 MES fixes

  amdkfd:
   - MES fix

  ast:
   - Fix display output after reboot

  bridge:
   - lt9211: Fix version check

  panthor:
   - Fix MCU suspend

  qaic:
   - Init bootlog in correct order
   - Treat remaining == 0 as error in find_and_map_user_pages()
   - Lock access to DBC request queue

  rockchip:
   - vop2: Fix destination size in atomic check"

* tag 'drm-fixes-2025-10-17' of https://gitlab.freedesktop.org/drm/kernel: (44 commits)
  drm/sched: Fix potential double free in drm_sched_job_add_resv_dependencies
  drm/xe/evict: drop bogus assert
  drm/xe/migrate: don't misalign current bytes
  drm/xe/kunit: Fix kerneldoc for parameterized tests
  drm/xe/svm: Ensure data will be migrated to system if indicated by madvise.
  drm/gpuvm: Fix kernel-doc warning for drm_gpuvm_map_req.map
  drm/i915/psr: Deactivate PSR only on LNL and when selective fetch enabled
  drm/ast: Blank with VGACR17 sync enable, always clear VGACRB6 sync off
  accel/qaic: Synchronize access to DBC request queue head & tail pointer
  accel/qaic: Treat remaining == 0 as error in find_and_map_user_pages()
  accel/qaic: Fix bootlog initialization ordering
  drm/rockchip: vop2: use correct destination rectangle height check
  drm/draw: fix color truncation in drm_draw_fill24
  drm/xe/guc: Check GuC running state before deregistering exec queue
  drm/xe: Enable media sampler power gating
  drm/xe: Handle mixed mappings and existing VRAM on atomic faults
  drm/xe/migrate: Fix an error path
  drm/xe: Move rebar to be done earlier
  drm/xe: Don't allow evicting of BOs in same VM in array of VM binds
  drm/xe: Increase global invalidation timeout to 1000us
  ...
parents 389dfd9d 62cab426

drivers/accel/qaic/qaic.h

+2 −0
Original line number Diff line number Diff line
@@ -97,6 +97,8 @@ struct dma_bridge_chan { 
	 * response queue's head and tail pointer of this DBC.

	 */

	void __iomem		*dbc_base;

	/* Synchronizes access to Request queue's head and tail pointer */

	struct mutex		req_lock;

	/* Head of list where each node is a memory handle queued in request queue */

	struct list_head	xfer_list;

	/* Synchronizes DBC readers during cleanup */

drivers/accel/qaic/qaic_control.c

+1 −1
Original line number Diff line number Diff line
@@ -407,7 +407,7 @@ static int find_and_map_user_pages(struct qaic_device *qdev, 
		return -EINVAL;

	remaining = in_trans->size - resources->xferred_dma_size;

	if (remaining == 0)

		return 0;

		return -EINVAL;



	if (check_add_overflow(xfer_start_addr, remaining, &end))

		return -EINVAL;

drivers/accel/qaic/qaic_data.c

+10 −2
Original line number Diff line number Diff line
@@ -1356,13 +1356,17 @@ static int __qaic_execute_bo_ioctl(struct drm_device *dev, void *data, struct dr 
		goto release_ch_rcu;

	}



	ret = mutex_lock_interruptible(&dbc->req_lock);

	if (ret)

		goto release_ch_rcu;



	head = readl(dbc->dbc_base + REQHP_OFF);

	tail = readl(dbc->dbc_base + REQTP_OFF);



	if (head == U32_MAX || tail == U32_MAX) {

		/* PCI link error */

		ret = -ENODEV;

		goto release_ch_rcu;

		goto unlock_req_lock;

	}



	queue_level = head <= tail ? tail - head : dbc->nelem - (head - tail);
@@ -1370,11 +1374,12 @@ static int __qaic_execute_bo_ioctl(struct drm_device *dev, void *data, struct dr 
	ret = send_bo_list_to_device(qdev, file_priv, exec, args->hdr.count, is_partial, dbc,

				     head, &tail);

	if (ret)

		goto release_ch_rcu;

		goto unlock_req_lock;



	/* Finalize commit to hardware */

	submit_ts = ktime_get_ns();

	writel(tail, dbc->dbc_base + REQTP_OFF);

	mutex_unlock(&dbc->req_lock);



	update_profiling_data(file_priv, exec, args->hdr.count, is_partial, received_ts,

			      submit_ts, queue_level);
@@ -1382,6 +1387,9 @@ static int __qaic_execute_bo_ioctl(struct drm_device *dev, void *data, struct dr 
	if (datapath_polling)

		schedule_work(&dbc->poll_work);



unlock_req_lock:

	if (ret)

		mutex_unlock(&dbc->req_lock);

release_ch_rcu:

	srcu_read_unlock(&dbc->ch_lock, rcu_id);

unlock_dev_srcu:

drivers/accel/qaic/qaic_debugfs.c

+3 −2
Original line number Diff line number Diff line
@@ -218,6 +218,9 @@ static int qaic_bootlog_mhi_probe(struct mhi_device *mhi_dev, const struct mhi_d 
	if (ret)

		goto destroy_workqueue;



	dev_set_drvdata(&mhi_dev->dev, qdev);

	qdev->bootlog_ch = mhi_dev;



	for (i = 0; i < BOOTLOG_POOL_SIZE; i++) {

		msg = devm_kzalloc(&qdev->pdev->dev, sizeof(*msg), GFP_KERNEL);

		if (!msg) {
@@ -233,8 +236,6 @@ static int qaic_bootlog_mhi_probe(struct mhi_device *mhi_dev, const struct mhi_d 
			goto mhi_unprepare;

	}



	dev_set_drvdata(&mhi_dev->dev, qdev);

	qdev->bootlog_ch = mhi_dev;

	return 0;



mhi_unprepare:

drivers/accel/qaic/qaic_drv.c

+3 −0
Original line number Diff line number Diff line
@@ -454,6 +454,9 @@ static struct qaic_device *create_qdev(struct pci_dev *pdev, 
			return NULL;

		init_waitqueue_head(&qdev->dbc[i].dbc_release);

		INIT_LIST_HEAD(&qdev->dbc[i].bo_lists);

		ret = drmm_mutex_init(drm, &qdev->dbc[i].req_lock);

		if (ret)

			return NULL;

	}



	return qdev;