niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

drm/sched: Add device pointer to drm_gpu_scheduler

Browse source 
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
This commit is contained in:
Jiawei Gu 2022-02-22 17:42:52 +08:00 • committed by Christian König
parent 95ee2a8b4b
commit 8ab62eda17
8 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
View file

@ -2316,7 +2316,9 @@ static int amdgpu_device_init_schedulers(struct amdgpu_device *adev)
r = drm_sched_init(&ring->sched, &amdgpu_sched_ops, r = drm_sched_init(&ring->sched, &amdgpu_sched_ops,
ring->num_hw_submission, amdgpu_job_hang_limit, 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) { if (r) {
DRM_ERROR("Failed to create scheduler on ring %s.\n", DRM_ERROR("Failed to create scheduler on ring %s.\n",
ring->name); ring->name);

2
drivers/gpu/drm/etnaviv/etnaviv_sched.c
View file

@ -195,7 +195,7 @@ int etnaviv_sched_init(struct etnaviv_gpu *gpu)
ret = drm_sched_init(&gpu->sched, &etnaviv_sched_ops, ret = drm_sched_init(&gpu->sched, &etnaviv_sched_ops,
etnaviv_hw_jobs_limit, etnaviv_job_hang_limit, etnaviv_hw_jobs_limit, etnaviv_job_hang_limit,
msecs_to_jiffies(500), NULL, NULL, msecs_to_jiffies(500), NULL, NULL,
dev_name(gpu->dev)); dev_name(gpu->dev), gpu->dev);
if (ret) if (ret)
return ret; return ret;

2
drivers/gpu/drm/lima/lima_sched.c
View file

@ -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, return drm_sched_init(&pipe->base, &lima_sched_ops, 1,
lima_job_hang_limit, lima_job_hang_limit,
msecs_to_jiffies(timeout), NULL, msecs_to_jiffies(timeout), NULL,
NULL, name); NULL, name, pipe->ldev->dev);
} }
void lima_sched_pipe_fini(struct lima_sched_pipe *pipe) void lima_sched_pipe_fini(struct lima_sched_pipe *pipe)

2
drivers/gpu/drm/msm/msm_ringbuffer.c
View file

@ -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, ret = drm_sched_init(&ring->sched, &msm_sched_ops,
num_hw_submissions, 0, sched_timeout, 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) { if (ret) {
goto fail; goto fail;
} }

2
drivers/gpu/drm/panfrost/panfrost_job.c
View file

