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

1 files changed, 12 insertions, 0 deletions

diff --git a/drivers/gpu/drm/virtio/virtgpu_display.c b/drivers/gpu/drm/virtio/virtgpu_display.c
index 8f8fed471e34..b5580b11a063 100644
--- a/drivers/gpu/drm/virtio/virtgpu_display.c
+++ b/drivers/gpu/drm/virtio/virtgpu_display.c
@@ -169,6 +169,12 @@ static int virtio_gpu_conn_get_modes(struct drm_connector *connector)
         struct drm_display_mode *mode = NULL;
         int count, width, height;
 
+        if (output->edid) {
+                count = drm_add_edid_modes(connector, output->edid);
+                if (count)
+                        return count;
+        }
+
         width  = le32_to_cpu(output->info.r.width);
         height = le32_to_cpu(output->info.r.height);
         count = drm_add_modes_noedid(connector, XRES_MAX, YRES_MAX);
@@ -287,6 +293,8 @@ static int vgdev_output_init(struct virtio_gpu_device *vgdev, int index)
         drm_connector_init(dev, connector, &virtio_gpu_connector_funcs,
                            DRM_MODE_CONNECTOR_VIRTUAL);
         drm_connector_helper_add(connector, &virtio_gpu_conn_helper_funcs);
+        if (vgdev->has_edid)
+                drm_connector_attach_edid_property(connector);
 
         drm_encoder_init(dev, encoder, &virtio_gpu_enc_funcs,
                          DRM_MODE_ENCODER_VIRTUAL, NULL);
@@ -378,6 +386,10 @@ int virtio_gpu_modeset_init(struct virtio_gpu_device *vgdev)
 
 void virtio_gpu_modeset_fini(struct virtio_gpu_device *vgdev)
 {
+        int i;
+
+        for (i = 0 ; i < vgdev->num_scanouts; ++i)
+                kfree(vgdev->outputs[i].edid);
         virtio_gpu_fbdev_fini(vgdev);
         drm_mode_config_cleanup(vgdev->ddev);
 }