drop drm-mediatek-fix-aal-size-config.patch from 5.10 and 5.11

diff --git a/queue-5.10/drm-mediatek-fix-aal-size-config.patch b/queue-5.10/drm-mediatek-fix-aal-size-config.patch
deleted file mode 100644 (file)
index ff40632..0000000
--- a/queue-5.10/drm-mediatek-fix-aal-size-config.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From c89dab15acdcdcfa6f2d342c8f3e627bebcce60b Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 22 Feb 2021 18:14:07 -0500
-Subject: drm/mediatek: Fix aal size config
-
-[ Upstream commit 71dcadba34203d8dd35152e368720f977e9cdb81 ]
-
-The orginal setting is not correct, fix it to follow hardware data sheet.
-If keep this error setting, mt8173/mt8183 display ok
-but mt8192 display abnormal.
-
-Fixes: 0664d1392c26 ("drm/mediatek: Add AAL engine basic function")
-
-Signed-off-by: Yongqiang Niu <yongqiang.niu@mediatek.com>
-Signed-off-by: Chun-Kuang Hu <chunkuang.hu@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
-index 3064eac1a7507..7fcb717f256c9 100644
---- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
-+++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
-@@ -180,7 +180,9 @@ static void mtk_aal_config(struct mtk_ddp_comp *comp, unsigned int w,
-                          unsigned int h, unsigned int vrefresh,
-                          unsigned int bpc, struct cmdq_pkt *cmdq_pkt)
- {
--      mtk_ddp_write(cmdq_pkt, h << 16 | w, comp, DISP_AAL_SIZE);
-+      struct mtk_ddp_comp_dev *priv = dev_get_drvdata(comp->dev);
-+
-+      mtk_ddp_write(cmdq_pkt, w << 16 | h, &priv->cmdq_reg, priv->regs, DISP_AAL_SIZE);
- }
- 
- static void mtk_aal_start(struct mtk_ddp_comp *comp)
--- 
-2.27.0
-

diff --git a/queue-5.10/series b/queue-5.10/series
index fccbbf86b88ef148af7b7117c58a905ef5a33a3a..80f1fe3ab915846dcdd38c53d7ffafe814afd9da 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -213,7 +213,6 @@ f2fs-fix-a-wrong-condition-in-__submit_bio.patch
 asoc-qcom-fix-typo-error-in-hdmi-regmap-config-callb.patch
 kvm-nsvm-don-t-strip-host-s-c-bit-from-guest-s-cr3-w.patch
 drm-mediatek-check-if-fb-is-null.patch
-drm-mediatek-fix-aal-size-config.patch
 drivers-hv-vmbus-avoid-use-after-free-in-vmbus_onoff.patch
 asoc-intel-sof_sdw-add-missing-tgl_hdmi-quirk-for-de.patch
 asoc-intel-sof_sdw-add-missing-tgl_hdmi-quirk-for-de.patch-16043

diff --git a/queue-5.11/drm-mediatek-fix-aal-size-config.patch b/queue-5.11/drm-mediatek-fix-aal-size-config.patch
deleted file mode 100644 (file)
index ddd0807..0000000
--- a/queue-5.11/drm-mediatek-fix-aal-size-config.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From d31e82c4f1147bd756fe4e509d101d720a47d4a8 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 22 Feb 2021 18:14:07 -0500
-Subject: drm/mediatek: Fix aal size config
-
-[ Upstream commit 71dcadba34203d8dd35152e368720f977e9cdb81 ]
-
-The orginal setting is not correct, fix it to follow hardware data sheet.
-If keep this error setting, mt8173/mt8183 display ok
-but mt8192 display abnormal.
-
-Fixes: 0664d1392c26 ("drm/mediatek: Add AAL engine basic function")
-
-Signed-off-by: Yongqiang Niu <yongqiang.niu@mediatek.com>
-Signed-off-by: Chun-Kuang Hu <chunkuang.hu@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
-index 3064eac1a7507..7fcb717f256c9 100644
---- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
-+++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
-@@ -180,7 +180,9 @@ static void mtk_aal_config(struct mtk_ddp_comp *comp, unsigned int w,
-                          unsigned int h, unsigned int vrefresh,
-                          unsigned int bpc, struct cmdq_pkt *cmdq_pkt)
- {
--      mtk_ddp_write(cmdq_pkt, h << 16 | w, comp, DISP_AAL_SIZE);
-+      struct mtk_ddp_comp_dev *priv = dev_get_drvdata(comp->dev);
-+
-+      mtk_ddp_write(cmdq_pkt, w << 16 | h, &priv->cmdq_reg, priv->regs, DISP_AAL_SIZE);
- }
- 
- static void mtk_aal_start(struct mtk_ddp_comp *comp)
--- 
-2.27.0
-

diff --git a/queue-5.11/series b/queue-5.11/series
index e8e337075762af7ac20aba4468b357a43acf918a..e52a0e01aee640a1f158657306d3d1a3f4aad429 100644 (file)
--- a/queue-5.11/series
+++ b/queue-5.11/series
@@ -255,7 +255,6 @@ f2fs-fix-a-wrong-condition-in-__submit_bio.patch
 asoc-qcom-fix-typo-error-in-hdmi-regmap-config-callb.patch
 kvm-nsvm-don-t-strip-host-s-c-bit-from-guest-s-cr3-w.patch
 drm-mediatek-check-if-fb-is-null.patch
-drm-mediatek-fix-aal-size-config.patch
 drivers-hv-vmbus-avoid-use-after-free-in-vmbus_onoff.patch
 asoc-intel-sof_sdw-add-missing-tgl_hdmi-quirk-for-de.patch
 asoc-intel-sof_sdw-add-missing-tgl_hdmi-quirk-for-de.patch-19323