drm/sched: Add device pointer to drm_gpu_scheduler

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

v2: amend all calls of drm_sched_init()
v3: fill dev pointer for all drm_sched_init() calls

Signed-off-by: Jiawei Gu <Jiawei.Gu@amd.com>
Reviewed-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Christian König <christian.koenig@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220221095705.5290-1-Jiawei.Gu@amd.com

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index d78141e2c509051a8f96d296cd3d3647bdc2d338..cd1f9140a878b828582bdf16a500496e542e6950 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -2316,7 +2316,9 @@ static int amdgpu_device_init_schedulers(struct amdgpu_device *adev)
 
                r = drm_sched_init(&ring->sched, &amdgpu_sched_ops,
                                   ring->num_hw_submission, amdgpu_job_hang_limit,
-                                  timeout, adev->reset_domain->wq, ring->sched_score, ring->name);
+                                  timeout, adev->reset_domain->wq,
+                                  ring->sched_score, ring->name,
+                                  adev->dev);
                if (r) {
                        DRM_ERROR("Failed to create scheduler on ring %s.\n",
                                  ring->name);

diff --git a/drivers/gpu/drm/etnaviv/etnaviv_sched.c b/drivers/gpu/drm/etnaviv/etnaviv_sched.c
index 58f593b278c15b5adfd92580e88f78eb8bca9e27..35e5ef7dbdcc4faea1f99a5743178cffec23a128 100644 (file)
--- a/drivers/gpu/drm/etnaviv/etnaviv_sched.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_sched.c
@@ -195,7 +195,7 @@ int etnaviv_sched_init(struct etnaviv_gpu *gpu)
        ret = drm_sched_init(&gpu->sched, &etnaviv_sched_ops,
                             etnaviv_hw_jobs_limit, etnaviv_job_hang_limit,
                             msecs_to_jiffies(500), NULL, NULL,
-                            dev_name(gpu->dev));
+                            dev_name(gpu->dev), gpu->dev);
        if (ret)
                return ret;
 

diff --git a/drivers/gpu/drm/lima/lima_sched.c b/drivers/gpu/drm/lima/lima_sched.c
index 12437e42cc765d874ff48ccb7d630b36fc18f04f..9cf4c60f4fca818395b5299e0b1c7370be82613f 100644 (file)
--- a/drivers/gpu/drm/lima/lima_sched.c
+++ b/drivers/gpu/drm/lima/lima_sched.c
@@ -491,7 +491,7 @@ int lima_sched_pipe_init(struct lima_sched_pipe *pipe, const char *name)
        return drm_sched_init(&pipe->base, &lima_sched_ops, 1,
                              lima_job_hang_limit,
                              msecs_to_jiffies(timeout), NULL,
-                             NULL, name);
+                             NULL, name, pipe->ldev->dev);
 }
 
 void lima_sched_pipe_fini(struct lima_sched_pipe *pipe)

diff --git a/drivers/gpu/drm/msm/msm_ringbuffer.c b/drivers/gpu/drm/msm/msm_ringbuffer.c
index 3bbf574c3bdc6316e00995751d184ac1de559e6b..367a6aaa3a202a8d5329d17aa2bad9fae7a53091 100644 (file)
--- a/drivers/gpu/drm/msm/msm_ringbuffer.c
+++ b/drivers/gpu/drm/msm/msm_ringbuffer.c
@@ -89,7 +89,7 @@ struct msm_ringbuffer *msm_ringbuffer_new(struct msm_gpu *gpu, int id,
 
        ret = drm_sched_init(&ring->sched, &msm_sched_ops,
                        num_hw_submissions, 0, sched_timeout,
-                       NULL, NULL, to_msm_bo(ring->bo)->name);
+                       NULL, NULL, to_msm_bo(ring->bo)->name, gpu->dev->dev);
        if (ret) {
                goto fail;
        }

diff --git a/drivers/gpu/drm/panfrost/panfrost_job.c b/drivers/gpu/drm/panfrost/panfrost_job.c
index 908d79520853dd2f1526d36abdaf0e3f9bd008e8..a6925dbb6224f3bf81259bb5e0481f25bc797133 100644 (file)
--- a/drivers/gpu/drm/panfrost/panfrost_job.c
+++ b/drivers/gpu/drm/panfrost/panfrost_job.c
@@ -812,7 +812,7 @@ int panfrost_job_init(struct panfrost_device *pfdev)
                                     nentries, 0,
                                     msecs_to_jiffies(JOB_TIMEOUT_MS),
                                     pfdev->reset.wq,
