Merge tag 'drm-next-2019-07-16' of git://anongit.freedesktop.org/drm/drm

[linux-2.6-microblaze.git] / drivers / gpu / drm / virtio / virtgpu_vq.c

diff --git a/drivers/gpu/drm/virtio/virtgpu_vq.c b/drivers/gpu/drm/virtio/virtgpu_vq.c
index 6c1a907..981ee16 100644 (file)
--- a/drivers/gpu/drm/virtio/virtgpu_vq.c
+++ b/drivers/gpu/drm/virtio/virtgpu_vq.c
@@ -631,11 +631,11 @@ static void virtio_gpu_cmd_get_edid_cb(struct virtio_gpu_device *vgdev,
        output = vgdev->outputs + scanout;
 
        new_edid = drm_do_get_edid(&output->conn, virtio_get_edid_block, resp);
+       drm_connector_update_edid_property(&output->conn, new_edid);
 
        spin_lock(&vgdev->display_info_lock);
        old_edid = output->edid;
        output->edid = new_edid;
-       drm_connector_update_edid_property(&output->conn, output->edid);
        spin_unlock(&vgdev->display_info_lock);
 
        kfree(old_edid);