iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/virtio: drop virtio_gpu_output->enabled

Browse Source 
Not needed, already tracked by drm_crtc_state->active.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20200818072511.6745-3-kraxel@redhat.com
This commit is contained in:
Gerd Hoffmann 2020-08-18 09:25:11 +02:00
parent 1bc371cd0e
commit 1174c8a0f3
3 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/virtio/virtgpu_display.c
View File

@ -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, static void virtio_gpu_crtc_atomic_enable(struct drm_crtc *crtc,
struct drm_crtc_state *old_state) 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, 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_cmd_set_scanout(vgdev, output->index, 0, 0, 0, 0, 0);
virtio_gpu_notify(vgdev); virtio_gpu_notify(vgdev);
output->enabled = false;
} }
static int virtio_gpu_crtc_atomic_check(struct drm_crtc *crtc, static int virtio_gpu_crtc_atomic_check(struct drm_crtc *crtc,

1
drivers/gpu/drm/virtio/virtgpu_drv.h
View File

@ -144,7 +144,6 @@ struct virtio_gpu_output {
struct edid *edid; struct edid *edid;
int cur_x; int cur_x;
int cur_y; int cur_y;
bool enabled;
bool needs_modeset; bool needs_modeset;
}; };
#define drm_crtc_to_virtio_gpu_output(x) \ #define drm_crtc_to_virtio_gpu_output(x) \

2
drivers/gpu/drm/virtio/virtgpu_plane.c
View File

@ -142,7 +142,7 @@ static void virtio_gpu_primary_plane_update(struct drm_plane *plane,
if (WARN_ON(!output)) if (WARN_ON(!output))
return; return;
if (!plane->state->fb || !output->enabled) { if (!plane->state->fb || !output->crtc.state->active) {
DRM_DEBUG("nofb\n"); DRM_DEBUG("nofb\n");
virtio_gpu_cmd_set_scanout(vgdev, output->index, 0, virtio_gpu_cmd_set_scanout(vgdev, output->index, 0,
plane->state->src_w >> 16, plane->state->src_w >> 16,