Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 665d6d4e authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2019-06-26' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes 



virtio- Don't call drm_connector_update_edid_property() while holding spinlock

Cc: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Sean Paul <sean@poorly.run>
Link: https://patchwork.freedesktop.org/patch/msgid/20190626205615.GA123489@art_vandelay
parents 4b972a01 41de4be6

drivers/gpu/drm/virtio/virtgpu_vq.c

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