Commit cbc3fa82 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2025-07-16' of... 

Merge tag 'drm-misc-fixes-2025-07-16' of https://gitlab.freedesktop.org/drm/misc/kernel

 into drm-fixes

drm-misc-fixes for v6.16 final?:
- nouveau ioctl validation fix.
- panfrost scheduler bug.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://lore.kernel.org/r/ee784a3a-30b4-489a-8503-b1be3b09268c@linux.intel.com
parents 347e9f50 cb345f95

drivers/gpu/drm/nouveau/nouveau_drm.c

+5 −6
Original line number Diff line number Diff line
@@ -1284,6 +1284,9 @@ nouveau_ioctls[] = { 
	DRM_IOCTL_DEF_DRV(NOUVEAU_EXEC, nouveau_exec_ioctl_exec, DRM_RENDER_ALLOW),

};



#define DRM_IOCTL_NOUVEAU_NVIF _IOC(_IOC_READ | _IOC_WRITE, DRM_IOCTL_BASE, \

				    DRM_COMMAND_BASE + DRM_NOUVEAU_NVIF, 0)



long

nouveau_drm_ioctl(struct file *file, unsigned int cmd, unsigned long arg)

{
@@ -1297,14 +1300,10 @@ nouveau_drm_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
		return ret;

	}



	switch (_IOC_NR(cmd) - DRM_COMMAND_BASE) {

	case DRM_NOUVEAU_NVIF:

	if ((cmd & ~IOCSIZE_MASK) == DRM_IOCTL_NOUVEAU_NVIF)

		ret = nouveau_abi16_ioctl(filp, (void __user *)arg, _IOC_SIZE(cmd));

		break;

	default:

	else

		ret = drm_ioctl(file, cmd, arg);

		break;

	}



	pm_runtime_mark_last_busy(dev->dev);

	pm_runtime_put_autosuspend(dev->dev);

drivers/gpu/drm/panfrost/panfrost_job.c

+1 −1
Original line number Diff line number Diff line
@@ -841,7 +841,6 @@ int panfrost_job_init(struct panfrost_device *pfdev) 
		.num_rqs = DRM_SCHED_PRIORITY_COUNT,

		.credit_limit = 2,

		.timeout = msecs_to_jiffies(JOB_TIMEOUT_MS),

		.timeout_wq = pfdev->reset.wq,

		.name = "pan_js",

		.dev = pfdev->dev,

	};
@@ -879,6 +878,7 @@ int panfrost_job_init(struct panfrost_device *pfdev) 
	pfdev->reset.wq = alloc_ordered_workqueue("panfrost-reset", 0);

	if (!pfdev->reset.wq)

		return -ENOMEM;

	args.timeout_wq = pfdev->reset.wq;



	for (j = 0; j < NUM_JOB_SLOTS; j++) {

		js->queue[j].fence_context = dma_fence_context_alloc(1);