From: Xinlei Lee <[email protected]>
The difference between MT8186 and other ICs is that when modifying the
output format, we need to modify the mmsys_base+0x400 register to take
effect. So when setting the dpi output format, we need to call
mtk_mmsys_ddp_dpi_fmt_config to set it to MT8186 synchronously.
Commit a071e52f75d1 ("soc: mediatek: Add mmsys func to adapt to dpi
output for MT8186") lacked some of the possible output formats and also
had a wrong bitmask.
Add the missing output formats and fix the bitmask.
While at it, also update mtk_mmsys_ddp_dpi_fmt_config() to use generic
formats, so that it is slightly easier to extend for other platforms.
Fixes: a071e52f75d1 ("soc: mediatek: Add mmsys func to adapt to dpi output for MT8186")
Signed-off-by: Xinlei Lee <[email protected]>
Reviewed-by: AngeloGioacchino Del Regno <[email protected]>
Reviewed-by: CK Hu <[email protected]>
Reviewed-by: Nícolas F. R. A. Prado <[email protected]>
---
drivers/soc/mediatek/mt8186-mmsys.h | 8 +++++---
drivers/soc/mediatek/mtk-mmsys.c | 27 ++++++++++++++++++++------
include/linux/soc/mediatek/mtk-mmsys.h | 7 +++++++
3 files changed, 33 insertions(+), 9 deletions(-)
diff --git a/drivers/soc/mediatek/mt8186-mmsys.h b/drivers/soc/mediatek/mt8186-mmsys.h
index 09b1ccbc0093..279d4138525b 100644
--- a/drivers/soc/mediatek/mt8186-mmsys.h
+++ b/drivers/soc/mediatek/mt8186-mmsys.h
@@ -5,9 +5,11 @@
/* Values for DPI configuration in MMSYS address space */
#define MT8186_MMSYS_DPI_OUTPUT_FORMAT 0x400
-#define DPI_FORMAT_MASK 0x1
-#define DPI_RGB888_DDR_CON BIT(0)
-#define DPI_RGB565_SDR_CON BIT(1)
+#define MT8186_DPI_FORMAT_MASK GENMASK(1, 0)
+#define MT8186_DPI_RGB888_SDR_CON 0
+#define MT8186_DPI_RGB888_DDR_CON 1
+#define MT8186_DPI_RGB565_SDR_CON 2
+#define MT8186_DPI_RGB565_DDR_CON 3
#define MT8186_MMSYS_OVL_CON 0xF04
#define MT8186_MMSYS_OVL0_CON_MASK 0x3
diff --git a/drivers/soc/mediatek/mtk-mmsys.c b/drivers/soc/mediatek/mtk-mmsys.c
index 2e20b24da363..16cd924d8973 100644
--- a/drivers/soc/mediatek/mtk-mmsys.c
+++ b/drivers/soc/mediatek/mtk-mmsys.c
@@ -238,12 +238,27 @@ static void mtk_mmsys_update_bits(struct mtk_mmsys *mmsys, u32 offset, u32 mask,
void mtk_mmsys_ddp_dpi_fmt_config(struct device *dev, u32 val)
{
- if (val)
- mtk_mmsys_update_bits(dev_get_drvdata(dev), MT8186_MMSYS_DPI_OUTPUT_FORMAT,
- DPI_RGB888_DDR_CON, DPI_FORMAT_MASK);
- else
- mtk_mmsys_update_bits(dev_get_drvdata(dev), MT8186_MMSYS_DPI_OUTPUT_FORMAT,
- DPI_RGB565_SDR_CON, DPI_FORMAT_MASK);
+ struct mtk_mmsys *mmsys = dev_get_drvdata(dev);
+
+ switch (val) {
+ case MTK_DPI_RGB888_SDR_CON:
+ mtk_mmsys_update_bits(mmsys, MT8186_MMSYS_DPI_OUTPUT_FORMAT,
+ MT8186_DPI_FORMAT_MASK, MT8186_DPI_RGB888_SDR_CON);
+ break;
+ case MTK_DPI_RGB565_SDR_CON:
+ mtk_mmsys_update_bits(mmsys, MT8186_MMSYS_DPI_OUTPUT_FORMAT,
+ MT8186_DPI_FORMAT_MASK, MT8186_DPI_RGB565_SDR_CON);
+ break;
+ case MTK_DPI_RGB565_DDR_CON:
+ mtk_mmsys_update_bits(mmsys, MT8186_MMSYS_DPI_OUTPUT_FORMAT,
+ MT8186_DPI_FORMAT_MASK, MT8186_DPI_RGB565_DDR_CON);
+ break;
+ case MTK_DPI_RGB888_DDR_CON:
+ default:
+ mtk_mmsys_update_bits(mmsys, MT8186_MMSYS_DPI_OUTPUT_FORMAT,
+ MT8186_DPI_FORMAT_MASK, MT8186_DPI_RGB888_DDR_CON);
+ break;
+ }
}
EXPORT_SYMBOL_GPL(mtk_mmsys_ddp_dpi_fmt_config);
diff --git a/include/linux/soc/mediatek/mtk-mmsys.h b/include/linux/soc/mediatek/mtk-mmsys.h
index d2b02bb43768..b85f66db33e1 100644
--- a/include/linux/soc/mediatek/mtk-mmsys.h
+++ b/include/linux/soc/mediatek/mtk-mmsys.h
@@ -9,6 +9,13 @@
enum mtk_ddp_comp_id;
struct device;
+enum mtk_dpi_out_format_con {
+ MTK_DPI_RGB888_SDR_CON,
+ MTK_DPI_RGB888_DDR_CON,
+ MTK_DPI_RGB565_SDR_CON,
+ MTK_DPI_RGB565_DDR_CON
+};
+
enum mtk_ddp_comp_id {
DDP_COMPONENT_AAL0,
DDP_COMPONENT_AAL1,
--
2.18.0
Hi Xinlei,
Can you please fix the threading of this patches. I can see that this 1/3 but
I'm not able to find 3/3 in the series. The first two look good, the third, I
don't know.
Regards,
Matthias
On 24/10/2022 04:04, [email protected] wrote:
> From: Xinlei Lee <[email protected]>
>
> The difference between MT8186 and other ICs is that when modifying the
> output format, we need to modify the mmsys_base+0x400 register to take
> effect. So when setting the dpi output format, we need to call
> mtk_mmsys_ddp_dpi_fmt_config to set it to MT8186 synchronously.
>
> Commit a071e52f75d1 ("soc: mediatek: Add mmsys func to adapt to dpi
> output for MT8186") lacked some of the possible output formats and also
> had a wrong bitmask.
>
> Add the missing output formats and fix the bitmask.
>
> While at it, also update mtk_mmsys_ddp_dpi_fmt_config() to use generic
> formats, so that it is slightly easier to extend for other platforms.
>
> Fixes: a071e52f75d1 ("soc: mediatek: Add mmsys func to adapt to dpi output for MT8186")
> Signed-off-by: Xinlei Lee <[email protected]>
> Reviewed-by: AngeloGioacchino Del Regno <[email protected]>
> Reviewed-by: CK Hu <[email protected]>
> Reviewed-by: Nícolas F. R. A. Prado <[email protected]>
> ---
> drivers/soc/mediatek/mt8186-mmsys.h | 8 +++++---
> drivers/soc/mediatek/mtk-mmsys.c | 27 ++++++++++++++++++++------
> include/linux/soc/mediatek/mtk-mmsys.h | 7 +++++++
> 3 files changed, 33 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/soc/mediatek/mt8186-mmsys.h b/drivers/soc/mediatek/mt8186-mmsys.h
> index 09b1ccbc0093..279d4138525b 100644
> --- a/drivers/soc/mediatek/mt8186-mmsys.h
> +++ b/drivers/soc/mediatek/mt8186-mmsys.h
> @@ -5,9 +5,11 @@
>
> /* Values for DPI configuration in MMSYS address space */
> #define MT8186_MMSYS_DPI_OUTPUT_FORMAT 0x400
> -#define DPI_FORMAT_MASK 0x1
> -#define DPI_RGB888_DDR_CON BIT(0)
> -#define DPI_RGB565_SDR_CON BIT(1)
> +#define MT8186_DPI_FORMAT_MASK GENMASK(1, 0)
> +#define MT8186_DPI_RGB888_SDR_CON 0
> +#define MT8186_DPI_RGB888_DDR_CON 1
> +#define MT8186_DPI_RGB565_SDR_CON 2
> +#define MT8186_DPI_RGB565_DDR_CON 3
>
> #define MT8186_MMSYS_OVL_CON 0xF04
> #define MT8186_MMSYS_OVL0_CON_MASK 0x3
> diff --git a/drivers/soc/mediatek/mtk-mmsys.c b/drivers/soc/mediatek/mtk-mmsys.c
> index 2e20b24da363..16cd924d8973 100644
> --- a/drivers/soc/mediatek/mtk-mmsys.c
> +++ b/drivers/soc/mediatek/mtk-mmsys.c
> @@ -238,12 +238,27 @@ static void mtk_mmsys_update_bits(struct mtk_mmsys *mmsys, u32 offset, u32 mask,
>
> void mtk_mmsys_ddp_dpi_fmt_config(struct device *dev, u32 val)
> {
> - if (val)
> - mtk_mmsys_update_bits(dev_get_drvdata(dev), MT8186_MMSYS_DPI_OUTPUT_FORMAT,
> - DPI_RGB888_DDR_CON, DPI_FORMAT_MASK);
> - else
> - mtk_mmsys_update_bits(dev_get_drvdata(dev), MT8186_MMSYS_DPI_OUTPUT_FORMAT,
> - DPI_RGB565_SDR_CON, DPI_FORMAT_MASK);
> + struct mtk_mmsys *mmsys = dev_get_drvdata(dev);
> +
> + switch (val) {
> + case MTK_DPI_RGB888_SDR_CON:
> + mtk_mmsys_update_bits(mmsys, MT8186_MMSYS_DPI_OUTPUT_FORMAT,
> + MT8186_DPI_FORMAT_MASK, MT8186_DPI_RGB888_SDR_CON);
> + break;
> + case MTK_DPI_RGB565_SDR_CON:
> + mtk_mmsys_update_bits(mmsys, MT8186_MMSYS_DPI_OUTPUT_FORMAT,
> + MT8186_DPI_FORMAT_MASK, MT8186_DPI_RGB565_SDR_CON);
> + break;
> + case MTK_DPI_RGB565_DDR_CON:
> + mtk_mmsys_update_bits(mmsys, MT8186_MMSYS_DPI_OUTPUT_FORMAT,
> + MT8186_DPI_FORMAT_MASK, MT8186_DPI_RGB565_DDR_CON);
> + break;
> + case MTK_DPI_RGB888_DDR_CON:
> + default:
> + mtk_mmsys_update_bits(mmsys, MT8186_MMSYS_DPI_OUTPUT_FORMAT,
> + MT8186_DPI_FORMAT_MASK, MT8186_DPI_RGB888_DDR_CON);
> + break;
> + }
> }
> EXPORT_SYMBOL_GPL(mtk_mmsys_ddp_dpi_fmt_config);
>
> diff --git a/include/linux/soc/mediatek/mtk-mmsys.h b/include/linux/soc/mediatek/mtk-mmsys.h
> index d2b02bb43768..b85f66db33e1 100644
> --- a/include/linux/soc/mediatek/mtk-mmsys.h
> +++ b/include/linux/soc/mediatek/mtk-mmsys.h
> @@ -9,6 +9,13 @@
> enum mtk_ddp_comp_id;
> struct device;
>
> +enum mtk_dpi_out_format_con {
> + MTK_DPI_RGB888_SDR_CON,
> + MTK_DPI_RGB888_DDR_CON,
> + MTK_DPI_RGB565_SDR_CON,
> + MTK_DPI_RGB565_DDR_CON
> +};
> +
> enum mtk_ddp_comp_id {
> DDP_COMPONENT_AAL0,
> DDP_COMPONENT_AAL1,
On 08/11/2022 19:11, Matthias Brugger wrote:
> Hi Xinlei,
>
> Can you please fix the threading of this patches. I can see that this 1/3 but
> I'm not able to find 3/3 in the series. The first two look good, the third, I
> don't know.
>
Nevermind this message, the problem was on my side.
Regards,
Matthias
> Regards,
> Matthias
>
> On 24/10/2022 04:04, [email protected] wrote:
>> From: Xinlei Lee <[email protected]>
>>
>> The difference between MT8186 and other ICs is that when modifying the
>> output format, we need to modify the mmsys_base+0x400 register to take
>> effect. So when setting the dpi output format, we need to call
>> mtk_mmsys_ddp_dpi_fmt_config to set it to MT8186 synchronously.
>> Commit a071e52f75d1 ("soc: mediatek: Add mmsys func to adapt to dpi
>> output for MT8186") lacked some of the possible output formats and also
>> had a wrong bitmask.
>>
>> Add the missing output formats and fix the bitmask.
>> While at it, also update mtk_mmsys_ddp_dpi_fmt_config() to use generic
>> formats, so that it is slightly easier to extend for other platforms.
>> Fixes: a071e52f75d1 ("soc: mediatek: Add mmsys func to adapt to dpi output for
>> MT8186")
>> Signed-off-by: Xinlei Lee <[email protected]>
>> Reviewed-by: AngeloGioacchino Del Regno <[email protected]>
>> Reviewed-by: CK Hu <[email protected]>
>> Reviewed-by: Nícolas F. R. A. Prado <[email protected]>
>> ---
>> drivers/soc/mediatek/mt8186-mmsys.h | 8 +++++---
>> drivers/soc/mediatek/mtk-mmsys.c | 27 ++++++++++++++++++++------
>> include/linux/soc/mediatek/mtk-mmsys.h | 7 +++++++
>> 3 files changed, 33 insertions(+), 9 deletions(-)
>>
>> diff --git a/drivers/soc/mediatek/mt8186-mmsys.h
>> b/drivers/soc/mediatek/mt8186-mmsys.h
>> index 09b1ccbc0093..279d4138525b 100644
>> --- a/drivers/soc/mediatek/mt8186-mmsys.h
>> +++ b/drivers/soc/mediatek/mt8186-mmsys.h
>> @@ -5,9 +5,11 @@
>> /* Values for DPI configuration in MMSYS address space */
>> #define MT8186_MMSYS_DPI_OUTPUT_FORMAT 0x400
>> -#define DPI_FORMAT_MASK 0x1
>> -#define DPI_RGB888_DDR_CON BIT(0)
>> -#define DPI_RGB565_SDR_CON BIT(1)
>> +#define MT8186_DPI_FORMAT_MASK GENMASK(1, 0)
>> +#define MT8186_DPI_RGB888_SDR_CON 0
>> +#define MT8186_DPI_RGB888_DDR_CON 1
>> +#define MT8186_DPI_RGB565_SDR_CON 2
>> +#define MT8186_DPI_RGB565_DDR_CON 3
>> #define MT8186_MMSYS_OVL_CON 0xF04
>> #define MT8186_MMSYS_OVL0_CON_MASK 0x3
>> diff --git a/drivers/soc/mediatek/mtk-mmsys.c b/drivers/soc/mediatek/mtk-mmsys.c
>> index 2e20b24da363..16cd924d8973 100644
>> --- a/drivers/soc/mediatek/mtk-mmsys.c
>> +++ b/drivers/soc/mediatek/mtk-mmsys.c
>> @@ -238,12 +238,27 @@ static void mtk_mmsys_update_bits(struct mtk_mmsys
>> *mmsys, u32 offset, u32 mask,
>> void mtk_mmsys_ddp_dpi_fmt_config(struct device *dev, u32 val)
>> {
>> - if (val)
>> - mtk_mmsys_update_bits(dev_get_drvdata(dev),
>> MT8186_MMSYS_DPI_OUTPUT_FORMAT,
>> - DPI_RGB888_DDR_CON, DPI_FORMAT_MASK);
>> - else
>> - mtk_mmsys_update_bits(dev_get_drvdata(dev),
>> MT8186_MMSYS_DPI_OUTPUT_FORMAT,
>> - DPI_RGB565_SDR_CON, DPI_FORMAT_MASK);
>> + struct mtk_mmsys *mmsys = dev_get_drvdata(dev);
>> +
>> + switch (val) {
>> + case MTK_DPI_RGB888_SDR_CON:
>> + mtk_mmsys_update_bits(mmsys, MT8186_MMSYS_DPI_OUTPUT_FORMAT,
>> + MT8186_DPI_FORMAT_MASK, MT8186_DPI_RGB888_SDR_CON);
>> + break;
>> + case MTK_DPI_RGB565_SDR_CON:
>> + mtk_mmsys_update_bits(mmsys, MT8186_MMSYS_DPI_OUTPUT_FORMAT,
>> + MT8186_DPI_FORMAT_MASK, MT8186_DPI_RGB565_SDR_CON);
>> + break;
>> + case MTK_DPI_RGB565_DDR_CON:
>> + mtk_mmsys_update_bits(mmsys, MT8186_MMSYS_DPI_OUTPUT_FORMAT,
>> + MT8186_DPI_FORMAT_MASK, MT8186_DPI_RGB565_DDR_CON);
>> + break;
>> + case MTK_DPI_RGB888_DDR_CON:
>> + default:
>> + mtk_mmsys_update_bits(mmsys, MT8186_MMSYS_DPI_OUTPUT_FORMAT,
>> + MT8186_DPI_FORMAT_MASK, MT8186_DPI_RGB888_DDR_CON);
>> + break;
>> + }
>> }
>> EXPORT_SYMBOL_GPL(mtk_mmsys_ddp_dpi_fmt_config);
>> diff --git a/include/linux/soc/mediatek/mtk-mmsys.h
>> b/include/linux/soc/mediatek/mtk-mmsys.h
>> index d2b02bb43768..b85f66db33e1 100644
>> --- a/include/linux/soc/mediatek/mtk-mmsys.h
>> +++ b/include/linux/soc/mediatek/mtk-mmsys.h
>> @@ -9,6 +9,13 @@
>> enum mtk_ddp_comp_id;
>> struct device;
>> +enum mtk_dpi_out_format_con {
>> + MTK_DPI_RGB888_SDR_CON,
>> + MTK_DPI_RGB888_DDR_CON,
>> + MTK_DPI_RGB565_SDR_CON,
>> + MTK_DPI_RGB565_DDR_CON
>> +};
>> +
>> enum mtk_ddp_comp_id {
>> DDP_COMPONENT_AAL0,
>> DDP_COMPONENT_AAL1,