Commit 1bc371cd authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

drm/virtio: fix unblank 



When going through a disable/enable cycle without changing the
framebuffer the optimization added by commit 3954ff10 ("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).

Cc: 1882851@bugs.launchpad.net
Fixes: 3954ff10 ("drm/virtio: skip set_scanout if framebuffer didn't change")
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Tested-by: default avatarJiri Slaby <jirislaby@kernel.org>
Tested-by: default avatarDiego Viola <diego.viola@gmail.com>
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20200818072511.6745-2-kraxel@redhat.com
parent c08503ec

drivers/gpu/drm/virtio/virtgpu_display.c

+11 −0
Original line number Diff line number Diff line
@@ -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

	 * independent 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
Original line number Diff line number Diff line
@@ -145,6 +145,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
Original line number Diff line number Diff line
@@ -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,

CRA Git | Maintained and supported by SUSTech CRA and CCSE