From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B2A39C4320A for ; Tue, 24 Aug 2021 00:12:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 95BF761052 for ; Tue, 24 Aug 2021 00:12:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233305AbhHXANT (ORCPT ); Mon, 23 Aug 2021 20:13:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50930 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233401AbhHXANS (ORCPT ); Mon, 23 Aug 2021 20:13:18 -0400 Received: from ozlabs.org (bilbo.ozlabs.org [IPv6:2401:3900:2:1::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8A2ADC061575; Mon, 23 Aug 2021 17:12:35 -0700 (PDT) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4GtqLS6vNQz9ssD; Tue, 24 Aug 2021 10:12:32 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1629763953; bh=smG2A0KLlmpKlAo1m3EBk1m9rpYW/qPPGNszKvRwOTI=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=M6T0VavKhAndB7pGZtf8ZmfojutzDUMTVroswObGTl5FJ/pnnTQhPvcIOLetH1rVM pLqArP+R5cilC0K56+cSp6VDunAiWNokvV2hXVsBuQoWdCPxwMFeXgOJ1ovOQ3bdws uA7z8yJZYRmVJHcWKRyVdndK856rcaaGtSWMfD5ks8tt6woDUOnBNDZkK0SOC1xKa1 rLc2GzEH1G7hGimFv27mV97BkDd7kcl+OsBVDalAR/KTNVzf0Qy1ohaSL20sLDN4fK FLUeTRQy8+cfoOlcOdxkqWUD/G77PyNOhhYZ/klQnrGi/nX9VlcWFeD2Ri55G7+nJo hciDhvaeoKjuA== Date: Tue, 24 Aug 2021 10:12:31 +1000 From: Stephen Rothwell To: Dave Airlie , DRI Cc: Chun-Kuang Hu , Linux Kernel Mailing List , Linux Next Mailing List , Yongqiang Niu , "jason-jh.lin" , Guenter Roeck Subject: Re: linux-next: manual merge of the drm tree with Linus' tree Message-ID: <20210824101231.72801784@canb.auug.org.au> In-Reply-To: <20210823124122.3d088380@canb.auug.org.au> References: <20210823124122.3d088380@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/kQO=hGw=Cw+9QfpvUMF0QRy"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/kQO=hGw=Cw+9QfpvUMF0QRy Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, [Thanks Guenter for pointing this out] On Mon, 23 Aug 2021 12:41:22 +1000 Stephen Rothwell = wrote: > > Today's linux-next merge of the drm tree got a conflict in: >=20 > drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c >=20 > between commit: >=20 > 71ac6f390f6a ("drm/mediatek: Add AAL output size configuration") >=20 > from Linus' tree and commit: >=20 > 78d1783c3243 ("drm/mediatek: Separate aal sub driver") >=20 > from the drm tree. >=20 > I fixed it up (I added the following merge resolution patch after > using the latter version of the above file) and can carry the fix as > necessary. This is now fixed as far as linux-next is concerned, but any > non trivial conflicts should be mentioned to your upstream maintainer > when your tree is submitted for merging. You may also want to consider > cooperating with the maintainer of the conflicting tree to minimise any > particularly complex conflicts. >=20 > From: Stephen Rothwell > Date: Mon, 23 Aug 2021 12:37:29 +1000 > Subject: [PATCH] drm/mediatek: merge fix for "Add AAL output size > configuration" >=20 > Signed-off-by: Stephen Rothwell > --- > drivers/gpu/drm/mediatek/mtk_disp_aal.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) >=20 > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_aal.c b/drivers/gpu/drm/me= diatek/mtk_disp_aal.c > index 64b45284766a..a6760761088b 100644 > --- a/drivers/gpu/drm/mediatek/mtk_disp_aal.c > +++ b/drivers/gpu/drm/mediatek/mtk_disp_aal.c > @@ -18,7 +18,7 @@ > #define DISP_AAL_EN 0x0000 > #define AAL_EN BIT(0) > #define DISP_AAL_SIZE 0x0030 > - > +#define DISP_AAL_OUTPUT_SIZE 0x04d8 > =20 > struct mtk_disp_aal_data { > bool has_gamma; > @@ -57,6 +57,7 @@ void mtk_aal_config(struct device *dev, unsigned int w, > struct mtk_disp_aal *aal =3D dev_get_drvdata(dev); > =20 > mtk_ddp_write(cmdq_pkt, w << 16 | h, &aal->cmdq_reg, aal->regs, DISP_AA= L_SIZE); > + mtk_ddp_write(cmdq_pkt, w << 16 | h, &priv->cmdq_reg, priv->regs, DISP_= AAL_OUTPUT_SIZE); > } > =20 > void mtk_aal_gamma_set(struct device *dev, struct drm_crtc_state *state) My mistake, I have fixed that patch today to be this: From: Stephen Rothwell Date: Mon, 23 Aug 2021 12:37:29 +1000 Subject: [PATCH] drm/mediatek: merge fix for "Add AAL output size configuration" Signed-off-by: Stephen Rothwell --- drivers/gpu/drm/mediatek/mtk_disp_aal.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/mediatek/mtk_disp_aal.c b/drivers/gpu/drm/medi= atek/mtk_disp_aal.c index 64b45284766a..a6760761088b 100644 --- a/drivers/gpu/drm/mediatek/mtk_disp_aal.c +++ b/drivers/gpu/drm/mediatek/mtk_disp_aal.c @@ -18,7 +18,7 @@ #define DISP_AAL_EN 0x0000 #define AAL_EN BIT(0) #define DISP_AAL_SIZE 0x0030 - +#define DISP_AAL_OUTPUT_SIZE 0x04d8 =20 struct mtk_disp_aal_data { bool has_gamma; @@ -57,6 +57,7 @@ void mtk_aal_config(struct device *dev, unsigned int w, struct mtk_disp_aal *aal =3D dev_get_drvdata(dev); =20 mtk_ddp_write(cmdq_pkt, w << 16 | h, &aal->cmdq_reg, aal->regs, DISP_AAL_= SIZE); + mtk_ddp_write(cmdq_pkt, w << 16 | h, &aal->cmdq_reg, aal->regs, DISP_AAL_= OUTPUT_SIZE); } =20 void mtk_aal_gamma_set(struct device *dev, struct drm_crtc_state *state) --=20 Cheers, Stephen Rothwell --Sig_/kQO=hGw=Cw+9QfpvUMF0QRy Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmEkOW8ACgkQAVBC80lX 0Gxj3Af+JUs4RUDEmZ9oeZiWmQtN2DLoKk6/ZkCh5rNEk/sNQoV8jHrkbPeYX+qi XKI9YLojYGGlyu4syadeBvdiXuVeYA2FR2KgLRlt/nNL5w+5w3iK2lIPK/12evI8 N0/fe2QbZoOfh/7hGOhHbefpZORb1XHNp37MbuTxp7hwVBbuPj+e89QVFRujRXgk Eyre3Dpm2XEenEqOFX/djnCeJKQaFHbj5nHHDczAmosUxrt4ptUX+M3u7MIA6RiY oeSxiL8qqduUxv5/5DfbuTgXKeTCryF5oDpKHsR4btwA9pwe9GD9byFfthbj6RFT 8f7G9vvZvM6ZXIlPWD4JhulCwQW3bg== =Zv/i -----END PGP SIGNATURE----- --Sig_/kQO=hGw=Cw+9QfpvUMF0QRy--