Skip to content

Commit

Permalink
Merge tag 'drm-next-2022-08-12-1' of git://anongit.freedesktop.org/dr…
Browse files Browse the repository at this point in the history
…m/drm

Pull drm fixes from Dave Airlie:
 "Not much to squeeze into rc1, just two small fixes, one for core gem
 and one for shmem-helpers:

  gem:
   - Annotate WW context in error paths

  shmem-helper:
   - Add missing vunmap in error paths"

* tag 'drm-next-2022-08-12-1' of git://anongit.freedesktop.org/drm/drm:
  drm/gem: Properly annotate WW context on drm_gem_lock_reservations() error
  drm/shmem-helper: Add missing vunmap on error
  • Loading branch information
Linus Torvalds committed Aug 12, 2022
2 parents 7ebfc85 + 36fa1cb commit 7ce2aa6
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/gpu/drm/drm_gem.c
Original file line number Diff line number Diff line change
Expand Up @@ -1226,7 +1226,7 @@ drm_gem_lock_reservations(struct drm_gem_object **objs, int count,
ret = dma_resv_lock_slow_interruptible(obj->resv,
acquire_ctx);
if (ret) {
ww_acquire_done(acquire_ctx);
ww_acquire_fini(acquire_ctx);
return ret;
}
}
Expand All @@ -1251,7 +1251,7 @@ drm_gem_lock_reservations(struct drm_gem_object **objs, int count,
goto retry;
}

ww_acquire_done(acquire_ctx);
ww_acquire_fini(acquire_ctx);
return ret;
}
}
Expand Down
1 change: 1 addition & 0 deletions drivers/gpu/drm/drm_gem_shmem_helper.c
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,7 @@ static int drm_gem_shmem_vmap_locked(struct drm_gem_shmem_object *shmem,
ret = dma_buf_vmap(obj->import_attach->dmabuf, map);
if (!ret) {
if (WARN_ON(map->is_iomem)) {
dma_buf_vunmap(obj->import_attach->dmabuf, map);
ret = -EIO;
goto err_put_pages;
}
Expand Down

0 comments on commit 7ce2aa6

Please sign in to comment.