]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm/virtio: plane_state->fb iff plane_state->crtc
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 13 Dec 2019 17:26:10 +0000 (18:26 +0100)
committerGerd Hoffmann <kraxel@redhat.com>
Mon, 16 Dec 2019 11:39:50 +0000 (12:39 +0100)
Checking both is one too much, so wrap a WARN_ON around it to stope
the copypasta.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20191213172612.1514842-8-daniel.vetter@ffwll.ch
Cc: David Airlie <airlied@linux.ie>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: virtualization@lists.linux-foundation.org
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
drivers/gpu/drm/virtio/virtgpu_plane.c

index bc4bc4475a8c0f01ce345cce74d7aa5aadea3b9f..947e65b51555450920bd49eb218f8ba0894a3601 100644 (file)
@@ -88,7 +88,7 @@ static int virtio_gpu_plane_atomic_check(struct drm_plane *plane,
        struct drm_crtc_state *crtc_state;
        int ret;
 
-       if (!state->fb || !state->crtc)
+       if (!state->fb || WARN_ON(!state->crtc))
                return 0;
 
        crtc_state = drm_atomic_get_crtc_state(state->state, state->crtc);