drm/nouveau: Use drm_gem_ttm_dumb_map_offset()

Nouveau now uses drm_gem_ttm_dumb_map_offset() to implement
struct drm_driver.dumb_map_offset.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Acked-by: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20210408140139.27731-4-tzimmermann@suse.de

diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c
index dac02c7..14101bd 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_display.c
+++ b/drivers/gpu/drm/nouveau/nouveau_display.c
@@ -838,21 +838,3 @@ nouveau_display_dumb_create(struct drm_file *file_priv, struct drm_device *dev,
        drm_gem_object_put(&bo->bo.base);
        return ret;
 }
-
-int
-nouveau_display_dumb_map_offset(struct drm_file *file_priv,
-                               struct drm_device *dev,
-                               uint32_t handle, uint64_t *poffset)
-{
-       struct drm_gem_object *gem;
-
-       gem = drm_gem_object_lookup(file_priv, handle);
-       if (gem) {
-               struct nouveau_bo *bo = nouveau_gem_object(gem);
-               *poffset = drm_vma_node_offset_addr(&bo->bo.base.vma_node);
-               drm_gem_object_put(gem);
-               return 0;
-       }
-
-       return -ENOENT;
-}

diff --git a/drivers/gpu/drm/nouveau/nouveau_display.h b/drivers/gpu/drm/nouveau/nouveau_display.h
index 616c434..2ab2ddb 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_display.h
+++ b/drivers/gpu/drm/nouveau/nouveau_display.h
@@ -58,8 +58,6 @@ bool nouveau_display_scanoutpos(struct drm_crtc *crtc,
 
 int  nouveau_display_dumb_create(struct drm_file *, struct drm_device *,
                                 struct drm_mode_create_dumb *args);
-int  nouveau_display_dumb_map_offset(struct drm_file *, struct drm_device *,
-                                    u32 handle, u64 *offset);
 
 void nouveau_hdmi_mode_set(struct drm_encoder *, struct drm_display_mode *);
 

diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c
index 885815e..9766218 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_drm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
@@ -31,6 +31,7 @@
 #include <linux/mmu_notifier.h>
 
 #include <drm/drm_crtc_helper.h>
+#include <drm/drm_gem_ttm_helper.h>
 #include <drm/drm_ioctl.h>
 #include <drm/drm_vblank.h>
 
@@ -1212,7 +1213,7 @@ driver_stub = {
        .gem_prime_import_sg_table = nouveau_gem_prime_import_sg_table,
 
        .dumb_create = nouveau_display_dumb_create,
-       .dumb_map_offset = nouveau_display_dumb_map_offset,
+       .dumb_map_offset = drm_gem_ttm_dumb_map_offset,
 
        .name = DRIVER_NAME,
        .desc = DRIVER_DESC,