From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Dave Airlie <airlied@linux.ie>, DRI <dri-devel@lists.freedesktop.org>
Cc: Chun-Kuang Hu <chunkuang.hu@kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Yongqiang Niu <yongqiang.niu@mediatek.com>,
"jason-jh.lin" <jason-jh.lin@mediatek.com>
Subject: linux-next: manual merge of the drm tree with Linus' tree
Date: Mon, 23 Aug 2021 12:41:22 +1000 [thread overview]
Message-ID: <20210823124122.3d088380@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1995 bytes --]
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
between commit:
71ac6f390f6a ("drm/mediatek: Add AAL output size configuration")
from Linus' tree and commit:
78d1783c3243 ("drm/mediatek: Separate aal sub driver")
from the drm tree.
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.
From: Stephen Rothwell <sfr@canb.auug.org.au>
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 <sfr@canb.auug.org.au>
---
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/mediatek/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
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 = dev_get_drvdata(dev);
mtk_ddp_write(cmdq_pkt, w << 16 | h, &aal->cmdq_reg, aal->regs, DISP_AAL_SIZE);
+ mtk_ddp_write(cmdq_pkt, w << 16 | h, &priv->cmdq_reg, priv->regs, DISP_AAL_OUTPUT_SIZE);
}
void mtk_aal_gamma_set(struct device *dev, struct drm_crtc_state *state)
--
2.32.0
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2021-08-23 2:41 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-23 2:41 Stephen Rothwell [this message]
2021-08-24 0:12 ` linux-next: manual merge of the drm tree with Linus' tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2024-03-04 1:08 Stephen Rothwell
2024-03-04 0:47 Stephen Rothwell
2024-01-08 0:14 Stephen Rothwell
2023-06-19 1:17 Stephen Rothwell
2022-11-30 22:57 Stephen Rothwell
2022-11-27 23:58 Stephen Rothwell
2022-11-29 9:07 ` Geert Uytterhoeven
2022-11-17 2:13 Stephen Rothwell
2022-09-19 0:58 Stephen Rothwell
2022-09-19 7:58 ` Geert Uytterhoeven
2022-09-19 14:23 ` Nathan Chancellor
2022-02-28 3:17 Stephen Rothwell
2021-10-29 0:48 Stephen Rothwell
2021-10-29 6:52 ` Joonas Lahtinen
2021-10-11 0:37 Stephen Rothwell
2021-08-12 1:20 Stephen Rothwell
2021-07-01 0:52 Stephen Rothwell
2021-03-29 2:14 Stephen Rothwell
2021-03-30 7:36 ` Geert Uytterhoeven
2021-03-30 23:41 ` Stephen Rothwell
2021-02-01 1:30 Stephen Rothwell
2021-02-14 22:07 ` Stephen Rothwell
2021-01-18 0:56 Stephen Rothwell
2020-10-02 3:42 Stephen Rothwell
2020-05-25 3:51 Stephen Rothwell
2020-03-23 0:50 Stephen Rothwell
2019-11-13 1:38 Stephen Rothwell
2019-11-13 1:38 ` Stephen Rothwell
2019-11-13 1:13 Stephen Rothwell
2019-11-13 1:13 ` Stephen Rothwell
2019-11-13 0:58 Stephen Rothwell
2019-11-13 0:58 ` Stephen Rothwell
2019-11-13 0:50 Stephen Rothwell
2019-11-13 0:50 ` Stephen Rothwell
2019-11-13 0:46 Stephen Rothwell
2019-11-13 0:46 ` Stephen Rothwell
2019-11-13 0:40 Stephen Rothwell
2019-11-13 0:40 ` Stephen Rothwell
2019-08-26 3:12 Stephen Rothwell
2019-06-11 2:19 Stephen Rothwell
2018-06-04 3:09 Stephen Rothwell
2018-03-26 3:38 Stephen Rothwell
2018-03-22 6:37 Stephen Rothwell
2018-03-26 3:45 ` Stephen Rothwell
2018-03-13 1:15 Stephen Rothwell
2018-02-18 23:10 Stephen Rothwell
2018-02-20 20:15 ` Rodrigo Vivi
2018-02-18 23:02 Stephen Rothwell
2018-01-15 1:08 Stephen Rothwell
2017-11-23 23:37 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210823124122.3d088380@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=airlied@linux.ie \
--cc=chunkuang.hu@kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=jason-jh.lin@mediatek.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=yongqiang.niu@mediatek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).