From: Gerd Hoffmann kraxel@redhat.com
[ Upstream commit 41de4be6f6efa4132b29af51158cd672d93f2543 ]
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@re... Signed-off-by: Sasha Levin sashal@kernel.org --- drivers/gpu/drm/virtio/virtgpu_vq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/virtio/virtgpu_vq.c b/drivers/gpu/drm/virtio/virtgpu_vq.c index 6bc2008b0d0d..3ef24f89ef93 100644 --- a/drivers/gpu/drm/virtio/virtgpu_vq.c +++ b/drivers/gpu/drm/virtio/virtgpu_vq.c @@ -620,11 +620,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);