diff options
| author | Thomas Zimmermann <tzimmermann@suse.de> | 2022-03-08 22:52:12 +0300 |
|---|---|---|
| committer | Patrik Jakobsson <patrik.r.jakobsson@gmail.com> | 2022-03-16 19:42:18 +0300 |
| commit | 16dad99de8f2abfcec9836e2031613a713e339d2 (patch) | |
| tree | 5e8f5037c3de5ef7c376cb8a32de6966200df1ea /drivers | |
| parent | de2d1822f9489268e0707b2d188dd789d5effd08 (diff) | |
| download | linux-16dad99de8f2abfcec9836e2031613a713e339d2.tar.xz | |
drm/gma500: Acquire reservation lock for GEM objects
Protect concurrent access to struct psb_gem_object by acquiring
the GEM object's reservation lock; as it's supposed to be. The
use of the GTT mutex can now be moved into GTT code.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Acked-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
Signed-off-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220308195222.13471-3-tzimmermann@suse.de
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/gma500/gem.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/gpu/drm/gma500/gem.c b/drivers/gpu/drm/gma500/gem.c index fe7d242567c0..026ce11f7460 100644 --- a/drivers/gpu/drm/gma500/gem.c +++ b/drivers/gpu/drm/gma500/gem.c @@ -31,6 +31,10 @@ int psb_gem_pin(struct psb_gem_object *pobj) unsigned int npages; int ret; + ret = dma_resv_lock(obj->resv, NULL); + if (drm_WARN_ONCE(dev, ret, "dma_resv_lock() failed, ret=%d\n", ret)) + return ret; + mutex_lock(&dev_priv->gtt_mutex); if (pobj->in_gart || pobj->stolen) @@ -56,11 +60,13 @@ int psb_gem_pin(struct psb_gem_object *pobj) out: ++pobj->in_gart; mutex_unlock(&dev_priv->gtt_mutex); + dma_resv_unlock(obj->resv); return 0; err_mutex_unlock: mutex_unlock(&dev_priv->gtt_mutex); + dma_resv_unlock(obj->resv); return ret; } @@ -71,6 +77,11 @@ void psb_gem_unpin(struct psb_gem_object *pobj) struct drm_psb_private *dev_priv = to_drm_psb_private(dev); u32 gpu_base = dev_priv->gtt.gatt_start; unsigned long npages; + int ret; + + ret = dma_resv_lock(obj->resv, NULL); + if (drm_WARN_ONCE(dev, ret, "dma_resv_lock() failed, ret=%d\n", ret)) + return; mutex_lock(&dev_priv->gtt_mutex); @@ -95,6 +106,7 @@ void psb_gem_unpin(struct psb_gem_object *pobj) out: mutex_unlock(&dev_priv->gtt_mutex); + dma_resv_unlock(obj->resv); } static vm_fault_t psb_gem_fault(struct vm_fault *vmf); |