Merge tag 'drm-misc-next-2018-11-28' of git://anongit.freedesktop.org/drm/drm-misc into drm-next

drm-misc-next for v4.21:

Core Changes:
- Merge drm_info.c into drm_debugfs.c
- Complete the fake drm_crtc_commit's hw_done/flip_done sooner.
- Remove deprecated drm_obj_ref/unref functions. All drivers use get/put now.
- Decrease stack use of drm_gem_prime_mmap.
- Improve documentation for dumb callbacks.

Driver Changes:
- Add edid support to virtio.
- Wait on implicit fence in meson and sun4i.
- Add support for BGRX8888 to sun4i.
- Preparation patches for sun4i driver to start supporting linear and tiled YUV formats.
- Add support for HDMI 1.4 4k modes to meson, and support for VIC alternate timings.
- Drop custom dumb_map in vkms.
- Small fixes and cleanups to v3d.

Signed-off-by: Dave Airlie <airlied@redhat.com>

From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/151a3270-b1be-ed75-bd58-6b29d741f592@linux.intel.com

3 files changed, 0 insertions, 30 deletions

diff --git a/drivers/gpu/drm/vkms/vkms_drv.c b/drivers/gpu/drm/vkms/vkms_drv.c
index a3d57e0f5ee5..83087877565c 100644
--- a/drivers/gpu/drm/vkms/vkms_drv.c
+++ b/drivers/gpu/drm/vkms/vkms_drv.c
@@ -68,7 +68,6 @@ static struct drm_driver vkms_driver = {
         .release                = vkms_release,
         .fops                   = &vkms_driver_fops,
         .dumb_create            = vkms_dumb_create,
-        .dumb_map_offset        = vkms_dumb_map,
         .gem_vm_ops             = &vkms_gem_vm_ops,
         .gem_free_object_unlocked = vkms_gem_free_object,
         .get_vblank_timestamp   = vkms_get_vblank_timestamp,
diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_drv.h
index 1c93990693e3..e4469cd3d254 100644
--- a/drivers/gpu/drm/vkms/vkms_drv.h
+++ b/drivers/gpu/drm/vkms/vkms_drv.h
@@ -127,9 +127,6 @@ vm_fault_t vkms_gem_fault(struct vm_fault *vmf);
 int vkms_dumb_create(struct drm_file *file, struct drm_device *dev,
                      struct drm_mode_create_dumb *args);
 
-int vkms_dumb_map(struct drm_file *file, struct drm_device *dev,
-                  u32 handle, u64 *offset);
-
 void vkms_gem_free_object(struct drm_gem_object *obj);
 
 int vkms_gem_vmap(struct drm_gem_object *obj);
diff --git a/drivers/gpu/drm/vkms/vkms_gem.c b/drivers/gpu/drm/vkms/vkms_gem.c
index d04e988b4cbe..80311daed47a 100644
--- a/drivers/gpu/drm/vkms/vkms_gem.c
+++ b/drivers/gpu/drm/vkms/vkms_gem.c
@@ -153,32 +153,6 @@ int vkms_dumb_create(struct drm_file *file, struct drm_device *dev,
         return 0;
 }
 
-int vkms_dumb_map(struct drm_file *file, struct drm_device *dev,
-                  u32 handle, u64 *offset)
-{
-        struct drm_gem_object *obj;
-        int ret;
-
-        obj = drm_gem_object_lookup(file, handle);
-        if (!obj)
-                return -ENOENT;
-
-        if (!obj->filp) {
-                ret = -EINVAL;
-                goto unref;
-        }
-
-        ret = drm_gem_create_mmap_offset(obj);
-        if (ret)
-                goto unref;
-
-        *offset = drm_vma_node_offset_addr(&obj->vma_node);
-unref:
-        drm_gem_object_put_unlocked(obj);
-
-        return ret;
-}
-
 static struct page **_get_pages(struct vkms_gem_object *vkms_obj)
 {
         struct drm_gem_object *gem_obj = &vkms_obj->gem;