drm/virtio: move drm_connector_update_edid_property() call
Subsystems (4)
Gerd Hoffmann
maintainerPATCH 1/1 drm/virtio: move drm_connector_update_edid_property() call
drm_connector_update_edid_property can sleep, we must not call it while holding a spinlock. Move the callsize.
--- drivers/gpu/drm/virtio/virtgpu_vq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/virtio/virtgpu_vq.c +1 -1
@@ -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);
Signature · 1 line
2.18.1
Quoted 9 lines · Gerd Hoffmann
drm_connector_update_edid_propertycan sleep, we must not call it while holding a spinlock. Move the callsize.Reported-by Max Filippov <[email protected]>Signed-off-by Gerd Hoffmann <[email protected]>--- drivers/gpu/drm/virtio/virtgpu_vq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
This change fixes the warning for me, thanks!
Signature · 2 lines
Thanks. -- Max
Quoted 9 lines · Gerd Hoffmann
drm_connector_update_edid_propertycan sleep, we must not call it while holding a spinlock. Move the callsize.Reported-by Max Filippov <[email protected]>Signed-off-by Gerd Hoffmann <[email protected]>--- drivers/gpu/drm/virtio/virtgpu_vq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
This change fixes the warning for me, thanks!
Signature · 2 lines
Thanks. -- Max
Quoted 2 lines · On Fri, 5 Apr 2019 06:46:02 +0200 Gerd Hoffmann <[email protected]> wrote:
drm_connector_update_edid_propertycan sleep, we must not call it while holding a spinlock. Move the callsize.
s/callsize/callsite/
Quoted 14 lines
Reported-by Max Filippov <[email protected]>Signed-off-by Gerd Hoffmann <[email protected]>--- drivers/gpu/drm/virtio/virtgpu_vq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/virtio/virtgpu_vq.c +0
-0@@ -619,11 +619,11 @@ static void virtio_gpu_cmd_get_edid_cb(struct virtio_gpu_device *vgdev, output = vgdev->outputs + scanout;
drivers/gpu/drm/virtio/virtgpu_vq.c static void virtio_gpu_cmd_get_edid_cb(struct virtio_gpu_device *vgdev, · line 629
Quoted 10 lines
drivers/gpu/drm/virtio/virtgpu_vq.c +1
-1new_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);
This gets rid of the sleeping while atomic traces I've been seeing with an s390x guest (both virtio-gpu-pci and virtio-gpu-ccw).
I have also looked at the code a bit, but don't feel confident enough to give an R-b.
Quoted 2 lines · On Fri, 5 Apr 2019 06:46:02 +0200 Gerd Hoffmann <[email protected]> wrote:
drm_connector_update_edid_propertycan sleep, we must not call it while holding a spinlock. Move the callsize.
s/callsize/callsite/
Quoted 14 lines
Reported-by Max Filippov <[email protected]>Signed-off-by Gerd Hoffmann <[email protected]>--- drivers/gpu/drm/virtio/virtgpu_vq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/virtio/virtgpu_vq.c +0
-0@@ -619,11 +619,11 @@ static void virtio_gpu_cmd_get_edid_cb(struct virtio_gpu_device *vgdev, output = vgdev->outputs + scanout;
drivers/gpu/drm/virtio/virtgpu_vq.c static void virtio_gpu_cmd_get_edid_cb(struct virtio_gpu_device *vgdev, · line 629
Quoted 10 lines
drivers/gpu/drm/virtio/virtgpu_vq.c +1
-1new_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);
This gets rid of the sleeping while atomic traces I've been seeing with an s390x guest (both virtio-gpu-pci and virtio-gpu-ccw).
I have also looked at the code a bit, but don't feel confident enough to give an R-b.
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Gerd Hoffmann
maintainerQuoted 7 lines · Cornelia Huck
Quoted 2 lines · On Fri, 5 Apr 2019 06:46:02 +0200 Gerd Hoffmann <[email protected]> wrote:
drm_connector_update_edid_propertycan sleep, we must not call it while holding a spinlock. Move the callsize.s/callsize/callsite/
Fixed on commit.
Quoted 9 lines
This gets rid of the sleeping while atomic traces I've been seeing with an s390x guest (both virtio-gpu-pci and virtio-gpu-ccw).
Tested-by Cornelia Huck <[email protected]>I have also looked at the code a bit, but don't feel confident enough to give an R-b.
Acked-by Cornelia Huck <[email protected]>
Thanks. Pushed to drm-misc-fixes.
cheers,
Gerd
Gerd Hoffmann
maintainerQuoted 7 lines · Cornelia Huck
Quoted 2 lines · On Fri, 5 Apr 2019 06:46:02 +0200 Gerd Hoffmann <[email protected]> wrote:
drm_connector_update_edid_propertycan sleep, we must not call it while holding a spinlock. Move the callsize.s/callsize/callsite/
Fixed on commit.
Quoted 9 lines
This gets rid of the sleeping while atomic traces I've been seeing with an s390x guest (both virtio-gpu-pci and virtio-gpu-ccw).
Tested-by Cornelia Huck <[email protected]>I have also looked at the code a bit, but don't feel confident enough to give an R-b.
Acked-by Cornelia Huck <[email protected]>
Thanks. Pushed to drm-misc-fixes.
cheers,
Gerd
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel