diff options
| author | Dmitry Osipenko <dmitry.osipenko@collabora.com> | 2022-10-17 20:22:14 +0300 |
|---|---|---|
| committer | Dmitry Osipenko <dmitry.osipenko@collabora.com> | 2022-10-18 01:21:42 +0300 |
| commit | f2d8e15ba18b708ab937b31f4af39ebd804eef1b (patch) | |
| tree | 4287d8282682e15fb653230aba18e609320723a4 /drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | |
| parent | e4ea542846d0ef2127d4feb75b7de78ab1266ead (diff) | |
| download | linux-f2d8e15ba18b708ab937b31f4af39ebd804eef1b.tar.xz | |
drm/i915: Prepare to dynamic dma-buf locking specification
Prepare i915 driver to the common dynamic dma-buf locking convention
by starting to use the unlocked versions of dma-buf API functions
and handling cases where importer now holds the reservation lock.
Acked-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Michael J. Ruhl <michael.j.ruhl@intel.com>
Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221017172229.42269-7-dmitry.osipenko@collabora.com
Diffstat (limited to 'drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c')
| -rw-r--r-- | drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c b/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c index f5062d0c6333..07eee1c09aaf 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c @@ -72,7 +72,7 @@ static int i915_gem_dmabuf_vmap(struct dma_buf *dma_buf, struct drm_i915_gem_object *obj = dma_buf_to_obj(dma_buf); void *vaddr; - vaddr = i915_gem_object_pin_map_unlocked(obj, I915_MAP_WB); + vaddr = i915_gem_object_pin_map(obj, I915_MAP_WB); if (IS_ERR(vaddr)) return PTR_ERR(vaddr); |