hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

drm fixes for 6.0-rc1 

gem:
 - Annotate WW context in error paths
 
 shmem-helper:
 - Add missing vunmap in error paths
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEEKbZHaGwW9KfbeusDHTzWXnEhr4FAmL1YFAACgkQDHTzWXnE
 hr4W3w//dJSJk9sVZNapyzK0f8vgKFRUdOY0In033RCuYVKf491GhqumbTF9sOil
 u8m6XpjgBwD980Hcwag9bpANMYXCUH05HlNeweoeEz0dRaxTuPdaeUrQ4/19UC/A
 uos6BhhrnVoq81dMZV1V2Si1lE/3/QuxCOq4CWAiHhmNWJ/x7RrjG4z2Gyh7LioQ
 Zjcfd40imKra5RUzfcfzqWecplMl5FpwR//O30Gd2tWz1ilXVCpxlzOVtHjM0ys3
 f/FKwGdeZKS7Ad0yI0Pj2ESw0dMbgcnsF+pi9+k7AS+SobK5q7iT2qRlQnaUtdbp
 T5RAadK8D2ft5zRNK+d7NZfYKktcPv/tSwgueLy8GUi8KnF4DS6JxHibG/95AjNo
 NTfL+3qV9+kwW+yb6wSfv3t7qR153uKEZW5xGH6PqeCofZKMws/RpNWpTOkl5Yau
 x/F3YRJ4Lcwx/jWqC4XtN02idAIUzOfF/aPvI28ic7P8esI4RfiBGe8nstsSb/gh
 BMF/DTlRfRnYQ5klxweT2YEn9mUprQzvgQDeYQtVD3qcM+F6PH5JbSt7K0ClvuFH
 oikDuqFFc7VwnMWfqqz14nMt7mfaDKIzNe2/GAUqvrn8ycoOSJX/9tXemPQtMs9l
 Byg0EK9IEi5yw8PYY59sK98c8Agt0HXoqbmNv3lnMjJSsvJDPUM=
 =Tpmn
 -----END PGP SIGNATURE-----

Merge tag 'drm-next-2022-08-12-1' of git://anongit.freedesktop.org/drm/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
This commit is contained in:
Linus Torvalds 2022-08-11 19:12:15 -07:00
parent 7ebfc85e2c 36fa1cb56a
commit 7ce2aa6d7f
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/drm_gem.c
View File

@ -1226,7 +1226,7 @@ retry:
ret = dma_resv_lock_slow_interruptible(obj->resv, ret = dma_resv_lock_slow_interruptible(obj->resv,
acquire_ctx); acquire_ctx);
if (ret) { if (ret) {
ww_acquire_done(acquire_ctx); ww_acquire_fini(acquire_ctx);
return ret; return ret;
} }
} }
@ -1251,7 +1251,7 @@ retry:
goto retry; goto retry;
} }
ww_acquire_done(acquire_ctx); ww_acquire_fini(acquire_ctx);
return ret; return ret;
} }
} }

1
drivers/gpu/drm/drm_gem_shmem_helper.c
View File

@ -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); ret = dma_buf_vmap(obj->import_attach->dmabuf, map);
if (!ret) { if (!ret) {
if (WARN_ON(map->is_iomem)) { if (WARN_ON(map->is_iomem)) {
dma_buf_vunmap(obj->import_attach->dmabuf, map);
ret = -EIO; ret = -EIO;
goto err_put_pages; goto err_put_pages;
} }