diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2019-07-08 18:04:41 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-07-08 18:04:41 +0200 |
| commit | 552a031ba12a4236be107a5b082a399237758a5d (patch) | |
| tree | a2bcdeb651b360013dbb654bbcd61dbaf51e0331 /drivers/gpu/drm/virtio/virtgpu_vq.c | |
| parent | Merge branch 'x86/cpu' into perf/core, to pick up revert (diff) | |
| parent | Linux 5.2 (diff) | |
| download | linux-dev-552a031ba12a4236be107a5b082a399237758a5d.tar.xz linux-dev-552a031ba12a4236be107a5b082a399237758a5d.zip | |
Merge tag 'v5.2' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/virtio/virtgpu_vq.c')
| -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); |