From patchwork Fri May 25 15:50:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 10427881 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B25DD601D5 for ; Fri, 25 May 2018 15:56:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9E854288FC for ; Fri, 25 May 2018 15:56:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 932A6289AA; Fri, 25 May 2018 15:56:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5A243288FC for ; Fri, 25 May 2018 15:56:56 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 961936E989; Fri, 25 May 2018 15:56:55 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.17.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id E68096E987 for ; Fri, 25 May 2018 15:56:53 +0000 (UTC) Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue105 [212.227.15.145]) with ESMTPA (Nemesis) id 0MZDyO-1fcp0q3XG0-00L0jq; Fri, 25 May 2018 17:51:41 +0200 From: Arnd Bergmann To: Laurent Pinchart , David Airlie Subject: [PATCH 4/8] drm/rcar-du: fix merge conflict for state->alpha Date: Fri, 25 May 2018 17:50:11 +0200 Message-Id: <20180525155030.3667352-4-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20180525155030.3667352-1-arnd@arndb.de> References: <20180525155030.3667352-1-arnd@arndb.de> X-Provags-ID: V03:K1:qfk7ta7aMUU5lUiyEuDc5IWKERsiJdt/aUVbBE5HdjYR4gX6A6l UMJVYSlXedaBgrIzHJKqwiLHj4N846MnGwE4uXeIBS2jp6F4ILsg9URWnWRpDR1BssvdkCD ANvUghPks2zeWC1YtuoBKOO4wp8NJLQA0xaiQppnf0/c3JEECO2iMHiBRySd/OnzHMGVtDT 9tWwrhNmLVkvqFnkjw6xQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:YNbZVEuhNMY=:mwlRcQCb+cqJLUmKDkq+nj M5L/5Wp2iqBXKKc4x1HxDsOj4FNblIvNKP6ZbIvU4+rnNBMNKMh+qymr79L8y600StYkcBScq mbkF2oAhS5ohQ3HzBjvXjsAGIFoPt7+NczKCmUJ4Txiw4mpJu0Ers129UiLWKUIDL9zGHXlx0 C9umiTIKHmi8OMeEPD2NBD+RNfn5PvMZhkaQTanb2WrsyVEGull3/Tn76yhlJ+vOAOqreWNSY vFMchfpkQMT3yUnxQuflhj+BwNlt/nUH9E4owa4eqeqbrgFWVo6AN+qJEh1o1EDIZR67nygi4 FseflynDpxjrG17vrCIArbnQs/isrStwQ1NEhqCXXAt35+kcmIWFjiPcTQi1Vb1kFT9Cf62hW NfFf4WGB6PdP9nTNhSoMSFIZE2sADybMe+i6JcTxIAR+t/iiB2KkKNw9ZuFWpKKa+eIDUR6my gPg3DPayVBzi5yEI0fs6y189VkdDPxwBWGapE/e1G89RHtkc32KSwKdU/wZ2CdYT72Z/j8z7y aBlAMqYpBmjTW/zgfC7WtxI0MpW18kB4K/h7ipiyjYK/4VGprlyJjDzC0vhqttgV+/UWVsQEe iaRzh1yahhGhpYFfCDbJ1ox4J/EwgBPQPAYENbKRu16T/SopaNxwlEWrsLhQiURmD9qzceq0f v0AsAe7SxNh0WPLBbbw8s9b88bEZ9rcCCi08Zq0GEvH9+B6r7xCCjWvv82CTgcXvWn20= X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Arnd Bergmann , Daniel Vetter , Liviu Dudau , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-renesas-soc@vger.kernel.org, Kieran Bingham , Mauro Carvalho Chehab MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP The "alpha" struct member was removed in one commit but another user added in another, leading to a build failure: drivers/gpu/drm/rcar-du/rcar_du_vsp.c: In function 'rcar_du_vsp_plane_atomic_duplicate_state': drivers/gpu/drm/rcar-du/rcar_du_vsp.c:325:6: error: 'struct rcar_du_vsp_plane_state' has no member named 'alpha' copy->alpha = to_rcar_vsp_plane_state(plane->state)->alpha; This fixes up the merge by using the correct member. Fixes: 75a07f399cd4 ("drm: rcar-du: Zero-out sg_tables when duplicating plane state") Fixes: 301a9b8d5456 ("drm/rcar-du: Convert to the new generic alpha property") Signed-off-by: Arnd Bergmann --- drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/rcar-du/rcar_du_vsp.c b/drivers/gpu/drm/rcar-du/rcar_du_vsp.c index 4a98470626d5..d9232e749b6d 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_vsp.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_vsp.c @@ -322,7 +322,7 @@ rcar_du_vsp_plane_atomic_duplicate_state(struct drm_plane *plane) return NULL; __drm_atomic_helper_plane_duplicate_state(plane, ©->state); - copy->alpha = to_rcar_vsp_plane_state(plane->state)->alpha; + copy->state.alpha = plane->state->alpha; return ©->state; }