From: Brigham Campbell Date: Sat, 2 Aug 2025 19:25:46 +0000 (-0600) Subject: accel/rocket: Fix Rockchip NPU compilation X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=218b15a3e9755c9cae79941b4bec22a4e8ad8758;p=users%2Fhch%2Fmisc.git accel/rocket: Fix Rockchip NPU compilation Replace DRM_GPU_SCHED_STAT_NOMINAL with GPU_DRM_SCHED_STAT_RESET, in accordance with commit 0a5dc1b67ef5 ("drm/sched: Rename DRM_GPU_SCHED_STAT_NOMINAL to DRM_GPU_SCHED_STAT_RESET") Pass extra parameter to drm_sched_job_init, as required by commit 2956554823ce ("drm/sched: Store the drm client_id in drm_sched_fence") Signed-off-by: Brigham Campbell Signed-off-by: Tomeu Vizoso Link: https://lore.kernel.org/r/20250802-fix-rockchip-npu-build-v1-1-fb0f0dacb3fe@brighamcampbell.com --- diff --git a/drivers/accel/rocket/rocket_job.c b/drivers/accel/rocket/rocket_job.c index e731da15ebff..5d4afd692306 100644 --- a/drivers/accel/rocket/rocket_job.c +++ b/drivers/accel/rocket/rocket_job.c @@ -390,7 +390,7 @@ static enum drm_gpu_sched_stat rocket_job_timedout(struct drm_sched_job *sched_j atomic_set(&core->reset.pending, 1); rocket_reset(core, sched_job); - return DRM_GPU_SCHED_STAT_NOMINAL; + return DRM_GPU_SCHED_STAT_RESET; } static void rocket_reset_work(struct work_struct *work) @@ -552,7 +552,7 @@ static int rocket_ioctl_submit_job(struct drm_device *dev, struct drm_file *file ret = drm_sched_job_init(&rjob->base, &file_priv->sched_entity, - 1, NULL); + 1, NULL, file->client_id); if (ret) goto out_put_job;