Merge branch 'topic/xehp-dg2-definitions-2021-07-21' into drm-intel-gt-next

[linux-2.6-microblaze.git] / drivers / gpu / drm / nouveau / nouveau_display.c

diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c
index dac02c7..929de41 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_display.c
+++ b/drivers/gpu/drm/nouveau/nouveau_display.c
@@ -697,7 +697,6 @@ nouveau_display_create(struct drm_device *dev)
 
        dev->mode_config.preferred_depth = 24;
        dev->mode_config.prefer_shadow = 1;
-       dev->mode_config.allow_fb_modifiers = true;
 
        if (drm->client.device.info.chipset < 0x11)
                dev->mode_config.async_page_flip = false;
@@ -838,21 +837,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;
-}