* [PATCH 2/2] drm/virtio: Remove open-coded commit-tail function [not found] ` <20200709123339.547390-1-daniel.vetter-/w4YWyX8dFk@public.gmane.org> @ 2020-07-09 12:33 ` Daniel Vetter [not found] ` <20200709123339.547390-2-daniel.vetter-/w4YWyX8dFk@public.gmane.org> [not found] ` <5cb80369-75a5-fc83-4683-3a6fc2814104@kernel.org> 0 siblings, 2 replies; 6+ messages in thread From: Daniel Vetter @ 2020-07-09 12:33 UTC (permalink / raw) To: DRI Development Cc: Intel Graphics Development, linux-rdma-u79uwXL29TY76Z2rM5mHXA, Daniel Vetter, Daniel Vetter, David Airlie, Gerd Hoffmann, virtualization-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA Exactly matches the one in the helpers. This avoids me having to roll out dma-fence critical section annotations to this copy. Signed-off-by: Daniel Vetter <daniel.vetter-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org> Cc: David Airlie <airlied-cv59FeDIM0c@public.gmane.org> Cc: Gerd Hoffmann <kraxel-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> Cc: virtualization-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org --- drivers/gpu/drm/virtio/virtgpu_display.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/drivers/gpu/drm/virtio/virtgpu_display.c b/drivers/gpu/drm/virtio/virtgpu_display.c index f3ce49c5a34c..af55b334be2f 100644 --- a/drivers/gpu/drm/virtio/virtgpu_display.c +++ b/drivers/gpu/drm/virtio/virtgpu_display.c @@ -314,25 +314,6 @@ virtio_gpu_user_framebuffer_create(struct drm_device *dev, return &virtio_gpu_fb->base; } -static void vgdev_atomic_commit_tail(struct drm_atomic_state *state) -{ - struct drm_device *dev = state->dev; - - drm_atomic_helper_commit_modeset_disables(dev, state); - drm_atomic_helper_commit_modeset_enables(dev, state); - drm_atomic_helper_commit_planes(dev, state, 0); - - drm_atomic_helper_fake_vblank(state); - drm_atomic_helper_commit_hw_done(state); - - drm_atomic_helper_wait_for_vblanks(dev, state); - drm_atomic_helper_cleanup_planes(dev, state); -} - -static const struct drm_mode_config_helper_funcs virtio_mode_config_helpers = { - .atomic_commit_tail = vgdev_atomic_commit_tail, -}; - static const struct drm_mode_config_funcs virtio_gpu_mode_funcs = { .fb_create = virtio_gpu_user_framebuffer_create, .atomic_check = drm_atomic_helper_check, @@ -346,7 +327,6 @@ void virtio_gpu_modeset_init(struct virtio_gpu_device *vgdev) drm_mode_config_init(vgdev->ddev); vgdev->ddev->mode_config.quirk_addfb_prefer_host_byte_order = true; vgdev->ddev->mode_config.funcs = &virtio_gpu_mode_funcs; - vgdev->ddev->mode_config.helper_private = &virtio_mode_config_helpers; /* modes will be validated against the framebuffer size */ vgdev->ddev->mode_config.min_width = XRES_MIN; -- 2.27.0 ^ permalink raw reply related [flat|nested] 6+ messages in thread
[parent not found: <20200709123339.547390-2-daniel.vetter-/w4YWyX8dFk@public.gmane.org>]
* Re: [PATCH 2/2] drm/virtio: Remove open-coded commit-tail function [not found] ` <20200709123339.547390-2-daniel.vetter-/w4YWyX8dFk@public.gmane.org> @ 2020-07-09 12:48 ` Gerd Hoffmann 2020-07-09 14:05 ` Sam Ravnborg 1 sibling, 0 replies; 6+ messages in thread From: Gerd Hoffmann @ 2020-07-09 12:48 UTC (permalink / raw) To: Daniel Vetter Cc: DRI Development, Intel Graphics Development, linux-rdma-u79uwXL29TY76Z2rM5mHXA, Daniel Vetter, David Airlie, virtualization-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA On Thu, Jul 09, 2020 at 02:33:39PM +0200, Daniel Vetter wrote: > Exactly matches the one in the helpers. > > This avoids me having to roll out dma-fence critical section > annotations to this copy. > > Signed-off-by: Daniel Vetter <daniel.vetter-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org> > Cc: David Airlie <airlied-cv59FeDIM0c@public.gmane.org> > Cc: Gerd Hoffmann <kraxel-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> > Cc: virtualization-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Acked-by: Gerd Hoffmann <kraxel-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] drm/virtio: Remove open-coded commit-tail function [not found] ` <20200709123339.547390-2-daniel.vetter-/w4YWyX8dFk@public.gmane.org> 2020-07-09 12:48 ` Gerd Hoffmann @ 2020-07-09 14:05 ` Sam Ravnborg [not found] ` <20200709140531.GA220817-uyr5N9Q2VtJg9hUCZPvPmw@public.gmane.org> 1 sibling, 1 reply; 6+ messages in thread From: Sam Ravnborg @ 2020-07-09 14:05 UTC (permalink / raw) To: Daniel Vetter Cc: DRI Development, linux-rdma-u79uwXL29TY76Z2rM5mHXA, Intel Graphics Development, virtualization-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA, David Airlie, Gerd Hoffmann, Daniel Vetter On Thu, Jul 09, 2020 at 02:33:39PM +0200, Daniel Vetter wrote: > Exactly matches the one in the helpers. > > This avoids me having to roll out dma-fence critical section > annotations to this copy. > > Signed-off-by: Daniel Vetter <daniel.vetter-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org> > Cc: David Airlie <airlied-cv59FeDIM0c@public.gmane.org> > Cc: Gerd Hoffmann <kraxel-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> > Cc: virtualization-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org > --- > drivers/gpu/drm/virtio/virtgpu_display.c | 20 -------------------- > 1 file changed, 20 deletions(-) Very nice catch: Reviewed-by: Sam Ravnborg <sam-uyr5N9Q2VtJg9hUCZPvPmw@public.gmane.org> > > diff --git a/drivers/gpu/drm/virtio/virtgpu_display.c b/drivers/gpu/drm/virtio/virtgpu_display.c > index f3ce49c5a34c..af55b334be2f 100644 > --- a/drivers/gpu/drm/virtio/virtgpu_display.c > +++ b/drivers/gpu/drm/virtio/virtgpu_display.c > @@ -314,25 +314,6 @@ virtio_gpu_user_framebuffer_create(struct drm_device *dev, > return &virtio_gpu_fb->base; > } > > -static void vgdev_atomic_commit_tail(struct drm_atomic_state *state) > -{ > - struct drm_device *dev = state->dev; > - > - drm_atomic_helper_commit_modeset_disables(dev, state); > - drm_atomic_helper_commit_modeset_enables(dev, state); > - drm_atomic_helper_commit_planes(dev, state, 0); > - > - drm_atomic_helper_fake_vblank(state); > - drm_atomic_helper_commit_hw_done(state); > - > - drm_atomic_helper_wait_for_vblanks(dev, state); > - drm_atomic_helper_cleanup_planes(dev, state); > -} > - > -static const struct drm_mode_config_helper_funcs virtio_mode_config_helpers = { > - .atomic_commit_tail = vgdev_atomic_commit_tail, > -}; > - > static const struct drm_mode_config_funcs virtio_gpu_mode_funcs = { > .fb_create = virtio_gpu_user_framebuffer_create, > .atomic_check = drm_atomic_helper_check, > @@ -346,7 +327,6 @@ void virtio_gpu_modeset_init(struct virtio_gpu_device *vgdev) > drm_mode_config_init(vgdev->ddev); > vgdev->ddev->mode_config.quirk_addfb_prefer_host_byte_order = true; > vgdev->ddev->mode_config.funcs = &virtio_gpu_mode_funcs; > - vgdev->ddev->mode_config.helper_private = &virtio_mode_config_helpers; > > /* modes will be validated against the framebuffer size */ > vgdev->ddev->mode_config.min_width = XRES_MIN; > -- > 2.27.0 > > _______________________________________________ > dri-devel mailing list > dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 6+ messages in thread
[parent not found: <20200709140531.GA220817-uyr5N9Q2VtJg9hUCZPvPmw@public.gmane.org>]
* Re: [PATCH 2/2] drm/virtio: Remove open-coded commit-tail function [not found] ` <20200709140531.GA220817-uyr5N9Q2VtJg9hUCZPvPmw@public.gmane.org> @ 2020-07-14 9:13 ` Daniel Vetter 0 siblings, 0 replies; 6+ messages in thread From: Daniel Vetter @ 2020-07-14 9:13 UTC (permalink / raw) To: Sam Ravnborg Cc: Daniel Vetter, DRI Development, linux-rdma-u79uwXL29TY76Z2rM5mHXA, Intel Graphics Development, virtualization-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA, David Airlie, Gerd Hoffmann, Daniel Vetter On Thu, Jul 09, 2020 at 04:05:31PM +0200, Sam Ravnborg wrote: > On Thu, Jul 09, 2020 at 02:33:39PM +0200, Daniel Vetter wrote: > > Exactly matches the one in the helpers. > > > > This avoids me having to roll out dma-fence critical section > > annotations to this copy. > > > > Signed-off-by: Daniel Vetter <daniel.vetter-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org> > > Cc: David Airlie <airlied-cv59FeDIM0c@public.gmane.org> > > Cc: Gerd Hoffmann <kraxel-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> > > Cc: virtualization-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org > > --- > > drivers/gpu/drm/virtio/virtgpu_display.c | 20 -------------------- > > 1 file changed, 20 deletions(-) > Very nice catch: > Reviewed-by: Sam Ravnborg <sam-uyr5N9Q2VtJg9hUCZPvPmw@public.gmane.org> Patch applied, thanks for reviewing. > > > > diff --git a/drivers/gpu/drm/virtio/virtgpu_display.c b/drivers/gpu/drm/virtio/virtgpu_display.c > > index f3ce49c5a34c..af55b334be2f 100644 > > --- a/drivers/gpu/drm/virtio/virtgpu_display.c > > +++ b/drivers/gpu/drm/virtio/virtgpu_display.c > > @@ -314,25 +314,6 @@ virtio_gpu_user_framebuffer_create(struct drm_device *dev, > > return &virtio_gpu_fb->base; > > } > > > > -static void vgdev_atomic_commit_tail(struct drm_atomic_state *state) > > -{ > > - struct drm_device *dev = state->dev; > > - > > - drm_atomic_helper_commit_modeset_disables(dev, state); > > - drm_atomic_helper_commit_modeset_enables(dev, state); > > - drm_atomic_helper_commit_planes(dev, state, 0); > > - > > - drm_atomic_helper_fake_vblank(state); > > - drm_atomic_helper_commit_hw_done(state); > > - > > - drm_atomic_helper_wait_for_vblanks(dev, state); > > - drm_atomic_helper_cleanup_planes(dev, state); > > -} > > - > > -static const struct drm_mode_config_helper_funcs virtio_mode_config_helpers = { > > - .atomic_commit_tail = vgdev_atomic_commit_tail, > > -}; > > - > > static const struct drm_mode_config_funcs virtio_gpu_mode_funcs = { > > .fb_create = virtio_gpu_user_framebuffer_create, > > .atomic_check = drm_atomic_helper_check, > > @@ -346,7 +327,6 @@ void virtio_gpu_modeset_init(struct virtio_gpu_device *vgdev) > > drm_mode_config_init(vgdev->ddev); > > vgdev->ddev->mode_config.quirk_addfb_prefer_host_byte_order = true; > > vgdev->ddev->mode_config.funcs = &virtio_gpu_mode_funcs; > > - vgdev->ddev->mode_config.helper_private = &virtio_mode_config_helpers; > > > > /* modes will be validated against the framebuffer size */ > > vgdev->ddev->mode_config.min_width = XRES_MIN; > > -- > > 2.27.0 > > > > _______________________________________________ > > dri-devel mailing list > > dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org > > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch ^ permalink raw reply [flat|nested] 6+ messages in thread
[parent not found: <5cb80369-75a5-fc83-4683-3a6fc2814104@kernel.org>]
* Re: [PATCH 2/2] drm/virtio: Remove open-coded commit-tail function [not found] ` <5cb80369-75a5-fc83-4683-3a6fc2814104@kernel.org> @ 2020-08-19 13:24 ` Gerd Hoffmann [not found] ` <8a80b434-c8ed-daa3-753b-dd2ec89b9067@kernel.org> 0 siblings, 1 reply; 6+ messages in thread From: Gerd Hoffmann @ 2020-08-19 13:24 UTC (permalink / raw) To: Jiri Slaby Cc: linux-rdma, Daniel Vetter, Intel Graphics Development, DRI Development, virtualization, David Airlie, Daniel Vetter On Wed, Aug 19, 2020 at 02:43:28PM +0200, Jiri Slaby wrote: > On 09. 07. 20, 14:33, Daniel Vetter wrote: > > Exactly matches the one in the helpers. > > It's not that exact. The order of modeset_enables and planes is > different. And this causes a regression -- no fb in qemu. Does https://patchwork.freedesktop.org/patch/385980/ help? take care, Gerd _______________________________________________ Virtualization mailing list Virtualization@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/virtualization ^ permalink raw reply [flat|nested] 6+ messages in thread
[parent not found: <8a80b434-c8ed-daa3-753b-dd2ec89b9067@kernel.org>]
* Re: [PATCH 2/2] drm/virtio: Remove open-coded commit-tail function [not found] ` <8a80b434-c8ed-daa3-753b-dd2ec89b9067@kernel.org> @ 2020-08-21 7:01 ` Gerd Hoffmann 0 siblings, 0 replies; 6+ messages in thread From: Gerd Hoffmann @ 2020-08-21 7:01 UTC (permalink / raw) To: Jiri Slaby Cc: linux-rdma, Daniel Vetter, Intel Graphics Development, DRI Development, virtualization, David Airlie, Daniel Vetter On Thu, Aug 20, 2020 at 08:32:51AM +0200, Jiri Slaby wrote: > On 19. 08. 20, 15:24, Gerd Hoffmann wrote: > > On Wed, Aug 19, 2020 at 02:43:28PM +0200, Jiri Slaby wrote: > >> On 09. 07. 20, 14:33, Daniel Vetter wrote: > >>> Exactly matches the one in the helpers. > >> > >> It's not that exact. The order of modeset_enables and planes is > >> different. And this causes a regression -- no fb in qemu. > > > > Does https://patchwork.freedesktop.org/patch/385980/ help? > > Yes, it does. Any chance you can send a tested-by & acked-by for the series so I can get it merged? thanks, Gerd _______________________________________________ Virtualization mailing list Virtualization@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/virtualization ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-08-21 7:02 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20200707201229.472834-4-daniel.vetter@ffwll.ch>
[not found] ` <20200709123339.547390-1-daniel.vetter@ffwll.ch>
[not found] ` <20200709123339.547390-1-daniel.vetter-/w4YWyX8dFk@public.gmane.org>
2020-07-09 12:33 ` [PATCH 2/2] drm/virtio: Remove open-coded commit-tail function Daniel Vetter
[not found] ` <20200709123339.547390-2-daniel.vetter-/w4YWyX8dFk@public.gmane.org>
2020-07-09 12:48 ` Gerd Hoffmann
2020-07-09 14:05 ` Sam Ravnborg
[not found] ` <20200709140531.GA220817-uyr5N9Q2VtJg9hUCZPvPmw@public.gmane.org>
2020-07-14 9:13 ` Daniel Vetter
[not found] ` <5cb80369-75a5-fc83-4683-3a6fc2814104@kernel.org>
2020-08-19 13:24 ` Gerd Hoffmann
[not found] ` <8a80b434-c8ed-daa3-753b-dd2ec89b9067@kernel.org>
2020-08-21 7:01 ` Gerd Hoffmann
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).