-                                    NULL, "pan_js");
+                                    NULL, "pan_js", pfdev->dev);
                if (ret) {
                        dev_err(pfdev->dev, "Failed to create scheduler: %d.", ret);
                        goto err_sched;

diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/scheduler/sched_main.c
index f91fb31ab7a7c77e90631216d3b10de5cd92e5d8..b81fceb0b8a20eea3dd0f57aa1b0151a0e46be7a 100644 (file)
--- a/drivers/gpu/drm/scheduler/sched_main.c
+++ b/drivers/gpu/drm/scheduler/sched_main.c
@@ -491,7 +491,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);
@@ -957,7 +957,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 {
@@ -991,7 +991,7 @@ int drm_sched_init(struct drm_gpu_scheduler *sched,
                   const struct drm_sched_backend_ops *ops,
                   unsigned hw_submission, unsigned hang_limit,
                   long timeout, struct workqueue_struct *timeout_wq,
-                  atomic_t *score, const char *name)
+                  atomic_t *score, const char *name, struct device *dev)
 {
        int i, ret;
        sched->ops = ops;
@@ -1001,6 +1001,7 @@ int drm_sched_init(struct drm_gpu_scheduler *sched,
        sched->timeout_wq = timeout_wq ? : system_wq;
        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]);
 
@@ -1018,7 +1019,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/drivers/gpu/drm/v3d/v3d_sched.c b/drivers/gpu/drm/v3d/v3d_sched.c
index e0cb7d0697a77171fba7190d1f6268415b399a11..39459ae96f30cf610395d2861fb96afb660f353f 100644 (file)
--- a/drivers/gpu/drm/v3d/v3d_sched.c
+++ b/drivers/gpu/drm/v3d/v3d_sched.c
@@ -391,7 +391,7 @@ v3d_sched_init(struct v3d_dev *v3d)
                             &v3d_bin_sched_ops,
                             hw_jobs_limit, job_hang_limit,
                             msecs_to_jiffies(hang_limit_ms), NULL,
-                            NULL, "v3d_bin");
+                            NULL, "v3d_bin", v3d->drm.dev);
        if (ret) {
                dev_err(v3d->drm.dev, "Failed to create bin scheduler: %d.", ret);
                return ret;
@@ -401,7 +401,7 @@ v3d_sched_init(struct v3d_dev *v3d)
                             &v3d_render_sched_ops,
                             hw_jobs_limit, job_hang_limit,
                             msecs_to_jiffies(hang_limit_ms), NULL,
-                            NULL, "v3d_render");
+                            NULL, "v3d_render", v3d->drm.dev);
        if (ret) {
                dev_err(v3d->drm.dev, "Failed to create render scheduler: %d.",
                        ret);
@@ -413,7 +413,7 @@ v3d_sched_init(struct v3d_dev *v3d)
                             &v3d_tfu_sched_ops,
                             hw_jobs_limit, job_hang_limit,
                             msecs_to_jiffies(hang_limit_ms), NULL,
-                            NULL, "v3d_tfu");
+                            NULL, "v3d_tfu", v3d->drm.dev);
        if (ret) {
                dev_err(v3d->drm.dev, "Failed to create TFU scheduler: %d.",
                        ret);
@@ -426,7 +426,7 @@ v3d_sched_init(struct v3d_dev *v3d)
                                     &v3d_csd_sched_ops,
                                     hw_jobs_limit, job_hang_limit,
                                     msecs_to_jiffies(hang_limit_ms), NULL,
-                                    NULL, "v3d_csd");
+                                    NULL, "v3d_csd", v3d->drm.dev);
                if (ret) {
                        dev_err(v3d->drm.dev, "Failed to create CSD scheduler: %d.",
                                ret);
@@ -438,7 +438,7 @@ v3d_sched_init(struct v3d_dev *v3d)
                                     &v3d_cache_clean_sched_ops,
                                     hw_jobs_limit, job_hang_limit,
                                     msecs_to_jiffies(hang_limit_ms), NULL,
-                                    NULL, "v3d_cache_clean");
+                                    NULL, "v3d_cache_clean", v3d->drm.dev);
                if (ret) {
                        dev_err(v3d->drm.dev, "Failed to create CACHE_CLEAN scheduler: %d.",
                                ret);

diff --git a/include/drm/gpu_scheduler.h b/include/drm/gpu_scheduler.h
index bbc22fad8d802b033ca224d8cc0a0b156ef85bf7..944f83ef9f2ef550dd71813d4e3a795edbee036e 100644 (file)
--- a/include/drm/gpu_scheduler.h
+++ b/include/drm/gpu_scheduler.h
@@ -457,13 +457,14 @@ 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, struct workqueue_struct *timeout_wq,
-                  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,