drm/mediatek: Add mt8195 DisplayPort driver
Subsystems (6)
cover drm/mediatek: Add mt8195 DisplayPort driver
Hi everyone,
this series is built around the DisplayPort driver. The dpi/dpintf driver and the added helper functions are required for the DisplayPort.
Note that this is an RFC. I would like to have your opinion on the driver and what needs to change. The driver itself has its rough edges that I am currently still working on, especially the training and powerup/down need some work in my opinion. Also the code compiles without an issue but is not fully tested yet.
However I already wanted to reach out for some feedback to see what can and should be improved. I am happy about every comment, thanks for taking the time.
The series is currently based on v5.14-rc5 but it requires other patches to actually work on mt8195 (clock, etc.). A binding documentation is not included yet.
Thanks,
Markus
Markus Schneider-Pargmann (5):
dt-bindings: mediatek,dpi: Add mt8195 dpintf
drm/mediatek: dpi: Add dpintf support
drm/edid: Add cea_sad helpers for freq/length
video/hdmi: Add audio_infoframe packing for DP
drm/mediatek: Add mt8195 DisplayPort driver
.../display/mediatek/mediatek,dpi.yaml | 48 +- drivers/gpu/drm/drm_edid.c | 57 + drivers/gpu/drm/mediatek/Kconfig | 7 + drivers/gpu/drm/mediatek/Makefile | 2 + drivers/gpu/drm/mediatek/mtk_dp.c | 3025 ++++++++++++++++ drivers/gpu/drm/mediatek/mtk_dp_reg.h | 3095 +++++++++++++++++ drivers/gpu/drm/mediatek/mtk_dpi.c | 282 +- drivers/gpu/drm/mediatek/mtk_dpi_regs.h | 12 + drivers/video/hdmi.c | 87 +- include/drm/drm_edid.h | 18 +- include/linux/hdmi.h | 4 + 11 files changed, 6564 insertions(+), 73 deletions(-) create mode 100644 drivers/gpu/drm/mediatek/mtk_dp.c create mode 100644 drivers/gpu/drm/mediatek/mtk_dp_reg.h
Signature · 1 line
2.32.0
RFC PATCH 1/5 dt-bindings: mediatek,dpi: Add mt8195 dpintf
DP_INTF is similar to the actual dpi. They differ in some points regarding registers and what needs to be set but the function blocks itself are similar in design.
--- .../display/mediatek/mediatek,dpi.yaml | 48 ++++++++++++++++--- 1 file changed, 42 insertions(+), 6 deletions(-)
Documentation/devicetree/bindings/display/mediatek/mediatek,dpi.yaml +42 -6
@@ -4,7 +4,7 @@ $id: http://devicetree.org/schemas/display/mediatek/mediatek,dpi.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# -title: mediatek DPI Controller Device Tree Bindings +title: mediatek DPI/DP_INTF Controller Device Tree Bindings maintainers: - CK Hu <[email protected]>
@@ -13,7 +13,8 @@ maintainers: description: | The Mediatek DPI function block is a sink of the display subsystem and provides 8-bit RGB/YUV444 or 8/10/10-bit YUV422 pixel data on a parallel - output bus. + output bus. The Mediatek DP_INTF is a similar function block that is + connected to the (embedded) display port function block. properties: compatible:
@@ -23,6 +24,7 @@ properties: - mediatek,mt8173-dpi - mediatek,mt8183-dpi - mediatek,mt8192-dpi + - mediatek,mt8195-dpintf reg: maxItems: 1
@@ -37,10 +39,11 @@ properties: - description: DPI PLL clock-names: - items: - - const: pixel - - const: engine - - const: pll + description: + For dpi clocks pixel, engine and pll are required. For dpintf pixel, pll, + pll_d2, pll_d4, pll_d8, pll_d16, hf_fmm, hf_fdp are required. + minItems: 3 + maxItems: 8 pinctrl-0: true pinctrl-1: true
@@ -64,6 +67,39 @@ required: - clock-names - port +allOf: + - if: + properties: + compatible: + contains: + enum: + - mediatek,mt8195-dpintf + then: + properties: + clocks: + minItems: 8 + maxItems: 8 + clock-names: + items: + - const: pixel + - const: pll + - const: pll_d2 + - const: pll_d4 + - const: pll_d8 + - const: pll_d16 + - const: hf_fmm + - const: hf_fdp + else: + properties: + clocks: + minItems: 3 + maxItems: 3 + clock-names: + items: + - const: pixel + - const: engine + - const: pll + additionalProperties: false examples:
Signature · 1 line
2.32.0
Re: [RFC PATCH 1/5] dt-bindings: mediatek,dpi: Add mt8195 dpintf
Hi, Markus:
Quoted 33 lines · Markus Schneider-Pargmann
DP_INTFis similar to the actual dpi. They differ in some points regarding registers and what needs to be set but the function blocks itself are similar in design.Signed-off-by Markus Schneider-Pargmann <[email protected]>--- .../display/mediatek/mediatek,dpi.yaml | 48 ++++++++++++++++--- 1 file changed, 42 insertions(+), 6 deletions(-)Documentation/devicetree/bindings/display/mediatek/mediatek,dpi.yaml +3
-2@@ -4,7 +4,7 @@ $id: https://urldefense.com/v3/__http://devicetree.org/schemas/display/mediatek/mediatek,dpi.yaml*__;Iw!!CTRNKA9wMg0ARbw!z5TyPvbq3ZLHjRPscOHigUMlikjhtJMFrEQqemcjQZa4NaXBE9tzMnDFMa1qYg$ $schema: https://urldefense.com/v3/__http://devicetree.org/meta-schemas/core.yaml*__;Iw!!CTRNKA9wMg0ARbw!z5TyPvbq3ZLHjRPscOHigUMlikjhtJMFrEQqemcjQZa4NaXBE9tzMnAjuBCxsg$ -title: mediatek DPI Controller Device Tree Bindings +title: mediatek DPI/DP_INTF Controller Device Tree Bindings maintainers: - CK Hu <[email protected]>@@ -13,7 +13,8 @@ maintainers: description: | The Mediatek DPI function block is a sink of the display subsystem and provides 8-bit RGB/YUV444 or 8/10/10-bit YUV422 pixel data on a parallel - output bus. + output bus. The Mediatek DP_INTF is a similar function block that is + connected to the (embedded) display port function block. properties: compatible:
Documentation/devicetree/bindings/display/mediatek/mediatek,dpi.yaml properties: · line 27
Quoted 4 lines
Documentation/devicetree/bindings/display/mediatek/mediatek,dpi.yaml +1
-0@@ -23,6 +24,7 @@ properties: - mediatek,mt8173-dpi - mediatek,mt8183-dpi - mediatek,mt8192-dpi + - mediatek,mt8195-dpintf
I've reviewed the modification in driver, it seems that dpintf is almost the same as dpi. Why use the name "dpintf"? I could accept this name only it's defined by hardware data sheet.
Regards,
CK
Quoted 59 lines
Documentation/devicetree/bindings/display/mediatek/mediatek,dpi.yaml +38
-4reg: maxItems: 1@@ -37,10 +39,11 @@ properties: - description: DPI PLL clock-names: - items: - - const: pixel - - const: engine - - const: pll + description: + For dpi clocks pixel, engine and pll are required. For dpintf pixel, pll, + pll_d2, pll_d4, pll_d8, pll_d16, hf_fmm, hf_fdp are required. + minItems: 3 + maxItems: 8 pinctrl-0: true pinctrl-1: true@@ -64,6 +67,39 @@ required: - clock-names - port +allOf: + - if: + properties: + compatible: + contains: + enum: + - mediatek,mt8195-dpintf + then: + properties: + clocks: + minItems: 8 + maxItems: 8 + clock-names: + items: + - const: pixel + - const: pll + - const: pll_d2 + - const: pll_d4 + - const: pll_d8 + - const: pll_d16 + - const: hf_fmm + - const: hf_fdp + else: + properties: + clocks: + minItems: 3 + maxItems: 3 + clock-names: + items: + - const: pixel + - const: engine + - const: pll + additionalProperties: false examples:
Re: [RFC PATCH 1/5] dt-bindings: mediatek,dpi: Add mt8195 dpintf
Hi,
Quoted 33 lines · CK Hu
Hi, Markus:
Quoted 30 lines · Markus Schneider-Pargmann
DP_INTFis similar to the actual dpi. They differ in some points regarding registers and what needs to be set but the function blocks itself are similar in design.Signed-off-by Markus Schneider-Pargmann <[email protected]>--- .../display/mediatek/mediatek,dpi.yaml | 48 ++++++++++++++++--- 1 file changed, 42 insertions(+), 6 deletions(-)Documentation/devicetree/bindings/display/mediatek/mediatek,dpi.yaml +3
-2@@ -4,7 +4,7 @@ $id: https://urldefense.com/v3/__http://devicetree.org/schemas/display/mediatek/mediatek,dpi.yaml*__;Iw!!CTRNKA9wMg0ARbw!z5TyPvbq3ZLHjRPscOHigUMlikjhtJMFrEQqemcjQZa4NaXBE9tzMnDFMa1qYg$ $schema: https://urldefense.com/v3/__http://devicetree.org/meta-schemas/core.yaml*__;Iw!!CTRNKA9wMg0ARbw!z5TyPvbq3ZLHjRPscOHigUMlikjhtJMFrEQqemcjQZa4NaXBE9tzMnAjuBCxsg$ -title: mediatek DPI Controller Device Tree Bindings +title: mediatek DPI/DP_INTF Controller Device Tree Bindings maintainers: - CK Hu <[email protected]>@@ -13,7 +13,8 @@ maintainers: description: | The Mediatek DPI function block is a sink of the display subsystem and provides 8-bit RGB/YUV444 or 8/10/10-bit YUV422 pixel data on a parallel - output bus. + output bus. The Mediatek DP_INTF is a similar function block that is + connected to the (embedded) display port function block.
Quoted 11 lines
Documentation/devicetree/bindings/display/mediatek/mediatek,dpi.yaml properties: · line 27
Quoted 7 lines
Documentation/devicetree/bindings/display/mediatek/mediatek,dpi.yaml +1
-0properties: compatible:@@ -23,6 +24,7 @@ properties: - mediatek,mt8173-dpi - mediatek,mt8183-dpi - mediatek,mt8192-dpi + - mediatek,mt8195-dpintfI've reviewed the modification in driver, it seems that dpintf is almost the same as dpi. Why use the name "dpintf"? I could accept this name only it's defined by hardware data sheet.
Yes the data sheet makes a distinction between DPI and DP_INTF. mt8195 has a DPI unit as well. DP_INTF has a slightly different feature set and also uses slightly different register bits.
Best,
Markus
Quoted 64 lines
Regards,
CKQuoted 59 lines
Documentation/devicetree/bindings/display/mediatek/mediatek,dpi.yaml +38
-4reg: maxItems: 1@@ -37,10 +39,11 @@ properties: - description: DPI PLL clock-names: - items: - - const: pixel - - const: engine - - const: pll + description: + For dpi clocks pixel, engine and pll are required. For dpintf pixel, pll, + pll_d2, pll_d4, pll_d8, pll_d16, hf_fmm, hf_fdp are required. + minItems: 3 + maxItems: 8 pinctrl-0: true pinctrl-1: true@@ -64,6 +67,39 @@ required: - clock-names - port +allOf: + - if: + properties: + compatible: + contains: + enum: + - mediatek,mt8195-dpintf + then: + properties: + clocks: + minItems: 8 + maxItems: 8 + clock-names: + items: + - const: pixel + - const: pll + - const: pll_d2 + - const: pll_d4 + - const: pll_d8 + - const: pll_d16 + - const: hf_fmm + - const: hf_fdp + else: + properties: + clocks: + minItems: 3 + maxItems: 3 + clock-names: + items: + - const: pixel + - const: engine + - const: pll + additionalProperties: false examples:
RFC PATCH 2/5 drm/mediatek: dpi: Add dpintf support
In reply to Markus Schneider-Pargmanndpintf is the displayport interface hardware unit. This unit is similar to dpi and can reuse most of the code.
This patch adds support for mt8195-dpintf to this dpi driver. Main differences are:
- Some features/functional components are not available for dpintf which are now excluded from code execution once is_dpintf is set
- dpintf can and needs to choose between different clockdividers based on the clockspeed. This is done by choosing a different clock parent.
- There are two additional clocks that need to be managed. These are only set for dpintf and will be set to NULL if not supplied. The clk_* calls handle these as normal clocks then.
- Some register contents differ slightly between the two components. To work around this I added register bits/masks with a DPINTF_ prefix and use them where different.
Based on a separate driver for dpintf created by
Jason-JH.Lin <[email protected]>.
--- drivers/gpu/drm/mediatek/mtk_dpi.c | 282 ++++++++++++++++++++---- drivers/gpu/drm/mediatek/mtk_dpi_regs.h | 12 + 2 files changed, 247 insertions(+), 47 deletions(-)
drivers/gpu/drm/mediatek/mtk_dpi.c +235 -47
@@ -63,6 +63,14 @@ enum mtk_dpi_out_color_format {MTK_DPI_COLOR_FORMAT_YCBCR_422_FULL }; +enum mtk_dpi_tvdpll_clk { +MTK_DPI_TVDPLL_D2 =0 , +MTK_DPI_TVDPLL_D4 =1 , +MTK_DPI_TVDPLL_D8 =2 , +MTK_DPI_TVDPLL_D16 =3 , +MTK_DPI_TVDPLL_NUM_CLKS =4 +}; +struct mtk_dpi {struct drm_encoder encoder;struct drm_bridge bridge;
@@ -71,8 +79,11 @@ struct mtk_dpi {void __iomem *regs;struct device *dev;struct clk *engine_clk; +struct clk *hf_fmm_clk; +struct clk *hf_fdp_clk;struct clk *pixel_clk;struct clk *tvd_clk; +struct clk_bulk_data tvd_clks[MTK_DPI_TVDPLL_NUM_CLKS ];int irq;struct drm_display_mode mode;const struct mtk_dpi_conf *conf;
@@ -125,6 +136,7 @@ struct mtk_dpi_conf {bool edge_sel_en;const u32 *output_fmts;u32 num_output_fmts; +bool is_dpintf; };static void mtk_dpi_mask (struct mtk_dpi *dpi,u32 offset,u32 val,u32 mask)
@@ -153,30 +165,52 @@ static void mtk_dpi_disable(struct mtk_dpi *dpi)static void mtk_dpi_config_hsync (struct mtk_dpi *dpi,struct mtk_dpi_sync_param *sync) { -mtk_dpi_mask (dpi,DPI_TGEN_HWIDTH , - sync->sync_width <<HPW ,HPW_MASK ); -mtk_dpi_mask (dpi,DPI_TGEN_HPORCH , - sync->back_porch <<HBP ,HBP_MASK ); -mtk_dpi_mask (dpi,DPI_TGEN_HPORCH , sync->front_porch <<HFP , -HFP_MASK ); +if (dpi->conf->is_dpintf) { +mtk_dpi_mask (dpi,DPI_TGEN_HWIDTH , + sync->sync_width <<HPW ,DPINTF_HPW_MASK ); +mtk_dpi_mask (dpi,DPI_TGEN_HPORCH , + sync->back_porch <<HBP ,DPINTF_HBP_MASK ); +mtk_dpi_mask (dpi,DPI_TGEN_HPORCH , sync->front_porch <<HFP , +DPINTF_HFP_MASK ); + }else { +mtk_dpi_mask (dpi,DPI_TGEN_HWIDTH , + sync->sync_width <<HPW ,HPW_MASK ); +mtk_dpi_mask (dpi,DPI_TGEN_HPORCH , + sync->back_porch <<HBP ,HBP_MASK ); +mtk_dpi_mask (dpi,DPI_TGEN_HPORCH , sync->front_porch <<HFP , +HFP_MASK ); + } }static void mtk_dpi_config_vsync (struct mtk_dpi *dpi,struct mtk_dpi_sync_param *sync,u32 width_addr,u32 porch_addr) { -mtk_dpi_mask (dpi, width_addr, - sync->sync_width <<VSYNC_WIDTH_SHIFT , -VSYNC_WIDTH_MASK );mtk_dpi_mask (dpi, width_addr, sync->shift_half_line <<VSYNC_HALF_LINE_SHIFT ,VSYNC_HALF_LINE_MASK ); -mtk_dpi_mask (dpi, porch_addr, - sync->back_porch <<VSYNC_BACK_PORCH_SHIFT , -VSYNC_BACK_PORCH_MASK ); -mtk_dpi_mask (dpi, porch_addr, - sync->front_porch <<VSYNC_FRONT_PORCH_SHIFT , -VSYNC_FRONT_PORCH_MASK ); + +if (dpi->conf->is_dpintf) { +mtk_dpi_mask (dpi, width_addr, + sync->sync_width <<VSYNC_WIDTH_SHIFT , +DPINTF_VSYNC_WIDTH_MASK ); +mtk_dpi_mask (dpi, porch_addr, + sync->back_porch <<VSYNC_BACK_PORCH_SHIFT , +DPINTF_VSYNC_BACK_PORCH_MASK ); +mtk_dpi_mask (dpi, porch_addr, + sync->front_porch <<VSYNC_FRONT_PORCH_SHIFT , +DPINTF_VSYNC_FRONT_PORCH_MASK ); + }else { +mtk_dpi_mask (dpi, width_addr, + sync->sync_width <<VSYNC_WIDTH_SHIFT , +VSYNC_WIDTH_MASK ); +mtk_dpi_mask (dpi, porch_addr, + sync->back_porch <<VSYNC_BACK_PORCH_SHIFT , +VSYNC_BACK_PORCH_MASK ); +mtk_dpi_mask (dpi, porch_addr, + sync->front_porch <<VSYNC_FRONT_PORCH_SHIFT , +VSYNC_FRONT_PORCH_MASK ); + } } static void mtk_dpi_config_vsync_lodd(struct mtk_dpi *dpi,
@@ -210,13 +244,20 @@ static void mtk_dpi_config_pol(struct mtk_dpi *dpi, struct mtk_dpi_polarities *dpi_pol) {unsigned int pol; +unsigned int mask; - pol = (dpi_pol->ck_pol ==MTK_DPI_POLARITY_RISING ?0 :CK_POL ) | - (dpi_pol->de_pol ==MTK_DPI_POLARITY_RISING ?0 :DE_POL ) | - (dpi_pol->hsync_pol ==MTK_DPI_POLARITY_RISING ?0 :HSYNC_POL ) | + mask =HSYNC_POL |VSYNC_POL ; + pol = (dpi_pol->hsync_pol ==MTK_DPI_POLARITY_RISING ?0 :HSYNC_POL ) | (dpi_pol->vsync_pol ==MTK_DPI_POLARITY_RISING ?0 :VSYNC_POL ); -mtk_dpi_mask (dpi,DPI_OUTPUT_SETTING , pol, -CK_POL |DE_POL |HSYNC_POL |VSYNC_POL ); +if (!dpi->conf->is_dpintf) { + mask |=CK_POL |DE_POL ; + pol |= (dpi_pol->ck_pol ==MTK_DPI_POLARITY_RISING ? +0 :CK_POL ) | + (dpi_pol->de_pol ==MTK_DPI_POLARITY_RISING ? +0 :DE_POL ); + } + +mtk_dpi_mask (dpi,DPI_OUTPUT_SETTING , pol, mask); }static void mtk_dpi_config_3d (struct mtk_dpi *dpi,bool en_3d)
@@ -270,8 +311,12 @@ static void mtk_dpi_config_bit_num(struct mtk_dpi *dpi, val =OUT_BIT_8 ;break ; } -mtk_dpi_mask (dpi,DPI_OUTPUT_SETTING , val <<OUT_BIT , -OUT_BIT_MASK ); +if (dpi->conf->is_dpintf) +mtk_dpi_mask (dpi,DPI_OUTPUT_SETTING , val <<DPINTF_OUT_BIT , +DPINTF_OUT_BIT_MASK ); +else +mtk_dpi_mask (dpi,DPI_OUTPUT_SETTING , val <<OUT_BIT , +OUT_BIT_MASK ); } static void mtk_dpi_config_yc_map(struct mtk_dpi *dpi,
@@ -332,12 +377,21 @@ static void mtk_dpi_config_channel_swap(struct mtk_dpi *dpi,break ; } -mtk_dpi_mask (dpi,DPI_OUTPUT_SETTING , val <<CH_SWAP ,CH_SWAP_MASK ); +if (dpi->conf->is_dpintf) +mtk_dpi_mask (dpi,DPI_OUTPUT_SETTING , val <<DPINTF_CH_SWAP , +DPINTF_CH_SWAP_MASK ); +else +mtk_dpi_mask (dpi,DPI_OUTPUT_SETTING , val <<CH_SWAP , +CH_SWAP_MASK ); }static void mtk_dpi_config_yuv422_enable (struct mtk_dpi *dpi,bool enable) { -mtk_dpi_mask (dpi,DPI_CON , enable ?YUV422_EN :0 ,YUV422_EN ); +if (dpi->conf->is_dpintf) +mtk_dpi_mask (dpi,DPI_CON , enable ?DPINTF_YUV422_EN :0 , +DPINTF_YUV422_EN ); +else +mtk_dpi_mask (dpi,DPI_CON , enable ?YUV422_EN :0 ,YUV422_EN ); }static void mtk_dpi_config_csc_enable (struct mtk_dpi *dpi,bool enable)
@@ -367,19 +421,25 @@ static void mtk_dpi_config_color_format(struct mtk_dpi *dpi,if ((format ==MTK_DPI_COLOR_FORMAT_YCBCR_444 ) || (format ==MTK_DPI_COLOR_FORMAT_YCBCR_444_FULL )) {mtk_dpi_config_yuv422_enable (dpi, false); -mtk_dpi_config_csc_enable (dpi, true); -mtk_dpi_config_swap_input (dpi, false); +if (!dpi->conf->is_dpintf) { +mtk_dpi_config_csc_enable (dpi, true); +mtk_dpi_config_swap_input (dpi, false); + }mtk_dpi_config_channel_swap (dpi,MTK_DPI_OUT_CHANNEL_SWAP_BGR ); }else if ((format ==MTK_DPI_COLOR_FORMAT_YCBCR_422 ) || (format ==MTK_DPI_COLOR_FORMAT_YCBCR_422_FULL )) {mtk_dpi_config_yuv422_enable (dpi, true); -mtk_dpi_config_csc_enable (dpi, true); -mtk_dpi_config_swap_input (dpi, true); +if (!dpi->conf->is_dpintf) { +mtk_dpi_config_csc_enable (dpi, true); +mtk_dpi_config_swap_input (dpi, true); + }mtk_dpi_config_channel_swap (dpi,MTK_DPI_OUT_CHANNEL_SWAP_RGB ); }else {mtk_dpi_config_yuv422_enable (dpi, false); -mtk_dpi_config_csc_enable (dpi, false); -mtk_dpi_config_swap_input (dpi, false); +if (!dpi->conf->is_dpintf) { +mtk_dpi_config_csc_enable (dpi, false); +mtk_dpi_config_swap_input (dpi, false); + }mtk_dpi_config_channel_swap (dpi,MTK_DPI_OUT_CHANNEL_SWAP_RGB ); } }
@@ -410,8 +470,10 @@ static void mtk_dpi_power_off(struct mtk_dpi *dpi)pinctrl_select_state (dpi->pinctrl, dpi->pins_gpio);mtk_dpi_disable (dpi); -clk_disable_unprepare (dpi->pixel_clk);clk_disable_unprepare (dpi->engine_clk); +clk_disable_unprepare (dpi->hf_fdp_clk); +clk_disable_unprepare (dpi->hf_fmm_clk); +clk_disable_unprepare (dpi->pixel_clk); }static int mtk_dpi_power_on (struct mtk_dpi *dpi)
@@ -433,12 +495,28 @@ static int mtk_dpi_power_on(struct mtk_dpi *dpi) goto err_pixel; } + ret =clk_prepare_enable (dpi->hf_fmm_clk); +if (ret) { +dev_err (dpi->dev,"Failed to enable hf_fmm clock: %d\n" , ret); + goto err_hf_fmm; + } + + ret =clk_prepare_enable (dpi->hf_fdp_clk); +if (ret) { +dev_err (dpi->dev,"Failed to enable hf_fdp clock: %d\n" , ret); + goto err_hf_fdp; + } +if (dpi->pinctrl && dpi->pins_dpi)pinctrl_select_state (dpi->pinctrl, dpi->pins_dpi);mtk_dpi_enable (dpi);return 0 ; +err_hf_fdp: +clk_disable_unprepare (dpi->hf_fmm_clk); +err_hf_fmm: +clk_disable_unprepare (dpi->pixel_clk); err_pixel:clk_disable_unprepare (dpi->engine_clk); err_refcount:
@@ -446,6 +524,31 @@ static int mtk_dpi_power_on(struct mtk_dpi *dpi)return ret; } +static void mtk_dpi_set_pixel_clk_parent (struct mtk_dpi *dpi, +unsigned int factor) +{ +struct clk *new_parent; + +switch (factor) { +case 16 : + new_parent = dpi->tvd_clks[MTK_DPI_TVDPLL_D16 ].clk; +break ; +case 8 : + new_parent = dpi->tvd_clks[MTK_DPI_TVDPLL_D8 ].clk; +break ; +case 4 : + new_parent = dpi->tvd_clks[MTK_DPI_TVDPLL_D4 ].clk; +break ; +case 2 : + new_parent = dpi->tvd_clks[MTK_DPI_TVDPLL_D2 ].clk; +break ; +default : + new_parent =NULL ; + } +if (new_parent) +clk_set_parent (dpi->pixel_clk, new_parent); +} +static int mtk_dpi_set_display_mode (struct mtk_dpi *dpi,struct drm_display_mode *mode) {
@@ -465,6 +568,8 @@ static int mtk_dpi_set_display_mode(struct mtk_dpi *dpi,drm_display_mode_to_videomode (mode, &vm); pll_rate = vm.pixelclock * factor; +mtk_dpi_set_pixel_clk_parent (dpi, factor); +dev_dbg (dpi->dev,"Want PLL %lu Hz, pixel clock %lu Hz\n" , pll_rate, vm.pixelclock);
@@ -484,10 +589,17 @@ static int mtk_dpi_set_display_mode(struct mtk_dpi *dpi,dev_dbg (dpi->dev,"Got PLL %lu Hz, pixel clock %lu Hz\n" , pll_rate, vm.pixelclock); - limit.c_bottom =0x0010 ; - limit.c_top =0x0FE0 ; - limit.y_bottom =0x0010 ; - limit.y_top =0x0FE0 ; +if (dpi->conf->is_dpintf) { + limit.c_bottom =0x0000 ; + limit.c_top =0xFFF ; + limit.y_bottom =0x0000 ; + limit.y_top =0xFFF ; + }else { + limit.c_bottom =0x0010 ; + limit.c_top =0x0FE0 ; + limit.y_bottom =0x0010 ; + limit.y_top =0x0FE0 ; + } dpi_pol.ck_pol =MTK_DPI_POLARITY_FALLING ; dpi_pol.de_pol =MTK_DPI_POLARITY_RISING ;
@@ -495,6 +607,7 @@ static int mtk_dpi_set_display_mode(struct mtk_dpi *dpi, MTK_DPI_POLARITY_FALLING :MTK_DPI_POLARITY_RISING ; dpi_pol.vsync_pol = vm.flags &DISPLAY_FLAGS_VSYNC_HIGH ?MTK_DPI_POLARITY_FALLING :MTK_DPI_POLARITY_RISING ; +// TODO(scosu): dpintf divides these 3 values by 4 hsync.sync_width = vm.hsync_len; hsync.back_porch = vm.hback_porch; hsync.front_porch = vm.hfront_porch;
@@ -539,12 +652,17 @@ static int mtk_dpi_set_display_mode(struct mtk_dpi *dpi,mtk_dpi_config_channel_limit (dpi, &limit);mtk_dpi_config_bit_num (dpi, dpi->bit_num);mtk_dpi_config_channel_swap (dpi, dpi->channel_swap); -mtk_dpi_config_yc_map (dpi, dpi->yc_map);mtk_dpi_config_color_format (dpi, dpi->color_format); -mtk_dpi_config_2n_h_fre (dpi); -mtk_dpi_dual_edge (dpi); -mtk_dpi_config_disable_edge (dpi); -mtk_dpi_sw_reset (dpi, false); +if (dpi->conf->is_dpintf) { +mtk_dpi_mask (dpi,DPI_CON ,DPINTF_INPUT_2P_EN , +DPINTF_INPUT_2P_EN ); + }else { +mtk_dpi_config_yc_map (dpi, dpi->yc_map); +mtk_dpi_config_2n_h_fre (dpi); +mtk_dpi_dual_edge (dpi); +mtk_dpi_config_disable_edge (dpi); +mtk_dpi_sw_reset (dpi, false); + }return 0 ; }
@@ -683,6 +801,14 @@ static const struct drm_bridge_funcs mtk_dpi_bridge_funcs = { .atomic_reset = drm_atomic_helper_bridge_reset, }; +static const struct drm_bridge_funcs mtk_dpintf_bridge_funcs = { + .attach = mtk_dpi_bridge_attach, + .mode_set = mtk_dpi_bridge_mode_set, + .disable = mtk_dpi_bridge_disable, + .enable = mtk_dpi_bridge_enable, + .atomic_check = mtk_dpi_bridge_atomic_check, +}; +void mtk_dpi_start (struct device *dev) {struct mtk_dpi *dpi =dev_get_drvdata (dev);
@@ -779,6 +905,16 @@ static unsigned int mt8183_calculate_factor(int clock)return 2 ; } +static unsigned int mt8195_dpintf_calculate_factor (int clock) +{ +if (clock <70000 ) +return 16 ; +else if (clock <200000 ) +return 8 ; +else +return 4 ; +} +static const u32 mt8173_output_fmts[] = {MEDIA_BUS_FMT_RGB888_1X24 , };
@@ -794,6 +930,7 @@ static const struct mtk_dpi_conf mt8173_conf = { .max_clock_khz = 300000, .output_fmts = mt8173_output_fmts, .num_output_fmts = ARRAY_SIZE(mt8173_output_fmts), + .is_dpintf = false, };static const struct mtk_dpi_conf mt2701_conf = {
@@ -803,6 +940,7 @@ static const struct mtk_dpi_conf mt2701_conf = { .max_clock_khz = 150000, .output_fmts = mt8173_output_fmts, .num_output_fmts = ARRAY_SIZE(mt8173_output_fmts), + .is_dpintf = false, };static const struct mtk_dpi_conf mt8183_conf = {
@@ -811,6 +949,7 @@ static const struct mtk_dpi_conf mt8183_conf = { .max_clock_khz = 100000, .output_fmts = mt8183_output_fmts, .num_output_fmts = ARRAY_SIZE(mt8183_output_fmts), + .is_dpintf = false, };static const struct mtk_dpi_conf mt8192_conf = {
@@ -819,6 +958,12 @@ static const struct mtk_dpi_conf mt8192_conf = { .max_clock_khz = 150000, .output_fmts = mt8173_output_fmts, .num_output_fmts = ARRAY_SIZE(mt8173_output_fmts), + .is_dpintf = false, +}; + +static const struct mtk_dpi_conf mt8195_dpintf_conf = { + .cal_factor = mt8195_dpintf_calculate_factor, + .is_dpintf = true, };static int mtk_dpi_probe (struct platform_device *pdev)
@@ -864,13 +1009,16 @@ static int mtk_dpi_probe(struct platform_device *pdev)return ret; } - dpi->engine_clk =devm_clk_get (dev,"engine" ); -if (IS_ERR (dpi->engine_clk)) { - ret =PTR_ERR (dpi->engine_clk); -if (ret != -EPROBE_DEFER ) -dev_err (dev,"Failed to get engine clock: %d\n" , ret); +if (!dpi->conf->is_dpintf) { + dpi->engine_clk =devm_clk_get (dev,"engine" ); +if (IS_ERR (dpi->engine_clk)) { + ret =PTR_ERR (dpi->engine_clk); +if (ret != -EPROBE_DEFER ) +dev_err (dev,"Failed to get engine clock: %d\n" , + ret); -return ret; +return ret; + } } dpi->pixel_clk =devm_clk_get (dev,"pixel" );
@@ -891,6 +1039,40 @@ static int mtk_dpi_probe(struct platform_device *pdev)return ret; } + dpi->hf_fmm_clk =devm_clk_get_optional (dev,"hf_fmm" ); +if (IS_ERR (dpi->hf_fmm_clk)) { + ret =PTR_ERR (dpi->hf_fmm_clk); +if (ret != -EPROBE_DEFER ) +dev_err (dev,"Failed to get hf_fmm clock: %d\n" , ret); + +return ret; + } + + dpi->hf_fdp_clk =devm_clk_get_optional (dev,"hf_fdp" ); +if (IS_ERR (dpi->hf_fdp_clk)) { + ret =PTR_ERR (dpi->hf_fdp_clk); +if (ret != -EPROBE_DEFER ) +dev_err (dev,"Failed to get hf_fdp clock: %d\n" , ret); + +return ret; + } + +if (dpi->conf->is_dpintf) { + dpi->tvd_clks[MTK_DPI_TVDPLL_D2 ].id ="pll_d2" ; + dpi->tvd_clks[MTK_DPI_TVDPLL_D4 ].id ="pll_d4" ; + dpi->tvd_clks[MTK_DPI_TVDPLL_D8 ].id ="pll_d8" ; + dpi->tvd_clks[MTK_DPI_TVDPLL_D16 ].id ="pll_d16" ; + ret =devm_clk_bulk_get_optional (dev,MTK_DPI_TVDPLL_NUM_CLKS , + dpi->tvd_clks); +if (ret) { +if (ret != -EPROBE_DEFER ) +dev_err (dev, +"Failed to get optional tvdpll divider clock: %d\n" , + ret); +return ret; + } + } + dpi->irq =platform_get_irq (pdev,0 );if (dpi->irq <=0 )return -EINVAL ;
@@ -904,7 +1086,10 @@ static int mtk_dpi_probe(struct platform_device *pdev)platform_set_drvdata (pdev, dpi); - dpi->bridge.funcs = &mtk_dpi_bridge_funcs; +if (dpi->conf->is_dpintf) + dpi->bridge.funcs = &mtk_dpintf_bridge_funcs; +else + dpi->bridge.funcs = &mtk_dpi_bridge_funcs; dpi->bridge.of_node = dev->of_node; dpi->bridge.type =DRM_MODE_CONNECTOR_DPI ;
@@ -943,6 +1128,9 @@ static const struct of_device_id mtk_dpi_of_ids[] = { { .compatible = "mediatek,mt8192-dpi", .data = &mt8192_conf, }, + { .compatible = "mediatek,mt8195-dpintf", + .data = &mt8195_dpintf_conf, + }, { }, };MODULE_DEVICE_TABLE (of, mtk_dpi_of_ids);
drivers/gpu/drm/mediatek/mtk_dpi_regs.h +12 -0
@@ -40,10 +40,14 @@#define FAKE_DE_LEVEN BIT(21)#define FAKE_DE_RODD BIT(22)#define FAKE_DE_REVEN BIT(23) +#define DPINTF_YUV422_EN BIT(24) +#define DPINTF_INPUT_2P_EN BIT(29)#define DPI_OUTPUT_SETTING 0x14#define CH_SWAP 0 +#define DPINTF_CH_SWAP BIT(1)#define CH_SWAP_MASK (0x7 << 0) +#define DPINTF_CH_SWAP_MASK (0x7 << 1)#define SWAP_RGB 0x00#define SWAP_GBR 0x01#define SWAP_BRG 0x02
@@ -64,7 +68,9 @@#define OEN_OFF BIT(16)#define EDGE_SEL BIT(17)#define OUT_BIT 18 +#define DPINTF_OUT_BIT 16#define OUT_BIT_MASK (0x3 << 18) +#define DPINTF_OUT_BIT_MASK (0x3 << 16)#define OUT_BIT_8 0x00#define OUT_BIT_10 0x01#define OUT_BIT_12 0x02
@@ -93,24 +99,30 @@#define DPI_TGEN_HWIDTH 0x20#define HPW 0#define HPW_MASK (0xFFF << 0) +#define DPINTF_HPW_MASK (0xFFFF << 0)#define DPI_TGEN_HPORCH 0x24#define HBP 0#define HBP_MASK (0xFFF << 0) +#define DPINTF_HBP_MASK (0xFFFF << 0)#define HFP 16#define HFP_MASK (0xFFF << 16) +#define DPINTF_HFP_MASK (0xFFFF << 16)#define DPI_TGEN_VWIDTH 0x28#define DPI_TGEN_VPORCH 0x2C#define VSYNC_WIDTH_SHIFT 0#define VSYNC_WIDTH_MASK (0xFFF << 0) +#define DPINTF_VSYNC_WIDTH_MASK (0xFFFF << 0)#define VSYNC_HALF_LINE_SHIFT 16#define VSYNC_HALF_LINE_MASK BIT(16)#define VSYNC_BACK_PORCH_SHIFT 0#define VSYNC_BACK_PORCH_MASK (0xFFF << 0) +#define DPINTF_VSYNC_BACK_PORCH_MASK (0xFFFF << 0)#define VSYNC_FRONT_PORCH_SHIFT 16#define VSYNC_FRONT_PORCH_MASK (0xFFF << 16) +#define DPINTF_VSYNC_FRONT_PORCH_MASK (0xFFFF << 16)#define DPI_BG_HCNTL 0x30#define BG_RIGHT (0x1FFF << 0)
Signature · 1 line
2.32.0
Re: [RFC PATCH 2/5] drm/mediatek: dpi: Add dpintf support
Hi, Markus:
Quoted 25 lines · Markus Schneider-Pargmann
dpintf is the displayport interface hardware unit. This unit is similar to dpi and can reuse most of the code.
This patch adds support for mt8195-dpintf to this dpi driver. Main differences are:
- Some features/functional components are not available for dpintf which are now excluded from code execution onceis_dpintfis set
- dpintf can and needs to choose between different clockdividers based on the clockspeed. This is done by choosing a different clock parent.
- There are two additional clocks that need to be managed. These are only set for dpintf and will be set to NULL if not supplied. The clk_* calls handle these as normal clocks then.
- Some register contents differ slightly between the two components. To work around this I added register bits/masks with aDPINTF_prefix and use them where different.Based on a separate driver for dpintf created by
Jason-JH.Lin <[email protected]>.Signed-off-by Markus Schneider-Pargmann <[email protected]>--- drivers/gpu/drm/mediatek/mtk_dpi.c | 282 ++++++++++++++++++++---- drivers/gpu/drm/mediatek/mtk_dpi_regs.h | 12 + 2 files changed, 247 insertions(+), 47 deletions(-)
[snip]
Quoted 14 lines
drivers/gpu/drm/mediatek/mtk_dpi.c +13
-0+static void mtk_dpi_set_pixel_clk_parent (struct mtk_dpi *dpi, +unsigned int factor) +{ +struct clk *new_parent; + +switch (factor) { +case 16 : + new_parent = dpi->tvd_clks[MTK_DPI_TVDPLL_D16 ].clk; +break ; +case 8 : + new_parent = dpi->tvd_clks[MTK_DPI_TVDPLL_D8 ].clk; +break ; +case 4 :
drivers/gpu/drm/mediatek/mtk_dpi.c static int mtk_dpi_power_on(struct mtk_dpi *dpi) · line 549
Quoted 10 lines
drivers/gpu/drm/mediatek/mtk_dpi.c +10
-0+ new_parent = dpi->tvd_clks[MTK_DPI_TVDPLL_D4 ].clk; +break ; +case 2 : + new_parent = dpi->tvd_clks[MTK_DPI_TVDPLL_D2 ].clk; +break ; +default : + new_parent =NULL ; + } +if (new_parent) +clk_set_parent (dpi->pixel_clk, new_parent);
I prefer that dpi->pixel_clk provide set_rate() interface, and let clock driver to control the parent of dpi->pixel_clk.
Regards,
CK
Quoted 14 lines
drivers/gpu/drm/mediatek/mtk_dpi.c +4
-0+} +static int mtk_dpi_set_display_mode (struct mtk_dpi *dpi,struct drm_display_mode *mode) {@@ -465,6 +568,8 @@ static int mtk_dpi_set_display_mode(struct mtk_dpi *dpi,drm_display_mode_to_videomode (mode, &vm); pll_rate = vm.pixelclock * factor; +mtk_dpi_set_pixel_clk_parent (dpi, factor); +dev_dbg (dpi->dev,"Want PLL %lu Hz, pixel clock %lu Hz\n" , pll_rate, vm.pixelclock);
Re: [RFC PATCH 2/5] drm/mediatek: dpi: Add dpintf support
Hi,
Quoted 50 lines · CK Hu
Hi, Markus:
Quoted 25 lines · Markus Schneider-Pargmann
dpintf is the displayport interface hardware unit. This unit is similar to dpi and can reuse most of the code.
This patch adds support for mt8195-dpintf to this dpi driver. Main differences are:
- Some features/functional components are not available for dpintf which are now excluded from code execution onceis_dpintfis set
- dpintf can and needs to choose between different clockdividers based on the clockspeed. This is done by choosing a different clock parent.
- There are two additional clocks that need to be managed. These are only set for dpintf and will be set to NULL if not supplied. The clk_* calls handle these as normal clocks then.
- Some register contents differ slightly between the two components. To work around this I added register bits/masks with aDPINTF_prefix and use them where different.Based on a separate driver for dpintf created by
Jason-JH.Lin <[email protected]>.Signed-off-by Markus Schneider-Pargmann <[email protected]>--- drivers/gpu/drm/mediatek/mtk_dpi.c | 282 ++++++++++++++++++++---- drivers/gpu/drm/mediatek/mtk_dpi_regs.h | 12 + 2 files changed, 247 insertions(+), 47 deletions(-)[snip]
Quoted 19 lines
drivers/gpu/drm/mediatek/mtk_dpi.c +18
-0+static void mtk_dpi_set_pixel_clk_parent (struct mtk_dpi *dpi, +unsigned int factor) +{ +struct clk *new_parent; + +switch (factor) { +case 16 : + new_parent = dpi->tvd_clks[MTK_DPI_TVDPLL_D16 ].clk; +break ; +case 8 : + new_parent = dpi->tvd_clks[MTK_DPI_TVDPLL_D8 ].clk; +break ; +case 4 : + new_parent = dpi->tvd_clks[MTK_DPI_TVDPLL_D4 ].clk; +break ; +case 2 : + new_parent = dpi->tvd_clks[MTK_DPI_TVDPLL_D2 ].clk; +break ;
Quoted 8 lines
drivers/gpu/drm/mediatek/mtk_dpi.c static int mtk_dpi_power_on(struct mtk_dpi *dpi) · line 549
Quoted 5 lines
drivers/gpu/drm/mediatek/mtk_dpi.c +5
-0+default : + new_parent =NULL ; + } +if (new_parent) +clk_set_parent (dpi->pixel_clk, new_parent);I prefer that
dpi->pixel_clkprovideset_rate()interface, and let clock driver to control the parent ofdpi->pixel_clk.
Good point, will do that, thanks.
Best,
Markus
Quoted 20 lines
Regards,
CKQuoted 14 lines
drivers/gpu/drm/mediatek/mtk_dpi.c +4
-0+} +static int mtk_dpi_set_display_mode (struct mtk_dpi *dpi,struct drm_display_mode *mode) {@@ -465,6 +568,8 @@ static int mtk_dpi_set_display_mode(struct mtk_dpi *dpi,drm_display_mode_to_videomode (mode, &vm); pll_rate = vm.pixelclock * factor; +mtk_dpi_set_pixel_clk_parent (dpi, factor); +dev_dbg (dpi->dev,"Want PLL %lu Hz, pixel clock %lu Hz\n" , pll_rate, vm.pixelclock);
RFC PATCH 3/5 drm/edid: Add cea_sad helpers for freq/length
In reply to Markus Schneider-PargmannThis patch adds two helper functions that extract the frequency and word length from a struct cea_sad.
For these helper functions new defines are added that help translate the 'freq' and 'byte2' fields into real numbers.
--- drivers/gpu/drm/drm_edid.c | 57 ++++++++++++++++++++++++++++++++++++++ include/drm/drm_edid.h | 18 ++++++++++-- 2 files changed, 73 insertions(+), 2 deletions(-)
drivers/gpu/drm/drm_edid.c +57 -0
@@ -4666,6 +4666,63 @@ int drm_edid_to_speaker_allocation(struct edid *edid, u8 **sadb) }EXPORT_SYMBOL (drm_edid_to_speaker_allocation); +/** +* drm_cea_sad_get_sample_rate - Extract the sample rate from cea_sad +* @sad: Pointer to the cea_sad struct +* +* Extracts the cea_sad frequency field and returns the sample rate in Hz. +* +* Return: Sample rate in Hz or a negative errno if parsing failed. +*/ +int drm_cea_sad_get_sample_rate (struct cea_sad *sad) +{ +switch (sad->freq) { +case CEA_SAD_FREQ_32KHZ : +return 32000 ; +case CEA_SAD_FREQ_44KHZ : +return 44100 ; +case CEA_SAD_FREQ_48KHZ : +return 48000 ; +case CEA_SAD_FREQ_88KHZ : +return 88200 ; +case CEA_SAD_FREQ_96KHZ : +return 96000 ; +case CEA_SAD_FREQ_176KHZ : +return 176400 ; +case CEA_SAD_FREQ_192KHZ : +return 192000 ; +default : +return -EINVAL ; + } +} +EXPORT_SYMBOL (drm_cea_sad_get_sample_rate); + +/** +* drm_cea_sad_get_uncompressed_word_length - Extract word length +* @sad: Pointer to the cea_sad struct +* +* Extracts the cea_sad byte2 field and returns the word length for an +* uncompressed stream. +* +* Note: This function may only be called for uncompressed audio. +* +* Return: Word length in bits or a negative errno if parsing failed. +*/ +int drm_cea_sad_get_uncompressed_word_length (struct cea_sad *sad) +{ +switch (sad->byte2) { +case CEA_SAD_UNCOMPRESSED_WORD_16BIT : +return 16 ; +case CEA_SAD_UNCOMPRESSED_WORD_20BIT : +return 20 ; +case CEA_SAD_UNCOMPRESSED_WORD_24BIT : +return 24 ; +default : +return -EINVAL ; + } +} +EXPORT_SYMBOL (drm_cea_sad_get_uncompressed_word_length); +/** * drm_av_sync_delay - compute the HDMI/DP sink audio-video sync delay * @connector: connector associated with the HDMI/DP sink
include/drm/drm_edid.h +16 -2
@@ -361,12 +361,24 @@ struct edid {/* Short Audio Descriptor */ struct cea_sad { -u8 format; +u8 format;/* See HDMI_AUDIO_CODING_TYPE_* */ u8 channels;/* max number of channels - 1 */ -u8 freq; +u8 freq;/* See CEA_SAD_FREQ_* */ u8 byte2;/* meaning depends on format */ }; +#define CEA_SAD_FREQ_32KHZ BIT(0) +#define CEA_SAD_FREQ_44KHZ BIT(1) +#define CEA_SAD_FREQ_48KHZ BIT(2) +#define CEA_SAD_FREQ_88KHZ BIT(3) +#define CEA_SAD_FREQ_96KHZ BIT(4) +#define CEA_SAD_FREQ_176KHZ BIT(5) +#define CEA_SAD_FREQ_192KHZ BIT(6) + +#define CEA_SAD_UNCOMPRESSED_WORD_16BIT BIT(0) +#define CEA_SAD_UNCOMPRESSED_WORD_20BIT BIT(1) +#define CEA_SAD_UNCOMPRESSED_WORD_24BIT BIT(2) +struct drm_encoder ;struct drm_connector ;struct drm_connector_state ;
@@ -374,6 +386,8 @@ struct drm_display_mode;int drm_edid_to_sad (struct edid *edid,struct cea_sad **sads);int drm_edid_to_speaker_allocation (struct edid *edid,u8 **sadb); +int drm_cea_sad_get_sample_rate (struct cea_sad *sad); +int drm_cea_sad_get_uncompressed_word_length (struct cea_sad *sad);int drm_av_sync_delay (struct drm_connector *connector,const struct drm_display_mode *mode);
Signature · 1 line
2.32.0
RFC PATCH 4/5 video/hdmi: Add audio_infoframe packing for DP
In reply to Markus Schneider-PargmannSimilar to HDMI, DP uses audio infoframes as well which are structured very similar to the HDMI ones.
This patch adds a helper function to pack the HDMI audio infoframe for DP, called hdmi_audio_infoframe_pack_for_dp(). hdmi_audio_infoframe_pack_only() is split into two parts. One of them packs the payload only and can be used for HDMI and DP.
--- drivers/video/hdmi.c | 87 +++++++++++++++++++++++++++++++++++--------- include/linux/hdmi.h | 4 ++ 2 files changed, 73 insertions(+), 18 deletions(-)
drivers/video/hdmi.c +69 -18
@@ -387,6 +387,28 @@ int hdmi_audio_infoframe_check(struct hdmi_audio_infoframe *frame) }EXPORT_SYMBOL (hdmi_audio_infoframe_check); +static void +hdmi_audio_infoframe_pack_payload (const struct hdmi_audio_infoframe *frame, +u8 *buffer) +{ +u8 channels; + +if (frame->channels >=2 ) + channels = frame->channels -1 ; +else + channels =0 ; + + buffer[0 ] = ((frame->coding_type &0xf ) <<4 ) | (channels &0x7 ); + buffer[1 ] = ((frame->sample_frequency &0x7 ) <<2 ) | + (frame->sample_size &0x3 ); + buffer[2 ] = frame->coding_type_ext &0x1f ; + buffer[3 ] = frame->channel_allocation; + buffer[4 ] = (frame->level_shift_value &0xf ) <<3 ; + +if (frame->downmix_inhibit) + buffer[4 ] |=BIT (7 ); +} +/** * hdmi_audio_infoframe_pack_only() - write HDMI audio infoframe to binary buffer * @frame: HDMI audio infoframe
@@ -404,7 +426,6 @@ EXPORT_SYMBOL(hdmi_audio_infoframe_check);ssize_t hdmi_audio_infoframe_pack_only (const struct hdmi_audio_infoframe *frame,void *buffer,size_t size) { -unsigned char channels;u8 *ptr = buffer;size_t length;int ret;
@@ -420,28 +441,13 @@ ssize_t hdmi_audio_infoframe_pack_only(const struct hdmi_audio_infoframe *frame,memset (buffer,0 , size); -if (frame->channels >=2 ) - channels = frame->channels -1 ; -else - channels =0 ; - ptr[0 ] = frame->type; ptr[1 ] = frame->version; ptr[2 ] = frame->length; ptr[3 ] =0 ;/* checksum */ -/* start infoframe payload */ - ptr +=HDMI_INFOFRAME_HEADER_SIZE ; - - ptr[0 ] = ((frame->coding_type &0xf ) <<4 ) | (channels &0x7 ); - ptr[1 ] = ((frame->sample_frequency &0x7 ) <<2 ) | - (frame->sample_size &0x3 ); - ptr[2 ] = frame->coding_type_ext &0x1f ; - ptr[3 ] = frame->channel_allocation; - ptr[4 ] = (frame->level_shift_value &0xf ) <<3 ; - -if (frame->downmix_inhibit) - ptr[4 ] |=BIT (7 ); +hdmi_audio_infoframe_pack_payload (frame, + ptr +HDMI_INFOFRAME_HEADER_SIZE );hdmi_infoframe_set_checksum (buffer, length);
@@ -479,6 +485,51 @@ ssize_t hdmi_audio_infoframe_pack(struct hdmi_audio_infoframe *frame, }EXPORT_SYMBOL (hdmi_audio_infoframe_pack); +/** +* hdmi_audio_infoframe_pack_for_dp - Pack a HDMI Audio infoframe for +* displayport +* +* @frame HDMI Audio infoframe +* @header Header buffer to be used +* @header_size Size of header buffer +* @data Data buffer to be used +* @data_size Size of data buffer +* @dp_version Display Port version to be encoded in the header +* +* Packs a HDMI Audio Infoframe to be sent over Display Port. This function +* fills both header and data buffer with the required data. +* +* Return: Number of total written bytes or a negative errno on failure. +*/ +ssize_t hdmi_audio_infoframe_pack_for_dp (struct hdmi_audio_infoframe *frame, +void *header,size_t header_size, +void *data,size_t data_size, +u8 dp_version) +{ +int ret; +u8 *hdr_ptr = header; + + ret =hdmi_audio_infoframe_check (frame); +if (ret) +return ret; + +if (header_size <4 || data_size < frame->length) +return -ENOSPC ; + +memset (header,0 , header_size); +memset (data,0 , data_size); + +// Secondary-data packet header + hdr_ptr[1 ] = frame->type; + hdr_ptr[2 ] =0x1B ;// As documented by DP spec for Secondary-data Packets + hdr_ptr[3 ] = (dp_version &0x3f ) <<2 ; + +hdmi_audio_infoframe_pack_payload (frame, data); + +return frame->length +4 ; +} +EXPORT_SYMBOL (hdmi_audio_infoframe_pack_for_dp); +/** * hdmi_vendor_infoframe_init() - initialize an HDMI vendor infoframe * @frame: HDMI vendor infoframe
include/linux/hdmi.h +4 -0
@@ -334,6 +334,10 @@ struct hdmi_audio_infoframe {int hdmi_audio_infoframe_init (struct hdmi_audio_infoframe *frame);ssize_t hdmi_audio_infoframe_pack (struct hdmi_audio_infoframe *frame,void *buffer,size_t size); +ssize_t hdmi_audio_infoframe_pack_for_dp (struct hdmi_audio_infoframe *frame, +void *header,size_t header_size, +void *data,size_t data_size, +u8 dp_version);ssize_t hdmi_audio_infoframe_pack_only (const struct hdmi_audio_infoframe *frame,void *buffer,size_t size);int hdmi_audio_infoframe_check (struct hdmi_audio_infoframe *frame);
Signature · 1 line
2.32.0
RFC PATCH 5/5 drm/mediatek: Add mt8195 DisplayPort driver
In reply to Markus Schneider-PargmannThis patch adds a DisplayPort driver for the Mediatek mt8195 SoC.
It supports both functional units on the mt8195, the embedded DisplayPort as well as the external DisplayPort units. It offers hot-plug-detection, audio up to 8 channels, and DisplayPort 1.4 with up to 4 lanes.
This driver is based on an initial version by
Jason-JH.Lin <[email protected]>.
--- drivers/gpu/drm/mediatek/Kconfig | 7 + drivers/gpu/drm/mediatek/Makefile | 2 + drivers/gpu/drm/mediatek/mtk_dp.c | 3025 ++++++++++++++++++++++++ drivers/gpu/drm/mediatek/mtk_dp_reg.h | 3095 +++++++++++++++++++++++++ 4 files changed, 6129 insertions(+) create mode 100644 drivers/gpu/drm/mediatek/mtk_dp.c create mode 100644 drivers/gpu/drm/mediatek/mtk_dp_reg.h
drivers/gpu/drm/mediatek/Kconfig +7 -0
@@ -28,3 +28,10 @@ config DRM_MEDIATEK_HDMI select PHY_MTK_HDMI help DRM/KMS HDMI driver for Mediatek SoCs + +config MTK_DPTX_SUPPORT + tristate "DRM DPTX Support for Mediatek SoCs" + depends on DRM_MEDIATEK + select GENERIC_PHY + help + DRM/KMS Display Port driver for Mediatek SoCs.
drivers/gpu/drm/mediatek/Makefile +2 -0
@@ -20,3 +20,5 @@ mediatek-drm-hdmi-objs := mtk_cec.o \ mtk_hdmi_ddc.o obj-$(CONFIG_DRM_MEDIATEK_HDMI) += mediatek-drm-hdmi.o + +obj-$(CONFIG_MTK_DPTX_SUPPORT) += mtk_dp.o
drivers/gpu/drm/mediatek/mtk_dp.c new file +3025 -0
2,985 lines not on this page · raw message
drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +3095 -0
3,095 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 7 lines
2.32.0 _______________________________________________ Linux-mediatek mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-mediatek
Part of the diff is not shown here. View the raw message.
Hi Markus,
A few general things in the following. This is what I look for first in a bridge driver - and I had no time today to review the driver in full. Please address these, then cc: me on next revision where I hopefully have more time.
Sam
Quoted 13 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +13
-0+static int mtk_dp_bridge_attach (struct drm_bridge *bridge, +enum drm_bridge_attach_flags flags) +{ +struct mtk_dp *mtk_dp =mtk_dp_from_bridge (bridge); +int ret; + +mtk_dp_poweron (mtk_dp); + +if (mtk_dp->next_bridge) { + ret =drm_bridge_attach (bridge->encoder, mtk_dp->next_bridge, + &mtk_dp->bridge, flags); +if (ret) { + drm_warn(mtk_dp->drm_dev,
drivers/gpu/drm/mediatek/mtk_dp.c line 2635
Quoted 10 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +10
-0+ "Failed to attach external bridge: %d\n", ret); +return ret; + } + } + +if (flags &DRM_BRIDGE_ATTACH_NO_CONNECTOR ) { +drm_err (mtk_dp->drm_dev, +"Fix bridge driver to make connector optional!" ); +return 0 ; + }
This driver is only used by mediatek, and I thought all of mediatek is converted so the display driver creates the connector.
It would be better to migrate mediatek over to always let the display driver create the connector and drop the connector support in this driver.
drivers/gpu/drm/mediatek/mtk_dp.c line 2747
Quoted 11 lines
+ struct
drm_bridge_funcsmtk_dp_bridge_funcs= {drivers/gpu/drm/mediatek/mtk_dp.c new file +10
-0+ .attach = mtk_dp_bridge_attach, + .mode_fixup = mtk_dp_bridge_mode_fixup, + .disable = mtk_dp_bridge_disable, + .post_disable = mtk_dp_bridge_post_disable, + .mode_set = mtk_dp_bridge_mode_set, + .pre_enable = mtk_dp_bridge_pre_enable, + .enable = mtk_dp_bridge_enable, + .get_edid = mtk_get_edid, + .detect = mtk_dp_bdg_detect, +};
For new drivers please avoid the recently deprecated functions.
- Use the atomic versions of pre_enable, enable, disable and post_disable.
- Merge mode_set with atomic_enable - as there is no need for the mode_Set operation.
- Use atomic_check in favour of mode_fixup, albeit the rules for atomic_check is at best vauge at the moment.
Hi Sam,
Quoted 6 lines · Sam Ravnborg
Hi Markus,
A few general things in the following. This is what I look for first in a bridge driver - and I had no time today to review the driver in full. Please address these, then cc: me on next revision where I hopefully have more time.
Thanks for taking the time and giving me the tips, will fix it and send a new version.
Best,
Markus
Quoted 59 lines
Sam
Quoted 13 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +13
-0+static int mtk_dp_bridge_attach (struct drm_bridge *bridge, +enum drm_bridge_attach_flags flags) +{ +struct mtk_dp *mtk_dp =mtk_dp_from_bridge (bridge); +int ret; + +mtk_dp_poweron (mtk_dp); + +if (mtk_dp->next_bridge) { + ret =drm_bridge_attach (bridge->encoder, mtk_dp->next_bridge, + &mtk_dp->bridge, flags); +if (ret) { + drm_warn(mtk_dp->drm_dev,drivers/gpu/drm/mediatek/mtk_dp.c line 2635
Quoted 10 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +10
-0+ "Failed to attach external bridge: %d\n", ret); +return ret; + } + } + +if (flags &DRM_BRIDGE_ATTACH_NO_CONNECTOR ) { +drm_err (mtk_dp->drm_dev, +"Fix bridge driver to make connector optional!" ); +return 0 ; + }This driver is only used by mediatek, and I thought all of mediatek is converted so the display driver creates the connector.
It would be better to migrate mediatek over to always let the display driver create the connector and drop the connector support in this driver.
drivers/gpu/drm/mediatek/mtk_dp.c line 2747
Quoted 11 lines
+ struct
drm_bridge_funcsmtk_dp_bridge_funcs= {drivers/gpu/drm/mediatek/mtk_dp.c new file +10
-0+ .attach = mtk_dp_bridge_attach, + .mode_fixup = mtk_dp_bridge_mode_fixup, + .disable = mtk_dp_bridge_disable, + .post_disable = mtk_dp_bridge_post_disable, + .mode_set = mtk_dp_bridge_mode_set, + .pre_enable = mtk_dp_bridge_pre_enable, + .enable = mtk_dp_bridge_enable, + .get_edid = mtk_get_edid, + .detect = mtk_dp_bdg_detect, +};For new drivers please avoid the recently deprecated functions.
- Use the atomic versions of
pre_enable, enable, disable andpost_disable.- Merge
mode_setwithatomic_enable- as there is no need for themode_Setoperation.- Use
atomic_checkin favour ofmode_fixup, albeit the rules foratomic_checkis at best vauge at the moment.
Hi, Markus:
Quoted 12 lines · Markus Schneider-Pargmann
This patch adds a DisplayPort driver for the Mediatek mt8195 SoC.
It supports both functional units on the mt8195, the embedded DisplayPort as well as the external DisplayPort units. It offers hot-plug-detection, audio up to 8 channels, and DisplayPort 1.4 with up to 4 lanes.
This driver is based on an initial version by
Jason-JH.Lin <[email protected]>.Signed-off-by Markus Schneider-Pargmann <[email protected]>---
[snip]
drivers/gpu/drm/mediatek/mtk_dp.c line 3005
Quoted 4 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +4
-0+ +static const struct of_device_id mtk_dp_of_match[] = { + { + .compatible ="mediatek,mt8195-dp_tx" ,
Where is the binding document of "mediatek,mt8195-dp_tx"?
drivers/gpu/drm/mediatek/mtk_dp.c line 3009
Quoted 4 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +4
-0+ .data = &mt8195_dp_driver_data, + }, + { + .compatible = "mediatek,mt8195-edp_tx",
Where is the binding document of "mediatek,mt8195-edp_tx"?
Quoted 50 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +16
-0+ .data = &mt8195_edp_driver_data, + }, + {}, +}; +MODULE_DEVICE_TABLE (of, mtk_dp_of_match); + +struct platform_driver mtk_dp_driver = { + .probe = mtk_dp_probe, + .remove = mtk_dp_remove, + .driver = { + .name ="mediatek-drm-dp" , + .of_match_table = mtk_dp_of_match, + .pm = &mtk_dp_pm_ops, + }, +}; +drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +28
-0@@ -0,0 +1,3095 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (c) 2019 MediaTek Inc. +* Copyright (c) 2021 BayLibre +*/ +#ifndef _MTK_DP_REG_H_ +#define _MTK_DP_REG_H_ + +#define MTK_DP_SIP_CONTROL_AARCH32 0x82000523 +# define MTK_DP_SIP_ATF_VIDEO_UNMUTE 0x20 +# define MTK_DP_SIP_ATF_EDP_VIDEO_UNMUTE 0x21 +# define MTK_DP_SIP_ATF_REG_WRITE 0x22 +# define MTK_DP_SIP_ATF_REG_READ 0x23 +# define MTK_DP_SIP_ATF_CMD_COUNT 0x24 + +#define TOP_OFFSET 0x2000 +#define ENC0_OFFSET 0x3000 +#define ENC1_OFFSET 0x3200 +#define TRANS_OFFSET 0x3400 +#define AUX_OFFSET 0x3600 +#define SEC_OFFSET 0x4000 + +#define MTK_DP_HPD_DISCONNECT BIT(1) +#define MTK_DP_HPD_CONNECT BIT(2) +#define MTK_DP_HPD_INTERRUPT BIT(3) + +#define MTK_DP_ENC0_P0_3000 (ENC0_OFFSET + 0x000) +# define LANE_NUM_DP_ENC0_P0_MASK 0x3
drivers/gpu/drm/mediatek/mtk_dp_reg.h line 38
Quoted 10 lines
drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +10
-0+# define LANE_NUM_DP_ENC0_P0_SHIFT 0 +# define VIDEO_MUTE_SW_DP_ENC0_P0_MASK 0x4 +# define VIDEO_MUTE_SW_DP_ENC0_P0_SHIFT 2 +# define VIDEO_MUTE_SEL_DP_ENC0_P0_MASK 0x8 +# define VIDEO_MUTE_SEL_DP_ENC0_P0_SHIFT 3 +# define ENHANCED_FRAME_EN_DP_ENC0_P0_MASK 0x10 +# define ENHANCED_FRAME_EN_DP_ENC0_P0_SHIFT 4 +# define HDCP_FRAME_EN_DP_ENC0_P0_MASK 0x20 +# define HDCP_FRAME_EN_DP_ENC0_P0_SHIFT 5 +# define IDP_EN_DP_ENC0_P0_MASK 0x40
Remove useless definition.
Regards,
CK.
Quoted 9 lines
drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +8
-0+# define IDP_EN_DP_ENC0_P0_SHIFT 6 +# define BS_SYMBOL_CNT_RESET_DP_ENC0_P0_MASK 0x80 +# define BS_SYMBOL_CNT_RESET_DP_ENC0_P0_SHIFT 7 +# define MIXER_DUMMY_DATA_DP_ENC0_P0_MASK 0xff00 +# define MIXER_DUMMY_DATA_DP_ENC0_P0_SHIFT 8 + + +#endif /*_MTK_DP_REG_H_*/
Hi,
Quoted 25 lines · CK Hu
Hi, Markus:
Quoted 12 lines · Markus Schneider-Pargmann
This patch adds a DisplayPort driver for the Mediatek mt8195 SoC.
It supports both functional units on the mt8195, the embedded DisplayPort as well as the external DisplayPort units. It offers hot-plug-detection, audio up to 8 channels, and DisplayPort 1.4 with up to 4 lanes.
This driver is based on an initial version by
Jason-JH.Lin <[email protected]>.Signed-off-by Markus Schneider-Pargmann <[email protected]>---
[snip]
drivers/gpu/drm/mediatek/mtk_dp.c line 3005
Quoted 4 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +4
-0+ +static const struct of_device_id mtk_dp_of_match[] = { + { + .compatible ="mediatek,mt8195-dp_tx" ,Where is the binding document of "mediatek,mt8195-dp_tx"?
Quoted 6 lines
drivers/gpu/drm/mediatek/mtk_dp.c line 3009
Quoted 4 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +4
-0+ .data = &mt8195_dp_driver_data, + }, + { + .compatible = "mediatek,mt8195-edp_tx",Where is the binding document of "mediatek,mt8195-edp_tx"?
I didn't include the bindings in this RFC, but will include them in the next version.
Quoted 55 lines
Quoted 55 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +16
-0+ .data = &mt8195_edp_driver_data, + }, + {}, +}; +MODULE_DEVICE_TABLE (of, mtk_dp_of_match); + +struct platform_driver mtk_dp_driver = { + .probe = mtk_dp_probe, + .remove = mtk_dp_remove, + .driver = { + .name ="mediatek-drm-dp" , + .of_match_table = mtk_dp_of_match, + .pm = &mtk_dp_pm_ops, + }, +}; +drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +32
-0@@ -0,0 +1,3095 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (c) 2019 MediaTek Inc. +* Copyright (c) 2021 BayLibre +*/ +#ifndef _MTK_DP_REG_H_ +#define _MTK_DP_REG_H_ + +#define MTK_DP_SIP_CONTROL_AARCH32 0x82000523 +# define MTK_DP_SIP_ATF_VIDEO_UNMUTE 0x20 +# define MTK_DP_SIP_ATF_EDP_VIDEO_UNMUTE 0x21 +# define MTK_DP_SIP_ATF_REG_WRITE 0x22 +# define MTK_DP_SIP_ATF_REG_READ 0x23 +# define MTK_DP_SIP_ATF_CMD_COUNT 0x24 + +#define TOP_OFFSET 0x2000 +#define ENC0_OFFSET 0x3000 +#define ENC1_OFFSET 0x3200 +#define TRANS_OFFSET 0x3400 +#define AUX_OFFSET 0x3600 +#define SEC_OFFSET 0x4000 + +#define MTK_DP_HPD_DISCONNECT BIT(1) +#define MTK_DP_HPD_CONNECT BIT(2) +#define MTK_DP_HPD_INTERRUPT BIT(3) + +#define MTK_DP_ENC0_P0_3000 (ENC0_OFFSET + 0x000) +# define LANE_NUM_DP_ENC0_P0_MASK 0x3 +# define LANE_NUM_DP_ENC0_P0_SHIFT 0 +# define VIDEO_MUTE_SW_DP_ENC0_P0_MASK 0x4 +# define VIDEO_MUTE_SW_DP_ENC0_P0_SHIFT 2 +# define VIDEO_MUTE_SEL_DP_ENC0_P0_MASK 0x8
Quoted 8 lines
drivers/gpu/drm/mediatek/mtk_dp_reg.h line 38
Quoted 6 lines
drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +6
-0+# define VIDEO_MUTE_SEL_DP_ENC0_P0_SHIFT 3 +# define ENHANCED_FRAME_EN_DP_ENC0_P0_MASK 0x10 +# define ENHANCED_FRAME_EN_DP_ENC0_P0_SHIFT 4 +# define HDCP_FRAME_EN_DP_ENC0_P0_MASK 0x20 +# define HDCP_FRAME_EN_DP_ENC0_P0_SHIFT 5 +# define IDP_EN_DP_ENC0_P0_MASK 0x40Remove useless definition.
Ok, will do. Thanks for the feedback.
Best,
Markus
Quoted 14 lines
Regards,
CK.Quoted 9 lines
drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +8
-0+# define IDP_EN_DP_ENC0_P0_SHIFT 6 +# define BS_SYMBOL_CNT_RESET_DP_ENC0_P0_MASK 0x80 +# define BS_SYMBOL_CNT_RESET_DP_ENC0_P0_SHIFT 7 +# define MIXER_DUMMY_DATA_DP_ENC0_P0_MASK 0xff00 +# define MIXER_DUMMY_DATA_DP_ENC0_P0_SHIFT 8 + + +#endif /*_MTK_DP_REG_H_*/
kernel test robot
build bot[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch]
Hi Markus,
[FYI, it's a private test report for your RFC patch.]
[auto build test ERROR on robh/for-next]
[also build test ERROR on pza/reset/next drm-intel/for-linux-next drm-tip/drm-tip drm-exynos/exynos-drm-next tegra-drm/drm/tegra/for-next linus/master v5.14-rc6 next-20210816] [cannot apply to drm/drm-next]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Markus-Schneider-Pargmann/drm-mediatek-Add-mt8195-DisplayPort-driver/20210817-034807 base: https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git for-next config: arm64-allyesconfig (attached as .config) compiler: aarch64-linux-gcc (GCC) 11.2.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/6b92a3087c42316f0b4bb41cf29928a73271a1b5
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Markus-Schneider-Pargmann/drm-mediatek-Add-mt8195-DisplayPort-driver/20210817-034807 git checkout 6b92a3087c42316f0b4bb41cf29928a73271a1b5
# save the attached .config to linux build tree
mkdir build_dir
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.2.0 make.cross O=build_dir ARCH=arm64 SHELL=/bin/bash
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
>> drivers/gpu/drm/mediatek/mtk_dp.c:39:10: fatal error: drm/mediatek_drm.h: No such file or directory
39 | #include <drm/mediatek_drm.h>
| ^~~~~~~~~~~~~~~~~~~~compilation terminated.
vim +39 drivers/gpu/drm/mediatek/mtk_dp.c
28
29 #include <drm/drm_atomic_helper.h>
30 #include <drm/drm_bridge.h>
31 #include <drm/drm_crtc.h>
32 #include <drm/drm_crtc_helper.h>
33 #include <drm/drm_dp_helper.h>
34 #include <drm/drm_edid.h>
35 #include <drm/drm_of.h>
36 #include <drm/drm_panel.h>
37 #include <drm/drm_print.h>
38 #include <drm/drm_probe_helper.h>
> 39 #include <drm/mediatek_drm.h>
40 #include <sound/hdmi-codec.h>
41 #include <video/videomode.h>
42 ---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
Hi, Markus:
Quoted 25 lines · Markus Schneider-Pargmann
This patch adds a DisplayPort driver for the Mediatek mt8195 SoC.
It supports both functional units on the mt8195, the embedded DisplayPort as well as the external DisplayPort units. It offers hot-plug-detection, audio up to 8 channels, and DisplayPort 1.4 with up to 4 lanes.
This driver is based on an initial version by
Jason-JH.Lin <[email protected]>.Signed-off-by Markus Schneider-Pargmann <[email protected]>--- drivers/gpu/drm/mediatek/Kconfig | 7 + drivers/gpu/drm/mediatek/Makefile | 2 + drivers/gpu/drm/mediatek/mtk_dp.c | 3025 ++++++++++++++++++++++++ drivers/gpu/drm/mediatek/mtk_dp_reg.h | 3095 +++++++++++++++++++++++++ 4 files changed, 6129 insertions(+) create mode 100644 drivers/gpu/drm/mediatek/mtk_dp.c create mode 100644 drivers/gpu/drm/mediatek/mtk_dp_reg.hdrivers/gpu/drm/mediatek/Kconfig +0
-0
drivers/gpu/drm/mediatek/Kconfig config DRM_MEDIATEK_HDMI · line 35
Quoted 8 lines
drivers/gpu/drm/mediatek/Kconfig +5
-0@@ -28,3 +28,10 @@ config DRM_MEDIATEK_HDMI select PHY_MTK_HDMI help DRM/KMS HDMI driver for Mediatek SoCs + +config MTK_DPTX_SUPPORT + tristate "DRM DPTX Support for Mediatek SoCs" + depends on DRM_MEDIATEK + select GENERIC_PHY
Why select GENERIC_PHY?
If this is a phy driver, place this driver in drivers/phy/mediatek/
Regards,
CK
Quoted 9 lines
drivers/gpu/drm/mediatek/Kconfig +2
-0+ help + DRM/KMS Display Port driver for Mediatek SoCs.drivers/gpu/drm/mediatek/Makefile +0
-0@@ -20,3 +20,5 @@ mediatek-drm-hdmi-objs := mtk_cec.o \ mtk_hdmi_ddc.o