Merge v5.6-rc1 into drm-misc-fixes

[tomoyo/tomoyo-test1.git] / drivers / gpu / drm / panfrost / panfrost_job.c

diff --git a/drivers/gpu/drm/panfrost/panfrost_job.c b/drivers/gpu/drm/panfrost/panfrost_job.c
index 4d38383..7157dfd 100644 (file)
--- a/drivers/gpu/drm/panfrost/panfrost_job.c
+++ b/drivers/gpu/drm/panfrost/panfrost_job.c
@@ -558,12 +558,14 @@ int panfrost_job_open(struct panfrost_file_priv *panfrost_priv)
 {
        struct panfrost_device *pfdev = panfrost_priv->pfdev;
        struct panfrost_job_slot *js = pfdev->js;
-       struct drm_sched_rq *rq;
+       struct drm_gpu_scheduler *sched;
        int ret, i;
 
        for (i = 0; i < NUM_JOB_SLOTS; i++) {
-               rq = &js->queue[i].sched.sched_rq[DRM_SCHED_PRIORITY_NORMAL];
-               ret = drm_sched_entity_init(&panfrost_priv->sched_entity[i], &rq, 1, NULL);
+               sched = &js->queue[i].sched;
+               ret = drm_sched_entity_init(&panfrost_priv->sched_entity[i],
+                                           DRM_SCHED_PRIORITY_NORMAL, &sched,
+                                           1, NULL);
                if (WARN_ON(ret))
                        return ret;
        }