Commit 3c4c39cb authored by Simona Vetter's avatar Simona Vetter
Browse files

Merge tag 'drm-misc-fixes-2025-05-28' of... 

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

 into drm-fixes

Short summary of fixes pull:

drm-scheduler:
- signal scheduled fence when killing job

dummycon:
- trigger deferred takeover when switching consoles

ivpu:
- improve logging
- update firmware filenames
- reorder steps in command-queue unregistering

Signed-off-by: default avatarSimona Vetter <simona.vetter@ffwll.ch>
From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20250528153550.GA21050@linux.fritz.box
parents 0ff41df1 4557cc83

drivers/accel/ivpu/ivpu_fw.c

+6 −6
Original line number Diff line number Diff line
@@ -55,18 +55,18 @@ static struct { 
	int gen;

	const char *name;

} fw_names[] = {

	{ IVPU_HW_IP_37XX, "vpu_37xx.bin" },

	{ IVPU_HW_IP_37XX, "intel/vpu/vpu_37xx_v1.bin" },

	{ IVPU_HW_IP_37XX, "intel/vpu/vpu_37xx_v0.0.bin" },

	{ IVPU_HW_IP_40XX, "vpu_40xx.bin" },

	{ IVPU_HW_IP_40XX, "intel/vpu/vpu_40xx_v1.bin" },

	{ IVPU_HW_IP_40XX, "intel/vpu/vpu_40xx_v0.0.bin" },

	{ IVPU_HW_IP_50XX, "vpu_50xx.bin" },

	{ IVPU_HW_IP_50XX, "intel/vpu/vpu_50xx_v1.bin" },

	{ IVPU_HW_IP_50XX, "intel/vpu/vpu_50xx_v0.0.bin" },

};



/* Production fw_names from the table above */

MODULE_FIRMWARE("intel/vpu/vpu_37xx_v0.0.bin");

MODULE_FIRMWARE("intel/vpu/vpu_40xx_v0.0.bin");

MODULE_FIRMWARE("intel/vpu/vpu_50xx_v0.0.bin");

MODULE_FIRMWARE("intel/vpu/vpu_37xx_v1.bin");

MODULE_FIRMWARE("intel/vpu/vpu_40xx_v1.bin");

MODULE_FIRMWARE("intel/vpu/vpu_50xx_v1.bin");



static int ivpu_fw_request(struct ivpu_device *vdev)

