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, 8 insertions, 0 deletions

diff --git a/drivers/gpu/drm/virtio/virtgpu_kms.c b/drivers/gpu/drm/virtio/virtgpu_kms.c
index 691b842d5f3a..3af6181c05a8 100644
--- a/drivers/gpu/drm/virtio/virtgpu_kms.c
+++ b/drivers/gpu/drm/virtio/virtgpu_kms.c
@@ -44,6 +44,8 @@ static void virtio_gpu_config_changed_work_func(struct work_struct *work)
         virtio_cread(vgdev->vdev, struct virtio_gpu_config,
                      events_read, &events_read);
         if (events_read & VIRTIO_GPU_EVENT_DISPLAY) {
+                if (vgdev->has_edid)
+                        virtio_gpu_cmd_get_edids(vgdev);
                 virtio_gpu_cmd_get_display_info(vgdev);
                 drm_helper_hpd_irq_event(vgdev->ddev);
                 events_clear |= VIRTIO_GPU_EVENT_DISPLAY;
@@ -156,6 +158,10 @@ int virtio_gpu_driver_load(struct drm_device *dev, unsigned long flags)
 #else
         DRM_INFO("virgl 3d acceleration not supported by guest\n");
 #endif
+        if (virtio_has_feature(vgdev->vdev, VIRTIO_GPU_F_EDID)) {
+                vgdev->has_edid = true;
+                DRM_INFO("EDID support available.\n");
+        }
 
         ret = virtio_find_vqs(vgdev->vdev, 2, vqs, callbacks, names, NULL);
         if (ret) {
@@ -201,6 +207,8 @@ int virtio_gpu_driver_load(struct drm_device *dev, unsigned long flags)
 
         if (num_capsets)
                 virtio_gpu_get_capsets(vgdev, num_capsets);
+        if (vgdev->has_edid)
+                virtio_gpu_cmd_get_edids(vgdev);
         virtio_gpu_cmd_get_display_info(vgdev);
         wait_event_timeout(vgdev->resp_wq, !vgdev->display_info_pending,
                            5 * HZ);