diff options
| author | Rob Clark <robdclark@chromium.org> | 2023-03-20 15:43:31 +0100 |
|---|---|---|
| committer | Rob Clark <robdclark@chromium.org> | 2023-03-26 00:31:44 +0100 |
| commit | 17b704f1c0fb9150551567cb7a5414fb761b57ea (patch) | |
| tree | 04a5576c88cec987b31d6ebdb549ce893367174d /drivers/gpu/drm/msm/msm_ringbuffer.c | |
| parent | drm/msm/gem: Protect pin_count/madv by LRU lock (diff) | |
| download | linux-17b704f1c0fb9150551567cb7a5414fb761b57ea.tar.xz linux-17b704f1c0fb9150551567cb7a5414fb761b57ea.zip | |
drm/msm/gem: Avoid obj lock in job_run()
Now that everything that controls which LRU an obj lives in *except* the
backing pages is protected by the LRU lock, add a special path to unpin
in the job_run() path, where we are assured that we already have backing
pages and will not be racing against eviction (because the GEM object's
dma_resv contains the fence that will be signaled when the submit/job
completes).
Signed-off-by: Rob Clark <robdclark@chromium.org>
Patchwork: https://patchwork.freedesktop.org/patch/527845/
Link: https://lore.kernel.org/r/20230320144356.803762-10-robdclark@gmail.com
Diffstat (limited to 'drivers/gpu/drm/msm/msm_ringbuffer.c')
| -rw-r--r-- | drivers/gpu/drm/msm/msm_ringbuffer.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/msm/msm_ringbuffer.c b/drivers/gpu/drm/msm/msm_ringbuffer.c index 31b4fbf96c36..b60199184409 100644 --- a/drivers/gpu/drm/msm/msm_ringbuffer.c +++ b/drivers/gpu/drm/msm/msm_ringbuffer.c @@ -24,9 +24,7 @@ static struct dma_fence *msm_job_run(struct drm_sched_job *job) struct drm_gem_object *obj = &submit->bos[i].obj->base; msm_gem_vma_unpin_fenced(submit->bos[i].vma, fctx); - msm_gem_lock(obj); - msm_gem_unpin_locked(obj); - msm_gem_unlock(obj); + msm_gem_unpin_active(obj); submit->bos[i].flags &= ~(BO_VMA_PINNED | BO_OBJ_PINNED); } |