From patchwork Thu Jul 27 12:24:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 13330068 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 953F0C0015E for ; Thu, 27 Jul 2023 12:24:21 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EED2210E346; Thu, 27 Jul 2023 12:24:20 +0000 (UTC) Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by gabe.freedesktop.org (Postfix) with ESMTPS id ACDC710E346 for ; Thu, 27 Jul 2023 12:24:18 +0000 (UTC) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 2570061E77; Thu, 27 Jul 2023 12:24:18 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A583DC433C7; Thu, 27 Jul 2023 12:24:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1690460658; bh=I5/OzNyWa4cq5lqW1SUiyYV4KV0DfEq9gMsgUWKzfA4=; h=From:To:Cc:Subject:Date:From; b=Wn40rLoxS6gKTnyr8X7QiWA9zo/IOmJfXxG60tMscbeBoJMA+CNIaOzZywmMphcfO DDfis9+PTBq8FYyHycTvonWDT1kQW1nw5M+22GXGDZJprpyFSSma8wtbvOA9jkwI9J MjOLVzTkHfZhQOxI0k19o9wOSIgRpI/WHARfWFO8XY8c/8KrELx7M+2j19uJoD8hws h1PZjri9PtRn+TMHhcSHg3KDRVG5eDe+hqeIimD4q3jK47PT/lkYxYnIBNEWJBKvSQ I0wPqf9/COE8bK2PWJGK18MpLIzatLd0UscbWaVjHd1v54/rck0TVNezXJruCL/wBX 6XsvYfN4N2YoQ== From: Arnd Bergmann To: Javier Martinez Canillas , David Airlie , Daniel Vetter , Maxime Ripard Subject: [PATCH] drm/ssd130x: drop DRM_GEM_SHADOW_PLANE_FUNCS override Date: Thu, 27 Jul 2023 14:24:06 +0200 Message-Id: <20230727122412.2464210-1-arnd@kernel.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Arnd Bergmann , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Geert Uytterhoeven , Thomas Zimmermann , Sam Ravnborg Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Arnd Bergmann It is not possible for ssd130x_primary_plane_funcs to use both its own reset/duplicate/destroy callbacks and the ones from DRM_GEM_SHADOW_PLANE_FUNCS: In file included from drivers/gpu/drm/solomon/ssd130x.c:29: include/drm/drm_gem_atomic_helper.h:100:18: error: initialized field overwritten [-Werror=override-init] 100 | .reset = drm_gem_reset_shadow_plane, \ 101 | .atomic_duplicate_state = drm_gem_duplicate_shadow_plane_state, \ 102 | .atomic_destroy_state = drm_gem_destroy_shadow_plane_state | ^~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/solomon/ssd130x.c:744:9: note: in expansion of macro 'DRM_GEM_SHADOW_PLANE_FUNCS' 744 | DRM_GEM_SHADOW_PLANE_FUNCS, | ^~~~~~~~~~~~~~~~~~~~~~~~~~ Since the custom callbacks were just added, I assume these are the ones it is meant to use, so remvoe the generic overrides. Fixes: 45b58669e532b ("drm/ssd130x: Allocate buffer in the plane's .atomic_check() callback") Signed-off-by: Arnd Bergmann --- drivers/gpu/drm/solomon/ssd130x.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/gpu/drm/solomon/ssd130x.c b/drivers/gpu/drm/solomon/ssd130x.c index d2f8dd6a6347a..479de42307c88 100644 --- a/drivers/gpu/drm/solomon/ssd130x.c +++ b/drivers/gpu/drm/solomon/ssd130x.c @@ -741,7 +741,6 @@ static const struct drm_plane_funcs ssd130x_primary_plane_funcs = { .atomic_duplicate_state = ssd130x_primary_plane_duplicate_state, .atomic_destroy_state = ssd130x_primary_plane_destroy_state, .destroy = drm_plane_cleanup, - DRM_GEM_SHADOW_PLANE_FUNCS, }; static enum drm_mode_status ssd130x_crtc_helper_mode_valid(struct drm_crtc *crtc,