All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drm/virtio: move drm_connector_update_edid_property() call
@ 2019-04-05  4:46 ` Gerd Hoffmann
  0 siblings, 0 replies; 12+ messages in thread
From: Gerd Hoffmann @ 2019-04-05  4:46 UTC (permalink / raw)
  To: dri-devel
  Cc: jcmvbkbc, Gerd Hoffmann, David Airlie, Daniel Vetter,
	open list:VIRTIO GPU DRIVER, open list

drm_connector_update_edid_property can sleep, we must not
call it while holding a spinlock.  Move the callsize.

Reported-by: Max Filippov <jcmvbkbc@gmail.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 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 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);
-- 
2.18.1


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [PATCH] drm/virtio: move drm_connector_update_edid_property() call
@ 2019-04-05  4:46 ` Gerd Hoffmann
  0 siblings, 0 replies; 12+ messages in thread
From: Gerd Hoffmann @ 2019-04-05  4:46 UTC (permalink / raw)
  To: dri-devel
  Cc: jcmvbkbc, Gerd Hoffmann, David Airlie, Daniel Vetter,
	open list:VIRTIO GPU DRIVER, open list

drm_connector_update_edid_property can sleep, we must not
call it while holding a spinlock.  Move the callsize.

Reported-by: Max Filippov <jcmvbkbc@gmail.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 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 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);
-- 
2.18.1

^ permalink raw reply related	[flat|nested] 12+ messages in thread
* Re: [PATCH] drm/virtio: move drm_connector_update_edid_property() call
  2019-04-05  4:46 ` Gerd Hoffmann
@ 2019-04-05  6:51   ` Max Filippov
  -1 siblings, 0 replies; 12+ messages in thread
From: Max Filippov @ 2019-04-05  6:51 UTC (permalink / raw)
  To: Gerd Hoffmann
  Cc: dri-devel, David Airlie, Daniel Vetter,
	open list:VIRTIO GPU DRIVER, open list

On Thu, Apr 4, 2019 at 9:46 PM Gerd Hoffmann <kraxel@redhat.com> wrote:
>
> drm_connector_update_edid_property can sleep, we must not
> call it while holding a spinlock.  Move the callsize.
>
> Reported-by: Max Filippov <jcmvbkbc@gmail.com>
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
>  drivers/gpu/drm/virtio/virtgpu_vq.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

This change fixes the warning for me, thanks!
Tested-by: Max Filippov <jcmvbkbc@gmail.com>

-- 
Thanks.
-- Max

^ permalink raw reply	[flat|nested] 12+ messages in thread
* Re: [PATCH] drm/virtio: move drm_connector_update_edid_property() call
  2019-04-05  4:46 ` Gerd Hoffmann
  (?)
  (?)
@ 2019-04-05  6:51 ` Max Filippov
  -1 siblings, 0 replies; 12+ messages in thread
From: Max Filippov @ 2019-04-05  6:51 UTC (permalink / raw)
  To: Gerd Hoffmann
  Cc: David Airlie, open list, Daniel Vetter, dri-devel,
	open list:VIRTIO GPU DRIVER

On Thu, Apr 4, 2019 at 9:46 PM Gerd Hoffmann <kraxel@redhat.com> wrote:
>
> drm_connector_update_edid_property can sleep, we must not
> call it while holding a spinlock.  Move the callsize.
>
> Reported-by: Max Filippov <jcmvbkbc@gmail.com>
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
>  drivers/gpu/drm/virtio/virtgpu_vq.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

This change fixes the warning for me, thanks!
Tested-by: Max Filippov <jcmvbkbc@gmail.com>

-- 
Thanks.
-- Max

^ permalink raw reply	[flat|nested] 12+ messages in thread
* Re: [PATCH] drm/virtio: move drm_connector_update_edid_property() call
@ 2019-04-05  6:51   ` Max Filippov
  0 siblings, 0 replies; 12+ messages in thread
From: Max Filippov @ 2019-04-05  6:51 UTC (permalink / raw)
  To: Gerd Hoffmann
  Cc: dri-devel, David Airlie, Daniel Vetter,
	open list:VIRTIO GPU DRIVER, open list

On Thu, Apr 4, 2019 at 9:46 PM Gerd Hoffmann <kraxel@redhat.com> wrote:
>
> drm_connector_update_edid_property can sleep, we must not
> call it while holding a spinlock.  Move the callsize.
>
> Reported-by: Max Filippov <jcmvbkbc@gmail.com>
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
>  drivers/gpu/drm/virtio/virtgpu_vq.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

This change fixes the warning for me, thanks!
Tested-by: Max Filippov <jcmvbkbc@gmail.com>

-- 
Thanks.
-- Max

^ permalink raw reply	[flat|nested] 12+ messages in thread
* Re: [PATCH] drm/virtio: move drm_connector_update_edid_property() call
  2019-04-05  4:46 ` Gerd Hoffmann
