UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Short summary of fixes pull: 

* gem: Annotate WW context in error paths
  * shmem-helper: Add missing vunmap in error paths
 -----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCAAdFiEEchf7rIzpz2NEoWjlaA3BHVMLeiMFAmLziw8ACgkQaA3BHVML
 eiNwIAf/Xukx8yBj3dth8e0hD4IJLPrf5u/cdnnyqheyX5r69f4POmBJj9GhmQMa
 0U+ppw9KOzgOPzteEUImCAFJXQWp0OgVvU2bNsfYEbbn7BNGSH8fqRUICIgdvphl
 jKyCP00UpAsnnZvx8QjCDc19WK0moMLiJdGryAxzZ8vpUKQtEWcvyPDvocir/2rP
 ApQsl+08WlEWoBUzYERMrGl7+NYVSEEJMf/arLnvHmBH1No51EAkkOxWysct+QtB
 V9M2hLVG6g24ah4xkJN+jB6JxestHmM/DPa+YjR2brAdudE6lginIkrxVHTlKbXS
 BDyQcVp+NJCb3WjCkn2R6ywnk9T8AA==
 =c/aF
 -----END PGP SIGNATURE-----

Merge tag 'drm-misc-next-fixes-2022-08-10' of git://anongit.freedesktop.org/drm/drm-misc into drm-next

Short summary of fixes pull:

 * gem: Annotate WW context in error paths
 * shmem-helper: Add missing vunmap in error paths

Signed-off-by: Dave Airlie <airlied@redhat.com>

From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/YvOLPpufsvOJHiNY@linux-uq9g
This commit is contained in:
Dave Airlie 2022-08-12 05:57:05 +10:00
parent 5493ee1919 2939deac1f
commit 36fa1cb56a
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,
acquire_ctx);
if (ret) {
ww_acquire_done(acquire_ctx);
ww_acquire_fini(acquire_ctx);
return ret;
}
}
@ -1251,7 +1251,7 @@ retry:
goto retry;
}
ww_acquire_done(acquire_ctx);
ww_acquire_fini(acquire_ctx);
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);
if (!ret) {
if (WARN_ON(map->is_iomem)) {
dma_buf_vunmap(obj->import_attach->dmabuf, map);
ret = -EIO;
goto err_put_pages;
}