Commit 7a086e51 authored Apr 05, 2019 by Gerd Hoffmann Committed by Alistair Delva Aug 19, 2019

UPSTREAM: drm/virtio: move drm_connector_update_edid_property() call



drm_connector_update_edid_property can sleep, we must not
call it while holding a spinlock.  Move the callsite.

Fixes: b4b01b4995fb ("drm/virtio: add edid support")
Reported-by: Max Filippov <jcmvbkbc@gmail.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Tested-by: Max Filippov <jcmvbkbc@gmail.com>
Tested-by: Cornelia Huck <cohuck@redhat.com>
Acked-by: Cornelia Huck <cohuck@redhat.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20190405044602.2334-1-kraxel@redhat.com


(cherry picked from commit 41de4be6f6efa4132b29af51158cd672d93f2543)
Signed-off-by: Greg Hartman <ghartman@google.com>
BUG: 139386237
Change-Id: Ied8aeb059be4d10c5c67ab94d2a37f1d8129b77a

parent 6c5eba8b

drivers/gpu/drm/virtio/virtgpu_vq.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -621,11 +621,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);