diff options
author | Rob Clark <robdclark@chromium.org> | 2022-06-28 15:41:29 -0700 |
---|---|---|
committer | Rob Clark <robdclark@chromium.org> | 2022-06-28 15:41:29 -0700 |
commit | 1796c0255bae9d3d4528b8b3916182b2bc4e1e71 (patch) | |
tree | 474ecb1ef87ad1bd1d41c62737da924db224f4a2 /drivers/gpu/drm/msm/msm_ringbuffer.c | |
parent | b13baccc3850ca8b8cccbf8ed9912dbaa0fdf7f3 (diff) | |
parent | 08de214138cdea438a0dfcb10d355a6650c6017c (diff) |
Merge tag 'drm-msm-fixes-2022-06-28' into msm-next-staging
Merge v5.19 fixes to avoid merge conflicts
Signed-off-by: Rob Clark <robdclark@chromium.org>
Diffstat (limited to 'drivers/gpu/drm/msm/msm_ringbuffer.c')
-rw-r--r-- | drivers/gpu/drm/msm/msm_ringbuffer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/msm/msm_ringbuffer.c b/drivers/gpu/drm/msm/msm_ringbuffer.c index 43066320ff8c..56eecb4a72dc 100644 --- a/drivers/gpu/drm/msm/msm_ringbuffer.c +++ b/drivers/gpu/drm/msm/msm_ringbuffer.c @@ -25,7 +25,7 @@ static struct dma_fence *msm_job_run(struct drm_sched_job *job) msm_gem_lock(obj); msm_gem_unpin_vma_fenced(submit->bos[i].vma, fctx); - submit->bos[i].flags &= ~BO_PINNED; + submit->bos[i].flags &= ~BO_VMA_PINNED; msm_gem_unlock(obj); } |