@ -812,7 +812,7 @@ int panfrost_job_init(struct panfrost_device *pfdev)
nentries, 0, nentries, 0,
msecs_to_jiffies(JOB_TIMEOUT_MS), msecs_to_jiffies(JOB_TIMEOUT_MS),
pfdev->reset.wq, pfdev->reset.wq,
NULL, "pan_js"); NULL, "pan_js", pfdev->dev);
if (ret) { if (ret) {
dev_err(pfdev->dev, "Failed to create scheduler: %d.", ret); dev_err(pfdev->dev, "Failed to create scheduler: %d.", ret);
goto err_sched; goto err_sched;

9
drivers/gpu/drm/scheduler/sched_main.c
View file

@ -491,7 +491,7 @@ void drm_sched_start(struct drm_gpu_scheduler *sched, bool full_recovery)
if (r == -ENOENT) if (r == -ENOENT)
drm_sched_job_done(s_job); drm_sched_job_done(s_job);
else if (r) else if (r)
DRM_ERROR("fence add callback failed (%d)\n", DRM_DEV_ERROR(sched->dev, "fence add callback failed (%d)\n",
r); r);
} else } else
drm_sched_job_done(s_job); drm_sched_job_done(s_job);
@ -957,7 +957,7 @@ static int drm_sched_main(void *param)
if (r == -ENOENT) if (r == -ENOENT)
drm_sched_job_done(sched_job); drm_sched_job_done(sched_job);
else if (r) else if (r)
DRM_ERROR("fence add callback failed (%d)\n", DRM_DEV_ERROR(sched->dev, "fence add callback failed (%d)\n",
r); r);
dma_fence_put(fence); dma_fence_put(fence);
} else { } else {
@ -991,7 +991,7 @@ int drm_sched_init(struct drm_gpu_scheduler *sched,
const struct drm_sched_backend_ops *ops, const struct drm_sched_backend_ops *ops,
unsigned hw_submission, unsigned hang_limit, unsigned hw_submission, unsigned hang_limit,
long timeout, struct workqueue_struct *timeout_wq, 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; int i, ret;
sched->ops = ops; sched->ops = ops;
@ -1001,6 +1001,7 @@ int drm_sched_init(struct drm_gpu_scheduler *sched,
sched->timeout_wq = timeout_wq ? : system_wq; sched->timeout_wq = timeout_wq ? : system_wq;
sched->hang_limit = hang_limit; sched->hang_limit = hang_limit;
sched->score = score ? score : &sched->_score; sched->score = score ? score : &sched->_score;
sched->dev = dev;
for (i = DRM_SCHED_PRIORITY_MIN; i < DRM_SCHED_PRIORITY_COUNT; i++) for (i = DRM_SCHED_PRIORITY_MIN; i < DRM_SCHED_PRIORITY_COUNT; i++)
drm_sched_rq_init(sched, &sched->sched_rq[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)) { if (IS_ERR(sched->thread)) {
ret = PTR_ERR(sched->thread); ret = PTR_ERR(sched->thread);
sched->thread = NULL; 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; return ret;
} }

10
drivers/gpu/drm/v3d/v3d_sched.c
View file

@ -391,7 +391,7 @@ v3d_sched_init(struct v3d_dev *v3d)
&v3d_bin_sched_ops, &v3d_bin_sched_ops,
hw_jobs_limit, job_hang_limit, hw_jobs_limit, job_hang_limit,
msecs_to_jiffies(hang_limit_ms), NULL, msecs_to_jiffies(hang_limit_ms), NULL,
NULL, "v3d_bin"); NULL, "v3d_bin", v3d->drm.dev);
if (ret) { if (ret) {
dev_err(v3d->drm.dev, "Failed to create bin scheduler: %d.", ret); dev_err(v3d->drm.dev, "Failed to create bin scheduler: %d.", ret);
return ret; return ret;
@ -401,7 +401,7 @@ v3d_sched_init(struct v3d_dev *v3d)
&v3d_render_sched_ops, &v3d_render_sched_ops,
hw_jobs_limit, job_hang_limit, hw_jobs_limit, job_hang_limit,
msecs_to_jiffies(hang_limit_ms), NULL, msecs_to_jiffies(hang_limit_ms), NULL,
NULL, "v3d_render"); NULL, "v3d_render", v3d->drm.dev);
if (ret) { if (ret) {
dev_err(v3d->drm.dev, "Failed to create render scheduler: %d.", dev_err(v3d->drm.dev, "Failed to create render scheduler: %d.",
ret); ret);
@ -413,7 +413,7 @@ v3d_sched_init(struct v3d_dev *v3d)
&v3d_tfu_sched_ops, &v3d_tfu_sched_ops,
hw_jobs_limit, job_hang_limit, hw_jobs_limit, job_hang_limit,
msecs_to_jiffies(hang_limit_ms), NULL, msecs_to_jiffies(hang_limit_ms), NULL,
NULL, "v3d_tfu"); NULL, "v3d_tfu", v3d->drm.dev);
if (ret) { if (ret) {
dev_err(v3d->drm.dev, "Failed to create TFU scheduler: %d.", dev_err(v3d->drm.dev, "Failed to create TFU scheduler: %d.",
ret); ret);
@ -426,7 +426,7 @@ v3d_sched_init(struct v3d_dev *v3d)
&v3d_csd_sched_ops, &v3d_csd_sched_ops,
hw_jobs_limit, job_hang_limit, hw_jobs_limit, job_hang_limit,
msecs_to_jiffies(hang_limit_ms), NULL, msecs_to_jiffies(hang_limit_ms), NULL,
NULL, "v3d_csd"); NULL, "v3d_csd", v3d->drm.dev);
if (ret) { if (ret) {
dev_err(v3d->drm.dev, "Failed to create CSD scheduler: %d.", dev_err(v3d->drm.dev, "Failed to create CSD scheduler: %d.",
ret); ret);
@ -438,7 +438,7 @@ v3d_sched_init(struct v3d_dev *v3d)
&v3d_cache_clean_sched_ops, &v3d_cache_clean_sched_ops,
hw_jobs_limit, job_hang_limit, hw_jobs_limit, job_hang_limit,
msecs_to_jiffies(hang_limit_ms), NULL, msecs_to_jiffies(hang_limit_ms), NULL,
NULL, "v3d_cache_clean"); NULL, "v3d_cache_clean", v3d->drm.dev);
if (ret) { if (ret) {
dev_err(v3d->drm.dev, "Failed to create CACHE_CLEAN scheduler: %d.", dev_err(v3d->drm.dev, "Failed to create CACHE_CLEAN scheduler: %d.",
ret); ret);

3
include/drm/gpu_scheduler.h
View file

@ -457,13 +457,14 @@ struct drm_gpu_scheduler {
atomic_t _score; atomic_t _score;
bool ready; bool ready;
bool free_guilty; bool free_guilty;
struct device *dev;
}; };
int drm_sched_init(struct drm_gpu_scheduler *sched, int drm_sched_init(struct drm_gpu_scheduler *sched,
const struct drm_sched_backend_ops *ops, const struct drm_sched_backend_ops *ops,
uint32_t hw_submission, unsigned hang_limit, uint32_t hw_submission, unsigned hang_limit,
long timeout, struct workqueue_struct *timeout_wq, 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); void drm_sched_fini(struct drm_gpu_scheduler *sched);
int drm_sched_job_init(struct drm_sched_job *job, int drm_sched_job_init(struct drm_sched_job *job,