Commit fc7f148f authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

drm/virtio: drop virtio_gpu_output->enabled 



Not needed, already tracked by drm_crtc_state->active.

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20200818072511.6745-3-kraxel@redhat.com
(cherry picked from commit 1174c8a0)
parent 5e2e2600

drivers/gpu/drm/virtio/virtgpu_display.c

+0 −4
Original line number Diff line number Diff line
@@ -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_drv.h

+0 −1
Original line number Diff line number Diff line
@@ -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_plane.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

CRA Git | Maintained and supported by SUSTech CRA and CCSE