drm/mediatek: Add mt8195 DisplayPort driver
Subsystems (8)
cover drm/mediatek: Add mt8195 DisplayPort driver
this series is built around the DisplayPort driver. The dpi/dpintf driver and the added helper functions are required for the DisplayPort driver to work.
This v9 is not quite ready yet, as project constraints forces me to publish v9 this week, I'm sorry if it's not standard practice.
Moreover, it is still un-tested on a recent kernel.
The integration kernel we are using is still based on 5.10... but we are actively working on bringing up a mt8195 integration branch on 5.17. The patches have been rebased on top of next-20220301 and have been tested to build sucessfully (no functional testing).
Changes from v8:
- The DP-Phy now has its own dt-bindings and now shares a regmap using the syscon facility with the DP driver.
- hot plug detection has been removed from the Embedded Display Port. patch and moved to the patch adding External Display Port support.
- started working on better error handling for the mtk_dp driver.
- rebased on linux-next.
- removal of tvd pll clocks re-introduced by mistake.
- various coding style fixes.
Things that are in my todolist for v10:
- fixing the train_handler in the mtk_dp driver, as I haven't been able to reproduce locally (hopefully migrating to running the tests on a more recent kernel will help)
- explaining the various sleep/delays introduced in the drivers
- explaining some of the differences between mt8195 and "legacy"
- retrieve CK/DE support from panel driver instead of hardcoding it into the dpi driver.
- better error handling/reporting in mtk_dp
- look into re-implementing mtk_dp_aux_transfer() using drm_dp_dpcd_read and drm_dp_dpcd_write as suggested by Rex.
Older revisions:
RFC - https://lore.kernel.org/linux-mediatek/[email protected]/
v1 - https://lore.kernel.org/linux-mediatek/[email protected]/ v2 - https://lore.kernel.org/linux-mediatek/[email protected]/ v3 - https://lore.kernel.org/linux-mediatek/[email protected]/ v4 - https://lore.kernel.org/linux-mediatek/[email protected]/ v5 - https://lore.kernel.org/all/[email protected]/ v6 - https://lore.kernel.org/linux-mediatek/[email protected]/ v7 - https://lore.kernel.org/linux-mediatek/[email protected]/ v8 - https://lore.kernel.org/linux-mediatek/[email protected]/
Functional dependencies are:
- Add Mediatek Soc DRM (vdosys0) support for mt8195
https://lore.kernel.org/all/[email protected]/
- Add MediaTek SoC DRM (vdosys1) support for mt8195
https://lore.kernel.org/all/[email protected]/
Guillaume Ranquet (15):
dt-bindings: mediatek,dp_phy: Add Display Port PHY binding drm/edid: Convert cea_sad helper struct to kernelDoc drm/edid: Add cea_sad helpers for freq/length drm/mediatek: dpi: move dpi limits to SoC config drm/mediatek: dpi: implement a CK/DE pol toggle in SoC config drm/mediatek: dpi: implement a swap_input toggle in SoC config drm/mediatek: dpi: move dimension mask to SoC config drm/mediatek: dpi: move hvsize_mask to SoC config drm/mediatek: dpi: move swap_shift to SoC config drm/mediatek: dpi: move the yuv422_en_bit to SoC config drm/mediatek: dpi: move the csc_enable bit to SoC config drm/mediatek: dpi: Add dpintf support
drm/meditek: dpi: Add matrix_sel helper drm/mediatek: Add mt8195 External DisplayPort support drm/mediatek: DP audio support for mt8195
Jitao Shi (2):
drm/mediatek: add hpd debounce
drm/mediatek: change the aux retries times when receiving AUX_DEFER
Markus Schneider-Pargmann (5):
dt-bindings: mediatek,dpi: Add DP_INTF compatible
dt-bindings: mediatek,dp: Add Display Port binding video/hdmi: Add audio_infoframe packing for DP
phy: phy-mtk-dp: Add driver for DP phy drm/mediatek: Add mt8195 Embedded DisplayPort driver
.../display/mediatek/mediatek,dp.yaml | 97 + .../display/mediatek/mediatek,dpi.yaml | 11 +- .../bindings/phy/mediatek,dp-phy.yaml | 43 + MAINTAINERS | 1 + drivers/gpu/drm/drm_edid.c | 74 + drivers/gpu/drm/mediatek/Kconfig | 8 + drivers/gpu/drm/mediatek/Makefile | 2 + drivers/gpu/drm/mediatek/mtk_dp.c | 3204 +++++++++++++++++ drivers/gpu/drm/mediatek/mtk_dp_reg.h | 568 +++ drivers/gpu/drm/mediatek/mtk_dpi.c | 222 +- drivers/gpu/drm/mediatek/mtk_dpi_regs.h | 38 + drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 8 + drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 1 + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 6 +- drivers/gpu/drm/mediatek/mtk_drm_drv.h | 1 + drivers/phy/mediatek/Kconfig | 8 + drivers/phy/mediatek/Makefile | 1 + drivers/phy/mediatek/phy-mtk-dp.c | 202 ++ drivers/video/hdmi.c | 82 +- include/drm/dp/drm_dp_helper.h | 2 + include/drm/drm_edid.h | 25 +- include/linux/hdmi.h | 7 +- include/linux/soc/mediatek/mtk-mmsys.h | 3 +- 23 files changed, 4541 insertions(+), 73 deletions(-) create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,dp.yaml create mode 100644 Documentation/devicetree/bindings/phy/mediatek,dp-phy.yaml create mode 100644 drivers/gpu/drm/mediatek/mtk_dp.c create mode 100644 drivers/gpu/drm/mediatek/mtk_dp_reg.h create mode 100644 drivers/phy/mediatek/phy-mtk-dp.c
Signature · 1 line
2.34.1
PATCH v9 1/22 dt-bindings: mediatek,dpi: Add DP_INTF compatible
From: Markus Schneider-Pargmann <[email protected]>
DP_INTF is similar to DPI but does not have the exact same feature set or register layouts.
DP_INTF is the sink of the display pipeline that is connected to the DisplayPort controller and encoder unit. It takes the same clocks as DPI.
--- .../bindings/display/mediatek/mediatek,dpi.yaml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
Documentation/devicetree/bindings/display/mediatek/mediatek,dpi.yaml +6 -5
@@ -4,16 +4,16 @@ $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 maintainers: - CK Hu <[email protected]> - Jitao shi <[email protected]> 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. + The Mediatek DPI and DP_INTF function blocks are 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. properties: compatible:
@@ -23,6 +23,7 @@ properties: - mediatek,mt8173-dpi - mediatek,mt8183-dpi - mediatek,mt8192-dpi + - mediatek,mt8195-dpintf reg: maxItems: 1
@@ -54,7 +55,7 @@ properties: $ref: /schemas/graph.yaml#/properties/port description: Output port node. This port should be connected to the input port of an - attached HDMI or LVDS encoder chip. + attached HDMI, LVDS or DisplayPort encoder chip. required: - compatible
Signature · 1 line
2.34.1
Re: [PATCH v9 01/22] dt-bindings: mediatek,dpi: Add DP_INTF compatible
Quoted 5 lines · Guillaume Ranquet
From: Markus Schneider-Pargmann <[email protected]>
DP_INTFis similar to DPI but does not have the exact same feature set or register layouts.
Quoted 7 lines
DP_INTFis the sink of the display pipeline that is connected to the DisplayPort controller and encoder unit. It takes the same clocks as DPI.Signed-off-by Markus Schneider-Pargmann <[email protected]>Signed-off-by Guillaume Ranquet <[email protected]>Reviewed-by Rob Herring <[email protected]>
Quoted 46 lines
--- .../bindings/display/mediatek/mediatek,dpi.yaml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)Documentation/devicetree/bindings/display/mediatek/mediatek,dpi.yaml +6
-5@@ -4,16 +4,16 @@ $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 maintainers: - CK Hu <[email protected]> - Jitao shi <[email protected]> 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. + The Mediatek DPI and DP_INTF function blocks are 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. properties: compatible:@@ -23,6 +23,7 @@ properties: - mediatek,mt8173-dpi - mediatek,mt8183-dpi - mediatek,mt8192-dpi + - mediatek,mt8195-dpintf reg: maxItems: 1@@ -54,7 +55,7 @@ properties: $ref: /schemas/graph.yaml#/properties/port description: Output port node. This port should be connected to the input port of an - attached HDMI or LVDS encoder chip. + attached HDMI, LVDS or DisplayPort encoder chip. required: - compatible
Re: [PATCH v9 01/22] dt-bindings: mediatek,dpi: Add DP_INTF compatible
In reply to Guillaume RanquetHi Guillaume,
Quoted 22 lines
DP_INTFis similar to DPI but does not have the exact same feature set or register layouts.
DP_INTFis the sink of the display pipeline that is connected to the DisplayPort controller and encoder unit. It takes the same clocks as DPI.Signed-off-by Markus Schneider-Pargmann <[email protected]>Signed-off-by Guillaume Ranquet <[email protected]>Reviewed-by Rob Herring <[email protected]>---
.../bindings/display/mediatek/mediatek,dpi.yaml| 11 ++++++-----1 file changed, 6 insertions(+), 5 deletions(-)Documentation/devicetree/bindings/display/mediatek/mediatek,dpi.yaml +0
-0@@ -4,16 +4,16 @@$id: http://devicetree.org/schemas/display/mediatek/mediatek,dpi.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#
Documentation/devicetree/bindings/display/mediatek/mediatek,dpi.yaml line 7
Quoted 2 lines
Documentation/devicetree/bindings/display/mediatek/mediatek,dpi.yaml +1
-1-title: mediatek DPI Controller Device Tree Bindings +title: mediatek DPI/DP_INTF Controller
^^^^^^^^
Would you mind changing this 'mediatek' to 'MediaTek'?
Quoted 8 lines
maintainers:
- CK Hu <[email protected]>
- Jitao shi <[email protected]>description: |
- The Mediatek DPI function block is a sink of the display subsystem and
s/Mediatek/MediaTek/
Could you replace all 'Mediatek' with 'MediaTek' of this series, please? We have set up a chcker inside our organization to capture this case, hopefully we will see less 'Mediatek' in the future.
Documentation/devicetree/bindings/display/mediatek/mediatek,dpi.yaml line 14
Quoted 3 lines
Documentation/devicetree/bindings/display/mediatek/mediatek,dpi.yaml +1
-2- provides 8-bit RGB/YUV444 or 8/10/10-bit YUV422 pixel data on a parallel - output bus. + The Mediatek DPI and DP_INTF function blocks are a sink of the display
s/Mediatek/MediaTek/
thanks,
Miles
Quoted 26 lines
Documentation/devicetree/bindings/display/mediatek/mediatek,dpi.yaml +2
-0+ subsystem and provides 8-bit RGB/YUV444 or 8/10/10-bit YUV422 pixel data on a + parallel output bus.properties:
compatible:Documentation/devicetree/bindings/display/mediatek/mediatek,dpi.yaml +2
-1@@ -23,6 +23,7 @@ properties: - mediatek,mt8173-dpi - mediatek,mt8183-dpi - mediatek,mt8192-dpi + - mediatek,mt8195-dpintf reg: maxItems: 1@@ -54,7 +55,7 @@ properties: $ref: /schemas/graph.yaml#/properties/port description: Output port node. This port should be connected to the input port of an - attached HDMI or LVDS encoder chip. + attached HDMI, LVDS or DisplayPort encoder chip.required:
- compatibleSignature · 1 line
2.34.1
Re: [PATCH v9 01/22] dt-bindings: mediatek,dpi: Add DP_INTF compatible
In reply to Guillaume RanquetHi,
Quoted 42 lines · Guillaume Ranquet
From: Markus Schneider-Pargmann <[email protected]>
DP_INTFis similar to DPI but does not have the exact same feature set or register layouts.
DP_INTFis the sink of the display pipeline that is connected to the DisplayPort controller and encoder unit. It takes the same clocks as DPI.Signed-off-by Markus Schneider-Pargmann <[email protected]>Signed-off-by Guillaume Ranquet <[email protected]>Reviewed-by Rob Herring <[email protected]>--- .../bindings/display/mediatek/mediatek,dpi.yaml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)Documentation/devicetree/bindings/display/mediatek/mediatek,dpi.yaml +4
-4@@ -4,16 +4,16 @@ $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 maintainers: - CK Hu <[email protected]> - Jitao shi <[email protected]> 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. + The Mediatek DPI and DP_INTF function blocks are 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. properties: compatible:
Documentation/devicetree/bindings/display/mediatek/mediatek,dpi.yaml properties: · line 26
Quoted 4 lines
Documentation/devicetree/bindings/display/mediatek/mediatek,dpi.yaml +1
-0@@ -23,6 +23,7 @@ properties: - mediatek,mt8173-dpi - mediatek,mt8183-dpi - mediatek,mt8192-dpi + - mediatek,mt8195-dpintf
It seems a bit weird to have all instances of DP_INTF with a separator but the compatible doesn't have one?
Is there a reason to not use dp-intf?
Maxime
Re: [PATCH v9 01/22] dt-bindings: mediatek,dpi: Add DP_INTF compatible
Quoted 53 lines · Maxime Ripard
Hi,
Quoted 42 lines · Guillaume Ranquet
From: Markus Schneider-Pargmann <[email protected]>
DP_INTFis similar to DPI but does not have the exact same feature set or register layouts.
DP_INTFis the sink of the display pipeline that is connected to the DisplayPort controller and encoder unit. It takes the same clocks as DPI.Signed-off-by Markus Schneider-Pargmann <[email protected]>Signed-off-by Guillaume Ranquet <[email protected]>Reviewed-by Rob Herring <[email protected]>--- .../bindings/display/mediatek/mediatek,dpi.yaml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)Documentation/devicetree/bindings/display/mediatek/mediatek,dpi.yaml +4
-4@@ -4,16 +4,16 @@ $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 maintainers: - CK Hu <[email protected]> - Jitao shi <[email protected]> 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. + The Mediatek DPI and DP_INTF function blocks are 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. properties: compatible:Documentation/devicetree/bindings/display/mediatek/mediatek,dpi.yaml properties: · line 26
Quoted 4 lines
Documentation/devicetree/bindings/display/mediatek/mediatek,dpi.yaml +1
-0@@ -23,6 +23,7 @@ properties: - mediatek,mt8173-dpi - mediatek,mt8183-dpi - mediatek,mt8192-dpi + - mediatek,mt8195-dpintfIt seems a bit weird to have all instances of
DP_INTFwith a separator but the compatible doesn't have one?
Quoted 1 line
Is there a reason to not use dp-intf?
None that I know of, It was taken as is from the vendor tree. I'll use dp-intf in v10 for the sake of consistency.
Thx,
Guillaume.
Quoted 2 lines
Maxime
PATCH v9 2/22 dt-bindings: mediatek,dp: Add Display Port binding
In reply to Guillaume RanquetFrom: Markus Schneider-Pargmann <[email protected]>
This controller is present on several mediatek hardware. Currently mt8195 and mt8395 have this controller without a functional difference, so only one compatible field is added.
The controller can have two forms, as a normal display port and as an embedded display port.
--- .../display/mediatek/mediatek,dp.yaml | 100 ++++++++++++++++++ 1 file changed, 100 insertions(+) create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,dp.yaml
Documentation/devicetree/bindings/display/mediatek/mediatek,dp.yaml new file +100 -0
@@ -0,0 +1,100 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/display/mediatek/mediatek,dp.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Mediatek Display Port Controller + +maintainers: + - CK Hu <[email protected]> + - Jitao shi <[email protected]> + +description: | + Device tree bindings for the Mediatek (embedded) Display Port controller + present on some Mediatek SoCs. + +properties: + compatible: + items: + - const: mediatek,mt8195-dp-tx + - const: syscon + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + clocks: + items: + - description: faxi clock + + clock-names: + items: + - const: faxi + + phys: + maxItems: 1 + + phy-names: + items: + - const: dp + + power-domains: + maxItems: 1 + + ports: + $ref: /schemas/graph.yaml#/properties/ports + properties: + port@0: + $ref: /schemas/graph.yaml#/properties/port + description: Input endpoint of the controller, usually dp_intf + + port@1: + $ref: /schemas/graph.yaml#/properties/port + description: Output endpoint of the controller + + required: + - port@0 + +required: + - compatible + - reg + - interrupts + - ports + +additionalProperties: false + +examples: + - | + #include <dt-bindings/interrupt-controller/arm-gic.h> + #include <dt-bindings/power/mt8195-power.h> + edp_tx: edisplay-port-tx@1c500000 { + compatible = "mediatek,mt8195-dp-tx","syscon"; + reg = <0 0x1c500000 0 0x8000>; + interrupts = <GIC_SPI 676 IRQ_TYPE_LEVEL_HIGH 0>; + power-domains = <&spm MT8195_POWER_DOMAIN_EPD_TX>; + pinctrl-names = "default"; + pinctrl-0 = <&edp_pin>; + phys = <&dp_phy>; + phy-names = "dp"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + edp_in: endpoint { + remote-endpoint = <&dp_intf0_out>; + }; + }; + port@1 { + reg = <1>; + edp_out: endpoint { + remote-endpoint = <&panel_in>; + }; + }; + }; + };
Signature · 1 line
2.34.1
Rob Herring
maintainerRe: [PATCH v9 02/22] dt-bindings: mediatek,dp: Add Display Port binding
Quoted 9 lines · Guillaume Ranquet
From: Markus Schneider-Pargmann <[email protected]>
This controller is present on several mediatek hardware. Currently mt8195 and mt8395 have this controller without a functional difference, so only one compatible field is added.
The controller can have two forms, as a normal display port and as an embedded display port.
Quoted 7 lines
Signed-off-by Markus Schneider-Pargmann <[email protected]>Signed-off-by Guillaume Ranquet <[email protected]>--- .../display/mediatek/mediatek,dp.yaml | 100 ++++++++++++++++++ 1 file changed, 100 insertions(+) create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,dp.yaml
My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check' on your patch (DT_CHECKER_FLAGS is new in v5.13):
yamllint warnings/errors:
dtschema/dtc warnings/errors:Documentation/devicetree/bindings/display/mediatek/mediatek,dp.example.dts:24:18: fatal error: dt-bindings/power/mt8195-power.h: No such file or directory
24 | #include <dt-bindings/power/mt8195-power.h>
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
compilation terminated.
make[1]: *** [scripts/Makefile.lib:378: Documentation/devicetree/bindings/display/mediatek/mediatek,dp.example.dt.yaml] Error 1 make[1]: *** Waiting for unfinished jobs....
make: *** [Makefile:1398: dt_binding_check] Error 2
doc reference errors (make refcheckdocs):
See https://patchwork.ozlabs.org/patch/1609955
This check can fail if there are any dependencies. The base for a patch series is generally the most recent rc1.
If you already ran 'make dt_binding_check' and didn't see the above error(s), then make sure 'yamllint' is installed and dt-schema is up to date:
pip3 install dtschema --upgrade
Please check and re-submit.
Rob Herring
maintainerRe: [PATCH v9 02/22] dt-bindings: mediatek,dp: Add Display Port binding
In reply to Guillaume RanquetQuoted 33 lines · Guillaume Ranquet
From: Markus Schneider-Pargmann <[email protected]>
This controller is present on several mediatek hardware. Currently mt8195 and mt8395 have this controller without a functional difference, so only one compatible field is added.
The controller can have two forms, as a normal display port and as an embedded display port.
Signed-off-by Markus Schneider-Pargmann <[email protected]>Signed-off-by Guillaume Ranquet <[email protected]>--- .../display/mediatek/mediatek,dp.yaml | 100 ++++++++++++++++++ 1 file changed, 100 insertions(+) create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,dp.yamlDocumentation/devicetree/bindings/display/mediatek/mediatek,dp.yaml new file +11
-0@@ -0,0 +1,100 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/display/mediatek/mediatek,dp.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Mediatek Display Port Controller + +maintainers: + - CK Hu <[email protected]> + - Jitao shi <[email protected]>
Documentation/devicetree/bindings/display/mediatek/mediatek,dp.yaml line 21
Quoted 10 lines
Documentation/devicetree/bindings/display/mediatek/mediatek,dp.yaml new file +10
-0+ +description: | + Device tree bindings for the Mediatek (embedded) Display Port controller + present on some Mediatek SoCs. + +properties: + compatible: + items: + - const: mediatek,mt8195-dp-tx + - const: syscon
Add something to the above description to convince me this is a syscon.
If you need a regmap, the driver can create one. 'syscon' is really only needed if there's not a specific driver.
Rob
Re: [PATCH v9 02/22] dt-bindings: mediatek,dp: Add Display Port binding
In reply to Guillaume RanquetQuoted 20 lines
This controller is present on several mediatek hardware. Currently mt8195 and mt8395 have this controller without a functional difference, so only one compatible field is added.
The controller can have two forms, as a normal display port and as an embedded display port.
Signed-off-by Markus Schneider-Pargmann <[email protected]>Signed-off-by Guillaume Ranquet <[email protected]>---
.../display/mediatek/mediatek,dp.yaml| 100 ++++++++++++++++++1 file changed, 100 insertions(+)create mode 100644
Documentation/devicetree/bindings/display/mediatek/mediatek,dp.yamlDocumentation/devicetree/bindings/display/mediatek/mediatek,dp.yaml new file +0
-0
Documentation/devicetree/bindings/display/mediatek/mediatek,dp.yaml line 7
Quoted 7 lines
Documentation/devicetree/bindings/display/mediatek/mediatek,dp.yaml new file +7
-0@@ -0,0 +1,100 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/display/mediatek/mediatek,dp.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Mediatek Display Port Controller
s/Mediatek/MediaTek/
Documentation/devicetree/bindings/display/mediatek/mediatek,dp.yaml line 14
Quoted 7 lines
Documentation/devicetree/bindings/display/mediatek/mediatek,dp.yaml new file +7
-0+ +maintainers: + - CK Hu <[email protected]> + - Jitao shi <[email protected]> + +description: | + Device tree bindings for the Mediatek (embedded) Display Port controller
s/Mediatek/MediaTek/
Documentation/devicetree/bindings/display/mediatek/mediatek,dp.yaml line 15
Quoted 1 line
Documentation/devicetree/bindings/display/mediatek/mediatek,dp.yaml new file +1
-0+ present on some Mediatek SoCs.
s/Mediatek/MediaTek/
Quoted 89 lines
Documentation/devicetree/bindings/display/mediatek/mediatek,dp.yaml new file +85
-0+ +properties: + compatible: + items: + - const: mediatek,mt8195-dp-tx + - const: syscon + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + clocks: + items: + - description: faxi clock + + clock-names: + items: + - const: faxi + + phys: + maxItems: 1 + + phy-names: + items: + - const: dp + + power-domains: + maxItems: 1 + + ports: + $ref: /schemas/graph.yaml#/properties/ports + properties: + port@0: + $ref: /schemas/graph.yaml#/properties/port + description: Input endpoint of the controller, usually dp_intf + + port@1: + $ref: /schemas/graph.yaml#/properties/port + description: Output endpoint of the controller + + required: + - port@0 + +required: + - compatible + - reg + - interrupts + - ports + +additionalProperties: false + +examples: + - | + #include <dt-bindings/interrupt-controller/arm-gic.h> + #include <dt-bindings/power/mt8195-power.h> + edp_tx: edisplay-port-tx@1c500000 { + compatible = "mediatek,mt8195-dp-tx","syscon"; + reg = <0 0x1c500000 0 0x8000>; + interrupts = <GIC_SPI 676 IRQ_TYPE_LEVEL_HIGH 0>; + power-domains = <&spm MT8195_POWER_DOMAIN_EPD_TX>; + pinctrl-names = "default"; + pinctrl-0 = <&edp_pin>; + phys = <&dp_phy>; + phy-names = "dp"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + edp_in: endpoint { + remote-endpoint = <&dp_intf0_out>; + }; + }; + port@1 { + reg = <1>; + edp_out: endpoint { + remote-endpoint = <&panel_in>; + }; + }; + }; + };Signature · 1 line
2.34.1
PATCH v9 3/22 dt-bindings: mediatek,dp_phy: Add Display Port PHY binding
In reply to Guillaume RanquetThis phy controller is embedded in the Display Port Controller on mt8195 SoCs.
--- .../bindings/phy/mediatek,dp-phy.yaml | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 Documentation/devicetree/bindings/phy/mediatek,dp-phy.yaml
Documentation/devicetree/bindings/phy/mediatek,dp-phy.yaml new file +43 -0
@@ -0,0 +1,43 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +# Copyright (c) 2022 MediaTek +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/phy/mediatek,dp-phy.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: MediaTek Display Port PHY + +maintainers: + - CK Hu <[email protected]> + - Jitao shi <[email protected]> + +description: | + Device tree bindings for the Mediatek (embedded) Display Port PHY + present on some Mediatek SoCs. + +properties: + compatible: + enum: + - mediatek,mt8195-dp-phy + + mediatek,dp-syscon: + $ref: /schemas/types.yaml#/definitions/phandle + description: Phandle to the Display Port node. + + "#phy-cells": + const: 0 + +required: + - compatible + - mediatek,dp-syscon + - "#phy-cells" + +additionalProperties: false + +examples: + - | + dp_phy: dp-phy { + compatible = "mediatek,mt8195-dp-phy"; + mediatek,dp-syscon = <&dp_tx>; + #phy-cells = <0>; + };
Signature · 1 line
2.34.1
Rob Herring
maintainerRe: [PATCH v9 03/22] dt-bindings: mediatek,dp_phy: Add Display Port PHY binding
Quoted 1 line · Guillaume Ranquet
This phy controller is embedded in the Display Port Controller on mt8195 SoCs.
Sorry, but I think you need to go back to what you had in v8. While yes, the phy and controller IP often do change independently, this h/w looks pretty interwined.
You could make the controller a phy provider to itself if you wanted.
Quoted 60 lines
Signed-off-by Guillaume Ranquet <[email protected]>--- .../bindings/phy/mediatek,dp-phy.yaml | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 Documentation/devicetree/bindings/phy/mediatek,dp-phy.yamlDocumentation/devicetree/bindings/phy/mediatek,dp-phy.yaml new file +43
-0@@ -0,0 +1,43 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +# Copyright (c) 2022 MediaTek +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/phy/mediatek,dp-phy.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: MediaTek Display Port PHY + +maintainers: + - CK Hu <[email protected]> + - Jitao shi <[email protected]> + +description: | + Device tree bindings for the Mediatek (embedded) Display Port PHY + present on some Mediatek SoCs. + +properties: + compatible: + enum: + - mediatek,mt8195-dp-phy + + mediatek,dp-syscon: + $ref: /schemas/types.yaml#/definitions/phandle + description: Phandle to the Display Port node. + + "#phy-cells": + const: 0 + +required: + - compatible + - mediatek,dp-syscon + - "#phy-cells" + +additionalProperties: false + +examples: + - | + dp_phy: dp-phy { + compatible = "mediatek,mt8195-dp-phy"; + mediatek,dp-syscon = <&dp_tx>; + #phy-cells = <0>; + };Signature · 1 line
2.34.1
Re: [PATCH v9 03/22] dt-bindings: mediatek,dp_phy: Add Display Port PHY binding
Quoted 6 lines · Rob Herring
Quoted 1 line · Guillaume Ranquet
This phy controller is embedded in the Display Port Controller on mt8195 SoCs.
Sorry, but I think you need to go back to what you had in v8. While yes, the phy and controller IP often do change independently, this h/w looks pretty interwined.
Understood, I'll revert back to v8.
Quoted 2 lines
You could make the controller a phy provider to itself if you wanted.
Not sure I follow, could you point me to an example?
Thx,
Guillaume.
Quoted 61 lines
Quoted 61 lines
Signed-off-by Guillaume Ranquet <[email protected]>--- .../bindings/phy/mediatek,dp-phy.yaml | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 Documentation/devicetree/bindings/phy/mediatek,dp-phy.yamlDocumentation/devicetree/bindings/phy/mediatek,dp-phy.yaml new file +43
-1@@ -0,0 +1,43 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +# Copyright (c) 2022 MediaTek +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/phy/mediatek,dp-phy.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: MediaTek Display Port PHY + +maintainers: + - CK Hu <[email protected]> + - Jitao shi <[email protected]> + +description: | + Device tree bindings for the Mediatek (embedded) Display Port PHY + present on some Mediatek SoCs. + +properties: + compatible: + enum: + - mediatek,mt8195-dp-phy + + mediatek,dp-syscon: + $ref: /schemas/types.yaml#/definitions/phandle + description: Phandle to the Display Port node. + + "#phy-cells": + const: 0 + +required: + - compatible + - mediatek,dp-syscon + - "#phy-cells" + +additionalProperties: false + +examples: + - | + dp_phy: dp-phy { + compatible = "mediatek,mt8195-dp-phy"; + mediatek,dp-syscon = <&dp_tx>; + #phy-cells = <0>; + }; --2.34.1
Re: [PATCH v9 03/22] dt-bindings: mediatek,dp_phy: Add Display Port PHY binding
In reply to Guillaume RanquetQuoted 19 lines
This phy controller is embedded in the Display Port Controller on mt8195 SoCs.
Signed-off-by Guillaume Ranquet <[email protected]>---
.../bindings/phy/mediatek,dp-phy.yaml| 43 +++++++++++++++++++1 file changed, 43 insertions(+)create mode 100644
Documentation/devicetree/bindings/phy/mediatek,dp-phy.yamlDocumentation/devicetree/bindings/phy/mediatek,dp-phy.yaml new file +5
-0@@ -0,0 +1,43 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +# Copyright (c) 2022 MediaTek +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/phy/mediatek,dp-phy.yaml#
Documentation/devicetree/bindings/phy/mediatek,dp-phy.yaml line 15
Quoted 10 lines
Documentation/devicetree/bindings/phy/mediatek,dp-phy.yaml new file +10
-0+$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: MediaTek Display Port PHY + +maintainers: + - CK Hu <[email protected]> + - Jitao shi <[email protected]> + +description: | + Device tree bindings for the Mediatek (embedded) Display Port PHY
s/Mediatek/MediaTek/
Documentation/devicetree/bindings/phy/mediatek,dp-phy.yaml line 16
Quoted 1 line
Documentation/devicetree/bindings/phy/mediatek,dp-phy.yaml new file +1
-0+ present on some Mediatek SoCs.
s/Mediatek/MediaTek/
Quoted 31 lines
Documentation/devicetree/bindings/phy/mediatek,dp-phy.yaml new file +27
-0+ +properties: + compatible: + enum: + - mediatek,mt8195-dp-phy + + mediatek,dp-syscon: + $ref: /schemas/types.yaml#/definitions/phandle + description: Phandle to the Display Port node. + + "#phy-cells": + const: 0 + +required: + - compatible + - mediatek,dp-syscon + - "#phy-cells" + +additionalProperties: false + +examples: + - | + dp_phy: dp-phy { + compatible = "mediatek,mt8195-dp-phy"; + mediatek,dp-syscon = <&dp_tx>; + #phy-cells = <0>; + };Signature · 1 line
2.34.1
PATCH v9 4/22 drm/edid: Convert cea_sad helper struct to kernelDoc
In reply to Guillaume Ranquet--- include/drm/drm_edid.h | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
include/drm/drm_edid.h +8 -3
@@ -359,12 +359,17 @@ struct edid {#define EDID_PRODUCT_ID (e) ((e)->prod_code[0] | ((e)->prod_code[1] << 8)) -/* Short Audio Descriptor */ +/* struct cea_sad - Short Audio Descriptor. +@format: See HDMI_AUDIO_CODING_TYPE_*. +@channels: max number of channels - 1. +@freq: See CEA_SAD_FREQ_*. +@byte2: meaning depends on format. +*/ struct cea_sad {u8 format; -u8 channels;/* max number of channels - 1 */ +u8 channels;u8 freq; -u8 byte2;/* meaning depends on format */ +u8 byte2; };struct drm_encoder ;
Signature · 1 line
2.34.1
AngeloGioacchino Del Regno
maintainerRe: [PATCH v9 04/22] drm/edid: Convert cea_sad helper struct to kernelDoc
Il 28/03/22 00:39, Guillaume Ranquet ha scritto:
Quoted 10 lines
Signed-off-by Guillaume Ranquet <[email protected]>--- include/drm/drm_edid.h | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)include/drm/drm_edid.h +0
-0
include/drm/drm_edid.h struct edid { · line 362
Quoted 4 lines
include/drm/drm_edid.h +0
-1@@ -359,12 +359,17 @@ struct edid {#define EDID_PRODUCT_ID (e) ((e)->prod_code[0] | ((e)->prod_code[1] << 8)) -/* Short Audio Descriptor */
Hello Guillaume,
include/drm/drm_edid.h struct edid { · line 367
Quoted 6 lines
include/drm/drm_edid.h +6
-0+/* struct cea_sad - Short Audio Descriptor. +@format: See HDMI_AUDIO_CODING_TYPE_*. +@channels: max number of channels - 1. +@freq: See CEA_SAD_FREQ_*. +@byte2: meaning depends on format. +*/
I appreciate the effort, but this is not valid kerneldoc.
Please refer to https://docs.kernel.org/doc-guide/kernel-doc.html
Regards,
Angelo
Re: [PATCH v9 04/22] drm/edid: Convert cea_sad helper struct to kernelDoc
Quoted 27 lines · AngeloGioacchino Del Regno
Il 28/03/22 00:39, Guillaume Ranquet ha scritto:
Quoted 10 lines
Signed-off-by Guillaume Ranquet <[email protected]>--- include/drm/drm_edid.h | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)include/drm/drm_edid.h +0
-0include/drm/drm_edid.h struct edid { · line 362
Quoted 4 lines
include/drm/drm_edid.h +0
-1@@ -359,12 +359,17 @@ struct edid {#define EDID_PRODUCT_ID (e) ((e)->prod_code[0] | ((e)->prod_code[1] << 8)) -/* Short Audio Descriptor */ Hello Guillaume,
include/drm/drm_edid.h struct edid { · line 367
Quoted 6 lines
include/drm/drm_edid.h +6
-0+/* struct cea_sad - Short Audio Descriptor. +@format: See HDMI_AUDIO_CODING_TYPE_*. +@channels: max number of channels - 1. +@freq: See CEA_SAD_FREQ_*. +@byte2: meaning depends on format. +*/ I appreciate the effort, but this is not valid kerneldoc.
Quoted 4 lines
Please refer to https://docs.kernel.org/doc-guide/kernel-doc.html
Regards,
Angelo
Hello Angelo,
Thx for your review.
I'm sorry I posted this v9 in a bit of a rush...
but I promise we will get there... eventually :D
Thx,
Guillaume.
PATCH v9 5/22 drm/edid: Add cea_sad helpers for freq/length
In reply to Guillaume RanquetThis 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 | 74 ++++++++++++++++++++++++++++++++++++++ include/drm/drm_edid.h | 14 ++++++++ 2 files changed, 88 insertions(+)
drivers/gpu/drm/drm_edid.c +74 -0
@@ -4758,6 +4758,80 @@ 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 (const struct cea_sad *sad) +{ +switch (sad->freq) { +case DRM_CEA_SAD_FREQ_32KHZ : +return 32000 ; +case DRM_CEA_SAD_FREQ_44KHZ : +return 44100 ; +case DRM_CEA_SAD_FREQ_48KHZ : +return 48000 ; +case DRM_CEA_SAD_FREQ_88KHZ : +return 88200 ; +case DRM_CEA_SAD_FREQ_96KHZ : +return 96000 ; +case DRM_CEA_SAD_FREQ_176KHZ : +return 176400 ; +case DRM_CEA_SAD_FREQ_192KHZ : +return 192000 ; +default : +return -EINVAL ; + } +} +EXPORT_SYMBOL (drm_cea_sad_get_sample_rate); + +static bool drm_cea_sad_is_uncompressed (const struct cea_sad *sad) +{ +switch (sad->format) { +case HDMI_AUDIO_CODING_TYPE_STREAM : +case HDMI_AUDIO_CODING_TYPE_PCM : +return true; +default : +return false; + } +} + +/** +* 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 (const struct cea_sad *sad) +{ +if (!drm_cea_sad_is_uncompressed (sad)) { +DRM_WARN ("Unable to get the uncompressed word length for a compressed format: %u\n" , + sad->format); +return -EINVAL ; + } + +switch (sad->byte2) { +case DRM_CEA_SAD_UNCOMPRESSED_WORD_16BIT : +return 16 ; +case DRM_CEA_SAD_UNCOMPRESSED_WORD_20BIT : +return 20 ; +case DRM_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 +14 -0
@@ -372,6 +372,18 @@ struct cea_sad {u8 byte2; }; +#define DRM_CEA_SAD_FREQ_32KHZ BIT(0) +#define DRM_CEA_SAD_FREQ_44KHZ BIT(1) +#define DRM_CEA_SAD_FREQ_48KHZ BIT(2) +#define DRM_CEA_SAD_FREQ_88KHZ BIT(3) +#define DRM_CEA_SAD_FREQ_96KHZ BIT(4) +#define DRM_CEA_SAD_FREQ_176KHZ BIT(5) +#define DRM_CEA_SAD_FREQ_192KHZ BIT(6) + +#define DRM_CEA_SAD_UNCOMPRESSED_WORD_16BIT BIT(0) +#define DRM_CEA_SAD_UNCOMPRESSED_WORD_20BIT BIT(1) +#define DRM_CEA_SAD_UNCOMPRESSED_WORD_24BIT BIT(2) +struct drm_encoder ;struct drm_connector ;struct drm_connector_state ;
@@ -379,6 +391,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 (const struct cea_sad *sad); +int drm_cea_sad_get_uncompressed_word_length (const struct cea_sad *sad);int drm_av_sync_delay (struct drm_connector *connector,const struct drm_display_mode *mode);
Signature · 1 line
2.34.1
PATCH v9 6/22 video/hdmi: Add audio_infoframe packing for DP
In reply to Guillaume RanquetFrom: Markus Schneider-Pargmann <[email protected]>
Similar 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 | 82 ++++++++++++++++++++++++++-------- include/drm/dp/drm_dp_helper.h | 2 + include/linux/hdmi.h | 7 ++- 3 files changed, 71 insertions(+), 20 deletions(-)
drivers/video/hdmi.c +63 -19
@@ -21,6 +21,7 @@* DEALINGS IN THE SOFTWARE. */ +#include <drm/dp/drm_dp_helper.h> #include <linux/bitops.h> #include <linux/bug.h> #include <linux/errno.h>
@@ -381,12 +382,34 @@ static int hdmi_audio_infoframe_check_only(const struct hdmi_audio_infoframe *fr* * Returns 0 on success or a negative error code on failure. */ -int hdmi_audio_infoframe_check (struct hdmi_audio_infoframe *frame) +int hdmi_audio_infoframe_check (const struct hdmi_audio_infoframe *frame) {return hdmi_audio_infoframe_check_only (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 +427,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 +442,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 +486,43 @@ 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 +* @sdp: secondary data packet for display port. This is filled with the +* appropriate: data +* @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 the secondary data packet to be used for Display Port. +* +* Return: Number of total written bytes or a negative errno on failure. +*/ +ssize_t +hdmi_audio_infoframe_pack_for_dp (const struct hdmi_audio_infoframe *frame, +struct dp_sdp *sdp,u8 dp_version) +{ +int ret; + + ret =hdmi_audio_infoframe_check (frame); +if (ret) +return ret; + +memset (sdp->db,0 ,sizeof (sdp->db)); + +/* Secondary-data packet header */ + sdp->sdp_header.HB0 =0 ; + sdp->sdp_header.HB1 = frame->type; + sdp->sdp_header.HB2 =DP_SDP_AUDIO_INFOFRAME_HB2 ; + sdp->sdp_header.HB3 = (dp_version &0x3f ) <<2 ; + +hdmi_audio_infoframe_pack_payload (frame, sdp->db); + +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/drm/dp/drm_dp_helper.h +2 -0
@@ -1576,6 +1576,8 @@ int drm_dp_bw_code_to_link_rate(u8 link_bw);#define DP_SDP_VSC_EXT_CEA 0x21/* DP 1.4 */ /* 0x80+ CEA-861 infoframe types */ +#define DP_SDP_AUDIO_INFOFRAME_HB2 0x1b +/** * struct dp_sdp_header - DP secondary data packet header * @HB0: Secondary Data Packet ID
include/linux/hdmi.h +6 -1
@@ -336,7 +336,12 @@ ssize_t hdmi_audio_infoframe_pack(struct hdmi_audio_infoframe *frame, void *buffer, size_t size);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); +int hdmi_audio_infoframe_check (const struct hdmi_audio_infoframe *frame); + +struct dp_sdp ; +ssize_t +hdmi_audio_infoframe_pack_for_dp (const struct hdmi_audio_infoframe *frame, +struct dp_sdp *sdp,u8 dp_version);enum hdmi_3d_structure {HDMI_3D_STRUCTURE_INVALID =-1 ,
Signature · 1 line
2.34.1
AngeloGioacchino Del Regno
maintainerRe: [PATCH v9 06/22] video/hdmi: Add audio_infoframe packing for DP
Il 28/03/22 00:39, Guillaume Ranquet ha scritto:
Quoted 31 lines
From: Markus Schneider-Pargmann <[email protected]>
Similar 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.Signed-off-by Markus Schneider-Pargmann <[email protected]>Signed-off-by Guillaume Ranquet <[email protected]>--- drivers/video/hdmi.c | 82 ++++++++++++++++++++++++++-------- include/drm/dp/drm_dp_helper.h | 2 + include/linux/hdmi.h | 7 ++- 3 files changed, 71 insertions(+), 20 deletions(-)drivers/video/hdmi.c +1
-0@@ -21,6 +21,7 @@* DEALINGS IN THE SOFTWARE. */ +#include <drm/dp/drm_dp_helper.h> #include <linux/bitops.h> #include <linux/bug.h> #include <linux/errno.h>
drivers/video/hdmi.c static int hdmi_audio_infoframe_check_only(const struct hdmi_audio_infoframe *fr · line 385
Quoted 5 lines
drivers/video/hdmi.c +1
-1@@ -381,12 +382,34 @@ static int hdmi_audio_infoframe_check_only(const struct hdmi_audio_infoframe *fr* * Returns 0 on success or a negative error code on failure. */ -int hdmi_audio_infoframe_check (struct hdmi_audio_infoframe *frame) +int hdmi_audio_infoframe_check (const struct hdmi_audio_infoframe *frame)
I agree with this change, as hdmi_audio_infoframe_check_only()'s param is a const, but you really should mention that you're constifying this one in your commit description, or do that in a separate commit.
Either of the two is fine.
Regards,
Angelo
Re: [PATCH v9 06/22] video/hdmi: Add audio_infoframe packing for DP
Quoted 42 lines · AngeloGioacchino Del Regno
Il 28/03/22 00:39, Guillaume Ranquet ha scritto:
Quoted 31 lines
From: Markus Schneider-Pargmann <[email protected]>
Similar 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.Signed-off-by Markus Schneider-Pargmann <[email protected]>Signed-off-by Guillaume Ranquet <[email protected]>--- drivers/video/hdmi.c | 82 ++++++++++++++++++++++++++-------- include/drm/dp/drm_dp_helper.h | 2 + include/linux/hdmi.h | 7 ++- 3 files changed, 71 insertions(+), 20 deletions(-)drivers/video/hdmi.c +1
-0@@ -21,6 +21,7 @@* DEALINGS IN THE SOFTWARE. */ +#include <drm/dp/drm_dp_helper.h> #include <linux/bitops.h> #include <linux/bug.h> #include <linux/errno.h> drivers/video/hdmi.c static int hdmi_audio_infoframe_check_only(const struct hdmi_audio_infoframe *fr · line 385
Quoted 5 lines
drivers/video/hdmi.c +1
-1@@ -381,12 +382,34 @@ static int hdmi_audio_infoframe_check_only(const struct hdmi_audio_infoframe *fr* * Returns 0 on success or a negative error code on failure. */ -int hdmi_audio_infoframe_check (struct hdmi_audio_infoframe *frame) +int hdmi_audio_infoframe_check (const struct hdmi_audio_infoframe *frame)I agree with this change, as hdmi_audio_infoframe_check_only()'s param is a const, but you really should mention that you're constifying this one in your commit description, or do that in a separate commit.
Quoted 4 lines
Either of the two is fine.
Regards,
Angelo
Noted, I'll add it to the commit message.
Thx,
Guillaume.
PATCH v9 7/22 drm/mediatek: dpi: move dpi limits to SoC config
In reply to Guillaume RanquetAdd flexibility by moving the dpi limits to the SoC specific config
--- drivers/gpu/drm/mediatek/mtk_dpi.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-)
drivers/gpu/drm/mediatek/mtk_dpi.c +16 -9
@@ -125,6 +125,7 @@ struct mtk_dpi_conf {bool edge_sel_en;const u32 *output_fmts;u32 num_output_fmts; +const struct mtk_dpi_yc_limit *limit; };static void mtk_dpi_mask (struct mtk_dpi *dpi,u32 offset,u32 val,u32 mask)
@@ -235,9 +236,10 @@ static void mtk_dpi_config_fb_size(struct mtk_dpi *dpi, u32 width, u32 height)mtk_dpi_mask (dpi,DPI_SIZE , height <<VSIZE ,VSIZE_MASK ); } -static void mtk_dpi_config_channel_limit (struct mtk_dpi *dpi, -struct mtk_dpi_yc_limit *limit) +static void mtk_dpi_config_channel_limit (struct mtk_dpi *dpi) { +const struct mtk_dpi_yc_limit *limit = dpi->conf->limit; +mtk_dpi_mask (dpi,DPI_Y_LIMIT , limit->y_bottom <<Y_LIMINT_BOT ,Y_LIMINT_BOT_MASK ); mtk_dpi_mask(dpi, DPI_Y_LIMIT, limit->y_top << Y_LIMINT_TOP,
@@ -449,7 +451,6 @@ static int mtk_dpi_power_on(struct mtk_dpi *dpi)static int mtk_dpi_set_display_mode (struct mtk_dpi *dpi,struct drm_display_mode *mode) { -struct mtk_dpi_yc_limit limit;struct mtk_dpi_polarities dpi_pol;struct mtk_dpi_sync_param hsync;struct mtk_dpi_sync_param vsync_lodd = {0 };
@@ -484,11 +485,6 @@ 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 ; - dpi_pol.ck_pol =MTK_DPI_POLARITY_FALLING ; dpi_pol.de_pol =MTK_DPI_POLARITY_RISING ; dpi_pol.hsync_pol = vm.flags & DISPLAY_FLAGS_HSYNC_HIGH ?
@@ -536,7 +532,7 @@ static int mtk_dpi_set_display_mode(struct mtk_dpi *dpi,else mtk_dpi_config_fb_size (dpi, vm.hactive, vm.vactive); -mtk_dpi_config_channel_limit (dpi, &limit); +mtk_dpi_config_channel_limit (dpi);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);
@@ -790,12 +786,20 @@ static const u32 mt8183_output_fmts[] = { MEDIA_BUS_FMT_RGB888_2X12_BE, }; +static const struct mtk_dpi_yc_limit mtk_dpi_limit = { + .c_bottom =0x0010 , + .c_top =0x0FE0 , + .y_bottom =0x0010 , + .y_top =0x0FE0 , +}; +static const struct mtk_dpi_conf mt8173_conf = { .cal_factor = mt8173_calculate_factor, .reg_h_fre_con =0xe0 , .max_clock_khz =300000 , .output_fmts = mt8173_output_fmts, .num_output_fmts =ARRAY_SIZE (mt8173_output_fmts), + .limit = &mtk_dpi_limit, };static const struct mtk_dpi_conf mt2701_conf = {
@@ -805,6 +809,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), + .limit = &mtk_dpi_limit, };static const struct mtk_dpi_conf mt8183_conf = {
@@ -813,6 +818,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), + .limit = &mtk_dpi_limit, };static const struct mtk_dpi_conf mt8192_conf = {
@@ -821,6 +827,7 @@ 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), + .limit = &mtk_dpi_limit, };static int mtk_dpi_probe (struct platform_device *pdev)
Signature · 1 line
2.34.1
Re: [PATCH v9 07/22] drm/mediatek: dpi: move dpi limits to SoC config
Quoted 107 lines · Guillaume Ranquet
Add flexibility by moving the dpi limits to the SoC specific config
Signed-off-by Guillaume Ranquet <[email protected]>Reviewed-by AngeloGioacchino Del Regno <--- drivers/gpu/drm/mediatek/mtk_dpi.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-)drivers/gpu/drm/mediatek/mtk_dpi.c +1
-0@@ -125,6 +125,7 @@ struct mtk_dpi_conf {bool edge_sel_en;const u32 *output_fmts;u32 num_output_fmts; +const struct mtk_dpi_yc_limit *limit; }; static void mtk_dpi_mask(struct mtk_dpi *dpi, u32 offset, u32 val,u32 mask)
drivers/gpu/drm/mediatek/mtk_dpi.c +3
-2@@ -235,9 +236,10 @@ static void mtk_dpi_config_fb_size(struct mtk_dpi *dpi, u32 width, u32 height) mtk_dpi_mask(dpi, DPI_SIZE, height << VSIZE, VSIZE_MASK); } -static void mtk_dpi_config_channel_limit (struct mtk_dpi *dpi, -struct mtk_dpi_yc_limit *limit) +static void mtk_dpi_config_channel_limit (struct mtk_dpi *dpi) { +const struct mtk_dpi_yc_limit *limit = dpi->conf->limit; + mtk_dpi_mask(dpi, DPI_Y_LIMIT, limit->y_bottom << Y_LIMINT_BOT,drivers/gpu/drm/mediatek/mtk_dpi.c +0
-6Y_LIMINT_BOT_MASK); mtk_dpi_mask(dpi, DPI_Y_LIMIT, limit->y_top << Y_LIMINT_TOP,@@ -449,7 +451,6 @@ static int mtk_dpi_power_on(struct mtk_dpi *dpi)static int mtk_dpi_set_display_mode (struct mtk_dpi *dpi,struct drm_display_mode *mode) { -struct mtk_dpi_yc_limit limit;struct mtk_dpi_polarities dpi_pol;struct mtk_dpi_sync_param hsync;struct mtk_dpi_sync_param vsync_lodd = {0 };@@ -484,11 +485,6 @@ 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 ; - dpi_pol.ck_pol =MTK_DPI_POLARITY_FALLING ; dpi_pol.de_pol =MTK_DPI_POLARITY_RISING ;drivers/gpu/drm/mediatek/mtk_dpi.c +1
-1dpi_pol.hsync_pol = vm.flags & DISPLAY_FLAGS_HSYNC_HIGH ?@@ -536,7 +532,7 @@ static int mtk_dpi_set_display_mode(structmtk_dpi *dpi, else mtk_dpi_config_fb_size(dpi, vm.hactive, vm.vactive); -mtk_dpi_config_channel_limit (dpi, &limit); +mtk_dpi_config_channel_limit (dpi);mtk_dpi_config_bit_num (dpi, dpi->bit_num);mtk_dpi_config_channel_swap (dpi, dpi->channel_swap);drivers/gpu/drm/mediatek/mtk_dpi.c +10
-0mtk_dpi_config_yc_map (dpi, dpi->yc_map);@@ -790,12 +786,20 @@ static const u32 mt8183_output_fmts[] = { MEDIA_BUS_FMT_RGB888_2X12_BE, }; +static const struct mtk_dpi_yc_limit mtk_dpi_limit = { + .c_bottom =0x0010 , + .c_top =0x0FE0 , + .y_bottom =0x0010 , + .y_top =0x0FE0 , +}; +static const struct mtk_dpi_conf mt8173_conf = { .cal_factor = mt8173_calculate_factor, .reg_h_fre_con =0xe0 , .max_clock_khz =300000 , .output_fmts = mt8173_output_fmts, .num_output_fmts =ARRAY_SIZE (mt8173_output_fmts), + .limit = &mtk_dpi_limit, };static const struct mtk_dpi_conf mt2701_conf = {@@ -805,6 +809,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), + .limit = &mtk_dpi_limit, };static const struct mtk_dpi_conf mt8183_conf = {@@ -813,6 +818,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), + .limit = &mtk_dpi_limit, };static const struct mtk_dpi_conf mt8192_conf = {
drivers/gpu/drm/mediatek/mtk_dpi.c static const struct mtk_dpi_conf mt8192_conf = { · line 833
Quoted 7 lines
drivers/gpu/drm/mediatek/mtk_dpi.c +1
-0@@ -821,6 +827,7 @@ 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), + .limit = &mtk_dpi_limit, };static int mtk_dpi_probe (struct platform_device *pdev)
PATCH v9 8/22 drm/mediatek: dpi: implement a CK/DE pol toggle in SoC config
In reply to Guillaume RanquetAdds a bit of flexibility to support SoCs without CK/DE pol support
--- drivers/gpu/drm/mediatek/mtk_dpi.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-)
drivers/gpu/drm/mediatek/mtk_dpi.c +17 -5
@@ -125,6 +125,7 @@ struct mtk_dpi_conf {bool edge_sel_en;const u32 *output_fmts;u32 num_output_fmts; +bool is_ck_de_pol;const struct mtk_dpi_yc_limit *limit; };
@@ -211,13 +212,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_ck_de_pol) { + 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)
@@ -799,6 +807,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_ck_de_pol = true, .limit = &mtk_dpi_limit, };
@@ -809,6 +818,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_ck_de_pol = true, .limit = &mtk_dpi_limit, };
@@ -818,6 +828,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_ck_de_pol = true, .limit = &mtk_dpi_limit, };
@@ -827,6 +838,7 @@ 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_ck_de_pol = true, .limit = &mtk_dpi_limit, };
Signature · 1 line
2.34.1
Re: [PATCH v9 08/22] drm/mediatek: dpi: implement a CK/DE pol toggle in SoC config
Quoted 79 lines · Guillaume Ranquet
Adds a bit of flexibility to support SoCs without CK/DE pol support
Signed-off-by Guillaume Ranquet <[email protected]>Reviewed-by AngeloGioacchino Del Regno <--- drivers/gpu/drm/mediatek/mtk_dpi.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-)drivers/gpu/drm/mediatek/mtk_dpi.c +2
-1@@ -125,6 +125,7 @@ struct mtk_dpi_conf {bool edge_sel_en;const u32 *output_fmts;u32 num_output_fmts; +bool is_ck_de_pol;const struct mtk_dpi_yc_limit *limit; };@@ -211,13 +212,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 )|
drivers/gpu/drm/mediatek/mtk_dpi.c +0
-1- (dpi_pol->de_pol ==MTK_DPI_POLARITY_RISING ?0 :DE_POL )|
drivers/gpu/drm/mediatek/mtk_dpi.c +0
-1- (dpi_pol->hsync_pol == MTK_DPI_POLARITY_RISING ? 0 :
HSYNC_POL) |drivers/gpu/drm/mediatek/mtk_dpi.c +2
-0+ 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);drivers/gpu/drm/mediatek/mtk_dpi.c +12
-2-mtk_dpi_mask (dpi,DPI_OUTPUT_SETTING , pol, -CK_POL |DE_POL |HSYNC_POL |VSYNC_POL ); +if (dpi->conf->is_ck_de_pol) { + 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)@@ -799,6 +807,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_ck_de_pol = true, .limit = &mtk_dpi_limit, };@@ -809,6 +818,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_ck_de_pol = true, .limit = &mtk_dpi_limit, };@@ -818,6 +828,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_ck_de_pol = true, .limit = &mtk_dpi_limit, };
drivers/gpu/drm/mediatek/mtk_dpi.c static const struct mtk_dpi_conf mt8192_conf = { · line 844
Quoted 7 lines
drivers/gpu/drm/mediatek/mtk_dpi.c +1
-0@@ -827,6 +838,7 @@ 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_ck_de_pol = true, .limit = &mtk_dpi_limit, };
PATCH v9 9/22 drm/mediatek: dpi: implement a swap_input toggle in SoC config
In reply to Guillaume RanquetAdds a bit of flexibility to support SoCs without swap_input support
--- drivers/gpu/drm/mediatek/mtk_dpi.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
drivers/gpu/drm/mediatek/mtk_dpi.c +11 -3
@@ -126,6 +126,7 @@ struct mtk_dpi_conf {const u32 *output_fmts;u32 num_output_fmts;bool is_ck_de_pol; +bool swap_input_support;const struct mtk_dpi_yc_limit *limit; };
@@ -378,18 +379,21 @@ static void mtk_dpi_config_color_format(struct mtk_dpi *dpi, (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->swap_input_support) +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->swap_input_support) +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->swap_input_support) +mtk_dpi_config_swap_input (dpi, false);mtk_dpi_config_channel_swap (dpi,MTK_DPI_OUT_CHANNEL_SWAP_RGB ); } }
@@ -808,6 +812,7 @@ static const struct mtk_dpi_conf mt8173_conf = { .output_fmts = mt8173_output_fmts, .num_output_fmts = ARRAY_SIZE(mt8173_output_fmts), .is_ck_de_pol = true, + .swap_input_support = true, .limit = &mtk_dpi_limit, };
@@ -819,6 +824,7 @@ static const struct mtk_dpi_conf mt2701_conf = { .output_fmts = mt8173_output_fmts, .num_output_fmts = ARRAY_SIZE(mt8173_output_fmts), .is_ck_de_pol = true, + .swap_input_support = true, .limit = &mtk_dpi_limit, };
@@ -829,6 +835,7 @@ static const struct mtk_dpi_conf mt8183_conf = { .output_fmts = mt8183_output_fmts, .num_output_fmts = ARRAY_SIZE(mt8183_output_fmts), .is_ck_de_pol = true, + .swap_input_support = true, .limit = &mtk_dpi_limit, };
@@ -839,6 +846,7 @@ static const struct mtk_dpi_conf mt8192_conf = { .output_fmts = mt8173_output_fmts, .num_output_fmts = ARRAY_SIZE(mt8173_output_fmts), .is_ck_de_pol = true, + .swap_input_support = true, .limit = &mtk_dpi_limit, };
Signature · 1 line
2.34.1
Re: [PATCH v9 09/22] drm/mediatek: dpi: implement a swap_input toggle in SoC config
Quoted 76 lines · Guillaume Ranquet
Adds a bit of flexibility to support SoCs without
swap_inputsupportSigned-off-by Guillaume Ranquet <[email protected]>Reviewed-by AngeloGioacchino Del Regno <--- drivers/gpu/drm/mediatek/mtk_dpi.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)drivers/gpu/drm/mediatek/mtk_dpi.c +7
-3@@ -126,6 +126,7 @@ struct mtk_dpi_conf {const u32 *output_fmts;u32 num_output_fmts;bool is_ck_de_pol; +bool swap_input_support;const struct mtk_dpi_yc_limit *limit; };@@ -378,18 +379,21 @@ static void mtk_dpi_config_color_format(structmtk_dpi *dpi, (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->swap_input_support) +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->swap_input_support) +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->swap_input_support) +mtk_dpi_config_swap_input (dpi, false);mtk_dpi_config_channel_swap(dpi,
MTK_DPI_OUT_CHANNEL_SWAP_RGB);drivers/gpu/drm/mediatek/mtk_dpi.c +3
-0} }@@ -808,6 +812,7 @@ static const struct mtk_dpi_conf mt8173_conf = { .output_fmts = mt8173_output_fmts, .num_output_fmts = ARRAY_SIZE(mt8173_output_fmts), .is_ck_de_pol = true, + .swap_input_support = true, .limit = &mtk_dpi_limit, };@@ -819,6 +824,7 @@ static const struct mtk_dpi_conf mt2701_conf = { .output_fmts = mt8173_output_fmts, .num_output_fmts = ARRAY_SIZE(mt8173_output_fmts), .is_ck_de_pol = true, + .swap_input_support = true, .limit = &mtk_dpi_limit, };@@ -829,6 +835,7 @@ static const struct mtk_dpi_conf mt8183_conf = { .output_fmts = mt8183_output_fmts, .num_output_fmts = ARRAY_SIZE(mt8183_output_fmts), .is_ck_de_pol = true, + .swap_input_support = true, .limit = &mtk_dpi_limit, };
drivers/gpu/drm/mediatek/mtk_dpi.c static const struct mtk_dpi_conf mt8192_conf = { · line 852
Quoted 7 lines
drivers/gpu/drm/mediatek/mtk_dpi.c +1
-0@@ -839,6 +846,7 @@ static const struct mtk_dpi_conf mt8192_conf = { .output_fmts = mt8173_output_fmts, .num_output_fmts = ARRAY_SIZE(mt8173_output_fmts), .is_ck_de_pol = true, + .swap_input_support = true, .limit = &mtk_dpi_limit, };
PATCH v9 10/22 drm/mediatek: dpi: move dimension mask to SoC config
In reply to Guillaume RanquetAdd flexibility by moving the dimension mask to the SoC config
--- drivers/gpu/drm/mediatek/mtk_dpi.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-)
drivers/gpu/drm/mediatek/mtk_dpi.c +16 -10
@@ -127,6 +127,8 @@ struct mtk_dpi_conf {u32 num_output_fmts;bool is_ck_de_pol;bool swap_input_support; +/* Mask used for HWIDTH, HPORCH, VSYNC_WIDTH and VSYNC_PORCH (no shift) */ +u32 dimension_mask;const struct mtk_dpi_yc_limit *limit; };
@@ -156,30 +158,30 @@ 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_HWIDTH , sync->sync_width <<HPW , + dpi->conf->dimension_mask <<HPW ); +mtk_dpi_mask (dpi,DPI_TGEN_HPORCH , sync->back_porch <<HBP , + dpi->conf->dimension_mask <<HBP );mtk_dpi_mask (dpi,DPI_TGEN_HPORCH , sync->front_porch <<HFP , -HFP_MASK ); + dpi->conf->dimension_mask <<HFP ); }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, width_addr, + sync->sync_width <<VSYNC_WIDTH_SHIFT , + dpi->conf->dimension_mask <<VSYNC_WIDTH_SHIFT );mtk_dpi_mask (dpi, porch_addr, sync->back_porch <<VSYNC_BACK_PORCH_SHIFT , -VSYNC_BACK_PORCH_MASK ); + dpi->conf->dimension_mask <<VSYNC_BACK_PORCH_SHIFT );mtk_dpi_mask (dpi, porch_addr, sync->front_porch <<VSYNC_FRONT_PORCH_SHIFT , -VSYNC_FRONT_PORCH_MASK ); + dpi->conf->dimension_mask <<VSYNC_FRONT_PORCH_SHIFT ); } static void mtk_dpi_config_vsync_lodd(struct mtk_dpi *dpi,
@@ -813,6 +815,7 @@ static const struct mtk_dpi_conf mt8173_conf = { .num_output_fmts = ARRAY_SIZE(mt8173_output_fmts), .is_ck_de_pol = true, .swap_input_support = true, + .dimension_mask = HPW_MASK, .limit = &mtk_dpi_limit, };
@@ -825,6 +828,7 @@ static const struct mtk_dpi_conf mt2701_conf = { .num_output_fmts = ARRAY_SIZE(mt8173_output_fmts), .is_ck_de_pol = true, .swap_input_support = true, + .dimension_mask = HPW_MASK, .limit = &mtk_dpi_limit, };
@@ -836,6 +840,7 @@ static const struct mtk_dpi_conf mt8183_conf = { .num_output_fmts = ARRAY_SIZE(mt8183_output_fmts), .is_ck_de_pol = true, .swap_input_support = true, + .dimension_mask = HPW_MASK, .limit = &mtk_dpi_limit, };
@@ -847,6 +852,7 @@ static const struct mtk_dpi_conf mt8192_conf = { .num_output_fmts = ARRAY_SIZE(mt8173_output_fmts), .is_ck_de_pol = true, .swap_input_support = true, + .dimension_mask = HPW_MASK, .limit = &mtk_dpi_limit, };
Signature · 1 line
2.34.1
Re: [PATCH v9 10/22] drm/mediatek: dpi: move dimension mask to SoC config
Quoted 93 lines · Guillaume Ranquet
Add flexibility by moving the dimension mask to the SoC config
Signed-off-by Guillaume Ranquet <[email protected]>Reviewed-by AngeloGioacchino Del Regno <--- drivers/gpu/drm/mediatek/mtk_dpi.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-)drivers/gpu/drm/mediatek/mtk_dpi.c +1
-0@@ -127,6 +127,8 @@ struct mtk_dpi_conf {u32 num_output_fmts;bool is_ck_de_pol;bool swap_input_support; +/* Mask used for HWIDTH, HPORCH, VSYNC_WIDTH and VSYNC_PORCH (no shift) */
drivers/gpu/drm/mediatek/mtk_dpi.c +11
-10+u32 dimension_mask;const struct mtk_dpi_yc_limit *limit; };@@ -156,30 +158,30 @@ 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_HWIDTH , sync->sync_width <<HPW , + dpi->conf->dimension_mask <<HPW ); +mtk_dpi_mask (dpi,DPI_TGEN_HPORCH , sync->back_porch <<HBP , + dpi->conf->dimension_mask <<HBP );mtk_dpi_mask (dpi,DPI_TGEN_HPORCH , sync->front_porch <<HFP , -HFP_MASK ); + dpi->conf->dimension_mask <<HFP ); }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, width_addr, + sync->sync_width <<VSYNC_WIDTH_SHIFT , + dpi->conf->dimension_mask <<VSYNC_WIDTH_SHIFT );mtk_dpi_mask (dpi, porch_addr, sync->back_porch <<VSYNC_BACK_PORCH_SHIFT , -VSYNC_BACK_PORCH_MASK ); + dpi->conf->dimension_mask <<VSYNC_BACK_PORCH_SHIFT );mtk_dpi_mask (dpi, porch_addr, sync->front_porch <<VSYNC_FRONT_PORCH_SHIFT , -VSYNC_FRONT_PORCH_MASK ); + dpi->conf->dimension_mask <<VSYNC_FRONT_PORCH_SHIFT );}
static void mtk_dpi_config_vsync_lodd(struct
mtk_dpi*dpi,drivers/gpu/drm/mediatek/mtk_dpi.c +3
-0@@ -813,6 +815,7 @@ static const struct mtk_dpi_conf mt8173_conf = { .num_output_fmts = ARRAY_SIZE(mt8173_output_fmts), .is_ck_de_pol = true, .swap_input_support = true, + .dimension_mask = HPW_MASK, .limit = &mtk_dpi_limit, };@@ -825,6 +828,7 @@ static const struct mtk_dpi_conf mt2701_conf = { .num_output_fmts = ARRAY_SIZE(mt8173_output_fmts), .is_ck_de_pol = true, .swap_input_support = true, + .dimension_mask = HPW_MASK, .limit = &mtk_dpi_limit, };@@ -836,6 +840,7 @@ static const struct mtk_dpi_conf mt8183_conf = { .num_output_fmts = ARRAY_SIZE(mt8183_output_fmts), .is_ck_de_pol = true, .swap_input_support = true, + .dimension_mask = HPW_MASK, .limit = &mtk_dpi_limit, };
drivers/gpu/drm/mediatek/mtk_dpi.c static const struct mtk_dpi_conf mt8192_conf = { · line 858
Quoted 7 lines
drivers/gpu/drm/mediatek/mtk_dpi.c +1
-0@@ -847,6 +852,7 @@ static const struct mtk_dpi_conf mt8192_conf = { .num_output_fmts = ARRAY_SIZE(mt8173_output_fmts), .is_ck_de_pol = true, .swap_input_support = true, + .dimension_mask = HPW_MASK, .limit = &mtk_dpi_limit, };
PATCH v9 11/22 drm/mediatek: dpi: move hvsize_mask to SoC config
In reply to Guillaume RanquetAdd flexibility by moving the hvsize mask to SoC specific config
--- drivers/gpu/drm/mediatek/mtk_dpi.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/gpu/drm/mediatek/mtk_dpi.c +10 -2
@@ -129,6 +129,8 @@ struct mtk_dpi_conf {bool swap_input_support;/* Mask used for HWIDTH, HPORCH, VSYNC_WIDTH and VSYNC_PORCH (no shift) */ u32 dimension_mask; +/* HSIZE and VSIZE mask (no shift) */ +u32 hvsize_mask;const struct mtk_dpi_yc_limit *limit; };
@@ -243,8 +245,10 @@ static void mtk_dpi_config_interface(struct mtk_dpi *dpi, bool inter)static void mtk_dpi_config_fb_size (struct mtk_dpi *dpi,u32 width,u32 height) { -mtk_dpi_mask (dpi,DPI_SIZE , width <<HSIZE ,HSIZE_MASK ); -mtk_dpi_mask (dpi,DPI_SIZE , height <<VSIZE ,VSIZE_MASK ); +mtk_dpi_mask (dpi,DPI_SIZE , width <<HSIZE , + dpi->conf->hvsize_mask <<HSIZE ); +mtk_dpi_mask (dpi,DPI_SIZE , height <<VSIZE , + dpi->conf->hvsize_mask <<VSIZE ); }static void mtk_dpi_config_channel_limit (struct mtk_dpi *dpi)
@@ -816,6 +820,7 @@ static const struct mtk_dpi_conf mt8173_conf = { .is_ck_de_pol = true, .swap_input_support = true, .dimension_mask = HPW_MASK, + .hvsize_mask = HSIZE_MASK, .limit = &mtk_dpi_limit, };
@@ -829,6 +834,7 @@ static const struct mtk_dpi_conf mt2701_conf = { .is_ck_de_pol = true, .swap_input_support = true, .dimension_mask = HPW_MASK, + .hvsize_mask = HSIZE_MASK, .limit = &mtk_dpi_limit, };
@@ -841,6 +847,7 @@ static const struct mtk_dpi_conf mt8183_conf = { .is_ck_de_pol = true, .swap_input_support = true, .dimension_mask = HPW_MASK, + .hvsize_mask = HSIZE_MASK, .limit = &mtk_dpi_limit, };
@@ -853,6 +860,7 @@ static const struct mtk_dpi_conf mt8192_conf = { .is_ck_de_pol = true, .swap_input_support = true, .dimension_mask = HPW_MASK, + .hvsize_mask = HSIZE_MASK, .limit = &mtk_dpi_limit, };
Signature · 1 line
2.34.1
Re: [PATCH v9 11/22] drm/mediatek: dpi: move hvsize_mask to SoC config
Quoted 64 lines · Guillaume Ranquet
Add flexibility by moving the hvsize mask to SoC specific config
Signed-off-by Guillaume Ranquet <[email protected]>Reviewed-by AngeloGioacchino Del Regno <--- drivers/gpu/drm/mediatek/mtk_dpi.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)drivers/gpu/drm/mediatek/mtk_dpi.c +0
-0@@ -129,6 +129,8 @@ struct mtk_dpi_conf {bool swap_input_support;/* Mask used for HWIDTH, HPORCH, VSYNC_WIDTH and VSYNC_PORCH (no shift) */
drivers/gpu/drm/mediatek/mtk_dpi.c +6
-2u32 dimension_mask; +/* HSIZE and VSIZE mask (no shift) */ +u32 hvsize_mask;const struct mtk_dpi_yc_limit *limit; };@@ -243,8 +245,10 @@ static void mtk_dpi_config_interface(struct mtk_dpi *dpi, bool inter)static void mtk_dpi_config_fb_size (struct mtk_dpi *dpi,u32 width,u32 height) { -mtk_dpi_mask (dpi,DPI_SIZE , width <<HSIZE ,HSIZE_MASK ); -mtk_dpi_mask (dpi,DPI_SIZE , height <<VSIZE ,VSIZE_MASK ); +mtk_dpi_mask (dpi,DPI_SIZE , width <<HSIZE , + dpi->conf->hvsize_mask <<HSIZE ); +mtk_dpi_mask (dpi,DPI_SIZE , height <<VSIZE , + dpi->conf->hvsize_mask <<VSIZE ); }static void
mtk_dpi_config_channel_limit(struct mtk_dpi *dpi)drivers/gpu/drm/mediatek/mtk_dpi.c +3
-0@@ -816,6 +820,7 @@ static const struct mtk_dpi_conf mt8173_conf = { .is_ck_de_pol = true, .swap_input_support = true, .dimension_mask = HPW_MASK, + .hvsize_mask = HSIZE_MASK, .limit = &mtk_dpi_limit, };@@ -829,6 +834,7 @@ static const struct mtk_dpi_conf mt2701_conf = { .is_ck_de_pol = true, .swap_input_support = true, .dimension_mask = HPW_MASK, + .hvsize_mask = HSIZE_MASK, .limit = &mtk_dpi_limit, };@@ -841,6 +847,7 @@ static const struct mtk_dpi_conf mt8183_conf = { .is_ck_de_pol = true, .swap_input_support = true, .dimension_mask = HPW_MASK, + .hvsize_mask = HSIZE_MASK, .limit = &mtk_dpi_limit, };
drivers/gpu/drm/mediatek/mtk_dpi.c static const struct mtk_dpi_conf mt8192_conf = { · line 866
Quoted 7 lines
drivers/gpu/drm/mediatek/mtk_dpi.c +1
-0@@ -853,6 +860,7 @@ static const struct mtk_dpi_conf mt8192_conf = { .is_ck_de_pol = true, .swap_input_support = true, .dimension_mask = HPW_MASK, + .hvsize_mask = HSIZE_MASK, .limit = &mtk_dpi_limit, };
PATCH v9 12/22 drm/mediatek: dpi: move swap_shift to SoC config
In reply to Guillaume RanquetAdd flexibility by moving the swap shift value to SoC specific config
--- drivers/gpu/drm/mediatek/mtk_dpi.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/gpu/drm/mediatek/mtk_dpi.c +7 -1
@@ -131,6 +131,7 @@ struct mtk_dpi_conf {u32 dimension_mask;/* HSIZE and VSIZE mask (no shift) */ u32 hvsize_mask; +u32 channel_swap_shift;const struct mtk_dpi_yc_limit *limit; };
@@ -349,7 +350,8 @@ 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 ); +mtk_dpi_mask (dpi,DPI_OUTPUT_SETTING , val << dpi->conf->channel_swap_shift, +CH_SWAP_MASK ); }static void mtk_dpi_config_yuv422_enable (struct mtk_dpi *dpi,bool enable)
@@ -821,6 +823,7 @@ static const struct mtk_dpi_conf mt8173_conf = { .swap_input_support = true, .dimension_mask = HPW_MASK, .hvsize_mask = HSIZE_MASK, + .channel_swap_shift = CH_SWAP, .limit = &mtk_dpi_limit, };
@@ -835,6 +838,7 @@ static const struct mtk_dpi_conf mt2701_conf = { .swap_input_support = true, .dimension_mask = HPW_MASK, .hvsize_mask = HSIZE_MASK, + .channel_swap_shift = CH_SWAP, .limit = &mtk_dpi_limit, };
@@ -848,6 +852,7 @@ static const struct mtk_dpi_conf mt8183_conf = { .swap_input_support = true, .dimension_mask = HPW_MASK, .hvsize_mask = HSIZE_MASK, + .channel_swap_shift = CH_SWAP, .limit = &mtk_dpi_limit, };
@@ -861,6 +866,7 @@ static const struct mtk_dpi_conf mt8192_conf = { .swap_input_support = true, .dimension_mask = HPW_MASK, .hvsize_mask = HSIZE_MASK, + .channel_swap_shift = CH_SWAP, .limit = &mtk_dpi_limit, };
Signature · 1 line
2.34.1
Re: [PATCH v9 12/22] drm/mediatek: dpi: move swap_shift to SoC config
Il 28/03/22 00:39, Guillaume Ranquet ha scritto:
Quoted 3 lines
Add flexibility by moving the swap shift value to SoC specific config
Signed-off-by Guillaume Ranquet <[email protected]>
Re: [PATCH v9 12/22] drm/mediatek: dpi: move swap_shift to SoC config
In reply to Guillaume RanquetQuoted 59 lines · Guillaume Ranquet
Add flexibility by moving the swap shift value to SoC specific config
Signed-off-by Guillaume Ranquet <[email protected]>--- drivers/gpu/drm/mediatek/mtk_dpi.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)drivers/gpu/drm/mediatek/mtk_dpi.c +3
-1@@ -131,6 +131,7 @@ struct mtk_dpi_conf {u32 dimension_mask;/* HSIZE and VSIZE mask (no shift) */ u32 hvsize_mask; +u32 channel_swap_shift;const struct mtk_dpi_yc_limit *limit; };@@ -349,7 +350,8 @@ static void mtk_dpi_config_channel_swap(structmtk_dpi *dpi, break; } -mtk_dpi_mask (dpi,DPI_OUTPUT_SETTING , val <<CH_SWAP , CH_SWAP_MASK); + mtk_dpi_mask(dpi, DPI_OUTPUT_SETTING, val << dpi->conf- >channel_swap_shift, +CH_SWAP_MASK );}
static void mtk_dpi_config_yuv422_enable(struct
mtk_dpi*dpi, bool
enable)drivers/gpu/drm/mediatek/mtk_dpi.c +3
-0@@ -821,6 +823,7 @@ static const struct mtk_dpi_conf mt8173_conf = { .swap_input_support = true, .dimension_mask = HPW_MASK, .hvsize_mask = HSIZE_MASK, + .channel_swap_shift = CH_SWAP, .limit = &mtk_dpi_limit, };@@ -835,6 +838,7 @@ static const struct mtk_dpi_conf mt2701_conf = { .swap_input_support = true, .dimension_mask = HPW_MASK, .hvsize_mask = HSIZE_MASK, + .channel_swap_shift = CH_SWAP, .limit = &mtk_dpi_limit, };@@ -848,6 +852,7 @@ static const struct mtk_dpi_conf mt8183_conf = { .swap_input_support = true, .dimension_mask = HPW_MASK, .hvsize_mask = HSIZE_MASK, + .channel_swap_shift = CH_SWAP, .limit = &mtk_dpi_limit, };
drivers/gpu/drm/mediatek/mtk_dpi.c static const struct mtk_dpi_conf mt8192_conf = { · line 872
Quoted 7 lines
drivers/gpu/drm/mediatek/mtk_dpi.c +1
-0@@ -861,6 +866,7 @@ static const struct mtk_dpi_conf mt8192_conf = { .swap_input_support = true, .dimension_mask = HPW_MASK, .hvsize_mask = HSIZE_MASK, + .channel_swap_shift = CH_SWAP, .limit = &mtk_dpi_limit, };
PATCH v9 13/22 drm/mediatek: dpi: move the yuv422_en_bit to SoC config
In reply to Guillaume RanquetAdd flexibility by moving the yuv422 en bit to SoC specific config
--- drivers/gpu/drm/mediatek/mtk_dpi.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/gpu/drm/mediatek/mtk_dpi.c +7 -1
@@ -132,6 +132,7 @@ struct mtk_dpi_conf {/* HSIZE and VSIZE mask (no shift) */ u32 hvsize_mask;u32 channel_swap_shift; +u32 yuv422_en_bit;const struct mtk_dpi_yc_limit *limit; };
@@ -356,7 +357,8 @@ static void mtk_dpi_config_channel_swap(struct mtk_dpi *dpi,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 ); +mtk_dpi_mask (dpi,DPI_CON , enable ? dpi->conf->yuv422_en_bit :0 , + dpi->conf->yuv422_en_bit); }static void mtk_dpi_config_csc_enable (struct mtk_dpi *dpi,bool enable)
@@ -824,6 +826,7 @@ static const struct mtk_dpi_conf mt8173_conf = { .dimension_mask = HPW_MASK, .hvsize_mask = HSIZE_MASK, .channel_swap_shift = CH_SWAP, + .yuv422_en_bit = YUV422_EN, .limit = &mtk_dpi_limit, };
@@ -839,6 +842,7 @@ static const struct mtk_dpi_conf mt2701_conf = { .dimension_mask = HPW_MASK, .hvsize_mask = HSIZE_MASK, .channel_swap_shift = CH_SWAP, + .yuv422_en_bit = YUV422_EN, .limit = &mtk_dpi_limit, };
@@ -853,6 +857,7 @@ static const struct mtk_dpi_conf mt8183_conf = { .dimension_mask = HPW_MASK, .hvsize_mask = HSIZE_MASK, .channel_swap_shift = CH_SWAP, + .yuv422_en_bit = YUV422_EN, .limit = &mtk_dpi_limit, };
@@ -867,6 +872,7 @@ static const struct mtk_dpi_conf mt8192_conf = { .dimension_mask = HPW_MASK, .hvsize_mask = HSIZE_MASK, .channel_swap_shift = CH_SWAP, + .yuv422_en_bit = YUV422_EN, .limit = &mtk_dpi_limit, };
Signature · 1 line
2.34.1
Re: [PATCH v9 13/22] drm/mediatek: dpi: move the yuv422_en_bit to SoC config
Quoted 61 lines · Guillaume Ranquet
Add flexibility by moving the yuv422 en bit to SoC specific config
Signed-off-by Guillaume Ranquet <[email protected]>Reviewed-by AngeloGioacchino Del Regno <--- drivers/gpu/drm/mediatek/mtk_dpi.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)drivers/gpu/drm/mediatek/mtk_dpi.c +3
-1@@ -132,6 +132,7 @@ struct mtk_dpi_conf {/* HSIZE and VSIZE mask (no shift) */ u32 hvsize_mask;u32 channel_swap_shift; +u32 yuv422_en_bit;const struct mtk_dpi_yc_limit *limit; };@@ -356,7 +357,8 @@ static void mtk_dpi_config_channel_swap(structmtk_dpi *dpi, 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); + mtk_dpi_mask(dpi, DPI_CON, enable ? dpi->conf->yuv422_en_bit : 0, + dpi->conf->yuv422_en_bit);}
static void mtk_dpi_config_csc_enable(struct
mtk_dpi*dpi, bool
enable)drivers/gpu/drm/mediatek/mtk_dpi.c +3
-0@@ -824,6 +826,7 @@ static const struct mtk_dpi_conf mt8173_conf = { .dimension_mask = HPW_MASK, .hvsize_mask = HSIZE_MASK, .channel_swap_shift = CH_SWAP, + .yuv422_en_bit = YUV422_EN, .limit = &mtk_dpi_limit, };@@ -839,6 +842,7 @@ static const struct mtk_dpi_conf mt2701_conf = { .dimension_mask = HPW_MASK, .hvsize_mask = HSIZE_MASK, .channel_swap_shift = CH_SWAP, + .yuv422_en_bit = YUV422_EN, .limit = &mtk_dpi_limit, };@@ -853,6 +857,7 @@ static const struct mtk_dpi_conf mt8183_conf = { .dimension_mask = HPW_MASK, .hvsize_mask = HSIZE_MASK, .channel_swap_shift = CH_SWAP, + .yuv422_en_bit = YUV422_EN, .limit = &mtk_dpi_limit, };
drivers/gpu/drm/mediatek/mtk_dpi.c static const struct mtk_dpi_conf mt8192_conf = { · line 878
Quoted 7 lines
drivers/gpu/drm/mediatek/mtk_dpi.c +1
-0@@ -867,6 +872,7 @@ static const struct mtk_dpi_conf mt8192_conf = { .dimension_mask = HPW_MASK, .hvsize_mask = HSIZE_MASK, .channel_swap_shift = CH_SWAP, + .yuv422_en_bit = YUV422_EN, .limit = &mtk_dpi_limit, };
PATCH v9 14/22 drm/mediatek: dpi: move the csc_enable bit to SoC config
In reply to Guillaume RanquetAdd flexibility by moving the csc_enable bit to SoC specific config
--- drivers/gpu/drm/mediatek/mtk_dpi.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/gpu/drm/mediatek/mtk_dpi.c +7 -1
@@ -133,6 +133,7 @@ struct mtk_dpi_conf {u32 hvsize_mask;u32 channel_swap_shift;u32 yuv422_en_bit; +u32 csc_enable_bit;const struct mtk_dpi_yc_limit *limit; };
@@ -363,7 +364,8 @@ static void mtk_dpi_config_yuv422_enable(struct mtk_dpi *dpi, bool enable)static void mtk_dpi_config_csc_enable (struct mtk_dpi *dpi,bool enable) { -mtk_dpi_mask (dpi,DPI_CON , enable ?CSC_ENABLE :0 ,CSC_ENABLE ); +mtk_dpi_mask (dpi,DPI_CON , enable ? dpi->conf->csc_enable_bit :0 , + dpi->conf->csc_enable_bit); }static void mtk_dpi_config_swap_input (struct mtk_dpi *dpi,bool enable)
@@ -827,6 +829,7 @@ static const struct mtk_dpi_conf mt8173_conf = { .hvsize_mask = HSIZE_MASK, .channel_swap_shift = CH_SWAP, .yuv422_en_bit = YUV422_EN, + .csc_enable_bit = CSC_ENABLE, .limit = &mtk_dpi_limit, };
@@ -843,6 +846,7 @@ static const struct mtk_dpi_conf mt2701_conf = { .hvsize_mask = HSIZE_MASK, .channel_swap_shift = CH_SWAP, .yuv422_en_bit = YUV422_EN, + .csc_enable_bit = CSC_ENABLE, .limit = &mtk_dpi_limit, };
@@ -858,6 +862,7 @@ static const struct mtk_dpi_conf mt8183_conf = { .hvsize_mask = HSIZE_MASK, .channel_swap_shift = CH_SWAP, .yuv422_en_bit = YUV422_EN, + .csc_enable_bit = CSC_ENABLE, .limit = &mtk_dpi_limit, };
@@ -873,6 +878,7 @@ static const struct mtk_dpi_conf mt8192_conf = { .hvsize_mask = HSIZE_MASK, .channel_swap_shift = CH_SWAP, .yuv422_en_bit = YUV422_EN, + .csc_enable_bit = CSC_ENABLE, .limit = &mtk_dpi_limit, };
Signature · 1 line
2.34.1
Re: [PATCH v9 14/22] drm/mediatek: dpi: move the csc_enable bit to SoC config
Quoted 62 lines · Guillaume Ranquet
Add flexibility by moving the
csc_enablebit to SoC specific configSigned-off-by Guillaume Ranquet <[email protected]>Reviewed-by AngeloGioacchino Del Regno <--- drivers/gpu/drm/mediatek/mtk_dpi.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)drivers/gpu/drm/mediatek/mtk_dpi.c +2
-1@@ -133,6 +133,7 @@ struct mtk_dpi_conf {u32 hvsize_mask;u32 channel_swap_shift;u32 yuv422_en_bit; +u32 csc_enable_bit;const struct mtk_dpi_yc_limit *limit; };@@ -363,7 +364,8 @@ static void mtk_dpi_config_yuv422_enable(struct mtk_dpi *dpi, bool enable)static void mtk_dpi_config_csc_enable (struct mtk_dpi *dpi,bool enable) { -mtk_dpi_mask (dpi,DPI_CON , enable ?CSC_ENABLE :0 , CSC_ENABLE); + mtk_dpi_mask(dpi, DPI_CON, enable ? dpi->conf->csc_enable_bit :0,
drivers/gpu/drm/mediatek/mtk_dpi.c +1
-0+ dpi->conf->csc_enable_bit); } static void mtk_dpi_config_swap_input(struct mtk_dpi *dpi, boolenable)
drivers/gpu/drm/mediatek/mtk_dpi.c +3
-0@@ -827,6 +829,7 @@ static const struct mtk_dpi_conf mt8173_conf = { .hvsize_mask = HSIZE_MASK, .channel_swap_shift = CH_SWAP, .yuv422_en_bit = YUV422_EN, + .csc_enable_bit = CSC_ENABLE, .limit = &mtk_dpi_limit, };@@ -843,6 +846,7 @@ static const struct mtk_dpi_conf mt2701_conf = { .hvsize_mask = HSIZE_MASK, .channel_swap_shift = CH_SWAP, .yuv422_en_bit = YUV422_EN, + .csc_enable_bit = CSC_ENABLE, .limit = &mtk_dpi_limit, };@@ -858,6 +862,7 @@ static const struct mtk_dpi_conf mt8183_conf = { .hvsize_mask = HSIZE_MASK, .channel_swap_shift = CH_SWAP, .yuv422_en_bit = YUV422_EN, + .csc_enable_bit = CSC_ENABLE, .limit = &mtk_dpi_limit, };
drivers/gpu/drm/mediatek/mtk_dpi.c static const struct mtk_dpi_conf mt8192_conf = { · line 884
Quoted 7 lines
drivers/gpu/drm/mediatek/mtk_dpi.c +1
-0@@ -873,6 +878,7 @@ static const struct mtk_dpi_conf mt8192_conf = { .hvsize_mask = HSIZE_MASK, .channel_swap_shift = CH_SWAP, .yuv422_en_bit = YUV422_EN, + .csc_enable_bit = CSC_ENABLE, .limit = &mtk_dpi_limit, };
PATCH v9 15/22 drm/mediatek: dpi: Add dpintf support
In reply to Guillaume Ranquetdpintf 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 | 78 ++++++++++++++++++--- drivers/gpu/drm/mediatek/mtk_dpi_regs.h | 38 ++++++++++ drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 8 +++ drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 1 + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 5 +- include/linux/soc/mediatek/mtk-mmsys.h | 2 + 6 files changed, 120 insertions(+), 12 deletions(-)
drivers/gpu/drm/mediatek/mtk_dpi.c +67 -11
@@ -126,6 +126,7 @@ struct mtk_dpi_conf {const u32 *output_fmts;u32 num_output_fmts;bool is_ck_de_pol; +bool is_dpintf;bool swap_input_support;/* Mask used for HWIDTH, HPORCH, VSYNC_WIDTH and VSYNC_PORCH (no shift) */ u32 dimension_mask;
@@ -498,11 +499,11 @@ static int mtk_dpi_set_display_mode(struct mtk_dpi *dpi, vm.pixelclock = pll_rate / factor;if ((dpi->output_fmt ==MEDIA_BUS_FMT_RGB888_2X12_LE ) || - (dpi->output_fmt ==MEDIA_BUS_FMT_RGB888_2X12_BE )) + (dpi->output_fmt ==MEDIA_BUS_FMT_RGB888_2X12_BE )) {clk_set_rate (dpi->pixel_clk, vm.pixelclock *2 ); -else + }else {clk_set_rate (dpi->pixel_clk, vm.pixelclock); - + } vm.pixelclock =clk_get_rate (dpi->pixel_clk);
@@ -515,9 +516,15 @@ 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 ; - hsync.sync_width = vm.hsync_len; - hsync.back_porch = vm.hback_porch; - hsync.front_porch = vm.hfront_porch; +if (dpi->conf->is_dpintf) { + hsync.sync_width = vm.hsync_len /4 ; + hsync.back_porch = vm.hback_porch /4 ; + hsync.front_porch = vm.hfront_porch /4 ; + }else { + hsync.sync_width = vm.hsync_len; + hsync.back_porch = vm.hback_porch; + hsync.front_porch = vm.hfront_porch; + } hsync.shift_half_line = false; vsync_lodd.sync_width = vm.vsync_len; vsync_lodd.back_porch = vm.vback_porch;
@@ -559,13 +566,20 @@ static int mtk_dpi_set_display_mode(struct mtk_dpi *dpi,mtk_dpi_config_channel_limit (dpi);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); +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); +mtk_dpi_enable (dpi); +return 0 ; }
@@ -642,7 +656,10 @@ static int mtk_dpi_bridge_atomic_check(struct drm_bridge *bridge, dpi->bit_num =MTK_DPI_OUT_BIT_NUM_8BITS ; dpi->channel_swap =MTK_DPI_OUT_CHANNEL_SWAP_RGB ; dpi->yc_map =MTK_DPI_OUT_YC_MAP_RGB ; - dpi->color_format =MTK_DPI_COLOR_FORMAT_RGB ; +if (out_bus_format ==MEDIA_BUS_FMT_YUYV8_1X16 ) + dpi->color_format =MTK_DPI_COLOR_FORMAT_YCBCR_422_FULL ; +else + dpi->color_format =MTK_DPI_COLOR_FORMAT_RGB ;return 0 ; }
@@ -801,6 +818,16 @@ static unsigned int mt8183_calculate_factor(int clock)return 2 ; } +static unsigned int mt8195_dpintf_calculate_factor (int clock) +{ +if (clock <70000 ) +return 4 ; +else if (clock <200000 ) +return 2 ; +else +return 1 ; +} +static const u32 mt8173_output_fmts[] = {MEDIA_BUS_FMT_RGB888_1X24 , };
@@ -810,6 +837,12 @@ static const u32 mt8183_output_fmts[] = { MEDIA_BUS_FMT_RGB888_2X12_BE, }; +static const u32 mt8195_output_fmts[] = { +MEDIA_BUS_FMT_RGB888_1X24 , +MEDIA_BUS_FMT_YUV8_1X24 , +MEDIA_BUS_FMT_YUYV8_1X16 , +}; +static const struct mtk_dpi_yc_limit mtk_dpi_limit = { .c_bottom =0x0010 , .c_top =0x0FE0 ,
@@ -817,6 +850,13 @@ static const struct mtk_dpi_yc_limit mtk_dpi_limit = { .y_top = 0x0FE0, }; +static const struct mtk_dpi_yc_limit mtk_dpintf_limit = { + .c_bottom =0x0000 , + .c_top =0xFFF , + .y_bottom =0x0000 , + .y_top =0xFFF , +}; +static const struct mtk_dpi_conf mt8173_conf = { .cal_factor = mt8173_calculate_factor, .reg_h_fre_con =0xe0 ,
@@ -882,6 +922,19 @@ static const struct mtk_dpi_conf mt8192_conf = { .limit = &mtk_dpi_limit, }; +static const struct mtk_dpi_conf mt8195_dpintf_conf = { + .cal_factor = mt8195_dpintf_calculate_factor, + .output_fmts = mt8195_output_fmts, + .num_output_fmts =ARRAY_SIZE (mt8195_output_fmts), + .is_dpintf = true, + .dimension_mask =DPINTF_HPW_MASK , + .hvsize_mask =DPINTF_HSIZE_MASK , + .channel_swap_shift =DPINTF_CH_SWAP , + .yuv422_en_bit =DPINTF_YUV422_EN , + .csc_enable_bit =DPINTF_CSC_ENABLE , + .limit = &mtk_dpintf_limit, +}; +static int mtk_dpi_probe (struct platform_device *pdev) {struct device *dev = &pdev->dev;
@@ -1004,6 +1057,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 +38 -0
@@ -40,10 +40,15 @@#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_CSC_ENABLE BIT(26) +#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
@@ -80,8 +85,10 @@#define DPI_SIZE 0x18#define HSIZE 0#define HSIZE_MASK (0x1FFF << 0) +#define DPINTF_HSIZE_MASK (0xFFFF << 0)#define VSIZE 16#define VSIZE_MASK (0x1FFF << 16) +#define DPINTF_VSIZE_MASK (0xFFFF << 16)#define DPI_DDR_SETTING 0x1C#define DDR_EN BIT(0)
@@ -93,24 +100,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)
@@ -217,4 +230,29 @@#define EDGE_SEL_EN BIT(5)#define H_FRE_2N BIT(25) + +#define DPI_MATRIX_SET 0xB4 +#define INT_MATRIX_SEL BIT(0) +#define INT_MATRIX_SEL_MASK (0x1F << 0) +#define RGB_TO_JPEG 0x00 +#define RGB_TO_FULL709 0x01 +#define RGB_TO_BT601 0x02 +#define RGB_TO_BT709 0x03 +#define JPEG_TO_RGB 0x04 +#define FULL709_TO_RGB 0x05 +#define BT601_TO_RGB 0x06 +#define BT709_TO_RGB 0x07 +#define JPEG_TO_BT601 0x08 +#define JPEG_TO_BT709 0x09 +#define BT601_TO_JPEG 0xA +#define BT709_TO_JPEG 0xB +#define BT709_TO_BT601 0xC +#define BT601_TO_BT709 0xD +#define JPEG_TO_CERGB 0x14 +#define FULL709_TO_CERGB 0x15 +#define BT601_TO_CERGB 0x16 +#define BT709_TO_CERGB 0x17 +#define RGB_TO_CERGB 0x1C +#define MATRIX_BIT BIT(8) +#define EXT_MATRIX_EN BIT(12)#endif /* __MTK_DPI_REGS_H */
drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c +8 -0
@@ -351,6 +351,11 @@ static const char * const mtk_ddp_comp_stem[MTK_DDP_COMP_TYPE_MAX] = { [MTK_DISP_WDMA] = "wdma", [MTK_DPI] = "dpi", [MTK_DSI] = "dsi", + [MTK_DP_INTF] = "dp-intf", + [MTK_DISP_PWM] = "pwm", + [MTK_DISP_MUTEX] = "mutex", + [MTK_DISP_OD] = "od", + [MTK_DISP_BLS] = "bls", };struct mtk_ddp_comp_match {
@@ -369,6 +374,8 @@ static const struct mtk_ddp_comp_match mtk_ddp_matches[DDP_COMPONENT_ID_MAX] = { [DDP_COMPONENT_DITHER] = { MTK_DISP_DITHER, 0, &ddp_dither }, [DDP_COMPONENT_DPI0] = { MTK_DPI, 0, &ddp_dpi }, [DDP_COMPONENT_DPI1] = { MTK_DPI, 1, &ddp_dpi }, + [DDP_COMPONENT_DP_INTF0] = { MTK_DP_INTF, 0, &ddp_dpi }, + [DDP_COMPONENT_DP_INTF1] = { MTK_DP_INTF, 1, &ddp_dpi }, [DDP_COMPONENT_DSI0] = { MTK_DSI, 0, &ddp_dsi }, [DDP_COMPONENT_DSI1] = { MTK_DSI, 1, &ddp_dsi }, [DDP_COMPONENT_DSI2] = { MTK_DSI, 2, &ddp_dsi },
@@ -481,6 +488,7 @@ int mtk_ddp_comp_init(struct device_node *node, struct mtk_ddp_comp *comp, type ==MTK_DISP_PWM || type ==MTK_DISP_RDMA || type ==MTK_DPI || + type ==MTK_DP_INTF || type == MTK_DSI) return 0;
drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h +1 -0
@@ -34,6 +34,7 @@ enum mtk_ddp_comp_type {MTK_DISP_UFOE ,MTK_DISP_WDMA ,MTK_DPI , +MTK_DP_INTF ,MTK_DSI , MTK_DDP_COMP_TYPE_MAX, };
drivers/gpu/drm/mediatek/mtk_drm_drv.c +4 -1
@@ -509,6 +509,8 @@ static const struct of_device_id mtk_ddp_comp_dt_ids[] = { .data = (void *)MTK_DPI }, { .compatible = "mediatek,mt8183-dpi", .data = (void *)MTK_DPI }, + { .compatible = "mediatek,mt8195-dpintf", + .data = (void *)MTK_DP_INTF }, { .compatible = "mediatek,mt2701-dsi", .data = (void *)MTK_DSI }, { .compatible = "mediatek,mt8173-dsi",
@@ -609,7 +611,8 @@ static int mtk_drm_probe(struct platform_device *pdev) comp_type == MTK_DISP_OVL_2L || comp_type == MTK_DISP_RDMA || comp_type == MTK_DPI || - comp_type == MTK_DSI) { + comp_type == MTK_DPI || + comp_type == MTK_DP_INTF) {dev_info (dev,"Adding component match for %pOF\n" , node); drm_of_component_match_add(dev, &match, component_compare_of,
include/linux/soc/mediatek/mtk-mmsys.h +2 -0
@@ -19,6 +19,8 @@ enum mtk_ddp_comp_id {DDP_COMPONENT_DITHER ,DDP_COMPONENT_DPI0 ,DDP_COMPONENT_DPI1 , +DDP_COMPONENT_DP_INTF0 , +DDP_COMPONENT_DP_INTF1 ,DDP_COMPONENT_DSI0 ,DDP_COMPONENT_DSI1 , DDP_COMPONENT_DSI2,
Signature · 1 line
2.34.1
Re: [PATCH v9 15/22] drm/mediatek: dpi: Add dpintf support
Hello Guillaume,
Thanks for your patch, but I have some questions for this patch:
Quoted 101 lines · Guillaume Ranquet
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]>Signed-off-by Guillaume Ranquet <[email protected]>Reviewed-by AngeloGioacchino Del Regno <--- drivers/gpu/drm/mediatek/mtk_dpi.c | 78 ++++++++++++++++++- -- drivers/gpu/drm/mediatek/mtk_dpi_regs.h | 38 ++++++++++ drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 8 +++ drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 1 + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 5 +- include/linux/soc/mediatek/mtk-mmsys.h | 2 + 6 files changed, 120 insertions(+), 12 deletions(-)drivers/gpu/drm/mediatek/mtk_dpi.c +1
-0@@ -126,6 +126,7 @@ struct mtk_dpi_conf {const u32 *output_fmts;u32 num_output_fmts;bool is_ck_de_pol; +bool is_dpintf;bool swap_input_support;/* Mask used for HWIDTH, HPORCH, VSYNC_WIDTH and VSYNC_PORCH (no shift) */
drivers/gpu/drm/mediatek/mtk_dpi.c +12
-6u32 dimension_mask;@@ -498,11 +499,11 @@ static int mtk_dpi_set_display_mode(struct mtk_dpi *dpi, vm.pixelclock = pll_rate / factor;if ((dpi->output_fmt ==MEDIA_BUS_FMT_RGB888_2X12_LE ) || - (dpi->output_fmt ==MEDIA_BUS_FMT_RGB888_2X12_BE )) + (dpi->output_fmt ==MEDIA_BUS_FMT_RGB888_2X12_BE )) {clk_set_rate (dpi->pixel_clk, vm.pixelclock *2 ); -else + }else {clk_set_rate (dpi->pixel_clk, vm.pixelclock); - + } vm.pixelclock =clk_get_rate (dpi->pixel_clk);@@ -515,9 +516,15 @@ static int mtk_dpi_set_display_mode(structmtk_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 ; - hsync.sync_width = vm.hsync_len; - hsync.back_porch = vm.hback_porch; - hsync.front_porch = vm.hfront_porch; +if (dpi->conf->is_dpintf) { + hsync.sync_width = vm.hsync_len /4 ; + hsync.back_porch = vm.hback_porch /4 ; + hsync.front_porch = vm.hfront_porch /4 ; + }else { + hsync.sync_width = vm.hsync_len; + hsync.back_porch = vm.hback_porch; + hsync.front_porch = vm.hfront_porch; + }drivers/gpu/drm/mediatek/mtk_dpi.c +2
-4hsync.shift_half_line = false; vsync_lodd.sync_width = vm.vsync_len; vsync_lodd.back_porch = vm.vback_porch;@@ -559,13 +566,20 @@ static int mtk_dpi_set_display_mode(structmtk_dpi *dpi,mtk_dpi_config_channel_limit (dpi );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); +if (dpi->conf->is_dpintf) { + mtk_dpi_mask(dpi, DPI_CON, DPINTF_INPUT_2P_EN,
drivers/gpu/drm/mediatek/mtk_dpi.c static int mtk_dpi_set_display_mode(struct · line 582
Quoted 10 lines
drivers/gpu/drm/mediatek/mtk_dpi.c +8
-0+ 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); +mtk_dpi_enable (dpi);
Why do we need to add mtk_dpi_enable() here?
Will this change the power on sequence?
BRs,
Rex
Quoted 288 lines
drivers/gpu/drm/mediatek/mtk_dpi.c +5
-1+return 0 ; }@@ -642,7 +656,10 @@ static int mtk_dpi_bridge_atomic_check(struct drm_bridge *bridge, dpi->bit_num =MTK_DPI_OUT_BIT_NUM_8BITS ; dpi->channel_swap =MTK_DPI_OUT_CHANNEL_SWAP_RGB ; dpi->yc_map =MTK_DPI_OUT_YC_MAP_RGB ; - dpi->color_format =MTK_DPI_COLOR_FORMAT_RGB ; +if (out_bus_format ==MEDIA_BUS_FMT_YUYV8_1X16 ) + dpi->color_format =MTK_DPI_COLOR_FORMAT_YCBCR_422_FULL ; +else + dpi->color_format =MTK_DPI_COLOR_FORMAT_RGB ;drivers/gpu/drm/mediatek/mtk_dpi.c +10
-0return 0 ; }@@ -801,6 +818,16 @@ static unsigned int mt8183_calculate_factor(int clock)return 2 ; } +static unsigned int mt8195_dpintf_calculate_factor (int clock) +{ +if (clock <70000 ) +return 4 ; +else if (clock <200000 ) +return 2 ; +else +return 1 ; +} +static const u32 mt8173_output_fmts[] = {MEDIA_BUS_FMT_RGB888_1X24 ,};
drivers/gpu/drm/mediatek/mtk_dpi.c +13
-0@@ -810,6 +837,12 @@ static const u32 mt8183_output_fmts[] = { MEDIA_BUS_FMT_RGB888_2X12_BE, }; +static const u32 mt8195_output_fmts[] = { +MEDIA_BUS_FMT_RGB888_1X24 , +MEDIA_BUS_FMT_YUV8_1X24 , +MEDIA_BUS_FMT_YUYV8_1X16 , +}; +static const struct mtk_dpi_yc_limit mtk_dpi_limit = { .c_bottom =0x0010 , .c_top =0x0FE0 ,@@ -817,6 +850,13 @@ static const struct mtk_dpi_yc_limit mtk_dpi_limit = { .y_top = 0x0FE0, }; +static const struct mtk_dpi_yc_limit mtk_dpintf_limit = { + .c_bottom =0x0000 , + .c_top =0xFFF , + .y_bottom =0x0000 , + .y_top =0xFFF , +}; +static const struct mtk_dpi_conf mt8173_conf = { .cal_factor = mt8173_calculate_factor,drivers/gpu/drm/mediatek/mtk_dpi.c +16
-0.reg_h_fre_con = 0xe0,@@ -882,6 +922,19 @@ static const struct mtk_dpi_conf mt8192_conf = { .limit = &mtk_dpi_limit, }; +static const struct mtk_dpi_conf mt8195_dpintf_conf = { + .cal_factor = mt8195_dpintf_calculate_factor, + .output_fmts = mt8195_output_fmts, + .num_output_fmts =ARRAY_SIZE (mt8195_output_fmts), + .is_dpintf = true, + .dimension_mask =DPINTF_HPW_MASK , + .hvsize_mask =DPINTF_HSIZE_MASK , + .channel_swap_shift =DPINTF_CH_SWAP , + .yuv422_en_bit =DPINTF_YUV422_EN , + .csc_enable_bit =DPINTF_CSC_ENABLE , + .limit = &mtk_dpintf_limit, +}; +static int mtk_dpi_probe (struct platform_device *pdev) {struct device *dev = &pdev->dev;@@ -1004,6 +1057,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 +38
-0@@ -40,10 +40,15 @@#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_CSC_ENABLE BIT(26) +#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@@ -80,8 +85,10 @@#define DPI_SIZE 0x18#define HSIZE 0#define HSIZE_MASK (0x1FFF << 0) +#define DPINTF_HSIZE_MASK (0xFFFF << 0)#define VSIZE 16#define VSIZE_MASK (0x1FFF << 16) +#define DPINTF_VSIZE_MASK (0xFFFF << 16)#define DPI_DDR_SETTING 0x1C#define DDR_EN BIT(0)@@ -93,24 +100,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)@@ -217,4 +230,29 @@#define EDGE_SEL_EN BIT(5)#define H_FRE_2N BIT(25) + +#define DPI_MATRIX_SET 0xB4 +#define INT_MATRIX_SEL BIT(0) +#define INT_MATRIX_SEL_MASK (0x1F << 0) +#define RGB_TO_JPEG 0x00 +#define RGB_TO_FULL709 0x01 +#define RGB_TO_BT601 0x02 +#define RGB_TO_BT709 0x03 +#define JPEG_TO_RGB 0x04 +#define FULL709_TO_RGB 0x05 +#define BT601_TO_RGB 0x06 +#define BT709_TO_RGB 0x07 +#define JPEG_TO_BT601 0x08 +#define JPEG_TO_BT709 0x09 +#define BT601_TO_JPEG 0xA +#define BT709_TO_JPEG 0xB +#define BT709_TO_BT601 0xC +#define BT601_TO_BT709 0xD +#define JPEG_TO_CERGB 0x14 +#define FULL709_TO_CERGB 0x15 +#define BT601_TO_CERGB 0x16 +#define BT709_TO_CERGB 0x17 +#define RGB_TO_CERGB 0x1C +#define MATRIX_BIT BIT(8) +#define EXT_MATRIX_EN BIT(12)#endif /* __MTK_DPI_REGS_H */ drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c +5
-0@@ -351,6 +351,11 @@ static const char * const mtk_ddp_comp_stem[MTK_DDP_COMP_TYPE_MAX] = { [MTK_DISP_WDMA] = "wdma", [MTK_DPI] = "dpi", [MTK_DSI] = "dsi", + [MTK_DP_INTF] = "dp-intf", + [MTK_DISP_PWM] = "pwm", + [MTK_DISP_MUTEX] = "mutex", + [MTK_DISP_OD] = "od", + [MTK_DISP_BLS] = "bls", };struct
mtk_ddp_comp_match{drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c +0
-0@@ -369,6 +374,8 @@ static const struct mtk_ddp_comp_match mtk_ddp_matches[DDP_COMPONENT_ID_MAX] = { [DDP_COMPONENT_DITHER] = { MTK_DISP_DITHER, 0, &ddp_dither }, [DDP_COMPONENT_DPI0] = { MTK_DPI, 0, &ddp_dpi }, [DDP_COMPONENT_DPI1] = { MTK_DPI, 1,
&ddp_dpi},drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c +1
-0+ [DDP_COMPONENT_DP_INTF0] = { MTK_DP_INTF, 0, &ddp_dpi},
drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c +1
-0+ [DDP_COMPONENT_DP_INTF1] = { MTK_DP_INTF, 1, &ddp_dpi},
[DDP_COMPONENT_DSI0] = {MTK_DSI, 0,&ddp_dsi},
[DDP_COMPONENT_DSI1] = {MTK_DSI, 1,&ddp_dsi},
[DDP_COMPONENT_DSI2] = {MTK_DSI, 2,&ddp_dsi},drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c +1
-0@@ -481,6 +488,7 @@ int mtk_ddp_comp_init(struct device_node *node,struct mtk_ddp_comp *comp, type == MTK_DISP_PWM || type == MTK_DISP_RDMA || type == MTK_DPI || + type == MTK_DP_INTF || type == MTK_DSI) return 0;drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h +1
-0@@ -34,6 +34,7 @@ enum mtk_ddp_comp_type {MTK_DISP_UFOE ,MTK_DISP_WDMA ,MTK_DPI , +MTK_DP_INTF ,MTK_DSI , MTK_DDP_COMP_TYPE_MAX, };drivers/gpu/drm/mediatek/mtk_drm_drv.c +2
-0@@ -509,6 +509,8 @@ static const struct of_device_id mtk_ddp_comp_dt_ids[] = { .data = (void *)MTK_DPI }, { .compatible = "mediatek,mt8183-dpi", .data = (void *)MTK_DPI }, + { .compatible = "mediatek,mt8195-dpintf", + .data = (void *)MTK_DP_INTF }, { .compatible = "mediatek,mt2701-dsi", .data = (void *)MTK_DSI },drivers/gpu/drm/mediatek/mtk_drm_drv.c +2
-1{ .compatible = "mediatek,mt8173-dsi",@@ -609,7 +611,8 @@ static int mtk_drm_probe(struct platform_device *pdev) comp_type == MTK_DISP_OVL_2L || comp_type == MTK_DISP_RDMA || comp_type == MTK_DPI || - comp_type == MTK_DSI) { + comp_type == MTK_DPI || + comp_type == MTK_DP_INTF) { dev_info(dev, "Adding component match for %pOF\n",drivers/gpu/drm/mediatek/mtk_drm_drv.c +0
-0node); drm_of_component_match_add(dev, &match,
component_compare_of,include/linux/soc/mediatek/mtk-mmsys.h +2
-0@@ -19,6 +19,8 @@ enum mtk_ddp_comp_id {DDP_COMPONENT_DITHER ,DDP_COMPONENT_DPI0 ,DDP_COMPONENT_DPI1 , +DDP_COMPONENT_DP_INTF0 , +DDP_COMPONENT_DP_INTF1 ,DDP_COMPONENT_DSI0 ,DDP_COMPONENT_DSI1 , DDP_COMPONENT_DSI2,
Re: [PATCH v9 15/22] drm/mediatek: dpi: Add dpintf support
Quoted 115 lines · Rex-BC Chen
Hello Guillaume,
Thanks for your patch, but I have some questions for this patch:
Quoted 110 lines · Guillaume Ranquet
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]>Signed-off-by Guillaume Ranquet <[email protected]>Reviewed-by AngeloGioacchino Del Regno <--- drivers/gpu/drm/mediatek/mtk_dpi.c | 78 ++++++++++++++++++- -- drivers/gpu/drm/mediatek/mtk_dpi_regs.h | 38 ++++++++++ drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 8 +++ drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 1 + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 5 +- include/linux/soc/mediatek/mtk-mmsys.h | 2 + 6 files changed, 120 insertions(+), 12 deletions(-)drivers/gpu/drm/mediatek/mtk_dpi.c +1
-0@@ -126,6 +126,7 @@ struct mtk_dpi_conf {const u32 *output_fmts;u32 num_output_fmts;bool is_ck_de_pol; +bool is_dpintf;bool swap_input_support;/* Mask used for HWIDTH, HPORCH, VSYNC_WIDTH and VSYNC_PORCH (no shift) */
drivers/gpu/drm/mediatek/mtk_dpi.c +12
-6u32 dimension_mask;@@ -498,11 +499,11 @@ static int mtk_dpi_set_display_mode(struct mtk_dpi *dpi, vm.pixelclock = pll_rate / factor;if ((dpi->output_fmt ==MEDIA_BUS_FMT_RGB888_2X12_LE ) || - (dpi->output_fmt ==MEDIA_BUS_FMT_RGB888_2X12_BE )) + (dpi->output_fmt ==MEDIA_BUS_FMT_RGB888_2X12_BE )) {clk_set_rate (dpi->pixel_clk, vm.pixelclock *2 ); -else + }else {clk_set_rate (dpi->pixel_clk, vm.pixelclock); - + } vm.pixelclock =clk_get_rate (dpi->pixel_clk);@@ -515,9 +516,15 @@ static int mtk_dpi_set_display_mode(structmtk_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 ; - hsync.sync_width = vm.hsync_len; - hsync.back_porch = vm.hback_porch; - hsync.front_porch = vm.hfront_porch; +if (dpi->conf->is_dpintf) { + hsync.sync_width = vm.hsync_len /4 ; + hsync.back_porch = vm.hback_porch /4 ; + hsync.front_porch = vm.hfront_porch /4 ; + }else { + hsync.sync_width = vm.hsync_len; + hsync.back_porch = vm.hback_porch; + hsync.front_porch = vm.hfront_porch; + }drivers/gpu/drm/mediatek/mtk_dpi.c +9
-4hsync.shift_half_line = false; vsync_lodd.sync_width = vm.vsync_len; vsync_lodd.back_porch = vm.vback_porch;@@ -559,13 +566,20 @@ static int mtk_dpi_set_display_mode(structmtk_dpi *dpi,mtk_dpi_config_channel_limit (dpi );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); +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);
Quoted 5 lines
drivers/gpu/drm/mediatek/mtk_dpi.c static int mtk_dpi_set_display_mode(struct mtk_dpi *dpi, · line 581
Quoted 1 line
drivers/gpu/drm/mediatek/mtk_dpi.c +1
-0+mtk_dpi_enable (dpi);Why do we need to add
mtk_dpi_enable()here?
Will this change the power on sequence?
I have been told that this is to avoid artifacts on screen, the mtk_dpi_enable() is done
in mtk_dpi_set_display_mode() instead of mtk_dpi_power_on();
I will try to convey that explanation in a separate patch for v10
Quoted 291 lines
BRs,
RexQuoted 288 lines
drivers/gpu/drm/mediatek/mtk_dpi.c +5
-1+return 0 ; }@@ -642,7 +656,10 @@ static int mtk_dpi_bridge_atomic_check(struct drm_bridge *bridge, dpi->bit_num =MTK_DPI_OUT_BIT_NUM_8BITS ; dpi->channel_swap =MTK_DPI_OUT_CHANNEL_SWAP_RGB ; dpi->yc_map =MTK_DPI_OUT_YC_MAP_RGB ; - dpi->color_format =MTK_DPI_COLOR_FORMAT_RGB ; +if (out_bus_format ==MEDIA_BUS_FMT_YUYV8_1X16 ) + dpi->color_format =MTK_DPI_COLOR_FORMAT_YCBCR_422_FULL ; +else + dpi->color_format =MTK_DPI_COLOR_FORMAT_RGB ;drivers/gpu/drm/mediatek/mtk_dpi.c +10
-0return 0 ; }@@ -801,6 +818,16 @@ static unsigned int mt8183_calculate_factor(int clock)return 2 ; } +static unsigned int mt8195_dpintf_calculate_factor (int clock) +{ +if (clock <70000 ) +return 4 ; +else if (clock <200000 ) +return 2 ; +else +return 1 ; +} +static const u32 mt8173_output_fmts[] = {MEDIA_BUS_FMT_RGB888_1X24 ,};
drivers/gpu/drm/mediatek/mtk_dpi.c +13
-0@@ -810,6 +837,12 @@ static const u32 mt8183_output_fmts[] = { MEDIA_BUS_FMT_RGB888_2X12_BE, }; +static const u32 mt8195_output_fmts[] = { +MEDIA_BUS_FMT_RGB888_1X24 , +MEDIA_BUS_FMT_YUV8_1X24 , +MEDIA_BUS_FMT_YUYV8_1X16 , +}; +static const struct mtk_dpi_yc_limit mtk_dpi_limit = { .c_bottom =0x0010 , .c_top =0x0FE0 ,@@ -817,6 +850,13 @@ static const struct mtk_dpi_yc_limit mtk_dpi_limit = { .y_top = 0x0FE0, }; +static const struct mtk_dpi_yc_limit mtk_dpintf_limit = { + .c_bottom =0x0000 , + .c_top =0xFFF , + .y_bottom =0x0000 , + .y_top =0xFFF , +}; +static const struct mtk_dpi_conf mt8173_conf = { .cal_factor = mt8173_calculate_factor,drivers/gpu/drm/mediatek/mtk_dpi.c +16
-0.reg_h_fre_con = 0xe0,@@ -882,6 +922,19 @@ static const struct mtk_dpi_conf mt8192_conf = { .limit = &mtk_dpi_limit, }; +static const struct mtk_dpi_conf mt8195_dpintf_conf = { + .cal_factor = mt8195_dpintf_calculate_factor, + .output_fmts = mt8195_output_fmts, + .num_output_fmts =ARRAY_SIZE (mt8195_output_fmts), + .is_dpintf = true, + .dimension_mask =DPINTF_HPW_MASK , + .hvsize_mask =DPINTF_HSIZE_MASK , + .channel_swap_shift =DPINTF_CH_SWAP , + .yuv422_en_bit =DPINTF_YUV422_EN , + .csc_enable_bit =DPINTF_CSC_ENABLE , + .limit = &mtk_dpintf_limit, +}; +static int mtk_dpi_probe (struct platform_device *pdev) {struct device *dev = &pdev->dev;@@ -1004,6 +1057,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 +38
-0@@ -40,10 +40,15 @@#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_CSC_ENABLE BIT(26) +#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@@ -80,8 +85,10 @@#define DPI_SIZE 0x18#define HSIZE 0#define HSIZE_MASK (0x1FFF << 0) +#define DPINTF_HSIZE_MASK (0xFFFF << 0)#define VSIZE 16#define VSIZE_MASK (0x1FFF << 16) +#define DPINTF_VSIZE_MASK (0xFFFF << 16)#define DPI_DDR_SETTING 0x1C#define DDR_EN BIT(0)@@ -93,24 +100,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)@@ -217,4 +230,29 @@#define EDGE_SEL_EN BIT(5)#define H_FRE_2N BIT(25) + +#define DPI_MATRIX_SET 0xB4 +#define INT_MATRIX_SEL BIT(0) +#define INT_MATRIX_SEL_MASK (0x1F << 0) +#define RGB_TO_JPEG 0x00 +#define RGB_TO_FULL709 0x01 +#define RGB_TO_BT601 0x02 +#define RGB_TO_BT709 0x03 +#define JPEG_TO_RGB 0x04 +#define FULL709_TO_RGB 0x05 +#define BT601_TO_RGB 0x06 +#define BT709_TO_RGB 0x07 +#define JPEG_TO_BT601 0x08 +#define JPEG_TO_BT709 0x09 +#define BT601_TO_JPEG 0xA +#define BT709_TO_JPEG 0xB +#define BT709_TO_BT601 0xC +#define BT601_TO_BT709 0xD +#define JPEG_TO_CERGB 0x14 +#define FULL709_TO_CERGB 0x15 +#define BT601_TO_CERGB 0x16 +#define BT709_TO_CERGB 0x17 +#define RGB_TO_CERGB 0x1C +#define MATRIX_BIT BIT(8) +#define EXT_MATRIX_EN BIT(12)#endif /* __MTK_DPI_REGS_H */ drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c +5
-0@@ -351,6 +351,11 @@ static const char * const mtk_ddp_comp_stem[MTK_DDP_COMP_TYPE_MAX] = { [MTK_DISP_WDMA] = "wdma", [MTK_DPI] = "dpi", [MTK_DSI] = "dsi", + [MTK_DP_INTF] = "dp-intf", + [MTK_DISP_PWM] = "pwm", + [MTK_DISP_MUTEX] = "mutex", + [MTK_DISP_OD] = "od", + [MTK_DISP_BLS] = "bls", };struct
mtk_ddp_comp_match{drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c +0
-0@@ -369,6 +374,8 @@ static const struct mtk_ddp_comp_match mtk_ddp_matches[DDP_COMPONENT_ID_MAX] = { [DDP_COMPONENT_DITHER] = { MTK_DISP_DITHER, 0, &ddp_dither }, [DDP_COMPONENT_DPI0] = { MTK_DPI, 0, &ddp_dpi }, [DDP_COMPONENT_DPI1] = { MTK_DPI, 1,
&ddp_dpi},drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c +1
-0+ [DDP_COMPONENT_DP_INTF0] = { MTK_DP_INTF, 0, &ddp_dpi},
drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c +1
-0+ [DDP_COMPONENT_DP_INTF1] = { MTK_DP_INTF, 1, &ddp_dpi},
[DDP_COMPONENT_DSI0] = {MTK_DSI, 0,&ddp_dsi},
[DDP_COMPONENT_DSI1] = {MTK_DSI, 1,&ddp_dsi},
[DDP_COMPONENT_DSI2] = {MTK_DSI, 2,&ddp_dsi},drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c +1
-0@@ -481,6 +488,7 @@ int mtk_ddp_comp_init(struct device_node *node,struct mtk_ddp_comp *comp, type == MTK_DISP_PWM || type == MTK_DISP_RDMA || type == MTK_DPI || + type == MTK_DP_INTF || type == MTK_DSI) return 0;drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h +1
-0@@ -34,6 +34,7 @@ enum mtk_ddp_comp_type {MTK_DISP_UFOE ,MTK_DISP_WDMA ,MTK_DPI , +MTK_DP_INTF ,MTK_DSI , MTK_DDP_COMP_TYPE_MAX, };drivers/gpu/drm/mediatek/mtk_drm_drv.c +2
-0@@ -509,6 +509,8 @@ static const struct of_device_id mtk_ddp_comp_dt_ids[] = { .data = (void *)MTK_DPI }, { .compatible = "mediatek,mt8183-dpi", .data = (void *)MTK_DPI }, + { .compatible = "mediatek,mt8195-dpintf", + .data = (void *)MTK_DP_INTF }, { .compatible = "mediatek,mt2701-dsi", .data = (void *)MTK_DSI },drivers/gpu/drm/mediatek/mtk_drm_drv.c +2
-1{ .compatible = "mediatek,mt8173-dsi",@@ -609,7 +611,8 @@ static int mtk_drm_probe(struct platform_device *pdev) comp_type == MTK_DISP_OVL_2L || comp_type == MTK_DISP_RDMA || comp_type == MTK_DPI || - comp_type == MTK_DSI) { + comp_type == MTK_DPI || + comp_type == MTK_DP_INTF) { dev_info(dev, "Adding component match for %pOF\n",drivers/gpu/drm/mediatek/mtk_drm_drv.c +0
-0node); drm_of_component_match_add(dev, &match,
component_compare_of,include/linux/soc/mediatek/mtk-mmsys.h +2
-0@@ -19,6 +19,8 @@ enum mtk_ddp_comp_id {DDP_COMPONENT_DITHER ,DDP_COMPONENT_DPI0 ,DDP_COMPONENT_DPI1 , +DDP_COMPONENT_DP_INTF0 , +DDP_COMPONENT_DP_INTF1 ,DDP_COMPONENT_DSI0 ,DDP_COMPONENT_DSI1 , DDP_COMPONENT_DSI2,
Re: [PATCH v9 15/22] drm/mediatek: dpi: Add dpintf support
In reply to Guillaume RanquetQuoted 373 lines · Guillaume Ranquet
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]>Signed-off-by Guillaume Ranquet <[email protected]>Reviewed-by AngeloGioacchino Del Regno <--- drivers/gpu/drm/mediatek/mtk_dpi.c | 78 ++++++++++++++++++- -- drivers/gpu/drm/mediatek/mtk_dpi_regs.h | 38 ++++++++++ drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 8 +++ drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 1 + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 5 +- include/linux/soc/mediatek/mtk-mmsys.h | 2 + 6 files changed, 120 insertions(+), 12 deletions(-)drivers/gpu/drm/mediatek/mtk_dpi.c +1
-0@@ -126,6 +126,7 @@ struct mtk_dpi_conf {const u32 *output_fmts;u32 num_output_fmts;bool is_ck_de_pol; +bool is_dpintf;bool swap_input_support;/* Mask used for HWIDTH, HPORCH, VSYNC_WIDTH and VSYNC_PORCH (no shift) */
drivers/gpu/drm/mediatek/mtk_dpi.c +12
-6u32 dimension_mask;@@ -498,11 +499,11 @@ static int mtk_dpi_set_display_mode(struct mtk_dpi *dpi, vm.pixelclock = pll_rate / factor;if ((dpi->output_fmt ==MEDIA_BUS_FMT_RGB888_2X12_LE ) || - (dpi->output_fmt ==MEDIA_BUS_FMT_RGB888_2X12_BE )) + (dpi->output_fmt ==MEDIA_BUS_FMT_RGB888_2X12_BE )) {clk_set_rate (dpi->pixel_clk, vm.pixelclock *2 ); -else + }else {clk_set_rate (dpi->pixel_clk, vm.pixelclock); - + } vm.pixelclock =clk_get_rate (dpi->pixel_clk);@@ -515,9 +516,15 @@ static int mtk_dpi_set_display_mode(structmtk_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 ; - hsync.sync_width = vm.hsync_len; - hsync.back_porch = vm.hback_porch; - hsync.front_porch = vm.hfront_porch; +if (dpi->conf->is_dpintf) { + hsync.sync_width = vm.hsync_len /4 ; + hsync.back_porch = vm.hback_porch /4 ; + hsync.front_porch = vm.hfront_porch /4 ; + }else { + hsync.sync_width = vm.hsync_len; + hsync.back_porch = vm.hback_porch; + hsync.front_porch = vm.hfront_porch; + }drivers/gpu/drm/mediatek/mtk_dpi.c +15
-5hsync.shift_half_line = false; vsync_lodd.sync_width = vm.vsync_len; vsync_lodd.back_porch = vm.vback_porch;@@ -559,13 +566,20 @@ static int mtk_dpi_set_display_mode(structmtk_dpi *dpi,mtk_dpi_config_channel_limit (dpi );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); +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); +mtk_dpi_enable (dpi); +return 0 ; }@@ -642,7 +656,10 @@ static int mtk_dpi_bridge_atomic_check(struct drm_bridge *bridge, dpi->bit_num =MTK_DPI_OUT_BIT_NUM_8BITS ; dpi->channel_swap =MTK_DPI_OUT_CHANNEL_SWAP_RGB ; dpi->yc_map =MTK_DPI_OUT_YC_MAP_RGB ; - dpi->color_format =MTK_DPI_COLOR_FORMAT_RGB ; +if (out_bus_format ==MEDIA_BUS_FMT_YUYV8_1X16 ) + dpi->color_format =MTK_DPI_COLOR_FORMAT_YCBCR_422_FULL ; +else + dpi->color_format =MTK_DPI_COLOR_FORMAT_RGB ;drivers/gpu/drm/mediatek/mtk_dpi.c +10
-0return 0 ; }@@ -801,6 +818,16 @@ static unsigned int mt8183_calculate_factor(int clock)return 2 ; } +static unsigned int mt8195_dpintf_calculate_factor (int clock) +{ +if (clock <70000 ) +return 4 ; +else if (clock <200000 ) +return 2 ; +else +return 1 ; +} +static const u32 mt8173_output_fmts[] = {MEDIA_BUS_FMT_RGB888_1X24 ,};
drivers/gpu/drm/mediatek/mtk_dpi.c +13
-0@@ -810,6 +837,12 @@ static const u32 mt8183_output_fmts[] = { MEDIA_BUS_FMT_RGB888_2X12_BE, }; +static const u32 mt8195_output_fmts[] = { +MEDIA_BUS_FMT_RGB888_1X24 , +MEDIA_BUS_FMT_YUV8_1X24 , +MEDIA_BUS_FMT_YUYV8_1X16 , +}; +static const struct mtk_dpi_yc_limit mtk_dpi_limit = { .c_bottom =0x0010 , .c_top =0x0FE0 ,@@ -817,6 +850,13 @@ static const struct mtk_dpi_yc_limit mtk_dpi_limit = { .y_top = 0x0FE0, }; +static const struct mtk_dpi_yc_limit mtk_dpintf_limit = { + .c_bottom =0x0000 , + .c_top =0xFFF , + .y_bottom =0x0000 , + .y_top =0xFFF , +}; +static const struct mtk_dpi_conf mt8173_conf = { .cal_factor = mt8173_calculate_factor,drivers/gpu/drm/mediatek/mtk_dpi.c +16
-0.reg_h_fre_con = 0xe0,@@ -882,6 +922,19 @@ static const struct mtk_dpi_conf mt8192_conf = { .limit = &mtk_dpi_limit, }; +static const struct mtk_dpi_conf mt8195_dpintf_conf = { + .cal_factor = mt8195_dpintf_calculate_factor, + .output_fmts = mt8195_output_fmts, + .num_output_fmts =ARRAY_SIZE (mt8195_output_fmts), + .is_dpintf = true, + .dimension_mask =DPINTF_HPW_MASK , + .hvsize_mask =DPINTF_HSIZE_MASK , + .channel_swap_shift =DPINTF_CH_SWAP , + .yuv422_en_bit =DPINTF_YUV422_EN , + .csc_enable_bit =DPINTF_CSC_ENABLE , + .limit = &mtk_dpintf_limit, +}; +static int mtk_dpi_probe (struct platform_device *pdev) {struct device *dev = &pdev->dev;@@ -1004,6 +1057,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 +38
-0@@ -40,10 +40,15 @@#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_CSC_ENABLE BIT(26) +#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@@ -80,8 +85,10 @@#define DPI_SIZE 0x18#define HSIZE 0#define HSIZE_MASK (0x1FFF << 0) +#define DPINTF_HSIZE_MASK (0xFFFF << 0)#define VSIZE 16#define VSIZE_MASK (0x1FFF << 16) +#define DPINTF_VSIZE_MASK (0xFFFF << 16)#define DPI_DDR_SETTING 0x1C#define DDR_EN BIT(0)@@ -93,24 +100,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)@@ -217,4 +230,29 @@#define EDGE_SEL_EN BIT(5)#define H_FRE_2N BIT(25) + +#define DPI_MATRIX_SET 0xB4 +#define INT_MATRIX_SEL BIT(0) +#define INT_MATRIX_SEL_MASK (0x1F << 0) +#define RGB_TO_JPEG 0x00 +#define RGB_TO_FULL709 0x01 +#define RGB_TO_BT601 0x02 +#define RGB_TO_BT709 0x03 +#define JPEG_TO_RGB 0x04 +#define FULL709_TO_RGB 0x05 +#define BT601_TO_RGB 0x06 +#define BT709_TO_RGB 0x07 +#define JPEG_TO_BT601 0x08 +#define JPEG_TO_BT709 0x09 +#define BT601_TO_JPEG 0xA +#define BT709_TO_JPEG 0xB +#define BT709_TO_BT601 0xC +#define BT601_TO_BT709 0xD +#define JPEG_TO_CERGB 0x14 +#define FULL709_TO_CERGB 0x15 +#define BT601_TO_CERGB 0x16 +#define BT709_TO_CERGB 0x17 +#define RGB_TO_CERGB 0x1C +#define MATRIX_BIT BIT(8) +#define EXT_MATRIX_EN BIT(12)#endif /* __MTK_DPI_REGS_H */ drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c +5
-0@@ -351,6 +351,11 @@ static const char * const mtk_ddp_comp_stem[MTK_DDP_COMP_TYPE_MAX] = { [MTK_DISP_WDMA] = "wdma", [MTK_DPI] = "dpi", [MTK_DSI] = "dsi", + [MTK_DP_INTF] = "dp-intf", + [MTK_DISP_PWM] = "pwm", + [MTK_DISP_MUTEX] = "mutex", + [MTK_DISP_OD] = "od", + [MTK_DISP_BLS] = "bls", };struct
mtk_ddp_comp_match{drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c +0
-0@@ -369,6 +374,8 @@ static const struct mtk_ddp_comp_match mtk_ddp_matches[DDP_COMPONENT_ID_MAX] = { [DDP_COMPONENT_DITHER] = { MTK_DISP_DITHER, 0, &ddp_dither }, [DDP_COMPONENT_DPI0] = { MTK_DPI, 0, &ddp_dpi }, [DDP_COMPONENT_DPI1] = { MTK_DPI, 1,
&ddp_dpi},drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c +1
-0+ [DDP_COMPONENT_DP_INTF0] = { MTK_DP_INTF, 0, &ddp_dpi},
drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c +1
-0+ [DDP_COMPONENT_DP_INTF1] = { MTK_DP_INTF, 1, &ddp_dpi},
[DDP_COMPONENT_DSI0] = {MTK_DSI, 0,&ddp_dsi},
[DDP_COMPONENT_DSI1] = {MTK_DSI, 1,&ddp_dsi},
[DDP_COMPONENT_DSI2] = {MTK_DSI, 2,&ddp_dsi},drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c +1
-0@@ -481,6 +488,7 @@ int mtk_ddp_comp_init(struct device_node *node,struct mtk_ddp_comp *comp, type == MTK_DISP_PWM || type == MTK_DISP_RDMA || type == MTK_DPI || + type == MTK_DP_INTF || type == MTK_DSI) return 0;drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h +1
-0@@ -34,6 +34,7 @@ enum mtk_ddp_comp_type {MTK_DISP_UFOE ,MTK_DISP_WDMA ,MTK_DPI , +MTK_DP_INTF ,MTK_DSI , MTK_DDP_COMP_TYPE_MAX, };drivers/gpu/drm/mediatek/mtk_drm_drv.c +2
-0@@ -509,6 +509,8 @@ static const struct of_device_id mtk_ddp_comp_dt_ids[] = { .data = (void *)MTK_DPI }, { .compatible = "mediatek,mt8183-dpi", .data = (void *)MTK_DPI }, + { .compatible = "mediatek,mt8195-dpintf", + .data = (void *)MTK_DP_INTF }, { .compatible = "mediatek,mt2701-dsi", .data = (void *)MTK_DSI },drivers/gpu/drm/mediatek/mtk_drm_drv.c +0
-0{ .compatible = "mediatek,mt8173-dsi",
drivers/gpu/drm/mediatek/mtk_drm_drv.c static int mtk_drm_probe(struct platform_device · line 616
Quoted 7 lines
drivers/gpu/drm/mediatek/mtk_drm_drv.c +2
-1@@ -609,7 +611,8 @@ static int mtk_drm_probe(struct platform_device *pdev) comp_type == MTK_DISP_OVL_2L || comp_type == MTK_DISP_RDMA || comp_type == MTK_DPI || - comp_type == MTK_DSI) { + comp_type == MTK_DPI || + comp_type == MTK_DP_INTF) {
Hello Guillaume,
Is this modification correct?MTK_DPI appears twice and MTK_DSI is removed.
BRs,
Rex
Quoted 19 lines
drivers/gpu/drm/mediatek/mtk_drm_drv.c +0
-0dev_info(dev, "Adding component match for %pOF\n",drivers/gpu/drm/mediatek/mtk_drm_drv.c +0
-0node); drm_of_component_match_add(dev, &match,
component_compare_of,include/linux/soc/mediatek/mtk-mmsys.h +2
-0@@ -19,6 +19,8 @@ enum mtk_ddp_comp_id {DDP_COMPONENT_DITHER ,DDP_COMPONENT_DPI0 ,DDP_COMPONENT_DPI1 , +DDP_COMPONENT_DP_INTF0 , +DDP_COMPONENT_DP_INTF1 ,DDP_COMPONENT_DSI0 ,DDP_COMPONENT_DSI1 , DDP_COMPONENT_DSI2,
Re: [PATCH v9 15/22] drm/mediatek: dpi: Add dpintf support
Quoted 384 lines · Rex-BC Chen
Quoted 373 lines · Guillaume Ranquet
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]>Signed-off-by Guillaume Ranquet <[email protected]>Reviewed-by AngeloGioacchino Del Regno <--- drivers/gpu/drm/mediatek/mtk_dpi.c | 78 ++++++++++++++++++- -- drivers/gpu/drm/mediatek/mtk_dpi_regs.h | 38 ++++++++++ drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 8 +++ drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 1 + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 5 +- include/linux/soc/mediatek/mtk-mmsys.h | 2 + 6 files changed, 120 insertions(+), 12 deletions(-)drivers/gpu/drm/mediatek/mtk_dpi.c +1
-0@@ -126,6 +126,7 @@ struct mtk_dpi_conf {const u32 *output_fmts;u32 num_output_fmts;bool is_ck_de_pol; +bool is_dpintf;bool swap_input_support;/* Mask used for HWIDTH, HPORCH, VSYNC_WIDTH and VSYNC_PORCH (no shift) */
drivers/gpu/drm/mediatek/mtk_dpi.c +12
-6u32 dimension_mask;@@ -498,11 +499,11 @@ static int mtk_dpi_set_display_mode(struct mtk_dpi *dpi, vm.pixelclock = pll_rate / factor;if ((dpi->output_fmt ==MEDIA_BUS_FMT_RGB888_2X12_LE ) || - (dpi->output_fmt ==MEDIA_BUS_FMT_RGB888_2X12_BE )) + (dpi->output_fmt ==MEDIA_BUS_FMT_RGB888_2X12_BE )) {clk_set_rate (dpi->pixel_clk, vm.pixelclock *2 ); -else + }else {clk_set_rate (dpi->pixel_clk, vm.pixelclock); - + } vm.pixelclock =clk_get_rate (dpi->pixel_clk);@@ -515,9 +516,15 @@ static int mtk_dpi_set_display_mode(structmtk_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 ; - hsync.sync_width = vm.hsync_len; - hsync.back_porch = vm.hback_porch; - hsync.front_porch = vm.hfront_porch; +if (dpi->conf->is_dpintf) { + hsync.sync_width = vm.hsync_len /4 ; + hsync.back_porch = vm.hback_porch /4 ; + hsync.front_porch = vm.hfront_porch /4 ; + }else { + hsync.sync_width = vm.hsync_len; + hsync.back_porch = vm.hback_porch; + hsync.front_porch = vm.hfront_porch; + }drivers/gpu/drm/mediatek/mtk_dpi.c +15
-5hsync.shift_half_line = false; vsync_lodd.sync_width = vm.vsync_len; vsync_lodd.back_porch = vm.vback_porch;@@ -559,13 +566,20 @@ static int mtk_dpi_set_display_mode(structmtk_dpi *dpi,mtk_dpi_config_channel_limit (dpi );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); +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); +mtk_dpi_enable (dpi); +return 0 ; }@@ -642,7 +656,10 @@ static int mtk_dpi_bridge_atomic_check(struct drm_bridge *bridge, dpi->bit_num =MTK_DPI_OUT_BIT_NUM_8BITS ; dpi->channel_swap =MTK_DPI_OUT_CHANNEL_SWAP_RGB ; dpi->yc_map =MTK_DPI_OUT_YC_MAP_RGB ; - dpi->color_format =MTK_DPI_COLOR_FORMAT_RGB ; +if (out_bus_format ==MEDIA_BUS_FMT_YUYV8_1X16 ) + dpi->color_format =MTK_DPI_COLOR_FORMAT_YCBCR_422_FULL ; +else + dpi->color_format =MTK_DPI_COLOR_FORMAT_RGB ;drivers/gpu/drm/mediatek/mtk_dpi.c +10
-0return 0 ; }@@ -801,6 +818,16 @@ static unsigned int mt8183_calculate_factor(int clock)return 2 ; } +static unsigned int mt8195_dpintf_calculate_factor (int clock) +{ +if (clock <70000 ) +return 4 ; +else if (clock <200000 ) +return 2 ; +else +return 1 ; +} +static const u32 mt8173_output_fmts[] = {MEDIA_BUS_FMT_RGB888_1X24 ,};
drivers/gpu/drm/mediatek/mtk_dpi.c +13
-0@@ -810,6 +837,12 @@ static const u32 mt8183_output_fmts[] = { MEDIA_BUS_FMT_RGB888_2X12_BE, }; +static const u32 mt8195_output_fmts[] = { +MEDIA_BUS_FMT_RGB888_1X24 , +MEDIA_BUS_FMT_YUV8_1X24 , +MEDIA_BUS_FMT_YUYV8_1X16 , +}; +static const struct mtk_dpi_yc_limit mtk_dpi_limit = { .c_bottom =0x0010 , .c_top =0x0FE0 ,@@ -817,6 +850,13 @@ static const struct mtk_dpi_yc_limit mtk_dpi_limit = { .y_top = 0x0FE0, }; +static const struct mtk_dpi_yc_limit mtk_dpintf_limit = { + .c_bottom =0x0000 , + .c_top =0xFFF , + .y_bottom =0x0000 , + .y_top =0xFFF , +}; +static const struct mtk_dpi_conf mt8173_conf = { .cal_factor = mt8173_calculate_factor,drivers/gpu/drm/mediatek/mtk_dpi.c +16
-0.reg_h_fre_con = 0xe0,@@ -882,6 +922,19 @@ static const struct mtk_dpi_conf mt8192_conf = { .limit = &mtk_dpi_limit, }; +static const struct mtk_dpi_conf mt8195_dpintf_conf = { + .cal_factor = mt8195_dpintf_calculate_factor, + .output_fmts = mt8195_output_fmts, + .num_output_fmts =ARRAY_SIZE (mt8195_output_fmts), + .is_dpintf = true, + .dimension_mask =DPINTF_HPW_MASK , + .hvsize_mask =DPINTF_HSIZE_MASK , + .channel_swap_shift =DPINTF_CH_SWAP , + .yuv422_en_bit =DPINTF_YUV422_EN , + .csc_enable_bit =DPINTF_CSC_ENABLE , + .limit = &mtk_dpintf_limit, +}; +static int mtk_dpi_probe (struct platform_device *pdev) {struct device *dev = &pdev->dev;@@ -1004,6 +1057,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 +38
-0@@ -40,10 +40,15 @@#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_CSC_ENABLE BIT(26) +#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@@ -80,8 +85,10 @@#define DPI_SIZE 0x18#define HSIZE 0#define HSIZE_MASK (0x1FFF << 0) +#define DPINTF_HSIZE_MASK (0xFFFF << 0)#define VSIZE 16#define VSIZE_MASK (0x1FFF << 16) +#define DPINTF_VSIZE_MASK (0xFFFF << 16)#define DPI_DDR_SETTING 0x1C#define DDR_EN BIT(0)@@ -93,24 +100,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)@@ -217,4 +230,29 @@#define EDGE_SEL_EN BIT(5)#define H_FRE_2N BIT(25) + +#define DPI_MATRIX_SET 0xB4 +#define INT_MATRIX_SEL BIT(0) +#define INT_MATRIX_SEL_MASK (0x1F << 0) +#define RGB_TO_JPEG 0x00 +#define RGB_TO_FULL709 0x01 +#define RGB_TO_BT601 0x02 +#define RGB_TO_BT709 0x03 +#define JPEG_TO_RGB 0x04 +#define FULL709_TO_RGB 0x05 +#define BT601_TO_RGB 0x06 +#define BT709_TO_RGB 0x07 +#define JPEG_TO_BT601 0x08 +#define JPEG_TO_BT709 0x09 +#define BT601_TO_JPEG 0xA +#define BT709_TO_JPEG 0xB +#define BT709_TO_BT601 0xC +#define BT601_TO_BT709 0xD +#define JPEG_TO_CERGB 0x14 +#define FULL709_TO_CERGB 0x15 +#define BT601_TO_CERGB 0x16 +#define BT709_TO_CERGB 0x17 +#define RGB_TO_CERGB 0x1C +#define MATRIX_BIT BIT(8) +#define EXT_MATRIX_EN BIT(12)#endif /* __MTK_DPI_REGS_H */ drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c +5
-0@@ -351,6 +351,11 @@ static const char * const mtk_ddp_comp_stem[MTK_DDP_COMP_TYPE_MAX] = { [MTK_DISP_WDMA] = "wdma", [MTK_DPI] = "dpi", [MTK_DSI] = "dsi", + [MTK_DP_INTF] = "dp-intf", + [MTK_DISP_PWM] = "pwm", + [MTK_DISP_MUTEX] = "mutex", + [MTK_DISP_OD] = "od", + [MTK_DISP_BLS] = "bls", };struct
mtk_ddp_comp_match{drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c +0
-0@@ -369,6 +374,8 @@ static const struct mtk_ddp_comp_match mtk_ddp_matches[DDP_COMPONENT_ID_MAX] = { [DDP_COMPONENT_DITHER] = { MTK_DISP_DITHER, 0, &ddp_dither }, [DDP_COMPONENT_DPI0] = { MTK_DPI, 0, &ddp_dpi }, [DDP_COMPONENT_DPI1] = { MTK_DPI, 1,
&ddp_dpi},drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c +1
-0+ [DDP_COMPONENT_DP_INTF0] = { MTK_DP_INTF, 0, &ddp_dpi},
drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c +1
-0+ [DDP_COMPONENT_DP_INTF1] = { MTK_DP_INTF, 1, &ddp_dpi},
[DDP_COMPONENT_DSI0] = {MTK_DSI, 0,&ddp_dsi},
[DDP_COMPONENT_DSI1] = {MTK_DSI, 1,&ddp_dsi},
[DDP_COMPONENT_DSI2] = {MTK_DSI, 2,&ddp_dsi},drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c +1
-0@@ -481,6 +488,7 @@ int mtk_ddp_comp_init(struct device_node *node,struct mtk_ddp_comp *comp, type == MTK_DISP_PWM || type == MTK_DISP_RDMA || type == MTK_DPI || + type == MTK_DP_INTF || type == MTK_DSI) return 0;drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h +1
-0@@ -34,6 +34,7 @@ enum mtk_ddp_comp_type {MTK_DISP_UFOE ,MTK_DISP_WDMA ,MTK_DPI , +MTK_DP_INTF ,MTK_DSI , MTK_DDP_COMP_TYPE_MAX, };drivers/gpu/drm/mediatek/mtk_drm_drv.c +2
-0@@ -509,6 +509,8 @@ static const struct of_device_id mtk_ddp_comp_dt_ids[] = { .data = (void *)MTK_DPI }, { .compatible = "mediatek,mt8183-dpi", .data = (void *)MTK_DPI }, + { .compatible = "mediatek,mt8195-dpintf", + .data = (void *)MTK_DP_INTF }, { .compatible = "mediatek,mt2701-dsi", .data = (void *)MTK_DSI },drivers/gpu/drm/mediatek/mtk_drm_drv.c +0
-0{ .compatible = "mediatek,mt8173-dsi",drivers/gpu/drm/mediatek/mtk_drm_drv.c static int mtk_drm_probe(struct platform_device · line 616
Quoted 7 lines
drivers/gpu/drm/mediatek/mtk_drm_drv.c +2
-1@@ -609,7 +611,8 @@ static int mtk_drm_probe(struct platform_device *pdev) comp_type == MTK_DISP_OVL_2L || comp_type == MTK_DISP_RDMA || comp_type == MTK_DPI || - comp_type == MTK_DSI) { + comp_type == MTK_DPI || + comp_type == MTK_DP_INTF) {Hello Guillaume,
Quoted 3 lines
Is this modification correct?
MTK_DPIappears twice andMTK_DSIis removed.
This is not correct, I've messed up my rebase it seems.
Thx for your review.
Quoted 24 lines
BRs,
RexQuoted 19 lines
drivers/gpu/drm/mediatek/mtk_drm_drv.c +0
-0dev_info(dev, "Adding component match for %pOF\n",drivers/gpu/drm/mediatek/mtk_drm_drv.c +0
-0node); drm_of_component_match_add(dev, &match,
component_compare_of,include/linux/soc/mediatek/mtk-mmsys.h +2
-0@@ -19,6 +19,8 @@ enum mtk_ddp_comp_id {DDP_COMPONENT_DITHER ,DDP_COMPONENT_DPI0 ,DDP_COMPONENT_DPI1 , +DDP_COMPONENT_DP_INTF0 , +DDP_COMPONENT_DP_INTF1 ,DDP_COMPONENT_DSI0 ,DDP_COMPONENT_DSI1 , DDP_COMPONENT_DSI2,
PATCH v9 16/22 drm/meditek: dpi: Add matrix_sel helper
In reply to Guillaume RanquetAdd a mtk_dpi_matrix_sel() helper to update the DPI_MATRIX_SET register depending on the color format.
--- drivers/gpu/drm/mediatek/mtk_dpi.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
drivers/gpu/drm/mediatek/mtk_dpi.c +21 -0
@@ -385,6 +385,25 @@ static void mtk_dpi_config_disable_edge(struct mtk_dpi *dpi)mtk_dpi_mask (dpi, dpi->conf->reg_h_fre_con,0 ,EDGE_SEL_EN ); } +static void mtk_dpi_matrix_sel (struct mtk_dpi *dpi,enum mtk_dpi_out_color_format format) +{ +u32 matrix_sel =0 ; + +switch (format) { +case MTK_DPI_COLOR_FORMAT_YCBCR_422 : +case MTK_DPI_COLOR_FORMAT_YCBCR_422_FULL : +case MTK_DPI_COLOR_FORMAT_YCBCR_444 : +case MTK_DPI_COLOR_FORMAT_YCBCR_444_FULL : +case MTK_DPI_COLOR_FORMAT_XV_YCC : +if (dpi->mode.hdisplay <=720 ) + matrix_sel =0x2 ; +break ; +default : +break ; + } +mtk_dpi_mask (dpi,DPI_MATRIX_SET , matrix_sel,INT_MATRIX_SEL_MASK ); +} +static void mtk_dpi_config_color_format (struct mtk_dpi *dpi,enum mtk_dpi_out_color_format format) {
@@ -392,6 +411,7 @@ static void mtk_dpi_config_color_format(struct mtk_dpi *dpi, (format == MTK_DPI_COLOR_FORMAT_YCBCR_444_FULL)) {mtk_dpi_config_yuv422_enable (dpi, false);mtk_dpi_config_csc_enable (dpi, true); +mtk_dpi_matrix_sel (dpi, format);if (dpi->conf->swap_input_support)mtk_dpi_config_swap_input (dpi, false);mtk_dpi_config_channel_swap (dpi,MTK_DPI_OUT_CHANNEL_SWAP_BGR );
@@ -399,6 +419,7 @@ static void mtk_dpi_config_color_format(struct mtk_dpi *dpi, (format == MTK_DPI_COLOR_FORMAT_YCBCR_422_FULL)) {mtk_dpi_config_yuv422_enable (dpi, true);mtk_dpi_config_csc_enable (dpi, true); +mtk_dpi_matrix_sel (dpi, format);if (dpi->conf->swap_input_support)mtk_dpi_config_swap_input (dpi, true);mtk_dpi_config_channel_swap (dpi,MTK_DPI_OUT_CHANNEL_SWAP_RGB );
Signature · 1 line
2.34.1
Re: [PATCH v9 16/22] drm/meditek: dpi: Add matrix_sel helper
Quoted 62 lines · Guillaume Ranquet
Add a
mtk_dpi_matrix_sel()helper to update theDPI_MATRIX_SETregister depending on the color format.Signed-off-by Guillaume Ranquet <[email protected]>--- drivers/gpu/drm/mediatek/mtk_dpi.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)drivers/gpu/drm/mediatek/mtk_dpi.c +17
-0@@ -385,6 +385,25 @@ static void mtk_dpi_config_disable_edge(struct mtk_dpi *dpi) mtk_dpi_mask(dpi, dpi->conf->reg_h_fre_con, 0, EDGE_SEL_EN); } +static void mtk_dpi_matrix_sel (struct mtk_dpi *dpi,enum mtk_dpi_out_color_format format) +{ + u32 matrix_sel = 0; + + switch (format) { +case MTK_DPI_COLOR_FORMAT_YCBCR_422 : +case MTK_DPI_COLOR_FORMAT_YCBCR_422_FULL : +case MTK_DPI_COLOR_FORMAT_YCBCR_444 : +case MTK_DPI_COLOR_FORMAT_YCBCR_444_FULL : +case MTK_DPI_COLOR_FORMAT_XV_YCC : +if (dpi->mode.hdisplay <=720 ) + matrix_sel =0x2 ; +break ; +default : +break ; + } + mtk_dpi_mask(dpi, DPI_MATRIX_SET, matrix_sel,
INT_MATRIX_SEL_MASK);drivers/gpu/drm/mediatek/mtk_dpi.c +2
-0+} +static void mtk_dpi_config_color_format (struct mtk_dpi *dpi, enum mtk_dpi_out_color_formatformat)
{drivers/gpu/drm/mediatek/mtk_dpi.c +1
-0@@ -392,6 +411,7 @@ static void mtk_dpi_config_color_format(structmtk_dpi *dpi, (format == MTK_DPI_COLOR_FORMAT_YCBCR_444_FULL)) {mtk_dpi_config_yuv422_enable (dpi ,false );mtk_dpi_config_csc_enable (dpi, true); +mtk_dpi_matrix_sel (dpi, format);if (dpi->conf->swap_input_support)mtk_dpi_config_swap_input (dpi, false);mtk_dpi_config_channel_swap(dpi,
MTK_DPI_OUT_CHANNEL_SWAP_BGR);drivers/gpu/drm/mediatek/mtk_dpi.c +1
-0@@ -399,6 +419,7 @@ static void mtk_dpi_config_color_format(structmtk_dpi *dpi, (format == MTK_DPI_COLOR_FORMAT_YCBCR_422_FULL)) {mtk_dpi_config_yuv422_enable (dpi ,true );mtk_dpi_config_csc_enable (dpi, true); +mtk_dpi_matrix_sel (dpi, format);if (dpi->conf->swap_input_support)mtk_dpi_config_swap_input (dpi, true);
Quoted 2 lines
mtk_dpi_config_channel_swap(dpi,
MTK_DPI_OUT_CHANNEL_SWAP_RGB);
Hello Guillaume,
Thanks for your patch.
I have one question:
Do this setting affect the dpi for previous SoCs? (8183, 8192, or 8186)
If we can confirm the original register setting for this offset in 8183/8192/8186, I think we can clarify this question.
BRs,
Rex
Re: [PATCH v9 16/22] drm/meditek: dpi: Add matrix_sel helper
Quoted 68 lines · Rex-BC Chen
Quoted 62 lines · Guillaume Ranquet
Add a
mtk_dpi_matrix_sel()helper to update theDPI_MATRIX_SETregister depending on the color format.Signed-off-by Guillaume Ranquet <[email protected]>--- drivers/gpu/drm/mediatek/mtk_dpi.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)drivers/gpu/drm/mediatek/mtk_dpi.c +17
-0@@ -385,6 +385,25 @@ static void mtk_dpi_config_disable_edge(struct mtk_dpi *dpi) mtk_dpi_mask(dpi, dpi->conf->reg_h_fre_con, 0, EDGE_SEL_EN); } +static void mtk_dpi_matrix_sel (struct mtk_dpi *dpi,enum mtk_dpi_out_color_format format) +{ + u32 matrix_sel = 0; + + switch (format) { +case MTK_DPI_COLOR_FORMAT_YCBCR_422 : +case MTK_DPI_COLOR_FORMAT_YCBCR_422_FULL : +case MTK_DPI_COLOR_FORMAT_YCBCR_444 : +case MTK_DPI_COLOR_FORMAT_YCBCR_444_FULL : +case MTK_DPI_COLOR_FORMAT_XV_YCC : +if (dpi->mode.hdisplay <=720 ) + matrix_sel =0x2 ; +break ; +default : +break ; + } + mtk_dpi_mask(dpi, DPI_MATRIX_SET, matrix_sel,
INT_MATRIX_SEL_MASK);drivers/gpu/drm/mediatek/mtk_dpi.c +2
-0+} +static void mtk_dpi_config_color_format (struct mtk_dpi *dpi, enum mtk_dpi_out_color_formatformat)
{drivers/gpu/drm/mediatek/mtk_dpi.c +1
-0@@ -392,6 +411,7 @@ static void mtk_dpi_config_color_format(structmtk_dpi *dpi, (format == MTK_DPI_COLOR_FORMAT_YCBCR_444_FULL)) {mtk_dpi_config_yuv422_enable (dpi ,false );mtk_dpi_config_csc_enable (dpi, true); +mtk_dpi_matrix_sel (dpi, format);if (dpi->conf->swap_input_support)mtk_dpi_config_swap_input (dpi, false);mtk_dpi_config_channel_swap(dpi,
MTK_DPI_OUT_CHANNEL_SWAP_BGR);drivers/gpu/drm/mediatek/mtk_dpi.c +1
-0@@ -399,6 +419,7 @@ static void mtk_dpi_config_color_format(structmtk_dpi *dpi, (format == MTK_DPI_COLOR_FORMAT_YCBCR_422_FULL)) {mtk_dpi_config_yuv422_enable (dpi ,true );mtk_dpi_config_csc_enable (dpi, true); +mtk_dpi_matrix_sel (dpi, format);if (dpi->conf->swap_input_support)mtk_dpi_config_swap_input (dpi, true);Quoted 2 lines
mtk_dpi_config_channel_swap(dpi,
MTK_DPI_OUT_CHANNEL_SWAP_RGB);Hello Guillaume,
Quoted 7 lines
Thanks for your patch.
I have one question:
Do this setting affect the dpi for previous SoCs? (8183, 8192, or 8186)
If we can confirm the original register setting for this offset in 8183/8192/8186, I think we can clarify this question.
I've checked in the datasheet I have (8365/8385) that this register and setting exists.
So yes, it will affect other platforms.
Quoted 3 lines
BRs,
Rex
PATCH v9 17/22 phy: phy-mtk-dp: Add driver for DP phy
In reply to Guillaume RanquetFrom: Markus Schneider-Pargmann <[email protected]>
This is a new driver that supports the integrated DisplayPort phy for mediatek SoCs, especially the mt8195. The phy is integrated into the DisplayPort controller and will be created by the mtk-dp driver. This driver expects a struct regmap to be able to work on the same registers as the DisplayPort controller. It sets the device data to be the struct phy so that the DisplayPort controller can easily work with it.
The driver does not have any devicetree bindings because the datasheet does not list the controller and the phy as distinct units.
The interaction with the controller can be covered by the configure callback of the phy framework and its displayport parameters.
--- MAINTAINERS | 1 + drivers/phy/mediatek/Kconfig | 8 ++ drivers/phy/mediatek/Makefile | 1 + drivers/phy/mediatek/phy-mtk-dp.c | 201 ++++++++++++++++++++++++++++++ 4 files changed, 211 insertions(+) create mode 100644 drivers/phy/mediatek/phy-mtk-dp.c
MAINTAINERS +1 -0
@@ -6604,6 +6604,7 @@ L: [email protected] (moderated for non-subscribers) S: Supported F: Documentation/devicetree/bindings/display/mediatek/ F: drivers/gpu/drm/mediatek/ +F: drivers/phy/mediatek/phy-mtk-dp.c F: drivers/phy/mediatek/phy-mtk-hdmi* F: drivers/phy/mediatek/phy-mtk-mipi*
drivers/phy/mediatek/Kconfig +8 -0
@@ -55,3 +55,11 @@ config PHY_MTK_MIPI_DSI select GENERIC_PHY help Support MIPI DSI for Mediatek SoCs. + +config PHY_MTK_DP + tristate "MediaTek DP-PHY Driver" + depends on ARCH_MEDIATEK || COMPILE_TEST + depends on OF + select GENERIC_PHY + help + Support DisplayPort PHY for Mediatek SoCs.
drivers/phy/mediatek/Makefile +1 -0
@@ -3,6 +3,7 @@ # Makefile for the phy drivers. # +obj-$(CONFIG_PHY_MTK_DP) += phy-mtk-dp.o obj-$(CONFIG_PHY_MTK_TPHY) += phy-mtk-tphy.o obj-$(CONFIG_PHY_MTK_UFS) += phy-mtk-ufs.o obj-$(CONFIG_PHY_MTK_XSPHY) += phy-mtk-xsphy.o
drivers/phy/mediatek/phy-mtk-dp.c new file +201 -0
201 lines not on this page · raw message
Signature · 1 line
2.34.1
AngeloGioacchino Del Regno
maintainerRe: [PATCH v9 17/22] phy: phy-mtk-dp: Add driver for DP phy
Il 28/03/22 00:39, Guillaume Ranquet ha scritto:
Quoted 25 lines
From: Markus Schneider-Pargmann <[email protected]>
This is a new driver that supports the integrated DisplayPort phy for mediatek SoCs, especially the mt8195. The phy is integrated into the DisplayPort controller and will be created by the mtk-dp driver. This driver expects a struct regmap to be able to work on the same registers as the DisplayPort controller. It sets the device data to be the struct phy so that the DisplayPort controller can easily work with it.
The driver does not have any devicetree bindings because the datasheet does not list the controller and the phy as distinct units.
The interaction with the controller can be covered by the configure callback of the phy framework and its displayport parameters.
Signed-off-by Markus Schneider-Pargmann <[email protected]>Signed-off-by Guillaume Ranquet <[email protected]>--- MAINTAINERS | 1 + drivers/phy/mediatek/Kconfig | 8 ++ drivers/phy/mediatek/Makefile | 1 + drivers/phy/mediatek/phy-mtk-dp.c | 201 ++++++++++++++++++++++++++++++ 4 files changed, 211 insertions(+)create mode 100644
drivers/phy/mediatek/phy-mtk-dp.c
..snip..
Quoted 5 lines
drivers/phy/mediatek/phy-mtk-dp.c new file +0
-0
..snip..
drivers/phy/mediatek/phy-mtk-dp.c line 171
Quoted 10 lines
drivers/phy/mediatek/phy-mtk-dp.c new file +10
-0+ +static int mtk_dp_phy_probe (struct platform_device *pdev) +{ +struct device *dev = &pdev->dev; +struct mtk_dp_phy *dp_phy; +struct phy *phy; +struct regmap *regs; + + regs =syscon_regmap_lookup_by_phandle (dev->of_node,"mediatek,dp-syscon" ); +
Please drop this blank line
drivers/phy/mediatek/phy-mtk-dp.c line 182
Quoted 11 lines
drivers/phy/mediatek/phy-mtk-dp.c new file +11
-0+if (IS_ERR (regs)) +return PTR_ERR (regs); + + dp_phy =devm_kzalloc (dev,sizeof (*dp_phy),GFP_KERNEL ); +if (!dp_phy) +return -ENOMEM ; + + dp_phy->regs = regs; + + phy =devm_phy_create (dev,NULL , &mtk_dp_phy_dev_ops); +
Same here
drivers/phy/mediatek/phy-mtk-dp.c line 185
Quoted 3 lines
drivers/phy/mediatek/phy-mtk-dp.c new file +3
-0+if (IS_ERR (phy)) +return dev_err_probe (dev,PTR_ERR (phy),"Failed to create DP PHY: %ld\n" ,PTR_ERR (phy)); +
Using dev_err_probe automates printing the error, so the correct usage is:
return dev_err_probe(dev, PTR_ERR(phy), "Failed to create DP PHY\n");
drivers/phy/mediatek/phy-mtk-dp.c line 197
Quoted 12 lines
drivers/phy/mediatek/phy-mtk-dp.c new file +12
-0+phy_set_drvdata (phy, dp_phy); + +return 0 ; +} + +struct platform_driver mtk_dp_phy_driver = { + .probe = mtk_dp_phy_probe, + .driver = { + .name ="mediatek-dp-phy" , + }, +}; +module_platform_driver (mtk_dp_phy_driver);
Also, in your dt-binding, you mention a compatible for this driver, but I don't see any, here. This means that you do know what to do, so please do it.
Regards,
Angelo
Quoted 4 lines
drivers/phy/mediatek/phy-mtk-dp.c new file +4
-0+ +MODULE_AUTHOR ("Markus Schneider-Pargmann <[email protected]>" ); +MODULE_DESCRIPTION ("MediaTek DP PHY Driver" ); +MODULE_LICENSE ("GPL" );
Re: [PATCH v9 17/22] phy: phy-mtk-dp: Add driver for DP phy
Quoted 72 lines · AngeloGioacchino Del Regno
Il 28/03/22 00:39, Guillaume Ranquet ha scritto:
Quoted 25 lines
From: Markus Schneider-Pargmann <[email protected]>
This is a new driver that supports the integrated DisplayPort phy for mediatek SoCs, especially the mt8195. The phy is integrated into the DisplayPort controller and will be created by the mtk-dp driver. This driver expects a struct regmap to be able to work on the same registers as the DisplayPort controller. It sets the device data to be the struct phy so that the DisplayPort controller can easily work with it.
The driver does not have any devicetree bindings because the datasheet does not list the controller and the phy as distinct units.
The interaction with the controller can be covered by the configure callback of the phy framework and its displayport parameters.
Signed-off-by Markus Schneider-Pargmann <[email protected]>Signed-off-by Guillaume Ranquet <[email protected]>--- MAINTAINERS | 1 + drivers/phy/mediatek/Kconfig | 8 ++ drivers/phy/mediatek/Makefile | 1 + drivers/phy/mediatek/phy-mtk-dp.c | 201 ++++++++++++++++++++++++++++++ 4 files changed, 211 insertions(+)create mode 100644
drivers/phy/mediatek/phy-mtk-dp.c..snip..
Quoted 5 lines
drivers/phy/mediatek/phy-mtk-dp.c new file +0
-0..snip..
drivers/phy/mediatek/phy-mtk-dp.c line 171
Quoted 10 lines
drivers/phy/mediatek/phy-mtk-dp.c new file +10
-0+ +static int mtk_dp_phy_probe (struct platform_device *pdev) +{ +struct device *dev = &pdev->dev; +struct mtk_dp_phy *dp_phy; +struct phy *phy; +struct regmap *regs; + + regs =syscon_regmap_lookup_by_phandle (dev->of_node,"mediatek,dp-syscon" ); +Please drop this blank line
drivers/phy/mediatek/phy-mtk-dp.c line 182
Quoted 11 lines
drivers/phy/mediatek/phy-mtk-dp.c new file +11
-0+if (IS_ERR (regs)) +return PTR_ERR (regs); + + dp_phy =devm_kzalloc (dev,sizeof (*dp_phy),GFP_KERNEL ); +if (!dp_phy) +return -ENOMEM ; + + dp_phy->regs = regs; + + phy =devm_phy_create (dev,NULL , &mtk_dp_phy_dev_ops); +Same here
drivers/phy/mediatek/phy-mtk-dp.c line 185
Quoted 3 lines
drivers/phy/mediatek/phy-mtk-dp.c new file +3
-0+if (IS_ERR (phy)) +return dev_err_probe (dev,PTR_ERR (phy),"Failed to create DP PHY: %ld\n" ,PTR_ERR (phy)); +Using
dev_err_probeautomates printing the error, so the correct usage is:return
dev_err_probe(dev, PTR_ERR(phy), "Failed to create DP PHY\n");
Quoted 16 lines
drivers/phy/mediatek/phy-mtk-dp.c line 197
Quoted 12 lines
drivers/phy/mediatek/phy-mtk-dp.c new file +12
-0+phy_set_drvdata (phy, dp_phy); + +return 0 ; +} + +struct platform_driver mtk_dp_phy_driver = { + .probe = mtk_dp_phy_probe, + .driver = { + .name ="mediatek-dp-phy" , + }, +}; +module_platform_driver (mtk_dp_phy_driver);Also, in your dt-binding, you mention a compatible for this driver, but I don't see any, here. This means that you do know what to do, so please do it.
Following the comments from rob [1], I'll revert back to using platform_device_register_data() from v8.
[1] https://lore.kernel.org/linux-mediatek/YkOPB5W7uXkOc72%[email protected]/
Quoted 8 lines
Regards,
AngeloQuoted 4 lines
drivers/phy/mediatek/phy-mtk-dp.c new file +4
-0+ +MODULE_AUTHOR ("Markus Schneider-Pargmann <[email protected]>" ); +MODULE_DESCRIPTION ("MediaTek DP PHY Driver" ); +MODULE_LICENSE ("GPL" );
PATCH v9 18/22 drm/mediatek: Add mt8195 Embedded DisplayPort driver
In reply to Guillaume RanquetFrom: Markus Schneider-Pargmann <[email protected]>
This patch adds a DisplayPort driver for the Mediatek mt8195 SoC.
It supports the mt8195, the embedded DisplayPort units. It offers DisplayPort 1.4 with up to 4 lanes.
The driver shares its iomap range with the mtk-dp-phy driver using the regmap/syscon facility.
This driver is based on an initial version by
Jason-JH.Lin <[email protected]>.
--- drivers/gpu/drm/mediatek/Kconfig | 8 + drivers/gpu/drm/mediatek/Makefile | 2 + drivers/gpu/drm/mediatek/mtk_dp.c | 2221 ++++++++++++++++++++++++ drivers/gpu/drm/mediatek/mtk_dp_reg.h | 568 ++++++ drivers/gpu/drm/mediatek/mtk_drm_drv.c | 1 + drivers/gpu/drm/mediatek/mtk_drm_drv.h | 1 + 6 files changed, 2801 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 +8 -0
@@ -28,3 +28,11 @@ 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 PHY_MTK_DP + select DRM_DP_HELPER + help + DRM/KMS Display Port driver for Mediatek SoCs.
drivers/gpu/drm/mediatek/Makefile +2 -0
@@ -21,3 +21,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 +2221 -0
2,221 lines not on this page · raw message
drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +568 -0
568 lines not on this page · raw message
drivers/gpu/drm/mediatek/mtk_drm_drv.c +1 -0
@@ -709,6 +709,7 @@ static struct platform_driver * const mtk_drm_drivers[] = { &mtk_disp_ovl_driver, &mtk_disp_rdma_driver, &mtk_dpi_driver, + &mtk_dp_driver, &mtk_drm_platform_driver, &mtk_dsi_driver, };
drivers/gpu/drm/mediatek/mtk_drm_drv.h +1 -0
@@ -53,6 +53,7 @@ extern struct platform_driver mtk_disp_gamma_driver;extern struct platform_driver mtk_disp_ovl_driver;extern struct platform_driver mtk_disp_rdma_driver;extern struct platform_driver mtk_dpi_driver; +extern struct platform_driver mtk_dp_driver;extern struct platform_driver mtk_dsi_driver;#endif /* MTK_DRM_DRV_H */
Signature · 1 line
2.34.1
AngeloGioacchino Del Regno
maintainerRe: [PATCH v9 18/22] drm/mediatek: Add mt8195 Embedded DisplayPort driver
Il 28/03/22 00:39, Guillaume Ranquet ha scritto:
Quoted 10 lines
From: Markus Schneider-Pargmann <[email protected]>
This patch adds a DisplayPort driver for the Mediatek mt8195 SoC.
It supports the mt8195, the embedded DisplayPort units. It offers DisplayPort 1.4 with up to 4 lanes.
The driver shares its iomap range with the mtk-dp-phy driver using the regmap/syscon facility.
Quoted 6 lines
This driver is based on an initial version by
Jason-JH.Lin <[email protected]>.Signed-off-by Markus Schneider-Pargmann <[email protected]>Signed-off-by Guillaume Ranquet <[email protected]>Reported-by kernel test robot <[email protected]>
Hello Guillaume,
as you know, there's some more work to do on this driver.
I will also mention here, not on the code, that at this point, your mtk_dp_aux_transfer() function has something VERY similar to function drm_dp_dpcd_access(), so I really believe that you can instead use functions drm_dp_dpcd_read() and drm_dp_dpcd_write(), avoiding code duplication around.
Please check drivers/gpu/drm/dp/drm_dp.c.
Quoted 16 lines
--- drivers/gpu/drm/mediatek/Kconfig | 8 + drivers/gpu/drm/mediatek/Makefile | 2 + drivers/gpu/drm/mediatek/mtk_dp.c | 2221 ++++++++++++++++++++++++ drivers/gpu/drm/mediatek/mtk_dp_reg.h | 568 ++++++ drivers/gpu/drm/mediatek/mtk_drm_drv.c | 1 + drivers/gpu/drm/mediatek/mtk_drm_drv.h | 1 + 6 files changed, 2801 insertions(+)create mode 100644
drivers/gpu/drm/mediatek/mtk_dp.ccreate mode 100644drivers/gpu/drm/mediatek/mtk_dp_reg.hdrivers/gpu/drm/mediatek/Kconfig +0
-0
drivers/gpu/drm/mediatek/Kconfig config DRM_MEDIATEK_HDMI · line 32
Quoted 5 lines
drivers/gpu/drm/mediatek/Kconfig +2
-0@@ -28,3 +28,11 @@ config DRM_MEDIATEK_HDMI select PHY_MTK_HDMI help DRM/KMS HDMI driver for Mediatek SoCs + +config MTK_DPTX_SUPPORT
Actually, I think that the best would be DRM_MEDIATEK_DP_TX or DRM_MEDIATEK_DP... ...also, ordering is important, please!
Quoted 50 lines
drivers/gpu/drm/mediatek/Kconfig +6
-0+ tristate "DRM DPTX Support for Mediatek SoCs" + depends on DRM_MEDIATEK + select PHY_MTK_DP + select DRM_DP_HELPER + help + DRM/KMS Display Port driver for Mediatek SoCs.drivers/gpu/drm/mediatek/Makefile +2
-0@@ -21,3 +21,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.odrivers/gpu/drm/mediatek/mtk_dp.c new file +28
-0@@ -0,0 +1,2221 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (c) 2019 MediaTek Inc. +* Copyright (c) 2021 BayLibre +*/ + +#include <drm/drm_atomic_helper.h> +#include <drm/drm_bridge.h> +#include <drm/drm_crtc.h> +#include <drm/dp/drm_dp_helper.h> +#include <drm/drm_edid.h> +#include <drm/drm_of.h> +#include <drm/drm_panel.h> +#include <drm/drm_print.h> +#include <drm/drm_probe_helper.h> +#include <linux/arm-smccc.h> +#include <linux/clk.h> +#include <linux/delay.h> +#include <linux/errno.h> +#include <linux/kernel.h> +#include <linux/mfd/syscon.h> +#include <linux/nvmem-consumer.h> +#include <linux/of.h> +#include <linux/of_irq.h> +#include <linux/of_platform.h> +#include <linux/phy/phy.h> +#include <linux/platform_device.h> +#include <linux/pm_runtime.h>
drivers/gpu/drm/mediatek/mtk_dp.c line 38
Quoted 10 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +10
-0+#include <linux/regmap.h> +#include <sound/hdmi-codec.h> +#include <video/videomode.h> + +#include "mtk_dp_reg.h" + +#define MTK_DP_AUX_WAIT_REPLY_COUNT 20 +#define MTK_DP_CHECK_SINK_CAP_TIMEOUT_COUNT 3 + +//TODO: platform/device data or dts?
Assuming that your TODO is about the maximum number of lanes, { .compatible = "mediatek,mt8195-edp-tx", .data = &some_const_structure },
Quoted 2 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +2
-0+#define MTK_DP_MAX_LANES 4 +#define MTK_DP_MAX_LINK_RATE MTK_DP_LINKRATE_HBR3
..snip..
Quoted 6 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +6
-0+ +static int mtk_dp_bulk_16bit_write (struct mtk_dp *mtk_dp,u32 offset,u8 *buf, +size_t length) +{ +int i; +int ret =0 ;
drivers/gpu/drm/mediatek/mtk_dp.c line 238
Quoted 10 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +10
-0+int num_regs = (length +1 ) /2 ; + +/* 2 bytes per register */ +for (i =0 ; i < num_regs; i++) { +u32 val = buf[i *2 ] | + (i *2 +1 < length ? buf[i *2 +1 ] <<8 :0 ); + + ret =mtk_dp_write (mtk_dp, offset + i *4 , val); +if (ret) + goto out;
if (ret)
return ret;
drivers/gpu/drm/mediatek/mtk_dp.c line 241
Quoted 3 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +3
-0+ } + +out:
Remove this label.
Quoted 26 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +26
-0+return ret; +} + +static unsigned long mtk_dp_sip_atf_call (unsigned int cmd,unsigned int para) +{ +struct arm_smccc_res res; + +arm_smccc_smc (MTK_DP_SIP_CONTROL_AARCH32 , cmd, para,0 ,0 ,0 ,0 ,0 , + &res); + +pr_debug ("[DPTX]%s cmd 0x%x, p1 0x%x, ret 0x%lx-0x%lx" , __func__, cmd, + para, res.a0, res.a1); +return res.a1; +} + +static int mtk_dp_msa_bypass_disable (struct mtk_dp *mtk_dp) +{ +const u16 bits_to_set = +BIT (HTOTAL_SEL_DP_ENC0_P0_SHIFT ) | +BIT (VTOTAL_SEL_DP_ENC0_P0_SHIFT ) | +BIT (HSTART_SEL_DP_ENC0_P0_SHIFT ) | +BIT (VSTART_SEL_DP_ENC0_P0_SHIFT ) | +BIT (HWIDTH_SEL_DP_ENC0_P0_SHIFT ) | +BIT (VHEIGHT_SEL_DP_ENC0_P0_SHIFT ) | +BIT (HSP_SEL_DP_ENC0_P0_SHIFT ) |BIT (HSW_SEL_DP_ENC0_P0_SHIFT ) | +BIT (VSP_SEL_DP_ENC0_P0_SHIFT ) |BIT (VSW_SEL_DP_ENC0_P0_SHIFT );
drivers/gpu/drm/mediatek/mtk_dp.c line 277
Quoted 10 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +10
-0+return mtk_dp_update_bits (mtk_dp,MTK_DP_ENC0_P0_3030 , bits_to_set, + bits_to_set); +} + +#define MTK_UPD_BITS_OR_OUT (mtk_dp, offset, val, mask, ret, label) \ + do {\ + ret = mtk_dp_update_bits(mtk_dp, offset, val, mask); \ + if (ret) \ + goto label; \ + } while (0)
I'm sorry, no offense - but this macro is a bit ugly...
I think I understand why you have introduced it, but in my opinion this decreases human readability a lot, I was even about to point out multiple functions that you had unused labels before checking this macro, as that was totally unexpected...
In my opinion, this should be open-coded everywhere... yes it makes the file a bit fatter in terms of amount of text, but eh... it's life :)))
Quoted 1 line
+
....snip....
Quoted 21 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +21
-0+ +static int mtk_dp_set_color_format (struct mtk_dp *mtk_dp, +enum mtk_dp_color_format color_format) +{ +u32 val; +int ret; + + mtk_dp->info.format = color_format; + +/* Update MISC0 */ + ret =mtk_dp_update_bits (mtk_dp,MTK_DP_ENC0_P0_3034 , + color_format <<DP_TEST_COLOR_FORMAT_SHIFT , +DP_TEST_COLOR_FORMAT_MASK ); + +if (ret) +return ret; + +switch (color_format) { +case MTK_DP_COLOR_FORMAT_YUV_422 : + val =PIXEL_ENCODE_FORMAT_DP_ENC0_P0_YCBCR422 ; +break ;
drivers/gpu/drm/mediatek/mtk_dp.c line 368
Quoted 10 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +10
-0+case MTK_DP_COLOR_FORMAT_YUV_420 : + val =PIXEL_ENCODE_FORMAT_DP_ENC0_P0_YCBCR420 ; +break ; +case MTK_DP_COLOR_FORMAT_YONLY : +case MTK_DP_COLOR_FORMAT_RAW : +case MTK_DP_COLOR_FORMAT_RESERVED : +case MTK_DP_COLOR_FORMAT_UNKNOWN : +drm_warn (mtk_dp->drm_dev,"Unsupported color format: %d\n" , + color_format); + fallthrough;
Uhm, are you sure that you should fallthrough?
If we get a color format that we don't understand, the best thing that would happen is that we'd get scrambled colors... which is something unwanted.
The best idea is to return -EINVAL here, hence refuse to go on with an invalid color format.
Quoted 10 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +10
-0+case MTK_DP_COLOR_FORMAT_RGB_444 : +case MTK_DP_COLOR_FORMAT_YUV_444 : + val =PIXEL_ENCODE_FORMAT_DP_ENC0_P0_RGB ; +break ; + } + +return mtk_dp_update_bits (mtk_dp,MTK_DP_ENC0_P0_303C , val, +PIXEL_ENCODE_FORMAT_DP_ENC0_P0_MASK ); +} +
...snip...
drivers/gpu/drm/mediatek/mtk_dp.c line 780
Quoted 4 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +4
-0+ +static void mtk_dp_initialize_hpd_detect_settings (struct mtk_dp *mtk_dp) +{ +// Debounce threshold
I think I already told you to fix comments style.
Quoted 21 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +21
-0+mtk_dp_update_bits (mtk_dp,MTK_DP_TRANS_P0_3410 , +8 <<HPD_DEB_THD_DP_TRANS_P0_SHIFT , +HPD_DEB_THD_DP_TRANS_P0_MASK ); +mtk_dp_update_bits (mtk_dp,MTK_DP_TRANS_P0_3410 , + (HPD_INT_THD_DP_TRANS_P0_LOWER_500US | +HPD_INT_THD_DP_TRANS_P0_UPPER_1100US ) + <<HPD_INT_THD_DP_TRANS_P0_SHIFT , +HPD_INT_THD_DP_TRANS_P0_MASK ); + +// Connect threshold 1.5ms + 5 x 0.1ms = 2ms +// Disconnect threshold 1.5ms + 5 x 0.1ms = 2ms +mtk_dp_update_bits (mtk_dp,MTK_DP_TRANS_P0_3410 , + (5 <<HPD_DISC_THD_DP_TRANS_P0_SHIFT ) | + (5 <<HPD_CONN_THD_DP_TRANS_P0_SHIFT ), +HPD_DISC_THD_DP_TRANS_P0_MASK | +HPD_CONN_THD_DP_TRANS_P0_MASK ); +mtk_dp_update_bits (mtk_dp,MTK_DP_TRANS_P0_3430 , +HPD_INT_THD_ECO_DP_TRANS_P0_HIGH_BOUND_EXT , +HPD_INT_THD_ECO_DP_TRANS_P0_MASK ); +} +
..snip..
Quoted 20 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +20
-0+ +static int mtk_dp_power_disable (struct mtk_dp *mtk_dp) +{ +int ret; + + ret =mtk_dp_write (mtk_dp,MTK_DP_TOP_PWR_STATE ,0 ); + +if (ret) + goto out; + +usleep_range (10 ,200 ); + ret =mtk_dp_write (mtk_dp,MTK_DP_0034 , +DA_CKM_CKTX0_EN_FORCE_EN |DA_CKM_BIAS_LPF_EN_FORCE_VAL | +DA_CKM_BIAS_EN_FORCE_VAL | +DA_XTP_GLB_LDO_EN_FORCE_VAL | +DA_XTP_GLB_AVD10_ON_FORCE_VAL ); + +if (ret) + goto out; +
drivers/gpu/drm/mediatek/mtk_dp.c line 1131
Quoted 10 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +10
-0+/* Disable RX */ + ret =mtk_dp_write (mtk_dp,MTK_DP_1040 ,0 ); + +if (ret) + goto out; + + ret =mtk_dp_write (mtk_dp,MTK_DP_TOP_MEM_PD , +0x550 |BIT (FUSE_SEL_SHIFT ) |BIT (MEM_ISO_EN_SHIFT )); + +out:
You are using a goto instead of a return, but you're not reverting any change, so this goto usage is not justified - hence, wrong.
Please simply return ret when anything fails, and return 0 at the end of this function.
....... (blahblah function code) ret = something() if (ret) return ret; return 0; }
Quoted 3 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +3
-0+return ret; +} +
...snip...
Quoted 7 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +7
-0+ +static int mtk_dp_dt_parse (struct mtk_dp *mtk_dp, +struct platform_device *pdev) +{ +struct device *dev = &pdev->dev; +int ret =0 ; +void __iomem *base;
drivers/gpu/drm/mediatek/mtk_dp.c line 1695
Quoted 10 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +10
-0+ + base =devm_platform_ioremap_resource (pdev,0 ); +if (IS_ERR (base)) +return PTR_ERR (base); + + mtk_dp->regs =syscon_node_to_regmap (dev->of_node); +if (IS_ERR (mtk_dp->regs)) +return PTR_ERR (mtk_dp->regs); + +//TODO: optional clock?
Well, if it's optional, you should use devm_clk_get_optional(), meaning that......
drivers/gpu/drm/mediatek/mtk_dp.c line 1700
Quoted 5 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +5
-0+ mtk_dp->dp_tx_clk =devm_clk_get (dev,"faxi" ); +if (IS_ERR (mtk_dp->dp_tx_clk)) { + ret =PTR_ERR (mtk_dp->dp_tx_clk); +dev_info (dev,"Failed to get dptx clock: %d\n" , ret); + mtk_dp->dp_tx_clk =NULL ;
...I shouldn't see this snippet of code, as it should be a bit different... :)
Quoted 5 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +5
-0+ } + +return 0 ; +} +
..snip..
drivers/gpu/drm/mediatek/mtk_dp.c line 1917
Quoted 12 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +11
-0+static void mtk_dp_bridge_atomic_disable (struct drm_bridge *bridge, +struct drm_bridge_state *old_state) +{ +struct mtk_dp *mtk_dp =mtk_dp_from_bridge (bridge); + +mtk_dp_video_mute (mtk_dp, true); + mtk_dp->state =MTK_DP_STATE_IDLE ; + mtk_dp->train_state =MTK_DP_TRAIN_STATE_STARTUP ; + + mtk_dp->enabled = false; +msleep (100 );
100 milliseconds is an eternity, why are we sleeping for *so long* here?
Please, either add a comment that fully explains the resons for that, or remove the sleep entirely: to my eyes, it doesn't look like this sleep is really needed for anything important because here you are disabling the bridge and *powering off* the IP entirely.
Quoted 3 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +3
-0+mtk_dp_poweroff (mtk_dp); +} +
..snip..
Quoted 7 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +7
-0+ +static enum drm_mode_status +mtk_dp_bridge_mode_valid (struct drm_bridge *bridge, +const struct drm_display_info *info, +const struct drm_display_mode *mode) +{ +struct mtk_dp *mtk_dp =mtk_dp_from_bridge (bridge);
drivers/gpu/drm/mediatek/mtk_dp.c line 2000
Quoted 10 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +10
-0+u32 rx_linkrate = (u32 )mtk_dp->train_info.link_rate *27000 ; +u32 bpp = info->color_formats &DRM_COLOR_FORMAT_YCBCR422 ?16 :24 ; + +if (rx_linkrate * mtk_dp->train_info.lane_count < mode->clock * bpp /8 ) +return MODE_CLOCK_HIGH ; + +if (mode->clock >600000 ) +return MODE_CLOCK_HIGH ; + +//TODO: explain magic number: 62?
Please fix this TODO for v10.
Quoted 6 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +6
-0+if ((mode->clock *1000 ) / (mode->htotal * mode->vtotal) >62 ) +return MODE_CLOCK_HIGH ; + +return MODE_OK ; +} +
Re: [PATCH v9 18/22] drm/mediatek: Add mt8195 Embedded DisplayPort driver
Quoted 21 lines · AngeloGioacchino Del Regno
Il 28/03/22 00:39, Guillaume Ranquet ha scritto:
Quoted 10 lines
From: Markus Schneider-Pargmann <[email protected]>
This patch adds a DisplayPort driver for the Mediatek mt8195 SoC.
It supports the mt8195, the embedded DisplayPort units. It offers DisplayPort 1.4 with up to 4 lanes.
The driver shares its iomap range with the mtk-dp-phy driver using the regmap/syscon facility.
Quoted 6 lines
This driver is based on an initial version by
Jason-JH.Lin <[email protected]>.Signed-off-by Markus Schneider-Pargmann <[email protected]>Signed-off-by Guillaume Ranquet <[email protected]>Reported-by kernel test robot <[email protected]>Hello Guillaume,
as you know, there's some more work to do on this driver.
Quoted 8 lines
I will also mention here, not on the code, that at this point, your
mtk_dp_aux_transfer()function has something VERY similar to functiondrm_dp_dpcd_access(), so I really believe that you can instead use functionsdrm_dp_dpcd_read()anddrm_dp_dpcd_write(), avoiding code duplication around.Please check
drivers/gpu/drm/dp/drm_dp.c.
This is already in my TODO list as this has been suggested by Rex earlier.
Quoted 11 lines
Quoted 11 lines
--- drivers/gpu/drm/mediatek/Kconfig | 8 + drivers/gpu/drm/mediatek/Makefile | 2 + drivers/gpu/drm/mediatek/mtk_dp.c | 2221 ++++++++++++++++++++++++ drivers/gpu/drm/mediatek/mtk_dp_reg.h | 568 ++++++ drivers/gpu/drm/mediatek/mtk_drm_drv.c | 1 + drivers/gpu/drm/mediatek/mtk_drm_drv.h | 1 + 6 files changed, 2801 insertions(+)create mode 100644
drivers/gpu/drm/mediatek/mtk_dp.ccreate mode 100644drivers/gpu/drm/mediatek/mtk_dp_reg.h
Quoted 14 lines
drivers/gpu/drm/mediatek/Kconfig config DRM_MEDIATEK_HDMI · line 32
Quoted 10 lines
drivers/gpu/drm/mediatek/Kconfig +2
-0@@ -28,3 +28,11 @@ config DRM_MEDIATEK_HDMI select PHY_MTK_HDMI help DRM/KMS HDMI driver for Mediatek SoCs + +config MTK_DPTX_SUPPORTActually, I think that the best would be
DRM_MEDIATEK_DP_TXorDRM_MEDIATEK_DP... ...also, ordering is important, please!
I will update the name.
What do you mean by ordering? do you expect the configs to be ordered alphabetically?
Quoted 55 lines
Quoted 55 lines
drivers/gpu/drm/mediatek/Kconfig +6
-0+ tristate "DRM DPTX Support for Mediatek SoCs" + depends on DRM_MEDIATEK + select PHY_MTK_DP + select DRM_DP_HELPER + help + DRM/KMS Display Port driver for Mediatek SoCs.drivers/gpu/drm/mediatek/Makefile +2
-0@@ -21,3 +21,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.odrivers/gpu/drm/mediatek/mtk_dp.c new file +33
-0@@ -0,0 +1,2221 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (c) 2019 MediaTek Inc. +* Copyright (c) 2021 BayLibre +*/ + +#include <drm/drm_atomic_helper.h> +#include <drm/drm_bridge.h> +#include <drm/drm_crtc.h> +#include <drm/dp/drm_dp_helper.h> +#include <drm/drm_edid.h> +#include <drm/drm_of.h> +#include <drm/drm_panel.h> +#include <drm/drm_print.h> +#include <drm/drm_probe_helper.h> +#include <linux/arm-smccc.h> +#include <linux/clk.h> +#include <linux/delay.h> +#include <linux/errno.h> +#include <linux/kernel.h> +#include <linux/mfd/syscon.h> +#include <linux/nvmem-consumer.h> +#include <linux/of.h> +#include <linux/of_irq.h> +#include <linux/of_platform.h> +#include <linux/phy/phy.h> +#include <linux/platform_device.h> +#include <linux/pm_runtime.h> +#include <linux/regmap.h> +#include <sound/hdmi-codec.h> +#include <video/videomode.h> + +#include "mtk_dp_reg.h"
Quoted 8 lines
drivers/gpu/drm/mediatek/mtk_dp.c line 38
Quoted 5 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +5
-0+ +#define MTK_DP_AUX_WAIT_REPLY_COUNT 20 +#define MTK_DP_CHECK_SINK_CAP_TIMEOUT_COUNT 3 + +//TODO: platform/device data or dts? Assuming that your TODO is about the maximum number of lanes, { .compatible = "mediatek,mt8195-edp-tx", .data =
&some_const_structure},
Yes, exactly that, it'll be in v10.
Quoted 71 lines
Quoted 3 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +2
-0+#define MTK_DP_MAX_LANES 4 +#define MTK_DP_MAX_LINK_RATE MTK_DP_LINKRATE_HBR3..snip..
Quoted 6 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +6
-0+ +static int mtk_dp_bulk_16bit_write (struct mtk_dp *mtk_dp,u32 offset,u8 *buf, +size_t length) +{ +int i; +int ret =0 ;drivers/gpu/drm/mediatek/mtk_dp.c line 238
Quoted 10 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +10
-0+int num_regs = (length +1 ) /2 ; + +/* 2 bytes per register */ +for (i =0 ; i < num_regs; i++) { +u32 val = buf[i *2 ] | + (i *2 +1 < length ? buf[i *2 +1 ] <<8 :0 ); + + ret =mtk_dp_write (mtk_dp, offset + i *4 , val); +if (ret) + goto out;if (ret)
return ret;drivers/gpu/drm/mediatek/mtk_dp.c line 241
Quoted 3 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +3
-0+ } + +out:Remove this label.
Quoted 26 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +26
-0+return ret; +} + +static unsigned long mtk_dp_sip_atf_call (unsigned int cmd,unsigned int para) +{ +struct arm_smccc_res res; + +arm_smccc_smc (MTK_DP_SIP_CONTROL_AARCH32 , cmd, para,0 ,0 ,0 ,0 ,0 , + &res); + +pr_debug ("[DPTX]%s cmd 0x%x, p1 0x%x, ret 0x%lx-0x%lx" , __func__, cmd, + para, res.a0, res.a1); +return res.a1; +} + +static int mtk_dp_msa_bypass_disable (struct mtk_dp *mtk_dp) +{ +const u16 bits_to_set = +BIT (HTOTAL_SEL_DP_ENC0_P0_SHIFT ) | +BIT (VTOTAL_SEL_DP_ENC0_P0_SHIFT ) | +BIT (HSTART_SEL_DP_ENC0_P0_SHIFT ) | +BIT (VSTART_SEL_DP_ENC0_P0_SHIFT ) | +BIT (HWIDTH_SEL_DP_ENC0_P0_SHIFT ) | +BIT (VHEIGHT_SEL_DP_ENC0_P0_SHIFT ) | +BIT (HSP_SEL_DP_ENC0_P0_SHIFT ) |BIT (HSW_SEL_DP_ENC0_P0_SHIFT ) | +BIT (VSP_SEL_DP_ENC0_P0_SHIFT ) |BIT (VSW_SEL_DP_ENC0_P0_SHIFT );drivers/gpu/drm/mediatek/mtk_dp.c line 277
Quoted 10 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +10
-0+return mtk_dp_update_bits (mtk_dp,MTK_DP_ENC0_P0_3030 , bits_to_set, + bits_to_set); +} + +#define MTK_UPD_BITS_OR_OUT (mtk_dp, offset, val, mask, ret, label) \ + do {\ + ret = mtk_dp_update_bits(mtk_dp, offset, val, mask); \ + if (ret) \ + goto label; \ + } while (0)I'm sorry, no offense - but this macro is a bit ugly...
Quoted 8 lines
I think I understand why you have introduced it, but in my opinion this decreases human readability a lot, I was even about to point out multiple functions that you had unused labels before checking this macro, as that was totally unexpected...
In my opinion, this should be open-coded everywhere... yes it makes the file a bit fatter in terms of amount of text, but eh... it's life :)))
No offense taken... I find the macro ugly too... but I couldn't think of anything less
ugly... I'll bite the bullet and write all of the code then.
Quoted 40 lines
Quoted 1 line
+
....snip....
Quoted 21 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +21
-0+ +static int mtk_dp_set_color_format (struct mtk_dp *mtk_dp, +enum mtk_dp_color_format color_format) +{ +u32 val; +int ret; + + mtk_dp->info.format = color_format; + +/* Update MISC0 */ + ret =mtk_dp_update_bits (mtk_dp,MTK_DP_ENC0_P0_3034 , + color_format <<DP_TEST_COLOR_FORMAT_SHIFT , +DP_TEST_COLOR_FORMAT_MASK ); + +if (ret) +return ret; + +switch (color_format) { +case MTK_DP_COLOR_FORMAT_YUV_422 : + val =PIXEL_ENCODE_FORMAT_DP_ENC0_P0_YCBCR422 ; +break ;drivers/gpu/drm/mediatek/mtk_dp.c line 368
Quoted 10 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +10
-0+case MTK_DP_COLOR_FORMAT_YUV_420 : + val =PIXEL_ENCODE_FORMAT_DP_ENC0_P0_YCBCR420 ; +break ; +case MTK_DP_COLOR_FORMAT_YONLY : +case MTK_DP_COLOR_FORMAT_RAW : +case MTK_DP_COLOR_FORMAT_RESERVED : +case MTK_DP_COLOR_FORMAT_UNKNOWN : +drm_warn (mtk_dp->drm_dev,"Unsupported color format: %d\n" , + color_format); + fallthrough;Uhm, are you sure that you should fallthrough?
If we get a color format that we don't understand, the best thing that would happen is that we'd get scrambled colors... which is something unwanted.
Quoted 3 lines
The best idea is to return
-EINVALhere, hence refuse to go on with an invalid color format.
Will do.
Quoted 91 lines
Quoted 10 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +10
-0+case MTK_DP_COLOR_FORMAT_RGB_444 : +case MTK_DP_COLOR_FORMAT_YUV_444 : + val =PIXEL_ENCODE_FORMAT_DP_ENC0_P0_RGB ; +break ; + } + +return mtk_dp_update_bits (mtk_dp,MTK_DP_ENC0_P0_303C , val, +PIXEL_ENCODE_FORMAT_DP_ENC0_P0_MASK ); +} +...snip...
drivers/gpu/drm/mediatek/mtk_dp.c line 780
Quoted 4 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +4
-0+ +static void mtk_dp_initialize_hpd_detect_settings (struct mtk_dp *mtk_dp) +{ +// Debounce threshold I think I already told you to fix comments style.
Quoted 21 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +21
-0+mtk_dp_update_bits (mtk_dp,MTK_DP_TRANS_P0_3410 , +8 <<HPD_DEB_THD_DP_TRANS_P0_SHIFT , +HPD_DEB_THD_DP_TRANS_P0_MASK ); +mtk_dp_update_bits (mtk_dp,MTK_DP_TRANS_P0_3410 , + (HPD_INT_THD_DP_TRANS_P0_LOWER_500US | +HPD_INT_THD_DP_TRANS_P0_UPPER_1100US ) + <<HPD_INT_THD_DP_TRANS_P0_SHIFT , +HPD_INT_THD_DP_TRANS_P0_MASK ); + +// Connect threshold 1.5ms + 5 x 0.1ms = 2ms +// Disconnect threshold 1.5ms + 5 x 0.1ms = 2ms +mtk_dp_update_bits (mtk_dp,MTK_DP_TRANS_P0_3410 , + (5 <<HPD_DISC_THD_DP_TRANS_P0_SHIFT ) | + (5 <<HPD_CONN_THD_DP_TRANS_P0_SHIFT ), +HPD_DISC_THD_DP_TRANS_P0_MASK | +HPD_CONN_THD_DP_TRANS_P0_MASK ); +mtk_dp_update_bits (mtk_dp,MTK_DP_TRANS_P0_3430 , +HPD_INT_THD_ECO_DP_TRANS_P0_HIGH_BOUND_EXT , +HPD_INT_THD_ECO_DP_TRANS_P0_MASK ); +} +..snip..
Quoted 20 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +20
-0+ +static int mtk_dp_power_disable (struct mtk_dp *mtk_dp) +{ +int ret; + + ret =mtk_dp_write (mtk_dp,MTK_DP_TOP_PWR_STATE ,0 ); + +if (ret) + goto out; + +usleep_range (10 ,200 ); + ret =mtk_dp_write (mtk_dp,MTK_DP_0034 , +DA_CKM_CKTX0_EN_FORCE_EN |DA_CKM_BIAS_LPF_EN_FORCE_VAL | +DA_CKM_BIAS_EN_FORCE_VAL | +DA_XTP_GLB_LDO_EN_FORCE_VAL | +DA_XTP_GLB_AVD10_ON_FORCE_VAL ); + +if (ret) + goto out; +drivers/gpu/drm/mediatek/mtk_dp.c line 1131
Quoted 10 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +10
-0+/* Disable RX */ + ret =mtk_dp_write (mtk_dp,MTK_DP_1040 ,0 ); + +if (ret) + goto out; + + ret =mtk_dp_write (mtk_dp,MTK_DP_TOP_MEM_PD , +0x550 |BIT (FUSE_SEL_SHIFT ) |BIT (MEM_ISO_EN_SHIFT )); + +out:You are using a goto instead of a return, but you're not reverting any change, so this goto usage is not justified - hence, wrong.
Please simply return ret when anything fails, and return 0 at the end of this function.
....... (blahblah function code) ret = something() if (ret) return ret; return 0; }
Quoted 5 lines
Quoted 3 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +3
-0+return ret; +} +...snip...
I'll remove all the gotos that have no unwrapping then.
Quoted 22 lines
Quoted 8 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +7
-0+ +static int mtk_dp_dt_parse (struct mtk_dp *mtk_dp, +struct platform_device *pdev) +{ +struct device *dev = &pdev->dev; +int ret =0 ; +void __iomem *base;drivers/gpu/drm/mediatek/mtk_dp.c line 1695
Quoted 10 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +10
-0+ + base =devm_platform_ioremap_resource (pdev,0 ); +if (IS_ERR (base)) +return PTR_ERR (base); + + mtk_dp->regs =syscon_node_to_regmap (dev->of_node); +if (IS_ERR (mtk_dp->regs)) +return PTR_ERR (mtk_dp->regs); + +//TODO: optional clock? Well, if it's optional, you should use
devm_clk_get_optional(), meaning that......
Quoted 8 lines
drivers/gpu/drm/mediatek/mtk_dp.c line 1700
Quoted 5 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +5
-0+ mtk_dp->dp_tx_clk =devm_clk_get (dev,"faxi" ); +if (IS_ERR (mtk_dp->dp_tx_clk)) { + ret =PTR_ERR (mtk_dp->dp_tx_clk); +dev_info (dev,"Failed to get dptx clock: %d\n" , ret); + mtk_dp->dp_tx_clk =NULL ;...I shouldn't see this snippet of code, as it should be a bit different... :)
It is still unclear to me if this should be optional or not, hence the 'TODO'
Quoted 19 lines
Quoted 5 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +5
-0+ } + +return 0 ; +} +..snip..
Quoted 10 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +10
-0+static void mtk_dp_bridge_atomic_disable (struct drm_bridge *bridge, +struct drm_bridge_state *old_state) +{ +struct mtk_dp *mtk_dp =mtk_dp_from_bridge (bridge); + +mtk_dp_video_mute (mtk_dp, true); + mtk_dp->state =MTK_DP_STATE_IDLE ; + mtk_dp->train_state =MTK_DP_TRAIN_STATE_STARTUP ; + + mtk_dp->enabled = false;
Quoted 9 lines
drivers/gpu/drm/mediatek/mtk_dp.c line 1917
Quoted 1 line
drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+msleep (100 );100 milliseconds is an eternity, why are we sleeping for *so long* here?
Please, either add a comment that fully explains the resons for that, or remove the sleep entirely: to my eyes, it doesn't look like this sleep is really needed for anything important because here you are disabling the bridge and *powering off* the IP entirely.
This sleep can be removed.
I will also make an effort to document all the other delays in the code for v10.
Quoted 26 lines
Quoted 3 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +3
-0+mtk_dp_poweroff (mtk_dp); +} +..snip..
Quoted 7 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +7
-0+ +static enum drm_mode_status +mtk_dp_bridge_mode_valid (struct drm_bridge *bridge, +const struct drm_display_info *info, +const struct drm_display_mode *mode) +{ +struct mtk_dp *mtk_dp =mtk_dp_from_bridge (bridge);drivers/gpu/drm/mediatek/mtk_dp.c line 2000
Quoted 10 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +10
-0+u32 rx_linkrate = (u32 )mtk_dp->train_info.link_rate *27000 ; +u32 bpp = info->color_formats &DRM_COLOR_FORMAT_YCBCR422 ?16 :24 ; + +if (rx_linkrate * mtk_dp->train_info.lane_count < mode->clock * bpp /8 ) +return MODE_CLOCK_HIGH ; + +if (mode->clock >600000 ) +return MODE_CLOCK_HIGH ; + +//TODO: explain magic number: 62? Please fix this TODO for v10.
Quoted 8 lines
drivers/gpu/drm/mediatek/mtk_dp.c line 2006
Quoted 6 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +6
-0+if ((mode->clock *1000 ) / (mode->htotal * mode->vtotal) >62 ) +return MODE_CLOCK_HIGH ; + +return MODE_OK ; +} +
Thx a lot for your review,
Guillaume.
AngeloGioacchino Del Regno
maintainerRe: [PATCH v9 18/22] drm/mediatek: Add mt8195 Embedded DisplayPort driver
Il 12/04/22 11:46, Guillaume Ranquet ha scritto:
Quoted 59 lines
Quoted 21 lines · AngeloGioacchino Del Regno
Il 28/03/22 00:39, Guillaume Ranquet ha scritto:
Quoted 10 lines
From: Markus Schneider-Pargmann <[email protected]>
This patch adds a DisplayPort driver for the Mediatek mt8195 SoC.
It supports the mt8195, the embedded DisplayPort units. It offers DisplayPort 1.4 with up to 4 lanes.
The driver shares its iomap range with the mtk-dp-phy driver using the regmap/syscon facility.
Quoted 6 lines
This driver is based on an initial version by
Jason-JH.Lin <[email protected]>.Signed-off-by Markus Schneider-Pargmann <[email protected]>Signed-off-by Guillaume Ranquet <[email protected]>Reported-by kernel test robot <[email protected]>Hello Guillaume,
as you know, there's some more work to do on this driver.Quoted 8 lines
I will also mention here, not on the code, that at this point, your
mtk_dp_aux_transfer()function has something VERY similar to functiondrm_dp_dpcd_access(), so I really believe that you can instead use functionsdrm_dp_dpcd_read()anddrm_dp_dpcd_write(), avoiding code duplication around.Please check
drivers/gpu/drm/dp/drm_dp.c.This is already in my TODO list as this has been suggested by Rex earlier.
Quoted 11 lines
Quoted 11 lines
--- drivers/gpu/drm/mediatek/Kconfig | 8 + drivers/gpu/drm/mediatek/Makefile | 2 + drivers/gpu/drm/mediatek/mtk_dp.c | 2221 ++++++++++++++++++++++++ drivers/gpu/drm/mediatek/mtk_dp_reg.h | 568 ++++++ drivers/gpu/drm/mediatek/mtk_drm_drv.c | 1 + drivers/gpu/drm/mediatek/mtk_drm_drv.h | 1 + 6 files changed, 2801 insertions(+)create mode 100644
drivers/gpu/drm/mediatek/mtk_dp.ccreate mode 100644drivers/gpu/drm/mediatek/mtk_dp_reg.hQuoted 14 lines
drivers/gpu/drm/mediatek/Kconfig config DRM_MEDIATEK_HDMI · line 32
Quoted 10 lines
drivers/gpu/drm/mediatek/Kconfig +2
-0@@ -28,3 +28,11 @@ config DRM_MEDIATEK_HDMI select PHY_MTK_HDMI help DRM/KMS HDMI driver for Mediatek SoCs + +config MTK_DPTX_SUPPORTActually, I think that the best would be
DRM_MEDIATEK_DP_TXorDRM_MEDIATEK_DP... ...also, ordering is important, please!
Quoted 4 lines
I will update the name.
What do you mean by ordering? do you expect the configs to be ordered alphabetically?
Yes, correct. Configuration options shall be alphabetically ordered. Obviously, the same applies for Makefile :)
Quoted 21 lines
Quoted 21 lines
Quoted 21 lines
drivers/gpu/drm/mediatek/Kconfig +6
-0+ tristate "DRM DPTX Support for Mediatek SoCs" + depends on DRM_MEDIATEK + select PHY_MTK_DP + select DRM_DP_HELPER + help + DRM/KMS Display Port driver for Mediatek SoCs.drivers/gpu/drm/mediatek/Makefile +2
-0@@ -21,3 +21,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.odrivers/gpu/drm/mediatek/mtk_dp.c new file +0
-0
..snip..
Quoted 14 lines
Quoted 14 lines
drivers/gpu/drm/mediatek/mtk_dp.c line 277
Quoted 7 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +7
-0+ +#define MTK_UPD_BITS_OR_OUT (mtk_dp, offset, val, mask, ret, label) \ + do {\ + ret = mtk_dp_update_bits(mtk_dp, offset, val, mask); \ + if (ret) \ + goto label; \ + } while (0)I'm sorry, no offense - but this macro is a bit ugly...
I think I understand why you have introduced it, but in my opinion this decreases human readability a lot, I was even about to point out multiple functions that you had unused labels before checking this macro, as that was totally unexpected...
Quoted 8 lines
Quoted 4 lines
In my opinion, this should be open-coded everywhere... yes it makes the file a bit fatter in terms of amount of text, but eh... it's life :)))
No offense taken... I find the macro ugly too... but I couldn't think of anything less
ugly... I'll bite the bullet and write all of the code then.
I can't think of anything shorter, either.. so yep, sometimes writing 'em all is simply the best option.
Quoted 8 lines
Quoted 8 lines
Quoted 1 line
+
....snip....
Quoted 4 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +4
-0+ +static int mtk_dp_set_color_format (struct mtk_dp *mtk_dp, +enum mtk_dp_color_format color_format) +{
..snip..
Quoted 29 lines
Quoted 21 lines
Quoted 7 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +7
-0+ +static int mtk_dp_dt_parse (struct mtk_dp *mtk_dp, +struct platform_device *pdev) +{ +struct device *dev = &pdev->dev; +int ret =0 ; +void __iomem *base;drivers/gpu/drm/mediatek/mtk_dp.c line 1695
Quoted 10 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +10
-0+ + base =devm_platform_ioremap_resource (pdev,0 ); +if (IS_ERR (base)) +return PTR_ERR (base); + + mtk_dp->regs =syscon_node_to_regmap (dev->of_node); +if (IS_ERR (mtk_dp->regs)) +return PTR_ERR (mtk_dp->regs); + +//TODO: optional clock? Well, if it's optional, you should use
devm_clk_get_optional(), meaning that......Quoted 8 lines
drivers/gpu/drm/mediatek/mtk_dp.c line 1700
Quoted 5 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +5
-0+ mtk_dp->dp_tx_clk =devm_clk_get (dev,"faxi" ); +if (IS_ERR (mtk_dp->dp_tx_clk)) { + ret =PTR_ERR (mtk_dp->dp_tx_clk); +dev_info (dev,"Failed to get dptx clock: %d\n" , ret); + mtk_dp->dp_tx_clk =NULL ;...I shouldn't see this snippet of code, as it should be a bit different... :)
Quoted 2 lines
It is still unclear to me if this should be optional or not, hence the 'TODO'
Thinking about this a bit more - this driver is for MT8195 only, for now... and the DP cannot work without the AXI clock being up... logically.
I'd say, at this point, to make this mandatory.
If any newer platform will make this optional, we can either assign clk26m (ugh!) or we can get back to this one and convert this to devm_clk_get_optional().
Don't forget that we can also manage this in devicetree bindings, where we can for example declare a property to be optional for one or more compatibles, so there's no problem if we'd be doing such a change in the future, I think.
Quoted 23 lines
Quoted 23 lines
Quoted 5 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +5
-0+ } + +return 0 ; +} +..snip..
drivers/gpu/drm/mediatek/mtk_dp.c line 1917
Quoted 12 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +11
-0+static void mtk_dp_bridge_atomic_disable (struct drm_bridge *bridge, +struct drm_bridge_state *old_state) +{ +struct mtk_dp *mtk_dp =mtk_dp_from_bridge (bridge); + +mtk_dp_video_mute (mtk_dp, true); + mtk_dp->state =MTK_DP_STATE_IDLE ; + mtk_dp->train_state =MTK_DP_TRAIN_STATE_STARTUP ; + + mtk_dp->enabled = false; +msleep (100 );100 milliseconds is an eternity, why are we sleeping for *so long* here?
Quoted 8 lines
Quoted 5 lines
Please, either add a comment that fully explains the resons for that, or remove the sleep entirely: to my eyes, it doesn't look like this sleep is really needed for anything important because here you are disabling the bridge and *powering off* the IP entirely.
This sleep can be removed.
I will also make an effort to document all the other delays in the code for v10.
Thanks for that.
(snip)
Quoted 6 lines
Quoted 3 lines
Quoted 1 line
+
Thx a lot for your review,
Guillaume.
You're welcome!
Cheers,
Angelo
Re: [PATCH v9 18/22] drm/mediatek: Add mt8195 Embedded DisplayPort driver
In reply to Guillaume RanquetQuoted 96 lines · Guillaume Ranquet
From: Markus Schneider-Pargmann <[email protected]>
This patch adds a DisplayPort driver for the Mediatek mt8195 SoC.
It supports the mt8195, the embedded DisplayPort units. It offers DisplayPort 1.4 with up to 4 lanes.
The driver shares its iomap range with the mtk-dp-phy driver using the regmap/syscon facility.
This driver is based on an initial version by
Jason-JH.Lin <[email protected]>.Signed-off-by Markus Schneider-Pargmann <[email protected]>Signed-off-by Guillaume Ranquet <[email protected]>Reported-by kernel test robot <[email protected]>--- drivers/gpu/drm/mediatek/Kconfig | 8 + drivers/gpu/drm/mediatek/Makefile | 2 + drivers/gpu/drm/mediatek/mtk_dp.c | 2221 ++++++++++++++++++++++++ drivers/gpu/drm/mediatek/mtk_dp_reg.h | 568 ++++++ drivers/gpu/drm/mediatek/mtk_drm_drv.c | 1 + drivers/gpu/drm/mediatek/mtk_drm_drv.h | 1 + 6 files changed, 2801 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 +8
-0@@ -28,3 +28,11 @@ 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 PHY_MTK_DP + select DRM_DP_HELPER + help + DRM/KMS Display Port driver for Mediatek SoCs.drivers/gpu/drm/mediatek/Makefile +2
-0@@ -21,3 +21,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.odrivers/gpu/drm/mediatek/mtk_dp.c new file +32
-0@@ -0,0 +1,2221 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (c) 2019 MediaTek Inc. +* Copyright (c) 2021 BayLibre +*/ + +#include <drm/drm_atomic_helper.h> +#include <drm/drm_bridge.h> +#include <drm/drm_crtc.h> +#include <drm/dp/drm_dp_helper.h> +#include <drm/drm_edid.h> +#include <drm/drm_of.h> +#include <drm/drm_panel.h> +#include <drm/drm_print.h> +#include <drm/drm_probe_helper.h> +#include <linux/arm-smccc.h> +#include <linux/clk.h> +#include <linux/delay.h> +#include <linux/errno.h> +#include <linux/kernel.h> +#include <linux/mfd/syscon.h> +#include <linux/nvmem-consumer.h> +#include <linux/of.h> +#include <linux/of_irq.h> +#include <linux/of_platform.h> +#include <linux/phy/phy.h> +#include <linux/platform_device.h> +#include <linux/pm_runtime.h> +#include <linux/regmap.h> +#include <sound/hdmi-codec.h> +#include <video/videomode.h> +
...snip...
Quoted 11 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +2
-0+ +static SIMPLE_DEV_PM_OPS(mtk_dp_pm_ops, mtk_dp_suspend,
mtk_dp_resume);drivers/gpu/drm/mediatek/mtk_dp.c new file +8
-0+ +static const struct of_device_id mtk_dp_of_match[] = { + { .compatible ="mediatek,mt8195-edp-tx" , }, + {}, +}; +MODULE_DEVICE_TABLE (of, mtk_dp_of_match); + +struct platform_driver mtk_dp_driver = {
drivers/gpu/drm/mediatek/mtk_dp.c line 2218
Quoted 10 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +10
-0+ .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, + }, +}; + +MODULE_AUTHOR ("Jason-JH.Lin <[email protected]>" );
Hello Guillaume,
I think the module author is not Jason-JH Lin. He is the owner of 8195 DRM.
The owner should be Jitao Shi <[email protected]>
BRs,
Rex
Quoted 650 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +3
-0+MODULE_AUTHOR ("Markus Schneider-Pargmann <[email protected]>" ); +MODULE_DESCRIPTION ("MediaTek DisplayPort Driver" ); +MODULE_LICENSE ("GPL" );drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +9
-0@@ -0,0 +1,568 @@ +/* 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 (BIT(0) | BIT(1) | BIT(5) |BIT(8) | BIT(10) | BIT(25) | BIT(31))
drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +121
-0+#define MTK_DP_SIP_ATF_VIDEO_UNMUTE (BIT(5)) +#define MTK_DP_SIP_ATF_EDP_VIDEO_UNMUTE (BIT(0) | BIT(5)) + +#define DP_PHY_GLB_BIAS_GEN_00 0 +#define RG_XTP_GLB_BIAS_INTR_CTRL GENMASK(20, 16) + +#define DP_PHY_GLB_DPAUX_TX (BIT(3)) +#define RG_CKM_PT0_CKTX_IMPSEL GENMASK(23, 20) + +#define DP_PHY_LANE_TX_0 (BIT(2) | BIT(8)) +#define RG_XTP_LN0_TX_IMPSEL_PMOS GENMASK(15, 12) +#define RG_XTP_LN0_TX_IMPSEL_NMOS GENMASK(19, 16) + +#define DP_PHY_LANE_TX_1 (BIT(2) | BIT(9)) +#define RG_XTP_LN1_TX_IMPSEL_PMOS GENMASK(15, 12) +#define RG_XTP_LN1_TX_IMPSEL_NMOS GENMASK(19, 16) + +#define DP_PHY_LANE_TX_2 (BIT(2) | BIT(8) | BIT(9)) +#define RG_XTP_LN2_TX_IMPSEL_PMOS GENMASK(15, 12) +#define RG_XTP_LN2_TX_IMPSEL_NMOS GENMASK(19, 16) + +#define DP_PHY_LANE_TX_3 (BIT(2) | BIT(10)) +#define RG_XTP_LN3_TX_IMPSEL_PMOS GENMASK(15, 12) +#define RG_XTP_LN3_TX_IMPSEL_NMOS GENMASK(19, 16) + +#define TOP_OFFSET (BIT(13)) +#define ENC0_OFFSET GENMASK(13, 12) +#define ENC1_OFFSET (BIT(9) | BIT(12) | BIT(13)) +#define TRANS_OFFSET (BIT(10) | BIT(12) | BIT(13)) +#define AUX_OFFSET (BIT(9) | BIT(10) | BIT(12) | BIT(13)) +#define SEC_OFFSET (BIT(14)) + +#define MTK_DP_HPD_DISCONNECT BIT(1) +#define MTK_DP_HPD_CONNECT BIT(2) +#define MTK_DP_HPD_INTERRUPT BIT(3) + +#define MTK_DP_0034 (BIT(2) | BIT(4) | BIT(5)) +#define DA_XTP_GLB_CKDET_EN_FORCE_VAL BIT(15) +#define DA_XTP_GLB_CKDET_EN_FORCE_EN BIT(14) +#define DA_CKM_INTCKTX_EN_FORCE_VAL BIT(13) +#define DA_CKM_INTCKTX_EN_FORCE_EN BIT(12) +#define DA_CKM_CKTX0_EN_FORCE_VAL BIT(11) +#define DA_CKM_CKTX0_EN_FORCE_EN BIT(10) +#define DA_CKM_XTAL_CK_FORCE_VAL BIT(9) +#define DA_CKM_XTAL_CK_FORCE_EN BIT(8) +#define DA_CKM_BIAS_LPF_EN_FORCE_VAL BIT(7) +#define DA_CKM_BIAS_LPF_EN_FORCE_EN BIT(6) +#define DA_CKM_BIAS_EN_FORCE_VAL BIT(5) +#define DA_CKM_BIAS_EN_FORCE_EN BIT(4) +#define DA_XTP_GLB_AVD10_ON_FORCE_VAL BIT(3) +#define DA_XTP_GLB_AVD10_ON_FORCE BIT(2) +#define DA_XTP_GLB_LDO_EN_FORCE_VAL BIT(1) +#define DA_XTP_GLB_LDO_EN_FORCE_EN BIT(0) + +#define MTK_DP_1040 (BIT(6) | BIT(12)) +#define RG_DPAUX_RX_VALID_DEGLITCH_EN BIT(2) +#define RG_XTP_GLB_CKDET_EN BIT(1) +#define RG_DPAUX_RX_EN BIT(0) + +#define MTK_DP_ENC0_P0_3000 (ENC0_OFFSET + 0x00) +#define LANE_NUM_DP_ENC0_P0_MASK GENMASK(1, 0) +#define VIDEO_MUTE_SW_DP_ENC0_P0_MASK (BIT(2)) +#define VIDEO_MUTE_SW_DP_ENC0_P0_SHIFT (BIT(1)) +#define VIDEO_MUTE_SEL_DP_ENC0_P0_MASK (BIT(3)) +#define VIDEO_MUTE_SEL_DP_ENC0_P0_SHIFT GENMASK(1, 0) +#define ENHANCED_FRAME_EN_DP_ENC0_P0_MASK (BIT(4)) +#define ENHANCED_FRAME_EN_DP_ENC0_P0_SHIFT (BIT(2)) + +#define MTK_DP_ENC0_P0_3004 (ENC0_OFFSET + 0x04) +#define VIDEO_M_CODE_SEL_DP_ENC0_P0_MASK (BIT(8)) +#define VIDEO_M_CODE_SEL_DP_ENC0_P0_SHIFT (BIT(3)) +#define DP_TX_ENCODER_4P_RESET_SW_DP_ENC0_P0_MASK (BIT(9)) +#define DP_TX_ENCODER_4P_RESET_SW_DP_ENC0_P0_SHIFT (BIT(0) | BIT(3)) + +#define MTK_DP_ENC0_P0_3008 (ENC0_OFFSET + 0x08) +#define VIDEO_M_CODE_SW_0_DP_ENC0_P0_MASK GENMASK(15, 0) + +#define MTK_DP_ENC0_P0_300C (ENC0_OFFSET + 0x0C) +#define VIDEO_M_CODE_SW_1_DP_ENC0_P0_MASK GENMASK(7, 0) + +#define MTK_DP_ENC0_P0_3010 (ENC0_OFFSET + 0x10) +#define HTOTAL_SW_DP_ENC0_P0_MASK GENMASK(15, 0) + +#define MTK_DP_ENC0_P0_3014 (ENC0_OFFSET + 0x14) +#define VTOTAL_SW_DP_ENC0_P0_MASK GENMASK(15, 0) + +#define MTK_DP_ENC0_P0_3018 (ENC0_OFFSET + 0x18) +#define HSTART_SW_DP_ENC0_P0_MASK GENMASK(15, 0) + +#define MTK_DP_ENC0_P0_301C (ENC0_OFFSET + 0x1C) +#define VSTART_SW_DP_ENC0_P0_MASK GENMASK(15, 0) + +#define MTK_DP_ENC0_P0_3020 (ENC0_OFFSET + 0x20) +#define HWIDTH_SW_DP_ENC0_P0_MASK GENMASK(15, 0) + +#define MTK_DP_ENC0_P0_3024 (ENC0_OFFSET + 0x24) +#define VHEIGHT_SW_DP_ENC0_P0_MASK GENMASK(15, 0) + +#define MTK_DP_ENC0_P0_3028 (ENC0_OFFSET + 0x28) +#define HSW_SW_DP_ENC0_P0_MASK GENMASK(14, 0) +#define HSW_SW_DP_ENC0_P0_SHIFT 0 +#define HSP_SW_DP_ENC0_P0_MASK (BIT(15)) + +#define MTK_DP_ENC0_P0_302C (ENC0_OFFSET + 0x2C) +#define VSW_SW_DP_ENC0_P0_MASK GENMASK(14, 0) +#define VSW_SW_DP_ENC0_P0_SHIFT 0 +#define VSP_SW_DP_ENC0_P0_MASK (BIT(15)) + +#define MTK_DP_ENC0_P0_3030 (ENC0_OFFSET + 0x30) +#define HTOTAL_SEL_DP_ENC0_P0_SHIFT 0 +#define VTOTAL_SEL_DP_ENC0_P0_SHIFT (BIT(0)) +#define HSTART_SEL_DP_ENC0_P0_SHIFT (BIT(1)) +#define VSTART_SEL_DP_ENC0_P0_SHIFT GENMASK(1, 0) +#define HWIDTH_SEL_DP_ENC0_P0_SHIFT (BIT(2)) +#define VHEIGHT_SEL_DP_ENC0_P0_SHIFT (BIT(0) | BIT(2)) +#define HSP_SEL_DP_ENC0_P0_SHIFT GENMASK(2, 1) +#define HSW_SEL_DP_ENC0_P0_SHIFT GENMASK(2, 0) +#define VSP_SEL_DP_ENC0_P0_SHIFT (BIT(3)) +#define VSW_SEL_DP_ENC0_P0_SHIFT (BIT(0) | BIT(3)) +#define VBID_AUDIO_MUTE_FLAG_SW_DP_ENC0_P0_MASK (BIT(11)) +#define VBID_AUDIO_MUTE_SW_DP_ENC0_P0_SHIFT (BIT(0) | BIT(1) |BIT(3))
drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +15
-0+#define VBID_AUDIO_MUTE_FLAG_SEL_DP_ENC0_P0_MASK (BIT(12)) +#define VBID_AUDIO_MUTE_SEL_DP_ENC0_P0_SHIFT GENMASK(3, 2) + +#define MTK_DP_ENC0_P0_3034 (ENC0_OFFSET + 0x34) + +#define MTK_DP_ENC0_P0_3038 (ENC0_OFFSET + 0x38) +#define VIDEO_SOURCE_SEL_DP_ENC0_P0_MASK (BIT(11)) +#define VIDEO_SOURCE_SEL_DP_ENC0_P0_SHIFT (BIT(0) | BIT(1) | BIT(3)) + +#define MTK_DP_ENC0_P0_303C (ENC0_OFFSET + 0x3C) +#define SRAM_START_READ_THRD_DP_ENC0_P0_MASK GENMASK(5, 0) +#define SRAM_START_READ_THRD_DP_ENC0_P0_SHIFT 0 +#define VIDEO_COLOR_DEPTH_DP_ENC0_P0_MASK GENMASK(10, 8) +#define VIDEO_COLOR_DEPTH_DP_ENC0_P0_SHIFT (BIT(3)) +#define
VIDEO_COLOR_DEPTH_DP_ENC0_P0_16BIT
\drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +2
-0+ (0 <<VIDEO_COLOR_DEPTH_DP_ENC0_P0_SHIFT ) +#define
VIDEO_COLOR_DEPTH_DP_ENC0_P0_12BIT
\drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +2
-0+ (1 <<VIDEO_COLOR_DEPTH_DP_ENC0_P0_SHIFT ) +#define
VIDEO_COLOR_DEPTH_DP_ENC0_P0_10BIT
\drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +2
-0+ (2 <<VIDEO_COLOR_DEPTH_DP_ENC0_P0_SHIFT ) +#define
VIDEO_COLOR_DEPTH_DP_ENC0_P0_8BIT
\drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +2
-0+ (3 <<VIDEO_COLOR_DEPTH_DP_ENC0_P0_SHIFT ) +#define
VIDEO_COLOR_DEPTH_DP_ENC0_P0_6BIT
\drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +4
-0+ (4 << VIDEO_COLOR_DEPTH_DP_ENC0_P0_SHIFT) +#define PIXEL_ENCODE_FORMAT_DP_ENC0_P0_MASK GENMASK(14, 12) +#define PIXEL_ENCODE_FORMAT_DP_ENC0_P0_SHIFT GENMASK(3, 2) +#define
PIXEL_ENCODE_FORMAT_DP_ENC0_P0_RGB
\drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +2
-0+ (0 <<PIXEL_ENCODE_FORMAT_DP_ENC0_P0_SHIFT ) +#define
PIXEL_ENCODE_FORMAT_DP_ENC0_P0_YCBCR422
\drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +2
-0+ (1 <<PIXEL_ENCODE_FORMAT_DP_ENC0_P0_SHIFT ) +#define
PIXEL_ENCODE_FORMAT_DP_ENC0_P0_YCBCR420
\drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +67
-0+ (2 << PIXEL_ENCODE_FORMAT_DP_ENC0_P0_SHIFT) +#define VIDEO_MN_GEN_EN_DP_ENC0_P0_MASK (BIT(15)) +#define VIDEO_MN_GEN_EN_DP_ENC0_P0_SHIFT GENMASK(3, 0) + +#define MTK_DP_ENC0_P0_3040 (ENC0_OFFSET + 0x40) +#define SDP_DOWN_CNT_INIT_DP_ENC0_P0_MASK GENMASK(11, 0) +#define SDP_DOWN_CNT_INIT_DP_ENC0_P0_SHIFT 0 + +#define MTK_DP_ENC0_P0_3044 (ENC0_OFFSET + 0x44) +#define VIDEO_N_CODE_0_DP_ENC0_P0_MASK GENMASK(15, 0) + +#define MTK_DP_ENC0_P0_3048 (ENC0_OFFSET + 0x48) +#define VIDEO_N_CODE_1_DP_ENC0_P0_MASK GENMASK(7, 0) + +#define MTK_DP_ENC0_P0_304C (ENC0_OFFSET + 0x4C) +#define VBID_VIDEO_MUTE_DP_ENC0_P0_MASK (BIT(2)) +#define SDP_VSYNC_RISING_MASK_DP_ENC0_P0_MASK (BIT(8)) + +#define MTK_DP_ENC0_P0_3050 (ENC0_OFFSET + 0x50) +#define VIDEO_N_CODE_MN_GEN_0_DP_ENC0_P0_MASK GENMASK(15, 0) + +#define MTK_DP_ENC0_P0_3054 (ENC0_OFFSET + 0x54) +#define VIDEO_N_CODE_MN_GEN_1_DP_ENC0_P0_MASK GENMASK(7, 0) + +#define MTK_DP_ENC0_P0_3064 (ENC0_OFFSET + 0x64) +#define HDE_NUM_LAST_DP_ENC0_P0_MASK GENMASK(15, 0) + +#define MTK_DP_ENC0_P0_3088 (ENC0_OFFSET + 0x88) +#define AU_EN_DP_ENC0_P0_MASK (BIT(6)) +#define AU_EN_DP_ENC0_P0_SHIFT GENMASK(2, 1) +#define AUDIO_8CH_EN_DP_ENC0_P0_MASK (BIT(7)) +#define AUDIO_8CH_SEL_DP_ENC0_P0_MASK (BIT(8)) +#define AUDIO_2CH_EN_DP_ENC0_P0_MASK (BIT(14)) +#define AUDIO_2CH_SEL_DP_ENC0_P0_MASK (BIT(15)) + +#define MTK_DP_ENC0_P0_308C (ENC0_OFFSET + 0x8C) +#define CH_STATUS_0_DP_ENC0_P0_MASK GENMASK(15, 0) + +#define MTK_DP_ENC0_P0_3090 (ENC0_OFFSET + 0x90) +#define CH_STATUS_1_DP_ENC0_P0_MASK GENMASK(15, 0) + +#define MTK_DP_ENC0_P0_3094 (ENC0_OFFSET + 0x94) +#define CH_STATUS_2_DP_ENC0_P0_MASK GENMASK(7, 0) + +#define MTK_DP_ENC0_P0_30A0 (ENC0_OFFSET + 0xA0) + +#define MTK_DP_ENC0_P0_30A4 (ENC0_OFFSET + 0xA4) +#define AU_TS_CFG_DP_ENC0_P0_MASK GENMASK(7, 0) + +#define MTK_DP_ENC0_P0_30A8 (ENC0_OFFSET + 0xA8) + +#define MTK_DP_ENC0_P0_30AC (ENC0_OFFSET + 0xAC) + +#define MTK_DP_ENC0_P0_30B0 (ENC0_OFFSET + 0xB0) + +#define MTK_DP_ENC0_P0_30B4 (ENC0_OFFSET + 0xB4) +#define ISRC_CFG_DP_ENC0_P0_MASK GENMASK(15, 8) +#define ISRC_CFG_DP_ENC0_P0_SHIFT (BIT(3)) + +#define MTK_DP_ENC0_P0_30B8 (ENC0_OFFSET + 0xB8) + +#define MTK_DP_ENC0_P0_30BC (ENC0_OFFSET + 0xBC) +#define ISRC_CONT_DP_ENC0_P0_MASK (BIT(0)) +#define ISRC_CONT_DP_ENC0_P0_SHIFT 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_SHIFT (BIT(3)) +#define
AUDIO_M_CODE_MULT_DIV_SEL_DP_ENC0_P0_MUL_2
\drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +2
-0+ (1 <<AUDIO_M_CODE_MULT_DIV_SEL_DP_ENC0_P0_SHIFT ) +#define
AUDIO_M_CODE_MULT_DIV_SEL_DP_ENC0_P0_MUL_4
\drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +2
-0+ (2 <<AUDIO_M_CODE_MULT_DIV_SEL_DP_ENC0_P0_SHIFT ) +#define
AUDIO_M_CODE_MULT_DIV_SEL_DP_ENC0_P0_MUL_8
\drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +2
-0+ (3 <<AUDIO_M_CODE_MULT_DIV_SEL_DP_ENC0_P0_SHIFT ) +#define
AUDIO_M_CODE_MULT_DIV_SEL_DP_ENC0_P0_DIV_2
\drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +2
-0+ (5 <<AUDIO_M_CODE_MULT_DIV_SEL_DP_ENC0_P0_SHIFT ) +#define
AUDIO_M_CODE_MULT_DIV_SEL_DP_ENC0_P0_DIV_4
\drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +2
-0+ (6 <<AUDIO_M_CODE_MULT_DIV_SEL_DP_ENC0_P0_SHIFT ) +#define
AUDIO_M_CODE_MULT_DIV_SEL_DP_ENC0_P0_DIV_8
\drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +114
-0+ (7 << AUDIO_M_CODE_MULT_DIV_SEL_DP_ENC0_P0_SHIFT) + +#define MTK_DP_ENC0_P0_30D8 (ENC0_OFFSET + 0xD8) + +#define MTK_DP_ENC0_P0_312C (ENC0_OFFSET + 0x12C) +#define ASP_HB2_DP_ENC0_P0_MASK GENMASK(7, 0) +#define ASP_HB3_DP_ENC0_P0_MASK GENMASK(15, 8) +#define ASP_HB3_DP_ENC0_P0_SHIFT (BIT(3)) + +#define MTK_DP_ENC0_P0_3130 (ENC0_OFFSET + 0x130) + +#define MTK_DP_ENC0_P0_3138 (ENC0_OFFSET + 0x138) + +#define MTK_DP_ENC0_P0_3154 (ENC0_OFFSET + 0x154) +#define PGEN_HTOTAL_DP_ENC0_P0_MASK GENMASK(13, 0) + +#define MTK_DP_ENC0_P0_3158 (ENC0_OFFSET + 0x158) +#define PGEN_HSYNC_RISING_DP_ENC0_P0_MASK GENMASK(13, 0) + +#define MTK_DP_ENC0_P0_315C (ENC0_OFFSET + 0x15C) +#define PGEN_HSYNC_PULSE_WIDTH_DP_ENC0_P0_MASK GENMASK(13, 0) + +#define MTK_DP_ENC0_P0_3160 (ENC0_OFFSET + 0x160) +#define PGEN_HFDE_START_DP_ENC0_P0_MASK GENMASK(13, 0) + +#define MTK_DP_ENC0_P0_3164 (ENC0_OFFSET + 0x164) +#define PGEN_HFDE_ACTIVE_WIDTH_DP_ENC0_P0_MASK GENMASK(13, 0) + +#define MTK_DP_ENC0_P0_3168 (ENC0_OFFSET + 0x168) +#define PGEN_VTOTAL_DP_ENC0_P0_MASK GENMASK(12, 0) + +#define MTK_DP_ENC0_P0_316C (ENC0_OFFSET + 0x16C) +#define PGEN_VSYNC_RISING_DP_ENC0_P0_MASK GENMASK(12, 0) + +#define MTK_DP_ENC0_P0_3170 (ENC0_OFFSET + 0x170) +#define PGEN_VSYNC_PULSE_WIDTH_DP_ENC0_P0_MASK GENMASK(12, 0) + +#define MTK_DP_ENC0_P0_3174 (ENC0_OFFSET + 0x174) +#define PGEN_VFDE_START_DP_ENC0_P0_MASK GENMASK(12, 0) + +#define MTK_DP_ENC0_P0_3178 (ENC0_OFFSET + 0x178) +#define PGEN_VFDE_ACTIVE_WIDTH_DP_ENC0_P0_MASK GENMASK(12, 0) + +#define MTK_DP_ENC0_P0_31B0 (ENC0_OFFSET + 0x1B0) +#define PGEN_PATTERN_SEL_SHIFT (BIT(2)) +#define PGEN_PATTERN_SEL_MASK GENMASK(6, 4) + +#define MTK_DP_ENC0_P0_31C8 (ENC0_OFFSET + 0x1C8) +#define VSC_EXT_VESA_HB0_DP_ENC0_P0_MASK GENMASK(7, 0) +#define VSC_EXT_VESA_HB1_DP_ENC0_P0_MASK GENMASK(15, 8) +#define VSC_EXT_VESA_HB1_DP_ENC0_P0_SHIFT (BIT(3)) + +#define MTK_DP_ENC0_P0_31CC (ENC0_OFFSET + 0x1CC) +#define VSC_EXT_VESA_HB2_DP_ENC0_P0_MASK GENMASK(7, 0) +#define VSC_EXT_VESA_HB2_DP_ENC0_P0_SHIFT 0 +#define VSC_EXT_VESA_HB3_DP_ENC0_P0_MASK GENMASK(15, 8) + +#define MTK_DP_ENC0_P0_31D0 (ENC0_OFFSET + 0x1D0) +#define VSC_EXT_CEA_HB0_DP_ENC0_P0_MASK GENMASK(7, 0) +#define VSC_EXT_CEA_HB1_DP_ENC0_P0_MASK GENMASK(15, 8) +#define VSC_EXT_CEA_HB1_DP_ENC0_P0_SHIFT (BIT(3)) + +#define MTK_DP_ENC0_P0_31D4 (ENC0_OFFSET + 0x1D4) +#define VSC_EXT_CEA_HB2_DP_ENC0_P0_MASK GENMASK(7, 0) +#define VSC_EXT_CEA_HB2_DP_ENC0_P0_SHIFT 0 +#define VSC_EXT_CEA_HB3_DP_ENC0_P0_MASK GENMASK(15, 8) + +#define MTK_DP_ENC0_P0_31D8 (ENC0_OFFSET + 0x1D8) +#define VSC_EXT_VESA_NUM_DP_ENC0_P0_MASK GENMASK(5, 0) +#define VSC_EXT_VESA_NUM_DP_ENC0_P0_SHIFT 0 +#define VSC_EXT_CEA_NUM_DP_ENC0_P0_MASK GENMASK(13, 8) +#define VSC_EXT_CEA_NUM_DP_ENC0_P0_SHIFT (BIT(3)) + +#define MTK_DP_ENC0_P0_31DC (ENC0_OFFSET + 0x1DC) +#define HDR0_CFG_DP_ENC0_P0_MASK GENMASK(7, 0) +#define HDR0_CFG_DP_ENC0_P0_SHIFT 0 + +#define MTK_DP_ENC0_P0_31E8 (ENC0_OFFSET + 0x1E8) + +#define MTK_DP_ENC0_P0_31EC (ENC0_OFFSET + 0x1EC) +#define AUDIO_CH_SRC_SEL_DP_ENC0_P0_MASK (BIT(4)) +#define AUDIO_CH_SRC_SEL_DP_ENC0_P0_SHIFT (BIT(2)) +#define ISRC1_HB3_DP_ENC0_P0_MASK GENMASK(15, 8) +#define ISRC1_HB3_DP_ENC0_P0_SHIFT (BIT(3)) + +#define MTK_DP_ENC1_P0_3200 (ENC1_OFFSET + 0x00) + +#define MTK_DP_ENC1_P0_3280 (ENC1_OFFSET + 0x80) +#define SDP_PACKET_TYPE_DP_ENC1_P0_MASK GENMASK(4, 0) +#define SDP_PACKET_W_DP_ENC1_P0 (BIT(5)) +#define SDP_PACKET_W_DP_ENC1_P0_MASK (BIT(5)) +#define SDP_PACKET_W_DP_ENC1_P0_SHIFT (BIT(0) | BIT(2)) + +#define MTK_DP_ENC1_P0_328C (ENC1_OFFSET + 0x8C) + +#define MTK_DP_ENC1_P0_3290 (ENC1_OFFSET + 0x90) + +#define MTK_DP_ENC1_P0_32A0 (ENC1_OFFSET + 0xA0) + +#define MTK_DP_ENC1_P0_32A4 (ENC1_OFFSET + 0xA4) + +#define MTK_DP_ENC1_P0_3300 (ENC1_OFFSET + 0x100) +#define VIDEO_AFIFO_RDY_SEL_DP_ENC1_P0_MASK GENMASK(9, 8) +#define VIDEO_AFIFO_RDY_SEL_DP_ENC1_P0_SHIFT (BIT(3)) + +#define MTK_DP_ENC1_P0_3304 (ENC1_OFFSET + 0x104) +#define AU_PRTY_REGEN_DP_ENC1_P0_MASK (BIT(8)) +#define AU_CH_STS_REGEN_DP_ENC1_P0_MASK (BIT(9)) +#define AUDIO_SAMPLE_PRSENT_REGEN_DP_ENC1_P0_MASK (BIT(12)) + +#define MTK_DP_ENC1_P0_3324 (ENC1_OFFSET + 0x124) +#define AUDIO_SOURCE_MUX_DP_ENC1_P0_MASK GENMASK(9, 8) +#define AUDIO_SOURCE_MUX_DP_ENC1_P0_SHIFT (BIT(3)) +#define
AUDIO_SOURCE_MUX_DP_ENC1_P0_DPRX
\drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +30
-0+ (0 << AUDIO_SOURCE_MUX_DP_ENC1_P0_SHIFT) + +#define MTK_DP_ENC1_P0_3364 (ENC1_OFFSET + 0x164) +#define SDP_DOWN_CNT_INIT_IN_HBLANK_DP_ENC1_P0_MASK GENMASK(11, 0) +#define SDP_DOWN_CNT_INIT_IN_HBLANK_DP_ENC1_P0_SHIFT 0 +#define FIFO_READ_START_POINT_DP_ENC1_P0_MASK GENMASK(15, 12) +#define FIFO_READ_START_POINT_DP_ENC1_P0_SHIFT GENMASK(3, 2) + +#define MTK_DP_ENC1_P0_3368 (ENC1_OFFSET + 0x168) +#define VIDEO_SRAM_FIFO_CNT_RESET_SEL_DP_ENC1_P0_SHIFT 0 +#define VIDEO_STABLE_CNT_THRD_DP_ENC1_P0_SHIFT (BIT(2)) +#define SDP_DP13_EN_DP_ENC1_P0_SHIFT (BIT(3)) +#define BS2BS_MODE_DP_ENC1_P0_MASK GENMASK(13, 12) +#define BS2BS_MODE_DP_ENC1_P0_SHIFT GENMASK(3, 2) + +#define MTK_DP_ENC1_P0_33F4 (ENC1_OFFSET + 0x1F4) + +#define MTK_DP_TRANS_P0_3400 (TRANS_OFFSET + 0) +#define PATTERN1_EN_DP_TRANS_P0_MASK (BIT(12)) +#define PATTERN1_EN_DP_TRANS_P0_SHIFT GENMASK(3, 2) +#define PATTERN2_EN_DP_TRANS_P0_MASK (BIT(13)) +#define PATTERN3_EN_DP_TRANS_P0_MASK (BIT(14)) +#define PATTERN4_EN_DP_TRANS_P0_MASK (BIT(15)) + +#define MTK_DP_TRANS_P0_3404 (TRANS_OFFSET + 0x4) +#define DP_SCR_EN_DP_TRANS_P0_MASK (BIT(0)) + +#define MTK_DP_TRANS_P0_340C (TRANS_OFFSET + 0xC) +#define DP_TX_TRANSMITTER_4P_RESET_SW_DP_TRANS_P0_MASK (BIT(13)) +#define DP_TX_TRANSMITTER_4P_RESET_SW_DP_TRANS_P0_SHIFT (BIT(0) |BIT(2) | BIT(3))
drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +7
-0+ +#define MTK_DP_TRANS_P0_3410 (TRANS_OFFSET + 0x10) +#define HPD_DEB_THD_DP_TRANS_P0_MASK GENMASK(3, 0) +#define HPD_DEB_THD_DP_TRANS_P0_SHIFT 0 +#define HPD_INT_THD_DP_TRANS_P0_MASK GENMASK(7, 4) +#define HPD_INT_THD_DP_TRANS_P0_SHIFT (BIT(2)) +#define HPD_INT_THD_DP_TRANS_P0_LOWER_500US (2 <<
HPD_INT_THD_DP_TRANS_P0_SHIFT)
+#defineHPD_INT_THD_DP_TRANS_P0_UPPER_1100US
\drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +14
-0+ (2 << (HPD_INT_THD_DP_TRANS_P0_SHIFT + 2)) +#define HPD_DISC_THD_DP_TRANS_P0_MASK GENMASK(11, 8) +#define HPD_DISC_THD_DP_TRANS_P0_SHIFT (BIT(3)) +#define HPD_CONN_THD_DP_TRANS_P0_MASK GENMASK(15, 12) +#define HPD_CONN_THD_DP_TRANS_P0_SHIFT GENMASK(3, 2) + +#define MTK_DP_TRANS_P0_3414 (TRANS_OFFSET + 0x14) +#define HPD_DB_DP_TRANS_P0_MASK (BIT(2)) + +#define MTK_DP_TRANS_P0_3418 (TRANS_OFFSET + 0x18) +#define IRQ_CLR_DP_TRANS_P0_MASK GENMASK(3, 0) +#define IRQ_MASK_DP_TRANS_P0_MASK GENMASK(7, 4) +#define IRQ_MASK_DP_TRANS_P0_SHIFT (BIT(2)) +#define IRQ_MASK_DP_TRANS_P0_DISC_IRQ (BIT(1) <<
IRQ_MASK_DP_TRANS_P0_SHIFT)
+#defineIRQ_MASK_DP_TRANS_P0_CONN_IRQ(BIT(2) <<IRQ_MASK_DP_TRANS_P0_SHIFT)
+#defineIRQ_MASK_DP_TRANS_P0_INT_IRQ(BIT(3) <<IRQ_MASK_DP_TRANS_P0_SHIFT)drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +5
-0+#define IRQ_STATUS_DP_TRANS_P0_MASK GENMASK(15, 12) +#define IRQ_STATUS_DP_TRANS_P0_SHIFT GENMASK(3, 2) + +#define MTK_DP_TRANS_P0_342C (TRANS_OFFSET + 0x2C) +#define XTAL_FREQ_DP_TRANS_P0_DEFAULT (BIT(0) | BIT(3) | BIT(5) |BIT(6))
drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +61
-0+#define XTAL_FREQ_DP_TRANS_P0_MASK GENMASK(7, 0) + +#define MTK_DP_TRANS_P0_3430 (TRANS_OFFSET + 0x30) +#define HPD_INT_THD_ECO_DP_TRANS_P0_MASK GENMASK(1, 0) +#define HPD_INT_THD_ECO_DP_TRANS_P0_HIGH_BOUND_EXT BIT(1) + +#define MTK_DP_TRANS_P0_34A4 (TRANS_OFFSET + 0xA4) +#define LANE_NUM_DP_TRANS_P0_MASK GENMASK(3, 2) +#define LANE_NUM_DP_TRANS_P0_SHIFT (BIT(1)) + +#define MTK_DP_TRANS_P0_3540 (TRANS_OFFSET + 0x140) +#define FEC_EN_DP_TRANS_P0_MASK (BIT(0)) +#define FEC_EN_DP_TRANS_P0_SHIFT 0 +#define FEC_CLOCK_EN_MODE_DP_TRANS_P0_MASK (BIT(3)) +#define FEC_CLOCK_EN_MODE_DP_TRANS_P0_SHIFT GENMASK(1, 0) + +#define MTK_DP_TRANS_P0_3580 (TRANS_OFFSET + 0x180) +#define POST_MISC_DATA_LANE0_OV_DP_TRANS_P0_MASK (BIT(8)) +#define POST_MISC_DATA_LANE1_OV_DP_TRANS_P0_MASK (BIT(9)) +#define POST_MISC_DATA_LANE2_OV_DP_TRANS_P0_MASK (BIT(10)) +#define POST_MISC_DATA_LANE3_OV_DP_TRANS_P0_MASK (BIT(11)) + +#define MTK_DP_TRANS_P0_35C4 (TRANS_OFFSET + 0x1C4) +#define SW_IRQ_MASK_DP_TRANS_P0_MASK GENMASK(15, 0) + +#define MTK_DP_TRANS_P0_35C8 (TRANS_OFFSET + 0x1C8) +#define SW_IRQ_CLR_DP_TRANS_P0_MASK GENMASK(15, 0) + +#define SW_IRQ_STATUS_DP_TRANS_P0_MASK GENMASK(15, 0) +#define SW_IRQ_STATUS_DP_TRANS_P0_SHIFT 0 + +#define MTK_DP_TRANS_P0_35D0 (TRANS_OFFSET + 0x1D0) +#define SW_IRQ_FINAL_STATUS_DP_TRANS_P0_MASK GENMASK(15, 0) + +#define MTK_DP_TRANS_P0_35F0 (TRANS_OFFSET + 0x1F0) + +#define MTK_DP_AUX_P0_360C (AUX_OFFSET + 0xC) +#define AUX_TIMEOUT_THR_AUX_TX_P0_MASK GENMASK(12, 0) + +#define MTK_DP_AUX_P0_3614 (AUX_OFFSET + 0x14) +#define AUX_RX_UI_CNT_THR_AUX_TX_P0_MASK GENMASK(6, 0) +#define AUX_RX_UI_CNT_THR_AUX_TX_P0_SHIFT 0 + +#define MTK_DP_AUX_P0_3618 (AUX_OFFSET + 0x18) +#define AUX_RX_FIFO_FULL_AUX_TX_P0_MASK (BIT(9)) +#define AUX_RX_FIFO_WRITE_POINTER_AUX_TX_P0_MASK GENMASK(3, 0) + +#define MTK_DP_AUX_P0_3620 (AUX_OFFSET + 0x20) +#define AUX_RD_MODE_AUX_TX_P0_MASK (BIT(9)) +#define AUX_RX_FIFO_READ_PULSE_TX_P0_MASK (BIT(8)) +#define AUX_RX_FIFO_R_PULSE_TX_P0_SHIFT (BIT(3)) +#define AUX_RX_FIFO_READ_DATA_AUX_TX_P0_MASK GENMASK(7, 0) +#define AUX_RX_FIFO_READ_DATA_AUX_TX_P0_SHIFT 0 + +#define MTK_DP_AUX_P0_3624 (AUX_OFFSET + 0x24) +#define AUX_RX_REPLY_COMMAND_AUX_TX_P0_MASK GENMASK(3, 0) + +#define MTK_DP_AUX_P0_3628 (AUX_OFFSET + 0x28) +#define AUX_RX_PHY_STATE_AUX_TX_P0_MASK GENMASK(9, 0) +#define AUX_RX_PHY_STATE_AUX_TX_P0_SHIFT 0 +#define
AUX_RX_PHY_STATE_AUX_TX_P0_RX_IDLE
\drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +20
-0+ (BIT(0) << AUX_RX_PHY_STATE_AUX_TX_P0_SHIFT) + +#define MTK_DP_AUX_P0_362C (AUX_OFFSET + 0x2C) +#define AUX_NO_LENGTH_AUX_TX_P0_MASK (BIT(0)) +#define AUX_NO_LENGTH_AUX_TX_P0_SHIFT 0 +#define AUX_TX_AUXTX_OV_EN_AUX_TX_P0_MASK (BIT(1)) +#define AUX_RESERVED_RW_0_AUX_TX_P0_MASK GENMASK(15, 2) + +#define MTK_DP_AUX_P0_3630 (AUX_OFFSET + 0x30) +#define AUX_TX_REQUEST_READY_AUX_TX_P0_MASK (BIT(3)) +#define AUX_TX_REQUEST_READY_AUX_TX_P0_SHIFT GENMASK(1, 0) + +#define MTK_DP_AUX_P0_3634 (AUX_OFFSET + 0x34) +#define AUX_TX_OVER_SAMPLE_RATE_AUX_TX_P0_MASK GENMASK(15, 8) +#define AUX_TX_OVER_SAMPLE_RATE_AUX_TX_P0_SHIFT (BIT(3)) + +#define MTK_DP_AUX_P0_3640 (AUX_OFFSET + 0x40) +#define AUX_RX_RECV_COMPLETE_IRQ_TX_P0_MASK (BIT(6)) +#define AUX_RX_AUX_RECV_COMPLETE_IRQ_AUX_TX_P0_SHIFT GENMASK(2, 1) +#define AUX_RX_EDID_RECV_COMPLETE_IRQ_AUX_TX_P0_SHIFT (BIT(0) |BIT(2))
drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +32
-0+#define AUX_RX_MCCS_RECV_COMPLETE_IRQ_AUX_TX_P0_SHIFT (BIT(2)) +#define AUX_RX_CMD_RECV_IRQ_AUX_TX_P0_SHIFT GENMASK(1, 0) +#define AUX_RX_ADDR_RECV_IRQ_AUX_TX_P0_SHIFT (BIT(1)) +#define AUX_RX_DATA_RECV_IRQ_AUX_TX_P0_SHIFT (BIT(0)) +#define AUX_400US_TIMEOUT_IRQ_AUX_TX_P0_MASK (BIT(0)) +#define AUX_400US_TIMEOUT_IRQ_AUX_TX_P0_SHIFT 0 + +#define MTK_DP_AUX_P0_3644 (AUX_OFFSET + 0x44) +#define MCU_REQUEST_COMMAND_AUX_TX_P0_MASK GENMASK(3, 0) + +#define MTK_DP_AUX_P0_3648 (AUX_OFFSET + 0x48) +#define MCU_REQUEST_ADDRESS_LSB_AUX_TX_P0_MASK GENMASK(15, 0) + +#define MTK_DP_AUX_P0_364C (AUX_OFFSET + 0x4C) +#define MCU_REQUEST_ADDRESS_MSB_AUX_TX_P0_MASK GENMASK(3, 0) + +#define MTK_DP_AUX_P0_3650 (AUX_OFFSET + 0x50) +#define MCU_REQ_DATA_NUM_AUX_TX_P0_MASK GENMASK(15, 12) +#define MCU_REQ_DATA_NUM_AUX_TX_P0_SHIFT GENMASK(3, 2) +#define PHY_FIFO_RST_AUX_TX_P0_MASK (BIT(9)) +#define MCU_ACK_TRAN_COMPLETE_AUX_TX_P0_MASK (BIT(8)) +#define MCU_ACK_TRAN_COMPLETE_AUX_TX_P0_SHIFT (BIT(3)) + +#define MTK_DP_AUX_P0_3658 (AUX_OFFSET + 0x58) +#define AUX_TX_OV_EN_AUX_TX_P0_MASK (BIT(0)) + +#define MTK_DP_AUX_P0_3690 (AUX_OFFSET + 0x90) +#define RX_REPLY_COMPLETE_MODE_AUX_TX_P0_MASK (BIT(8)) +#define RX_REPLY_COMPLETE_MODE_AUX_TX_P0_SHIFT (BIT(3)) + +#define MTK_DP_AUX_P0_3704 (AUX_OFFSET + 0x104) +#define AUX_TX_FIFO_WRITE_DATA_NEW_MODE_TOGGLE_AUX_TX_P0_MASK (BIT(1))
drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +44
-0+#define AUX_TX_FIFO_NEW_MODE_EN_AUX_TX_P0_MASK (BIT(2)) +#define AUX_TX_FIFO_NEW_MODE_EN_AUX_TX_P0_SHIFT (BIT(1)) + +#define MTK_DP_AUX_P0_3708 (AUX_OFFSET + 0x108) + +#define MTK_DP_AUX_P0_37C8 (AUX_OFFSET + 0x1C8) +#define MTK_ATOP_EN_AUX_TX_P0_MASK (BIT(0)) +#define MTK_ATOP_EN_AUX_TX_P0_SHIFT 0 + +#define MTK_DP_TOP_PWR_STATE (TOP_OFFSET + 0x0) +#define DP_PWR_STATE_MASK GENMASK(1, 0) +#define DP_PWR_STATE_BANDGAP (BIT(0)) +#define DP_PWR_STATE_BANDGAP_TPLL (BIT(1)) +#define DP_PWR_STATE_BANDGAP_TPLL_LANE GENMASK(1, 0) + +#define MTK_DP_TOP_SWING_EMP (TOP_OFFSET + 0x4) +#define DP_TX0_VOLT_SWING_MASK GENMASK(1, 0) +#define DP_TX0_VOLT_SWING_SHIFT 0 +#define DP_TX0_PRE_EMPH_MASK GENMASK(3, 2) +#define DP_TX0_PRE_EMPH_SHIFT (BIT(1)) +#define DP_TX1_VOLT_SWING_MASK GENMASK(9, 8) +#define DP_TX1_VOLT_SWING_SHIFT (BIT(3)) +#define DP_TX1_PRE_EMPH_MASK GENMASK(11, 10) +#define DP_TX2_VOLT_SWING_MASK GENMASK(17, 16) +#define DP_TX2_PRE_EMPH_MASK GENMASK(19, 18) +#define DP_TX3_VOLT_SWING_MASK GENMASK(25, 24) +#define DP_TX3_PRE_EMPH_MASK GENMASK(27, 26) + +#define MTK_DP_TOP_RESET_AND_PROBE (TOP_OFFSET + 0x20) +#define SW_RST_B_SHIFT 0 +#define SW_RST_B_PHYD (BIT(4) << SW_RST_B_SHIFT) + +#define MTK_DP_TOP_IRQ_STATUS (TOP_OFFSET + 0x28) +#define RGS_IRQ_STATUS_SHIFT 0 +#define RGS_IRQ_STATUS_TRANSMITTER (BIT(1) << RGS_IRQ_STATUS_SHIFT) + +#define MTK_DP_TOP_IRQ_MASK (TOP_OFFSET + 0x2C) +#define IRQ_MASK_AUX_TOP_IRQ BIT(2) + +#define MTK_DP_TOP_MEM_PD (TOP_OFFSET + 0x38) +#define MEM_ISO_EN_SHIFT 0 +#define FUSE_SEL_SHIFT (BIT(1)) + +#endif /*_MTK_DP_REG_H_*/ drivers/gpu/drm/mediatek/mtk_drm_drv.c +1
-0@@ -709,6 +709,7 @@ static struct platform_driver * const mtk_drm_drivers[] = { &mtk_disp_ovl_driver, &mtk_disp_rdma_driver, &mtk_dpi_driver, + &mtk_dp_driver, &mtk_drm_platform_driver, &mtk_dsi_driver,};
drivers/gpu/drm/mediatek/mtk_drm_drv.h +1
-0@@ -53,6 +53,7 @@ extern struct platform_driver mtk_disp_gamma_driver;extern struct platform_driver mtk_disp_ovl_driver;extern struct platform_driver mtk_disp_rdma_driver;extern struct platform_driver mtk_dpi_driver; +extern struct platform_driver mtk_dp_driver;extern struct platform_driver mtk_dsi_driver;#endif /*
MTK_DRM_DRV_H*/
Re: [PATCH v9 18/22] drm/mediatek: Add mt8195 Embedded DisplayPort driver
Quoted 124 lines · Rex-BC Chen
Quoted 96 lines · Guillaume Ranquet
From: Markus Schneider-Pargmann <[email protected]>
This patch adds a DisplayPort driver for the Mediatek mt8195 SoC.
It supports the mt8195, the embedded DisplayPort units. It offers DisplayPort 1.4 with up to 4 lanes.
The driver shares its iomap range with the mtk-dp-phy driver using the regmap/syscon facility.
This driver is based on an initial version by
Jason-JH.Lin <[email protected]>.Signed-off-by Markus Schneider-Pargmann <[email protected]>Signed-off-by Guillaume Ranquet <[email protected]>Reported-by kernel test robot <[email protected]>--- drivers/gpu/drm/mediatek/Kconfig | 8 + drivers/gpu/drm/mediatek/Makefile | 2 + drivers/gpu/drm/mediatek/mtk_dp.c | 2221 ++++++++++++++++++++++++ drivers/gpu/drm/mediatek/mtk_dp_reg.h | 568 ++++++ drivers/gpu/drm/mediatek/mtk_drm_drv.c | 1 + drivers/gpu/drm/mediatek/mtk_drm_drv.h | 1 + 6 files changed, 2801 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 +8
-0@@ -28,3 +28,11 @@ 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 PHY_MTK_DP + select DRM_DP_HELPER + help + DRM/KMS Display Port driver for Mediatek SoCs.drivers/gpu/drm/mediatek/Makefile +2
-0@@ -21,3 +21,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.odrivers/gpu/drm/mediatek/mtk_dp.c new file +32
-0@@ -0,0 +1,2221 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (c) 2019 MediaTek Inc. +* Copyright (c) 2021 BayLibre +*/ + +#include <drm/drm_atomic_helper.h> +#include <drm/drm_bridge.h> +#include <drm/drm_crtc.h> +#include <drm/dp/drm_dp_helper.h> +#include <drm/drm_edid.h> +#include <drm/drm_of.h> +#include <drm/drm_panel.h> +#include <drm/drm_print.h> +#include <drm/drm_probe_helper.h> +#include <linux/arm-smccc.h> +#include <linux/clk.h> +#include <linux/delay.h> +#include <linux/errno.h> +#include <linux/kernel.h> +#include <linux/mfd/syscon.h> +#include <linux/nvmem-consumer.h> +#include <linux/of.h> +#include <linux/of_irq.h> +#include <linux/of_platform.h> +#include <linux/phy/phy.h> +#include <linux/platform_device.h> +#include <linux/pm_runtime.h> +#include <linux/regmap.h> +#include <sound/hdmi-codec.h> +#include <video/videomode.h> +...snip...
Quoted 11 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +2
-0+ +static SIMPLE_DEV_PM_OPS(mtk_dp_pm_ops, mtk_dp_suspend,
mtk_dp_resume);drivers/gpu/drm/mediatek/mtk_dp.c new file +8
-0+ +static const struct of_device_id mtk_dp_of_match[] = { + { .compatible ="mediatek,mt8195-edp-tx" , }, + {}, +}; +MODULE_DEVICE_TABLE (of, mtk_dp_of_match); + +struct platform_driver mtk_dp_driver = {drivers/gpu/drm/mediatek/mtk_dp.c line 2218
Quoted 10 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +10
-0+ .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, + }, +}; + +MODULE_AUTHOR ("Jason-JH.Lin <[email protected]>" );Hello Guillaume,
Quoted 6 lines
I think the module author is not Jason-JH Lin. He is the owner of 8195 DRM.
The owner should be Jitao Shi <[email protected]>BRs,
Rex
Hi Rex,
We kept the original author from the vendor tree.
I'll update for v10.
Thx,
Guillaume.
Quoted 651 lines
Quoted 650 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +3
-0+MODULE_AUTHOR ("Markus Schneider-Pargmann <[email protected]>" ); +MODULE_DESCRIPTION ("MediaTek DisplayPort Driver" ); +MODULE_LICENSE ("GPL" );drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +9
-0@@ -0,0 +1,568 @@ +/* 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 (BIT(0) | BIT(1) | BIT(5) |BIT(8) | BIT(10) | BIT(25) | BIT(31))
drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +121
-0+#define MTK_DP_SIP_ATF_VIDEO_UNMUTE (BIT(5)) +#define MTK_DP_SIP_ATF_EDP_VIDEO_UNMUTE (BIT(0) | BIT(5)) + +#define DP_PHY_GLB_BIAS_GEN_00 0 +#define RG_XTP_GLB_BIAS_INTR_CTRL GENMASK(20, 16) + +#define DP_PHY_GLB_DPAUX_TX (BIT(3)) +#define RG_CKM_PT0_CKTX_IMPSEL GENMASK(23, 20) + +#define DP_PHY_LANE_TX_0 (BIT(2) | BIT(8)) +#define RG_XTP_LN0_TX_IMPSEL_PMOS GENMASK(15, 12) +#define RG_XTP_LN0_TX_IMPSEL_NMOS GENMASK(19, 16) + +#define DP_PHY_LANE_TX_1 (BIT(2) | BIT(9)) +#define RG_XTP_LN1_TX_IMPSEL_PMOS GENMASK(15, 12) +#define RG_XTP_LN1_TX_IMPSEL_NMOS GENMASK(19, 16) + +#define DP_PHY_LANE_TX_2 (BIT(2) | BIT(8) | BIT(9)) +#define RG_XTP_LN2_TX_IMPSEL_PMOS GENMASK(15, 12) +#define RG_XTP_LN2_TX_IMPSEL_NMOS GENMASK(19, 16) + +#define DP_PHY_LANE_TX_3 (BIT(2) | BIT(10)) +#define RG_XTP_LN3_TX_IMPSEL_PMOS GENMASK(15, 12) +#define RG_XTP_LN3_TX_IMPSEL_NMOS GENMASK(19, 16) + +#define TOP_OFFSET (BIT(13)) +#define ENC0_OFFSET GENMASK(13, 12) +#define ENC1_OFFSET (BIT(9) | BIT(12) | BIT(13)) +#define TRANS_OFFSET (BIT(10) | BIT(12) | BIT(13)) +#define AUX_OFFSET (BIT(9) | BIT(10) | BIT(12) | BIT(13)) +#define SEC_OFFSET (BIT(14)) + +#define MTK_DP_HPD_DISCONNECT BIT(1) +#define MTK_DP_HPD_CONNECT BIT(2) +#define MTK_DP_HPD_INTERRUPT BIT(3) + +#define MTK_DP_0034 (BIT(2) | BIT(4) | BIT(5)) +#define DA_XTP_GLB_CKDET_EN_FORCE_VAL BIT(15) +#define DA_XTP_GLB_CKDET_EN_FORCE_EN BIT(14) +#define DA_CKM_INTCKTX_EN_FORCE_VAL BIT(13) +#define DA_CKM_INTCKTX_EN_FORCE_EN BIT(12) +#define DA_CKM_CKTX0_EN_FORCE_VAL BIT(11) +#define DA_CKM_CKTX0_EN_FORCE_EN BIT(10) +#define DA_CKM_XTAL_CK_FORCE_VAL BIT(9) +#define DA_CKM_XTAL_CK_FORCE_EN BIT(8) +#define DA_CKM_BIAS_LPF_EN_FORCE_VAL BIT(7) +#define DA_CKM_BIAS_LPF_EN_FORCE_EN BIT(6) +#define DA_CKM_BIAS_EN_FORCE_VAL BIT(5) +#define DA_CKM_BIAS_EN_FORCE_EN BIT(4) +#define DA_XTP_GLB_AVD10_ON_FORCE_VAL BIT(3) +#define DA_XTP_GLB_AVD10_ON_FORCE BIT(2) +#define DA_XTP_GLB_LDO_EN_FORCE_VAL BIT(1) +#define DA_XTP_GLB_LDO_EN_FORCE_EN BIT(0) + +#define MTK_DP_1040 (BIT(6) | BIT(12)) +#define RG_DPAUX_RX_VALID_DEGLITCH_EN BIT(2) +#define RG_XTP_GLB_CKDET_EN BIT(1) +#define RG_DPAUX_RX_EN BIT(0) + +#define MTK_DP_ENC0_P0_3000 (ENC0_OFFSET + 0x00) +#define LANE_NUM_DP_ENC0_P0_MASK GENMASK(1, 0) +#define VIDEO_MUTE_SW_DP_ENC0_P0_MASK (BIT(2)) +#define VIDEO_MUTE_SW_DP_ENC0_P0_SHIFT (BIT(1)) +#define VIDEO_MUTE_SEL_DP_ENC0_P0_MASK (BIT(3)) +#define VIDEO_MUTE_SEL_DP_ENC0_P0_SHIFT GENMASK(1, 0) +#define ENHANCED_FRAME_EN_DP_ENC0_P0_MASK (BIT(4)) +#define ENHANCED_FRAME_EN_DP_ENC0_P0_SHIFT (BIT(2)) + +#define MTK_DP_ENC0_P0_3004 (ENC0_OFFSET + 0x04) +#define VIDEO_M_CODE_SEL_DP_ENC0_P0_MASK (BIT(8)) +#define VIDEO_M_CODE_SEL_DP_ENC0_P0_SHIFT (BIT(3)) +#define DP_TX_ENCODER_4P_RESET_SW_DP_ENC0_P0_MASK (BIT(9)) +#define DP_TX_ENCODER_4P_RESET_SW_DP_ENC0_P0_SHIFT (BIT(0) | BIT(3)) + +#define MTK_DP_ENC0_P0_3008 (ENC0_OFFSET + 0x08) +#define VIDEO_M_CODE_SW_0_DP_ENC0_P0_MASK GENMASK(15, 0) + +#define MTK_DP_ENC0_P0_300C (ENC0_OFFSET + 0x0C) +#define VIDEO_M_CODE_SW_1_DP_ENC0_P0_MASK GENMASK(7, 0) + +#define MTK_DP_ENC0_P0_3010 (ENC0_OFFSET + 0x10) +#define HTOTAL_SW_DP_ENC0_P0_MASK GENMASK(15, 0) + +#define MTK_DP_ENC0_P0_3014 (ENC0_OFFSET + 0x14) +#define VTOTAL_SW_DP_ENC0_P0_MASK GENMASK(15, 0) + +#define MTK_DP_ENC0_P0_3018 (ENC0_OFFSET + 0x18) +#define HSTART_SW_DP_ENC0_P0_MASK GENMASK(15, 0) + +#define MTK_DP_ENC0_P0_301C (ENC0_OFFSET + 0x1C) +#define VSTART_SW_DP_ENC0_P0_MASK GENMASK(15, 0) + +#define MTK_DP_ENC0_P0_3020 (ENC0_OFFSET + 0x20) +#define HWIDTH_SW_DP_ENC0_P0_MASK GENMASK(15, 0) + +#define MTK_DP_ENC0_P0_3024 (ENC0_OFFSET + 0x24) +#define VHEIGHT_SW_DP_ENC0_P0_MASK GENMASK(15, 0) + +#define MTK_DP_ENC0_P0_3028 (ENC0_OFFSET + 0x28) +#define HSW_SW_DP_ENC0_P0_MASK GENMASK(14, 0) +#define HSW_SW_DP_ENC0_P0_SHIFT 0 +#define HSP_SW_DP_ENC0_P0_MASK (BIT(15)) + +#define MTK_DP_ENC0_P0_302C (ENC0_OFFSET + 0x2C) +#define VSW_SW_DP_ENC0_P0_MASK GENMASK(14, 0) +#define VSW_SW_DP_ENC0_P0_SHIFT 0 +#define VSP_SW_DP_ENC0_P0_MASK (BIT(15)) + +#define MTK_DP_ENC0_P0_3030 (ENC0_OFFSET + 0x30) +#define HTOTAL_SEL_DP_ENC0_P0_SHIFT 0 +#define VTOTAL_SEL_DP_ENC0_P0_SHIFT (BIT(0)) +#define HSTART_SEL_DP_ENC0_P0_SHIFT (BIT(1)) +#define VSTART_SEL_DP_ENC0_P0_SHIFT GENMASK(1, 0) +#define HWIDTH_SEL_DP_ENC0_P0_SHIFT (BIT(2)) +#define VHEIGHT_SEL_DP_ENC0_P0_SHIFT (BIT(0) | BIT(2)) +#define HSP_SEL_DP_ENC0_P0_SHIFT GENMASK(2, 1) +#define HSW_SEL_DP_ENC0_P0_SHIFT GENMASK(2, 0) +#define VSP_SEL_DP_ENC0_P0_SHIFT (BIT(3)) +#define VSW_SEL_DP_ENC0_P0_SHIFT (BIT(0) | BIT(3)) +#define VBID_AUDIO_MUTE_FLAG_SW_DP_ENC0_P0_MASK (BIT(11)) +#define VBID_AUDIO_MUTE_SW_DP_ENC0_P0_SHIFT (BIT(0) | BIT(1) |BIT(3))
drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +15
-0+#define VBID_AUDIO_MUTE_FLAG_SEL_DP_ENC0_P0_MASK (BIT(12)) +#define VBID_AUDIO_MUTE_SEL_DP_ENC0_P0_SHIFT GENMASK(3, 2) + +#define MTK_DP_ENC0_P0_3034 (ENC0_OFFSET + 0x34) + +#define MTK_DP_ENC0_P0_3038 (ENC0_OFFSET + 0x38) +#define VIDEO_SOURCE_SEL_DP_ENC0_P0_MASK (BIT(11)) +#define VIDEO_SOURCE_SEL_DP_ENC0_P0_SHIFT (BIT(0) | BIT(1) | BIT(3)) + +#define MTK_DP_ENC0_P0_303C (ENC0_OFFSET + 0x3C) +#define SRAM_START_READ_THRD_DP_ENC0_P0_MASK GENMASK(5, 0) +#define SRAM_START_READ_THRD_DP_ENC0_P0_SHIFT 0 +#define VIDEO_COLOR_DEPTH_DP_ENC0_P0_MASK GENMASK(10, 8) +#define VIDEO_COLOR_DEPTH_DP_ENC0_P0_SHIFT (BIT(3)) +#define
VIDEO_COLOR_DEPTH_DP_ENC0_P0_16BIT
\drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +2
-0+ (0 <<VIDEO_COLOR_DEPTH_DP_ENC0_P0_SHIFT ) +#define
VIDEO_COLOR_DEPTH_DP_ENC0_P0_12BIT
\drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +2
-0+ (1 <<VIDEO_COLOR_DEPTH_DP_ENC0_P0_SHIFT ) +#define
VIDEO_COLOR_DEPTH_DP_ENC0_P0_10BIT
\drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +2
-0+ (2 <<VIDEO_COLOR_DEPTH_DP_ENC0_P0_SHIFT ) +#define
VIDEO_COLOR_DEPTH_DP_ENC0_P0_8BIT
\drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +2
-0+ (3 <<VIDEO_COLOR_DEPTH_DP_ENC0_P0_SHIFT ) +#define
VIDEO_COLOR_DEPTH_DP_ENC0_P0_6BIT
\drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +4
-0+ (4 << VIDEO_COLOR_DEPTH_DP_ENC0_P0_SHIFT) +#define PIXEL_ENCODE_FORMAT_DP_ENC0_P0_MASK GENMASK(14, 12) +#define PIXEL_ENCODE_FORMAT_DP_ENC0_P0_SHIFT GENMASK(3, 2) +#define
PIXEL_ENCODE_FORMAT_DP_ENC0_P0_RGB
\drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +2
-0+ (0 <<PIXEL_ENCODE_FORMAT_DP_ENC0_P0_SHIFT ) +#define
PIXEL_ENCODE_FORMAT_DP_ENC0_P0_YCBCR422
\drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +2
-0+ (1 <<PIXEL_ENCODE_FORMAT_DP_ENC0_P0_SHIFT ) +#define
PIXEL_ENCODE_FORMAT_DP_ENC0_P0_YCBCR420
\drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +67
-0+ (2 << PIXEL_ENCODE_FORMAT_DP_ENC0_P0_SHIFT) +#define VIDEO_MN_GEN_EN_DP_ENC0_P0_MASK (BIT(15)) +#define VIDEO_MN_GEN_EN_DP_ENC0_P0_SHIFT GENMASK(3, 0) + +#define MTK_DP_ENC0_P0_3040 (ENC0_OFFSET + 0x40) +#define SDP_DOWN_CNT_INIT_DP_ENC0_P0_MASK GENMASK(11, 0) +#define SDP_DOWN_CNT_INIT_DP_ENC0_P0_SHIFT 0 + +#define MTK_DP_ENC0_P0_3044 (ENC0_OFFSET + 0x44) +#define VIDEO_N_CODE_0_DP_ENC0_P0_MASK GENMASK(15, 0) + +#define MTK_DP_ENC0_P0_3048 (ENC0_OFFSET + 0x48) +#define VIDEO_N_CODE_1_DP_ENC0_P0_MASK GENMASK(7, 0) + +#define MTK_DP_ENC0_P0_304C (ENC0_OFFSET + 0x4C) +#define VBID_VIDEO_MUTE_DP_ENC0_P0_MASK (BIT(2)) +#define SDP_VSYNC_RISING_MASK_DP_ENC0_P0_MASK (BIT(8)) + +#define MTK_DP_ENC0_P0_3050 (ENC0_OFFSET + 0x50) +#define VIDEO_N_CODE_MN_GEN_0_DP_ENC0_P0_MASK GENMASK(15, 0) + +#define MTK_DP_ENC0_P0_3054 (ENC0_OFFSET + 0x54) +#define VIDEO_N_CODE_MN_GEN_1_DP_ENC0_P0_MASK GENMASK(7, 0) + +#define MTK_DP_ENC0_P0_3064 (ENC0_OFFSET + 0x64) +#define HDE_NUM_LAST_DP_ENC0_P0_MASK GENMASK(15, 0) + +#define MTK_DP_ENC0_P0_3088 (ENC0_OFFSET + 0x88) +#define AU_EN_DP_ENC0_P0_MASK (BIT(6)) +#define AU_EN_DP_ENC0_P0_SHIFT GENMASK(2, 1) +#define AUDIO_8CH_EN_DP_ENC0_P0_MASK (BIT(7)) +#define AUDIO_8CH_SEL_DP_ENC0_P0_MASK (BIT(8)) +#define AUDIO_2CH_EN_DP_ENC0_P0_MASK (BIT(14)) +#define AUDIO_2CH_SEL_DP_ENC0_P0_MASK (BIT(15)) + +#define MTK_DP_ENC0_P0_308C (ENC0_OFFSET + 0x8C) +#define CH_STATUS_0_DP_ENC0_P0_MASK GENMASK(15, 0) + +#define MTK_DP_ENC0_P0_3090 (ENC0_OFFSET + 0x90) +#define CH_STATUS_1_DP_ENC0_P0_MASK GENMASK(15, 0) + +#define MTK_DP_ENC0_P0_3094 (ENC0_OFFSET + 0x94) +#define CH_STATUS_2_DP_ENC0_P0_MASK GENMASK(7, 0) + +#define MTK_DP_ENC0_P0_30A0 (ENC0_OFFSET + 0xA0) + +#define MTK_DP_ENC0_P0_30A4 (ENC0_OFFSET + 0xA4) +#define AU_TS_CFG_DP_ENC0_P0_MASK GENMASK(7, 0) + +#define MTK_DP_ENC0_P0_30A8 (ENC0_OFFSET + 0xA8) + +#define MTK_DP_ENC0_P0_30AC (ENC0_OFFSET + 0xAC) + +#define MTK_DP_ENC0_P0_30B0 (ENC0_OFFSET + 0xB0) + +#define MTK_DP_ENC0_P0_30B4 (ENC0_OFFSET + 0xB4) +#define ISRC_CFG_DP_ENC0_P0_MASK GENMASK(15, 8) +#define ISRC_CFG_DP_ENC0_P0_SHIFT (BIT(3)) + +#define MTK_DP_ENC0_P0_30B8 (ENC0_OFFSET + 0xB8) + +#define MTK_DP_ENC0_P0_30BC (ENC0_OFFSET + 0xBC) +#define ISRC_CONT_DP_ENC0_P0_MASK (BIT(0)) +#define ISRC_CONT_DP_ENC0_P0_SHIFT 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_SHIFT (BIT(3)) +#define
AUDIO_M_CODE_MULT_DIV_SEL_DP_ENC0_P0_MUL_2
\drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +2
-0+ (1 <<AUDIO_M_CODE_MULT_DIV_SEL_DP_ENC0_P0_SHIFT ) +#define
AUDIO_M_CODE_MULT_DIV_SEL_DP_ENC0_P0_MUL_4
\drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +2
-0+ (2 <<AUDIO_M_CODE_MULT_DIV_SEL_DP_ENC0_P0_SHIFT ) +#define
AUDIO_M_CODE_MULT_DIV_SEL_DP_ENC0_P0_MUL_8
\drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +2
-0+ (3 <<AUDIO_M_CODE_MULT_DIV_SEL_DP_ENC0_P0_SHIFT ) +#define
AUDIO_M_CODE_MULT_DIV_SEL_DP_ENC0_P0_DIV_2
\drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +2
-0+ (5 <<AUDIO_M_CODE_MULT_DIV_SEL_DP_ENC0_P0_SHIFT ) +#define
AUDIO_M_CODE_MULT_DIV_SEL_DP_ENC0_P0_DIV_4
\drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +2
-0+ (6 <<AUDIO_M_CODE_MULT_DIV_SEL_DP_ENC0_P0_SHIFT ) +#define
AUDIO_M_CODE_MULT_DIV_SEL_DP_ENC0_P0_DIV_8
\drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +114
-0+ (7 << AUDIO_M_CODE_MULT_DIV_SEL_DP_ENC0_P0_SHIFT) + +#define MTK_DP_ENC0_P0_30D8 (ENC0_OFFSET + 0xD8) + +#define MTK_DP_ENC0_P0_312C (ENC0_OFFSET + 0x12C) +#define ASP_HB2_DP_ENC0_P0_MASK GENMASK(7, 0) +#define ASP_HB3_DP_ENC0_P0_MASK GENMASK(15, 8) +#define ASP_HB3_DP_ENC0_P0_SHIFT (BIT(3)) + +#define MTK_DP_ENC0_P0_3130 (ENC0_OFFSET + 0x130) + +#define MTK_DP_ENC0_P0_3138 (ENC0_OFFSET + 0x138) + +#define MTK_DP_ENC0_P0_3154 (ENC0_OFFSET + 0x154) +#define PGEN_HTOTAL_DP_ENC0_P0_MASK GENMASK(13, 0) + +#define MTK_DP_ENC0_P0_3158 (ENC0_OFFSET + 0x158) +#define PGEN_HSYNC_RISING_DP_ENC0_P0_MASK GENMASK(13, 0) + +#define MTK_DP_ENC0_P0_315C (ENC0_OFFSET + 0x15C) +#define PGEN_HSYNC_PULSE_WIDTH_DP_ENC0_P0_MASK GENMASK(13, 0) + +#define MTK_DP_ENC0_P0_3160 (ENC0_OFFSET + 0x160) +#define PGEN_HFDE_START_DP_ENC0_P0_MASK GENMASK(13, 0) + +#define MTK_DP_ENC0_P0_3164 (ENC0_OFFSET + 0x164) +#define PGEN_HFDE_ACTIVE_WIDTH_DP_ENC0_P0_MASK GENMASK(13, 0) + +#define MTK_DP_ENC0_P0_3168 (ENC0_OFFSET + 0x168) +#define PGEN_VTOTAL_DP_ENC0_P0_MASK GENMASK(12, 0) + +#define MTK_DP_ENC0_P0_316C (ENC0_OFFSET + 0x16C) +#define PGEN_VSYNC_RISING_DP_ENC0_P0_MASK GENMASK(12, 0) + +#define MTK_DP_ENC0_P0_3170 (ENC0_OFFSET + 0x170) +#define PGEN_VSYNC_PULSE_WIDTH_DP_ENC0_P0_MASK GENMASK(12, 0) + +#define MTK_DP_ENC0_P0_3174 (ENC0_OFFSET + 0x174) +#define PGEN_VFDE_START_DP_ENC0_P0_MASK GENMASK(12, 0) + +#define MTK_DP_ENC0_P0_3178 (ENC0_OFFSET + 0x178) +#define PGEN_VFDE_ACTIVE_WIDTH_DP_ENC0_P0_MASK GENMASK(12, 0) + +#define MTK_DP_ENC0_P0_31B0 (ENC0_OFFSET + 0x1B0) +#define PGEN_PATTERN_SEL_SHIFT (BIT(2)) +#define PGEN_PATTERN_SEL_MASK GENMASK(6, 4) + +#define MTK_DP_ENC0_P0_31C8 (ENC0_OFFSET + 0x1C8) +#define VSC_EXT_VESA_HB0_DP_ENC0_P0_MASK GENMASK(7, 0) +#define VSC_EXT_VESA_HB1_DP_ENC0_P0_MASK GENMASK(15, 8) +#define VSC_EXT_VESA_HB1_DP_ENC0_P0_SHIFT (BIT(3)) + +#define MTK_DP_ENC0_P0_31CC (ENC0_OFFSET + 0x1CC) +#define VSC_EXT_VESA_HB2_DP_ENC0_P0_MASK GENMASK(7, 0) +#define VSC_EXT_VESA_HB2_DP_ENC0_P0_SHIFT 0 +#define VSC_EXT_VESA_HB3_DP_ENC0_P0_MASK GENMASK(15, 8) + +#define MTK_DP_ENC0_P0_31D0 (ENC0_OFFSET + 0x1D0) +#define VSC_EXT_CEA_HB0_DP_ENC0_P0_MASK GENMASK(7, 0) +#define VSC_EXT_CEA_HB1_DP_ENC0_P0_MASK GENMASK(15, 8) +#define VSC_EXT_CEA_HB1_DP_ENC0_P0_SHIFT (BIT(3)) + +#define MTK_DP_ENC0_P0_31D4 (ENC0_OFFSET + 0x1D4) +#define VSC_EXT_CEA_HB2_DP_ENC0_P0_MASK GENMASK(7, 0) +#define VSC_EXT_CEA_HB2_DP_ENC0_P0_SHIFT 0 +#define VSC_EXT_CEA_HB3_DP_ENC0_P0_MASK GENMASK(15, 8) + +#define MTK_DP_ENC0_P0_31D8 (ENC0_OFFSET + 0x1D8) +#define VSC_EXT_VESA_NUM_DP_ENC0_P0_MASK GENMASK(5, 0) +#define VSC_EXT_VESA_NUM_DP_ENC0_P0_SHIFT 0 +#define VSC_EXT_CEA_NUM_DP_ENC0_P0_MASK GENMASK(13, 8) +#define VSC_EXT_CEA_NUM_DP_ENC0_P0_SHIFT (BIT(3)) + +#define MTK_DP_ENC0_P0_31DC (ENC0_OFFSET + 0x1DC) +#define HDR0_CFG_DP_ENC0_P0_MASK GENMASK(7, 0) +#define HDR0_CFG_DP_ENC0_P0_SHIFT 0 + +#define MTK_DP_ENC0_P0_31E8 (ENC0_OFFSET + 0x1E8) + +#define MTK_DP_ENC0_P0_31EC (ENC0_OFFSET + 0x1EC) +#define AUDIO_CH_SRC_SEL_DP_ENC0_P0_MASK (BIT(4)) +#define AUDIO_CH_SRC_SEL_DP_ENC0_P0_SHIFT (BIT(2)) +#define ISRC1_HB3_DP_ENC0_P0_MASK GENMASK(15, 8) +#define ISRC1_HB3_DP_ENC0_P0_SHIFT (BIT(3)) + +#define MTK_DP_ENC1_P0_3200 (ENC1_OFFSET + 0x00) + +#define MTK_DP_ENC1_P0_3280 (ENC1_OFFSET + 0x80) +#define SDP_PACKET_TYPE_DP_ENC1_P0_MASK GENMASK(4, 0) +#define SDP_PACKET_W_DP_ENC1_P0 (BIT(5)) +#define SDP_PACKET_W_DP_ENC1_P0_MASK (BIT(5)) +#define SDP_PACKET_W_DP_ENC1_P0_SHIFT (BIT(0) | BIT(2)) + +#define MTK_DP_ENC1_P0_328C (ENC1_OFFSET + 0x8C) + +#define MTK_DP_ENC1_P0_3290 (ENC1_OFFSET + 0x90) + +#define MTK_DP_ENC1_P0_32A0 (ENC1_OFFSET + 0xA0) + +#define MTK_DP_ENC1_P0_32A4 (ENC1_OFFSET + 0xA4) + +#define MTK_DP_ENC1_P0_3300 (ENC1_OFFSET + 0x100) +#define VIDEO_AFIFO_RDY_SEL_DP_ENC1_P0_MASK GENMASK(9, 8) +#define VIDEO_AFIFO_RDY_SEL_DP_ENC1_P0_SHIFT (BIT(3)) + +#define MTK_DP_ENC1_P0_3304 (ENC1_OFFSET + 0x104) +#define AU_PRTY_REGEN_DP_ENC1_P0_MASK (BIT(8)) +#define AU_CH_STS_REGEN_DP_ENC1_P0_MASK (BIT(9)) +#define AUDIO_SAMPLE_PRSENT_REGEN_DP_ENC1_P0_MASK (BIT(12)) + +#define MTK_DP_ENC1_P0_3324 (ENC1_OFFSET + 0x124) +#define AUDIO_SOURCE_MUX_DP_ENC1_P0_MASK GENMASK(9, 8) +#define AUDIO_SOURCE_MUX_DP_ENC1_P0_SHIFT (BIT(3)) +#define
AUDIO_SOURCE_MUX_DP_ENC1_P0_DPRX
\drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +30
-0+ (0 << AUDIO_SOURCE_MUX_DP_ENC1_P0_SHIFT) + +#define MTK_DP_ENC1_P0_3364 (ENC1_OFFSET + 0x164) +#define SDP_DOWN_CNT_INIT_IN_HBLANK_DP_ENC1_P0_MASK GENMASK(11, 0) +#define SDP_DOWN_CNT_INIT_IN_HBLANK_DP_ENC1_P0_SHIFT 0 +#define FIFO_READ_START_POINT_DP_ENC1_P0_MASK GENMASK(15, 12) +#define FIFO_READ_START_POINT_DP_ENC1_P0_SHIFT GENMASK(3, 2) + +#define MTK_DP_ENC1_P0_3368 (ENC1_OFFSET + 0x168) +#define VIDEO_SRAM_FIFO_CNT_RESET_SEL_DP_ENC1_P0_SHIFT 0 +#define VIDEO_STABLE_CNT_THRD_DP_ENC1_P0_SHIFT (BIT(2)) +#define SDP_DP13_EN_DP_ENC1_P0_SHIFT (BIT(3)) +#define BS2BS_MODE_DP_ENC1_P0_MASK GENMASK(13, 12) +#define BS2BS_MODE_DP_ENC1_P0_SHIFT GENMASK(3, 2) + +#define MTK_DP_ENC1_P0_33F4 (ENC1_OFFSET + 0x1F4) + +#define MTK_DP_TRANS_P0_3400 (TRANS_OFFSET + 0) +#define PATTERN1_EN_DP_TRANS_P0_MASK (BIT(12)) +#define PATTERN1_EN_DP_TRANS_P0_SHIFT GENMASK(3, 2) +#define PATTERN2_EN_DP_TRANS_P0_MASK (BIT(13)) +#define PATTERN3_EN_DP_TRANS_P0_MASK (BIT(14)) +#define PATTERN4_EN_DP_TRANS_P0_MASK (BIT(15)) + +#define MTK_DP_TRANS_P0_3404 (TRANS_OFFSET + 0x4) +#define DP_SCR_EN_DP_TRANS_P0_MASK (BIT(0)) + +#define MTK_DP_TRANS_P0_340C (TRANS_OFFSET + 0xC) +#define DP_TX_TRANSMITTER_4P_RESET_SW_DP_TRANS_P0_MASK (BIT(13)) +#define DP_TX_TRANSMITTER_4P_RESET_SW_DP_TRANS_P0_SHIFT (BIT(0) |BIT(2) | BIT(3))
drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +7
-0+ +#define MTK_DP_TRANS_P0_3410 (TRANS_OFFSET + 0x10) +#define HPD_DEB_THD_DP_TRANS_P0_MASK GENMASK(3, 0) +#define HPD_DEB_THD_DP_TRANS_P0_SHIFT 0 +#define HPD_INT_THD_DP_TRANS_P0_MASK GENMASK(7, 4) +#define HPD_INT_THD_DP_TRANS_P0_SHIFT (BIT(2)) +#define HPD_INT_THD_DP_TRANS_P0_LOWER_500US (2 <<
HPD_INT_THD_DP_TRANS_P0_SHIFT)
+#defineHPD_INT_THD_DP_TRANS_P0_UPPER_1100US
\drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +14
-0+ (2 << (HPD_INT_THD_DP_TRANS_P0_SHIFT + 2)) +#define HPD_DISC_THD_DP_TRANS_P0_MASK GENMASK(11, 8) +#define HPD_DISC_THD_DP_TRANS_P0_SHIFT (BIT(3)) +#define HPD_CONN_THD_DP_TRANS_P0_MASK GENMASK(15, 12) +#define HPD_CONN_THD_DP_TRANS_P0_SHIFT GENMASK(3, 2) + +#define MTK_DP_TRANS_P0_3414 (TRANS_OFFSET + 0x14) +#define HPD_DB_DP_TRANS_P0_MASK (BIT(2)) + +#define MTK_DP_TRANS_P0_3418 (TRANS_OFFSET + 0x18) +#define IRQ_CLR_DP_TRANS_P0_MASK GENMASK(3, 0) +#define IRQ_MASK_DP_TRANS_P0_MASK GENMASK(7, 4) +#define IRQ_MASK_DP_TRANS_P0_SHIFT (BIT(2)) +#define IRQ_MASK_DP_TRANS_P0_DISC_IRQ (BIT(1) <<
IRQ_MASK_DP_TRANS_P0_SHIFT)
+#defineIRQ_MASK_DP_TRANS_P0_CONN_IRQ(BIT(2) <<IRQ_MASK_DP_TRANS_P0_SHIFT)
+#defineIRQ_MASK_DP_TRANS_P0_INT_IRQ(BIT(3) <<IRQ_MASK_DP_TRANS_P0_SHIFT)drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +5
-0+#define IRQ_STATUS_DP_TRANS_P0_MASK GENMASK(15, 12) +#define IRQ_STATUS_DP_TRANS_P0_SHIFT GENMASK(3, 2) + +#define MTK_DP_TRANS_P0_342C (TRANS_OFFSET + 0x2C) +#define XTAL_FREQ_DP_TRANS_P0_DEFAULT (BIT(0) | BIT(3) | BIT(5) |BIT(6))
drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +61
-0+#define XTAL_FREQ_DP_TRANS_P0_MASK GENMASK(7, 0) + +#define MTK_DP_TRANS_P0_3430 (TRANS_OFFSET + 0x30) +#define HPD_INT_THD_ECO_DP_TRANS_P0_MASK GENMASK(1, 0) +#define HPD_INT_THD_ECO_DP_TRANS_P0_HIGH_BOUND_EXT BIT(1) + +#define MTK_DP_TRANS_P0_34A4 (TRANS_OFFSET + 0xA4) +#define LANE_NUM_DP_TRANS_P0_MASK GENMASK(3, 2) +#define LANE_NUM_DP_TRANS_P0_SHIFT (BIT(1)) + +#define MTK_DP_TRANS_P0_3540 (TRANS_OFFSET + 0x140) +#define FEC_EN_DP_TRANS_P0_MASK (BIT(0)) +#define FEC_EN_DP_TRANS_P0_SHIFT 0 +#define FEC_CLOCK_EN_MODE_DP_TRANS_P0_MASK (BIT(3)) +#define FEC_CLOCK_EN_MODE_DP_TRANS_P0_SHIFT GENMASK(1, 0) + +#define MTK_DP_TRANS_P0_3580 (TRANS_OFFSET + 0x180) +#define POST_MISC_DATA_LANE0_OV_DP_TRANS_P0_MASK (BIT(8)) +#define POST_MISC_DATA_LANE1_OV_DP_TRANS_P0_MASK (BIT(9)) +#define POST_MISC_DATA_LANE2_OV_DP_TRANS_P0_MASK (BIT(10)) +#define POST_MISC_DATA_LANE3_OV_DP_TRANS_P0_MASK (BIT(11)) + +#define MTK_DP_TRANS_P0_35C4 (TRANS_OFFSET + 0x1C4) +#define SW_IRQ_MASK_DP_TRANS_P0_MASK GENMASK(15, 0) + +#define MTK_DP_TRANS_P0_35C8 (TRANS_OFFSET + 0x1C8) +#define SW_IRQ_CLR_DP_TRANS_P0_MASK GENMASK(15, 0) + +#define SW_IRQ_STATUS_DP_TRANS_P0_MASK GENMASK(15, 0) +#define SW_IRQ_STATUS_DP_TRANS_P0_SHIFT 0 + +#define MTK_DP_TRANS_P0_35D0 (TRANS_OFFSET + 0x1D0) +#define SW_IRQ_FINAL_STATUS_DP_TRANS_P0_MASK GENMASK(15, 0) + +#define MTK_DP_TRANS_P0_35F0 (TRANS_OFFSET + 0x1F0) + +#define MTK_DP_AUX_P0_360C (AUX_OFFSET + 0xC) +#define AUX_TIMEOUT_THR_AUX_TX_P0_MASK GENMASK(12, 0) + +#define MTK_DP_AUX_P0_3614 (AUX_OFFSET + 0x14) +#define AUX_RX_UI_CNT_THR_AUX_TX_P0_MASK GENMASK(6, 0) +#define AUX_RX_UI_CNT_THR_AUX_TX_P0_SHIFT 0 + +#define MTK_DP_AUX_P0_3618 (AUX_OFFSET + 0x18) +#define AUX_RX_FIFO_FULL_AUX_TX_P0_MASK (BIT(9)) +#define AUX_RX_FIFO_WRITE_POINTER_AUX_TX_P0_MASK GENMASK(3, 0) + +#define MTK_DP_AUX_P0_3620 (AUX_OFFSET + 0x20) +#define AUX_RD_MODE_AUX_TX_P0_MASK (BIT(9)) +#define AUX_RX_FIFO_READ_PULSE_TX_P0_MASK (BIT(8)) +#define AUX_RX_FIFO_R_PULSE_TX_P0_SHIFT (BIT(3)) +#define AUX_RX_FIFO_READ_DATA_AUX_TX_P0_MASK GENMASK(7, 0) +#define AUX_RX_FIFO_READ_DATA_AUX_TX_P0_SHIFT 0 + +#define MTK_DP_AUX_P0_3624 (AUX_OFFSET + 0x24) +#define AUX_RX_REPLY_COMMAND_AUX_TX_P0_MASK GENMASK(3, 0) + +#define MTK_DP_AUX_P0_3628 (AUX_OFFSET + 0x28) +#define AUX_RX_PHY_STATE_AUX_TX_P0_MASK GENMASK(9, 0) +#define AUX_RX_PHY_STATE_AUX_TX_P0_SHIFT 0 +#define
AUX_RX_PHY_STATE_AUX_TX_P0_RX_IDLE
\drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +20
-0+ (BIT(0) << AUX_RX_PHY_STATE_AUX_TX_P0_SHIFT) + +#define MTK_DP_AUX_P0_362C (AUX_OFFSET + 0x2C) +#define AUX_NO_LENGTH_AUX_TX_P0_MASK (BIT(0)) +#define AUX_NO_LENGTH_AUX_TX_P0_SHIFT 0 +#define AUX_TX_AUXTX_OV_EN_AUX_TX_P0_MASK (BIT(1)) +#define AUX_RESERVED_RW_0_AUX_TX_P0_MASK GENMASK(15, 2) + +#define MTK_DP_AUX_P0_3630 (AUX_OFFSET + 0x30) +#define AUX_TX_REQUEST_READY_AUX_TX_P0_MASK (BIT(3)) +#define AUX_TX_REQUEST_READY_AUX_TX_P0_SHIFT GENMASK(1, 0) + +#define MTK_DP_AUX_P0_3634 (AUX_OFFSET + 0x34) +#define AUX_TX_OVER_SAMPLE_RATE_AUX_TX_P0_MASK GENMASK(15, 8) +#define AUX_TX_OVER_SAMPLE_RATE_AUX_TX_P0_SHIFT (BIT(3)) + +#define MTK_DP_AUX_P0_3640 (AUX_OFFSET + 0x40) +#define AUX_RX_RECV_COMPLETE_IRQ_TX_P0_MASK (BIT(6)) +#define AUX_RX_AUX_RECV_COMPLETE_IRQ_AUX_TX_P0_SHIFT GENMASK(2, 1) +#define AUX_RX_EDID_RECV_COMPLETE_IRQ_AUX_TX_P0_SHIFT (BIT(0) |BIT(2))
drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +32
-0+#define AUX_RX_MCCS_RECV_COMPLETE_IRQ_AUX_TX_P0_SHIFT (BIT(2)) +#define AUX_RX_CMD_RECV_IRQ_AUX_TX_P0_SHIFT GENMASK(1, 0) +#define AUX_RX_ADDR_RECV_IRQ_AUX_TX_P0_SHIFT (BIT(1)) +#define AUX_RX_DATA_RECV_IRQ_AUX_TX_P0_SHIFT (BIT(0)) +#define AUX_400US_TIMEOUT_IRQ_AUX_TX_P0_MASK (BIT(0)) +#define AUX_400US_TIMEOUT_IRQ_AUX_TX_P0_SHIFT 0 + +#define MTK_DP_AUX_P0_3644 (AUX_OFFSET + 0x44) +#define MCU_REQUEST_COMMAND_AUX_TX_P0_MASK GENMASK(3, 0) + +#define MTK_DP_AUX_P0_3648 (AUX_OFFSET + 0x48) +#define MCU_REQUEST_ADDRESS_LSB_AUX_TX_P0_MASK GENMASK(15, 0) + +#define MTK_DP_AUX_P0_364C (AUX_OFFSET + 0x4C) +#define MCU_REQUEST_ADDRESS_MSB_AUX_TX_P0_MASK GENMASK(3, 0) + +#define MTK_DP_AUX_P0_3650 (AUX_OFFSET + 0x50) +#define MCU_REQ_DATA_NUM_AUX_TX_P0_MASK GENMASK(15, 12) +#define MCU_REQ_DATA_NUM_AUX_TX_P0_SHIFT GENMASK(3, 2) +#define PHY_FIFO_RST_AUX_TX_P0_MASK (BIT(9)) +#define MCU_ACK_TRAN_COMPLETE_AUX_TX_P0_MASK (BIT(8)) +#define MCU_ACK_TRAN_COMPLETE_AUX_TX_P0_SHIFT (BIT(3)) + +#define MTK_DP_AUX_P0_3658 (AUX_OFFSET + 0x58) +#define AUX_TX_OV_EN_AUX_TX_P0_MASK (BIT(0)) + +#define MTK_DP_AUX_P0_3690 (AUX_OFFSET + 0x90) +#define RX_REPLY_COMPLETE_MODE_AUX_TX_P0_MASK (BIT(8)) +#define RX_REPLY_COMPLETE_MODE_AUX_TX_P0_SHIFT (BIT(3)) + +#define MTK_DP_AUX_P0_3704 (AUX_OFFSET + 0x104) +#define AUX_TX_FIFO_WRITE_DATA_NEW_MODE_TOGGLE_AUX_TX_P0_MASK (BIT(1))
drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +44
-0+#define AUX_TX_FIFO_NEW_MODE_EN_AUX_TX_P0_MASK (BIT(2)) +#define AUX_TX_FIFO_NEW_MODE_EN_AUX_TX_P0_SHIFT (BIT(1)) + +#define MTK_DP_AUX_P0_3708 (AUX_OFFSET + 0x108) + +#define MTK_DP_AUX_P0_37C8 (AUX_OFFSET + 0x1C8) +#define MTK_ATOP_EN_AUX_TX_P0_MASK (BIT(0)) +#define MTK_ATOP_EN_AUX_TX_P0_SHIFT 0 + +#define MTK_DP_TOP_PWR_STATE (TOP_OFFSET + 0x0) +#define DP_PWR_STATE_MASK GENMASK(1, 0) +#define DP_PWR_STATE_BANDGAP (BIT(0)) +#define DP_PWR_STATE_BANDGAP_TPLL (BIT(1)) +#define DP_PWR_STATE_BANDGAP_TPLL_LANE GENMASK(1, 0) + +#define MTK_DP_TOP_SWING_EMP (TOP_OFFSET + 0x4) +#define DP_TX0_VOLT_SWING_MASK GENMASK(1, 0) +#define DP_TX0_VOLT_SWING_SHIFT 0 +#define DP_TX0_PRE_EMPH_MASK GENMASK(3, 2) +#define DP_TX0_PRE_EMPH_SHIFT (BIT(1)) +#define DP_TX1_VOLT_SWING_MASK GENMASK(9, 8) +#define DP_TX1_VOLT_SWING_SHIFT (BIT(3)) +#define DP_TX1_PRE_EMPH_MASK GENMASK(11, 10) +#define DP_TX2_VOLT_SWING_MASK GENMASK(17, 16) +#define DP_TX2_PRE_EMPH_MASK GENMASK(19, 18) +#define DP_TX3_VOLT_SWING_MASK GENMASK(25, 24) +#define DP_TX3_PRE_EMPH_MASK GENMASK(27, 26) + +#define MTK_DP_TOP_RESET_AND_PROBE (TOP_OFFSET + 0x20) +#define SW_RST_B_SHIFT 0 +#define SW_RST_B_PHYD (BIT(4) << SW_RST_B_SHIFT) + +#define MTK_DP_TOP_IRQ_STATUS (TOP_OFFSET + 0x28) +#define RGS_IRQ_STATUS_SHIFT 0 +#define RGS_IRQ_STATUS_TRANSMITTER (BIT(1) << RGS_IRQ_STATUS_SHIFT) + +#define MTK_DP_TOP_IRQ_MASK (TOP_OFFSET + 0x2C) +#define IRQ_MASK_AUX_TOP_IRQ BIT(2) + +#define MTK_DP_TOP_MEM_PD (TOP_OFFSET + 0x38) +#define MEM_ISO_EN_SHIFT 0 +#define FUSE_SEL_SHIFT (BIT(1)) + +#endif /*_MTK_DP_REG_H_*/ drivers/gpu/drm/mediatek/mtk_drm_drv.c +1
-0@@ -709,6 +709,7 @@ static struct platform_driver * const mtk_drm_drivers[] = { &mtk_disp_ovl_driver, &mtk_disp_rdma_driver, &mtk_dpi_driver, + &mtk_dp_driver, &mtk_drm_platform_driver, &mtk_dsi_driver,};
drivers/gpu/drm/mediatek/mtk_drm_drv.h +1
-0@@ -53,6 +53,7 @@ extern struct platform_driver mtk_disp_gamma_driver;extern struct platform_driver mtk_disp_ovl_driver;extern struct platform_driver mtk_disp_rdma_driver;extern struct platform_driver mtk_dpi_driver; +extern struct platform_driver mtk_dp_driver;extern struct platform_driver mtk_dsi_driver;#endif /*
MTK_DRM_DRV_H*/
Re: [PATCH v9 18/22] drm/mediatek: Add mt8195 Embedded DisplayPort driver
In reply to Guillaume RanquetHello Guillaume,
Thanks for your patch.
I add some comments below:
Quoted 111 lines · Guillaume Ranquet
From: Markus Schneider-Pargmann <[email protected]>
This patch adds a DisplayPort driver for the Mediatek mt8195 SoC.
It supports the mt8195, the embedded DisplayPort units. It offers DisplayPort 1.4 with up to 4 lanes.
The driver shares its iomap range with the mtk-dp-phy driver using the regmap/syscon facility.
This driver is based on an initial version by
Jason-JH.Lin <[email protected]>.Signed-off-by Markus Schneider-Pargmann <[email protected]>Signed-off-by Guillaume Ranquet <[email protected]>Reported-by kernel test robot <[email protected]>--- drivers/gpu/drm/mediatek/Kconfig | 8 + drivers/gpu/drm/mediatek/Makefile | 2 + drivers/gpu/drm/mediatek/mtk_dp.c | 2221 ++++++++++++++++++++++++ drivers/gpu/drm/mediatek/mtk_dp_reg.h | 568 ++++++ drivers/gpu/drm/mediatek/mtk_drm_drv.c | 1 + drivers/gpu/drm/mediatek/mtk_drm_drv.h | 1 + 6 files changed, 2801 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 +8
-0@@ -28,3 +28,11 @@ 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 PHY_MTK_DP + select DRM_DP_HELPER + help + DRM/KMS Display Port driver for Mediatek SoCs.drivers/gpu/drm/mediatek/Makefile +2
-0@@ -21,3 +21,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.odrivers/gpu/drm/mediatek/mtk_dp.c new file +47
-0@@ -0,0 +1,2221 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (c) 2019 MediaTek Inc. +* Copyright (c) 2021 BayLibre +*/ + +#include <drm/drm_atomic_helper.h> +#include <drm/drm_bridge.h> +#include <drm/drm_crtc.h> +#include <drm/dp/drm_dp_helper.h> +#include <drm/drm_edid.h> +#include <drm/drm_of.h> +#include <drm/drm_panel.h> +#include <drm/drm_print.h> +#include <drm/drm_probe_helper.h> +#include <linux/arm-smccc.h> +#include <linux/clk.h> +#include <linux/delay.h> +#include <linux/errno.h> +#include <linux/kernel.h> +#include <linux/mfd/syscon.h> +#include <linux/nvmem-consumer.h> +#include <linux/of.h> +#include <linux/of_irq.h> +#include <linux/of_platform.h> +#include <linux/phy/phy.h> +#include <linux/platform_device.h> +#include <linux/pm_runtime.h> +#include <linux/regmap.h> +#include <sound/hdmi-codec.h> +#include <video/videomode.h> + +#include "mtk_dp_reg.h" + +#define MTK_DP_AUX_WAIT_REPLY_COUNT 20 +#define MTK_DP_CHECK_SINK_CAP_TIMEOUT_COUNT 3 + +//TODO: platform/device data or dts? +#define MTK_DP_MAX_LANES 4 +#define MTK_DP_MAX_LINK_RATE MTK_DP_LINKRATE_HBR3 + +#define MTK_DP_TBC_BUF_READ_START_ADDR 0x08 + +#define MTK_DP_TRAIN_RETRY_LIMIT 8 +#define MTK_DP_TRAIN_MAX_ITERATIONS 5 + +#define MTK_DP_AUX_WRITE_READ_WAIT_TIME_US 20
drivers/gpu/drm/mediatek/mtk_dp.c line 57
Quoted 10 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +10
-0+ +#define MTK_DP_DP_VERSION_11 0x11 + +enum mtk_dp_state { +MTK_DP_STATE_INITIAL , +MTK_DP_STATE_IDLE , +MTK_DP_STATE_PREPARE , +MTK_DP_STATE_NORMAL , +}; +
snif...
Quoted 104 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +11
-0+ +static int mtk_dp_msa_bypass_disable (struct mtk_dp *mtk_dp) +{ +const u16 bits_to_set = +BIT (HTOTAL_SEL_DP_ENC0_P0_SHIFT ) | +BIT (VTOTAL_SEL_DP_ENC0_P0_SHIFT ) | +BIT (HSTART_SEL_DP_ENC0_P0_SHIFT ) | +BIT (VSTART_SEL_DP_ENC0_P0_SHIFT ) | +BIT (HWIDTH_SEL_DP_ENC0_P0_SHIFT ) | +BIT (VHEIGHT_SEL_DP_ENC0_P0_SHIFT ) | + BIT(HSP_SEL_DP_ENC0_P0_SHIFT) |
BIT(HSW_SEL_DP_ENC0_P0_SHIFT)|drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+ BIT(VSP_SEL_DP_ENC0_P0_SHIFT) |
BIT(VSW_SEL_DP_ENC0_P0_SHIFT);drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+ return mtk_dp_update_bits(mtk_dp, MTK_DP_ENC0_P0_3030,
bits_to_set,drivers/gpu/drm/mediatek/mtk_dp.c new file +16
-0+ bits_to_set); +} + +#define MTK_UPD_BITS_OR_OUT (mtk_dp, offset, val, mask, ret, label) \ + do {\ + ret = mtk_dp_update_bits(mtk_dp, offset, val, mask); \ + if (ret) \ + goto label; \ + } while (0) + +static int mtk_dp_set_msa (struct mtk_dp *mtk_dp) +{ +int ret; +struct mtk_dp_timings *timings = &mtk_dp->info.timings; + + MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_ENC0_P0_3010, timings-Quoted 1 line
htotal,
drivers/gpu/drm/mediatek/mtk_dp.c new file +3
-0+ HTOTAL_SW_DP_ENC0_P0_MASK, ret, out); + MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_ENC0_P0_3018, + timings->vm.hsync_len + timings-Quoted 1 line
vm.hback_porch,
drivers/gpu/drm/mediatek/mtk_dp.c new file +3
-0+ HSTART_SW_DP_ENC0_P0_MASK, ret, out); + MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_ENC0_P0_3028, + timings->vm.hsync_len <<
HSW_SW_DP_ENC0_P0_SHIFT,drivers/gpu/drm/mediatek/mtk_dp.c new file +4
-0+ HSW_SW_DP_ENC0_P0_MASK, ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_ENC0_P0_3028 ,0 , +HSP_SW_DP_ENC0_P0_MASK , ret, out); + MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_ENC0_P0_3020, timings-Quoted 1 line
vm.hactive,
drivers/gpu/drm/mediatek/mtk_dp.c new file +2
-0+ HWIDTH_SW_DP_ENC0_P0_MASK, ret, out); + MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_ENC0_P0_3014, timings-Quoted 1 line
vtotal,
drivers/gpu/drm/mediatek/mtk_dp.c new file +3
-0+ VTOTAL_SW_DP_ENC0_P0_MASK, ret, out); + MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_ENC0_P0_301C, + timings->vm.vsync_len + timings-Quoted 1 line
vm.vback_porch,
drivers/gpu/drm/mediatek/mtk_dp.c new file +3
-0+ VSTART_SW_DP_ENC0_P0_MASK, ret, out); + MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_ENC0_P0_302C, + timings->vm.vsync_len <<
VSW_SW_DP_ENC0_P0_SHIFT,drivers/gpu/drm/mediatek/mtk_dp.c new file +4
-0+ VSW_SW_DP_ENC0_P0_MASK, ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_ENC0_P0_302C ,0 , +VSP_SW_DP_ENC0_P0_MASK , ret, out); + MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_ENC0_P0_3024, timings-Quoted 1 line
vm.vactive,
drivers/gpu/drm/mediatek/mtk_dp.c new file +2
-0+ VHEIGHT_SW_DP_ENC0_P0_MASK, ret, out); + MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_ENC0_P0_3064, timings-Quoted 1 line
vm.hactive,
drivers/gpu/drm/mediatek/mtk_dp.c new file +2
-0+ HDE_NUM_LAST_DP_ENC0_P0_MASK, ret, out); + MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_ENC0_P0_3154, timings-Quoted 1 line
htotal,
drivers/gpu/drm/mediatek/mtk_dp.c new file +4
-0+ PGEN_HTOTAL_DP_ENC0_P0_MASK, ret, out); + MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_ENC0_P0_3158, + timings->vm.hfront_porch, + PGEN_HSYNC_RISING_DP_ENC0_P0_MASK, ret,out);
drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+ MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_ENC0_P0_315C, timings-Quoted 1 line
vm.hsync_len,
drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+ PGEN_HSYNC_PULSE_WIDTH_DP_ENC0_P0_MASK,ret, out);
drivers/gpu/drm/mediatek/mtk_dp.c new file +2
-0+ MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_ENC0_P0_3160, + timings->vm.hback_porch + timings-Quoted 1 line
vm.hsync_len,
drivers/gpu/drm/mediatek/mtk_dp.c new file +2
-0+ PGEN_HFDE_START_DP_ENC0_P0_MASK, ret, out); + MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_ENC0_P0_3164, timings-Quoted 1 line
vm.hactive,
drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+ PGEN_HFDE_ACTIVE_WIDTH_DP_ENC0_P0_MASK,ret, out);
drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+ MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_ENC0_P0_3168, timings-Quoted 1 line
vtotal,
drivers/gpu/drm/mediatek/mtk_dp.c new file +4
-0+ PGEN_VTOTAL_DP_ENC0_P0_MASK, ret, out); + MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_ENC0_P0_316C, + timings->vm.vfront_porch, + PGEN_VSYNC_RISING_DP_ENC0_P0_MASK, ret,out);
drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+ MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_ENC0_P0_3170, timings-Quoted 1 line
vm.vsync_len,
drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+ PGEN_VSYNC_PULSE_WIDTH_DP_ENC0_P0_MASK,ret, out);
drivers/gpu/drm/mediatek/mtk_dp.c new file +2
-0+ MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_ENC0_P0_3174, + timings->vm.vback_porch + timings-Quoted 1 line
vm.vsync_len,
drivers/gpu/drm/mediatek/mtk_dp.c new file +2
-0+ PGEN_VFDE_START_DP_ENC0_P0_MASK, ret, out); + MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_ENC0_P0_3178, timings-Quoted 1 line
vm.vactive,
drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+ PGEN_VFDE_ACTIVE_WIDTH_DP_ENC0_P0_MASK,ret, out);
drivers/gpu/drm/mediatek/mtk_dp.c
Quoted 2 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +2
-0+ +out:
Just like Angelo's comments.
I think we can remove this macro.
IMO, I think we don't need to go to out.
The failure is caused by update registers fail, and there are error message in mtk_dp_update_bits().
I think we can or all ret value and check them in last of this funtion.
Quoted 16 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +5
-0+return ret; +} + +static int mtk_dp_set_color_format (struct mtk_dp *mtk_dp, + enum mtk_dp_color_format
color_format)drivers/gpu/drm/mediatek/mtk_dp.c new file +9
-0+{ +u32 val; +int ret; + + mtk_dp->info.format = color_format; + +/* Update MISC0 */ + ret = mtk_dp_update_bits(mtk_dp, MTK_DP_ENC0_P0_3034, + color_format <<
DP_TEST_COLOR_FORMAT_SHIFT,
drivers/gpu/drm/mediatek/mtk_dp.c line 350
Quoted 1 line
drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+ DP_TEST_COLOR_FORMAT_MASK);
maybe the same indention with "color_format <<DP_TEST_COLOR_FORMAT_SHIFT," here?
Quoted 41 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +16
-0+ +if (ret) +return ret; + +switch (color_format) { +case MTK_DP_COLOR_FORMAT_YUV_422 : + val =PIXEL_ENCODE_FORMAT_DP_ENC0_P0_YCBCR422 ; +break ; +case MTK_DP_COLOR_FORMAT_YUV_420 : + val =PIXEL_ENCODE_FORMAT_DP_ENC0_P0_YCBCR420 ; +break ; +case MTK_DP_COLOR_FORMAT_YONLY : +case MTK_DP_COLOR_FORMAT_RAW : +case MTK_DP_COLOR_FORMAT_RESERVED : +case MTK_DP_COLOR_FORMAT_UNKNOWN : + drm_warn(mtk_dp->drm_dev, "Unsupported color format:%d\n",
drivers/gpu/drm/mediatek/mtk_dp.c new file +23
-0+ color_format); + fallthrough; +case MTK_DP_COLOR_FORMAT_RGB_444 : +case MTK_DP_COLOR_FORMAT_YUV_444 : + val =PIXEL_ENCODE_FORMAT_DP_ENC0_P0_RGB ; +break ; + } + +return mtk_dp_update_bits (mtk_dp,MTK_DP_ENC0_P0_303C , val, +PIXEL_ENCODE_FORMAT_DP_ENC0_P0_MASK ); +} + +static int mtk_dp_set_color_depth (struct mtk_dp *mtk_dp, +enum mtk_dp_color_depth color_depth) +{ +int ret; +u32 val; + + mtk_dp->info.depth = color_depth; + +/* Update MISC0 */ + ret = mtk_dp_update_bits(mtk_dp, MTK_DP_ENC0_P0_3034, + color_depth <<
DP_TEST_BIT_DEPTH_SHIFT,
drivers/gpu/drm/mediatek/mtk_dp.c line 390
Quoted 1 line
drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+ DP_TEST_BIT_DEPTH_MASK);
ditto
Quoted 72 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +22
-0+ +if (ret) +return ret; + +switch (color_depth) { +case MTK_DP_COLOR_DEPTH_6BIT : + val =VIDEO_COLOR_DEPTH_DP_ENC0_P0_6BIT ; +break ; +case MTK_DP_COLOR_DEPTH_8BIT : + val =VIDEO_COLOR_DEPTH_DP_ENC0_P0_8BIT ; +break ; +case MTK_DP_COLOR_DEPTH_10BIT : + val =VIDEO_COLOR_DEPTH_DP_ENC0_P0_10BIT ; +break ; +case MTK_DP_COLOR_DEPTH_12BIT : + val =VIDEO_COLOR_DEPTH_DP_ENC0_P0_12BIT ; +break ; +case MTK_DP_COLOR_DEPTH_16BIT : + val =VIDEO_COLOR_DEPTH_DP_ENC0_P0_16BIT ; +break ; +case MTK_DP_COLOR_DEPTH_UNKNOWN : + drm_warn(mtk_dp->drm_dev, "Unsupported color depth%d\n",
drivers/gpu/drm/mediatek/mtk_dp.c new file +15
-0+ color_depth); +return -EINVAL ; + } + +return mtk_dp_update_bits (mtk_dp,MTK_DP_ENC0_P0_303C , val, +VIDEO_COLOR_DEPTH_DP_ENC0_P0_MASK ); +} + +static int mtk_dp_mn_overwrite_disable (struct mtk_dp *mtk_dp) +{ +return mtk_dp_update_bits (mtk_dp,MTK_DP_ENC0_P0_3004 ,0 , +VIDEO_M_CODE_SEL_DP_ENC0_P0_MASK ); +} + +static int mtk_dp_set_sram_read_start(struct mtk_dp *mtk_dp, u32val)
drivers/gpu/drm/mediatek/mtk_dp.c new file +3
-0+{ + return mtk_dp_update_bits(mtk_dp, MTK_DP_ENC0_P0_303C, + val <<
SRAM_START_READ_THRD_DP_ENC0_P0_SHIFT,drivers/gpu/drm/mediatek/mtk_dp.c new file +15
-0+ SRAM_START_READ_THRD_DP_ENC0_P0_MASK); +} + +static int mtk_dp_setup_encoder (struct mtk_dp *mtk_dp) +{ +int ret; + +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_ENC0_P0_303C , +BIT (VIDEO_MN_GEN_EN_DP_ENC0_P0_SHIFT ), +VIDEO_MN_GEN_EN_DP_ENC0_P0_MASK , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_ENC0_P0_3040 , +0x20 <<SDP_DOWN_CNT_INIT_DP_ENC0_P0_SHIFT , +SDP_DOWN_CNT_INIT_DP_ENC0_P0_MASK , ret, out); + MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_ENC1_P0_3364, + 0x20 <<
SDP_DOWN_CNT_INIT_IN_HBLANK_DP_ENC1_P0_SHIFT,drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+ SDP_DOWN_CNT_INIT_IN_HBLANK_DP_ENC1_P0_MASK,ret, out);
drivers/gpu/drm/mediatek/mtk_dp.c new file +5
-0+MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_ENC1_P0_3300 , +2 <<VIDEO_AFIFO_RDY_SEL_DP_ENC1_P0_SHIFT , +VIDEO_AFIFO_RDY_SEL_DP_ENC1_P0_MASK , ret, out); + MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_ENC1_P0_3364, + 4 <<
FIFO_READ_START_POINT_DP_ENC1_P0_SHIFT,drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+ FIFO_READ_START_POINT_DP_ENC1_P0_MASK, ret,out);
drivers/gpu/drm/mediatek/mtk_dp.c new file +2
-0+ ret = mtk_dp_write(mtk_dp, MTK_DP_ENC1_P0_3368, + 1 <<
VIDEO_SRAM_FIFO_CNT_RESET_SEL_DP_ENC1_P0_SHIFT|
drivers/gpu/drm/mediatek/mtk_dp.c line 457
Quoted 3 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +3
-0+1 <<VIDEO_STABLE_CNT_THRD_DP_ENC1_P0_SHIFT | +BIT (SDP_DP13_EN_DP_ENC1_P0_SHIFT ) | + 1 << BS2BS_MODE_DP_ENC1_P0_SHIFT);
ditto
Quoted 192 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +11
-0+ +out: +return ret; +} + +static int mtk_dp_pg_disable (struct mtk_dp *mtk_dp) +{ +int ret; + + MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_ENC0_P0_3038, 0, + VIDEO_SOURCE_SEL_DP_ENC0_P0_MASK, ret,out);
drivers/gpu/drm/mediatek/mtk_dp.c new file +2
-0+ MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_ENC0_P0_31B0, + 4 << PGEN_PATTERN_SEL_SHIFT,
PGEN_PATTERN_SEL_MASK, ret, out);drivers/gpu/drm/mediatek/mtk_dp.c new file +19
-0+ +out: +return ret; +} + +static bool mtk_dp_plug_state (struct mtk_dp *mtk_dp) +{ +return !!(mtk_dp_read (mtk_dp,MTK_DP_TRANS_P0_3414 ) & +HPD_DB_DP_TRANS_P0_MASK ); +} + +static void mtk_dp_aux_irq_clear (struct mtk_dp *mtk_dp) +{ +mtk_dp_write (mtk_dp,MTK_DP_AUX_P0_3640 , +BIT (AUX_400US_TIMEOUT_IRQ_AUX_TX_P0_SHIFT ) | +BIT (AUX_RX_DATA_RECV_IRQ_AUX_TX_P0_SHIFT ) | +BIT (AUX_RX_ADDR_RECV_IRQ_AUX_TX_P0_SHIFT ) | +BIT (AUX_RX_CMD_RECV_IRQ_AUX_TX_P0_SHIFT ) | + BIT(AUX_RX_MCCS_RECV_COMPLETE_IRQ_AUX_TX_P0_SHIFT)|
drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+BIT (AUX_RX_EDID_RECV_COMPLETE_IRQ_AUX_TX_P0_SHIFT )|
drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+ BIT(AUX_RX_AUX_RECV_COMPLETE_IRQ_AUX_TX_P0_SHIFT));
drivers/gpu/drm/mediatek/mtk_dp.c new file +3
-0+} + +static int mtk_dp_aux_set_cmd(struct mtk_dp *mtk_dp, u8 cmd, u32addr)
drivers/gpu/drm/mediatek/mtk_dp.c new file +5
-0+{ +int ret; + + MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_AUX_P0_3644, cmd, + MCU_REQUEST_COMMAND_AUX_TX_P0_MASK, ret,out);
drivers/gpu/drm/mediatek/mtk_dp.c new file +2
-0+ MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_AUX_P0_3648, addr, + MCU_REQUEST_ADDRESS_LSB_AUX_TX_P0_MASK,ret, out);
drivers/gpu/drm/mediatek/mtk_dp.c new file +2
-0+ MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_AUX_P0_364C, addr >> 16, + MCU_REQUEST_ADDRESS_MSB_AUX_TX_P0_MASK,ret, out);
drivers/gpu/drm/mediatek/mtk_dp.c new file +22
-0+ +out: +return ret; +} + +static int mtk_dp_aux_cmd_complete (struct mtk_dp *mtk_dp) +{ +return mtk_dp_update_bits (mtk_dp,MTK_DP_AUX_P0_3650 , +BIT (MCU_ACK_TRAN_COMPLETE_AUX_TX_P0_SHIFT ), +MCU_ACK_TRAN_COMPLETE_AUX_TX_P0_MASK | +PHY_FIFO_RST_AUX_TX_P0_MASK | +MCU_REQ_DATA_NUM_AUX_TX_P0_MASK ); +} + +static int mtk_dp_aux_request_ready (struct mtk_dp *mtk_dp) +{ +return mtk_dp_update_bits (mtk_dp,MTK_DP_AUX_P0_3630 , +BIT (AUX_TX_REQUEST_READY_AUX_TX_P0_SHIFT ), +AUX_TX_REQUEST_READY_AUX_TX_P0_MASK ); +} + +static void mtk_dp_aux_fill_write_fifo(struct mtk_dp *mtk_dp, u8*buf,
drivers/gpu/drm/mediatek/mtk_dp.c new file +3
-0+ size_t length) +{ + mtk_dp_bulk_16bit_write(mtk_dp, MTK_DP_AUX_P0_3708, buf,length);
drivers/gpu/drm/mediatek/mtk_dp.c new file +14
-0+} + +static int mtk_dp_aux_read_rx_fifo (struct mtk_dp *mtk_dp,u8 *buf, +size_t length,int read_delay) +{ +int ret; +int read_pos; + +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_AUX_P0_3620 ,0 , +AUX_RD_MODE_AUX_TX_P0_MASK , ret, out); + +for (read_pos =0 ; read_pos < length; read_pos++) { + MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_AUX_P0_3620, + BIT(AUX_RX_FIFO_R_PULSE_TX_P0_SHIFT),
drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+ AUX_RX_FIFO_READ_PULSE_TX_P0_MASK,ret, out);
drivers/gpu/drm/mediatek/mtk_dp.c new file +5
-0+usleep_range (read_delay, read_delay *2 ); + buf[read_pos] = + (u8)(mtk_dp_read (mtk_dp,MTK_DP_AUX_P0_3620 ) & +AUX_RX_FIFO_READ_DATA_AUX_TX_P0_MASK >> + AUX_RX_FIFO_READ_DATA_AUX_TX_P0_SHIFT);
drivers/gpu/drm/mediatek/mtk_dp.c new file +7
-0+ } + +out: +return ret; +} + +static int mtk_dp_aux_set_length(struct mtk_dp *mtk_dp, size_tlength)
drivers/gpu/drm/mediatek/mtk_dp.c new file +7
-0+{ +int ret; + +if (length >0 ) { + MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_AUX_P0_3650, + (length - 1) + <<
MCU_REQ_DATA_NUM_AUX_TX_P0_SHIFT,drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+ MCU_REQ_DATA_NUM_AUX_TX_P0_MASK,ret, out);
drivers/gpu/drm/mediatek/mtk_dp.c new file +4
-0+ MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_AUX_P0_362C, 0, + AUX_NO_LENGTH_AUX_TX_P0_MASK | + AUX_TX_AUXTX_OV_EN_AUX_TX_P0_MASK | + AUX_RESERVED_RW_0_AUX_TX_P0_MASK,ret, out);
drivers/gpu/drm/mediatek/mtk_dp.c new file +6
-0+ }else { + MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_AUX_P0_362C, + BIT(AUX_NO_LENGTH_AUX_TX_P0_SHIFT), + AUX_NO_LENGTH_AUX_TX_P0_MASK | + AUX_TX_AUXTX_OV_EN_AUX_TX_P0_MASK | + AUX_RESERVED_RW_0_AUX_TX_P0_MASK,ret, out);
drivers/gpu/drm/mediatek/mtk_dp.c new file +7
-0+ } + +out: +return ret; +} + +static int mtk_dp_aux_wait_for_completion(struct mtk_dp *mtk_dp,bool
is_read)drivers/gpu/drm/mediatek/mtk_dp.c new file +8
-0+{ +int wait_reply =MTK_DP_AUX_WAIT_REPLY_COUNT ; + +while (--wait_reply) { +u32 aux_irq_status; + +if (is_read) { + u32 fifo_status = mtk_dp_read(mtk_dp,
MTK_DP_AUX_P0_3618);drivers/gpu/drm/mediatek/mtk_dp.c new file +9
-0+ +if (fifo_status & + (AUX_RX_FIFO_WRITE_POINTER_AUX_TX_P0_MASK | +AUX_RX_FIFO_FULL_AUX_TX_P0_MASK )) { +return 0 ; + } + } + + aux_irq_status = mtk_dp_read(mtk_dp,
MTK_DP_AUX_P0_3640);drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+ if (aux_irq_status &
AUX_RX_RECV_COMPLETE_IRQ_TX_P0_MASK)drivers/gpu/drm/mediatek/mtk_dp.c new file +3
-0+return 0 ; + + if (aux_irq_status &
AUX_400US_TIMEOUT_IRQ_AUX_TX_P0_MASK)drivers/gpu/drm/mediatek/mtk_dp.c new file +9
-0+return -ETIMEDOUT ; + +usleep_range (100 ,500 ); + } + +return -ETIMEDOUT ; +} + +static int mtk_dp_aux_do_transfer(struct mtk_dp *mtk_dp, bool
is_read, u8 cmd,drivers/gpu/drm/mediatek/mtk_dp.c new file +12
-0+ u32 addr, u8 *buf, size_t length) +{ + int ret; +u32 reply_cmd; + +if (is_read && (length >DP_AUX_MAX_PAYLOAD_BYTES || + (cmd ==DP_AUX_NATIVE_READ && !length))) +return -EINVAL ; + + if (!is_read) { + ret = mtk_dp_update_bits(mtk_dp, MTK_DP_AUX_P0_3704, + BIT(AUX_TX_FIFO_NEW_MODE_EN_AU
X_TX_P0_SHIFT),drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+AUX_TX_FIFO_NEW_MODE_EN_AUX_TX_P0_MA
Quoted 1 line
SK);
BIT(AUX_TX_FIFO_NEW_MODE_EN_AUX_TX_P0_SHIFT) is very strange.. (#define AUX_TX_FIFO_NEW_MODE_EN_AUX_TX_P0_SHIFT (BIT(1)))
Quoted 23 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +16
-0+ +if (ret) +return ret; + } + +mtk_dp_aux_cmd_complete (mtk_dp); +mtk_dp_aux_irq_clear (mtk_dp); +usleep_range (MTK_DP_AUX_WRITE_READ_WAIT_TIME_US , +MTK_DP_AUX_WRITE_READ_WAIT_TIME_US *2 ); + +mtk_dp_aux_set_cmd (mtk_dp, cmd, addr); +mtk_dp_aux_set_length (mtk_dp, length); + +if (!is_read) { +if (length) + mtk_dp_aux_fill_write_fifo(mtk_dp, buf,length);
drivers/gpu/drm/mediatek/mtk_dp.c new file +3
-0+ + ret =mtk_dp_update_bits (mtk_dp,MTK_DP_AUX_P0_3704 , + AUX_TX_FIFO_WRITE_DATA_NEW_MOD
E_TOGGLE_AUX_TX_P0_MASK,drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+AUX_TX_FIFO_WRITE_DATA_NEW_MODE_TOGG
LE_AUX_TX_P0_MASK);
drivers/gpu/drm/mediatek/mtk_dp.c line 209
Quoted 4 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +4
-0+ +if (ret) +return ret; + }
is this the same with previous if (!is_read) ?
If yes, maybe we can
extract them..
Quoted 82 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +10
-0+ +mtk_dp_aux_request_ready (mtk_dp); + + ret =mtk_dp_aux_wait_for_completion (mtk_dp, is_read); + + reply_cmd =mtk_dp_read (mtk_dp,MTK_DP_AUX_P0_3624 ) & +AUX_RX_REPLY_COMMAND_AUX_TX_P0_MASK ; + +if (ret || reply_cmd) { + u32 phy_status = mtk_dp_read(mtk_dp,
MTK_DP_AUX_P0_3628) &drivers/gpu/drm/mediatek/mtk_dp.c new file +34
-0+AUX_RX_PHY_STATE_AUX_TX_P0_MASK ; +if (phy_status !=AUX_RX_PHY_STATE_AUX_TX_P0_RX_IDLE ) { +drm_err (mtk_dp->drm_dev, +"AUX Rx Aux hang, need SW reset\n" ); +return -EIO ; + } + +mtk_dp_aux_cmd_complete (mtk_dp); +mtk_dp_aux_irq_clear (mtk_dp); + +usleep_range (MTK_DP_AUX_WRITE_READ_WAIT_TIME_US , +MTK_DP_AUX_WRITE_READ_WAIT_TIME_US *2 ); +return -ETIMEDOUT ; + } + +if (!length) { + ret =mtk_dp_update_bits (mtk_dp,MTK_DP_AUX_P0_362C ,0 , +AUX_NO_LENGTH_AUX_TX_P0_MASK | +AUX_TX_AUXTX_OV_EN_AUX_TX_P0_MASK | +AUX_RESERVED_RW_0_AUX_TX_P0_MASK ); + +if (ret) +return ret; + + }else if (is_read) { +int read_delay; + +if (cmd == (DP_AUX_I2C_READ |DP_AUX_I2C_MOT ) || + cmd ==DP_AUX_I2C_READ ) + read_delay =500 ; +else + read_delay =100 ; + + mtk_dp_aux_read_rx_fifo(mtk_dp, buf, length,
read_delay);drivers/gpu/drm/mediatek/mtk_dp.c new file +11
-0+ } + +mtk_dp_aux_cmd_complete (mtk_dp); +mtk_dp_aux_irq_clear (mtk_dp); +usleep_range (MTK_DP_AUX_WRITE_READ_WAIT_TIME_US , +MTK_DP_AUX_WRITE_READ_WAIT_TIME_US *2 ); + +return 0 ; +} + +static bool mtk_dp_set_swing_pre_emphasis(struct mtk_dp *mtk_dp, int
lane_num,drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+int swing_val, intpreemphasis)
drivers/gpu/drm/mediatek/mtk_dp.c new file +14
-0+{ +int ret; + +u32 lane_shift = lane_num *DP_TX1_VOLT_SWING_SHIFT ; + +if (lane_num <0 || lane_num >3 ) +return false; + +dev_dbg (mtk_dp->dev, +"link training swing_val= 0x%x, preemphasis = 0x%x\n" , + swing_val, preemphasis); + + MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_TOP_SWING_EMP, + swing_val << (DP_TX0_VOLT_SWING_SHIFT +
lane_shift),drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+ DP_TX0_VOLT_SWING_MASK << lane_shift, ret,out);
drivers/gpu/drm/mediatek/mtk_dp.c new file +2
-0+ MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_TOP_SWING_EMP, + preemphasis << (DP_TX0_PRE_EMPH_SHIFT +
lane_shift),drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+ DP_TX0_PRE_EMPH_MASK << lane_shift, ret,out);
drivers/gpu/drm/mediatek/mtk_dp.c line 724
Quoted 3 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +3
-0+ +out: +return !ret;
why return !ret?
Quoted 20 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +6
-0+} + +static int mtk_dp_reset_swing_pre_emphasis (struct mtk_dp *mtk_dp) +{ + return mtk_dp_update_bits(mtk_dp, MTK_DP_TOP_SWING_EMP, 0, + DP_TX0_VOLT_SWING_MASK |
DP_TX1_VOLT_SWING_MASK|drivers/gpu/drm/mediatek/mtk_dp.c new file +3
-0+DP_TX2_VOLT_SWING_MASK | +DP_TX3_VOLT_SWING_MASK | +DP_TX0_PRE_EMPH_MASK |DP_TX1_PRE_EMPH_MASK |
drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+ DP_TX2_PRE_EMPH_MASK |
DP_TX3_PRE_EMPH_MASK);drivers/gpu/drm/mediatek/mtk_dp.c new file +7
-0+} + +static int mtk_dp_fec_enable (struct mtk_dp *mtk_dp,bool enable) +{ +return mtk_dp_update_bits (mtk_dp,MTK_DP_TRANS_P0_3540 , + enable ?BIT (FEC_EN_DP_TRANS_P0_SHIFT ) :0 , +FEC_EN_DP_TRANS_P0_MASK );
drivers/gpu/drm/mediatek/mtk_dp.c line 751
Quoted 10 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +10
-0+} + +static int mtk_dp_hwirq_enable (struct mtk_dp *mtk_dp,bool enable) +{ +u32 val =0 ; + +if (!enable) + val =IRQ_MASK_DP_TRANS_P0_DISC_IRQ | +IRQ_MASK_DP_TRANS_P0_CONN_IRQ | +IRQ_MASK_DP_TRANS_P0_INT_IRQ ;
I think val = enable ? ... : 0
Quoted 48 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +14
-0+return mtk_dp_update_bits (mtk_dp,MTK_DP_TRANS_P0_3418 , val, +IRQ_MASK_DP_TRANS_P0_MASK ); +} + +static int mtk_dp_initialize_settings (struct mtk_dp *mtk_dp) +{ +int ret; + +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_TRANS_P0_342C , +XTAL_FREQ_DP_TRANS_P0_DEFAULT , +XTAL_FREQ_DP_TRANS_P0_MASK , ret, out); + MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_TRANS_P0_3540, + BIT(FEC_CLOCK_EN_MODE_DP_TRANS_P0_SHIFT), + FEC_CLOCK_EN_MODE_DP_TRANS_P0_MASK, ret,out);
drivers/gpu/drm/mediatek/mtk_dp.c new file +5
-0+MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_ENC0_P0_31EC , +BIT (AUDIO_CH_SRC_SEL_DP_ENC0_P0_SHIFT ), +AUDIO_CH_SRC_SEL_DP_ENC0_P0_MASK , ret, out); + MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_ENC0_P0_304C, 0, + SDP_VSYNC_RISING_MASK_DP_ENC0_P0_MASK, ret,out);
drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+ MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_TOP_IRQ_MASK,
IRQ_MASK_AUX_TOP_IRQ,drivers/gpu/drm/mediatek/mtk_dp.c new file +7
-0+ IRQ_MASK_AUX_TOP_IRQ, ret, out); + +out: +return ret; +} + +static void mtk_dp_initialize_hpd_detect_settings(struct mtk_dp
*mtk_dp)drivers/gpu/drm/mediatek/mtk_dp.c new file +16
-0+{ +// Debounce threshold +mtk_dp_update_bits (mtk_dp,MTK_DP_TRANS_P0_3410 , +8 <<HPD_DEB_THD_DP_TRANS_P0_SHIFT , +HPD_DEB_THD_DP_TRANS_P0_MASK ); +mtk_dp_update_bits (mtk_dp,MTK_DP_TRANS_P0_3410 , + (HPD_INT_THD_DP_TRANS_P0_LOWER_500US | +HPD_INT_THD_DP_TRANS_P0_UPPER_1100US ) + <<HPD_INT_THD_DP_TRANS_P0_SHIFT , +HPD_INT_THD_DP_TRANS_P0_MASK ); + +// Connect threshold 1.5ms + 5 x 0.1ms = 2ms +// Disconnect threshold 1.5ms + 5 x 0.1ms = 2ms + mtk_dp_update_bits(mtk_dp, MTK_DP_TRANS_P0_3410, + (5 << HPD_DISC_THD_DP_TRANS_P0_SHIFT) | + (5 <<
HPD_CONN_THD_DP_TRANS_P0_SHIFT),
drivers/gpu/drm/mediatek/mtk_dp.c line 799
Quoted 5 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +5
-0+HPD_DISC_THD_DP_TRANS_P0_MASK | + HPD_CONN_THD_DP_TRANS_P0_MASK); +mtk_dp_update_bits (mtk_dp,MTK_DP_TRANS_P0_3430 , +HPD_INT_THD_ECO_DP_TRANS_P0_HIGH_BOUND_EXT , +HPD_INT_THD_ECO_DP_TRANS_P0_MASK );
this function is not control if !ret,
maybe we should let all functions of setting register follow the same rule?
Quoted 90 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +14
-0+} + +static int mtk_dp_initialize_aux_settings (struct mtk_dp *mtk_dp) +{ +int ret; + +/* modify timeout threshold = 1595 [12 : 8] */ +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_AUX_P0_360C ,0x1595 , +AUX_TIMEOUT_THR_AUX_TX_P0_MASK , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_AUX_P0_3658 ,0 , +AUX_TX_OV_EN_AUX_TX_P0_MASK , ret, out); +/* 25 for 26M */ + MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_AUX_P0_3634, + 25 <<
AUX_TX_OVER_SAMPLE_RATE_AUX_TX_P0_SHIFT,drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+ AUX_TX_OVER_SAMPLE_RATE_AUX_TX_P0_MASK, ret,out);
drivers/gpu/drm/mediatek/mtk_dp.c new file +27
-0+/* 13 for 26M */ +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_AUX_P0_3614 , +13 <<AUX_RX_UI_CNT_THR_AUX_TX_P0_SHIFT , +AUX_RX_UI_CNT_THR_AUX_TX_P0_MASK , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_AUX_P0_37C8 , +BIT (MTK_ATOP_EN_AUX_TX_P0_SHIFT ), +MTK_ATOP_EN_AUX_TX_P0_MASK , ret, out); + +out: +return ret; +} + +static int mtk_dp_initialize_digital_settings (struct mtk_dp *mtk_dp) +{ +int ret; + +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_ENC0_P0_304C ,0 , +VBID_VIDEO_MUTE_DP_ENC0_P0_MASK , ret, out); +mtk_dp_set_color_format (mtk_dp,MTK_DP_COLOR_FORMAT_RGB_444 ); +mtk_dp_set_color_depth (mtk_dp,MTK_DP_COLOR_DEPTH_8BIT ); +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_ENC1_P0_3368 , +1 <<BS2BS_MODE_DP_ENC1_P0_SHIFT , +BS2BS_MODE_DP_ENC1_P0_MASK , ret, out); + +/* dp tx encoder reset all sw */ + MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_ENC0_P0_3004, + BIT(DP_TX_ENCODER_4P_RESET_SW_DP_ENC0_P0_SHIFT),
drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+ DP_TX_ENCODER_4P_RESET_SW_DP_ENC0_P0_MASK,ret, out);
drivers/gpu/drm/mediatek/mtk_dp.c new file +3
-0+usleep_range (1000 ,5000 ); + MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_ENC0_P0_3004, 0, + DP_TX_ENCODER_4P_RESET_SW_DP_ENC0_P0_MASK,ret, out);
drivers/gpu/drm/mediatek/mtk_dp.c new file +11
-0+ +out: +return ret; +} + +static int mtk_dp_digital_sw_reset (struct mtk_dp *mtk_dp) +{ +int ret; + + MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_TRANS_P0_340C, + BIT(DP_TX_TRANSMITTER_4P_RESET_SW_DP_TRANS_
P0_SHIFT),drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+DP_TX_TRANSMITTER_4P_RESET_SW_DP_TRANS_P0_MA SK, ret, out);
drivers/gpu/drm/mediatek/mtk_dp.c new file +3
-0+usleep_range (1000 ,5000 ); +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_TRANS_P0_340C ,0 , + DP_TX_TRANSMITTER_4P_RESET_SW_DP_TRANS_P0_MASK, ret, out);
drivers/gpu/drm/mediatek/mtk_dp.c new file +11
-0+ +out: +return ret; +} + +static int mtk_dp_set_lanes (struct mtk_dp *mtk_dp,int lanes) +{ +int ret; + + MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_TRANS_P0_35F0, + lanes == 0 ? 0 : BIT(3), BIT(3) | BIT(2),ret, out);
drivers/gpu/drm/mediatek/mtk_dp.c new file +9
-0+MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_ENC0_P0_3000 , lanes, +LANE_NUM_DP_ENC0_P0_MASK , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_TRANS_P0_34A4 , + lanes <<LANE_NUM_DP_TRANS_P0_SHIFT , +LANE_NUM_DP_TRANS_P0_MASK , ret, out); + +out: +return ret; +}
drivers/gpu/drm/mediatek/mtk_dp.c line 890
Quoted 10 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +10
-0+ +static int link_rate_to_mb_per_s (struct mtk_dp *mtk_dp, +enum mtk_dp_linkrate linkrate) +{ +switch (linkrate) { +default : +drm_err (mtk_dp->drm_dev, +"Implementation error, unknown linkrate %d\n" , + linkrate); + fallthrough;
I think we should return 0?
Quoted 13 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +12
-0+case MTK_DP_LINKRATE_RBR : +return 1620 ; +case MTK_DP_LINKRATE_HBR : +return 2700 ; +case MTK_DP_LINKRATE_HBR2 : +return 5400 ; +case MTK_DP_LINKRATE_HBR3 : +return 8100 ; + } +} + +static u32 check_cal_data_valid(u32 min, u32 max, u32 val, u32
default_val)
drivers/gpu/drm/mediatek/mtk_dp.c line 905
Quoted 3 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +3
-0+{ +if (val < min || val > max) +return default_val;
maybe we should add some warning here.
Quoted 150 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +16
-0+ +return val; +} + +static int mtk_dp_get_calibration_data (struct mtk_dp *mtk_dp) +{ +struct dp_cal_data *cal_data = &mtk_dp->cal_data; +struct device *dev = mtk_dp->dev; +struct nvmem_cell *cell; +u32 *buf; +size_t len; + + cell =nvmem_cell_get (dev,"dp_calibration_data" ); +if (IS_ERR (cell)) { + dev_err(dev, + "Error: Failed to get nvmem celldp_calibration_data\n");
drivers/gpu/drm/mediatek/mtk_dp.c new file +9
-0+return PTR_ERR (cell); + } + + buf = (u32 *)nvmem_cell_read (cell, &len); +nvmem_cell_put (cell); + +if (IS_ERR (buf) || ((len /sizeof (u32)) !=4 )) { + dev_err(dev, + "Error: Failed to read nvmem_cell_read fail len%ld\n",
drivers/gpu/drm/mediatek/mtk_dp.c new file +6
-0+ (len / sizeof(u32))); +return PTR_ERR (buf); + } + + cal_data->glb_bias_trim = + check_cal_data_valid(1, 0x1e, (buf[3] >> 27) & 0x1f,
0xf);drivers/gpu/drm/mediatek/mtk_dp.c new file +4
-0+ cal_data->clktx_impse = +check_cal_data_valid (1 ,0xe , (buf[0 ] >>9 ) &0xf ,0x8 ); + cal_data->ln_tx_impsel_pmos[0 ] = + check_cal_data_valid(1, 0xe, (buf[2] >> 28) & 0xf,
0x8);drivers/gpu/drm/mediatek/mtk_dp.c new file +2
-0+ cal_data->ln_tx_impsel_nmos[0 ] = + check_cal_data_valid(1, 0xe, (buf[2] >> 24) & 0xf,
0x8);drivers/gpu/drm/mediatek/mtk_dp.c new file +2
-0+ cal_data->ln_tx_impsel_pmos[1 ] = + check_cal_data_valid(1, 0xe, (buf[2] >> 20) & 0xf,
0x8);drivers/gpu/drm/mediatek/mtk_dp.c new file +2
-0+ cal_data->ln_tx_impsel_nmos[1 ] = + check_cal_data_valid(1, 0xe, (buf[2] >> 16) & 0xf,
0x8);drivers/gpu/drm/mediatek/mtk_dp.c new file +2
-0+ cal_data->ln_tx_impsel_pmos[2 ] = + check_cal_data_valid(1, 0xe, (buf[2] >> 12) & 0xf,
0x8);drivers/gpu/drm/mediatek/mtk_dp.c new file +19
-0+ cal_data->ln_tx_impsel_nmos[2 ] = +check_cal_data_valid (1 ,0xe , (buf[2 ] >>8 ) &0xf ,0x8 ); + cal_data->ln_tx_impsel_pmos[3 ] = +check_cal_data_valid (1 ,0xe , (buf[2 ] >>4 ) &0xf ,0x8 ); + cal_data->ln_tx_impsel_nmos[3 ] = +check_cal_data_valid (1 ,0xe , buf[2 ] &0xf ,0x8 ); + +kfree (buf); + +return 0 ; +} + +static int mtk_dp_set_cal_data (struct mtk_dp *mtk_dp) +{ +int ret; +struct dp_cal_data *cal_data = &mtk_dp->cal_data; + + MTK_UPD_BITS_OR_OUT(mtk_dp, DP_PHY_GLB_DPAUX_TX, + cal_data->clktx_impse << 20,
RG_CKM_PT0_CKTX_IMPSEL, ret, out);drivers/gpu/drm/mediatek/mtk_dp.c new file +34
-0+MTK_UPD_BITS_OR_OUT (mtk_dp,DP_PHY_GLB_BIAS_GEN_00 , + cal_data->glb_bias_trim <<16 , +RG_XTP_GLB_BIAS_INTR_CTRL , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,DP_PHY_LANE_TX_0 , + cal_data->ln_tx_impsel_pmos[0 ] <<12 , +RG_XTP_LN0_TX_IMPSEL_PMOS , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,DP_PHY_LANE_TX_0 , + cal_data->ln_tx_impsel_nmos[0 ] <<16 , +RG_XTP_LN0_TX_IMPSEL_NMOS , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,DP_PHY_LANE_TX_1 , + cal_data->ln_tx_impsel_pmos[1 ] <<12 , +RG_XTP_LN1_TX_IMPSEL_PMOS , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,DP_PHY_LANE_TX_1 , + cal_data->ln_tx_impsel_nmos[1 ] <<16 , +RG_XTP_LN1_TX_IMPSEL_NMOS , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,DP_PHY_LANE_TX_2 , + cal_data->ln_tx_impsel_pmos[2 ] <<12 , +RG_XTP_LN2_TX_IMPSEL_PMOS , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,DP_PHY_LANE_TX_2 , + cal_data->ln_tx_impsel_nmos[2 ] <<16 , +RG_XTP_LN2_TX_IMPSEL_NMOS , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,DP_PHY_LANE_TX_3 , + cal_data->ln_tx_impsel_pmos[3 ] <<12 , +RG_XTP_LN3_TX_IMPSEL_PMOS , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,DP_PHY_LANE_TX_3 , + cal_data->ln_tx_impsel_nmos[3 ] <<16 , +RG_XTP_LN3_TX_IMPSEL_NMOS , ret, out); + +out: +return ret; +} + +static int mtk_dp_phy_configure (struct mtk_dp *mtk_dp, + enum mtk_dp_linkrate link_rate, int
lane_count)drivers/gpu/drm/mediatek/mtk_dp.c new file +5
-0+{ + int ret; + union phy_configure_opts phy_opts = { + .dp = { + .link_rate = link_rate_to_mb_per_s(mtk_dp,
link_rate),drivers/gpu/drm/mediatek/mtk_dp.c new file +8
-0+ .set_rate = 1, + .lanes = lane_count, + .set_lanes = 1, + .ssc = mtk_dp->train_info.sink_ssc, + } + }; + + MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_TOP_PWR_STATE,
DP_PWR_STATE_BANDGAP,drivers/gpu/drm/mediatek/mtk_dp.c new file +10
-0+ DP_PWR_STATE_MASK, ret, out); + + ret =phy_configure (mtk_dp->phy, &phy_opts); + +if (ret) + goto out; + +mtk_dp_set_cal_data (mtk_dp); + MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_TOP_PWR_STATE, + DP_PWR_STATE_BANDGAP_TPLL_LANE,
DP_PWR_STATE_MASK, ret, out);drivers/gpu/drm/mediatek/mtk_dp.c new file +6
-0+ +out: +return ret; +} + +static int mtk_dp_set_idle_pattern(struct mtk_dp *mtk_dp, boolenable)
drivers/gpu/drm/mediatek/mtk_dp.c new file +6
-0+{ +const u32 val =POST_MISC_DATA_LANE0_OV_DP_TRANS_P0_MASK | +POST_MISC_DATA_LANE1_OV_DP_TRANS_P0_MASK | +POST_MISC_DATA_LANE2_OV_DP_TRANS_P0_MASK | +POST_MISC_DATA_LANE3_OV_DP_TRANS_P0_MASK ; + return mtk_dp_update_bits(mtk_dp, MTK_DP_TRANS_P0_3580, enable? val : 0, val);
drivers/gpu/drm/mediatek/mtk_dp.c new file +4
-0+} + +//TODO: check return value in callee +static int mtk_dp_train_set_pattern(struct mtk_dp *mtk_dp, int
Quoted 1 line
pattern)
maybe we can use uint8 pattern.
So that we don't need to check the value is < 0.
Quoted 98 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +4
-0+{ +if (pattern <0 || pattern >4 ) { + drm_err(mtk_dp->drm_dev, + "Implementation error, no such pattern %d\n",pattern);
drivers/gpu/drm/mediatek/mtk_dp.c new file +9
-0+return -EINVAL ; + } + +if (pattern ==1 )/* TPS1 */ +mtk_dp_set_idle_pattern (mtk_dp, false); + + return mtk_dp_update_bits(mtk_dp, + MTK_DP_TRANS_P0_3400, + pattern ? BIT(pattern - 1) <<
PATTERN1_EN_DP_TRANS_P0_SHIFT: 0,drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+ PATTERN1_EN_DP_TRANS_P0_MASK |
PATTERN2_EN_DP_TRANS_P0_MASK|drivers/gpu/drm/mediatek/mtk_dp.c new file +5
-0+PATTERN3_EN_DP_TRANS_P0_MASK | + PATTERN4_EN_DP_TRANS_P0_MASK); +} + +static int mtk_dp_set_enhanced_frame_mode(struct mtk_dp *mtk_dp,bool enable)
drivers/gpu/drm/mediatek/mtk_dp.c new file +3
-0+{ + return mtk_dp_update_bits(mtk_dp, MTK_DP_ENC0_P0_3000, + enable ?
BIT(ENHANCED_FRAME_EN_DP_ENC0_P0_SHIFT): 0,drivers/gpu/drm/mediatek/mtk_dp.c new file +4
-0+ ENHANCED_FRAME_EN_DP_ENC0_P0_MASK); +} + +static int mtk_dp_training_set_scramble(struct mtk_dp *mtk_dp, boolenable)
drivers/gpu/drm/mediatek/mtk_dp.c new file +27
-0+{ +return mtk_dp_update_bits (mtk_dp,MTK_DP_TRANS_P0_3404 , + enable ?DP_SCR_EN_DP_TRANS_P0_MASK :0 , +DP_SCR_EN_DP_TRANS_P0_MASK ); +} + +static void mtk_dp_video_mute (struct mtk_dp *mtk_dp,bool enable) +{ +u32 val =BIT (VIDEO_MUTE_SEL_DP_ENC0_P0_SHIFT ); + +if (enable) + val |=BIT (VIDEO_MUTE_SW_DP_ENC0_P0_SHIFT ); +mtk_dp_update_bits (mtk_dp,MTK_DP_ENC0_P0_3000 , val, +VIDEO_MUTE_SEL_DP_ENC0_P0_MASK | +VIDEO_MUTE_SW_DP_ENC0_P0_MASK ); + +mtk_dp_sip_atf_call (MTK_DP_SIP_ATF_EDP_VIDEO_UNMUTE , enable); +} + +static int mtk_dp_power_enable (struct mtk_dp *mtk_dp) +{ +int ret; + +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_TOP_RESET_AND_PROBE ,0 , +SW_RST_B_PHYD , ret, out); +usleep_range (10 ,200 ); + MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_TOP_RESET_AND_PROBE,
SW_RST_B_PHYD,drivers/gpu/drm/mediatek/mtk_dp.c new file +21
-0+ SW_RST_B_PHYD, ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_TOP_PWR_STATE , +DP_PWR_STATE_BANDGAP_TPLL , +DP_PWR_STATE_MASK , ret, out); + +out: +return ret; +} + +static int mtk_dp_power_disable (struct mtk_dp *mtk_dp) +{ +int ret; + + ret =mtk_dp_write (mtk_dp,MTK_DP_TOP_PWR_STATE ,0 ); + +if (ret) + goto out; + +usleep_range (10 ,200 ); + ret = mtk_dp_write(mtk_dp, MTK_DP_0034, + DA_CKM_CKTX0_EN_FORCE_EN |
DA_CKM_BIAS_LPF_EN_FORCE_VAL|drivers/gpu/drm/mediatek/mtk_dp.c new file +15
-0+DA_CKM_BIAS_EN_FORCE_VAL | +DA_XTP_GLB_LDO_EN_FORCE_VAL | + DA_XTP_GLB_AVD10_ON_FORCE_VAL); + +if (ret) + goto out; + +/* Disable RX */ + ret =mtk_dp_write (mtk_dp,MTK_DP_1040 ,0 ); + +if (ret) + goto out; + + ret = mtk_dp_write(mtk_dp, MTK_DP_TOP_MEM_PD, + 0x550 | BIT(FUSE_SEL_SHIFT) |
BIT(MEM_ISO_EN_SHIFT));
drivers/gpu/drm/mediatek/mtk_dp.c line 242
Quoted 3 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +3
-0+ +out: +return ret;
If we don't do anything special here, I think we can return directly and no need "out" label.
Quoted 15 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +15
-0+} + +static void mtk_dp_initialize_priv_data (struct mtk_dp *mtk_dp) +{ + mtk_dp->train_info.link_rate =MTK_DP_LINKRATE_HBR2 ; + mtk_dp->train_info.lane_count =MTK_DP_MAX_LANES ; + mtk_dp->train_info.irq_status =0 ; + mtk_dp->train_info.cable_plugged_in = false; + mtk_dp->train_info.cable_state_change = false; + mtk_dp->train_state =MTK_DP_TRAIN_STATE_STARTUP ; + mtk_dp->state =MTK_DP_STATE_INITIAL ; + + mtk_dp->info.format =MTK_DP_COLOR_FORMAT_RGB_444 ; + mtk_dp->info.depth =MTK_DP_COLOR_DEPTH_8BIT ; + memset(&mtk_dp->info.timings, 0, sizeof(struct
Quoted 1 line
mtk_dp_timings));
maybe re-order this.
Quoted 15 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +13
-0+ mtk_dp->info.timings.frame_rate =60 ; + + mtk_dp->has_fec = false; +} + +static void mtk_dp_setup_tu (struct mtk_dp *mtk_dp) +{ +u32 sram_read_start =MTK_DP_TBC_BUF_READ_START_ADDR ; + +if (mtk_dp->train_info.lane_count >0 ) { + sram_read_start =min_t (u32, +MTK_DP_TBC_BUF_READ_START_ADDR , + mtk_dp->info.timings.vm.hactive/
drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+ (mtk_dp->train_info.lane_count
Quoted 1 line
* 4 * 2 * 2));
This is something magic number..
I think we should add some comments here.
Quoted 6 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +6
-0+mtk_dp_set_sram_read_start (mtk_dp, sram_read_start); + } + +mtk_dp_setup_encoder (mtk_dp); +} +
drivers/gpu/drm/mediatek/mtk_dp.c line 1177
Quoted 10 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +10
-0+static void mtk_dp_calculate_pixrate (struct mtk_dp *mtk_dp) +{ +int target_frame_rate =60 ; +int target_pixel_clk; + +if (mtk_dp->info.timings.frame_rate >0 ) { + target_frame_rate = mtk_dp->info.timings.frame_rate; + target_pixel_clk = (int )mtk_dp->info.timings.htotal * + (int )mtk_dp->info.timings.vtotal * + target_frame_rate;
I think target_pixel_clk should be always >= 0?
Can we use u32 for target_pixel_clk?
Quoted 70 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +2
-0+ }else if (mtk_dp->info.timings.pix_rate_khz >0 ) { + target_pixel_clk = mtk_dp->info.timings.pix_rate_khz *1000;
drivers/gpu/drm/mediatek/mtk_dp.c new file +8
-0+ }else { + target_pixel_clk = (int )mtk_dp->info.timings.htotal * + (int )mtk_dp->info.timings.vtotal * + target_frame_rate; + } + +if (target_pixel_clk >0 ) + mtk_dp->info.timings.pix_rate_khz = target_pixel_clk /1000;
drivers/gpu/drm/mediatek/mtk_dp.c new file +11
-0+} + +static void mtk_dp_set_tx_out (struct mtk_dp *mtk_dp) +{ +mtk_dp_msa_bypass_disable (mtk_dp); +mtk_dp_calculate_pixrate (mtk_dp); +mtk_dp_pg_disable (mtk_dp); +mtk_dp_setup_tu (mtk_dp); +} + +static void mtk_dp_train_update_swing_pre(struct mtk_dp *mtk_dp, intlanes,
drivers/gpu/drm/mediatek/mtk_dp.c new file +10
-0+ u8 dpcd_adjust_req[2]) +{ +int lane; + +for (lane =0 ; lane < lanes; ++lane) { +u8 val; +u8 swing; +u8 preemphasis; +int index = lane /2 ; + int shift = lane % 2 ?
DP_ADJUST_VOLTAGE_SWING_LANE1_SHIFT: 0;drivers/gpu/drm/mediatek/mtk_dp.c new file +15
-0+ + swing = (dpcd_adjust_req[index] >> shift) & +DP_ADJUST_VOLTAGE_SWING_LANE0_MASK ; + preemphasis = ((dpcd_adjust_req[index] >> shift) & +DP_ADJUST_PRE_EMPHASIS_LANE0_MASK ) >> +DP_ADJUST_PRE_EMPHASIS_LANE0_SHIFT ; + val = swing <<DP_TRAIN_VOLTAGE_SWING_SHIFT | + preemphasis <<DP_TRAIN_PRE_EMPHASIS_SHIFT ; + +if (swing ==DP_TRAIN_VOLTAGE_SWING_LEVEL_3 ) + val |=DP_TRAIN_MAX_SWING_REACHED ; +if (preemphasis ==3 ) + val |=DP_TRAIN_MAX_PRE_EMPHASIS_REACHED ; + + mtk_dp_set_swing_pre_emphasis(mtk_dp, lane, swing,preemphasis);
drivers/gpu/drm/mediatek/mtk_dp.c new file +11
-0+drm_dp_dpcd_writeb (&mtk_dp->aux,DP_TRAINING_LANE0_SET + lane, + val); + } + +/* Wait for the signal to be stable enough */ +usleep_range (2000 ,5000 ); +} + +static void mtk_dp_read_link_status (struct mtk_dp *mtk_dp, + u8link_status[DP_LINK_STATUS_SIZE])
drivers/gpu/drm/mediatek/mtk_dp.c new file +6
-0+{ +drm_dp_dpcd_read (&mtk_dp->aux,DP_LANE0_1_STATUS , link_status, +DP_LINK_STATUS_SIZE ); +} + +static int mtk_dp_train_flow(struct mtk_dp *mtk_dp, int
target_link_rate,
drivers/gpu/drm/mediatek/mtk_dp.c line 1240
Quoted 1 line
drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+ int target_lane_count)
hmm..
This function is too complicated.
I think you can refer to this drivers in coreboot
I have modified this before...
Quoted 197 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +12
-0+{ +u8 link_status[DP_LINK_STATUS_SIZE ] = {}; +u8 lane_adjust[2 ] = {}; +bool pass_tps1 = false; +bool pass_tps2_3 = false; +int train_retries; +int status_control; +int iteration_count; +u8 prev_lane_adjust; +u8 val; + + drm_dp_dpcd_writeb(&mtk_dp->aux, DP_LINK_BW_SET,
target_link_rate);drivers/gpu/drm/mediatek/mtk_dp.c new file +2
-0+ drm_dp_dpcd_writeb(&mtk_dp->aux, DP_LANE_COUNT_SET, + target_lane_count |
DP_LANE_COUNT_ENHANCED_FRAME_EN);drivers/gpu/drm/mediatek/mtk_dp.c new file +12
-0+ +if (mtk_dp->train_info.sink_ssc) +drm_dp_dpcd_writeb (&mtk_dp->aux,DP_DOWNSPREAD_CTRL , +DP_SPREAD_AMP_0_5 ); + + train_retries =0 ; + status_control =0 ; + iteration_count =1 ; + prev_lane_adjust =0xFF ; + +mtk_dp_set_lanes (mtk_dp, target_lane_count /2 ); + mtk_dp_phy_configure(mtk_dp, target_link_rate,
target_lane_count);drivers/gpu/drm/mediatek/mtk_dp.c new file +3
-0+ + dev_dbg(mtk_dp->dev, + "Link train target_link_rate = 0x%x, target_lane_count= 0x%x\n",
drivers/gpu/drm/mediatek/mtk_dp.c new file +6
-0+ target_link_rate, target_lane_count); + + do { + train_retries++; + if (!mtk_dp->train_info.cable_plugged_in || + ((mtk_dp->train_info.irq_status &
MTK_DP_HPD_DISCONNECT) !=drivers/gpu/drm/mediatek/mtk_dp.c new file +17
-0+ 0x0)) { +return -ENODEV ; + } + +if (mtk_dp->train_state <MTK_DP_TRAIN_STATE_TRAINING ) +return -EAGAIN ; + +if (!pass_tps1) { +mtk_dp_training_set_scramble (mtk_dp, false); + +if (status_control ==0 ) { + status_control =1 ; +mtk_dp_train_set_pattern (mtk_dp,1 ); + val =DP_LINK_SCRAMBLING_DISABLE | +DP_TRAINING_PATTERN_1 ; +drm_dp_dpcd_writeb (&mtk_dp->aux, + DP_TRAINING_PATTERN_SET,
drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+DP_LINK_SCRAMBLING_D ISABLE |
drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+DP_TRAINING_PATTERN_ 1);
drivers/gpu/drm/mediatek/mtk_dp.c new file +2
-0+drm_dp_dpcd_read (&mtk_dp->aux, + DP_ADJUST_REQUEST_LANE0_1,
drivers/gpu/drm/mediatek/mtk_dp.c new file +6
-0+ lane_adjust, + sizeof(lane_adjust)); + iteration_count++; + +mtk_dp_train_update_swing_pre (mtk_dp, + target_la
ne_count,lane_adjust);drivers/gpu/drm/mediatek/mtk_dp.c new file +3
-0+ } + + drm_dp_link_train_clock_recovery_delay(&mtk_dp-Quoted 1 line
aux,
drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+ mtk_dp-Quoted 1 line
rx_cap);drivers/gpu/drm/mediatek/mtk_dp.c new file +4
-0+mtk_dp_read_link_status (mtk_dp, link_status); + +if (drm_dp_clock_recovery_ok (link_status, + target_lane_count)) {
drivers/gpu/drm/mediatek/mtk_dp.c new file +5
-0+ mtk_dp->train_info.cr_done = true; + pass_tps1 = true; + train_retries =0 ; + iteration_count =1 ; + dev_dbg(mtk_dp->dev, "Link train CRpass\n");
drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+ }else if (prev_lane_adjust == link_status[4 ]){
drivers/gpu/drm/mediatek/mtk_dp.c new file +13
-0+ iteration_count++; +if (prev_lane_adjust & +DP_ADJUST_VOLTAGE_SWING_LANE0_MASK ) +break ; + }else { + prev_lane_adjust = link_status[4 ]; + } +dev_dbg (mtk_dp->dev,"Link train CQ fail\n" ); + }else if (pass_tps1 && !pass_tps2_3) { +if (status_control ==1 ) { + status_control =2 ; +if (mtk_dp->train_info.tps4) { + mtk_dp_train_set_pattern(mtk_dp, 4);
drivers/gpu/drm/mediatek/mtk_dp.c new file +3
-0+ val =DP_TRAINING_PATTERN_4 ; + }else if (mtk_dp->train_info.tps3) { + mtk_dp_train_set_pattern(mtk_dp, 3);
drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+ val =
DP_LINK_SCRAMBLING_DISABLE|drivers/gpu/drm/mediatek/mtk_dp.c new file +3
-0+DP_TRAINING_PATTERN_3 ; + }else { + mtk_dp_train_set_pattern(mtk_dp, 2);
drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+ val =
DP_LINK_SCRAMBLING_DISABLE|drivers/gpu/drm/mediatek/mtk_dp.c new file +4
-0+DP_TRAINING_PATTERN_2 ; + } +drm_dp_dpcd_writeb (&mtk_dp->aux, + DP_TRAINING_PATTERN_SET,
drivers/gpu/drm/mediatek/mtk_dp.c new file +4
-0+ val); + +drm_dp_dpcd_read (&mtk_dp->aux, + DP_ADJUST_REQUEST_LANE0_1,
drivers/gpu/drm/mediatek/mtk_dp.c new file +6
-0+ lane_adjust, + sizeof(lane_adjust)); + + iteration_count++; +mtk_dp_train_update_swing_pre (mtk_dp, + target_la
ne_count,lane_adjust);drivers/gpu/drm/mediatek/mtk_dp.c new file +3
-0+ } + + drm_dp_link_train_channel_eq_delay(&mtk_dp-Quoted 1 line
aux,
drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+ mtk_dp-Quoted 1 line
rx_cap);drivers/gpu/drm/mediatek/mtk_dp.c new file +5
-0+ +mtk_dp_read_link_status (mtk_dp, link_status); + + if (!drm_dp_clock_recovery_ok(link_status, + target_lane_count)) {
drivers/gpu/drm/mediatek/mtk_dp.c new file +3
-0+ mtk_dp->train_info.cr_done = false; + mtk_dp->train_info.eq_done = false; + dev_dbg(mtk_dp->dev, "Link train EQfail\n");
drivers/gpu/drm/mediatek/mtk_dp.c new file +8
-0+break ; + } + +if (drm_dp_channel_eq_ok (link_status, + target_lane_count)) { + mtk_dp->train_info.eq_done = true; + pass_tps2_3 = true; + dev_dbg(mtk_dp->dev, "Link train EQpass\n");
drivers/gpu/drm/mediatek/mtk_dp.c new file +10
-0+break ; + } + +if (prev_lane_adjust == link_status[4 ]) + iteration_count++; +else + prev_lane_adjust = link_status[4 ]; + } + + drm_dp_dpcd_read(&mtk_dp->aux,
DP_ADJUST_REQUEST_LANE0_1,drivers/gpu/drm/mediatek/mtk_dp.c new file +2
-0+ lane_adjust, sizeof(lane_adjust)); + mtk_dp_train_update_swing_pre(mtk_dp,
target_lane_count,drivers/gpu/drm/mediatek/mtk_dp.c new file +23
-0+ lane_adjust); + }while (train_retries <MTK_DP_TRAIN_RETRY_LIMIT && + iteration_count <MTK_DP_TRAIN_MAX_ITERATIONS ); + +drm_dp_dpcd_writeb (&mtk_dp->aux,DP_TRAINING_PATTERN_SET , +DP_TRAINING_PATTERN_DISABLE ); +mtk_dp_train_set_pattern (mtk_dp,0 ); + +if (!pass_tps2_3) +return -ETIMEDOUT ; + + mtk_dp->train_info.link_rate = target_link_rate; + mtk_dp->train_info.lane_count = target_lane_count; + +mtk_dp_training_set_scramble (mtk_dp, true); + +drm_dp_dpcd_writeb (&mtk_dp->aux,DP_LANE_COUNT_SET , + target_lane_count | +DP_LANE_COUNT_ENHANCED_FRAME_EN ); +mtk_dp_set_enhanced_frame_mode (mtk_dp, true); + +return 0 ; +}
snip..
drivers/gpu/drm/mediatek/mtk_dp_reg.h
Quoted 6 lines
drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +0
-0
For mtk_dp_reg.h,
1. I think it's no need to add parnethess for BIT().
2. Use tab to alignment for readability.
BRs,
Rex
Quoted 641 lines
drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +9
-0@@ -0,0 +1,568 @@ +/* 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 (BIT(0) | BIT(1) | BIT(5) |BIT(8) | BIT(10) | BIT(25) | BIT(31))
drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +121
-0+#define MTK_DP_SIP_ATF_VIDEO_UNMUTE (BIT(5)) +#define MTK_DP_SIP_ATF_EDP_VIDEO_UNMUTE (BIT(0) | BIT(5)) + +#define DP_PHY_GLB_BIAS_GEN_00 0 +#define RG_XTP_GLB_BIAS_INTR_CTRL GENMASK(20, 16) + +#define DP_PHY_GLB_DPAUX_TX (BIT(3)) +#define RG_CKM_PT0_CKTX_IMPSEL GENMASK(23, 20) + +#define DP_PHY_LANE_TX_0 (BIT(2) | BIT(8)) +#define RG_XTP_LN0_TX_IMPSEL_PMOS GENMASK(15, 12) +#define RG_XTP_LN0_TX_IMPSEL_NMOS GENMASK(19, 16) + +#define DP_PHY_LANE_TX_1 (BIT(2) | BIT(9)) +#define RG_XTP_LN1_TX_IMPSEL_PMOS GENMASK(15, 12) +#define RG_XTP_LN1_TX_IMPSEL_NMOS GENMASK(19, 16) + +#define DP_PHY_LANE_TX_2 (BIT(2) | BIT(8) | BIT(9)) +#define RG_XTP_LN2_TX_IMPSEL_PMOS GENMASK(15, 12) +#define RG_XTP_LN2_TX_IMPSEL_NMOS GENMASK(19, 16) + +#define DP_PHY_LANE_TX_3 (BIT(2) | BIT(10)) +#define RG_XTP_LN3_TX_IMPSEL_PMOS GENMASK(15, 12) +#define RG_XTP_LN3_TX_IMPSEL_NMOS GENMASK(19, 16) + +#define TOP_OFFSET (BIT(13)) +#define ENC0_OFFSET GENMASK(13, 12) +#define ENC1_OFFSET (BIT(9) | BIT(12) | BIT(13)) +#define TRANS_OFFSET (BIT(10) | BIT(12) | BIT(13)) +#define AUX_OFFSET (BIT(9) | BIT(10) | BIT(12) | BIT(13)) +#define SEC_OFFSET (BIT(14)) + +#define MTK_DP_HPD_DISCONNECT BIT(1) +#define MTK_DP_HPD_CONNECT BIT(2) +#define MTK_DP_HPD_INTERRUPT BIT(3) + +#define MTK_DP_0034 (BIT(2) | BIT(4) | BIT(5)) +#define DA_XTP_GLB_CKDET_EN_FORCE_VAL BIT(15) +#define DA_XTP_GLB_CKDET_EN_FORCE_EN BIT(14) +#define DA_CKM_INTCKTX_EN_FORCE_VAL BIT(13) +#define DA_CKM_INTCKTX_EN_FORCE_EN BIT(12) +#define DA_CKM_CKTX0_EN_FORCE_VAL BIT(11) +#define DA_CKM_CKTX0_EN_FORCE_EN BIT(10) +#define DA_CKM_XTAL_CK_FORCE_VAL BIT(9) +#define DA_CKM_XTAL_CK_FORCE_EN BIT(8) +#define DA_CKM_BIAS_LPF_EN_FORCE_VAL BIT(7) +#define DA_CKM_BIAS_LPF_EN_FORCE_EN BIT(6) +#define DA_CKM_BIAS_EN_FORCE_VAL BIT(5) +#define DA_CKM_BIAS_EN_FORCE_EN BIT(4) +#define DA_XTP_GLB_AVD10_ON_FORCE_VAL BIT(3) +#define DA_XTP_GLB_AVD10_ON_FORCE BIT(2) +#define DA_XTP_GLB_LDO_EN_FORCE_VAL BIT(1) +#define DA_XTP_GLB_LDO_EN_FORCE_EN BIT(0) + +#define MTK_DP_1040 (BIT(6) | BIT(12)) +#define RG_DPAUX_RX_VALID_DEGLITCH_EN BIT(2) +#define RG_XTP_GLB_CKDET_EN BIT(1) +#define RG_DPAUX_RX_EN BIT(0) + +#define MTK_DP_ENC0_P0_3000 (ENC0_OFFSET + 0x00) +#define LANE_NUM_DP_ENC0_P0_MASK GENMASK(1, 0) +#define VIDEO_MUTE_SW_DP_ENC0_P0_MASK (BIT(2)) +#define VIDEO_MUTE_SW_DP_ENC0_P0_SHIFT (BIT(1)) +#define VIDEO_MUTE_SEL_DP_ENC0_P0_MASK (BIT(3)) +#define VIDEO_MUTE_SEL_DP_ENC0_P0_SHIFT GENMASK(1, 0) +#define ENHANCED_FRAME_EN_DP_ENC0_P0_MASK (BIT(4)) +#define ENHANCED_FRAME_EN_DP_ENC0_P0_SHIFT (BIT(2)) + +#define MTK_DP_ENC0_P0_3004 (ENC0_OFFSET + 0x04) +#define VIDEO_M_CODE_SEL_DP_ENC0_P0_MASK (BIT(8)) +#define VIDEO_M_CODE_SEL_DP_ENC0_P0_SHIFT (BIT(3)) +#define DP_TX_ENCODER_4P_RESET_SW_DP_ENC0_P0_MASK (BIT(9)) +#define DP_TX_ENCODER_4P_RESET_SW_DP_ENC0_P0_SHIFT (BIT(0) | BIT(3)) + +#define MTK_DP_ENC0_P0_3008 (ENC0_OFFSET + 0x08) +#define VIDEO_M_CODE_SW_0_DP_ENC0_P0_MASK GENMASK(15, 0) + +#define MTK_DP_ENC0_P0_300C (ENC0_OFFSET + 0x0C) +#define VIDEO_M_CODE_SW_1_DP_ENC0_P0_MASK GENMASK(7, 0) + +#define MTK_DP_ENC0_P0_3010 (ENC0_OFFSET + 0x10) +#define HTOTAL_SW_DP_ENC0_P0_MASK GENMASK(15, 0) + +#define MTK_DP_ENC0_P0_3014 (ENC0_OFFSET + 0x14) +#define VTOTAL_SW_DP_ENC0_P0_MASK GENMASK(15, 0) + +#define MTK_DP_ENC0_P0_3018 (ENC0_OFFSET + 0x18) +#define HSTART_SW_DP_ENC0_P0_MASK GENMASK(15, 0) + +#define MTK_DP_ENC0_P0_301C (ENC0_OFFSET + 0x1C) +#define VSTART_SW_DP_ENC0_P0_MASK GENMASK(15, 0) + +#define MTK_DP_ENC0_P0_3020 (ENC0_OFFSET + 0x20) +#define HWIDTH_SW_DP_ENC0_P0_MASK GENMASK(15, 0) + +#define MTK_DP_ENC0_P0_3024 (ENC0_OFFSET + 0x24) +#define VHEIGHT_SW_DP_ENC0_P0_MASK GENMASK(15, 0) + +#define MTK_DP_ENC0_P0_3028 (ENC0_OFFSET + 0x28) +#define HSW_SW_DP_ENC0_P0_MASK GENMASK(14, 0) +#define HSW_SW_DP_ENC0_P0_SHIFT 0 +#define HSP_SW_DP_ENC0_P0_MASK (BIT(15)) + +#define MTK_DP_ENC0_P0_302C (ENC0_OFFSET + 0x2C) +#define VSW_SW_DP_ENC0_P0_MASK GENMASK(14, 0) +#define VSW_SW_DP_ENC0_P0_SHIFT 0 +#define VSP_SW_DP_ENC0_P0_MASK (BIT(15)) + +#define MTK_DP_ENC0_P0_3030 (ENC0_OFFSET + 0x30) +#define HTOTAL_SEL_DP_ENC0_P0_SHIFT 0 +#define VTOTAL_SEL_DP_ENC0_P0_SHIFT (BIT(0)) +#define HSTART_SEL_DP_ENC0_P0_SHIFT (BIT(1)) +#define VSTART_SEL_DP_ENC0_P0_SHIFT GENMASK(1, 0) +#define HWIDTH_SEL_DP_ENC0_P0_SHIFT (BIT(2)) +#define VHEIGHT_SEL_DP_ENC0_P0_SHIFT (BIT(0) | BIT(2)) +#define HSP_SEL_DP_ENC0_P0_SHIFT GENMASK(2, 1) +#define HSW_SEL_DP_ENC0_P0_SHIFT GENMASK(2, 0) +#define VSP_SEL_DP_ENC0_P0_SHIFT (BIT(3)) +#define VSW_SEL_DP_ENC0_P0_SHIFT (BIT(0) | BIT(3)) +#define VBID_AUDIO_MUTE_FLAG_SW_DP_ENC0_P0_MASK (BIT(11)) +#define VBID_AUDIO_MUTE_SW_DP_ENC0_P0_SHIFT (BIT(0) | BIT(1) |BIT(3))
drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +15
-0+#define VBID_AUDIO_MUTE_FLAG_SEL_DP_ENC0_P0_MASK (BIT(12)) +#define VBID_AUDIO_MUTE_SEL_DP_ENC0_P0_SHIFT GENMASK(3, 2) + +#define MTK_DP_ENC0_P0_3034 (ENC0_OFFSET + 0x34) + +#define MTK_DP_ENC0_P0_3038 (ENC0_OFFSET + 0x38) +#define VIDEO_SOURCE_SEL_DP_ENC0_P0_MASK (BIT(11)) +#define VIDEO_SOURCE_SEL_DP_ENC0_P0_SHIFT (BIT(0) | BIT(1) | BIT(3)) + +#define MTK_DP_ENC0_P0_303C (ENC0_OFFSET + 0x3C) +#define SRAM_START_READ_THRD_DP_ENC0_P0_MASK GENMASK(5, 0) +#define SRAM_START_READ_THRD_DP_ENC0_P0_SHIFT 0 +#define VIDEO_COLOR_DEPTH_DP_ENC0_P0_MASK GENMASK(10, 8) +#define VIDEO_COLOR_DEPTH_DP_ENC0_P0_SHIFT (BIT(3)) +#define
VIDEO_COLOR_DEPTH_DP_ENC0_P0_16BIT
\drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +2
-0+ (0 <<VIDEO_COLOR_DEPTH_DP_ENC0_P0_SHIFT ) +#define
VIDEO_COLOR_DEPTH_DP_ENC0_P0_12BIT
\drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +2
-0+ (1 <<VIDEO_COLOR_DEPTH_DP_ENC0_P0_SHIFT ) +#define
VIDEO_COLOR_DEPTH_DP_ENC0_P0_10BIT
\drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +2
-0+ (2 <<VIDEO_COLOR_DEPTH_DP_ENC0_P0_SHIFT ) +#define
VIDEO_COLOR_DEPTH_DP_ENC0_P0_8BIT
\drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +2
-0+ (3 <<VIDEO_COLOR_DEPTH_DP_ENC0_P0_SHIFT ) +#define
VIDEO_COLOR_DEPTH_DP_ENC0_P0_6BIT
\drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +4
-0+ (4 << VIDEO_COLOR_DEPTH_DP_ENC0_P0_SHIFT) +#define PIXEL_ENCODE_FORMAT_DP_ENC0_P0_MASK GENMASK(14, 12) +#define PIXEL_ENCODE_FORMAT_DP_ENC0_P0_SHIFT GENMASK(3, 2) +#define
PIXEL_ENCODE_FORMAT_DP_ENC0_P0_RGB
\drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +2
-0+ (0 <<PIXEL_ENCODE_FORMAT_DP_ENC0_P0_SHIFT ) +#define
PIXEL_ENCODE_FORMAT_DP_ENC0_P0_YCBCR422
\drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +2
-0+ (1 <<PIXEL_ENCODE_FORMAT_DP_ENC0_P0_SHIFT ) +#define
PIXEL_ENCODE_FORMAT_DP_ENC0_P0_YCBCR420
\drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +67
-0+ (2 << PIXEL_ENCODE_FORMAT_DP_ENC0_P0_SHIFT) +#define VIDEO_MN_GEN_EN_DP_ENC0_P0_MASK (BIT(15)) +#define VIDEO_MN_GEN_EN_DP_ENC0_P0_SHIFT GENMASK(3, 0) + +#define MTK_DP_ENC0_P0_3040 (ENC0_OFFSET + 0x40) +#define SDP_DOWN_CNT_INIT_DP_ENC0_P0_MASK GENMASK(11, 0) +#define SDP_DOWN_CNT_INIT_DP_ENC0_P0_SHIFT 0 + +#define MTK_DP_ENC0_P0_3044 (ENC0_OFFSET + 0x44) +#define VIDEO_N_CODE_0_DP_ENC0_P0_MASK GENMASK(15, 0) + +#define MTK_DP_ENC0_P0_3048 (ENC0_OFFSET + 0x48) +#define VIDEO_N_CODE_1_DP_ENC0_P0_MASK GENMASK(7, 0) + +#define MTK_DP_ENC0_P0_304C (ENC0_OFFSET + 0x4C) +#define VBID_VIDEO_MUTE_DP_ENC0_P0_MASK (BIT(2)) +#define SDP_VSYNC_RISING_MASK_DP_ENC0_P0_MASK (BIT(8)) + +#define MTK_DP_ENC0_P0_3050 (ENC0_OFFSET + 0x50) +#define VIDEO_N_CODE_MN_GEN_0_DP_ENC0_P0_MASK GENMASK(15, 0) + +#define MTK_DP_ENC0_P0_3054 (ENC0_OFFSET + 0x54) +#define VIDEO_N_CODE_MN_GEN_1_DP_ENC0_P0_MASK GENMASK(7, 0) + +#define MTK_DP_ENC0_P0_3064 (ENC0_OFFSET + 0x64) +#define HDE_NUM_LAST_DP_ENC0_P0_MASK GENMASK(15, 0) + +#define MTK_DP_ENC0_P0_3088 (ENC0_OFFSET + 0x88) +#define AU_EN_DP_ENC0_P0_MASK (BIT(6)) +#define AU_EN_DP_ENC0_P0_SHIFT GENMASK(2, 1) +#define AUDIO_8CH_EN_DP_ENC0_P0_MASK (BIT(7)) +#define AUDIO_8CH_SEL_DP_ENC0_P0_MASK (BIT(8)) +#define AUDIO_2CH_EN_DP_ENC0_P0_MASK (BIT(14)) +#define AUDIO_2CH_SEL_DP_ENC0_P0_MASK (BIT(15)) + +#define MTK_DP_ENC0_P0_308C (ENC0_OFFSET + 0x8C) +#define CH_STATUS_0_DP_ENC0_P0_MASK GENMASK(15, 0) + +#define MTK_DP_ENC0_P0_3090 (ENC0_OFFSET + 0x90) +#define CH_STATUS_1_DP_ENC0_P0_MASK GENMASK(15, 0) + +#define MTK_DP_ENC0_P0_3094 (ENC0_OFFSET + 0x94) +#define CH_STATUS_2_DP_ENC0_P0_MASK GENMASK(7, 0) + +#define MTK_DP_ENC0_P0_30A0 (ENC0_OFFSET + 0xA0) + +#define MTK_DP_ENC0_P0_30A4 (ENC0_OFFSET + 0xA4) +#define AU_TS_CFG_DP_ENC0_P0_MASK GENMASK(7, 0) + +#define MTK_DP_ENC0_P0_30A8 (ENC0_OFFSET + 0xA8) + +#define MTK_DP_ENC0_P0_30AC (ENC0_OFFSET + 0xAC) + +#define MTK_DP_ENC0_P0_30B0 (ENC0_OFFSET + 0xB0) + +#define MTK_DP_ENC0_P0_30B4 (ENC0_OFFSET + 0xB4) +#define ISRC_CFG_DP_ENC0_P0_MASK GENMASK(15, 8) +#define ISRC_CFG_DP_ENC0_P0_SHIFT (BIT(3)) + +#define MTK_DP_ENC0_P0_30B8 (ENC0_OFFSET + 0xB8) + +#define MTK_DP_ENC0_P0_30BC (ENC0_OFFSET + 0xBC) +#define ISRC_CONT_DP_ENC0_P0_MASK (BIT(0)) +#define ISRC_CONT_DP_ENC0_P0_SHIFT 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_SHIFT (BIT(3)) +#define
AUDIO_M_CODE_MULT_DIV_SEL_DP_ENC0_P0_MUL_2
\drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +2
-0+ (1 <<AUDIO_M_CODE_MULT_DIV_SEL_DP_ENC0_P0_SHIFT ) +#define
AUDIO_M_CODE_MULT_DIV_SEL_DP_ENC0_P0_MUL_4
\drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +2
-0+ (2 <<AUDIO_M_CODE_MULT_DIV_SEL_DP_ENC0_P0_SHIFT ) +#define2 lines not shown · raw message
drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +2
-0+ (3 <<AUDIO_M_CODE_MULT_DIV_SEL_DP_ENC0_P0_SHIFT ) +#define2 lines not shown · raw message
drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +2
-0+ (5 <<AUDIO_M_CODE_MULT_DIV_SEL_DP_ENC0_P0_SHIFT ) +#define2 lines not shown · raw message
drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +2
-0+ (6 <<AUDIO_M_CODE_MULT_DIV_SEL_DP_ENC0_P0_SHIFT ) +#define2 lines not shown · raw message
drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +114
-0+ (7 << AUDIO_M_CODE_MULT_DIV_SEL_DP_ENC0_P0_SHIFT) + +#define MTK_DP_ENC0_P0_30D8 (ENC0_OFFSET + 0xD8) + +#define MTK_DP_ENC0_P0_312C (ENC0_OFFSET + 0x12C) +#define ASP_HB2_DP_ENC0_P0_MASK GENMASK(7, 0) +#define ASP_HB3_DP_ENC0_P0_MASK GENMASK(15, 8) +#define ASP_HB3_DP_ENC0_P0_SHIFT (BIT(3)) + +#define MTK_DP_ENC0_P0_3130 (ENC0_OFFSET + 0x130) + +#define MTK_DP_ENC0_P0_3138 (ENC0_OFFSET + 0x138) + +#define MTK_DP_ENC0_P0_3154 (ENC0_OFFSET + 0x154) +#define PGEN_HTOTAL_DP_ENC0_P0_MASK GENMASK(13, 0) + +#define MTK_DP_ENC0_P0_3158 (ENC0_OFFSET + 0x158) +#define PGEN_HSYNC_RISING_DP_ENC0_P0_MASK GENMASK(13, 0) + +#define MTK_DP_ENC0_P0_315C (ENC0_OFFSET + 0x15C) +#define PGEN_HSYNC_PULSE_WIDTH_DP_ENC0_P0_MASK GENMASK(13, 0) + +#define MTK_DP_ENC0_P0_3160 (ENC0_OFFSET + 0x160) +#define PGEN_HFDE_START_DP_ENC0_P0_MASK GENMASK(13, 0) + +#define MTK_DP_ENC0_P0_3164 (ENC0_OFFSET + 0x164) +#define PGEN_HFDE_ACTIVE_WIDTH_DP_ENC0_P0_MASK GENMASK(13, 0) + +#define MTK_DP_ENC0_P0_3168 (ENC0_OFFSET + 0x168) +#define PGEN_VTOTAL_DP_ENC0_P0_MASK GENMASK(12, 0) + +#define MTK_DP_ENC0_P0_316C (ENC0_OFFSET + 0x16C) +#define PGEN_VSYNC_RISING_DP_ENC0_P0_MASK GENMASK(12, 0) + +#define MTK_DP_ENC0_P0_3170 (ENC0_OFFSET + 0x170) +#define PGEN_VSYNC_PULSE_WIDTH_DP_ENC0_P0_MASK GENMASK(12, 0) + +#define MTK_DP_ENC0_P0_3174 (ENC0_OFFSET + 0x174) +#define PGEN_VFDE_START_DP_ENC0_P0_MASK GENMASK(12, 0) + +#define MTK_DP_ENC0_P0_3178 (ENC0_OFFSET + 0x178) +#define PGEN_VFDE_ACTIVE_WIDTH_DP_ENC0_P0_MASK GENMASK(12, 0) + +#define MTK_DP_ENC0_P0_31B0 (ENC0_OFFSET + 0x1B0) +#define PGEN_PATTERN_SEL_SHIFT (BIT(2)) +#define PGEN_PATTERN_SEL_MASK GENMASK(6, 4) + +#define MTK_DP_ENC0_P0_31C8 (ENC0_OFFSET + 0x1C8) +#define VSC_EXT_VESA_HB0_DP_ENC0_P0_MASK GENMASK(7, 0) +#define VSC_EXT_VESA_HB1_DP_ENC0_P0_MASK GENMASK(15, 8) +#define VSC_EXT_VESA_HB1_DP_ENC0_P0_SHIFT (BIT(3)) + +#define MTK_DP_ENC0_P0_31CC (ENC0_OFFSET + 0x1CC) +#define VSC_EXT_VESA_HB2_DP_ENC0_P0_MASK GENMASK(7, 0) +#define VSC_EXT_VESA_HB2_DP_ENC0_P0_SHIFT 0 +#define VSC_EXT_VESA_HB3_DP_ENC0_P0_MASK GENMASK(15, 8) + +#define MTK_DP_ENC0_P0_31D0 (ENC0_OFFSET + 0x1D0) +#define VSC_EXT_CEA_HB0_DP_ENC0_P0_MASK GENMASK(7, 0) +#define VSC_EXT_CEA_HB1_DP_ENC0_P0_MASK GENMASK(15, 8) +#define VSC_EXT_CEA_HB1_DP_ENC0_P0_SHIFT (BIT(3)) + +#define MTK_DP_ENC0_P0_31D4 (ENC0_OFFSET + 0x1D4) +#define VSC_EXT_CEA_HB2_DP_ENC0_P0_MASK GENMASK(7, 0) +#define VSC_EXT_CEA_HB2_DP_ENC0_P0_SHIFT 0 +#define VSC_EXT_CEA_HB3_DP_ENC0_P0_MASK GENMASK(15, 8) + +#define MTK_DP_ENC0_P0_31D8 (ENC0_OFFSET + 0x1D8) +#define VSC_EXT_VESA_NUM_DP_ENC0_P0_MASK GENMASK(5, 0) +#define VSC_EXT_VESA_NUM_DP_ENC0_P0_SHIFT 0 +#define VSC_EXT_CEA_NUM_DP_ENC0_P0_MASK GENMASK(13, 8) +#define VSC_EXT_CEA_NUM_DP_ENC0_P0_SHIFT (BIT(3)) + +#define MTK_DP_ENC0_P0_31DC (ENC0_OFFSET + 0x1DC) +#define HDR0_CFG_DP_ENC0_P0_MASK GENMASK(7, 0) +#define HDR0_CFG_DP_ENC0_P0_SHIFT 0 + +#define MTK_DP_ENC0_P0_31E8 (ENC0_OFFSET + 0x1E8) + +#define MTK_DP_ENC0_P0_31EC (ENC0_OFFSET + 0x1EC) +#define AUDIO_CH_SRC_SEL_DP_ENC0_P0_MASK (BIT(4)) +#define AUDIO_CH_SRC_SEL_DP_ENC0_P0_SHIFT (BIT(2)) +#define ISRC1_HB3_DP_ENC0_P0_MASK GENMASK(15, 8) +#define ISRC1_HB3_DP_ENC0_P0_SHIFT (BIT(3)) + +#define MTK_DP_ENC1_P0_3200 (ENC1_OFFSET + 0x00) + +#define MTK_DP_ENC1_P0_3280 (ENC1_OFFSET + 0x80) +#define SDP_PACKET_TYPE_DP_ENC1_P0_MASK GENMASK(4, 0) +#define SDP_PACKET_W_DP_ENC1_P0 (BIT(5)) +#define SDP_PACKET_W_DP_ENC1_P0_MASK (BIT(5)) +#define SDP_PACKET_W_DP_ENC1_P0_SHIFT (BIT(0) | BIT(2)) + +#define MTK_DP_ENC1_P0_328C (ENC1_OFFSET + 0x8C) + +#define MTK_DP_ENC1_P0_3290 (ENC1_OFFSET + 0x90) + +#define MTK_DP_ENC1_P0_32A0 (ENC1_OFFSET + 0xA0) + +#define MTK_DP_ENC1_P0_32A4 (ENC1_OFFSET + 0xA4) + +#define MTK_DP_ENC1_P0_3300 (ENC1_OFFSET + 0x100) +#define VIDEO_AFIFO_RDY_SEL_DP_ENC1_P0_MASK GENMASK(9, 8) +#define VIDEO_AFIFO_RDY_SEL_DP_ENC1_P0_SHIFT (BIT(3)) + +#define MTK_DP_ENC1_P0_3304 (ENC1_OFFSET + 0x104) +#define AU_PRTY_REGEN_DP_ENC1_P0_MASK (BIT(8)) +#define AU_CH_STS_REGEN_DP_ENC1_P0_MASK (BIT(9)) +#define AUDIO_SAMPLE_PRSENT_REGEN_DP_ENC1_P0_MASK (BIT(12)) + +#define MTK_DP_ENC1_P0_3324 (ENC1_OFFSET + 0x124) +#define AUDIO_SOURCE_MUX_DP_ENC1_P0_MASK GENMASK(9, 8) +#define AUDIO_SOURCE_MUX_DP_ENC1_P0_SHIFT (BIT(3)) +#define2 lines not shown · raw message
drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +30
-0+ (0 << AUDIO_SOURCE_MUX_DP_ENC1_P0_SHIFT) + +#define MTK_DP_ENC1_P0_3364 (ENC1_OFFSET + 0x164) +#define SDP_DOWN_CNT_INIT_IN_HBLANK_DP_ENC1_P0_MASK GENMASK(11, 0) +#define SDP_DOWN_CNT_INIT_IN_HBLANK_DP_ENC1_P0_SHIFT 0 +#define FIFO_READ_START_POINT_DP_ENC1_P0_MASK GENMASK(15, 12) +#define FIFO_READ_START_POINT_DP_ENC1_P0_SHIFT GENMASK(3, 2) + +#define MTK_DP_ENC1_P0_3368 (ENC1_OFFSET + 0x168) +#define VIDEO_SRAM_FIFO_CNT_RESET_SEL_DP_ENC1_P0_SHIFT 0 +#define VIDEO_STABLE_CNT_THRD_DP_ENC1_P0_SHIFT (BIT(2)) +#define SDP_DP13_EN_DP_ENC1_P0_SHIFT (BIT(3)) +#define BS2BS_MODE_DP_ENC1_P0_MASK GENMASK(13, 12) +#define BS2BS_MODE_DP_ENC1_P0_SHIFT GENMASK(3, 2) + +#define MTK_DP_ENC1_P0_33F4 (ENC1_OFFSET + 0x1F4) + +#define MTK_DP_TRANS_P0_3400 (TRANS_OFFSET + 0) +#define PATTERN1_EN_DP_TRANS_P0_MASK (BIT(12)) +#define PATTERN1_EN_DP_TRANS_P0_SHIFT GENMASK(3, 2) +#define PATTERN2_EN_DP_TRANS_P0_MASK (BIT(13)) +#define PATTERN3_EN_DP_TRANS_P0_MASK (BIT(14)) +#define PATTERN4_EN_DP_TRANS_P0_MASK (BIT(15)) + +#define MTK_DP_TRANS_P0_3404 (TRANS_OFFSET + 0x4) +#define DP_SCR_EN_DP_TRANS_P0_MASK (BIT(0)) + +#define MTK_DP_TRANS_P0_340C (TRANS_OFFSET + 0xC) +#define DP_TX_TRANSMITTER_4P_RESET_SW_DP_TRANS_P0_MASK (BIT(13)) +#define DP_TX_TRANSMITTER_4P_RESET_SW_DP_TRANS_P0_SHIFT (BIT(0) |1 line not shown · raw message
drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +7
-0+ +#define MTK_DP_TRANS_P0_3410 (TRANS_OFFSET + 0x10) +#define HPD_DEB_THD_DP_TRANS_P0_MASK GENMASK(3, 0) +#define HPD_DEB_THD_DP_TRANS_P0_SHIFT 0 +#define HPD_INT_THD_DP_TRANS_P0_MASK GENMASK(7, 4) +#define HPD_INT_THD_DP_TRANS_P0_SHIFT (BIT(2)) +#define HPD_INT_THD_DP_TRANS_P0_LOWER_500US (2 <<4 lines not shown · raw message
drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +14
-0+ (2 << (HPD_INT_THD_DP_TRANS_P0_SHIFT + 2)) +#define HPD_DISC_THD_DP_TRANS_P0_MASK GENMASK(11, 8) +#define HPD_DISC_THD_DP_TRANS_P0_SHIFT (BIT(3)) +#define HPD_CONN_THD_DP_TRANS_P0_MASK GENMASK(15, 12) +#define HPD_CONN_THD_DP_TRANS_P0_SHIFT GENMASK(3, 2) + +#define MTK_DP_TRANS_P0_3414 (TRANS_OFFSET + 0x14) +#define HPD_DB_DP_TRANS_P0_MASK (BIT(2)) + +#define MTK_DP_TRANS_P0_3418 (TRANS_OFFSET + 0x18) +#define IRQ_CLR_DP_TRANS_P0_MASK GENMASK(3, 0) +#define IRQ_MASK_DP_TRANS_P0_MASK GENMASK(7, 4) +#define IRQ_MASK_DP_TRANS_P0_SHIFT (BIT(2)) +#define IRQ_MASK_DP_TRANS_P0_DISC_IRQ (BIT(1) <<5 lines not shown · raw message
drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +5
-0+#define IRQ_STATUS_DP_TRANS_P0_MASK GENMASK(15, 12) +#define IRQ_STATUS_DP_TRANS_P0_SHIFT GENMASK(3, 2) +Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
1 line not shown · raw message
drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +61
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
2 lines not shown · raw message
drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +20
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
1 line not shown · raw message
drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +32
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
1 line not shown · raw message
drivers/gpu/drm/mediatek/mtk_dp_reg.h new file +44
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
1 line not shown · raw message
The rest of this diff is not shown. View the raw message.
1 line not shown · raw message
Parts of this message are not shown here. View the raw message.
Re: [PATCH v9 18/22] drm/mediatek: Add mt8195 Embedded DisplayPort driver
Quoted 232 lines · Rex-BC Chen
Hello Guillaume,
Thanks for your patch.
I add some comments below:Quoted 111 lines · Guillaume Ranquet
From: Markus Schneider-Pargmann <[email protected]>
This patch adds a DisplayPort driver for the Mediatek mt8195 SoC.
It supports the mt8195, the embedded DisplayPort units. It offers DisplayPort 1.4 with up to 4 lanes.
The driver shares its iomap range with the mtk-dp-phy driver using the regmap/syscon facility.
This driver is based on an initial version by
Jason-JH.Lin <[email protected]>.Signed-off-by Markus Schneider-Pargmann <[email protected]>Signed-off-by Guillaume Ranquet <[email protected]>Reported-by kernel test robot <[email protected]>--- drivers/gpu/drm/mediatek/Kconfig | 8 + drivers/gpu/drm/mediatek/Makefile | 2 + drivers/gpu/drm/mediatek/mtk_dp.c | 2221 ++++++++++++++++++++++++ drivers/gpu/drm/mediatek/mtk_dp_reg.h | 568 ++++++ drivers/gpu/drm/mediatek/mtk_drm_drv.c | 1 + drivers/gpu/drm/mediatek/mtk_drm_drv.h | 1 + 6 files changed, 2801 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 +8
-0@@ -28,3 +28,11 @@ 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 PHY_MTK_DP + select DRM_DP_HELPER + help + DRM/KMS Display Port driver for Mediatek SoCs.drivers/gpu/drm/mediatek/Makefile +2
-0@@ -21,3 +21,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.odrivers/gpu/drm/mediatek/mtk_dp.c new file +47
-0@@ -0,0 +1,2221 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (c) 2019 MediaTek Inc. +* Copyright (c) 2021 BayLibre +*/ + +#include <drm/drm_atomic_helper.h> +#include <drm/drm_bridge.h> +#include <drm/drm_crtc.h> +#include <drm/dp/drm_dp_helper.h> +#include <drm/drm_edid.h> +#include <drm/drm_of.h> +#include <drm/drm_panel.h> +#include <drm/drm_print.h> +#include <drm/drm_probe_helper.h> +#include <linux/arm-smccc.h> +#include <linux/clk.h> +#include <linux/delay.h> +#include <linux/errno.h> +#include <linux/kernel.h> +#include <linux/mfd/syscon.h> +#include <linux/nvmem-consumer.h> +#include <linux/of.h> +#include <linux/of_irq.h> +#include <linux/of_platform.h> +#include <linux/phy/phy.h> +#include <linux/platform_device.h> +#include <linux/pm_runtime.h> +#include <linux/regmap.h> +#include <sound/hdmi-codec.h> +#include <video/videomode.h> + +#include "mtk_dp_reg.h" + +#define MTK_DP_AUX_WAIT_REPLY_COUNT 20 +#define MTK_DP_CHECK_SINK_CAP_TIMEOUT_COUNT 3 + +//TODO: platform/device data or dts? +#define MTK_DP_MAX_LANES 4 +#define MTK_DP_MAX_LINK_RATE MTK_DP_LINKRATE_HBR3 + +#define MTK_DP_TBC_BUF_READ_START_ADDR 0x08 + +#define MTK_DP_TRAIN_RETRY_LIMIT 8 +#define MTK_DP_TRAIN_MAX_ITERATIONS 5 + +#define MTK_DP_AUX_WRITE_READ_WAIT_TIME_US 20drivers/gpu/drm/mediatek/mtk_dp.c line 57
Quoted 10 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +10
-0+ +#define MTK_DP_DP_VERSION_11 0x11 + +enum mtk_dp_state { +MTK_DP_STATE_INITIAL , +MTK_DP_STATE_IDLE , +MTK_DP_STATE_PREPARE , +MTK_DP_STATE_NORMAL , +}; +snif...
Quoted 102 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +11
-0+ +static int mtk_dp_msa_bypass_disable (struct mtk_dp *mtk_dp) +{ +const u16 bits_to_set = +BIT (HTOTAL_SEL_DP_ENC0_P0_SHIFT ) | +BIT (VTOTAL_SEL_DP_ENC0_P0_SHIFT ) | +BIT (HSTART_SEL_DP_ENC0_P0_SHIFT ) | +BIT (VSTART_SEL_DP_ENC0_P0_SHIFT ) | +BIT (HWIDTH_SEL_DP_ENC0_P0_SHIFT ) | +BIT (VHEIGHT_SEL_DP_ENC0_P0_SHIFT ) | + BIT(HSP_SEL_DP_ENC0_P0_SHIFT) |
BIT(HSW_SEL_DP_ENC0_P0_SHIFT)|drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+ BIT(VSP_SEL_DP_ENC0_P0_SHIFT) |
BIT(VSW_SEL_DP_ENC0_P0_SHIFT);drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+ return mtk_dp_update_bits(mtk_dp, MTK_DP_ENC0_P0_3030,
bits_to_set,drivers/gpu/drm/mediatek/mtk_dp.c new file +16
-0+ bits_to_set); +} + +#define MTK_UPD_BITS_OR_OUT (mtk_dp, offset, val, mask, ret, label) \ + do {\ + ret = mtk_dp_update_bits(mtk_dp, offset, val, mask); \ + if (ret) \ + goto label; \ + } while (0) + +static int mtk_dp_set_msa (struct mtk_dp *mtk_dp) +{ +int ret; +struct mtk_dp_timings *timings = &mtk_dp->info.timings; + + MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_ENC0_P0_3010, timings-Quoted 1 line
htotal,
drivers/gpu/drm/mediatek/mtk_dp.c new file +3
-0+ HTOTAL_SW_DP_ENC0_P0_MASK, ret, out); + MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_ENC0_P0_3018, + timings->vm.hsync_len + timings-Quoted 1 line
vm.hback_porch,
drivers/gpu/drm/mediatek/mtk_dp.c new file +3
-0+ HSTART_SW_DP_ENC0_P0_MASK, ret, out); + MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_ENC0_P0_3028, + timings->vm.hsync_len <<
HSW_SW_DP_ENC0_P0_SHIFT,drivers/gpu/drm/mediatek/mtk_dp.c new file +4
-0+ HSW_SW_DP_ENC0_P0_MASK, ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_ENC0_P0_3028 ,0 , +HSP_SW_DP_ENC0_P0_MASK , ret, out); + MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_ENC0_P0_3020, timings-Quoted 1 line
vm.hactive,
drivers/gpu/drm/mediatek/mtk_dp.c new file +2
-0+ HWIDTH_SW_DP_ENC0_P0_MASK, ret, out); + MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_ENC0_P0_3014, timings-Quoted 1 line
vtotal,
drivers/gpu/drm/mediatek/mtk_dp.c new file +3
-0+ VTOTAL_SW_DP_ENC0_P0_MASK, ret, out); + MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_ENC0_P0_301C, + timings->vm.vsync_len + timings-Quoted 1 line
vm.vback_porch,
drivers/gpu/drm/mediatek/mtk_dp.c new file +3
-0+ VSTART_SW_DP_ENC0_P0_MASK, ret, out); + MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_ENC0_P0_302C, + timings->vm.vsync_len <<
VSW_SW_DP_ENC0_P0_SHIFT,drivers/gpu/drm/mediatek/mtk_dp.c new file +4
-0+ VSW_SW_DP_ENC0_P0_MASK, ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_ENC0_P0_302C ,0 , +VSP_SW_DP_ENC0_P0_MASK , ret, out); + MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_ENC0_P0_3024, timings-Quoted 1 line
vm.vactive,
drivers/gpu/drm/mediatek/mtk_dp.c new file +2
-0+ VHEIGHT_SW_DP_ENC0_P0_MASK, ret, out); + MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_ENC0_P0_3064, timings-Quoted 1 line
vm.hactive,
drivers/gpu/drm/mediatek/mtk_dp.c new file +2
-0+ HDE_NUM_LAST_DP_ENC0_P0_MASK, ret, out); + MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_ENC0_P0_3154, timings-Quoted 1 line
htotal,
drivers/gpu/drm/mediatek/mtk_dp.c new file +4
-0+ PGEN_HTOTAL_DP_ENC0_P0_MASK, ret, out); + MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_ENC0_P0_3158, + timings->vm.hfront_porch, + PGEN_HSYNC_RISING_DP_ENC0_P0_MASK, ret,out);
drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+ MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_ENC0_P0_315C, timings-Quoted 1 line
vm.hsync_len,
drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+ PGEN_HSYNC_PULSE_WIDTH_DP_ENC0_P0_MASK,ret, out);
drivers/gpu/drm/mediatek/mtk_dp.c new file +2
-0+ MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_ENC0_P0_3160, + timings->vm.hback_porch + timings-Quoted 1 line
vm.hsync_len,
drivers/gpu/drm/mediatek/mtk_dp.c new file +2
-0+ PGEN_HFDE_START_DP_ENC0_P0_MASK, ret, out); + MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_ENC0_P0_3164, timings-Quoted 1 line
vm.hactive,
drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+ PGEN_HFDE_ACTIVE_WIDTH_DP_ENC0_P0_MASK,ret, out);
drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+ MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_ENC0_P0_3168, timings-Quoted 1 line
vtotal,
drivers/gpu/drm/mediatek/mtk_dp.c new file +4
-0+ PGEN_VTOTAL_DP_ENC0_P0_MASK, ret, out); + MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_ENC0_P0_316C, + timings->vm.vfront_porch, + PGEN_VSYNC_RISING_DP_ENC0_P0_MASK, ret,out);
drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+ MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_ENC0_P0_3170, timings-Quoted 1 line
vm.vsync_len,
drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+ PGEN_VSYNC_PULSE_WIDTH_DP_ENC0_P0_MASK,ret, out);
drivers/gpu/drm/mediatek/mtk_dp.c new file +2
-0+ MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_ENC0_P0_3174, + timings->vm.vback_porch + timings-Quoted 1 line
vm.vsync_len,
drivers/gpu/drm/mediatek/mtk_dp.c new file +2
-0+ PGEN_VFDE_START_DP_ENC0_P0_MASK, ret, out); + MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_ENC0_P0_3178, timings-Quoted 1 line
vm.vactive,
Quoted 12 lines
drivers/gpu/drm/mediatek/mtk_dp.c
Quoted 4 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+ PGEN_VFDE_ACTIVE_WIDTH_DP_ENC0_P0_MASK,ret, out);
drivers/gpu/drm/mediatek/mtk_dp.c new file +2
-0+ +out:Just like Angelo's comments.
I think we can remove this macro.
IMO, I think we don't need to go to out.
The failure is caused by update registers fail, and there are error message inmtk_dp_update_bits().
I think we can or all ret value and check them in last of this funtion.
Yes, that macro was not a great idea.
Quoted 12 lines
Quoted 12 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +5
-0+return ret; +} + +static int mtk_dp_set_color_format (struct mtk_dp *mtk_dp, + enum mtk_dp_color_format
color_format)drivers/gpu/drm/mediatek/mtk_dp.c new file +6
-0+{ +u32 val; +int ret; + + mtk_dp->info.format = color_format; +
Quoted 9 lines
drivers/gpu/drm/mediatek/mtk_dp.c line 350
Quoted 5 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +3
-0+/* Update MISC0 */ + ret = mtk_dp_update_bits(mtk_dp, MTK_DP_ENC0_P0_3034, + color_format <<
DP_TEST_COLOR_FORMAT_SHIFT,drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+ DP_TEST_COLOR_FORMAT_MASK);maybe the same indention with "
color_format<<DP_TEST_COLOR_FORMAT_SHIFT," here?
I'll fix the indentation here.
Quoted 342 lines
Quoted 41 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +16
-0+ +if (ret) +return ret; + +switch (color_format) { +case MTK_DP_COLOR_FORMAT_YUV_422 : + val =PIXEL_ENCODE_FORMAT_DP_ENC0_P0_YCBCR422 ; +break ; +case MTK_DP_COLOR_FORMAT_YUV_420 : + val =PIXEL_ENCODE_FORMAT_DP_ENC0_P0_YCBCR420 ; +break ; +case MTK_DP_COLOR_FORMAT_YONLY : +case MTK_DP_COLOR_FORMAT_RAW : +case MTK_DP_COLOR_FORMAT_RESERVED : +case MTK_DP_COLOR_FORMAT_UNKNOWN : + drm_warn(mtk_dp->drm_dev, "Unsupported color format:%d\n",
drivers/gpu/drm/mediatek/mtk_dp.c new file +23
-0+ color_format); + fallthrough; +case MTK_DP_COLOR_FORMAT_RGB_444 : +case MTK_DP_COLOR_FORMAT_YUV_444 : + val =PIXEL_ENCODE_FORMAT_DP_ENC0_P0_RGB ; +break ; + } + +return mtk_dp_update_bits (mtk_dp,MTK_DP_ENC0_P0_303C , val, +PIXEL_ENCODE_FORMAT_DP_ENC0_P0_MASK ); +} + +static int mtk_dp_set_color_depth (struct mtk_dp *mtk_dp, +enum mtk_dp_color_depth color_depth) +{ +int ret; +u32 val; + + mtk_dp->info.depth = color_depth; + +/* Update MISC0 */ + ret = mtk_dp_update_bits(mtk_dp, MTK_DP_ENC0_P0_3034, + color_depth <<
DP_TEST_BIT_DEPTH_SHIFT,drivers/gpu/drm/mediatek/mtk_dp.c line 390
Quoted 1 line
drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+ DP_TEST_BIT_DEPTH_MASK);ditto
Quoted 72 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +22
-0+ +if (ret) +return ret; + +switch (color_depth) { +case MTK_DP_COLOR_DEPTH_6BIT : + val =VIDEO_COLOR_DEPTH_DP_ENC0_P0_6BIT ; +break ; +case MTK_DP_COLOR_DEPTH_8BIT : + val =VIDEO_COLOR_DEPTH_DP_ENC0_P0_8BIT ; +break ; +case MTK_DP_COLOR_DEPTH_10BIT : + val =VIDEO_COLOR_DEPTH_DP_ENC0_P0_10BIT ; +break ; +case MTK_DP_COLOR_DEPTH_12BIT : + val =VIDEO_COLOR_DEPTH_DP_ENC0_P0_12BIT ; +break ; +case MTK_DP_COLOR_DEPTH_16BIT : + val =VIDEO_COLOR_DEPTH_DP_ENC0_P0_16BIT ; +break ; +case MTK_DP_COLOR_DEPTH_UNKNOWN : + drm_warn(mtk_dp->drm_dev, "Unsupported color depth%d\n",
drivers/gpu/drm/mediatek/mtk_dp.c new file +15
-0+ color_depth); +return -EINVAL ; + } + +return mtk_dp_update_bits (mtk_dp,MTK_DP_ENC0_P0_303C , val, +VIDEO_COLOR_DEPTH_DP_ENC0_P0_MASK ); +} + +static int mtk_dp_mn_overwrite_disable (struct mtk_dp *mtk_dp) +{ +return mtk_dp_update_bits (mtk_dp,MTK_DP_ENC0_P0_3004 ,0 , +VIDEO_M_CODE_SEL_DP_ENC0_P0_MASK ); +} + +static int mtk_dp_set_sram_read_start(struct mtk_dp *mtk_dp, u32val)
drivers/gpu/drm/mediatek/mtk_dp.c new file +3
-0+{ + return mtk_dp_update_bits(mtk_dp, MTK_DP_ENC0_P0_303C, + val <<
SRAM_START_READ_THRD_DP_ENC0_P0_SHIFT,drivers/gpu/drm/mediatek/mtk_dp.c new file +15
-0+ SRAM_START_READ_THRD_DP_ENC0_P0_MASK); +} + +static int mtk_dp_setup_encoder (struct mtk_dp *mtk_dp) +{ +int ret; + +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_ENC0_P0_303C , +BIT (VIDEO_MN_GEN_EN_DP_ENC0_P0_SHIFT ), +VIDEO_MN_GEN_EN_DP_ENC0_P0_MASK , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_ENC0_P0_3040 , +0x20 <<SDP_DOWN_CNT_INIT_DP_ENC0_P0_SHIFT , +SDP_DOWN_CNT_INIT_DP_ENC0_P0_MASK , ret, out); + MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_ENC1_P0_3364, + 0x20 <<
SDP_DOWN_CNT_INIT_IN_HBLANK_DP_ENC1_P0_SHIFT,drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+ SDP_DOWN_CNT_INIT_IN_HBLANK_DP_ENC1_P0_MASK,ret, out);
drivers/gpu/drm/mediatek/mtk_dp.c new file +5
-0+MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_ENC1_P0_3300 , +2 <<VIDEO_AFIFO_RDY_SEL_DP_ENC1_P0_SHIFT , +VIDEO_AFIFO_RDY_SEL_DP_ENC1_P0_MASK , ret, out); + MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_ENC1_P0_3364, + 4 <<
FIFO_READ_START_POINT_DP_ENC1_P0_SHIFT,drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+ FIFO_READ_START_POINT_DP_ENC1_P0_MASK, ret,out);
drivers/gpu/drm/mediatek/mtk_dp.c new file +2
-0+ ret = mtk_dp_write(mtk_dp, MTK_DP_ENC1_P0_3368, + 1 <<
VIDEO_SRAM_FIFO_CNT_RESET_SEL_DP_ENC1_P0_SHIFT|drivers/gpu/drm/mediatek/mtk_dp.c line 457
Quoted 3 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +3
-0+1 <<VIDEO_STABLE_CNT_THRD_DP_ENC1_P0_SHIFT | +BIT (SDP_DP13_EN_DP_ENC1_P0_SHIFT ) | + 1 << BS2BS_MODE_DP_ENC1_P0_SHIFT);ditto
Quoted 192 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +11
-0+ +out: +return ret; +} + +static int mtk_dp_pg_disable (struct mtk_dp *mtk_dp) +{ +int ret; + + MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_ENC0_P0_3038, 0, + VIDEO_SOURCE_SEL_DP_ENC0_P0_MASK, ret,out);
drivers/gpu/drm/mediatek/mtk_dp.c new file +2
-0+ MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_ENC0_P0_31B0, + 4 << PGEN_PATTERN_SEL_SHIFT,
PGEN_PATTERN_SEL_MASK, ret, out);drivers/gpu/drm/mediatek/mtk_dp.c new file +19
-0+ +out: +return ret; +} + +static bool mtk_dp_plug_state (struct mtk_dp *mtk_dp) +{ +return !!(mtk_dp_read (mtk_dp,MTK_DP_TRANS_P0_3414 ) & +HPD_DB_DP_TRANS_P0_MASK ); +} + +static void mtk_dp_aux_irq_clear (struct mtk_dp *mtk_dp) +{ +mtk_dp_write (mtk_dp,MTK_DP_AUX_P0_3640 , +BIT (AUX_400US_TIMEOUT_IRQ_AUX_TX_P0_SHIFT ) | +BIT (AUX_RX_DATA_RECV_IRQ_AUX_TX_P0_SHIFT ) | +BIT (AUX_RX_ADDR_RECV_IRQ_AUX_TX_P0_SHIFT ) | +BIT (AUX_RX_CMD_RECV_IRQ_AUX_TX_P0_SHIFT ) | + BIT(AUX_RX_MCCS_RECV_COMPLETE_IRQ_AUX_TX_P0_SHIFT)|
drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+BIT (AUX_RX_EDID_RECV_COMPLETE_IRQ_AUX_TX_P0_SHIFT )|
drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+ BIT(AUX_RX_AUX_RECV_COMPLETE_IRQ_AUX_TX_P0_SHIFT));
drivers/gpu/drm/mediatek/mtk_dp.c new file +3
-0+} + +static int mtk_dp_aux_set_cmd(struct mtk_dp *mtk_dp, u8 cmd, u32addr)
drivers/gpu/drm/mediatek/mtk_dp.c new file +5
-0+{ +int ret; + + MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_AUX_P0_3644, cmd, + MCU_REQUEST_COMMAND_AUX_TX_P0_MASK, ret,out);
drivers/gpu/drm/mediatek/mtk_dp.c new file +2
-0+ MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_AUX_P0_3648, addr, + MCU_REQUEST_ADDRESS_LSB_AUX_TX_P0_MASK,ret, out);
drivers/gpu/drm/mediatek/mtk_dp.c new file +2
-0+ MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_AUX_P0_364C, addr >> 16, + MCU_REQUEST_ADDRESS_MSB_AUX_TX_P0_MASK,ret, out);
drivers/gpu/drm/mediatek/mtk_dp.c new file +22
-0+ +out: +return ret; +} + +static int mtk_dp_aux_cmd_complete (struct mtk_dp *mtk_dp) +{ +return mtk_dp_update_bits (mtk_dp,MTK_DP_AUX_P0_3650 , +BIT (MCU_ACK_TRAN_COMPLETE_AUX_TX_P0_SHIFT ), +MCU_ACK_TRAN_COMPLETE_AUX_TX_P0_MASK | +PHY_FIFO_RST_AUX_TX_P0_MASK | +MCU_REQ_DATA_NUM_AUX_TX_P0_MASK ); +} + +static int mtk_dp_aux_request_ready (struct mtk_dp *mtk_dp) +{ +return mtk_dp_update_bits (mtk_dp,MTK_DP_AUX_P0_3630 , +BIT (AUX_TX_REQUEST_READY_AUX_TX_P0_SHIFT ), +AUX_TX_REQUEST_READY_AUX_TX_P0_MASK ); +} + +static void mtk_dp_aux_fill_write_fifo(struct mtk_dp *mtk_dp, u8*buf,
drivers/gpu/drm/mediatek/mtk_dp.c new file +3
-0+ size_t length) +{ + mtk_dp_bulk_16bit_write(mtk_dp, MTK_DP_AUX_P0_3708, buf,length);
drivers/gpu/drm/mediatek/mtk_dp.c new file +14
-0+} + +static int mtk_dp_aux_read_rx_fifo (struct mtk_dp *mtk_dp,u8 *buf, +size_t length,int read_delay) +{ +int ret; +int read_pos; + +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_AUX_P0_3620 ,0 , +AUX_RD_MODE_AUX_TX_P0_MASK , ret, out); + +for (read_pos =0 ; read_pos < length; read_pos++) { + MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_AUX_P0_3620, + BIT(AUX_RX_FIFO_R_PULSE_TX_P0_SHIFT),
drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+ AUX_RX_FIFO_READ_PULSE_TX_P0_MASK,ret, out);
drivers/gpu/drm/mediatek/mtk_dp.c new file +5
-0+usleep_range (read_delay, read_delay *2 ); + buf[read_pos] = + (u8)(mtk_dp_read (mtk_dp,MTK_DP_AUX_P0_3620 ) & +AUX_RX_FIFO_READ_DATA_AUX_TX_P0_MASK >> + AUX_RX_FIFO_READ_DATA_AUX_TX_P0_SHIFT);
drivers/gpu/drm/mediatek/mtk_dp.c new file +7
-0+ } + +out: +return ret; +} + +static int mtk_dp_aux_set_length(struct mtk_dp *mtk_dp, size_tlength)
drivers/gpu/drm/mediatek/mtk_dp.c new file +7
-0+{ +int ret; + +if (length >0 ) { + MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_AUX_P0_3650, + (length - 1) + <<
MCU_REQ_DATA_NUM_AUX_TX_P0_SHIFT,drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+ MCU_REQ_DATA_NUM_AUX_TX_P0_MASK,ret, out);
drivers/gpu/drm/mediatek/mtk_dp.c new file +4
-0+ MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_AUX_P0_362C, 0, + AUX_NO_LENGTH_AUX_TX_P0_MASK | + AUX_TX_AUXTX_OV_EN_AUX_TX_P0_MASK | + AUX_RESERVED_RW_0_AUX_TX_P0_MASK,ret, out);
drivers/gpu/drm/mediatek/mtk_dp.c new file +6
-0+ }else { + MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_AUX_P0_362C, + BIT(AUX_NO_LENGTH_AUX_TX_P0_SHIFT), + AUX_NO_LENGTH_AUX_TX_P0_MASK | + AUX_TX_AUXTX_OV_EN_AUX_TX_P0_MASK | + AUX_RESERVED_RW_0_AUX_TX_P0_MASK,ret, out);
drivers/gpu/drm/mediatek/mtk_dp.c new file +7
-0+ } + +out: +return ret; +} + +static int mtk_dp_aux_wait_for_completion(struct mtk_dp *mtk_dp,bool
is_read)drivers/gpu/drm/mediatek/mtk_dp.c new file +8
-0+{ +int wait_reply =MTK_DP_AUX_WAIT_REPLY_COUNT ; + +while (--wait_reply) { +u32 aux_irq_status; + +if (is_read) { + u32 fifo_status = mtk_dp_read(mtk_dp,
MTK_DP_AUX_P0_3618);drivers/gpu/drm/mediatek/mtk_dp.c new file +9
-0+ +if (fifo_status & + (AUX_RX_FIFO_WRITE_POINTER_AUX_TX_P0_MASK | +AUX_RX_FIFO_FULL_AUX_TX_P0_MASK )) { +return 0 ; + } + } + + aux_irq_status = mtk_dp_read(mtk_dp,
MTK_DP_AUX_P0_3640);drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+ if (aux_irq_status &
AUX_RX_RECV_COMPLETE_IRQ_TX_P0_MASK)drivers/gpu/drm/mediatek/mtk_dp.c new file +3
-0+return 0 ; + + if (aux_irq_status &
AUX_400US_TIMEOUT_IRQ_AUX_TX_P0_MASK)drivers/gpu/drm/mediatek/mtk_dp.c new file +9
-0+return -ETIMEDOUT ; + +usleep_range (100 ,500 ); + } + +return -ETIMEDOUT ; +} + +static int mtk_dp_aux_do_transfer(struct mtk_dp *mtk_dp, bool
is_read, u8 cmd,drivers/gpu/drm/mediatek/mtk_dp.c new file +12
-0+ u32 addr, u8 *buf, size_t length) +{ + int ret; +u32 reply_cmd; + +if (is_read && (length >DP_AUX_MAX_PAYLOAD_BYTES || + (cmd ==DP_AUX_NATIVE_READ && !length))) +return -EINVAL ; + + if (!is_read) { + ret = mtk_dp_update_bits(mtk_dp, MTK_DP_AUX_P0_3704, + BIT(AUX_TX_FIFO_NEW_MODE_EN_AU
X_TX_P0_SHIFT),drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+AUX_TX_FIFO_NEW_MODE_EN_AUX_TX_P0_MA Quoted 1 line
SK);
BIT(AUX_TX_FIFO_NEW_MODE_EN_AUX_TX_P0_SHIFT)is very strange.. (#defineAUX_TX_FIFO_NEW_MODE_EN_AUX_TX_P0_SHIFT(BIT(1)))Quoted 23 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +16
-0+ +if (ret) +return ret; + } + +mtk_dp_aux_cmd_complete (mtk_dp); +mtk_dp_aux_irq_clear (mtk_dp); +usleep_range (MTK_DP_AUX_WRITE_READ_WAIT_TIME_US , +MTK_DP_AUX_WRITE_READ_WAIT_TIME_US *2 ); + +mtk_dp_aux_set_cmd (mtk_dp, cmd, addr); +mtk_dp_aux_set_length (mtk_dp, length); + +if (!is_read) { +if (length) + mtk_dp_aux_fill_write_fifo(mtk_dp, buf,length);
drivers/gpu/drm/mediatek/mtk_dp.c new file +3
-0+ + ret =mtk_dp_update_bits (mtk_dp,MTK_DP_AUX_P0_3704 , + AUX_TX_FIFO_WRITE_DATA_NEW_MOD
E_TOGGLE_AUX_TX_P0_MASK,drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+AUX_TX_FIFO_WRITE_DATA_NEW_MODE_TOGG
LE_AUX_TX_P0_MASK);
Quoted 9 lines
drivers/gpu/drm/mediatek/mtk_dp.c line 209
Quoted 4 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +4
-0+ +if (ret) +return ret; + }is this the same with previous if (!is_read) ?
If yes, maybe we can
extract them..
I plan to simplify this function as much as possible. As previsouly stated, this can use drm_dp_dpcd_read/write()
Quoted 79 lines
Quoted 79 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +10
-0+ +mtk_dp_aux_request_ready (mtk_dp); + + ret =mtk_dp_aux_wait_for_completion (mtk_dp, is_read); + + reply_cmd =mtk_dp_read (mtk_dp,MTK_DP_AUX_P0_3624 ) & +AUX_RX_REPLY_COMMAND_AUX_TX_P0_MASK ; + +if (ret || reply_cmd) { + u32 phy_status = mtk_dp_read(mtk_dp,
MTK_DP_AUX_P0_3628) &drivers/gpu/drm/mediatek/mtk_dp.c new file +34
-0+AUX_RX_PHY_STATE_AUX_TX_P0_MASK ; +if (phy_status !=AUX_RX_PHY_STATE_AUX_TX_P0_RX_IDLE ) { +drm_err (mtk_dp->drm_dev, +"AUX Rx Aux hang, need SW reset\n" ); +return -EIO ; + } + +mtk_dp_aux_cmd_complete (mtk_dp); +mtk_dp_aux_irq_clear (mtk_dp); + +usleep_range (MTK_DP_AUX_WRITE_READ_WAIT_TIME_US , +MTK_DP_AUX_WRITE_READ_WAIT_TIME_US *2 ); +return -ETIMEDOUT ; + } + +if (!length) { + ret =mtk_dp_update_bits (mtk_dp,MTK_DP_AUX_P0_362C ,0 , +AUX_NO_LENGTH_AUX_TX_P0_MASK | +AUX_TX_AUXTX_OV_EN_AUX_TX_P0_MASK | +AUX_RESERVED_RW_0_AUX_TX_P0_MASK ); + +if (ret) +return ret; + + }else if (is_read) { +int read_delay; + +if (cmd == (DP_AUX_I2C_READ |DP_AUX_I2C_MOT ) || + cmd ==DP_AUX_I2C_READ ) + read_delay =500 ; +else + read_delay =100 ; + + mtk_dp_aux_read_rx_fifo(mtk_dp, buf, length,
read_delay);drivers/gpu/drm/mediatek/mtk_dp.c new file +11
-0+ } + +mtk_dp_aux_cmd_complete (mtk_dp); +mtk_dp_aux_irq_clear (mtk_dp); +usleep_range (MTK_DP_AUX_WRITE_READ_WAIT_TIME_US , +MTK_DP_AUX_WRITE_READ_WAIT_TIME_US *2 ); + +return 0 ; +} + +static bool mtk_dp_set_swing_pre_emphasis(struct mtk_dp *mtk_dp, int
lane_num,drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+int swing_val, intpreemphasis)
drivers/gpu/drm/mediatek/mtk_dp.c new file +14
-0+{ +int ret; + +u32 lane_shift = lane_num *DP_TX1_VOLT_SWING_SHIFT ; + +if (lane_num <0 || lane_num >3 ) +return false; + +dev_dbg (mtk_dp->dev, +"link training swing_val= 0x%x, preemphasis = 0x%x\n" , + swing_val, preemphasis); + + MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_TOP_SWING_EMP, + swing_val << (DP_TX0_VOLT_SWING_SHIFT +
lane_shift),drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+ DP_TX0_VOLT_SWING_MASK << lane_shift, ret,out);
drivers/gpu/drm/mediatek/mtk_dp.c new file +2
-0+ MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_TOP_SWING_EMP, + preemphasis << (DP_TX0_PRE_EMPH_SHIFT +
Quoted 8 lines
drivers/gpu/drm/mediatek/mtk_dp.c line 724
Quoted 6 lines
lane_shift),drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+ DP_TX0_PRE_EMPH_MASK << lane_shift, ret,out);
drivers/gpu/drm/mediatek/mtk_dp.c new file +3
-0+ +out: +return !ret;why return !ret?
unsure... this return value is unused in the callee anyway... I should have better error management in v10.
Quoted 25 lines
Quoted 25 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +6
-0+} + +static int mtk_dp_reset_swing_pre_emphasis (struct mtk_dp *mtk_dp) +{ + return mtk_dp_update_bits(mtk_dp, MTK_DP_TOP_SWING_EMP, 0, + DP_TX0_VOLT_SWING_MASK |
DP_TX1_VOLT_SWING_MASK|drivers/gpu/drm/mediatek/mtk_dp.c new file +3
-0+DP_TX2_VOLT_SWING_MASK | +DP_TX3_VOLT_SWING_MASK | +DP_TX0_PRE_EMPH_MASK |DP_TX1_PRE_EMPH_MASK |
drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+ DP_TX2_PRE_EMPH_MASK |
DP_TX3_PRE_EMPH_MASK);drivers/gpu/drm/mediatek/mtk_dp.c new file +11
-0+} + +static int mtk_dp_fec_enable (struct mtk_dp *mtk_dp,bool enable) +{ +return mtk_dp_update_bits (mtk_dp,MTK_DP_TRANS_P0_3540 , + enable ?BIT (FEC_EN_DP_TRANS_P0_SHIFT ) :0 , +FEC_EN_DP_TRANS_P0_MASK ); +} + +static int mtk_dp_hwirq_enable (struct mtk_dp *mtk_dp,bool enable) +{
Quoted 8 lines
drivers/gpu/drm/mediatek/mtk_dp.c line 751
Quoted 6 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +6
-0+u32 val =0 ; + +if (!enable) + val =IRQ_MASK_DP_TRANS_P0_DISC_IRQ | +IRQ_MASK_DP_TRANS_P0_CONN_IRQ | +IRQ_MASK_DP_TRANS_P0_INT_IRQ ;I think val = enable ? ... : 0
Yes, this can be simplified :)
Quoted 50 lines
Quoted 50 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +14
-0+return mtk_dp_update_bits (mtk_dp,MTK_DP_TRANS_P0_3418 , val, +IRQ_MASK_DP_TRANS_P0_MASK ); +} + +static int mtk_dp_initialize_settings (struct mtk_dp *mtk_dp) +{ +int ret; + +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_TRANS_P0_342C , +XTAL_FREQ_DP_TRANS_P0_DEFAULT , +XTAL_FREQ_DP_TRANS_P0_MASK , ret, out); + MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_TRANS_P0_3540, + BIT(FEC_CLOCK_EN_MODE_DP_TRANS_P0_SHIFT), + FEC_CLOCK_EN_MODE_DP_TRANS_P0_MASK, ret,out);
drivers/gpu/drm/mediatek/mtk_dp.c new file +5
-0+MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_ENC0_P0_31EC , +BIT (AUDIO_CH_SRC_SEL_DP_ENC0_P0_SHIFT ), +AUDIO_CH_SRC_SEL_DP_ENC0_P0_MASK , ret, out); + MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_ENC0_P0_304C, 0, + SDP_VSYNC_RISING_MASK_DP_ENC0_P0_MASK, ret,out);
drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+ MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_TOP_IRQ_MASK,
IRQ_MASK_AUX_TOP_IRQ,drivers/gpu/drm/mediatek/mtk_dp.c new file +7
-0+ IRQ_MASK_AUX_TOP_IRQ, ret, out); + +out: +return ret; +} + +static void mtk_dp_initialize_hpd_detect_settings(struct mtk_dp
*mtk_dp)drivers/gpu/drm/mediatek/mtk_dp.c new file +16
-0+{ +// Debounce threshold +mtk_dp_update_bits (mtk_dp,MTK_DP_TRANS_P0_3410 , +8 <<HPD_DEB_THD_DP_TRANS_P0_SHIFT , +HPD_DEB_THD_DP_TRANS_P0_MASK ); +mtk_dp_update_bits (mtk_dp,MTK_DP_TRANS_P0_3410 , + (HPD_INT_THD_DP_TRANS_P0_LOWER_500US | +HPD_INT_THD_DP_TRANS_P0_UPPER_1100US ) + <<HPD_INT_THD_DP_TRANS_P0_SHIFT , +HPD_INT_THD_DP_TRANS_P0_MASK ); + +// Connect threshold 1.5ms + 5 x 0.1ms = 2ms +// Disconnect threshold 1.5ms + 5 x 0.1ms = 2ms + mtk_dp_update_bits(mtk_dp, MTK_DP_TRANS_P0_3410, + (5 << HPD_DISC_THD_DP_TRANS_P0_SHIFT) | + (5 <<
HPD_CONN_THD_DP_TRANS_P0_SHIFT),drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+ HPD_DISC_THD_DP_TRANS_P0_MASK |
Quoted 9 lines
drivers/gpu/drm/mediatek/mtk_dp.c line 799
Quoted 4 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +4
-0+ HPD_CONN_THD_DP_TRANS_P0_MASK); +mtk_dp_update_bits (mtk_dp,MTK_DP_TRANS_P0_3430 , +HPD_INT_THD_ECO_DP_TRANS_P0_HIGH_BOUND_EXT , +HPD_INT_THD_ECO_DP_TRANS_P0_MASK );this function is not control if !ret,
maybe we should let all functions of setting register follow the same rule?
v10 should have proper error handling throughout all the functions.
Quoted 94 lines
Quoted 94 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +14
-0+} + +static int mtk_dp_initialize_aux_settings (struct mtk_dp *mtk_dp) +{ +int ret; + +/* modify timeout threshold = 1595 [12 : 8] */ +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_AUX_P0_360C ,0x1595 , +AUX_TIMEOUT_THR_AUX_TX_P0_MASK , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_AUX_P0_3658 ,0 , +AUX_TX_OV_EN_AUX_TX_P0_MASK , ret, out); +/* 25 for 26M */ + MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_AUX_P0_3634, + 25 <<
AUX_TX_OVER_SAMPLE_RATE_AUX_TX_P0_SHIFT,drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+ AUX_TX_OVER_SAMPLE_RATE_AUX_TX_P0_MASK, ret,out);
drivers/gpu/drm/mediatek/mtk_dp.c new file +27
-0+/* 13 for 26M */ +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_AUX_P0_3614 , +13 <<AUX_RX_UI_CNT_THR_AUX_TX_P0_SHIFT , +AUX_RX_UI_CNT_THR_AUX_TX_P0_MASK , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_AUX_P0_37C8 , +BIT (MTK_ATOP_EN_AUX_TX_P0_SHIFT ), +MTK_ATOP_EN_AUX_TX_P0_MASK , ret, out); + +out: +return ret; +} + +static int mtk_dp_initialize_digital_settings (struct mtk_dp *mtk_dp) +{ +int ret; + +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_ENC0_P0_304C ,0 , +VBID_VIDEO_MUTE_DP_ENC0_P0_MASK , ret, out); +mtk_dp_set_color_format (mtk_dp,MTK_DP_COLOR_FORMAT_RGB_444 ); +mtk_dp_set_color_depth (mtk_dp,MTK_DP_COLOR_DEPTH_8BIT ); +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_ENC1_P0_3368 , +1 <<BS2BS_MODE_DP_ENC1_P0_SHIFT , +BS2BS_MODE_DP_ENC1_P0_MASK , ret, out); + +/* dp tx encoder reset all sw */ + MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_ENC0_P0_3004, + BIT(DP_TX_ENCODER_4P_RESET_SW_DP_ENC0_P0_SHIFT),
drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+ DP_TX_ENCODER_4P_RESET_SW_DP_ENC0_P0_MASK,ret, out);
drivers/gpu/drm/mediatek/mtk_dp.c new file +3
-0+usleep_range (1000 ,5000 ); + MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_ENC0_P0_3004, 0, + DP_TX_ENCODER_4P_RESET_SW_DP_ENC0_P0_MASK,ret, out);
drivers/gpu/drm/mediatek/mtk_dp.c new file +11
-0+ +out: +return ret; +} + +static int mtk_dp_digital_sw_reset (struct mtk_dp *mtk_dp) +{ +int ret; + + MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_TRANS_P0_340C, + BIT(DP_TX_TRANSMITTER_4P_RESET_SW_DP_TRANS_
P0_SHIFT),drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+DP_TX_TRANSMITTER_4P_RESET_SW_DP_TRANS_P0_MA SK, ret, out);
drivers/gpu/drm/mediatek/mtk_dp.c new file +3
-0+usleep_range (1000 ,5000 ); +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_TRANS_P0_340C ,0 , + DP_TX_TRANSMITTER_4P_RESET_SW_DP_TRANS_P0_MASK, ret, out);
drivers/gpu/drm/mediatek/mtk_dp.c new file +11
-0+ +out: +return ret; +} + +static int mtk_dp_set_lanes (struct mtk_dp *mtk_dp,int lanes) +{ +int ret; + + MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_TRANS_P0_35F0, + lanes == 0 ? 0 : BIT(3), BIT(3) | BIT(2),ret, out);
drivers/gpu/drm/mediatek/mtk_dp.c new file +13
-0+MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_ENC0_P0_3000 , lanes, +LANE_NUM_DP_ENC0_P0_MASK , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_TRANS_P0_34A4 , + lanes <<LANE_NUM_DP_TRANS_P0_SHIFT , +LANE_NUM_DP_TRANS_P0_MASK , ret, out); + +out: +return ret; +} + +static int link_rate_to_mb_per_s (struct mtk_dp *mtk_dp, +enum mtk_dp_linkrate linkrate) +{
Quoted 9 lines
drivers/gpu/drm/mediatek/mtk_dp.c line 890
Quoted 6 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +6
-0+switch (linkrate) { +default : +drm_err (mtk_dp->drm_dev, +"Implementation error, unknown linkrate %d\n" , + linkrate); + fallthrough;I think we should return 0?
maybe not 0, -EINVAL seemed to be a good candidate?
Quoted 10 lines
Quoted 10 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +10
-0+case MTK_DP_LINKRATE_RBR : +return 1620 ; +case MTK_DP_LINKRATE_HBR : +return 2700 ; +case MTK_DP_LINKRATE_HBR2 : +return 5400 ; +case MTK_DP_LINKRATE_HBR3 : +return 8100 ; + } +}
Quoted 8 lines
drivers/gpu/drm/mediatek/mtk_dp.c line 905
Quoted 6 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +2
-0+ +static u32 check_cal_data_valid(u32 min, u32 max, u32 val, u32
default_val)drivers/gpu/drm/mediatek/mtk_dp.c new file +3
-0+{ +if (val < min || val > max) +return default_val;maybe we should add some warning here.
Will do.
Quoted 147 lines
Quoted 147 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +16
-0+ +return val; +} + +static int mtk_dp_get_calibration_data (struct mtk_dp *mtk_dp) +{ +struct dp_cal_data *cal_data = &mtk_dp->cal_data; +struct device *dev = mtk_dp->dev; +struct nvmem_cell *cell; +u32 *buf; +size_t len; + + cell =nvmem_cell_get (dev,"dp_calibration_data" ); +if (IS_ERR (cell)) { + dev_err(dev, + "Error: Failed to get nvmem celldp_calibration_data\n");
drivers/gpu/drm/mediatek/mtk_dp.c new file +9
-0+return PTR_ERR (cell); + } + + buf = (u32 *)nvmem_cell_read (cell, &len); +nvmem_cell_put (cell); + +if (IS_ERR (buf) || ((len /sizeof (u32)) !=4 )) { + dev_err(dev, + "Error: Failed to read nvmem_cell_read fail len%ld\n",
drivers/gpu/drm/mediatek/mtk_dp.c new file +6
-0+ (len / sizeof(u32))); +return PTR_ERR (buf); + } + + cal_data->glb_bias_trim = + check_cal_data_valid(1, 0x1e, (buf[3] >> 27) & 0x1f,
0xf);drivers/gpu/drm/mediatek/mtk_dp.c new file +4
-0+ cal_data->clktx_impse = +check_cal_data_valid (1 ,0xe , (buf[0 ] >>9 ) &0xf ,0x8 ); + cal_data->ln_tx_impsel_pmos[0 ] = + check_cal_data_valid(1, 0xe, (buf[2] >> 28) & 0xf,
0x8);drivers/gpu/drm/mediatek/mtk_dp.c new file +2
-0+ cal_data->ln_tx_impsel_nmos[0 ] = + check_cal_data_valid(1, 0xe, (buf[2] >> 24) & 0xf,
0x8);drivers/gpu/drm/mediatek/mtk_dp.c new file +2
-0+ cal_data->ln_tx_impsel_pmos[1 ] = + check_cal_data_valid(1, 0xe, (buf[2] >> 20) & 0xf,
0x8);drivers/gpu/drm/mediatek/mtk_dp.c new file +2
-0+ cal_data->ln_tx_impsel_nmos[1 ] = + check_cal_data_valid(1, 0xe, (buf[2] >> 16) & 0xf,
0x8);drivers/gpu/drm/mediatek/mtk_dp.c new file +2
-0+ cal_data->ln_tx_impsel_pmos[2 ] = + check_cal_data_valid(1, 0xe, (buf[2] >> 12) & 0xf,
0x8);drivers/gpu/drm/mediatek/mtk_dp.c new file +19
-0+ cal_data->ln_tx_impsel_nmos[2 ] = +check_cal_data_valid (1 ,0xe , (buf[2 ] >>8 ) &0xf ,0x8 ); + cal_data->ln_tx_impsel_pmos[3 ] = +check_cal_data_valid (1 ,0xe , (buf[2 ] >>4 ) &0xf ,0x8 ); + cal_data->ln_tx_impsel_nmos[3 ] = +check_cal_data_valid (1 ,0xe , buf[2 ] &0xf ,0x8 ); + +kfree (buf); + +return 0 ; +} + +static int mtk_dp_set_cal_data (struct mtk_dp *mtk_dp) +{ +int ret; +struct dp_cal_data *cal_data = &mtk_dp->cal_data; + + MTK_UPD_BITS_OR_OUT(mtk_dp, DP_PHY_GLB_DPAUX_TX, + cal_data->clktx_impse << 20,
RG_CKM_PT0_CKTX_IMPSEL, ret, out);drivers/gpu/drm/mediatek/mtk_dp.c new file +34
-0+MTK_UPD_BITS_OR_OUT (mtk_dp,DP_PHY_GLB_BIAS_GEN_00 , + cal_data->glb_bias_trim <<16 , +RG_XTP_GLB_BIAS_INTR_CTRL , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,DP_PHY_LANE_TX_0 , + cal_data->ln_tx_impsel_pmos[0 ] <<12 , +RG_XTP_LN0_TX_IMPSEL_PMOS , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,DP_PHY_LANE_TX_0 , + cal_data->ln_tx_impsel_nmos[0 ] <<16 , +RG_XTP_LN0_TX_IMPSEL_NMOS , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,DP_PHY_LANE_TX_1 , + cal_data->ln_tx_impsel_pmos[1 ] <<12 , +RG_XTP_LN1_TX_IMPSEL_PMOS , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,DP_PHY_LANE_TX_1 , + cal_data->ln_tx_impsel_nmos[1 ] <<16 , +RG_XTP_LN1_TX_IMPSEL_NMOS , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,DP_PHY_LANE_TX_2 , + cal_data->ln_tx_impsel_pmos[2 ] <<12 , +RG_XTP_LN2_TX_IMPSEL_PMOS , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,DP_PHY_LANE_TX_2 , + cal_data->ln_tx_impsel_nmos[2 ] <<16 , +RG_XTP_LN2_TX_IMPSEL_NMOS , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,DP_PHY_LANE_TX_3 , + cal_data->ln_tx_impsel_pmos[3 ] <<12 , +RG_XTP_LN3_TX_IMPSEL_PMOS , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,DP_PHY_LANE_TX_3 , + cal_data->ln_tx_impsel_nmos[3 ] <<16 , +RG_XTP_LN3_TX_IMPSEL_NMOS , ret, out); + +out: +return ret; +} + +static int mtk_dp_phy_configure (struct mtk_dp *mtk_dp, + enum mtk_dp_linkrate link_rate, int
lane_count)drivers/gpu/drm/mediatek/mtk_dp.c new file +5
-0+{ + int ret; + union phy_configure_opts phy_opts = { + .dp = { + .link_rate = link_rate_to_mb_per_s(mtk_dp,
link_rate),drivers/gpu/drm/mediatek/mtk_dp.c new file +8
-0+ .set_rate = 1, + .lanes = lane_count, + .set_lanes = 1, + .ssc = mtk_dp->train_info.sink_ssc, + } + }; + + MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_TOP_PWR_STATE,
DP_PWR_STATE_BANDGAP,drivers/gpu/drm/mediatek/mtk_dp.c new file +10
-0+ DP_PWR_STATE_MASK, ret, out); + + ret =phy_configure (mtk_dp->phy, &phy_opts); + +if (ret) + goto out; + +mtk_dp_set_cal_data (mtk_dp); + MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_TOP_PWR_STATE, + DP_PWR_STATE_BANDGAP_TPLL_LANE,
DP_PWR_STATE_MASK, ret, out);drivers/gpu/drm/mediatek/mtk_dp.c new file +6
-0+ +out: +return ret; +} + +static int mtk_dp_set_idle_pattern(struct mtk_dp *mtk_dp, boolenable)
drivers/gpu/drm/mediatek/mtk_dp.c new file +6
-0+{ +const u32 val =POST_MISC_DATA_LANE0_OV_DP_TRANS_P0_MASK | +POST_MISC_DATA_LANE1_OV_DP_TRANS_P0_MASK | +POST_MISC_DATA_LANE2_OV_DP_TRANS_P0_MASK | +POST_MISC_DATA_LANE3_OV_DP_TRANS_P0_MASK ; + return mtk_dp_update_bits(mtk_dp, MTK_DP_TRANS_P0_3580, enable? val : 0, val);
Quoted 8 lines
Quoted 5 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +4
-0+} + +//TODO: check return value in callee +static int mtk_dp_train_set_pattern(struct mtk_dp *mtk_dp, intpattern)
maybe we can use uint8 pattern.
So that we don't need to check the value is < 0.
Yes... and the pattern value is entirely controled within this driver anyway.
Quoted 97 lines
Quoted 97 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +4
-0+{ +if (pattern <0 || pattern >4 ) { + drm_err(mtk_dp->drm_dev, + "Implementation error, no such pattern %d\n",pattern);
drivers/gpu/drm/mediatek/mtk_dp.c new file +9
-0+return -EINVAL ; + } + +if (pattern ==1 )/* TPS1 */ +mtk_dp_set_idle_pattern (mtk_dp, false); + + return mtk_dp_update_bits(mtk_dp, + MTK_DP_TRANS_P0_3400, + pattern ? BIT(pattern - 1) <<
PATTERN1_EN_DP_TRANS_P0_SHIFT: 0,drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+ PATTERN1_EN_DP_TRANS_P0_MASK |
PATTERN2_EN_DP_TRANS_P0_MASK|drivers/gpu/drm/mediatek/mtk_dp.c new file +5
-0+PATTERN3_EN_DP_TRANS_P0_MASK | + PATTERN4_EN_DP_TRANS_P0_MASK); +} + +static int mtk_dp_set_enhanced_frame_mode(struct mtk_dp *mtk_dp,bool enable)
drivers/gpu/drm/mediatek/mtk_dp.c new file +3
-0+{ + return mtk_dp_update_bits(mtk_dp, MTK_DP_ENC0_P0_3000, + enable ?
BIT(ENHANCED_FRAME_EN_DP_ENC0_P0_SHIFT): 0,drivers/gpu/drm/mediatek/mtk_dp.c new file +4
-0+ ENHANCED_FRAME_EN_DP_ENC0_P0_MASK); +} + +static int mtk_dp_training_set_scramble(struct mtk_dp *mtk_dp, boolenable)
drivers/gpu/drm/mediatek/mtk_dp.c new file +27
-0+{ +return mtk_dp_update_bits (mtk_dp,MTK_DP_TRANS_P0_3404 , + enable ?DP_SCR_EN_DP_TRANS_P0_MASK :0 , +DP_SCR_EN_DP_TRANS_P0_MASK ); +} + +static void mtk_dp_video_mute (struct mtk_dp *mtk_dp,bool enable) +{ +u32 val =BIT (VIDEO_MUTE_SEL_DP_ENC0_P0_SHIFT ); + +if (enable) + val |=BIT (VIDEO_MUTE_SW_DP_ENC0_P0_SHIFT ); +mtk_dp_update_bits (mtk_dp,MTK_DP_ENC0_P0_3000 , val, +VIDEO_MUTE_SEL_DP_ENC0_P0_MASK | +VIDEO_MUTE_SW_DP_ENC0_P0_MASK ); + +mtk_dp_sip_atf_call (MTK_DP_SIP_ATF_EDP_VIDEO_UNMUTE , enable); +} + +static int mtk_dp_power_enable (struct mtk_dp *mtk_dp) +{ +int ret; + +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_TOP_RESET_AND_PROBE ,0 , +SW_RST_B_PHYD , ret, out); +usleep_range (10 ,200 ); + MTK_UPD_BITS_OR_OUT(mtk_dp, MTK_DP_TOP_RESET_AND_PROBE,
SW_RST_B_PHYD,drivers/gpu/drm/mediatek/mtk_dp.c new file +21
-0+ SW_RST_B_PHYD, ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_TOP_PWR_STATE , +DP_PWR_STATE_BANDGAP_TPLL , +DP_PWR_STATE_MASK , ret, out); + +out: +return ret; +} + +static int mtk_dp_power_disable (struct mtk_dp *mtk_dp) +{ +int ret; + + ret =mtk_dp_write (mtk_dp,MTK_DP_TOP_PWR_STATE ,0 ); + +if (ret) + goto out; + +usleep_range (10 ,200 ); + ret = mtk_dp_write(mtk_dp, MTK_DP_0034, + DA_CKM_CKTX0_EN_FORCE_EN |
DA_CKM_BIAS_LPF_EN_FORCE_VAL|drivers/gpu/drm/mediatek/mtk_dp.c new file +14
-0+DA_CKM_BIAS_EN_FORCE_VAL | +DA_XTP_GLB_LDO_EN_FORCE_VAL | + DA_XTP_GLB_AVD10_ON_FORCE_VAL); + +if (ret) + goto out; + +/* Disable RX */ + ret =mtk_dp_write (mtk_dp,MTK_DP_1040 ,0 ); + +if (ret) + goto out; + + ret = mtk_dp_write(mtk_dp, MTK_DP_TOP_MEM_PD,
Quoted 8 lines
drivers/gpu/drm/mediatek/mtk_dp.c line 242
Quoted 5 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+ 0x550 | BIT(FUSE_SEL_SHIFT) |
BIT(MEM_ISO_EN_SHIFT));drivers/gpu/drm/mediatek/mtk_dp.c new file +3
-0+ +out: +return ret;If we don't do anything special here, I think we can return directly and no need "out" label.
Yes, I'll remove the un-needed labels whenever there's no unwraping to be done.
Quoted 11 lines
Quoted 11 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +10
-0+} + +static void mtk_dp_initialize_priv_data (struct mtk_dp *mtk_dp) +{ + mtk_dp->train_info.link_rate =MTK_DP_LINKRATE_HBR2 ; + mtk_dp->train_info.lane_count =MTK_DP_MAX_LANES ; + mtk_dp->train_info.irq_status =0 ; + mtk_dp->train_info.cable_plugged_in = false; + mtk_dp->train_info.cable_state_change = false; + mtk_dp->train_state =MTK_DP_TRAIN_STATE_STARTUP ;
Quoted 8 lines
Quoted 6 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +5
-0+ mtk_dp->state =MTK_DP_STATE_INITIAL ; + + mtk_dp->info.format =MTK_DP_COLOR_FORMAT_RGB_444 ; + mtk_dp->info.depth =MTK_DP_COLOR_DEPTH_8BIT ; + memset(&mtk_dp->info.timings, 0, sizeof(struct
mtk_dp_timings));maybe re-order this.
Will do.
Quoted 12 lines
Quoted 12 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +11
-0+ mtk_dp->info.timings.frame_rate =60 ; + + mtk_dp->has_fec = false; +} + +static void mtk_dp_setup_tu (struct mtk_dp *mtk_dp) +{ +u32 sram_read_start =MTK_DP_TBC_BUF_READ_START_ADDR ; + +if (mtk_dp->train_info.lane_count >0 ) { + sram_read_start = min_t(u32,
Quoted 9 lines
Quoted 5 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +2
-0+MTK_DP_TBC_BUF_READ_START_ADDR , + mtk_dp->info.timings.vm.hactive/
drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+ (mtk_dp->train_info.lane_count* 4 * 2 * 2));
This is something magic number..
I think we should add some comments here.
Will do.
Quoted 11 lines
Quoted 11 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +11
-0+mtk_dp_set_sram_read_start (mtk_dp, sram_read_start); + } + +mtk_dp_setup_encoder (mtk_dp); +} + +static void mtk_dp_calculate_pixrate (struct mtk_dp *mtk_dp) +{ +int target_frame_rate =60 ; +int target_pixel_clk; +
Quoted 8 lines
drivers/gpu/drm/mediatek/mtk_dp.c line 1177
Quoted 5 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +5
-0+if (mtk_dp->info.timings.frame_rate >0 ) { + target_frame_rate = mtk_dp->info.timings.frame_rate; + target_pixel_clk = (int )mtk_dp->info.timings.htotal * + (int )mtk_dp->info.timings.vtotal * + target_frame_rate;I think
target_pixel_clkshould be always >= 0?
Can we use u32 fortarget_pixel_clk?
Yes, I don't see how any of the calculations could get us a negative pixel_clk.
Quoted 79 lines
Quoted 71 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +2
-0+ }else if (mtk_dp->info.timings.pix_rate_khz >0 ) { + target_pixel_clk = mtk_dp->info.timings.pix_rate_khz *1000;
drivers/gpu/drm/mediatek/mtk_dp.c new file +8
-0+ }else { + target_pixel_clk = (int )mtk_dp->info.timings.htotal * + (int )mtk_dp->info.timings.vtotal * + target_frame_rate; + } + +if (target_pixel_clk >0 ) + mtk_dp->info.timings.pix_rate_khz = target_pixel_clk /1000;
drivers/gpu/drm/mediatek/mtk_dp.c new file +11
-0+} + +static void mtk_dp_set_tx_out (struct mtk_dp *mtk_dp) +{ +mtk_dp_msa_bypass_disable (mtk_dp); +mtk_dp_calculate_pixrate (mtk_dp); +mtk_dp_pg_disable (mtk_dp); +mtk_dp_setup_tu (mtk_dp); +} + +static void mtk_dp_train_update_swing_pre(struct mtk_dp *mtk_dp, intlanes,
drivers/gpu/drm/mediatek/mtk_dp.c new file +10
-0+ u8 dpcd_adjust_req[2]) +{ +int lane; + +for (lane =0 ; lane < lanes; ++lane) { +u8 val; +u8 swing; +u8 preemphasis; +int index = lane /2 ; + int shift = lane % 2 ?
DP_ADJUST_VOLTAGE_SWING_LANE1_SHIFT: 0;drivers/gpu/drm/mediatek/mtk_dp.c new file +15
-0+ + swing = (dpcd_adjust_req[index] >> shift) & +DP_ADJUST_VOLTAGE_SWING_LANE0_MASK ; + preemphasis = ((dpcd_adjust_req[index] >> shift) & +DP_ADJUST_PRE_EMPHASIS_LANE0_MASK ) >> +DP_ADJUST_PRE_EMPHASIS_LANE0_SHIFT ; + val = swing <<DP_TRAIN_VOLTAGE_SWING_SHIFT | + preemphasis <<DP_TRAIN_PRE_EMPHASIS_SHIFT ; + +if (swing ==DP_TRAIN_VOLTAGE_SWING_LEVEL_3 ) + val |=DP_TRAIN_MAX_SWING_REACHED ; +if (preemphasis ==3 ) + val |=DP_TRAIN_MAX_PRE_EMPHASIS_REACHED ; + + mtk_dp_set_swing_pre_emphasis(mtk_dp, lane, swing,preemphasis);
drivers/gpu/drm/mediatek/mtk_dp.c new file +11
-0+drm_dp_dpcd_writeb (&mtk_dp->aux,DP_TRAINING_LANE0_SET + lane, + val); + } + +/* Wait for the signal to be stable enough */ +usleep_range (2000 ,5000 ); +} + +static void mtk_dp_read_link_status (struct mtk_dp *mtk_dp, + u8link_status[DP_LINK_STATUS_SIZE])
drivers/gpu/drm/mediatek/mtk_dp.c new file +6
-0+{ +drm_dp_dpcd_read (&mtk_dp->aux,DP_LANE0_1_STATUS , link_status, +DP_LINK_STATUS_SIZE ); +} + +static int mtk_dp_train_flow(struct mtk_dp *mtk_dp, int
target_link_rate,drivers/gpu/drm/mediatek/mtk_dp.c line 1240
Quoted 1 line
drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+ int target_lane_count)hmm..
This function is too complicated.
I think you can refer to this drivers in coreboot
I have modified this before...
Quoted 2 lines
Thx for the hints.
Quoted 200 lines
Quoted 197 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +12
-0+{ +u8 link_status[DP_LINK_STATUS_SIZE ] = {}; +u8 lane_adjust[2 ] = {}; +bool pass_tps1 = false; +bool pass_tps2_3 = false; +int train_retries; +int status_control; +int iteration_count; +u8 prev_lane_adjust; +u8 val; + + drm_dp_dpcd_writeb(&mtk_dp->aux, DP_LINK_BW_SET,
target_link_rate);drivers/gpu/drm/mediatek/mtk_dp.c new file +2
-0+ drm_dp_dpcd_writeb(&mtk_dp->aux, DP_LANE_COUNT_SET, + target_lane_count |
DP_LANE_COUNT_ENHANCED_FRAME_EN);drivers/gpu/drm/mediatek/mtk_dp.c new file +12
-0+ +if (mtk_dp->train_info.sink_ssc) +drm_dp_dpcd_writeb (&mtk_dp->aux,DP_DOWNSPREAD_CTRL , +DP_SPREAD_AMP_0_5 ); + + train_retries =0 ; + status_control =0 ; + iteration_count =1 ; + prev_lane_adjust =0xFF ; + +mtk_dp_set_lanes (mtk_dp, target_lane_count /2 ); + mtk_dp_phy_configure(mtk_dp, target_link_rate,
target_lane_count);drivers/gpu/drm/mediatek/mtk_dp.c new file +3
-0+ + dev_dbg(mtk_dp->dev, + "Link train target_link_rate = 0x%x, target_lane_count= 0x%x\n",
drivers/gpu/drm/mediatek/mtk_dp.c new file +6
-0+ target_link_rate, target_lane_count); + + do { + train_retries++; + if (!mtk_dp->train_info.cable_plugged_in || + ((mtk_dp->train_info.irq_status &
MTK_DP_HPD_DISCONNECT) !=drivers/gpu/drm/mediatek/mtk_dp.c new file +17
-0+ 0x0)) { +return -ENODEV ; + } + +if (mtk_dp->train_state <MTK_DP_TRAIN_STATE_TRAINING ) +return -EAGAIN ; + +if (!pass_tps1) { +mtk_dp_training_set_scramble (mtk_dp, false); + +if (status_control ==0 ) { + status_control =1 ; +mtk_dp_train_set_pattern (mtk_dp,1 ); + val =DP_LINK_SCRAMBLING_DISABLE | +DP_TRAINING_PATTERN_1 ; +drm_dp_dpcd_writeb (&mtk_dp->aux, + DP_TRAINING_PATTERN_SET,
drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+DP_LINK_SCRAMBLING_D ISABLE |
drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+DP_TRAINING_PATTERN_ 1);
drivers/gpu/drm/mediatek/mtk_dp.c new file +2
-0+drm_dp_dpcd_read (&mtk_dp->aux, + DP_ADJUST_REQUEST_LANE0_1,
drivers/gpu/drm/mediatek/mtk_dp.c new file +6
-0+ lane_adjust, + sizeof(lane_adjust)); + iteration_count++; + +mtk_dp_train_update_swing_pre (mtk_dp, + target_la
ne_count,lane_adjust);drivers/gpu/drm/mediatek/mtk_dp.c new file +3
-0+ } + + drm_dp_link_train_clock_recovery_delay(&mtk_dp-Quoted 1 line
aux,
drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+ mtk_dp-Quoted 1 line
rx_cap);drivers/gpu/drm/mediatek/mtk_dp.c new file +4
-0+mtk_dp_read_link_status (mtk_dp, link_status); + +if (drm_dp_clock_recovery_ok (link_status, + target_lane_count)) {
drivers/gpu/drm/mediatek/mtk_dp.c new file +5
-0+ mtk_dp->train_info.cr_done = true; + pass_tps1 = true; + train_retries =0 ; + iteration_count =1 ; + dev_dbg(mtk_dp->dev, "Link train CRpass\n");
drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+ }else if (prev_lane_adjust == link_status[4 ]){
drivers/gpu/drm/mediatek/mtk_dp.c new file +13
-0+ iteration_count++; +if (prev_lane_adjust & +DP_ADJUST_VOLTAGE_SWING_LANE0_MASK ) +break ; + }else { + prev_lane_adjust = link_status[4 ]; + } +dev_dbg (mtk_dp->dev,"Link train CQ fail\n" ); + }else if (pass_tps1 && !pass_tps2_3) { +if (status_control ==1 ) { + status_control =2 ; +if (mtk_dp->train_info.tps4) { + mtk_dp_train_set_pattern(mtk_dp, 4);
drivers/gpu/drm/mediatek/mtk_dp.c new file +3
-0+ val =DP_TRAINING_PATTERN_4 ; + }else if (mtk_dp->train_info.tps3) { + mtk_dp_train_set_pattern(mtk_dp, 3);
drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+ val =
DP_LINK_SCRAMBLING_DISABLE|drivers/gpu/drm/mediatek/mtk_dp.c new file +3
-0+DP_TRAINING_PATTERN_3 ; + }else { + mtk_dp_train_set_pattern(mtk_dp, 2);
drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+ val =
DP_LINK_SCRAMBLING_DISABLE|drivers/gpu/drm/mediatek/mtk_dp.c new file +4
-0+DP_TRAINING_PATTERN_2 ; + } +drm_dp_dpcd_writeb (&mtk_dp->aux, + DP_TRAINING_PATTERN_SET,
drivers/gpu/drm/mediatek/mtk_dp.c new file +4
-0+ val); + +drm_dp_dpcd_read (&mtk_dp->aux, + DP_ADJUST_REQUEST_LANE0_1,
drivers/gpu/drm/mediatek/mtk_dp.c new file +6
-0+ lane_adjust, + sizeof(lane_adjust)); + + iteration_count++; +mtk_dp_train_update_swing_pre (mtk_dp, + target_la
ne_count,lane_adjust);drivers/gpu/drm/mediatek/mtk_dp.c new file +3
-0+ } + + drm_dp_link_train_channel_eq_delay(&mtk_dp-Quoted 1 line
aux,
drivers/gpu/drm/mediatek/mtk_dp.c new file +1
-0+ mtk_dp-Quoted 1 line
rx_cap);drivers/gpu/drm/mediatek/mtk_dp.c new file +5
-0+ +mtk_dp_read_link_status (mtk_dp, link_status); + + if (!drm_dp_clock_recovery_ok(link_status, + target_lane_count)) {
drivers/gpu/drm/mediatek/mtk_dp.c new file +3
-0+ mtk_dp->train_info.cr_done = false; + mtk_dp->train_info.eq_done = false; + dev_dbg(mtk_dp->dev, "Link train EQ1 line not shown · raw message
drivers/gpu/drm/mediatek/mtk_dp.c new file +8
-0+break ; + } + +if (drm_dp_channel_eq_ok (link_status, + target_lane_count)) { + mtk_dp->train_info.eq_done = true; + pass_tps2_3 = true; + dev_dbg(mtk_dp->dev, "Link train EQ1 line not shown · raw message
drivers/gpu/drm/mediatek/mtk_dp.c new file +10
-0+break ; + } + +if (prev_lane_adjust == link_status[4 ]) + iteration_count++; +else + prev_lane_adjust = link_status[4 ]; + } + + drm_dp_dpcd_read(&mtk_dp->aux,1 line not shown · raw message
drivers/gpu/drm/mediatek/mtk_dp.c new file +2
-0+ lane_adjust, sizeof(lane_adjust)); + mtk_dp_train_update_swing_pre(mtk_dp,1 line not shown · raw message
drivers/gpu/drm/mediatek/mtk_dp.c new file +23
-0+ lane_adjust); + }while (train_retries <MTK_DP_TRAIN_RETRY_LIMIT && + iteration_count <MTK_DP_TRAIN_MAX_ITERATIONS ); + +drm_dp_dpcd_writeb (&mtk_dp->aux,DP_TRAINING_PATTERN_SET , +DP_TRAINING_PATTERN_DISABLE ); +mtk_dp_train_set_pattern (mtk_dp,0 ); + +if (!pass_tps2_3) +return -ETIMEDOUT ; + + mtk_dp->train_info.link_rate = target_link_rate; + mtk_dp->train_info.lane_count = target_lane_count; + +mtk_dp_training_set_scramble (mtk_dp, true); + +drm_dp_dpcd_writeb (&mtk_dp->aux,DP_LANE_COUNT_SET , + target_lane_count | +DP_LANE_COUNT_ENHANCED_FRAME_EN ); +mtk_dp_set_enhanced_frame_mode (mtk_dp, true); + +return 0 ; +}1 line not shown · raw message
Quoted 11 lines
9 lines not shown · raw message
648 lines not shown · raw message
Part of this message is not shown here. View the raw message.
Re: [PATCH v9 18/22] drm/mediatek: Add mt8195 Embedded DisplayPort driver
In reply to Guillaume RanquetHi Guillaume,
Quoted 10 lines · Guillaume Ranquet
From: Markus Schneider-Pargmann <[email protected]>
This patch adds a DisplayPort driver for the Mediatek mt8195 SoC.
It supports the mt8195, the embedded DisplayPort units. It offers DisplayPort 1.4 with up to 4 lanes.
The driver shares its iomap range with the mtk-dp-phy driver using the regmap/syscon facility.
Quoted 6 lines
This driver is based on an initial version by
Jason-JH.Lin <[email protected]>.Signed-off-by Markus Schneider-Pargmann <[email protected]>Signed-off-by Guillaume Ranquet <[email protected]>Reported-by kernel test robot <[email protected]>
You don't need to set Reported-by on a patch introducing a new driver. That would be typically done for a fix.
Quoted 43 lines
--- drivers/gpu/drm/mediatek/Kconfig | 8 + drivers/gpu/drm/mediatek/Makefile | 2 + drivers/gpu/drm/mediatek/mtk_dp.c | 2221 ++++++++++++++++++++++++ drivers/gpu/drm/mediatek/mtk_dp_reg.h | 568 ++++++ drivers/gpu/drm/mediatek/mtk_drm_drv.c | 1 + drivers/gpu/drm/mediatek/mtk_drm_drv.h | 1 + 6 files changed, 2801 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 +8
-0@@ -28,3 +28,11 @@ 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 PHY_MTK_DP + select DRM_DP_HELPER + help + DRM/KMS Display Port driver for Mediatek SoCs.drivers/gpu/drm/mediatek/Makefile +2
-0@@ -21,3 +21,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.odrivers/gpu/drm/mediatek/mtk_dp.c new file +0
-0
drivers/gpu/drm/mediatek/mtk_dp.c line 4
Quoted 4 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +4
-0@@ -0,0 +1,2221 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (c) 2019 MediaTek Inc. +* Copyright (c) 2021 BayLibre
2022?
Quoted 24 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +24
-0+*/ + +#include <drm/drm_atomic_helper.h> +#include <drm/drm_bridge.h> +#include <drm/drm_crtc.h> +#include <drm/dp/drm_dp_helper.h> +#include <drm/drm_edid.h> +#include <drm/drm_of.h> +#include <drm/drm_panel.h> +#include <drm/drm_print.h> +#include <drm/drm_probe_helper.h> +#include <linux/arm-smccc.h> +#include <linux/clk.h> +#include <linux/delay.h> +#include <linux/errno.h> +#include <linux/kernel.h> +#include <linux/mfd/syscon.h> +#include <linux/nvmem-consumer.h> +#include <linux/of.h> +#include <linux/of_irq.h> +#include <linux/of_platform.h> +#include <linux/phy/phy.h> +#include <linux/platform_device.h> +#include <linux/pm_runtime.h>
drivers/gpu/drm/mediatek/mtk_dp.c line 38
Quoted 10 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +10
-0+#include <linux/regmap.h> +#include <sound/hdmi-codec.h> +#include <video/videomode.h> + +#include "mtk_dp_reg.h" + +#define MTK_DP_AUX_WAIT_REPLY_COUNT 20 +#define MTK_DP_CHECK_SINK_CAP_TIMEOUT_COUNT 3 + +//TODO: platform/device data or dts?
DTS :)
Quoted 57 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +57
-0+#define MTK_DP_MAX_LANES 4 +#define MTK_DP_MAX_LINK_RATE MTK_DP_LINKRATE_HBR3 + +#define MTK_DP_TBC_BUF_READ_START_ADDR 0x08 + +#define MTK_DP_TRAIN_RETRY_LIMIT 8 +#define MTK_DP_TRAIN_MAX_ITERATIONS 5 + +#define MTK_DP_AUX_WRITE_READ_WAIT_TIME_US 20 + +#define MTK_DP_DP_VERSION_11 0x11 + +enum mtk_dp_state { +MTK_DP_STATE_INITIAL , +MTK_DP_STATE_IDLE , +MTK_DP_STATE_PREPARE , +MTK_DP_STATE_NORMAL , +}; + +enum mtk_dp_train_state { +MTK_DP_TRAIN_STATE_STARTUP =0 , +MTK_DP_TRAIN_STATE_CHECKCAP , +MTK_DP_TRAIN_STATE_CHECKEDID , +MTK_DP_TRAIN_STATE_TRAINING_PRE , +MTK_DP_TRAIN_STATE_TRAINING , +MTK_DP_TRAIN_STATE_NORMAL , +MTK_DP_TRAIN_STATE_DPIDLE , +}; + +struct mtk_dp_timings { +struct videomode vm; + +u16 htotal; +u16 vtotal; +u8 frame_rate; +u32 pix_rate_khz; +}; + +struct mtk_dp_train_info { +bool tps3; +bool tps4; +bool sink_ssc; +bool cable_plugged_in; +bool cable_state_change; +bool cr_done; +bool eq_done; + +/* link_rate is in multiple of 0.27Gbps */ +int link_rate; +int lane_count; + +u8 irq_status; +int check_cap_count; +}; + +/* Same values as used by the DP Spec for MISC0 bits 1 and 2 */ +enum mtk_dp_color_format {
drivers/gpu/drm/mediatek/mtk_dp.c line 105
Quoted 10 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +10
-0+MTK_DP_COLOR_FORMAT_RGB_444 =0 , +MTK_DP_COLOR_FORMAT_YUV_422 =1 , +MTK_DP_COLOR_FORMAT_YUV_444 =2 , +MTK_DP_COLOR_FORMAT_YUV_420 =3 , +MTK_DP_COLOR_FORMAT_YONLY =4 , +MTK_DP_COLOR_FORMAT_RAW =5 , +MTK_DP_COLOR_FORMAT_RESERVED =6 , +MTK_DP_COLOR_FORMAT_DEFAULT =MTK_DP_COLOR_FORMAT_RGB_444 , + MTK_DP_COLOR_FORMAT_UNKNOWN = 15, +};
Isn't that redundant with DP_MSA_MISC_COLOR_* ?
Quoted 8 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +8
-0+/* Multiple of 0.27Gbps */ +enum mtk_dp_linkrate { +MTK_DP_LINKRATE_RBR =0x6 , +MTK_DP_LINKRATE_HBR =0xA , +MTK_DP_LINKRATE_HBR2 =0x14 , +MTK_DP_LINKRATE_HBR25 =0x19 , +MTK_DP_LINKRATE_HBR3 =0x1E , +};
drivers/gpu/drm/mediatek/mtk_dp.c line 124
Quoted 10 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +10
-0+ +/* Same values as used for DP Spec MISC0 bits 5,6,7 */ +enum mtk_dp_color_depth { +MTK_DP_COLOR_DEPTH_6BIT =0 , +MTK_DP_COLOR_DEPTH_8BIT =1 , +MTK_DP_COLOR_DEPTH_10BIT =2 , +MTK_DP_COLOR_DEPTH_12BIT =3 , +MTK_DP_COLOR_DEPTH_16BIT =4 , +MTK_DP_COLOR_DEPTH_UNKNOWN =5 , +};
DP_MSA_MISC_*_BPC?
Quoted 1,475 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +1475
-0+struct mtk_dp_info { +enum mtk_dp_color_depth depth; +enum mtk_dp_color_format format; +struct mtk_dp_timings timings; +}; + +struct dp_cal_data { +unsigned int glb_bias_trim; +unsigned int clktx_impse; + +//TODO: see above with MTK_DP_MAX_LANES, make it SoC specific +unsigned int ln_tx_impsel_pmos[MTK_DP_MAX_LANES ]; +unsigned int ln_tx_impsel_nmos[MTK_DP_MAX_LANES ]; +}; + +struct mtk_dp { +struct device *dev; +struct phy *phy; +struct dp_cal_data cal_data; + +struct drm_device *drm_dev; +struct drm_bridge bridge; +struct drm_bridge *next_bridge; +struct drm_dp_aux aux; + +/* Protects edid as it is used in both bridge ops and IRQ handler */ +struct mutex edid_lock; +struct edid *edid; + +u8 rx_cap[DP_RECEIVER_CAP_SIZE ]; + +struct mtk_dp_info info; +enum mtk_dp_state state; + +struct mtk_dp_train_info train_info; +enum mtk_dp_train_state train_state; +unsigned int input_fmt; + +struct regmap *regs; +struct clk *dp_tx_clk; + +bool enabled; + +bool has_fec; +/* Protects the mtk_dp struct */ +struct mutex dp_lock; + +hdmi_codec_plugged_cb plugged_cb; +struct device *codec_dev; +u8 connector_eld[MAX_ELD_BYTES ]; +struct drm_connector *conn; +}; + +static struct mtk_dp *mtk_dp_from_bridge (struct drm_bridge *b) +{ + return container_of(b, struct mtk_dp, bridge); +} + +static u32 mtk_dp_read (struct mtk_dp *mtk_dp,u32 offset) +{ +u32 read_val; +int ret; + + ret =regmap_read (mtk_dp->regs, offset, &read_val); +if (ret) { +dev_err (mtk_dp->dev,"Failed to read register 0x%x: %d\n" , + offset, ret); +return 0 ; + } + +return read_val; +} + +static int mtk_dp_write (struct mtk_dp *mtk_dp,u32 offset,u32 val) +{ +int ret; + + ret =regmap_write (mtk_dp->regs, offset, val); +if (ret) +dev_err (mtk_dp->dev, +"Failed to write register 0x%x with value 0x%x: %d\n" , + offset, val, ret); +return ret; +} + +static int mtk_dp_update_bits (struct mtk_dp *mtk_dp,u32 offset,u32 val, +u32 mask) +{ +int ret; + + ret =regmap_update_bits (mtk_dp->regs, offset, mask, val); +if (ret) +dev_err (mtk_dp->dev, +"Failed to update register 0x%x with value 0x%x, mask 0x%x: %d\n" , + offset, val, mask, ret); +return ret; +} + +static int mtk_dp_bulk_16bit_write (struct mtk_dp *mtk_dp,u32 offset,u8 *buf, +size_t length) +{ +int i; +int ret =0 ; +int num_regs = (length +1 ) /2 ; + +/* 2 bytes per register */ +for (i =0 ; i < num_regs; i++) { +u32 val = buf[i *2 ] | + (i *2 +1 < length ? buf[i *2 +1 ] <<8 :0 ); + + ret =mtk_dp_write (mtk_dp, offset + i *4 , val); +if (ret) + goto out; + } + +out: +return ret; +} + +static unsigned long mtk_dp_sip_atf_call (unsigned int cmd,unsigned int para) +{ +struct arm_smccc_res res; + +arm_smccc_smc (MTK_DP_SIP_CONTROL_AARCH32 , cmd, para,0 ,0 ,0 ,0 ,0 , + &res); + +pr_debug ("[DPTX]%s cmd 0x%x, p1 0x%x, ret 0x%lx-0x%lx" , __func__, cmd, + para, res.a0, res.a1); +return res.a1; +} + +static int mtk_dp_msa_bypass_disable (struct mtk_dp *mtk_dp) +{ +const u16 bits_to_set = +BIT (HTOTAL_SEL_DP_ENC0_P0_SHIFT ) | +BIT (VTOTAL_SEL_DP_ENC0_P0_SHIFT ) | +BIT (HSTART_SEL_DP_ENC0_P0_SHIFT ) | +BIT (VSTART_SEL_DP_ENC0_P0_SHIFT ) | +BIT (HWIDTH_SEL_DP_ENC0_P0_SHIFT ) | +BIT (VHEIGHT_SEL_DP_ENC0_P0_SHIFT ) | +BIT (HSP_SEL_DP_ENC0_P0_SHIFT ) |BIT (HSW_SEL_DP_ENC0_P0_SHIFT ) | +BIT (VSP_SEL_DP_ENC0_P0_SHIFT ) |BIT (VSW_SEL_DP_ENC0_P0_SHIFT ); +return mtk_dp_update_bits (mtk_dp,MTK_DP_ENC0_P0_3030 , bits_to_set, + bits_to_set); +} + +#define MTK_UPD_BITS_OR_OUT (mtk_dp, offset, val, mask, ret, label) \ + do {\ + ret = mtk_dp_update_bits(mtk_dp, offset, val, mask); \ + if (ret) \ + goto label; \ + } while (0) + +static int mtk_dp_set_msa (struct mtk_dp *mtk_dp) +{ +int ret; +struct mtk_dp_timings *timings = &mtk_dp->info.timings; + +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_ENC0_P0_3010 , timings->htotal, +HTOTAL_SW_DP_ENC0_P0_MASK , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_ENC0_P0_3018 , + timings->vm.hsync_len + timings->vm.hback_porch, +HSTART_SW_DP_ENC0_P0_MASK , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_ENC0_P0_3028 , + timings->vm.hsync_len <<HSW_SW_DP_ENC0_P0_SHIFT , +HSW_SW_DP_ENC0_P0_MASK , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_ENC0_P0_3028 ,0 , +HSP_SW_DP_ENC0_P0_MASK , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_ENC0_P0_3020 , timings->vm.hactive, +HWIDTH_SW_DP_ENC0_P0_MASK , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_ENC0_P0_3014 , timings->vtotal, +VTOTAL_SW_DP_ENC0_P0_MASK , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_ENC0_P0_301C , + timings->vm.vsync_len + timings->vm.vback_porch, +VSTART_SW_DP_ENC0_P0_MASK , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_ENC0_P0_302C , + timings->vm.vsync_len <<VSW_SW_DP_ENC0_P0_SHIFT , +VSW_SW_DP_ENC0_P0_MASK , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_ENC0_P0_302C ,0 , +VSP_SW_DP_ENC0_P0_MASK , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_ENC0_P0_3024 , timings->vm.vactive, +VHEIGHT_SW_DP_ENC0_P0_MASK , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_ENC0_P0_3064 , timings->vm.hactive, +HDE_NUM_LAST_DP_ENC0_P0_MASK , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_ENC0_P0_3154 , timings->htotal, +PGEN_HTOTAL_DP_ENC0_P0_MASK , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_ENC0_P0_3158 , + timings->vm.hfront_porch, +PGEN_HSYNC_RISING_DP_ENC0_P0_MASK , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_ENC0_P0_315C , timings->vm.hsync_len, +PGEN_HSYNC_PULSE_WIDTH_DP_ENC0_P0_MASK , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_ENC0_P0_3160 , + timings->vm.hback_porch + timings->vm.hsync_len, +PGEN_HFDE_START_DP_ENC0_P0_MASK , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_ENC0_P0_3164 , timings->vm.hactive, +PGEN_HFDE_ACTIVE_WIDTH_DP_ENC0_P0_MASK , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_ENC0_P0_3168 , timings->vtotal, +PGEN_VTOTAL_DP_ENC0_P0_MASK , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_ENC0_P0_316C , + timings->vm.vfront_porch, +PGEN_VSYNC_RISING_DP_ENC0_P0_MASK , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_ENC0_P0_3170 , timings->vm.vsync_len, +PGEN_VSYNC_PULSE_WIDTH_DP_ENC0_P0_MASK , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_ENC0_P0_3174 , + timings->vm.vback_porch + timings->vm.vsync_len, +PGEN_VFDE_START_DP_ENC0_P0_MASK , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_ENC0_P0_3178 , timings->vm.vactive, +PGEN_VFDE_ACTIVE_WIDTH_DP_ENC0_P0_MASK , ret, out); + +out: +return ret; +} + +static int mtk_dp_set_color_format (struct mtk_dp *mtk_dp, +enum mtk_dp_color_format color_format) +{ +u32 val; +int ret; + + mtk_dp->info.format = color_format; + +/* Update MISC0 */ + ret =mtk_dp_update_bits (mtk_dp,MTK_DP_ENC0_P0_3034 , + color_format <<DP_TEST_COLOR_FORMAT_SHIFT , +DP_TEST_COLOR_FORMAT_MASK ); + +if (ret) +return ret; + +switch (color_format) { +case MTK_DP_COLOR_FORMAT_YUV_422 : + val =PIXEL_ENCODE_FORMAT_DP_ENC0_P0_YCBCR422 ; +break ; +case MTK_DP_COLOR_FORMAT_YUV_420 : + val =PIXEL_ENCODE_FORMAT_DP_ENC0_P0_YCBCR420 ; +break ; +case MTK_DP_COLOR_FORMAT_YONLY : +case MTK_DP_COLOR_FORMAT_RAW : +case MTK_DP_COLOR_FORMAT_RESERVED : +case MTK_DP_COLOR_FORMAT_UNKNOWN : +drm_warn (mtk_dp->drm_dev,"Unsupported color format: %d\n" , + color_format); + fallthrough; +case MTK_DP_COLOR_FORMAT_RGB_444 : +case MTK_DP_COLOR_FORMAT_YUV_444 : + val =PIXEL_ENCODE_FORMAT_DP_ENC0_P0_RGB ; +break ; + } + +return mtk_dp_update_bits (mtk_dp,MTK_DP_ENC0_P0_303C , val, +PIXEL_ENCODE_FORMAT_DP_ENC0_P0_MASK ); +} + +static int mtk_dp_set_color_depth (struct mtk_dp *mtk_dp, +enum mtk_dp_color_depth color_depth) +{ +int ret; +u32 val; + + mtk_dp->info.depth = color_depth; + +/* Update MISC0 */ + ret =mtk_dp_update_bits (mtk_dp,MTK_DP_ENC0_P0_3034 , + color_depth <<DP_TEST_BIT_DEPTH_SHIFT , +DP_TEST_BIT_DEPTH_MASK ); + +if (ret) +return ret; + +switch (color_depth) { +case MTK_DP_COLOR_DEPTH_6BIT : + val =VIDEO_COLOR_DEPTH_DP_ENC0_P0_6BIT ; +break ; +case MTK_DP_COLOR_DEPTH_8BIT : + val =VIDEO_COLOR_DEPTH_DP_ENC0_P0_8BIT ; +break ; +case MTK_DP_COLOR_DEPTH_10BIT : + val =VIDEO_COLOR_DEPTH_DP_ENC0_P0_10BIT ; +break ; +case MTK_DP_COLOR_DEPTH_12BIT : + val =VIDEO_COLOR_DEPTH_DP_ENC0_P0_12BIT ; +break ; +case MTK_DP_COLOR_DEPTH_16BIT : + val =VIDEO_COLOR_DEPTH_DP_ENC0_P0_16BIT ; +break ; +case MTK_DP_COLOR_DEPTH_UNKNOWN : +drm_warn (mtk_dp->drm_dev,"Unsupported color depth %d\n" , + color_depth); +return -EINVAL ; + } + +return mtk_dp_update_bits (mtk_dp,MTK_DP_ENC0_P0_303C , val, +VIDEO_COLOR_DEPTH_DP_ENC0_P0_MASK ); +} + +static int mtk_dp_mn_overwrite_disable (struct mtk_dp *mtk_dp) +{ +return mtk_dp_update_bits (mtk_dp,MTK_DP_ENC0_P0_3004 ,0 , +VIDEO_M_CODE_SEL_DP_ENC0_P0_MASK ); +} + +static int mtk_dp_set_sram_read_start (struct mtk_dp *mtk_dp,u32 val) +{ +return mtk_dp_update_bits (mtk_dp,MTK_DP_ENC0_P0_303C , + val <<SRAM_START_READ_THRD_DP_ENC0_P0_SHIFT , +SRAM_START_READ_THRD_DP_ENC0_P0_MASK ); +} + +static int mtk_dp_setup_encoder (struct mtk_dp *mtk_dp) +{ +int ret; + +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_ENC0_P0_303C , +BIT (VIDEO_MN_GEN_EN_DP_ENC0_P0_SHIFT ), +VIDEO_MN_GEN_EN_DP_ENC0_P0_MASK , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_ENC0_P0_3040 , +0x20 <<SDP_DOWN_CNT_INIT_DP_ENC0_P0_SHIFT , +SDP_DOWN_CNT_INIT_DP_ENC0_P0_MASK , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_ENC1_P0_3364 , +0x20 <<SDP_DOWN_CNT_INIT_IN_HBLANK_DP_ENC1_P0_SHIFT , +SDP_DOWN_CNT_INIT_IN_HBLANK_DP_ENC1_P0_MASK , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_ENC1_P0_3300 , +2 <<VIDEO_AFIFO_RDY_SEL_DP_ENC1_P0_SHIFT , +VIDEO_AFIFO_RDY_SEL_DP_ENC1_P0_MASK , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_ENC1_P0_3364 , +4 <<FIFO_READ_START_POINT_DP_ENC1_P0_SHIFT , +FIFO_READ_START_POINT_DP_ENC1_P0_MASK , ret, out); + ret =mtk_dp_write (mtk_dp,MTK_DP_ENC1_P0_3368 , +1 <<VIDEO_SRAM_FIFO_CNT_RESET_SEL_DP_ENC1_P0_SHIFT | +1 <<VIDEO_STABLE_CNT_THRD_DP_ENC1_P0_SHIFT | +BIT (SDP_DP13_EN_DP_ENC1_P0_SHIFT ) | +1 <<BS2BS_MODE_DP_ENC1_P0_SHIFT ); + +out: +return ret; +} + +static int mtk_dp_pg_disable (struct mtk_dp *mtk_dp) +{ +int ret; + +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_ENC0_P0_3038 ,0 , +VIDEO_SOURCE_SEL_DP_ENC0_P0_MASK , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_ENC0_P0_31B0 , +4 <<PGEN_PATTERN_SEL_SHIFT ,PGEN_PATTERN_SEL_MASK , ret, out); + +out: +return ret; +} + +static bool mtk_dp_plug_state (struct mtk_dp *mtk_dp) +{ +return !!(mtk_dp_read (mtk_dp,MTK_DP_TRANS_P0_3414 ) & +HPD_DB_DP_TRANS_P0_MASK ); +} + +static void mtk_dp_aux_irq_clear (struct mtk_dp *mtk_dp) +{ +mtk_dp_write (mtk_dp,MTK_DP_AUX_P0_3640 , +BIT (AUX_400US_TIMEOUT_IRQ_AUX_TX_P0_SHIFT ) | +BIT (AUX_RX_DATA_RECV_IRQ_AUX_TX_P0_SHIFT ) | +BIT (AUX_RX_ADDR_RECV_IRQ_AUX_TX_P0_SHIFT ) | +BIT (AUX_RX_CMD_RECV_IRQ_AUX_TX_P0_SHIFT ) | +BIT (AUX_RX_MCCS_RECV_COMPLETE_IRQ_AUX_TX_P0_SHIFT ) | +BIT (AUX_RX_EDID_RECV_COMPLETE_IRQ_AUX_TX_P0_SHIFT ) | +BIT (AUX_RX_AUX_RECV_COMPLETE_IRQ_AUX_TX_P0_SHIFT )); +} + +static int mtk_dp_aux_set_cmd (struct mtk_dp *mtk_dp,u8 cmd,u32 addr) +{ +int ret; + +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_AUX_P0_3644 , cmd, +MCU_REQUEST_COMMAND_AUX_TX_P0_MASK , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_AUX_P0_3648 , addr, +MCU_REQUEST_ADDRESS_LSB_AUX_TX_P0_MASK , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_AUX_P0_364C , addr >>16 , +MCU_REQUEST_ADDRESS_MSB_AUX_TX_P0_MASK , ret, out); + +out: +return ret; +} + +static int mtk_dp_aux_cmd_complete (struct mtk_dp *mtk_dp) +{ +return mtk_dp_update_bits (mtk_dp,MTK_DP_AUX_P0_3650 , +BIT (MCU_ACK_TRAN_COMPLETE_AUX_TX_P0_SHIFT ), +MCU_ACK_TRAN_COMPLETE_AUX_TX_P0_MASK | +PHY_FIFO_RST_AUX_TX_P0_MASK | +MCU_REQ_DATA_NUM_AUX_TX_P0_MASK ); +} + +static int mtk_dp_aux_request_ready (struct mtk_dp *mtk_dp) +{ +return mtk_dp_update_bits (mtk_dp,MTK_DP_AUX_P0_3630 , +BIT (AUX_TX_REQUEST_READY_AUX_TX_P0_SHIFT ), +AUX_TX_REQUEST_READY_AUX_TX_P0_MASK ); +} + +static void mtk_dp_aux_fill_write_fifo (struct mtk_dp *mtk_dp,u8 *buf, +size_t length) +{ +mtk_dp_bulk_16bit_write (mtk_dp,MTK_DP_AUX_P0_3708 , buf, length); +} + +static int mtk_dp_aux_read_rx_fifo (struct mtk_dp *mtk_dp,u8 *buf, +size_t length,int read_delay) +{ +int ret; +int read_pos; + +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_AUX_P0_3620 ,0 , +AUX_RD_MODE_AUX_TX_P0_MASK , ret, out); + +for (read_pos =0 ; read_pos < length; read_pos++) { +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_AUX_P0_3620 , +BIT (AUX_RX_FIFO_R_PULSE_TX_P0_SHIFT ), +AUX_RX_FIFO_READ_PULSE_TX_P0_MASK , ret, out); +usleep_range (read_delay, read_delay *2 ); + buf[read_pos] = + (u8)(mtk_dp_read (mtk_dp,MTK_DP_AUX_P0_3620 ) & +AUX_RX_FIFO_READ_DATA_AUX_TX_P0_MASK >> +AUX_RX_FIFO_READ_DATA_AUX_TX_P0_SHIFT ); + } + +out: +return ret; +} + +static int mtk_dp_aux_set_length (struct mtk_dp *mtk_dp,size_t length) +{ +int ret; + +if (length >0 ) { +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_AUX_P0_3650 , + (length -1 ) + <<MCU_REQ_DATA_NUM_AUX_TX_P0_SHIFT , +MCU_REQ_DATA_NUM_AUX_TX_P0_MASK , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_AUX_P0_362C ,0 , +AUX_NO_LENGTH_AUX_TX_P0_MASK | +AUX_TX_AUXTX_OV_EN_AUX_TX_P0_MASK | +AUX_RESERVED_RW_0_AUX_TX_P0_MASK , ret, out); + }else { +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_AUX_P0_362C , +BIT (AUX_NO_LENGTH_AUX_TX_P0_SHIFT ), +AUX_NO_LENGTH_AUX_TX_P0_MASK | +AUX_TX_AUXTX_OV_EN_AUX_TX_P0_MASK | +AUX_RESERVED_RW_0_AUX_TX_P0_MASK , ret, out); + } + +out: +return ret; +} + +static int mtk_dp_aux_wait_for_completion (struct mtk_dp *mtk_dp,bool is_read) +{ +int wait_reply =MTK_DP_AUX_WAIT_REPLY_COUNT ; + +while (--wait_reply) { +u32 aux_irq_status; + +if (is_read) { +u32 fifo_status =mtk_dp_read (mtk_dp,MTK_DP_AUX_P0_3618 ); + +if (fifo_status & + (AUX_RX_FIFO_WRITE_POINTER_AUX_TX_P0_MASK | +AUX_RX_FIFO_FULL_AUX_TX_P0_MASK )) { +return 0 ; + } + } + + aux_irq_status =mtk_dp_read (mtk_dp,MTK_DP_AUX_P0_3640 ); +if (aux_irq_status &AUX_RX_RECV_COMPLETE_IRQ_TX_P0_MASK ) +return 0 ; + +if (aux_irq_status &AUX_400US_TIMEOUT_IRQ_AUX_TX_P0_MASK ) +return -ETIMEDOUT ; + +usleep_range (100 ,500 ); + } + +return -ETIMEDOUT ; +} + +static int mtk_dp_aux_do_transfer (struct mtk_dp *mtk_dp,bool is_read,u8 cmd, +u32 addr,u8 *buf,size_t length) +{ +int ret; +u32 reply_cmd; + +if (is_read && (length >DP_AUX_MAX_PAYLOAD_BYTES || + (cmd ==DP_AUX_NATIVE_READ && !length))) +return -EINVAL ; + +if (!is_read) { + ret =mtk_dp_update_bits (mtk_dp,MTK_DP_AUX_P0_3704 , +BIT (AUX_TX_FIFO_NEW_MODE_EN_AUX_TX_P0_SHIFT ), +AUX_TX_FIFO_NEW_MODE_EN_AUX_TX_P0_MASK ); + +if (ret) +return ret; + } + +mtk_dp_aux_cmd_complete (mtk_dp); +mtk_dp_aux_irq_clear (mtk_dp); +usleep_range (MTK_DP_AUX_WRITE_READ_WAIT_TIME_US , +MTK_DP_AUX_WRITE_READ_WAIT_TIME_US *2 ); + +mtk_dp_aux_set_cmd (mtk_dp, cmd, addr); +mtk_dp_aux_set_length (mtk_dp, length); + +if (!is_read) { +if (length) +mtk_dp_aux_fill_write_fifo (mtk_dp, buf, length); + + ret =mtk_dp_update_bits (mtk_dp,MTK_DP_AUX_P0_3704 , +AUX_TX_FIFO_WRITE_DATA_NEW_MODE_TOGGLE_AUX_TX_P0_MASK , +AUX_TX_FIFO_WRITE_DATA_NEW_MODE_TOGGLE_AUX_TX_P0_MASK ); + +if (ret) +return ret; + } + +mtk_dp_aux_request_ready (mtk_dp); + + ret =mtk_dp_aux_wait_for_completion (mtk_dp, is_read); + + reply_cmd =mtk_dp_read (mtk_dp,MTK_DP_AUX_P0_3624 ) & +AUX_RX_REPLY_COMMAND_AUX_TX_P0_MASK ; + +if (ret || reply_cmd) { +u32 phy_status =mtk_dp_read (mtk_dp,MTK_DP_AUX_P0_3628 ) & +AUX_RX_PHY_STATE_AUX_TX_P0_MASK ; +if (phy_status !=AUX_RX_PHY_STATE_AUX_TX_P0_RX_IDLE ) { +drm_err (mtk_dp->drm_dev, +"AUX Rx Aux hang, need SW reset\n" ); +return -EIO ; + } + +mtk_dp_aux_cmd_complete (mtk_dp); +mtk_dp_aux_irq_clear (mtk_dp); + +usleep_range (MTK_DP_AUX_WRITE_READ_WAIT_TIME_US , +MTK_DP_AUX_WRITE_READ_WAIT_TIME_US *2 ); +return -ETIMEDOUT ; + } + +if (!length) { + ret =mtk_dp_update_bits (mtk_dp,MTK_DP_AUX_P0_362C ,0 , +AUX_NO_LENGTH_AUX_TX_P0_MASK | +AUX_TX_AUXTX_OV_EN_AUX_TX_P0_MASK | +AUX_RESERVED_RW_0_AUX_TX_P0_MASK ); + +if (ret) +return ret; + + }else if (is_read) { +int read_delay; + +if (cmd == (DP_AUX_I2C_READ |DP_AUX_I2C_MOT ) || + cmd ==DP_AUX_I2C_READ ) + read_delay =500 ; +else + read_delay =100 ; + +mtk_dp_aux_read_rx_fifo (mtk_dp, buf, length, read_delay); + } + +mtk_dp_aux_cmd_complete (mtk_dp); +mtk_dp_aux_irq_clear (mtk_dp); +usleep_range (MTK_DP_AUX_WRITE_READ_WAIT_TIME_US , +MTK_DP_AUX_WRITE_READ_WAIT_TIME_US *2 ); + +return 0 ; +} + +static bool mtk_dp_set_swing_pre_emphasis (struct mtk_dp *mtk_dp,int lane_num, +int swing_val,int preemphasis) +{ +int ret; + +u32 lane_shift = lane_num *DP_TX1_VOLT_SWING_SHIFT ; + +if (lane_num <0 || lane_num >3 ) +return false; + +dev_dbg (mtk_dp->dev, +"link training swing_val= 0x%x, preemphasis = 0x%x\n" , + swing_val, preemphasis); + +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_TOP_SWING_EMP , + swing_val << (DP_TX0_VOLT_SWING_SHIFT + lane_shift), +DP_TX0_VOLT_SWING_MASK << lane_shift, ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_TOP_SWING_EMP , + preemphasis << (DP_TX0_PRE_EMPH_SHIFT + lane_shift), +DP_TX0_PRE_EMPH_MASK << lane_shift, ret, out); + +out: +return !ret; +} + +static int mtk_dp_reset_swing_pre_emphasis (struct mtk_dp *mtk_dp) +{ +return mtk_dp_update_bits (mtk_dp,MTK_DP_TOP_SWING_EMP ,0 , +DP_TX0_VOLT_SWING_MASK |DP_TX1_VOLT_SWING_MASK | +DP_TX2_VOLT_SWING_MASK | +DP_TX3_VOLT_SWING_MASK | +DP_TX0_PRE_EMPH_MASK |DP_TX1_PRE_EMPH_MASK | +DP_TX2_PRE_EMPH_MASK |DP_TX3_PRE_EMPH_MASK ); +} + +static int mtk_dp_fec_enable (struct mtk_dp *mtk_dp,bool enable) +{ +return mtk_dp_update_bits (mtk_dp,MTK_DP_TRANS_P0_3540 , + enable ?BIT (FEC_EN_DP_TRANS_P0_SHIFT ) :0 , +FEC_EN_DP_TRANS_P0_MASK ); +} + +static int mtk_dp_hwirq_enable (struct mtk_dp *mtk_dp,bool enable) +{ +u32 val =0 ; + +if (!enable) + val =IRQ_MASK_DP_TRANS_P0_DISC_IRQ | +IRQ_MASK_DP_TRANS_P0_CONN_IRQ | +IRQ_MASK_DP_TRANS_P0_INT_IRQ ; +return mtk_dp_update_bits (mtk_dp,MTK_DP_TRANS_P0_3418 , val, +IRQ_MASK_DP_TRANS_P0_MASK ); +} + +static int mtk_dp_initialize_settings (struct mtk_dp *mtk_dp) +{ +int ret; + +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_TRANS_P0_342C , +XTAL_FREQ_DP_TRANS_P0_DEFAULT , +XTAL_FREQ_DP_TRANS_P0_MASK , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_TRANS_P0_3540 , +BIT (FEC_CLOCK_EN_MODE_DP_TRANS_P0_SHIFT ), +FEC_CLOCK_EN_MODE_DP_TRANS_P0_MASK , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_ENC0_P0_31EC , +BIT (AUDIO_CH_SRC_SEL_DP_ENC0_P0_SHIFT ), +AUDIO_CH_SRC_SEL_DP_ENC0_P0_MASK , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_ENC0_P0_304C ,0 , +SDP_VSYNC_RISING_MASK_DP_ENC0_P0_MASK , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_TOP_IRQ_MASK ,IRQ_MASK_AUX_TOP_IRQ , +IRQ_MASK_AUX_TOP_IRQ , ret, out); + +out: +return ret; +} + +static void mtk_dp_initialize_hpd_detect_settings (struct mtk_dp *mtk_dp) +{ +// Debounce threshold +mtk_dp_update_bits (mtk_dp,MTK_DP_TRANS_P0_3410 , +8 <<HPD_DEB_THD_DP_TRANS_P0_SHIFT , +HPD_DEB_THD_DP_TRANS_P0_MASK ); +mtk_dp_update_bits (mtk_dp,MTK_DP_TRANS_P0_3410 , + (HPD_INT_THD_DP_TRANS_P0_LOWER_500US | +HPD_INT_THD_DP_TRANS_P0_UPPER_1100US ) + <<HPD_INT_THD_DP_TRANS_P0_SHIFT , +HPD_INT_THD_DP_TRANS_P0_MASK ); + +// Connect threshold 1.5ms + 5 x 0.1ms = 2ms +// Disconnect threshold 1.5ms + 5 x 0.1ms = 2ms +mtk_dp_update_bits (mtk_dp,MTK_DP_TRANS_P0_3410 , + (5 <<HPD_DISC_THD_DP_TRANS_P0_SHIFT ) | + (5 <<HPD_CONN_THD_DP_TRANS_P0_SHIFT ), +HPD_DISC_THD_DP_TRANS_P0_MASK | +HPD_CONN_THD_DP_TRANS_P0_MASK ); +mtk_dp_update_bits (mtk_dp,MTK_DP_TRANS_P0_3430 , +HPD_INT_THD_ECO_DP_TRANS_P0_HIGH_BOUND_EXT , +HPD_INT_THD_ECO_DP_TRANS_P0_MASK ); +} + +static int mtk_dp_initialize_aux_settings (struct mtk_dp *mtk_dp) +{ +int ret; + +/* modify timeout threshold = 1595 [12 : 8] */ +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_AUX_P0_360C ,0x1595 , +AUX_TIMEOUT_THR_AUX_TX_P0_MASK , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_AUX_P0_3658 ,0 , +AUX_TX_OV_EN_AUX_TX_P0_MASK , ret, out); +/* 25 for 26M */ +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_AUX_P0_3634 , +25 <<AUX_TX_OVER_SAMPLE_RATE_AUX_TX_P0_SHIFT , +AUX_TX_OVER_SAMPLE_RATE_AUX_TX_P0_MASK , ret, out); +/* 13 for 26M */ +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_AUX_P0_3614 , +13 <<AUX_RX_UI_CNT_THR_AUX_TX_P0_SHIFT , +AUX_RX_UI_CNT_THR_AUX_TX_P0_MASK , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_AUX_P0_37C8 , +BIT (MTK_ATOP_EN_AUX_TX_P0_SHIFT ), +MTK_ATOP_EN_AUX_TX_P0_MASK , ret, out); + +out: +return ret; +} + +static int mtk_dp_initialize_digital_settings (struct mtk_dp *mtk_dp) +{ +int ret; + +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_ENC0_P0_304C ,0 , +VBID_VIDEO_MUTE_DP_ENC0_P0_MASK , ret, out); +mtk_dp_set_color_format (mtk_dp,MTK_DP_COLOR_FORMAT_RGB_444 ); +mtk_dp_set_color_depth (mtk_dp,MTK_DP_COLOR_DEPTH_8BIT ); +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_ENC1_P0_3368 , +1 <<BS2BS_MODE_DP_ENC1_P0_SHIFT , +BS2BS_MODE_DP_ENC1_P0_MASK , ret, out); + +/* dp tx encoder reset all sw */ +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_ENC0_P0_3004 , +BIT (DP_TX_ENCODER_4P_RESET_SW_DP_ENC0_P0_SHIFT ), +DP_TX_ENCODER_4P_RESET_SW_DP_ENC0_P0_MASK , ret, out); +usleep_range (1000 ,5000 ); +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_ENC0_P0_3004 ,0 , +DP_TX_ENCODER_4P_RESET_SW_DP_ENC0_P0_MASK , ret, out); + +out: +return ret; +} + +static int mtk_dp_digital_sw_reset (struct mtk_dp *mtk_dp) +{ +int ret; + +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_TRANS_P0_340C , +BIT (DP_TX_TRANSMITTER_4P_RESET_SW_DP_TRANS_P0_SHIFT ), +DP_TX_TRANSMITTER_4P_RESET_SW_DP_TRANS_P0_MASK , ret, out); +usleep_range (1000 ,5000 ); +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_TRANS_P0_340C ,0 , +DP_TX_TRANSMITTER_4P_RESET_SW_DP_TRANS_P0_MASK , ret, out); + +out: +return ret; +} + +static int mtk_dp_set_lanes (struct mtk_dp *mtk_dp,int lanes) +{ +int ret; + +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_TRANS_P0_35F0 , + lanes ==0 ?0 :BIT (3 ),BIT (3 ) |BIT (2 ), ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_ENC0_P0_3000 , lanes, +LANE_NUM_DP_ENC0_P0_MASK , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_TRANS_P0_34A4 , + lanes <<LANE_NUM_DP_TRANS_P0_SHIFT , +LANE_NUM_DP_TRANS_P0_MASK , ret, out); + +out: +return ret; +} + +static int link_rate_to_mb_per_s (struct mtk_dp *mtk_dp, +enum mtk_dp_linkrate linkrate) +{ +switch (linkrate) { +default : +drm_err (mtk_dp->drm_dev, +"Implementation error, unknown linkrate %d\n" , + linkrate); + fallthrough; +case MTK_DP_LINKRATE_RBR : +return 1620 ; +case MTK_DP_LINKRATE_HBR : +return 2700 ; +case MTK_DP_LINKRATE_HBR2 : +return 5400 ; +case MTK_DP_LINKRATE_HBR3 : +return 8100 ; + } +} + +static u32 check_cal_data_valid (u32 min,u32 max,u32 val,u32 default_val) +{ +if (val < min || val > max) +return default_val; + +return val; +} + +static int mtk_dp_get_calibration_data (struct mtk_dp *mtk_dp) +{ +struct dp_cal_data *cal_data = &mtk_dp->cal_data; +struct device *dev = mtk_dp->dev; +struct nvmem_cell *cell; +u32 *buf; +size_t len; + + cell =nvmem_cell_get (dev,"dp_calibration_data" ); +if (IS_ERR (cell)) { +dev_err (dev, +"Error: Failed to get nvmem cell dp_calibration_data\n" ); +return PTR_ERR (cell); + } + + buf = (u32 *)nvmem_cell_read (cell, &len); +nvmem_cell_put (cell); + +if (IS_ERR (buf) || ((len /sizeof (u32)) !=4 )) { +dev_err (dev, +"Error: Failed to read nvmem_cell_read fail len %ld\n" , + (len /sizeof (u32))); +return PTR_ERR (buf); + } + + cal_data->glb_bias_trim = +check_cal_data_valid (1 ,0x1e , (buf[3 ] >>27 ) &0x1f ,0xf ); + cal_data->clktx_impse = +check_cal_data_valid (1 ,0xe , (buf[0 ] >>9 ) &0xf ,0x8 ); + cal_data->ln_tx_impsel_pmos[0 ] = +check_cal_data_valid (1 ,0xe , (buf[2 ] >>28 ) &0xf ,0x8 ); + cal_data->ln_tx_impsel_nmos[0 ] = +check_cal_data_valid (1 ,0xe , (buf[2 ] >>24 ) &0xf ,0x8 ); + cal_data->ln_tx_impsel_pmos[1 ] = +check_cal_data_valid (1 ,0xe , (buf[2 ] >>20 ) &0xf ,0x8 ); + cal_data->ln_tx_impsel_nmos[1 ] = +check_cal_data_valid (1 ,0xe , (buf[2 ] >>16 ) &0xf ,0x8 ); + cal_data->ln_tx_impsel_pmos[2 ] = +check_cal_data_valid (1 ,0xe , (buf[2 ] >>12 ) &0xf ,0x8 ); + cal_data->ln_tx_impsel_nmos[2 ] = +check_cal_data_valid (1 ,0xe , (buf[2 ] >>8 ) &0xf ,0x8 ); + cal_data->ln_tx_impsel_pmos[3 ] = +check_cal_data_valid (1 ,0xe , (buf[2 ] >>4 ) &0xf ,0x8 ); + cal_data->ln_tx_impsel_nmos[3 ] = +check_cal_data_valid (1 ,0xe , buf[2 ] &0xf ,0x8 ); + +kfree (buf); + +return 0 ; +} + +static int mtk_dp_set_cal_data (struct mtk_dp *mtk_dp) +{ +int ret; +struct dp_cal_data *cal_data = &mtk_dp->cal_data; + +MTK_UPD_BITS_OR_OUT (mtk_dp,DP_PHY_GLB_DPAUX_TX , + cal_data->clktx_impse <<20 ,RG_CKM_PT0_CKTX_IMPSEL , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,DP_PHY_GLB_BIAS_GEN_00 , + cal_data->glb_bias_trim <<16 , +RG_XTP_GLB_BIAS_INTR_CTRL , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,DP_PHY_LANE_TX_0 , + cal_data->ln_tx_impsel_pmos[0 ] <<12 , +RG_XTP_LN0_TX_IMPSEL_PMOS , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,DP_PHY_LANE_TX_0 , + cal_data->ln_tx_impsel_nmos[0 ] <<16 , +RG_XTP_LN0_TX_IMPSEL_NMOS , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,DP_PHY_LANE_TX_1 , + cal_data->ln_tx_impsel_pmos[1 ] <<12 , +RG_XTP_LN1_TX_IMPSEL_PMOS , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,DP_PHY_LANE_TX_1 , + cal_data->ln_tx_impsel_nmos[1 ] <<16 , +RG_XTP_LN1_TX_IMPSEL_NMOS , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,DP_PHY_LANE_TX_2 , + cal_data->ln_tx_impsel_pmos[2 ] <<12 , +RG_XTP_LN2_TX_IMPSEL_PMOS , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,DP_PHY_LANE_TX_2 , + cal_data->ln_tx_impsel_nmos[2 ] <<16 , +RG_XTP_LN2_TX_IMPSEL_NMOS , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,DP_PHY_LANE_TX_3 , + cal_data->ln_tx_impsel_pmos[3 ] <<12 , +RG_XTP_LN3_TX_IMPSEL_PMOS , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,DP_PHY_LANE_TX_3 , + cal_data->ln_tx_impsel_nmos[3 ] <<16 , +RG_XTP_LN3_TX_IMPSEL_NMOS , ret, out); + +out: +return ret; +} + +static int mtk_dp_phy_configure (struct mtk_dp *mtk_dp, +enum mtk_dp_linkrate link_rate,int lane_count) +{ +int ret; +union phy_configure_opts phy_opts = { + .dp = { + .link_rate =link_rate_to_mb_per_s (mtk_dp, link_rate), + .set_rate =1 , + .lanes = lane_count, + .set_lanes =1 , + .ssc = mtk_dp->train_info.sink_ssc, + } + }; + +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_TOP_PWR_STATE ,DP_PWR_STATE_BANDGAP , +DP_PWR_STATE_MASK , ret, out); + + ret =phy_configure (mtk_dp->phy, &phy_opts); + +if (ret) + goto out; + +mtk_dp_set_cal_data (mtk_dp); +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_TOP_PWR_STATE , +DP_PWR_STATE_BANDGAP_TPLL_LANE ,DP_PWR_STATE_MASK , ret, out); + +out: +return ret; +} + +static int mtk_dp_set_idle_pattern (struct mtk_dp *mtk_dp,bool enable) +{ +const u32 val =POST_MISC_DATA_LANE0_OV_DP_TRANS_P0_MASK | +POST_MISC_DATA_LANE1_OV_DP_TRANS_P0_MASK | +POST_MISC_DATA_LANE2_OV_DP_TRANS_P0_MASK | +POST_MISC_DATA_LANE3_OV_DP_TRANS_P0_MASK ; +return mtk_dp_update_bits (mtk_dp,MTK_DP_TRANS_P0_3580 , enable ? val :0 , val); +} + +//TODO: check return value in callee +static int mtk_dp_train_set_pattern (struct mtk_dp *mtk_dp,int pattern) +{ +if (pattern <0 || pattern >4 ) { +drm_err (mtk_dp->drm_dev, +"Implementation error, no such pattern %d\n" , pattern); +return -EINVAL ; + } + +if (pattern ==1 )/* TPS1 */ +mtk_dp_set_idle_pattern (mtk_dp, false); + +return mtk_dp_update_bits (mtk_dp, +MTK_DP_TRANS_P0_3400 , + pattern ?BIT (pattern -1 ) <<PATTERN1_EN_DP_TRANS_P0_SHIFT :0 , +PATTERN1_EN_DP_TRANS_P0_MASK |PATTERN2_EN_DP_TRANS_P0_MASK | +PATTERN3_EN_DP_TRANS_P0_MASK | +PATTERN4_EN_DP_TRANS_P0_MASK ); +} + +static int mtk_dp_set_enhanced_frame_mode (struct mtk_dp *mtk_dp,bool enable) +{ +return mtk_dp_update_bits (mtk_dp,MTK_DP_ENC0_P0_3000 , + enable ?BIT (ENHANCED_FRAME_EN_DP_ENC0_P0_SHIFT ) :0 , +ENHANCED_FRAME_EN_DP_ENC0_P0_MASK ); +} + +static int mtk_dp_training_set_scramble (struct mtk_dp *mtk_dp,bool enable) +{ +return mtk_dp_update_bits (mtk_dp,MTK_DP_TRANS_P0_3404 , + enable ?DP_SCR_EN_DP_TRANS_P0_MASK :0 , +DP_SCR_EN_DP_TRANS_P0_MASK ); +} + +static void mtk_dp_video_mute (struct mtk_dp *mtk_dp,bool enable) +{ +u32 val =BIT (VIDEO_MUTE_SEL_DP_ENC0_P0_SHIFT ); + +if (enable) + val |=BIT (VIDEO_MUTE_SW_DP_ENC0_P0_SHIFT ); +mtk_dp_update_bits (mtk_dp,MTK_DP_ENC0_P0_3000 , val, +VIDEO_MUTE_SEL_DP_ENC0_P0_MASK | +VIDEO_MUTE_SW_DP_ENC0_P0_MASK ); + +mtk_dp_sip_atf_call (MTK_DP_SIP_ATF_EDP_VIDEO_UNMUTE , enable); +} + +static int mtk_dp_power_enable (struct mtk_dp *mtk_dp) +{ +int ret; + +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_TOP_RESET_AND_PROBE ,0 , +SW_RST_B_PHYD , ret, out); +usleep_range (10 ,200 ); +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_TOP_RESET_AND_PROBE ,SW_RST_B_PHYD , +SW_RST_B_PHYD , ret, out); +MTK_UPD_BITS_OR_OUT (mtk_dp,MTK_DP_TOP_PWR_STATE , +DP_PWR_STATE_BANDGAP_TPLL , +DP_PWR_STATE_MASK , ret, out); + +out: +return ret; +} + +static int mtk_dp_power_disable (struct mtk_dp *mtk_dp) +{ +int ret; + + ret =mtk_dp_write (mtk_dp,MTK_DP_TOP_PWR_STATE ,0 ); + +if (ret) + goto out; + +usleep_range (10 ,200 ); + ret =mtk_dp_write (mtk_dp,MTK_DP_0034 , +DA_CKM_CKTX0_EN_FORCE_EN |DA_CKM_BIAS_LPF_EN_FORCE_VAL | +DA_CKM_BIAS_EN_FORCE_VAL | +DA_XTP_GLB_LDO_EN_FORCE_VAL | +DA_XTP_GLB_AVD10_ON_FORCE_VAL ); + +if (ret) + goto out; + +/* Disable RX */ + ret =mtk_dp_write (mtk_dp,MTK_DP_1040 ,0 ); + +if (ret) + goto out; + + ret =mtk_dp_write (mtk_dp,MTK_DP_TOP_MEM_PD , +0x550 |BIT (FUSE_SEL_SHIFT ) |BIT (MEM_ISO_EN_SHIFT )); + +out: +return ret; +} + +static void mtk_dp_initialize_priv_data (struct mtk_dp *mtk_dp) +{ + mtk_dp->train_info.link_rate =MTK_DP_LINKRATE_HBR2 ; + mtk_dp->train_info.lane_count =MTK_DP_MAX_LANES ; + mtk_dp->train_info.irq_status =0 ; + mtk_dp->train_info.cable_plugged_in = false; + mtk_dp->train_info.cable_state_change = false; + mtk_dp->train_state =MTK_DP_TRAIN_STATE_STARTUP ; + mtk_dp->state =MTK_DP_STATE_INITIAL ; + + mtk_dp->info.format =MTK_DP_COLOR_FORMAT_RGB_444 ; + mtk_dp->info.depth =MTK_DP_COLOR_DEPTH_8BIT ; +memset (&mtk_dp->info.timings,0 ,sizeof (struct mtk_dp_timings )); + mtk_dp->info.timings.frame_rate =60 ; + + mtk_dp->has_fec = false; +} + +static void mtk_dp_setup_tu (struct mtk_dp *mtk_dp) +{ +u32 sram_read_start =MTK_DP_TBC_BUF_READ_START_ADDR ; + +if (mtk_dp->train_info.lane_count >0 ) { + sram_read_start =min_t (u32, +MTK_DP_TBC_BUF_READ_START_ADDR , + mtk_dp->info.timings.vm.hactive / + (mtk_dp->train_info.lane_count *4 *2 *2 )); +mtk_dp_set_sram_read_start (mtk_dp, sram_read_start); + } + +mtk_dp_setup_encoder (mtk_dp); +} + +static void mtk_dp_calculate_pixrate (struct mtk_dp *mtk_dp) +{ +int target_frame_rate =60 ; +int target_pixel_clk; + +if (mtk_dp->info.timings.frame_rate >0 ) { + target_frame_rate = mtk_dp->info.timings.frame_rate; + target_pixel_clk = (int )mtk_dp->info.timings.htotal * + (int )mtk_dp->info.timings.vtotal * + target_frame_rate; + }else if (mtk_dp->info.timings.pix_rate_khz >0 ) { + target_pixel_clk = mtk_dp->info.timings.pix_rate_khz *1000 ; + }else { + target_pixel_clk = (int )mtk_dp->info.timings.htotal * + (int )mtk_dp->info.timings.vtotal * + target_frame_rate; + } + +if (target_pixel_clk >0 ) + mtk_dp->info.timings.pix_rate_khz = target_pixel_clk /1000 ; +} + +static void mtk_dp_set_tx_out (struct mtk_dp *mtk_dp) +{ +mtk_dp_msa_bypass_disable (mtk_dp); +mtk_dp_calculate_pixrate (mtk_dp); +mtk_dp_pg_disable (mtk_dp); +mtk_dp_setup_tu (mtk_dp); +} + +static void mtk_dp_train_update_swing_pre (struct mtk_dp *mtk_dp,int lanes, +u8 dpcd_adjust_req[2 ]) +{ +int lane; + +for (lane =0 ; lane < lanes; ++lane) { +u8 val; +u8 swing; +u8 preemphasis; +int index = lane /2 ; +int shift = lane %2 ?DP_ADJUST_VOLTAGE_SWING_LANE1_SHIFT :0 ; + + swing = (dpcd_adjust_req[index] >> shift) & +DP_ADJUST_VOLTAGE_SWING_LANE0_MASK ; + preemphasis = ((dpcd_adjust_req[index] >> shift) & +DP_ADJUST_PRE_EMPHASIS_LANE0_MASK ) >> +DP_ADJUST_PRE_EMPHASIS_LANE0_SHIFT ; + val = swing <<DP_TRAIN_VOLTAGE_SWING_SHIFT | + preemphasis <<DP_TRAIN_PRE_EMPHASIS_SHIFT ; + +if (swing ==DP_TRAIN_VOLTAGE_SWING_LEVEL_3 ) + val |=DP_TRAIN_MAX_SWING_REACHED ; +if (preemphasis ==3 ) + val |=DP_TRAIN_MAX_PRE_EMPHASIS_REACHED ; + +mtk_dp_set_swing_pre_emphasis (mtk_dp, lane, swing, preemphasis); +drm_dp_dpcd_writeb (&mtk_dp->aux,DP_TRAINING_LANE0_SET + lane, + val); + } + +/* Wait for the signal to be stable enough */ +usleep_range (2000 ,5000 ); +} + +static void mtk_dp_read_link_status (struct mtk_dp *mtk_dp, +u8 link_status[DP_LINK_STATUS_SIZE ]) +{ +drm_dp_dpcd_read (&mtk_dp->aux,DP_LANE0_1_STATUS , link_status, +DP_LINK_STATUS_SIZE ); +} + +static int mtk_dp_train_flow (struct mtk_dp *mtk_dp,int target_link_rate, +int target_lane_count) +{ +u8 link_status[DP_LINK_STATUS_SIZE ] = {}; +u8 lane_adjust[2 ] = {}; +bool pass_tps1 = false; +bool pass_tps2_3 = false; +int train_retries; +int status_control; +int iteration_count; +u8 prev_lane_adjust; +u8 val; + +drm_dp_dpcd_writeb (&mtk_dp->aux,DP_LINK_BW_SET , target_link_rate); +drm_dp_dpcd_writeb (&mtk_dp->aux,DP_LANE_COUNT_SET , + target_lane_count |DP_LANE_COUNT_ENHANCED_FRAME_EN ); + +if (mtk_dp->train_info.sink_ssc) +drm_dp_dpcd_writeb (&mtk_dp->aux,DP_DOWNSPREAD_CTRL , +DP_SPREAD_AMP_0_5 ); + + train_retries =0 ; + status_control =0 ; + iteration_count =1 ; + prev_lane_adjust =0xFF ; + +mtk_dp_set_lanes (mtk_dp, target_lane_count /2 ); +mtk_dp_phy_configure (mtk_dp, target_link_rate, target_lane_count); + +dev_dbg (mtk_dp->dev, +"Link train target_link_rate = 0x%x, target_lane_count = 0x%x\n" , + target_link_rate, target_lane_count); + +do { + train_retries++; +if (!mtk_dp->train_info.cable_plugged_in || + ((mtk_dp->train_info.irq_status &MTK_DP_HPD_DISCONNECT ) != +0x0 )) { +return -ENODEV ; + } + +if (mtk_dp->train_state <MTK_DP_TRAIN_STATE_TRAINING ) +return -EAGAIN ; + +if (!pass_tps1) { +mtk_dp_training_set_scramble (mtk_dp, false); + +if (status_control ==0 ) { + status_control =1 ; +mtk_dp_train_set_pattern (mtk_dp,1 ); + val =DP_LINK_SCRAMBLING_DISABLE | +DP_TRAINING_PATTERN_1 ; +drm_dp_dpcd_writeb (&mtk_dp->aux, +DP_TRAINING_PATTERN_SET , +DP_LINK_SCRAMBLING_DISABLE | +DP_TRAINING_PATTERN_1 ); +drm_dp_dpcd_read (&mtk_dp->aux, +DP_ADJUST_REQUEST_LANE0_1 , + lane_adjust, +sizeof (lane_adjust)); + iteration_count++; + +mtk_dp_train_update_swing_pre (mtk_dp, + target_lane_count, lane_adjust); + } + +drm_dp_link_train_clock_recovery_delay (&mtk_dp->aux, + mtk_dp->rx_cap); +mtk_dp_read_link_status (mtk_dp, link_status); + +if (drm_dp_clock_recovery_ok (link_status, + target_lane_count)) { + mtk_dp->train_info.cr_done = true; + pass_tps1 = true; + train_retries =0 ; + iteration_count =1 ; +dev_dbg (mtk_dp->dev,"Link train CR pass\n" ); + }else if (prev_lane_adjust == link_status[4 ]) { + iteration_count++; +if (prev_lane_adjust & +DP_ADJUST_VOLTAGE_SWING_LANE0_MASK ) +break ; + }else { + prev_lane_adjust = link_status[4 ]; + } +dev_dbg (mtk_dp->dev,"Link train CQ fail\n" ); + }else if (pass_tps1 && !pass_tps2_3) { +if (status_control ==1 ) { + status_control =2 ; +if (mtk_dp->train_info.tps4) { +mtk_dp_train_set_pattern (mtk_dp,4 ); + val =DP_TRAINING_PATTERN_4 ; + }else if (mtk_dp->train_info.tps3) { +mtk_dp_train_set_pattern (mtk_dp,3 ); + val =DP_LINK_SCRAMBLING_DISABLE | +DP_TRAINING_PATTERN_3 ; + }else { +mtk_dp_train_set_pattern (mtk_dp,2 ); + val =DP_LINK_SCRAMBLING_DISABLE | +DP_TRAINING_PATTERN_2 ; + } +drm_dp_dpcd_writeb (&mtk_dp->aux, +DP_TRAINING_PATTERN_SET , + val); + +drm_dp_dpcd_read (&mtk_dp->aux, +DP_ADJUST_REQUEST_LANE0_1 , + lane_adjust, +sizeof (lane_adjust)); + + iteration_count++; +mtk_dp_train_update_swing_pre (mtk_dp, + target_lane_count, lane_adjust); + } + +drm_dp_link_train_channel_eq_delay (&mtk_dp->aux, + mtk_dp->rx_cap); + +mtk_dp_read_link_status (mtk_dp, link_status); + +if (!drm_dp_clock_recovery_ok (link_status, + target_lane_count)) { + mtk_dp->train_info.cr_done = false; + mtk_dp->train_info.eq_done = false; +dev_dbg (mtk_dp->dev,"Link train EQ fail\n" ); +break ; + } + +if (drm_dp_channel_eq_ok (link_status, + target_lane_count)) { + mtk_dp->train_info.eq_done = true; + pass_tps2_3 = true; +dev_dbg (mtk_dp->dev,"Link train EQ pass\n" ); +break ; + } + +if (prev_lane_adjust == link_status[4 ]) + iteration_count++; +else + prev_lane_adjust = link_status[4 ]; + } + +drm_dp_dpcd_read (&mtk_dp->aux,DP_ADJUST_REQUEST_LANE0_1 , + lane_adjust,sizeof (lane_adjust)); +mtk_dp_train_update_swing_pre (mtk_dp, target_lane_count, + lane_adjust); + }while (train_retries <MTK_DP_TRAIN_RETRY_LIMIT && + iteration_count <MTK_DP_TRAIN_MAX_ITERATIONS ); + +drm_dp_dpcd_writeb (&mtk_dp->aux,DP_TRAINING_PATTERN_SET , +DP_TRAINING_PATTERN_DISABLE ); +mtk_dp_train_set_pattern (mtk_dp,0 ); + +if (!pass_tps2_3) +return -ETIMEDOUT ; + + mtk_dp->train_info.link_rate = target_link_rate; + mtk_dp->train_info.lane_count = target_lane_count; + +mtk_dp_training_set_scramble (mtk_dp, true); + +drm_dp_dpcd_writeb (&mtk_dp->aux,DP_LANE_COUNT_SET , + target_lane_count | +DP_LANE_COUNT_ENHANCED_FRAME_EN ); +mtk_dp_set_enhanced_frame_mode (mtk_dp, true); + +return 0 ; +} + +static bool mtk_dp_parse_capabilities (struct mtk_dp *mtk_dp) +{ +u8 buf[DP_RECEIVER_CAP_SIZE ] = {}; +u8 val; +struct mtk_dp_train_info *train_info = &mtk_dp->train_info; + +if (!mtk_dp_plug_state (mtk_dp)) +return false; + +drm_dp_dpcd_writeb (&mtk_dp->aux,DP_SET_POWER ,DP_SET_POWER_D0 ); +usleep_range (2000 ,5000 ); + +drm_dp_read_dpcd_caps (&mtk_dp->aux, buf); + +memcpy (mtk_dp->rx_cap, buf,min (sizeof (mtk_dp->rx_cap),sizeof (buf))); + mtk_dp->rx_cap[DP_TRAINING_AUX_RD_INTERVAL ] &=DP_TRAINING_AUX_RD_MASK ; + + train_info->link_rate = +min_t (int,MTK_DP_MAX_LINK_RATE , buf[DP_MAX_LINK_RATE ]); + train_info->lane_count = +min_t (int,MTK_DP_MAX_LANES ,drm_dp_max_lane_count (buf)); + + train_info->tps3 =drm_dp_tps3_supported (buf); + train_info->tps4 =drm_dp_tps4_supported (buf); + + train_info->sink_ssc = + !!(buf[DP_MAX_DOWNSPREAD ] &DP_MAX_DOWNSPREAD_0_5 ); + + train_info->sink_ssc = false; + +drm_dp_dpcd_readb (&mtk_dp->aux,DP_MSTM_CAP , &val); +if (val &DP_MST_CAP ) { +/* Clear DP_DEVICE_SERVICE_IRQ_VECTOR_ESI0 */ +drm_dp_dpcd_readb (&mtk_dp->aux, +DP_DEVICE_SERVICE_IRQ_VECTOR_ESI0 , &val); +if (val) +drm_dp_dpcd_writeb (&mtk_dp->aux, +DP_DEVICE_SERVICE_IRQ_VECTOR_ESI0 , + val); + } + +return true; +} + +static void mtk_dp_train_change_mode (struct mtk_dp *mtk_dp) +{ +phy_reset (mtk_dp->phy); +mtk_dp_reset_swing_pre_emphasis (mtk_dp); + +usleep_range (2000 ,5000 ); +} + +static int mtk_dp_train_start (struct mtk_dp *mtk_dp) +{ +int ret =0 ; +int lane_count; +int link_rate; +int train_limit; +int max_link_rate; +int plug_wait; + +for (plug_wait =7 ; !mtk_dp_plug_state (mtk_dp) && plug_wait >0 ; + --plug_wait) +usleep_range (1000 ,5000 ); +if (plug_wait ==0 ) { + mtk_dp->train_state =MTK_DP_TRAIN_STATE_DPIDLE ; +return -ENODEV ; + } + + link_rate = mtk_dp->rx_cap[1 ]; + lane_count = mtk_dp->rx_cap[2 ] &0x1F ; + + mtk_dp->train_info.link_rate =min (MTK_DP_MAX_LINK_RATE , link_rate); + mtk_dp->train_info.lane_count =min (MTK_DP_MAX_LANES , lane_count); + link_rate = mtk_dp->train_info.link_rate; + lane_count = mtk_dp->train_info.lane_count; + +switch (link_rate) { +case MTK_DP_LINKRATE_RBR : +case MTK_DP_LINKRATE_HBR : +case MTK_DP_LINKRATE_HBR2 : +case MTK_DP_LINKRATE_HBR25 : +case MTK_DP_LINKRATE_HBR3 : +break ; +default : + mtk_dp->train_info.link_rate =MTK_DP_LINKRATE_HBR3 ; +break ; + }; + + max_link_rate = link_rate; +for (train_limit =6 ; train_limit >0 ; train_limit--) { + mtk_dp->train_info.cr_done = false; + mtk_dp->train_info.eq_done = false; + +mtk_dp_train_change_mode (mtk_dp); + ret =mtk_dp_train_flow (mtk_dp, link_rate, lane_count); +if (ret) +return ret; + +if (!mtk_dp->train_info.cr_done) { +switch (link_rate) { +case MTK_DP_LINKRATE_RBR : + lane_count = lane_count /2 ; + link_rate = max_link_rate; +if (lane_count ==0 ) { + mtk_dp->train_state = +MTK_DP_TRAIN_STATE_DPIDLE ; +return -EIO ; + } +break ; +case MTK_DP_LINKRATE_HBR : + link_rate =MTK_DP_LINKRATE_RBR ; +break ; +case MTK_DP_LINKRATE_HBR2 : + link_rate =MTK_DP_LINKRATE_HBR ; +break ; +case MTK_DP_LINKRATE_HBR3 : + link_rate =MTK_DP_LINKRATE_HBR2 ; +break ; +default : +return -EINVAL ; + }; + }else if (!mtk_dp->train_info.eq_done) { +if (lane_count ==0 ) +return -EIO ; + + lane_count /=2 ; + }else { +break ; + } + } + +if (train_limit ==0 ) +return -ETIMEDOUT ; + +return 0 ; +} + +static int mtk_dp_train_handler (struct mtk_dp *mtk_dp) +{ +int ret =0 ; +int i =50 ; + +for (; ret && i; i--) { +if (mtk_dp->train_state ==MTK_DP_TRAIN_STATE_NORMAL ) +continue ; + +switch (mtk_dp->train_state) { +case MTK_DP_TRAIN_STATE_STARTUP : + mtk_dp->train_state =MTK_DP_TRAIN_STATE_CHECKCAP ; +break ; + +case MTK_DP_TRAIN_STATE_CHECKCAP : +if (mtk_dp_parse_capabilities (mtk_dp)) { + mtk_dp->train_info.check_cap_count =0 ; + mtk_dp->train_state =MTK_DP_TRAIN_STATE_CHECKEDID ; + }else { + mtk_dp->train_info.check_cap_count++; + +if (mtk_dp->train_info.check_cap_count > +MTK_DP_CHECK_SINK_CAP_TIMEOUT_COUNT ) { + mtk_dp->train_info.check_cap_count =0 ; + mtk_dp->train_state =MTK_DP_TRAIN_STATE_DPIDLE ; + ret = -ETIMEDOUT ; + } + } +break ; + +case MTK_DP_TRAIN_STATE_CHECKEDID : + mtk_dp->train_state =MTK_DP_TRAIN_STATE_TRAINING_PRE ; +break ; + +case MTK_DP_TRAIN_STATE_TRAINING_PRE : + mtk_dp->train_state =MTK_DP_TRAIN_STATE_TRAINING ; +break ; + +case MTK_DP_TRAIN_STATE_TRAINING : + ret =mtk_dp_train_start (mtk_dp); +if (!ret) { +mtk_dp_video_mute (mtk_dp, true); + mtk_dp->train_state =MTK_DP_TRAIN_STATE_NORMAL ; +mtk_dp_fec_enable (mtk_dp, mtk_dp->has_fec); + }else if (ret != -EAGAIN ) { + mtk_dp->train_state =MTK_DP_TRAIN_STATE_DPIDLE ; + } + + ret =0 ; +break ; + +case MTK_DP_TRAIN_STATE_NORMAL : +break ; +case MTK_DP_TRAIN_STATE_DPIDLE : +break ;
drivers/gpu/drm/mediatek/mtk_dp.c line 1610
Quoted 10 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +10
-0+default : +break ; + } + } + +if (ret) +drm_err (mtk_dp->drm_dev,"Train handler failed %d\n" , ret); + +return ret; +}
I'm not really familiar with displayport, but it looks like you're hand-rolling a significant part of what the drm_dp_* helpers provide.
Quoted 88 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +88
-0+static void mtk_dp_video_enable (struct mtk_dp *mtk_dp,bool enable) +{ +if (enable) { +mtk_dp_set_tx_out (mtk_dp); +mtk_dp_video_mute (mtk_dp, false); + }else { +mtk_dp_video_mute (mtk_dp, true); + } +} + +static void mtk_dp_video_config (struct mtk_dp *mtk_dp) +{ +mtk_dp_mn_overwrite_disable (mtk_dp); + +mtk_dp_set_msa (mtk_dp); + +mtk_dp_set_color_depth (mtk_dp, mtk_dp->info.depth); +mtk_dp_set_color_format (mtk_dp, mtk_dp->info.format); +} + +static void mtk_dp_state_handler (struct mtk_dp *mtk_dp) +{ +switch (mtk_dp->state) { +case MTK_DP_STATE_INITIAL : +mtk_dp_video_mute (mtk_dp, true); + mtk_dp->state =MTK_DP_STATE_IDLE ; +break ; + +case MTK_DP_STATE_IDLE : +if (mtk_dp->train_state ==MTK_DP_TRAIN_STATE_NORMAL ) + mtk_dp->state =MTK_DP_STATE_PREPARE ; +break ; + +case MTK_DP_STATE_PREPARE : +mtk_dp_video_config (mtk_dp); +mtk_dp_video_enable (mtk_dp, true); + + mtk_dp->state =MTK_DP_STATE_NORMAL ; +break ; + +case MTK_DP_STATE_NORMAL : +if (mtk_dp->train_state !=MTK_DP_TRAIN_STATE_NORMAL ) { +mtk_dp_video_mute (mtk_dp, true); + mtk_dp->state =MTK_DP_STATE_IDLE ; + } +break ; + +default : +break ; + } +} + +static void mtk_dp_init_port (struct mtk_dp *mtk_dp) +{ +mtk_dp_set_idle_pattern (mtk_dp, true); +mtk_dp_initialize_priv_data (mtk_dp); + +mtk_dp_initialize_settings (mtk_dp); +mtk_dp_initialize_aux_settings (mtk_dp); +mtk_dp_initialize_digital_settings (mtk_dp); +mtk_dp_update_bits (mtk_dp,MTK_DP_AUX_P0_3690 , +BIT (RX_REPLY_COMPLETE_MODE_AUX_TX_P0_SHIFT ), +RX_REPLY_COMPLETE_MODE_AUX_TX_P0_MASK ); +mtk_dp_initialize_hpd_detect_settings (mtk_dp); + +mtk_dp_digital_sw_reset (mtk_dp); +} + +static int mtk_dp_dt_parse (struct mtk_dp *mtk_dp, +struct platform_device *pdev) +{ +struct device *dev = &pdev->dev; +int ret =0 ; +void __iomem *base; + + base =devm_platform_ioremap_resource (pdev,0 ); +if (IS_ERR (base)) +return PTR_ERR (base); + + mtk_dp->regs =syscon_node_to_regmap (dev->of_node); +if (IS_ERR (mtk_dp->regs)) +return PTR_ERR (mtk_dp->regs); + +//TODO: optional clock? + mtk_dp->dp_tx_clk =devm_clk_get (dev,"faxi" ); +if (IS_ERR (mtk_dp->dp_tx_clk)) { + ret =PTR_ERR (mtk_dp->dp_tx_clk); +dev_info (dev,"Failed to get dptx clock: %d\n" , ret);
drivers/gpu/drm/mediatek/mtk_dp.c line 1709
Quoted 10 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +10
-0+ mtk_dp->dp_tx_clk =NULL ; + } + +return 0 ; +} + +static enum drm_connector_status mtk_dp_bdg_detect (struct drm_bridge *bridge) +{ +return connector_status_connected; +}
I'm not quite sure what's going on there. You seem to have some support for HPD interrupts above, but you always report the display as connected?
I'd assume that either you don't have HPD support and then always report it as connected, or you have HPD support and report the current status in detect, but that combination seems weird.
Quoted 8 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +8
-0+static struct edid *mtk_dp_get_edid (struct drm_bridge *bridge, +struct drm_connector *connector) +{ +struct mtk_dp *mtk_dp =mtk_dp_from_bridge (bridge); +bool enabled = mtk_dp->enabled; +struct edid *new_edid =NULL ; + +if (!enabled)
drivers/gpu/drm/mediatek/mtk_dp.c line 1728
Quoted 10 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +10
-0+drm_bridge_chain_pre_enable (bridge); + +drm_dp_dpcd_writeb (&mtk_dp->aux,DP_SET_POWER ,DP_SET_POWER_D0 ); +usleep_range (2000 ,5000 ); + +if (mtk_dp_plug_state (mtk_dp)) + new_edid =drm_get_edid (connector, &mtk_dp->aux.ddc); + +if (!enabled) +drm_bridge_chain_post_disable (bridge);
Are you sure we can't get a mode set while get_edid is called?
If we can, then you could end up disabling the device while it's being powered on.
drivers/gpu/drm/mediatek/mtk_dp.c line 1740
Quoted 11 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +11
-0+mutex_lock (&mtk_dp->edid_lock); +kfree (mtk_dp->edid); + mtk_dp->edid =NULL ; + +if (!new_edid) { +mutex_unlock (&mtk_dp->edid_lock); +return NULL ; + } + + mtk_dp->edid =drm_edid_duplicate (new_edid); +mutex_unlock (&mtk_dp->edid_lock);
Why do you need a copy of the edid there?
Quoted 176 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +176
-0+return new_edid; +} + +static ssize_t mtk_dp_aux_transfer (struct drm_dp_aux *mtk_aux, +struct drm_dp_aux_msg *msg) +{ +struct mtk_dp *mtk_dp; +bool is_read; +u8 request; +size_t accessed_bytes =0 ; +int retry =3 , ret =0 ; + + mtk_dp = container_of(mtk_aux, struct mtk_dp, aux); + +if (!mtk_dp->train_info.cable_plugged_in || + mtk_dp->train_info.irq_status &MTK_DP_HPD_DISCONNECT ) { + mtk_dp->train_state =MTK_DP_TRAIN_STATE_CHECKCAP ; + ret = -EAGAIN ; + goto err; + } + +switch (msg->request) { +case DP_AUX_I2C_MOT : +case DP_AUX_I2C_WRITE : +case DP_AUX_NATIVE_WRITE : +case DP_AUX_I2C_WRITE_STATUS_UPDATE : +case DP_AUX_I2C_WRITE_STATUS_UPDATE |DP_AUX_I2C_MOT : + request = msg->request & ~DP_AUX_I2C_WRITE_STATUS_UPDATE ; + is_read = false; +break ; +case DP_AUX_I2C_READ : +case DP_AUX_NATIVE_READ : +case DP_AUX_I2C_READ |DP_AUX_I2C_MOT : + request = msg->request; + is_read = true; +break ; +default : +drm_err (mtk_aux->drm_dev,"invalid aux cmd = %d\n" , + msg->request); + ret = -EINVAL ; + goto err; + } + +if (msg->size ==0 ) { + ret =mtk_dp_aux_do_transfer (mtk_dp, is_read, request, + msg->address + accessed_bytes, + msg->buffer + accessed_bytes,0 ); + }else { +while (accessed_bytes < msg->size) { +size_t to_access = +min_t (size_t,DP_AUX_MAX_PAYLOAD_BYTES , + msg->size - accessed_bytes); +while (retry--) { + ret =mtk_dp_aux_do_transfer (mtk_dp, + is_read, request, + msg->address + accessed_bytes, + msg->buffer + accessed_bytes, + to_access); +if (ret ==0 ) +break ; +usleep_range (50 ,100 ); + } +if (!retry || ret) { +drm_info (mtk_dp->drm_dev, +"Failed to do AUX transfer: %d\n" , + ret); +break ; + } + accessed_bytes += to_access; + } + } +err: +if (ret) { + msg->reply =DP_AUX_NATIVE_REPLY_NACK |DP_AUX_I2C_REPLY_NACK ; +return ret; + } + + msg->reply =DP_AUX_NATIVE_REPLY_ACK |DP_AUX_I2C_REPLY_ACK ; +return msg->size; +} + +static void mtk_dp_poweroff (struct mtk_dp *mtk_dp) +{ +mutex_lock (&mtk_dp->dp_lock); + +mtk_dp_hwirq_enable (mtk_dp, false); +mtk_dp_power_disable (mtk_dp); +phy_exit (mtk_dp->phy); +clk_disable_unprepare (mtk_dp->dp_tx_clk); + +mutex_unlock (&mtk_dp->dp_lock); +} + +static int mtk_dp_poweron (struct mtk_dp *mtk_dp) +{ +int ret =0 ; + +mutex_lock (&mtk_dp->dp_lock); + + ret =clk_prepare_enable (mtk_dp->dp_tx_clk); +if (ret <0 ) { +dev_err (mtk_dp->dev,"Fail to enable clock: %d\n" , ret); + goto err; + } + ret =phy_init (mtk_dp->phy); +if (ret) { +dev_err (mtk_dp->dev,"Failed to initialize phy: %d\n" , ret); + goto err_phy_init; + } + ret =mtk_dp_phy_configure (mtk_dp,MTK_DP_LINKRATE_RBR ,1 ); +if (ret) { +dev_err (mtk_dp->dev,"Failed to configure phy: %d\n" , ret); + goto err_phy_config; + } + +mtk_dp_init_port (mtk_dp); +mtk_dp_power_enable (mtk_dp); +mtk_dp_hwirq_enable (mtk_dp, true); + +err_phy_config: +phy_exit (mtk_dp->phy); +err_phy_init: +clk_disable_unprepare (mtk_dp->dp_tx_clk); +err: +mutex_unlock (&mtk_dp->dp_lock); +return ret; +} + +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; + + ret =mtk_dp_poweron (mtk_dp); +if (ret) +return ret; + +if (!(flags &DRM_BRIDGE_ATTACH_NO_CONNECTOR )) { +dev_err (mtk_dp->dev,"Driver does not provide a connector!" ); +return -EINVAL ; + } + +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, +"Failed to attach external bridge: %d\n" , ret); +return ret; + } + } + + mtk_dp->drm_dev = bridge->dev; + +return 0 ; +} + +static void mtk_dp_bridge_detach (struct drm_bridge *bridge) +{ +struct mtk_dp *mtk_dp =mtk_dp_from_bridge (bridge); + + mtk_dp->drm_dev =NULL ; +} + +static void mtk_dp_bridge_atomic_disable (struct drm_bridge *bridge, +struct drm_bridge_state *old_state) +{ +struct mtk_dp *mtk_dp =mtk_dp_from_bridge (bridge); + +mtk_dp_video_mute (mtk_dp, true); + mtk_dp->state =MTK_DP_STATE_IDLE ; + mtk_dp->train_state =MTK_DP_TRAIN_STATE_STARTUP ; + + mtk_dp->enabled = false; +msleep (100 );
drivers/gpu/drm/mediatek/mtk_dp.c line 1927
Quoted 10 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +10
-0+mtk_dp_poweroff (mtk_dp); +} + +static void mtk_dp_parse_drm_mode_timings (struct mtk_dp *mtk_dp, +struct drm_display_mode *mode) +{ +struct mtk_dp_timings *timings = &mtk_dp->info.timings; + +drm_display_mode_to_videomode (mode, &timings->vm); + timings->frame_rate = mode->clock *1000 / mode->htotal / mode->vtotal;
drm_mode_vrefresh()
drivers/gpu/drm/mediatek/mtk_dp.c line 1930
Quoted 3 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +3
-0+ timings->htotal = mode->htotal; + timings->vtotal = mode->vtotal; +}
It's not really clear to me why you need to duplicate drm_display_mode here?
Quoted 36 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +36
-0+static void mtk_dp_bridge_atomic_enable (struct drm_bridge *bridge, +struct drm_bridge_state *old_state) +{ +struct mtk_dp *mtk_dp =mtk_dp_from_bridge (bridge); +struct drm_connector_state *conn_state; +struct drm_crtc *crtc; +struct drm_crtc_state *crtc_state; + + mtk_dp->conn =drm_atomic_get_new_connector_for_encoder (old_state->base.state, + bridge->encoder); +if (!mtk_dp->conn) { +drm_err (mtk_dp->drm_dev, +"Can't enable bridge as connector is missing\n" ); +return ; + } + +memcpy (mtk_dp->connector_eld, mtk_dp->conn->eld,MAX_ELD_BYTES ); + + conn_state = +drm_atomic_get_new_connector_state (old_state->base.state, mtk_dp->conn); +if (!conn_state) { +drm_err (mtk_dp->drm_dev, +"Can't enable bridge as connector state is missing\n" ); +return ; + } + + crtc = conn_state->crtc; +if (!crtc) { +drm_err (mtk_dp->drm_dev, +"Can't enable bridge as connector state doesn't have a crtc\n" ); +return ; + } + + crtc_state =drm_atomic_get_new_crtc_state (old_state->base.state, crtc); +if (!crtc_state) { + drm_err(mtk_dp->drm_dev,
drivers/gpu/drm/mediatek/mtk_dp.c line 1977
Quoted 10 lines
drivers/gpu/drm/mediatek/mtk_dp.c new file +10
-0+ "Can't enable bridge as crtc state is missing\n"); +return ; + } + +mtk_dp_parse_drm_mode_timings (mtk_dp, &crtc_state->adjusted_mode); +if (!mtk_dp_parse_capabilities (mtk_dp)) { +drm_err (mtk_dp->drm_dev, +"Can't enable bridge as nothing is plugged in\n" ); +return ; + }
All this needs to be done in atomic_check. You aren't allowed to fail in atomic_enable.
Maxime