Commit 218b15a3 authored by Brigham Campbell's avatar Brigham Campbell Committed by Tomeu Vizoso
Browse files

accel/rocket: Fix Rockchip NPU compilation 



Replace DRM_GPU_SCHED_STAT_NOMINAL with GPU_DRM_SCHED_STAT_RESET, in
accordance with commit 0a5dc1b6 ("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
29565548 ("drm/sched: Store the drm client_id in drm_sched_fence")

Signed-off-by: default avatarBrigham Campbell <me@brighamcampbell.com>
Signed-off-by: default avatarTomeu Vizoso <tomeu@tomeuvizoso.net>
Link: https://lore.kernel.org/r/20250802-fix-rockchip-npu-build-v1-1-fb0f0dacb3fe@brighamcampbell.com
parent 82928cc1

drivers/accel/rocket/rocket_job.c

+2 −2
Original line number Diff line number Diff line
@@ -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;