openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Cc: Gerd Hoffmann <kraxel@redhat.com>
 -----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCgAdFiEEfxcpfMSgdnQMs+QqlvcN/ahKBwoFAl0T1m0ACgkQlvcN/ahK
 BwrjJAf+KW+DKvW8qG+0+WZh3kUWOZS3Q2f/JYp5BKoJAZtALG9M8cuKCeMUSNBh
 CFlwVXrSBmNHkU0cR1Lazs4TR78qXSZHlbF6F3PwWBzxDLVXulDR4xW7q1YLkgzu
 xT2Y0CBe8kv6h3qU0pU0HIdmcHKnwXyf123qMWSx9GpBqIjcjkUiwvyaFuuNyc2E
 ZnditFUs03PJCHM2mv/UkLUVQIyNKyL65W9qHthLE/IziiM1ILBeYX0OOAeHRnMB
 NLMef0mMXHiXaQh3cKIIGcB15L5t7oY8I+h2qzxMBox6rHBproM4GFYw3wEQ5x7p
 /mPlGUkyiwKL6nNfbfvavF1bT24mAA==
 =Muod
 -----END PGP SIGNATURE-----

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: Dave Airlie <airlied@redhat.com>

From: Sean Paul <sean@poorly.run>
Link: https://patchwork.freedesktop.org/patch/msgid/20190626205615.GA123489@art_vandelay
This commit is contained in:
Dave Airlie 2019-06-27 11:31:56 +10:00
parent 4b972a01a7 41de4be6f6
commit 665d6d4e32
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/virtio/virtgpu_vq.c
View File

@ -619,11 +619,11 @@ static void virtio_gpu_cmd_get_edid_cb(struct virtio_gpu_device *vgdev,
output = vgdev->outputs + scanout; output = vgdev->outputs + scanout;
new_edid = drm_do_get_edid(&output->conn, virtio_get_edid_block, resp); 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); spin_lock(&vgdev->display_info_lock);
old_edid = output->edid; old_edid = output->edid;
output->edid = new_edid; output->edid = new_edid;
drm_connector_update_edid_property(&output->conn, output->edid);
spin_unlock(&vgdev->display_info_lock); spin_unlock(&vgdev->display_info_lock);
kfree(old_edid); kfree(old_edid);