diff options
| author | Dave Airlie <airlied@redhat.com> | 2019-06-27 04:31:56 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-06-27 04:34:52 +0300 |
| commit | 665d6d4e32313a7952bb3339647f74c3a6b0d78a (patch) | |
| tree | f79f691b47d9339e235e6fc346d934bb7dce8d88 /drivers/gpu/drm | |
| parent | 4b972a01a7da614b4796475f933094751a295a2f (diff) | |
| parent | 41de4be6f6efa4132b29af51158cd672d93f2543 (diff) | |
| download | linux-665d6d4e32313a7952bb3339647f74c3a6b0d78a.tar.xz | |
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
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/virtio/virtgpu_vq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/virtio/virtgpu_vq.c b/drivers/gpu/drm/virtio/virtgpu_vq.c index e62fe24b1a2e..5bb0f0a084e9 100644 --- a/drivers/gpu/drm/virtio/virtgpu_vq.c +++ b/drivers/gpu/drm/virtio/virtgpu_vq.c @@ -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); |