diff options
| author | Daniel Vetter <[email protected]> | 2019-12-13 18:26:08 +0100 |
|---|---|---|
| committer | Daniel Vetter <[email protected]> | 2020-01-28 15:42:23 +0100 |
| commit | fd907adeb793dc68a0353a8915abc37011bceae2 (patch) | |
| tree | 66f7256b4e93dc39c5a0703f5cc1507cab4682e9 | |
| parent | 4efb31316d5f317cc83cbc4a983327311ae959e6 (diff) | |
drm/rockchip: 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 <[email protected]>
Acked-by: Sam Ravnborg <[email protected]>
Signed-off-by: Daniel Vetter <[email protected]>
Cc: Sandy Huang <[email protected]>
Cc: "Heiko Stübner" <[email protected]>
Cc: [email protected]
Cc: [email protected]
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
| -rw-r--r-- | drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c index d04b3492bdac..cecb2cc781f5 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -724,7 +724,7 @@ static int vop_plane_atomic_check(struct drm_plane *plane, int max_scale = win->phy->scl ? FRAC_16_16(8, 1) : DRM_PLANE_HELPER_NO_SCALING; - if (!crtc || !fb) + if (!crtc || WARN_ON(!fb)) return 0; crtc_state = drm_atomic_get_existing_crtc_state(state->state, crtc); |