@ 2019-06-26  7:51   ` Cornelia Huck
  -1 siblings, 0 replies; 12+ messages in thread
From: Cornelia Huck @ 2019-06-26  7:51 UTC (permalink / raw)
  To: Gerd Hoffmann
  Cc: dri-devel, jcmvbkbc, David Airlie, Daniel Vetter,
	open list:VIRTIO GPU DRIVER, open list

On Fri,  5 Apr 2019 06:46:02 +0200
Gerd Hoffmann <kraxel@redhat.com> wrote:

> drm_connector_update_edid_property can sleep, we must not
> call it while holding a spinlock.  Move the callsize.

s/callsize/callsite/

> 
> Reported-by: Max Filippov <jcmvbkbc@gmail.com>
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
>  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 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);

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 <cohuck@redhat.com>

I have also looked at the code a bit, but don't feel confident enough
to give an R-b.

Acked-by: Cornelia Huck <cohuck@redhat.com>

^ permalink raw reply	[flat|nested] 12+ messages in thread
* Re: [PATCH] drm/virtio: move drm_connector_update_edid_property() call
  2019-04-05  4:46 ` Gerd Hoffmann
                   ` (2 preceding siblings ...)
  (?)
@ 2019-06-26  7:51 ` Cornelia Huck
  -1 siblings, 0 replies; 12+ messages in thread
From: Cornelia Huck @ 2019-06-26  7:51 UTC (permalink / raw)
  To: Gerd Hoffmann
  Cc: David Airlie, open list, dri-devel, open list:VIRTIO GPU DRIVER,
	jcmvbkbc, Daniel Vetter

On Fri,  5 Apr 2019 06:46:02 +0200
Gerd Hoffmann <kraxel@redhat.com> wrote:

> drm_connector_update_edid_property can sleep, we must not
> call it while holding a spinlock.  Move the callsize.

s/callsize/callsite/

> 
> Reported-by: Max Filippov <jcmvbkbc@gmail.com>
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
>  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 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);

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 <cohuck@redhat.com>

I have also looked at the code a bit, but don't feel confident enough
to give an R-b.

Acked-by: Cornelia Huck <cohuck@redhat.com>

^ permalink raw reply	[flat|nested] 12+ messages in thread
* Re: [PATCH] drm/virtio: move drm_connector_update_edid_property() call
@ 2019-06-26  7:51   ` Cornelia Huck
  0 siblings, 0 replies; 12+ messages in thread
From: Cornelia Huck @ 2019-06-26  7:51 UTC (permalink / raw)
  To: Gerd Hoffmann
  Cc: David Airlie, open list, dri-devel, open list:VIRTIO GPU DRIVER,
	jcmvbkbc

On Fri,  5 Apr 2019 06:46:02 +0200
Gerd Hoffmann <kraxel@redhat.com> wrote:

> drm_connector_update_edid_property can sleep, we must not
> call it while holding a spinlock.  Move the callsize.

s/callsize/callsite/

> 
> Reported-by: Max Filippov <jcmvbkbc@gmail.com>
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
>  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 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);

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 <cohuck@redhat.com>

I have also looked at the code a bit, but don't feel confident enough
to give an R-b.

Acked-by: Cornelia Huck <cohuck@redhat.com>
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 12+ messages in thread
* Re: [PATCH] drm/virtio: move drm_connector_update_edid_property() call
  2019-06-26  7:51   ` Cornelia Huck
@ 2019-06-26  9:15     ` Gerd Hoffmann
  -1 siblings, 0 replies; 12+ messages in thread
From: Gerd Hoffmann @ 2019-06-26  9:15 UTC (permalink / raw)
  To: Cornelia Huck
  Cc: dri-devel, jcmvbkbc, David Airlie, Daniel Vetter,
	open list:VIRTIO GPU DRIVER, open list

On Wed, Jun 26, 2019 at 09:51:46AM +0200, Cornelia Huck wrote:
> On Fri,  5 Apr 2019 06:46:02 +0200
> Gerd Hoffmann <kraxel@redhat.com> wrote:
> 
> > drm_connector_update_edid_property can sleep, we must not
> > call it while holding a spinlock.  Move the callsize.
> 
> s/callsize/callsite/

Fixed on commit.

> 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 <cohuck@redhat.com>
> 
> I have also looked at the code a bit, but don't feel confident enough
> to give an R-b.
> 
> Acked-by: Cornelia Huck <cohuck@redhat.com>

Thanks.  Pushed to drm-misc-fixes.

cheers,
  Gerd

^ permalink raw reply	[flat|nested] 12+ messages in thread
* Re: [PATCH] drm/virtio: move drm_connector_update_edid_property() call
  2019-06-26  7:51   ` Cornelia Huck
  (?)