{

drivers/accel/ivpu/ivpu_gem.c

+17 −8
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ static inline void ivpu_dbg_bo(struct ivpu_device *vdev, struct ivpu_bo *bo, con 
{

	ivpu_dbg(vdev, BO,

		 "%6s: bo %8p vpu_addr %9llx size %8zu ctx %d has_pages %d dma_mapped %d mmu_mapped %d wc %d imported %d\n",

		 action, bo, bo->vpu_addr, ivpu_bo_size(bo), bo->ctx ? bo->ctx->id : 0,

		 action, bo, bo->vpu_addr, ivpu_bo_size(bo), bo->ctx_id,

		 (bool)bo->base.pages, (bool)bo->base.sgt, bo->mmu_mapped, bo->base.map_wc,

		 (bool)bo->base.base.import_attach);

}
@@ -94,8 +94,6 @@ ivpu_bo_alloc_vpu_addr(struct ivpu_bo *bo, struct ivpu_mmu_context *ctx, 
		ivpu_err(vdev, "Failed to add BO to context %u: %d\n", ctx->id, ret);

	}



	ivpu_dbg_bo(vdev, bo, "alloc");



	mutex_unlock(&bo->lock);



	drm_dev_exit(idx);
@@ -215,7 +213,7 @@ struct drm_gem_object *ivpu_gem_prime_import(struct drm_device *dev, 
	return ERR_PTR(ret);

}



static struct ivpu_bo *ivpu_bo_alloc(struct ivpu_device *vdev, u64 size, u32 flags)

static struct ivpu_bo *ivpu_bo_alloc(struct ivpu_device *vdev, u64 size, u32 flags, u32 ctx_id)

{

	struct drm_gem_shmem_object *shmem;

	struct ivpu_bo *bo;
@@ -233,6 +231,7 @@ static struct ivpu_bo *ivpu_bo_alloc(struct ivpu_device *vdev, u64 size, u32 fla 
		return ERR_CAST(shmem);



	bo = to_ivpu_bo(&shmem->base);

	bo->ctx_id = ctx_id;

	bo->base.map_wc = flags & DRM_IVPU_BO_WC;

	bo->flags = flags;
@@ -240,6 +239,8 @@ static struct ivpu_bo *ivpu_bo_alloc(struct ivpu_device *vdev, u64 size, u32 fla 
	list_add_tail(&bo->bo_list_node, &vdev->bo_list);

	mutex_unlock(&vdev->bo_list_lock);



	ivpu_dbg_bo(vdev, bo, "alloc");



	return bo;

}
@@ -278,8 +279,13 @@ static void ivpu_gem_bo_free(struct drm_gem_object *obj) 
	mutex_unlock(&vdev->bo_list_lock);



	drm_WARN_ON(&vdev->drm, !dma_resv_test_signaled(obj->resv, DMA_RESV_USAGE_READ));

	drm_WARN_ON(&vdev->drm, ivpu_bo_size(bo) == 0);

	drm_WARN_ON(&vdev->drm, bo->base.vaddr);



	ivpu_bo_unbind_locked(bo);

	drm_WARN_ON(&vdev->drm, bo->mmu_mapped);

	drm_WARN_ON(&vdev->drm, bo->ctx);



	mutex_destroy(&bo->lock);



	drm_WARN_ON(obj->dev, bo->base.pages_use_count > 1);
@@ -314,7 +320,7 @@ int ivpu_bo_create_ioctl(struct drm_device *dev, void *data, struct drm_file *fi 
	if (size == 0)

		return -EINVAL;



	bo = ivpu_bo_alloc(vdev, size, args->flags);

	bo = ivpu_bo_alloc(vdev, size, args->flags, file_priv->ctx.id);

	if (IS_ERR(bo)) {

		ivpu_err(vdev, "Failed to allocate BO: %pe (ctx %u size %llu flags 0x%x)",

			 bo, file_priv->ctx.id, args->size, args->flags);
@@ -322,7 +328,10 @@ int ivpu_bo_create_ioctl(struct drm_device *dev, void *data, struct drm_file *fi 
	}



	ret = drm_gem_handle_create(file, &bo->base.base, &args->handle);

	if (!ret)

	if (ret)

		ivpu_err(vdev, "Failed to create handle for BO: %pe (ctx %u size %llu flags 0x%x)",

			 bo, file_priv->ctx.id, args->size, args->flags);

	else

		args->vpu_addr = bo->vpu_addr;



	drm_gem_object_put(&bo->base.base);
@@ -345,7 +354,7 @@ ivpu_bo_create(struct ivpu_device *vdev, struct ivpu_mmu_context *ctx, 
	drm_WARN_ON(&vdev->drm, !PAGE_ALIGNED(range->end));

	drm_WARN_ON(&vdev->drm, !PAGE_ALIGNED(size));



	bo = ivpu_bo_alloc(vdev, size, flags);

	bo = ivpu_bo_alloc(vdev, size, flags, IVPU_GLOBAL_CONTEXT_MMU_SSID);

	if (IS_ERR(bo)) {

		ivpu_err(vdev, "Failed to allocate BO: %pe (vpu_addr 0x%llx size %llu flags 0x%x)",

			 bo, range->start, size, flags);
@@ -452,7 +461,7 @@ static void ivpu_bo_print_info(struct ivpu_bo *bo, struct drm_printer *p) 
	mutex_lock(&bo->lock);



	drm_printf(p, "%-9p %-3u 0x%-12llx %-10lu 0x%-8x %-4u",

		   bo, bo->ctx ? bo->ctx->id : 0, bo->vpu_addr, bo->base.base.size,

		   bo, bo->ctx_id, bo->vpu_addr, bo->base.base.size,

		   bo->flags, kref_read(&bo->base.base.refcount));



	if (bo->base.pages)

drivers/accel/ivpu/ivpu_gem.h

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ struct ivpu_bo { 
	u64 vpu_addr;

	u32 flags;

	u32 job_status; /* Valid only for command buffer */

	u32 ctx_id;

	bool mmu_mapped;

};

drivers/accel/ivpu/ivpu_job.c

+4 −4
Original line number Diff line number Diff line
@@ -247,6 +247,10 @@ static int ivpu_cmdq_unregister(struct ivpu_file_priv *file_priv, struct ivpu_cm 
	if (!cmdq->db_id)

		return 0;



	ret = ivpu_jsm_unregister_db(vdev, cmdq->db_id);

	if (!ret)

		ivpu_dbg(vdev, JOB, "DB %d unregistered\n", cmdq->db_id);



	if (vdev->fw->sched_mode == VPU_SCHEDULING_MODE_HW) {

		ret = ivpu_jsm_hws_destroy_cmdq(vdev, file_priv->ctx.id, cmdq->id);

		if (!ret)
@@ -254,10 +258,6 @@ static int ivpu_cmdq_unregister(struct ivpu_file_priv *file_priv, struct ivpu_cm 
				 cmdq->id, file_priv->ctx.id);

	}



	ret = ivpu_jsm_unregister_db(vdev, cmdq->db_id);

	if (!ret)

		ivpu_dbg(vdev, JOB, "DB %d unregistered\n", cmdq->db_id);



	xa_erase(&file_priv->vdev->db_xa, cmdq->db_id);

	cmdq->db_id = 0;

drivers/gpu/drm/scheduler/sched_entity.c

+1 −0
Original line number Diff line number Diff line
@@ -176,6 +176,7 @@ static void drm_sched_entity_kill_jobs_work(struct work_struct *wrk) 
{

	struct drm_sched_job *job = container_of(wrk, typeof(*job), work);



	drm_sched_fence_scheduled(job->s_fence, NULL);

	drm_sched_fence_finished(job->s_fence, -ESRCH);

	WARN_ON(job->s_fence->parent);

	job->sched->ops->free_job(job);