drm/virtio: fix unblank
Subsystems (4)
Gerd Hoffmann
maintainerPATCH 1/1 drm/virtio: fix unblank
When going through a disable/enable cycle without changing the framebuffer the optimization added by commit 3954ff10e06e causes the screen stay blank. Add a bool to force an update to fix that.
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 | 1 + drivers/gpu/drm/virtio/virtgpu_plane.c | 4 +++- 3 files changed, 5 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 need_update; };#define drm_crtc_to_virtio_gpu_output (x) \ container_of(x, struct virtio_gpu_output, crtc)
drivers/gpu/drm/virtio/virtgpu_display.c +1 -0
@@ -99,6 +99,7 @@ static void virtio_gpu_crtc_atomic_enable(struct drm_crtc *crtc,struct virtio_gpu_output *output =drm_crtc_to_virtio_gpu_output (crtc); output->enabled = true; + output->need_update = true; } static void virtio_gpu_crtc_atomic_disable(struct drm_crtc *crtc,
drivers/gpu/drm/virtio/virtgpu_plane.c +3 -1
@@ -163,7 +163,8 @@ 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->need_update) { 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,
@@ -178,6 +179,7 @@ static void virtio_gpu_primary_plane_update(struct drm_plane *plane, plane->state->src_h >>16 , plane->state->src_x >>16 , plane->state->src_y >> 16); + output->need_update = false; } virtio_gpu_cmd_resource_flush(vgdev, bo->hw_res_handle,
Signature · 1 line
2.18.4