drm/virtio: fix unblank
Subsystems (4)
Gerd Hoffmann
maintainercover drm/virtio: fix unblank
Gerd Hoffmann (2):
drm/virtio: fix unblank
drm/virtio: drop virtio_gpu_output->enabled
drivers/gpu/drm/virtio/virtgpu_drv.h | 2 +- drivers/gpu/drm/virtio/virtgpu_display.c | 15 +++++++++++---- drivers/gpu/drm/virtio/virtgpu_plane.c | 6 ++++-- 3 files changed, 16 insertions(+), 7 deletions(-)
Signature · 6 lines
2.18.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Gerd Hoffmann
maintainerPATCH 1/2 drm/virtio: fix unblank
When going through a disable/enable cycle without changing the framebuffer the optimization added by commit 3954ff10e06e ("drm/virtio:
skip set_scanout if framebuffer didn't change") causes the screen stay blank. Add a bool to force an update to fix that.
v2: use drm_atomic_crtc_needs_modeset() (Daniel).
--- drivers/gpu/drm/virtio/virtgpu_drv.h | 1 + drivers/gpu/drm/virtio/virtgpu_display.c | 11 +++++++++++ drivers/gpu/drm/virtio/virtgpu_plane.c | 4 +++- 3 files changed, 15 insertions(+), 1 deletion(-)
drivers/gpu/drm/virtio/virtgpu_drv.h +1 -0
@@ -138,6 +138,7 @@ struct virtio_gpu_output {int cur_x;int cur_y;bool enabled; +bool needs_modeset; };#define drm_crtc_to_virtio_gpu_output (x) \ container_of(x, struct virtio_gpu_output, crtc)
drivers/gpu/drm/virtio/virtgpu_display.c +11 -0
@@ -123,6 +123,17 @@ static int virtio_gpu_crtc_atomic_check(struct drm_crtc *crtc,static void virtio_gpu_crtc_atomic_flush (struct drm_crtc *crtc,struct drm_crtc_state *old_state) { +struct virtio_gpu_output *output =drm_crtc_to_virtio_gpu_output (crtc); + +/* +* virtio-gpu can't do modeset and plane update operations +* independant from each other. So the actual modeset happens +* in the plane update callback, and here we just check +* whenever we must force the modeset. +*/ +if (drm_atomic_crtc_needs_modeset (crtc->state)) { + output->needs_modeset = true; + } }static const struct drm_crtc_helper_funcs virtio_gpu_crtc_helper_funcs = {
drivers/gpu/drm/virtio/virtgpu_plane.c +3 -1
@@ -163,7 +163,9 @@ static void virtio_gpu_primary_plane_update(struct drm_plane *plane, plane->state->src_w != old_state->src_w || plane->state->src_h != old_state->src_h || plane->state->src_x != old_state->src_x || - plane->state->src_y != old_state->src_y) { + plane->state->src_y != old_state->src_y || + output->needs_modeset) { + output->needs_modeset = false; DRM_DEBUG("handle 0x%x, crtc %dx%d+%d+%d, src %dx%d+%d+%d\n", bo->hw_res_handle, plane->state->crtc_w, plane->state->crtc_h,
Signature · 6 lines
2.18.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 10 lines · Gerd Hoffmann
When going through a disable/enable cycle without changing the framebuffer the optimization added by commit
3954ff10e06e("drm/virtio:
skipset_scanoutif framebuffer didn't change") causes the screen stay blank. Add a bool to force an update to fix that.v2: use
drm_atomic_crtc_needs_modeset()(Daniel).Fixes 3954ff10e06e ("drm/virtio: skip set_scanout if framebuffer didn't change")Signed-off-by Gerd Hoffmann <[email protected]>
Quoted 56 lines
--- drivers/gpu/drm/virtio/virtgpu_drv.h | 1 + drivers/gpu/drm/virtio/virtgpu_display.c | 11 +++++++++++ drivers/gpu/drm/virtio/virtgpu_plane.c | 4 +++- 3 files changed, 15 insertions(+), 1 deletion(-)drivers/gpu/drm/virtio/virtgpu_drv.h +1
-0@@ -138,6 +138,7 @@ struct virtio_gpu_output {int cur_x;int cur_y;bool enabled; +bool needs_modeset; };#define drm_crtc_to_virtio_gpu_output (x) \ container_of(x, struct virtio_gpu_output, crtc)drivers/gpu/drm/virtio/virtgpu_display.c +11
-0@@ -123,6 +123,17 @@ static int virtio_gpu_crtc_atomic_check(struct drm_crtc *crtc,static void virtio_gpu_crtc_atomic_flush (struct drm_crtc *crtc,struct drm_crtc_state *old_state) { +struct virtio_gpu_output *output =drm_crtc_to_virtio_gpu_output (crtc); + +/* +* virtio-gpu can't do modeset and plane update operations +* independant from each other. So the actual modeset happens +* in the plane update callback, and here we just check +* whenever we must force the modeset. +*/ +if (drm_atomic_crtc_needs_modeset (crtc->state)) { + output->needs_modeset = true; + } }static const struct drm_crtc_helper_funcs virtio_gpu_crtc_helper_funcs = {drivers/gpu/drm/virtio/virtgpu_plane.c +3
-1@@ -163,7 +163,9 @@ static void virtio_gpu_primary_plane_update(struct drm_plane *plane, plane->state->src_w != old_state->src_w || plane->state->src_h != old_state->src_h || plane->state->src_x != old_state->src_x || - plane->state->src_y != old_state->src_y) { + plane->state->src_y != old_state->src_y || + output->needs_modeset) { + output->needs_modeset = false; DRM_DEBUG("handle 0x%x, crtc %dx%d+%d+%d, src %dx%d+%d+%d\n", bo->hw_res_handle, plane->state->crtc_w, plane->state->crtc_h,
Signature · 6 lines
js suse labs _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Gerd Hoffmann
maintainerQuoted 6 lines · Jiri Slaby
Quoted 5 lines · Gerd Hoffmann
When going through a disable/enable cycle without changing the framebuffer the optimization added by commit
3954ff10e06e("drm/virtio:
skipset_scanoutif framebuffer didn't change") causes the screen stay blank. Add a bool to force an update to fix that.
Quoted 7 lines
Quoted 5 lines
v2: use
drm_atomic_crtc_needs_modeset()(Daniel).Fixes 3954ff10e06e ("drm/virtio: skip set_scanout if framebuffer didn't change")Signed-off-by Gerd Hoffmann <[email protected]>Tested-by Jiri Slaby <[email protected]>
Ping. Need an ack or an review to merge this.
thanks,
Gerd
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Daniel Vetter
Acked-byQuoted 9 lines · Gerd Hoffmann
Quoted 8 lines · Jiri Slaby
Quoted 7 lines · Gerd Hoffmann
When going through a disable/enable cycle without changing the framebuffer the optimization added by commit
3954ff10e06e("drm/virtio:
skipset_scanoutif framebuffer didn't change") causes the screen stay blank. Add a bool to force an update to fix that.v2: use
drm_atomic_crtc_needs_modeset()(Daniel).
Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
Fixes 3954ff10e06e ("drm/virtio: skip set_scanout if framebuffer didn't change")Signed-off-by Gerd Hoffmann <[email protected]>Tested-by Jiri Slaby <[email protected]>Ping. Need an ack or an review to merge this.
In case you still need that, on both patches:
Quoted 8 lines
thanks,
Gerd_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 21 lines · Gerd Hoffmann
When going through a disable/enable cycle without changing the framebuffer the optimization added by commit
3954ff10e06e("drm/virtio:
skipset_scanoutif framebuffer didn't change") causes the screen stay blank. Add a bool to force an update to fix that.v2: use
drm_atomic_crtc_needs_modeset()(Daniel).Fixes 3954ff10e06e ("drm/virtio: skip set_scanout if framebuffer didn't change")Signed-off-by Gerd Hoffmann <[email protected]>--- drivers/gpu/drm/virtio/virtgpu_drv.h | 1 + drivers/gpu/drm/virtio/virtgpu_display.c | 11 +++++++++++ drivers/gpu/drm/virtio/virtgpu_plane.c | 4 +++- 3 files changed, 15 insertions(+), 1 deletion(-)drivers/gpu/drm/virtio/virtgpu_drv.h +0
-0
drivers/gpu/drm/virtio/virtgpu_drv.h struct virtio_gpu_output { · line 141
Quoted 4 lines
drivers/gpu/drm/virtio/virtgpu_drv.h +1
-0@@ -138,6 +138,7 @@ struct virtio_gpu_output {int cur_x;int cur_y;bool enabled; +bool needs_modeset;
Maybe for a follow-up in -next: The clean atomic way of doing this is to put this into a virtio_crtc_state, compute it in atomic_check, and then fish it out (through old_state->state lookup, somewhat contrived I know) in the commit side. Putting random atomic commit state tracking stuff into non-state structures without appropriate amounts of locks is kinda iffy and means more work for reviewers pondering whether it all works correctly.
Cheers, Daniel
Quoted 43 lines
drivers/gpu/drm/virtio/virtgpu_drv.h +0
-0};#define drm_crtc_to_virtio_gpu_output (x) \ container_of(x, struct virtio_gpu_output, crtc)drivers/gpu/drm/virtio/virtgpu_display.c +11
-0@@ -123,6 +123,17 @@ static int virtio_gpu_crtc_atomic_check(struct drm_crtc *crtc,static void virtio_gpu_crtc_atomic_flush (struct drm_crtc *crtc,struct drm_crtc_state *old_state) { +struct virtio_gpu_output *output =drm_crtc_to_virtio_gpu_output (crtc); + +/* +* virtio-gpu can't do modeset and plane update operations +* independant from each other. So the actual modeset happens +* in the plane update callback, and here we just check +* whenever we must force the modeset. +*/ +if (drm_atomic_crtc_needs_modeset (crtc->state)) { + output->needs_modeset = true; + } }static const struct drm_crtc_helper_funcs virtio_gpu_crtc_helper_funcs = {drivers/gpu/drm/virtio/virtgpu_plane.c +3
-1@@ -163,7 +163,9 @@ static void virtio_gpu_primary_plane_update(struct drm_plane *plane, plane->state->src_w != old_state->src_w || plane->state->src_h != old_state->src_h || plane->state->src_x != old_state->src_x || - plane->state->src_y != old_state->src_y) { + plane->state->src_y != old_state->src_y || + output->needs_modeset) { + output->needs_modeset = false; DRM_DEBUG("handle 0x%x, crtc %dx%d+%d+%d, src %dx%d+%d+%d\n", bo->hw_res_handle, plane->state->crtc_w, plane->state->crtc_h,Signature · 1 line
2.18.4
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Gerd Hoffmann
maintainerPATCH 2/2 drm/virtio: drop virtio_gpu_output->enabled
In reply to Gerd HoffmannNot needed, already tracked by drm_crtc_state->active.
--- drivers/gpu/drm/virtio/virtgpu_drv.h | 1 - drivers/gpu/drm/virtio/virtgpu_display.c | 4 ---- drivers/gpu/drm/virtio/virtgpu_plane.c | 2 +- 3 files changed, 1 insertion(+), 6 deletions(-)
drivers/gpu/drm/virtio/virtgpu_drv.h +0 -1
@@ -137,7 +137,6 @@ struct virtio_gpu_output {struct edid *edid;int cur_x;int cur_y; -bool enabled;bool needs_modeset; };#define drm_crtc_to_virtio_gpu_output (x) \
drivers/gpu/drm/virtio/virtgpu_display.c +0 -4
@@ -97,9 +97,6 @@ static void virtio_gpu_crtc_mode_set_nofb(struct drm_crtc *crtc)static void virtio_gpu_crtc_atomic_enable (struct drm_crtc *crtc,struct drm_crtc_state *old_state) { -struct virtio_gpu_output *output =drm_crtc_to_virtio_gpu_output (crtc); - - output->enabled = true; } static void virtio_gpu_crtc_atomic_disable(struct drm_crtc *crtc,
@@ -111,7 +108,6 @@ static void virtio_gpu_crtc_atomic_disable(struct drm_crtc *crtc,virtio_gpu_cmd_set_scanout (vgdev, output->index,0 ,0 ,0 ,0 ,0 );virtio_gpu_notify (vgdev); - output->enabled = false; } static int virtio_gpu_crtc_atomic_check(struct drm_crtc *crtc,
drivers/gpu/drm/virtio/virtgpu_plane.c +1 -1
@@ -142,7 +142,7 @@ static void virtio_gpu_primary_plane_update(struct drm_plane *plane,if (WARN_ON (!output))return ; -if (!plane->state->fb || !output->enabled) { +if (!plane->state->fb || !output->crtc.state->active) {DRM_DEBUG ("nofb\n" ); virtio_gpu_cmd_set_scanout(vgdev, output->index, 0, plane->state->src_w >> 16,
Signature · 1 line
2.18.4
PATCH 1/1 drm/virtio: fix unblank
In reply to Gerd HoffmannFrom: Gerd Hoffmann <[email protected]>
When going through a disable/enable cycle without changing the framebuffer the optimization added by commit 3954ff10e06e ("drm/virtio:
skip set_scanout if framebuffer didn't change") causes the screen stay blank. Add a bool to force an update to fix that.
v2: use drm_atomic_crtc_needs_modeset() (Daniel).
--- drivers/gpu/drm/virtio/virtgpu_display.c | 11 +++++++++++ drivers/gpu/drm/virtio/virtgpu_drv.h | 1 + drivers/gpu/drm/virtio/virtgpu_plane.c | 4 +++- 3 files changed, 15 insertions(+), 1 deletion(-)
drivers/gpu/drm/virtio/virtgpu_display.c +11 -0
@@ -123,6 +123,17 @@ static int virtio_gpu_crtc_atomic_check(struct drm_crtc *crtc,static void virtio_gpu_crtc_atomic_flush (struct drm_crtc *crtc,struct drm_crtc_state *old_state) { +struct virtio_gpu_output *output =drm_crtc_to_virtio_gpu_output (crtc); + +/* +* virtio-gpu can't do modeset and plane update operations +* independant from each other. So the actual modeset happens +* in the plane update callback, and here we just check +* whenever we must force the modeset. +*/ +if (drm_atomic_crtc_needs_modeset (crtc->state)) { + output->needs_modeset = true; + } }static const struct drm_crtc_helper_funcs virtio_gpu_crtc_helper_funcs = {
drivers/gpu/drm/virtio/virtgpu_drv.h +1 -0
@@ -138,6 +138,7 @@ struct virtio_gpu_output {int cur_x;int cur_y;bool enabled; +bool needs_modeset; };#define drm_crtc_to_virtio_gpu_output (x) \ container_of(x, struct virtio_gpu_output, crtc)
drivers/gpu/drm/virtio/virtgpu_plane.c +3 -1
@@ -163,7 +163,9 @@ static void virtio_gpu_primary_plane_update(struct drm_plane *plane, plane->state->src_w != old_state->src_w || plane->state->src_h != old_state->src_h || plane->state->src_x != old_state->src_x || - plane->state->src_y != old_state->src_y) { + plane->state->src_y != old_state->src_y || + output->needs_modeset) { + output->needs_modeset = false; DRM_DEBUG("handle 0x%x, crtc %dx%d+%d+%d, src %dx%d+%d+%d\n", bo->hw_res_handle, plane->state->crtc_w, plane->state->crtc_h,
Signature · 1 line
2.28.0