From: Triet Hoang <[email protected]> Keep the scheduler allocation in rocket_file_priv and free it unconditionally in rocket_job_close().
Suggested-by: Igor Paunovic <[email protected]> Link: https://lore.kernel.org/all/[email protected]/#t Signed-off-by: Triet Hoang <[email protected]> --- drivers/accel/rocket/rocket_drv.h | 1 + drivers/accel/rocket/rocket_job.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/drivers/accel/rocket/rocket_drv.h b/drivers/accel/rocket/rocket_drv.h index 2c673bb99ccc..9421e48ec5d8 100644 --- a/drivers/accel/rocket/rocket_drv.h +++ b/drivers/accel/rocket/rocket_drv.h @@ -23,6 +23,7 @@ struct rocket_file_priv { struct drm_mm mm; struct mutex mm_lock; + struct drm_gpu_scheduler **scheds; struct drm_sched_entity sched_entity; }; diff --git a/drivers/accel/rocket/rocket_job.c b/drivers/accel/rocket/rocket_job.c index adcc792541ec..ff1d9e802024 100644 --- a/drivers/accel/rocket/rocket_job.c +++ b/drivers/accel/rocket/rocket_job.c @@ -514,8 +514,11 @@ int rocket_job_open(struct rocket_file_priv *rocket_priv) DRM_SCHED_PRIORITY_NORMAL, scheds, rdev->num_cores, NULL); + if (WARN_ON(ret)) kfree(scheds); + else + rocket_priv->scheds = scheds; return ret; } @@ -525,6 +528,7 @@ void rocket_job_close(struct rocket_file_priv *rocket_priv) struct drm_sched_entity *entity = &rocket_priv->sched_entity; kfree(entity->sched_list); + kfree(rocket_priv->scheds); drm_sched_entity_destroy(entity); } -- 2.53.0
