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: 126950 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a985:0:b0:3e4:2afc:c1 with SMTP id t5csp1072772vqo; Thu, 27 Jul 2023 05:48:34 -0700 (PDT) X-Google-Smtp-Source: APBJJlH+e0LFW0C8vcDNaOFPguHLlNPTamnNT8Fs5bhIKB9PHKdXiOV5+31X43MSGPEEyRzfwoI7 X-Received: by 2002:a05:6e02:2184:b0:345:baef:842b with SMTP id j4-20020a056e02218400b00345baef842bmr6209585ila.25.1690462113953; Thu, 27 Jul 2023 05:48:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690462113; cv=none; d=google.com; s=arc-20160816; b=B69fYIQFE9ZOdZN1LmCwtWdB/762PmVYlS3sW1Sz7r3MGWHEtHPylOVHq3xwW8EPFO Jn5aD63bOTR9dP4t5CalPPy1WldbO5PXbr2jwf62wj5WBu29ntENGcc6eMoBOSUjf9Tn O1EZRd0NbLeI7uk/0wgHgPyI21y7av0+DBjKyWQ/WpuuQ9nQXwmYbqvE89mlvQ/E1OYy JZB+i4oASHPnF0kYgXYpFRt0sypKprI+GlkcShn9JfOWCqsIWm3kokyg+bMsD2qtR/Gh Jl0QZKArCYin7yi+Yolj/DG+jX4ISUe3Rnudb16ZhRO34asX7EG9qdTmN2hsHoDSLgGc /0vg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=qrZbdrFOOu4wJhXbXx3S16joHmM9Zua04WqVZSF1SMY=; fh=BqxHUsvODcwFPjCAiojp310b/MnPFOBUn/wdcPLEhbs=; b=j1I840EdyafST2t+aTF26LLZDGZj/cL/TzM6VqwXenYXREbsfx2MfnzRJz0mVmenuZ dqB9oK/PcaWkxY4KCKO5yR6y5FedzTkyYmpmOdwANl23uxSaMC/MIDuN/n2rpHaGzrQk aebcmznQJ1Dw3RASjwEMOrtAcdlkq/NG2al8GWDAlB0Tgg9NlcA00eWU/cgHuY1G2YMt oFvy1llZ55OqnrVm955gxgmfB5Dv/9B5LJqmTaIxqHjWsuOh1f1n7L8USBsD/FlcYIls 3XoAwPHNWBdwCzdD7D/pxeS67JHs50aRWyVinKePcoTy2oqBl5JPqvp8OAjhcQH/w9gD f3gQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Wn40rLox; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id la4-20020a170902fa0400b001badbeac8d0si1216530plb.423.2023.07.27.05.48.20; Thu, 27 Jul 2023 05:48:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Wn40rLox; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231792AbjG0MZl (ORCPT + 99 others); Thu, 27 Jul 2023 08:25:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59536 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233208AbjG0MZZ (ORCPT ); Thu, 27 Jul 2023 08:25:25 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 14D823C01 for ; Thu, 27 Jul 2023 05:24:30 -0700 (PDT) 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 8416D61E5D for ; 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 Cc: Arnd Bergmann , Thomas Zimmermann , Sam Ravnborg , Geert Uytterhoeven , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org 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-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772578001718113795 X-GMAIL-MSGID: 1772578001718113795 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,