* [PATCH v4,0/3] Add compatible to increase MT8188 audio control
@ 2023-08-14 7:28 Shuijing Li
2023-08-14 7:28 ` [PATCH v4,1/3] dt-bindings: display: mediatek: dp: Add compatible for MediaTek MT8188 Shuijing Li
` (3 more replies)
0 siblings, 4 replies; 9+ messages in thread
From: Shuijing Li @ 2023-08-14 7:28 UTC (permalink / raw)
To: chunkuang.hu, p.zabel, airlied, daniel, robh+dt,
krzysztof.kozlowski+dt, conor+dt, matthias.bgg,
angelogioacchino.delregno, jitao.shi
Cc: dri-devel, linux-mediatek, devicetree, linux-kernel,
linux-arm-kernel, Project_Global_Chrome_Upstream_Group,
Shuijing Li
Add dt-binding documentation of dp-tx for MediaTek MT8188 SoC.
Mainly add the following two flag:
1.The audio packet arrangement function is to only arrange audio
packets into the Hblanking area. In order to align with the HW
default setting of g1200, this function needs to be turned off.
2.Due to the difference of HW, different dividers need to be set.
Base on the branch of linus/master v6.4.
Shuijing Li (3):
dt-bindings: display: mediatek: dp: Add compatible for MediaTek MT8188
drm/mediatek: dp: Add the audio packet flag to mtk_dp_data struct
drm/mediatek: dp: Add the audio divider to mtk_dp_data struct
.../display/mediatek/mediatek,dp.yaml | 2 ++
drivers/gpu/drm/mediatek/mtk_dp.c | 36 ++++++++++++++++++-
drivers/gpu/drm/mediatek/mtk_dp_reg.h | 23 ++++++++----
3 files changed, 54 insertions(+), 7 deletions(-)
--
2.40.1
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v4,1/3] dt-bindings: display: mediatek: dp: Add compatible for MediaTek MT8188
2023-08-14 7:28 [PATCH v4,0/3] Add compatible to increase MT8188 audio control Shuijing Li
@ 2023-08-14 7:28 ` Shuijing Li
2023-08-16 6:49 ` CK Hu (胡俊光)
2023-08-14 7:28 ` [PATCH v4,2/3] drm/mediatek: dp: Add the audio packet flag to mtk_dp_data struct Shuijing Li
` (2 subsequent siblings)
3 siblings, 1 reply; 9+ messages in thread
From: Shuijing Li @ 2023-08-14 7:28 UTC (permalink / raw)
To: chunkuang.hu, p.zabel, airlied, daniel, robh+dt,
krzysztof.kozlowski+dt, conor+dt, matthias.bgg,
angelogioacchino.delregno, jitao.shi
Cc: dri-devel, linux-mediatek, devicetree, linux-kernel,
linux-arm-kernel, Project_Global_Chrome_Upstream_Group,
Shuijing Li, Krzysztof Kozlowski
Add dt-binding documentation of dp-tx for MediaTek MT8188 SoC.
Signed-off-by: Shuijing Li <shuijing.li@mediatek.com>
Signed-off-by: Jitao Shi <jitao.shi@mediatek.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
Changes in v2:
add a mediatek,mt8188-edp-tx compatible per suggestion from the previous thread:
https://lore.kernel.org/lkml/c4a4a900-c80d-b110-f10e-7fa2dae8b7b5@collabora.com/
---
.../devicetree/bindings/display/mediatek/mediatek,dp.yaml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,dp.yaml b/Documentation/devicetree/bindings/display/mediatek/mediatek,dp.yaml
index ff781f2174a0..2aef1eb32e11 100644
--- a/Documentation/devicetree/bindings/display/mediatek/mediatek,dp.yaml
+++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,dp.yaml
@@ -21,6 +21,8 @@ description: |
properties:
compatible:
enum:
+ - mediatek,mt8188-dp-tx
+ - mediatek,mt8188-edp-tx
- mediatek,mt8195-dp-tx
- mediatek,mt8195-edp-tx
--
2.40.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH v4,2/3] drm/mediatek: dp: Add the audio packet flag to mtk_dp_data struct
2023-08-14 7:28 [PATCH v4,0/3] Add compatible to increase MT8188 audio control Shuijing Li
2023-08-14 7:28 ` [PATCH v4,1/3] dt-bindings: display: mediatek: dp: Add compatible for MediaTek MT8188 Shuijing Li
@ 2023-08-14 7:28 ` Shuijing Li
2023-08-14 9:14 ` Fei Shao
2023-08-16 7:17 ` [PATCH v4, 2/3] " CK Hu (胡俊光)
2023-08-14 7:28 ` [PATCH v4,3/3] drm/mediatek: dp: Add the audio divider " Shuijing Li
2023-08-16 7:12 ` [PATCH v4,0/3] Add compatible to increase MT8188 audio control CK Hu (胡俊光)
3 siblings, 2 replies; 9+ messages in thread
From: Shuijing Li @ 2023-08-14 7:28 UTC (permalink / raw)
To: chunkuang.hu, p.zabel, airlied, daniel, robh+dt,
krzysztof.kozlowski+dt, conor+dt, matthias.bgg,
angelogioacchino.delregno, jitao.shi
Cc: dri-devel, linux-mediatek, devicetree, linux-kernel,
linux-arm-kernel, Project_Global_Chrome_Upstream_Group,
Shuijing Li
The audio packet arrangement function is to only arrange audio.
packets into the Hblanking area. In order to align with the HW
default setting of mt8195, this function needs to be turned off.
Signed-off-by: Shuijing Li <shuijing.li@mediatek.com>
Signed-off-by: Jitao Shi <jitao.shi@mediatek.com>
---
Changes in v4:
drop mt8188_edp_data and remove unnecessary modification.
per suggestion from the previous thread:
https://lore.kernel.org/all/bddb1a1a445ead85056202c355627698051f12c9.camel@mediatek.com/
Changes in v3:
Separate these two things into two different patches.
per suggestion from the previous thread:
https://lore.kernel.org/lkml/e2ad22bcba31797f38a12a488d4246a01bf0cb2e.camel@mediatek.com/
Changes in v2:
- change the variables' name to be more descriptive
- add a comment that describes the function of mtk_dp_audio_sample_arrange
- reduce indentation by doing the inverse check
- add a definition of some bits
- add support for mediatek, mt8188-edp-tx
per suggestion from the previous thread:
https://lore.kernel.org/lkml/ac0fcec9-a2fe-06cc-c727-189ef7babe9c@collabora.com/
---
drivers/gpu/drm/mediatek/mtk_dp.c | 30 +++++++++++++++++++++++++++
drivers/gpu/drm/mediatek/mtk_dp_reg.h | 5 +++++
2 files changed, 35 insertions(+)
diff --git a/drivers/gpu/drm/mediatek/mtk_dp.c b/drivers/gpu/drm/mediatek/mtk_dp.c
index 64eee77452c0..75af6de7bc42 100644
--- a/drivers/gpu/drm/mediatek/mtk_dp.c
+++ b/drivers/gpu/drm/mediatek/mtk_dp.c
@@ -139,6 +139,7 @@ struct mtk_dp_data {
unsigned int smc_cmd;
const struct mtk_dp_efuse_fmt *efuse_fmt;
bool audio_supported;
+ bool audio_pkt_in_hblank_area;
};
static const struct mtk_dp_efuse_fmt mt8195_edp_efuse_fmt[MTK_DP_CAL_MAX] = {
@@ -1362,6 +1363,18 @@ static void mtk_dp_sdp_set_down_cnt_init_in_hblank(struct mtk_dp *mtk_dp)
SDP_DOWN_CNT_INIT_IN_HBLANK_DP_ENC1_P0_MASK);
}
+static void mtk_dp_audio_sample_arrange(struct mtk_dp *mtk_dp)
+{
+ /* arrange audio packets into the Hblanking and Vblanking area */
+ if (!mtk_dp->data->audio_pkt_in_hblank_area)
+ return;
+
+ mtk_dp_update_bits(mtk_dp, MTK_DP_ENC1_P0_3374, 0,
+ SDP_ASP_INSERT_IN_HBLANK_DP_ENC1_P0_MASK);
+ mtk_dp_update_bits(mtk_dp, MTK_DP_ENC1_P0_3374, 0,
+ SDP_DOWN_ASP_CNT_INIT_DP_ENC1_P0_MASK);
+}
+
static void mtk_dp_setup_tu(struct mtk_dp *mtk_dp)
{
u32 sram_read_start = min_t(u32, MTK_DP_TBC_BUF_READ_START_ADDR,
@@ -1371,6 +1384,7 @@ static void mtk_dp_setup_tu(struct mtk_dp *mtk_dp)
MTK_DP_PIX_PER_ADDR);
mtk_dp_set_sram_read_start(mtk_dp, sram_read_start);
mtk_dp_setup_encoder(mtk_dp);
+ mtk_dp_audio_sample_arrange(mtk_dp);
mtk_dp_sdp_set_down_cnt_init_in_hblank(mtk_dp);
mtk_dp_sdp_set_down_cnt_init(mtk_dp, sram_read_start);
}
@@ -2616,6 +2630,14 @@ static int mtk_dp_resume(struct device *dev)
static SIMPLE_DEV_PM_OPS(mtk_dp_pm_ops, mtk_dp_suspend, mtk_dp_resume);
+static const struct mtk_dp_data mt8188_dp_data = {
+ .bridge_type = DRM_MODE_CONNECTOR_DisplayPort,
+ .smc_cmd = MTK_DP_SIP_ATF_VIDEO_UNMUTE,
+ .efuse_fmt = mt8195_dp_efuse_fmt,
+ .audio_supported = true,
+ .audio_pkt_in_hblank_area = true,
+};
+
static const struct mtk_dp_data mt8195_edp_data = {
.bridge_type = DRM_MODE_CONNECTOR_eDP,
.smc_cmd = MTK_DP_SIP_ATF_EDP_VIDEO_UNMUTE,
@@ -2631,6 +2653,14 @@ static const struct mtk_dp_data mt8195_dp_data = {
};
static const struct of_device_id mtk_dp_of_match[] = {
+ {
+ .compatible = "mediatek,mt8188-edp-tx",
+ .data = &mt8195_edp_data,
+ },
+ {
+ .compatible = "mediatek,mt8188-dp-tx",
+ .data = &mt8188_dp_data,
+ },
{
.compatible = "mediatek,mt8195-edp-tx",
.data = &mt8195_edp_data,
diff --git a/drivers/gpu/drm/mediatek/mtk_dp_reg.h b/drivers/gpu/drm/mediatek/mtk_dp_reg.h
index 84e38cef03c2..f38d6ff12afe 100644
--- a/drivers/gpu/drm/mediatek/mtk_dp_reg.h
+++ b/drivers/gpu/drm/mediatek/mtk_dp_reg.h
@@ -228,6 +228,11 @@
VIDEO_STABLE_CNT_THRD_DP_ENC1_P0 | \
SDP_DP13_EN_DP_ENC1_P0 | \
BS2BS_MODE_DP_ENC1_P0)
+
+#define MTK_DP_ENC1_P0_3374 0x3374
+#define SDP_ASP_INSERT_IN_HBLANK_DP_ENC1_P0_MASK BIT(12)
+#define SDP_DOWN_ASP_CNT_INIT_DP_ENC1_P0_MASK GENMASK(11, 0)
+
#define MTK_DP_ENC1_P0_33F4 0x33f4
#define DP_ENC_DUMMY_RW_1_AUDIO_RST_EN BIT(0)
#define DP_ENC_DUMMY_RW_1 BIT(9)
--
2.40.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH v4,3/3] drm/mediatek: dp: Add the audio divider to mtk_dp_data struct
2023-08-14 7:28 [PATCH v4,0/3] Add compatible to increase MT8188 audio control Shuijing Li
2023-08-14 7:28 ` [PATCH v4,1/3] dt-bindings: display: mediatek: dp: Add compatible for MediaTek MT8188 Shuijing Li
2023-08-14 7:28 ` [PATCH v4,2/3] drm/mediatek: dp: Add the audio packet flag to mtk_dp_data struct Shuijing Li
@ 2023-08-14 7:28 ` Shuijing Li
2023-08-14 9:04 ` Fei Shao
2023-08-16 7:12 ` [PATCH v4,0/3] Add compatible to increase MT8188 audio control CK Hu (胡俊光)
3 siblings, 1 reply; 9+ messages in thread
From: Shuijing Li @ 2023-08-14 7:28 UTC (permalink / raw)
To: chunkuang.hu, p.zabel, airlied, daniel, robh+dt,
krzysztof.kozlowski+dt, conor+dt, matthias.bgg,
angelogioacchino.delregno, jitao.shi
Cc: dri-devel, linux-mediatek, devicetree, linux-kernel,
linux-arm-kernel, Project_Global_Chrome_Upstream_Group,
Shuijing Li
Due to the difference of HW, different dividers need to be set.
Signed-off-by: Shuijing Li <shuijing.li@mediatek.com>
Signed-off-by: Jitao Shi <jitao.shi@mediatek.com>
---
Changes in v4:
list all configuration for MT8188 and MT8195.
per suggestion from the previous thread:
https://lore.kernel.org/all/a9d1b9b7ef4780f51574d0bbbe28f6dd109a6ab8.camel@mediatek.com/
Changes in v3:
Separate these two things into two different patches.
per suggestion from the previous thread:
https://lore.kernel.org/lkml/e2ad22bcba31797f38a12a488d4246a01bf0cb2e.camel@mediatek.com/
Changes in v2:
- change the variables' name to be more descriptive
- add a comment that describes the function of mtk_dp_audio_sample_arrange
- reduce indentation by doing the inverse check
- add a definition of some bits
- add support for mediatek, mt8188-edp-tx
per suggestion from the previous thread:
https://lore.kernel.org/lkml/ac0fcec9-a2fe-06cc-c727-189ef7babe9c@collabora.com/
---
drivers/gpu/drm/mediatek/mtk_dp.c | 6 +++++-
drivers/gpu/drm/mediatek/mtk_dp_reg.h | 18 ++++++++++++------
2 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/mediatek/mtk_dp.c b/drivers/gpu/drm/mediatek/mtk_dp.c
index 75af6de7bc42..8f97e6f76639 100644
--- a/drivers/gpu/drm/mediatek/mtk_dp.c
+++ b/drivers/gpu/drm/mediatek/mtk_dp.c
@@ -140,6 +140,7 @@ struct mtk_dp_data {
const struct mtk_dp_efuse_fmt *efuse_fmt;
bool audio_supported;
bool audio_pkt_in_hblank_area;
+ u16 audio_m_div2_bit;
};
static const struct mtk_dp_efuse_fmt mt8195_edp_efuse_fmt[MTK_DP_CAL_MAX] = {
@@ -648,7 +649,7 @@ static void mtk_dp_audio_sdp_asp_set_channels(struct mtk_dp *mtk_dp,
static void mtk_dp_audio_set_divider(struct mtk_dp *mtk_dp)
{
mtk_dp_update_bits(mtk_dp, MTK_DP_ENC0_P0_30BC,
- AUDIO_M_CODE_MULT_DIV_SEL_DP_ENC0_P0_DIV_2,
+ mtk_dp->data->audio_m_div2_bit,
AUDIO_M_CODE_MULT_DIV_SEL_DP_ENC0_P0_MASK);
}
@@ -2636,6 +2637,7 @@ static const struct mtk_dp_data mt8188_dp_data = {
.efuse_fmt = mt8195_dp_efuse_fmt,
.audio_supported = true,
.audio_pkt_in_hblank_area = true,
+ .audio_m_div2_bit = MT8188_AUDIO_M_CODE_MULT_DIV_SEL_DP_ENC0_P0_DIV_2,
};
static const struct mtk_dp_data mt8195_edp_data = {
@@ -2643,6 +2645,7 @@ static const struct mtk_dp_data mt8195_edp_data = {
.smc_cmd = MTK_DP_SIP_ATF_EDP_VIDEO_UNMUTE,
.efuse_fmt = mt8195_edp_efuse_fmt,
.audio_supported = false,
+ .audio_m_div2_bit = MT8195_AUDIO_M_CODE_MULT_DIV_SEL_DP_ENC0_P0_DIV_2,
};
static const struct mtk_dp_data mt8195_dp_data = {
@@ -2650,6 +2653,7 @@ static const struct mtk_dp_data mt8195_dp_data = {
.smc_cmd = MTK_DP_SIP_ATF_VIDEO_UNMUTE,
.efuse_fmt = mt8195_dp_efuse_fmt,
.audio_supported = true,
+ .audio_m_div2_bit = MT8195_AUDIO_M_CODE_MULT_DIV_SEL_DP_ENC0_P0_DIV_2,
};
static const struct of_device_id mtk_dp_of_match[] = {
diff --git a/drivers/gpu/drm/mediatek/mtk_dp_reg.h b/drivers/gpu/drm/mediatek/mtk_dp_reg.h
index f38d6ff12afe..709b79480693 100644
--- a/drivers/gpu/drm/mediatek/mtk_dp_reg.h
+++ b/drivers/gpu/drm/mediatek/mtk_dp_reg.h
@@ -159,12 +159,18 @@
#define MTK_DP_ENC0_P0_30BC 0x30bc
#define ISRC_CONT_DP_ENC0_P0 BIT(0)
#define AUDIO_M_CODE_MULT_DIV_SEL_DP_ENC0_P0_MASK GENMASK(10, 8)
-#define AUDIO_M_CODE_MULT_DIV_SEL_DP_ENC0_P0_MUL_2 (1 << 8)
-#define AUDIO_M_CODE_MULT_DIV_SEL_DP_ENC0_P0_MUL_4 (2 << 8)
-#define AUDIO_M_CODE_MULT_DIV_SEL_DP_ENC0_P0_MUL_8 (3 << 8)
-#define AUDIO_M_CODE_MULT_DIV_SEL_DP_ENC0_P0_DIV_2 (5 << 8)
-#define AUDIO_M_CODE_MULT_DIV_SEL_DP_ENC0_P0_DIV_4 (6 << 8)
-#define AUDIO_M_CODE_MULT_DIV_SEL_DP_ENC0_P0_DIV_8 (7 << 8)
+#define MT8195_AUDIO_M_CODE_MULT_DIV_SEL_DP_ENC0_P0_MUL_2 (1 << 8)
+#define MT8195_AUDIO_M_CODE_MULT_DIV_SEL_DP_ENC0_P0_MUL_4 (2 << 8)
+#define MT8195_AUDIO_M_CODE_MULT_DIV_SEL_DP_ENC0_P0_MUL_8 (3 << 8)
+#define MT8195_AUDIO_M_CODE_MULT_DIV_SEL_DP_ENC0_P0_DIV_2 (5 << 8)
+#define MT8195_AUDIO_M_CODE_MULT_DIV_SEL_DP_ENC0_P0_DIV_4 (6 << 8)
+#define MT8195_AUDIO_M_CODE_MULT_DIV_SEL_DP_ENC0_P0_DIV_8 (7 << 8)
+#define MT8188_AUDIO_M_CODE_MULT_DIV_SEL_DP_ENC0_P0_MUL_2 (1 << 8)
+#define MT8188_AUDIO_M_CODE_MULT_DIV_SEL_DP_ENC0_P0_MUL_4 (2 << 8)
+#define MT8188_AUDIO_M_CODE_MULT_DIV_SEL_DP_ENC0_P0_MUL_8 (3 << 8)
+#define MT8188_AUDIO_M_CODE_MULT_DIV_SEL_DP_ENC0_P0_DIV_2 (4 << 8)
+#define MT8188_AUDIO_M_CODE_MULT_DIV_SEL_DP_ENC0_P0_DIV_4 (5 << 8)
+#define MT8188_AUDIO_M_CODE_MULT_DIV_SEL_DP_ENC0_P0_DIV_8 (7 << 8)
#define MTK_DP_ENC0_P0_30D8 0x30d8
#define MTK_DP_ENC0_P0_312C 0x312c
#define ASP_HB2_DP_ENC0_P0_MASK GENMASK(7, 0)
--
2.40.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH v4,3/3] drm/mediatek: dp: Add the audio divider to mtk_dp_data struct
2023-08-14 7:28 ` [PATCH v4,3/3] drm/mediatek: dp: Add the audio divider " Shuijing Li
@ 2023-08-14 9:04 ` Fei Shao
0 siblings, 0 replies; 9+ messages in thread
From: Fei Shao @ 2023-08-14 9:04 UTC (permalink / raw)
To: Shuijing Li
Cc: chunkuang.hu, p.zabel, airlied, daniel, robh+dt,
krzysztof.kozlowski+dt, conor+dt, matthias.bgg,
angelogioacchino.delregno, jitao.shi, dri-devel, linux-mediatek,
devicetree, linux-kernel, linux-arm-kernel,
Project_Global_Chrome_Upstream_Group
On Mon, Aug 14, 2023 at 3:28 PM Shuijing Li <shuijing.li@mediatek.com> wrote:
>
> Due to the difference of HW, different dividers need to be set.
>
> Signed-off-by: Shuijing Li <shuijing.li@mediatek.com>
> Signed-off-by: Jitao Shi <jitao.shi@mediatek.com>
Reviewed-by: Fei Shao <fshao@chromium.org>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v4,2/3] drm/mediatek: dp: Add the audio packet flag to mtk_dp_data struct
2023-08-14 7:28 ` [PATCH v4,2/3] drm/mediatek: dp: Add the audio packet flag to mtk_dp_data struct Shuijing Li
@ 2023-08-14 9:14 ` Fei Shao
2023-08-16 7:17 ` [PATCH v4, 2/3] " CK Hu (胡俊光)
1 sibling, 0 replies; 9+ messages in thread
From: Fei Shao @ 2023-08-14 9:14 UTC (permalink / raw)
To: Shuijing Li
Cc: chunkuang.hu, p.zabel, airlied, daniel, robh+dt,
krzysztof.kozlowski+dt, conor+dt, matthias.bgg,
angelogioacchino.delregno, jitao.shi, dri-devel, linux-mediatek,
devicetree, linux-kernel, linux-arm-kernel,
Project_Global_Chrome_Upstream_Group
On Mon, Aug 14, 2023 at 3:29 PM Shuijing Li <shuijing.li@mediatek.com> wrote:
>
> The audio packet arrangement function is to only arrange audio.
> packets into the Hblanking area. In order to align with the HW
> default setting of mt8195, this function needs to be turned off.
>
> Signed-off-by: Shuijing Li <shuijing.li@mediatek.com>
> Signed-off-by: Jitao Shi <jitao.shi@mediatek.com>
Reviewed-by: Fei Shao <fshao@chromium.org>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v4,1/3] dt-bindings: display: mediatek: dp: Add compatible for MediaTek MT8188
2023-08-14 7:28 ` [PATCH v4,1/3] dt-bindings: display: mediatek: dp: Add compatible for MediaTek MT8188 Shuijing Li
@ 2023-08-16 6:49 ` CK Hu (胡俊光)
0 siblings, 0 replies; 9+ messages in thread
From: CK Hu (胡俊光) @ 2023-08-16 6:49 UTC (permalink / raw)
To: Shuijing Li (李水静),
robh+dt, chunkuang.hu, Jitao Shi (石记涛),
daniel, p.zabel, conor+dt, airlied, krzysztof.kozlowski+dt,
matthias.bgg, angelogioacchino.delregno
Cc: dri-devel, linux-kernel, linux-mediatek, linux-arm-kernel,
krzysztof.kozlowski, devicetree,
Project_Global_Chrome_Upstream_Group
Hi, Shuijing:
On Mon, 2023-08-14 at 15:28 +0800, Shuijing Li wrote:
> Add dt-binding documentation of dp-tx for MediaTek MT8188 SoC.
Reviewed-by: CK Hu <ck.hu@mediatek.com>
>
> Signed-off-by: Shuijing Li <shuijing.li@mediatek.com>
> Signed-off-by: Jitao Shi <jitao.shi@mediatek.com>
> Reviewed-by: AngeloGioacchino Del Regno <
> angelogioacchino.delregno@collabora.com>
> Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> ---
> Changes in v2:
> add a mediatek,mt8188-edp-tx compatible per suggestion from the
> previous thread:
>
https://lore.kernel.org/lkml/c4a4a900-c80d-b110-f10e-7fa2dae8b7b5@collabora.com/
> ---
> .../devicetree/bindings/display/mediatek/mediatek,dp.yaml | 2
> ++
> 1 file changed, 2 insertions(+)
>
> diff --git
> a/Documentation/devicetree/bindings/display/mediatek/mediatek,dp.yaml
> b/Documentation/devicetree/bindings/display/mediatek/mediatek,dp.yaml
> index ff781f2174a0..2aef1eb32e11 100644
> ---
> a/Documentation/devicetree/bindings/display/mediatek/mediatek,dp.yaml
> +++
> b/Documentation/devicetree/bindings/display/mediatek/mediatek,dp.yaml
> @@ -21,6 +21,8 @@ description: |
> properties:
> compatible:
> enum:
> + - mediatek,mt8188-dp-tx
> + - mediatek,mt8188-edp-tx
> - mediatek,mt8195-dp-tx
> - mediatek,mt8195-edp-tx
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v4,0/3] Add compatible to increase MT8188 audio control
2023-08-14 7:28 [PATCH v4,0/3] Add compatible to increase MT8188 audio control Shuijing Li
` (2 preceding siblings ...)
2023-08-14 7:28 ` [PATCH v4,3/3] drm/mediatek: dp: Add the audio divider " Shuijing Li
@ 2023-08-16 7:12 ` CK Hu (胡俊光)
3 siblings, 0 replies; 9+ messages in thread
From: CK Hu (胡俊光) @ 2023-08-16 7:12 UTC (permalink / raw)
To: Shuijing Li (李水静),
robh+dt, chunkuang.hu, Jitao Shi (石记涛),
daniel, p.zabel, conor+dt, airlied, krzysztof.kozlowski+dt,
matthias.bgg, angelogioacchino.delregno
Cc: dri-devel, linux-kernel, linux-mediatek, linux-arm-kernel,
devicetree, Project_Global_Chrome_Upstream_Group
Hi, Shuijing:
On Mon, 2023-08-14 at 15:28 +0800, Shuijing Li wrote:
> Add dt-binding documentation of dp-tx for MediaTek MT8188 SoC.
> Mainly add the following two flag:
>
> 1.The audio packet arrangement function is to only arrange audio
> packets into the Hblanking area. In order to align with the HW
> default setting of g1200, this function needs to be turned off.
>
> 2.Due to the difference of HW, different dividers need to be set.
>
> Base on the branch of linus/master v6.4.
>
> Shuijing Li (3):
> dt-bindings: display: mediatek: dp: Add compatible for MediaTek
> MT8188
> drm/mediatek: dp: Add the audio packet flag to mtk_dp_data struct
> drm/mediatek: dp: Add the audio divider to mtk_dp_data struct
>
I would like to separate mt8188 related code from these two patches to
a new patches.
drm/mediatek: dp: Add the audio packet flag to mtk_dp_data struct
drm/mediatek: dp: Add the audio divider to mtk_dp_data struct
drm/mediatek: Add support MT8188 dp/edp function
Regards,
CK
>
> .../display/mediatek/mediatek,dp.yaml | 2 ++
> drivers/gpu/drm/mediatek/mtk_dp.c | 36
> ++++++++++++++++++-
> drivers/gpu/drm/mediatek/mtk_dp_reg.h | 23 ++++++++----
> 3 files changed, 54 insertions(+), 7 deletions(-)
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v4, 2/3] drm/mediatek: dp: Add the audio packet flag to mtk_dp_data struct
2023-08-14 7:28 ` [PATCH v4,2/3] drm/mediatek: dp: Add the audio packet flag to mtk_dp_data struct Shuijing Li
2023-08-14 9:14 ` Fei Shao
@ 2023-08-16 7:17 ` CK Hu (胡俊光)
1 sibling, 0 replies; 9+ messages in thread
From: CK Hu (胡俊光) @ 2023-08-16 7:17 UTC (permalink / raw)
To: Shuijing Li (李水静),
robh+dt, chunkuang.hu, Jitao Shi (石记涛),
daniel, p.zabel, conor+dt, airlied, krzysztof.kozlowski+dt,
matthias.bgg, angelogioacchino.delregno
Cc: dri-devel, linux-kernel, linux-mediatek, linux-arm-kernel,
devicetree, Project_Global_Chrome_Upstream_Group
Hi, Shuijing:
On Mon, 2023-08-14 at 15:28 +0800, Shuijing Li wrote:
> The audio packet arrangement function is to only arrange audio.
The '.' is redundant.
> packets into the Hblanking area. In order to align with the HW
> default setting of mt8195, this function needs to be turned off.
>
> Signed-off-by: Shuijing Li <shuijing.li@mediatek.com>
> Signed-off-by: Jitao Shi <jitao.shi@mediatek.com>
> ---
> Changes in v4:
> drop mt8188_edp_data and remove unnecessary modification.
> per suggestion from the previous thread:
>
https://lore.kernel.org/all/bddb1a1a445ead85056202c355627698051f12c9.camel@mediatek.com/
> Changes in v3:
> Separate these two things into two different patches.
> per suggestion from the previous thread:
>
https://lore.kernel.org/lkml/e2ad22bcba31797f38a12a488d4246a01bf0cb2e.camel@mediatek.com/
> Changes in v2:
> - change the variables' name to be more descriptive
> - add a comment that describes the function of
> mtk_dp_audio_sample_arrange
> - reduce indentation by doing the inverse check
> - add a definition of some bits
> - add support for mediatek, mt8188-edp-tx
> per suggestion from the previous thread:
>
https://lore.kernel.org/lkml/ac0fcec9-a2fe-06cc-c727-189ef7babe9c@collabora.com/
> ---
> drivers/gpu/drm/mediatek/mtk_dp.c | 30
> +++++++++++++++++++++++++++
> drivers/gpu/drm/mediatek/mtk_dp_reg.h | 5 +++++
> 2 files changed, 35 insertions(+)
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_dp.c
> b/drivers/gpu/drm/mediatek/mtk_dp.c
> index 64eee77452c0..75af6de7bc42 100644
> --- a/drivers/gpu/drm/mediatek/mtk_dp.c
> +++ b/drivers/gpu/drm/mediatek/mtk_dp.c
> @@ -139,6 +139,7 @@ struct mtk_dp_data {
> unsigned int smc_cmd;
> const struct mtk_dp_efuse_fmt *efuse_fmt;
> bool audio_supported;
> + bool audio_pkt_in_hblank_area;
> };
>
> static const struct mtk_dp_efuse_fmt
> mt8195_edp_efuse_fmt[MTK_DP_CAL_MAX] = {
> @@ -1362,6 +1363,18 @@ static void
> mtk_dp_sdp_set_down_cnt_init_in_hblank(struct mtk_dp *mtk_dp)
> SDP_DOWN_CNT_INIT_IN_HBLANK_DP_ENC1_P0_MASK)
> ;
> }
>
> +static void mtk_dp_audio_sample_arrange(struct mtk_dp *mtk_dp)
This function is to 'disable' arrangement, so add 'disable' in the
function name.
Regards,
CK
> +{
> + /* arrange audio packets into the Hblanking and Vblanking area
> */
> + if (!mtk_dp->data->audio_pkt_in_hblank_area)
> + return;
> +
> + mtk_dp_update_bits(mtk_dp, MTK_DP_ENC1_P0_3374, 0,
> + SDP_ASP_INSERT_IN_HBLANK_DP_ENC1_P0_MASK);
> + mtk_dp_update_bits(mtk_dp, MTK_DP_ENC1_P0_3374, 0,
> + SDP_DOWN_ASP_CNT_INIT_DP_ENC1_P0_MASK);
> +}
> +
> static void mtk_dp_setup_tu(struct mtk_dp *mtk_dp)
> {
> u32 sram_read_start = min_t(u32,
> MTK_DP_TBC_BUF_READ_START_ADDR,
> @@ -1371,6 +1384,7 @@ static void mtk_dp_setup_tu(struct mtk_dp
> *mtk_dp)
> MTK_DP_PIX_PER_ADDR);
> mtk_dp_set_sram_read_start(mtk_dp, sram_read_start);
> mtk_dp_setup_encoder(mtk_dp);
> + mtk_dp_audio_sample_arrange(mtk_dp);
> mtk_dp_sdp_set_down_cnt_init_in_hblank(mtk_dp);
> mtk_dp_sdp_set_down_cnt_init(mtk_dp, sram_read_start);
> }
> @@ -2616,6 +2630,14 @@ static int mtk_dp_resume(struct device *dev)
>
> static SIMPLE_DEV_PM_OPS(mtk_dp_pm_ops, mtk_dp_suspend,
> mtk_dp_resume);
>
> +static const struct mtk_dp_data mt8188_dp_data = {
> + .bridge_type = DRM_MODE_CONNECTOR_DisplayPort,
> + .smc_cmd = MTK_DP_SIP_ATF_VIDEO_UNMUTE,
> + .efuse_fmt = mt8195_dp_efuse_fmt,
> + .audio_supported = true,
> + .audio_pkt_in_hblank_area = true,
> +};
> +
> static const struct mtk_dp_data mt8195_edp_data = {
> .bridge_type = DRM_MODE_CONNECTOR_eDP,
> .smc_cmd = MTK_DP_SIP_ATF_EDP_VIDEO_UNMUTE,
> @@ -2631,6 +2653,14 @@ static const struct mtk_dp_data mt8195_dp_data
> = {
> };
>
> static const struct of_device_id mtk_dp_of_match[] = {
> + {
> + .compatible = "mediatek,mt8188-edp-tx",
> + .data = &mt8195_edp_data,
> + },
> + {
> + .compatible = "mediatek,mt8188-dp-tx",
> + .data = &mt8188_dp_data,
> + },
> {
> .compatible = "mediatek,mt8195-edp-tx",
> .data = &mt8195_edp_data,
> diff --git a/drivers/gpu/drm/mediatek/mtk_dp_reg.h
> b/drivers/gpu/drm/mediatek/mtk_dp_reg.h
> index 84e38cef03c2..f38d6ff12afe 100644
> --- a/drivers/gpu/drm/mediatek/mtk_dp_reg.h
> +++ b/drivers/gpu/drm/mediatek/mtk_dp_reg.h
> @@ -228,6 +228,11 @@
> VIDEO_STABLE_C
> NT_THRD_DP_ENC1_P0 | \
> SDP_DP13_EN_DP
> _ENC1_P0 | \
> BS2BS_MODE_DP_
> ENC1_P0)
> +
> +#define MTK_DP_ENC1_P0_3374 0x3374
> +#define SDP_ASP_INSERT_IN_HBLANK_DP_ENC1_P0_MASK BIT(12)
> +#define SDP_DOWN_ASP_CNT_INIT_DP_ENC1_P0_MASK GENMASK
> (11, 0)
> +
> #define MTK_DP_ENC1_P0_33F4 0x33f4
> #define DP_ENC_DUMMY_RW_1_AUDIO_RST_EN BIT(0)
> #define DP_ENC_DUMMY_RW_1 BIT(9)
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2023-08-16 7:18 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-08-14 7:28 [PATCH v4,0/3] Add compatible to increase MT8188 audio control Shuijing Li
2023-08-14 7:28 ` [PATCH v4,1/3] dt-bindings: display: mediatek: dp: Add compatible for MediaTek MT8188 Shuijing Li
2023-08-16 6:49 ` CK Hu (胡俊光)
2023-08-14 7:28 ` [PATCH v4,2/3] drm/mediatek: dp: Add the audio packet flag to mtk_dp_data struct Shuijing Li
2023-08-14 9:14 ` Fei Shao
2023-08-16 7:17 ` [PATCH v4, 2/3] " CK Hu (胡俊光)
2023-08-14 7:28 ` [PATCH v4,3/3] drm/mediatek: dp: Add the audio divider " Shuijing Li
2023-08-14 9:04 ` Fei Shao
2023-08-16 7:12 ` [PATCH v4,0/3] Add compatible to increase MT8188 audio control CK Hu (胡俊光)
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).