@ 2019-06-26  9:15   ` Gerd Hoffmann
  -1 siblings, 0 replies; 12+ messages in thread
From: Gerd Hoffmann @ 2019-06-26  9:15 UTC (permalink / raw)
  To: Cornelia Huck
  Cc: David Airlie, open list, dri-devel, open list:VIRTIO GPU DRIVER,
	jcmvbkbc, Daniel Vetter

On Wed, Jun 26, 2019 at 09:51:46AM +0200, Cornelia Huck wrote:
> On Fri,  5 Apr 2019 06:46:02 +0200
> Gerd Hoffmann <kraxel@redhat.com> wrote:
> 
> > drm_connector_update_edid_property can sleep, we must not
> > call it while holding a spinlock.  Move the callsize.
> 
> s/callsize/callsite/

Fixed on commit.

> 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 <cohuck@redhat.com>
> 
> I have also looked at the code a bit, but don't feel confident enough
> to give an R-b.
> 
> Acked-by: Cornelia Huck <cohuck@redhat.com>

Thanks.  Pushed to drm-misc-fixes.

cheers,
  Gerd

^ permalink raw reply	[flat|nested] 12+ messages in thread
* Re: [PATCH] drm/virtio: move drm_connector_update_edid_property() call
@ 2019-06-26  9:15     ` Gerd Hoffmann
  0 siblings, 0 replies; 12+ messages in thread
From: Gerd Hoffmann @ 2019-06-26  9:15 UTC (permalink / raw)
  To: Cornelia Huck
  Cc: David Airlie, open list, dri-devel, open list:VIRTIO GPU DRIVER,
	jcmvbkbc

On Wed, Jun 26, 2019 at 09:51:46AM +0200, Cornelia Huck wrote:
> On Fri,  5 Apr 2019 06:46:02 +0200
> Gerd Hoffmann <kraxel@redhat.com> wrote:
> 
> > drm_connector_update_edid_property can sleep, we must not
> > call it while holding a spinlock.  Move the callsize.
> 
> s/callsize/callsite/

Fixed on commit.

> 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 <cohuck@redhat.com>
> 
> I have also looked at the code a bit, but don't feel confident enough
> to give an R-b.
> 
> Acked-by: Cornelia Huck <cohuck@redhat.com>

Thanks.  Pushed to drm-misc-fixes.

cheers,
  Gerd
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 12+ messages in thread
* [PATCH] drm/virtio: move drm_connector_update_edid_property() call
@ 2019-04-05  4:46 Gerd Hoffmann
  0 siblings, 0 replies; 12+ messages in thread
From: Gerd Hoffmann @ 2019-04-05  4:46 UTC (permalink / raw)
  To: dri-devel
  Cc: David Airlie, open list, open list:VIRTIO GPU DRIVER, jcmvbkbc,
	Daniel Vetter

drm_connector_update_edid_property can sleep, we must not
call it while holding a spinlock.  Move the callsize.

Reported-by: Max Filippov <jcmvbkbc@gmail.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 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 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);
-- 
2.18.1

^ permalink raw reply related	[flat|nested] 12+ messages in thread
end of thread, other threads:[~2019-06-26  9:15 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-04-05  4:46 [PATCH] drm/virtio: move drm_connector_update_edid_property() call Gerd Hoffmann
2019-04-05  4:46 ` Gerd Hoffmann
2019-04-05  6:51 ` Max Filippov
2019-04-05  6:51   ` Max Filippov
2019-04-05  6:51 ` Max Filippov
2019-06-26  7:51 ` Cornelia Huck
2019-06-26  7:51 ` Cornelia Huck
2019-06-26  7:51   ` Cornelia Huck
2019-06-26  9:15   ` Gerd Hoffmann
2019-06-26  9:15   ` Gerd Hoffmann
2019-06-26  9:15     ` Gerd Hoffmann
2019-04-05  4:46 Gerd Hoffmann

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.