[1/2] drm/msm: Use struct dma_buf_map in GEM vmap ops

Commit Message

Thomas Zimmermann Nov. 9, 2020, 10:32 a.m. UTC

Fixes a build failure with msm.

This change was supposed to be part of commit 49a3f51dfeee ("drm/gem:
Use struct dma_buf_map in GEM vmap ops and convert GEM backends"), but
msm was forgotten.

Signed-off-by: Thomas Zimmermann <[e-mail]>
Fixes: 49a3f51dfeee ("drm/gem: Use struct dma_buf_map in GEM vmap ops and convert GEM backends")
Cc: Thomas Zimmermann <[e-mail]>
Cc: Christian König <[e-mail]>
Cc: David Airlie <[e-mail]>
Cc: Daniel Vetter <[e-mail]>
Cc: Maarten Lankhorst <[e-mail]>
Cc: Maxime Ripard <[e-mail]>
Cc: Dave Airlie <[e-mail]>
Cc: Lucas Stach <[e-mail]>
Cc: Russell King <[e-mail]>
Cc: Christian Gmeiner <[e-mail]>
Cc: Qiang Yu <[e-mail]>
Cc: Ben Skeggs <[e-mail]>
Cc: Rob Herring <[e-mail]>
Cc: Tomeu Vizoso <[e-mail]>
Cc: Steven Price <[e-mail]>
Cc: Alyssa Rosenzweig <[e-mail]>
Cc: Gerd Hoffmann <[e-mail]>
Cc: Alex Deucher <[e-mail]>
Cc: "Christian König" <[e-mail]>
Cc: Sandy Huang <[e-mail]>
Cc: "Heiko Stübner" <[e-mail]>
Cc: Hans de Goede <[e-mail]>
Cc: Sean Paul <[e-mail]>
Cc: Eric Anholt <[e-mail]>
Cc: Rodrigo Siqueira <[e-mail]>
Cc: Melissa Wen <[e-mail]>
Cc: Haneen Mohammed <[e-mail]>
Cc: Oleksandr Andrushchenko <[e-mail]>
Cc: Sumit Semwal <[e-mail]>
Cc: Emil Velikov <[e-mail]>
Cc: Luben Tuikov <[e-mail]>
Cc: Marek Szyprowski <[e-mail]>
Cc: Arunpravin <[e-mail]>
Cc: Huang Rui <[e-mail]>
Cc: Madhav Chauhan <[e-mail]>
Cc: Jason Gunthorpe <[e-mail]>
Cc: Sam Ravnborg <[e-mail]>
Cc: Chris Wilson <[e-mail]>
Cc: Qinglang Miao <[e-mail]>
Cc: [e-mail]
Cc: [e-mail]
Cc: [e-mail]
Cc: [e-mail]
Cc: [e-mail]
Cc: [e-mail]
Cc: [e-mail]
Cc: [e-mail]
Cc: [e-mail]
Cc: [e-mail]
---
 drivers/gpu/drm/msm/msm_drv.h       |  4 ++--
 drivers/gpu/drm/msm/msm_gem_prime.c | 13 ++++++++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

Patch

diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h
index c45789f36e48..a6aef687bc6e 100644
--- a/drivers/gpu/drm/msm/msm_drv.h
+++ b/drivers/gpu/drm/msm/msm_drv.h
@@ -295,8 +295,8 @@  int msm_gem_dumb_create(struct drm_file *file, struct drm_device *dev,
 int msm_gem_dumb_map_offset(struct drm_file *file, struct drm_device *dev,
 		uint32_t handle, uint64_t *offset);
 struct sg_table *msm_gem_prime_get_sg_table(struct drm_gem_object *obj);
-void *msm_gem_prime_vmap(struct drm_gem_object *obj);
-void msm_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr);
+int msm_gem_prime_vmap(struct drm_gem_object *obj, struct dma_buf_map *map);
+void msm_gem_prime_vunmap(struct drm_gem_object *obj, struct dma_buf_map *map);
 int msm_gem_prime_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma);
 struct drm_gem_object *msm_gem_prime_import_sg_table(struct drm_device *dev,
 		struct dma_buf_attachment *attach, struct sg_table *sg);
diff --git a/drivers/gpu/drm/msm/msm_gem_prime.c b/drivers/gpu/drm/msm/msm_gem_prime.c
index 515ef80816a0..9880348a4dc7 100644
--- a/drivers/gpu/drm/msm/msm_gem_prime.c
+++ b/drivers/gpu/drm/msm/msm_gem_prime.c
@@ -22,12 +22,19 @@  struct sg_table *msm_gem_prime_get_sg_table(struct drm_gem_object *obj)
 	return drm_prime_pages_to_sg(obj->dev, msm_obj->pages, npages);
 }
 
-void *msm_gem_prime_vmap(struct drm_gem_object *obj)
+int msm_gem_prime_vmap(struct drm_gem_object *obj, struct dma_buf_map *map)
 {
-	return msm_gem_get_vaddr(obj);
+	void *vaddr;
+
+	vaddr = msm_gem_get_vaddr(obj);
+	if (IS_ERR(vaddr))
+		return PTR_ERR(vaddr);
+	dma_buf_map_set_vaddr(map, vaddr);
+
+	return 0;
 }
 
-void msm_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr)
+void msm_gem_prime_vunmap(struct drm_gem_object *obj, struct dma_buf_map *map)
 {
 	msm_gem_put_vaddr(obj);
 }