From: Daniel Vetter Date: Fri, 13 Dec 2019 17:26:09 +0000 (+0100) Subject: drm/vc4: plane_state->fb iff plane_state->crtc X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=021b7c7b3268292d1366cf4ec83309b478a06630;p=openwrt%2Fstaging%2Fblogic.git drm/vc4: plane_state->fb iff plane_state->crtc Checking both is one too much, so wrap a WARN_ON around it to stope the copypasta. Reviewed-by: Heiko Stuebner Signed-off-by: Daniel Vetter Link: https://patchwork.freedesktop.org/patch/msgid/20191213172612.1514842-7-daniel.vetter@ffwll.ch --- diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c index 4934127f0d76..91e408f7a56e 100644 --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c @@ -139,7 +139,7 @@ static enum vc4_scaling_mode vc4_get_scaling_mode(u32 src, u32 dst) static bool plane_enabled(struct drm_plane_state *state) { - return state->fb && state->crtc; + return state->fb && !WARN_ON(!state->crtc); } static struct drm_plane_state *vc4_plane_duplicate_state(struct drm_plane *plane)