[PATCH] drm/sched: Add device pointer to drm_gpu_scheduler

[Jiawei Gu]

Add device pointer so scheduler's printing can use
DRM_DEV_ERROR() instead, which makes life easier under multiple GPU
scenario.

Signed-off-by: Jiawei Gu <jiawei...@amd.com>
---
 drivers/gpu/drm/scheduler/sched_main.c | 9 +++++----
 include/drm/gpu_scheduler.h            | 3 ++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/scheduler/sched_main.c 
b/drivers/gpu/drm/scheduler/sched_main.c
index 3e0bbc797eaa..4404af323321 100644
--- a/drivers/gpu/drm/scheduler/sched_main.c
+++ b/drivers/gpu/drm/scheduler/sched_main.c
@@ -489,7 +489,7 @@ void drm_sched_start(struct drm_gpu_scheduler *sched, bool 
full_recovery)
                        if (r == -ENOENT)
                                drm_sched_job_done(s_job);
                        else if (r)
-                               DRM_ERROR("fence add callback failed (%d)\n",
+                               DRM_DEV_ERROR(sched->dev, "fence add callback 
failed (%d)\n",
                                          r);
                } else
                        drm_sched_job_done(s_job);
@@ -815,7 +815,7 @@ static int drm_sched_main(void *param)
                        if (r == -ENOENT)
                                drm_sched_job_done(sched_job);
                        else if (r)
-                               DRM_ERROR("fence add callback failed (%d)\n",
+                               DRM_DEV_ERROR(sched->dev, "fence add callback 
failed (%d)\n",
                                          r);
                        dma_fence_put(fence);
                } else {
@@ -846,7 +846,7 @@ static int drm_sched_main(void *param)
 int drm_sched_init(struct drm_gpu_scheduler *sched,
                   const struct drm_sched_backend_ops *ops,
                   unsigned hw_submission, unsigned hang_limit, long timeout,
-                  atomic_t *score, const char *name)
+                  atomic_t *score, const char *name, struct device *dev)
 {
        int i, ret;
        sched->ops = ops;
@@ -855,6 +855,7 @@ int drm_sched_init(struct drm_gpu_scheduler *sched,
        sched->timeout = timeout;
        sched->hang_limit = hang_limit;
        sched->score = score ? score : &sched->_score;
+       sched->dev = dev;
        for (i = DRM_SCHED_PRIORITY_MIN; i < DRM_SCHED_PRIORITY_COUNT; i++)
                drm_sched_rq_init(sched, &sched->sched_rq[i]);
 
@@ -872,7 +873,7 @@ int drm_sched_init(struct drm_gpu_scheduler *sched,
        if (IS_ERR(sched->thread)) {
                ret = PTR_ERR(sched->thread);
                sched->thread = NULL;
-               DRM_ERROR("Failed to create scheduler for %s.\n", name);
+               DRM_DEV_ERROR(sched->dev, "Failed to create scheduler for 
%s.\n", name);
                return ret;
        }
 
diff --git a/include/drm/gpu_scheduler.h b/include/drm/gpu_scheduler.h
index d18af49fd009..38a479879fdb 100644
--- a/include/drm/gpu_scheduler.h
+++ b/include/drm/gpu_scheduler.h
@@ -302,12 +302,13 @@ struct drm_gpu_scheduler {
        atomic_t                        _score;
        bool                            ready;
        bool                            free_guilty;
+       struct device                   *dev;
 };
 
 int drm_sched_init(struct drm_gpu_scheduler *sched,
                   const struct drm_sched_backend_ops *ops,
                   uint32_t hw_submission, unsigned hang_limit, long timeout,
-                  atomic_t *score, const char *name);
+                  atomic_t *score, const char *name, struct device *dev);
 
 void drm_sched_fini(struct drm_gpu_scheduler *sched);
 int drm_sched_job_init(struct drm_sched_job *job,
-- 
2.17.1