From 726d76c3a696faecaeebfce01a24616d08158129 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 30 Mar 2020 18:25:10 +0100 Subject: [PATCH] drm/vc4: Fixup plane init within firmware-kms "drm/vc4: plane: Move additional planes creation to driver" moved overlay and cursor plane creation to a global function thata was unconditionally run, when it is not wanted in firmware KMS mode. Signed-off-by: Dave Stevenson --- drivers/gpu/drm/vc4/vc4_drv.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c index 7a65f19..f45cad6 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.c +++ b/drivers/gpu/drm/vc4/vc4_drv.c @@ -291,9 +291,11 @@ static int vc4_drm_bind(struct device *dev) if (ret) goto gem_destroy; - ret = vc4_plane_create_additional_planes(drm); - if (ret) - goto unbind_all; + if (!vc4->firmware_kms) { + ret = vc4_plane_create_additional_planes(drm); + if (ret) + goto unbind_all; + } drm_fb_helper_remove_conflicting_framebuffers(NULL, "vc4drmfb", false); -- 2.7.4