Initial support Cadence MHDP8501(HDMI/DP) for i.MX8MQ
Subsystems (7)
v20 cover Initial support Cadence MHDP8501(HDMI/DP) for i.MX8MQ
The patch set initial support Cadence MHDP8501(HDMI/DP) DRM bridge driver and Cadence HDP-TX PHY(HDMI/DP) driver for Freescale i.MX8MQ.
The patch set compose of DRM bridge drivers and PHY driver.
Both of them need by patch #1 and #3 to pass build.
DRM bridges driver patches:
#1: soc: cadence: Create helper functions for Cadence MHDP #2: drm: bridge: cadence: Update mhdp8546 mailbox access functions #3: phy: Add HDMI configuration options
#4: dt-bindings: display: bridge: Add Cadence MHDP8501 #5: drm: bridge: Cadence: Add MHDP8501 DP/HDMI driver
PHY driver patches:
#1: soc: cadence: Create helper functions for Cadence MHDP #3: phy: Add HDMI configuration options
#6: dt-bindings: phy: Add Freescale iMX8MQ DP and HDMI PHY #7: phy: freescale: Add DisplayPort/HDMI Combo-PHY driver for i.MX8MQ
i.MX8M/TQMa8Mx DT patches:
#8: Add DT nodes for DCSS/HDMI pipeline
#9: Enable HDMI for TQMa8Mx/MBa8Mx
v19->v20:
Patch #1: soc: cadence: Create helper functions for Cadence MHDP Patch #2: drm: bridge: cadence: Update mhdp8546 mailbox access functions
- The two patches are split from Patch #1 in v19.
The MHDP helper functions have been moved in a new "cadence" directory under the SOC directory in patch #1, in order to promote code reuse among MHDP8546, MHDP8501, and the i.MX8MQ HDMI/DP PHY drivers,
Patch #3: phy: Add HDMI configuration options
- Add a-b tag
Patch #4: dt-bindings: display: bridge: Add Cadence MHDP8501
- remove data type link of data-lanes
Patch #5: drm: bridge: Cadence: Add MHDP8501 DP/HDMI driver
- Dump mhdp FW version by debugfs
- Combine HDMI and DP cable detect functions into one function
- Combine HDMI and DP cable bridge_mode_valid() functions into one function
- Rename cdns_hdmi_reset_link() to cdns_hdmi_handle_hotplug()
- Add comments for EDID in cdns_hdmi_handle_hotplug() and cdns_dp_check_link_state()
- Add atomic_get_input_bus_fmts() and bridge_atomic_check() for DP driver
- Remove bpc and color_fmt init in atomic_enable() function.
- More detail comments for DDC adapter only support SCDC_I2C_SLAVE_ADDRESS read and write in HDMI driver.
Patch #7: phy: freescale: Add DisplayPort/HDMI Combo-PHY driver for i.MX8MQ
- implify DP configuration handling by directly copying
the configuration options to the driver's internal structure.
- return the error code directly instead of logging an error message in hdptx_clk_enable
- Remove redundant ref_clk_rate check
v18->v19:
Patch #1
- use guard(mutex)
- Add kerneldocs for all new APIs.
- Detail comments for mailbox access specific case.
- remove cdns_mhdp_dp_reg_write() because it is not needed by driver now.
Patch #3
- move property data-lanes to endpoint of port@1
Patch #4
- get endpoint for data-lanes as it had move to endpoint of port@1
- update clock management as devm_clk_get_enabled() introduced.
- Fix clear_infoframe() function is not work issue.
- Manage PHY power state via phy_power_on() and phy_power_off().
Patch #6
- Simplify the PLL table by removing unused and constant data
- Remove PHY power management, controller driver will handle them.
- Remove enum dp_link_rate
- introduce read_pll_timeout.
- update clock management as devm_clk_get_enabled() introduced.
- remove cdns_hdptx_phy_init() and cdns_hdptx_phy_remove().
Patch #8:
- move property data-lanes to endpoint of port@1
v17->v18:
Patch #1
- Create three ordinary mailbox access APIs cdns_mhdp_mailbox_send
cdns_mhdp_mailbox_send_recv cdns_mhdp_mailbox_send_recv_multi
- Create three secure mailbox access APIs cdns_mhdp_secure_mailbox_send cdns_mhdp_secure_mailbox_send_recv cdns_mhdp_secure_mailbox_send_recv_multi
- MHDP8546 DP and HDCP commands that need access mailbox are rewrited with above 6 API functions.
Patch #3
- remove lane-mapping and replace it with data-lanes
- remove r-b tag as property changed.
Patch #4
- MHDP8501 HDMI and DP commands that need access mailbox are rewrited with new API functions created in patch #1.
- replace lane-mapping with data-lanes, use the value from data-lanes to reorder HDMI and DP lane mapping.
- create I2C adapter for HDMI SCDC, remove cdns_hdmi_scdc_write() function.
- Rewrite cdns_hdmi_sink_config() function, use HDMI SCDC helper function drm_scdc_set_high_tmds_clock_ratio() and drm_scdc_set_scrambling() to config HDMI sink TMDS.
- Remove struct video_info from HDMI driver.
- Remove tmds_char_rate_valid() be called in bridge_mode_valid(), community had patch in reviewing to implement the function.
- Remove warning message print when get unknown HPD cable status.
- Add more detail comments for HDP plugin and plugout interrupt.
- use dev_dbg to repleace DRM_INFO when cable HPD status changed.
- Remove t-b tag as above code change.
Patch #6
- fix build error as code rebase to latest kernel version.
Patch #8:
- replace lane-mapping with data-lanes
v16->v17:
Patch #1:
- Replaces the local mutex mbox_mutex with a global mutex mhdp_mailbox_mutex
Patch #2:
- remove hdmi.h
- add 2024 year to copyright
- Add r-b tag.
Patch #3:
- Add lane-mapping property.
Patch #4:
- Reset the HDMI/DP link when an HPD (Hot Plug Detect) event is detected
- Move the HDMI protocol settings from hdmi_ctrl_init() to a new function cdns_hdmi_set_hdmi_mode_type(), to align with the introduced link reset functionality.
- Implement logic to check the type of HDMI sink.
If the sink is not a hdmi display, set the default mode to DVI.
- Implement hdmi_reset_infoframe function
- Reorder certain bit definitions in the header file to follow a descending order.
- Add "lane-mapping" property for both HDMI and DP, remove platform data from driver.
lane-mapping should be setting in dts according different board layout.
- Remove variable mode in struct cdns_mhdp8501_device, video mode could get from struct drm_crtc_state
- Remove variable char_rate in struct cdns_mhdp8501_device, it could get from struct struct drm_connector_state.hdmi
- Replaces the local mutex mbox_mutex with a global mutex mhdp_mailbox_mutex
- Remove mutext protect for phy_api access functions.
Patch #6:
- Remove mbox_mutex
v15->v16:
Patch #2:
- Remove pixel_clk_rate, bpc and color_space fields from struct phy_configure_opts_hdmi, they were replaced by unsigned long long tmds_char_rate.
- Remove r-b and a-c tags because this patch have important change. Patch #4:
- Add DRM_BRIDGE_OP_HDMI flags for HDMI driver,
- Introduce the hdmi info frame helper functions,
added hdmi_clear_infoframe(), hdmi_write_infoframe() and hdmi_tmds_char_rate_valid() according Dmitry's patch 'make use of the HDMI connector infrastructure' patchset ([2]).
- mode_fixup() is replaced by atomic_check().
- Fix video mode 4Kp30 did not work on some displays that support LTE_340Mcsc_scramble.
- updated for tmds_char_rate added in patch #2.
Patch #6:
- updated for tmds_char_rate added in patch #2.
v14->v15:
Patch #6 + #7:
- Merged PHY driver into a single combo PHY driver Patch #7 + #8:
- Add DT patches for a running HDMI setup
v13->v14:
Patch #4:
- Rebase to next-20240219, replace get_edid function by edid_read function as commits d807ad80d811b ("drm/bridge: add ->edid_read hook and drm_bridge_edid_read()") and 27b8f91c08d99 ("drm/bridge:
remove ->get_edid callback") had change the API.
v12->v13:
Patch #4:
- Explicitly include linux/platform_device.h for cdns-mhdp8501-core.c
- Fix build warning
- Order bit bpc and color_space in descending shit.
Patch #7:
- Fix build warning
v11->v12:
Patch #1:
- Move status initialize out of mbox_mutex.
- Reorder API functions in alphabetical.
- Add notes for malibox access functions.
- Add year 2024 to copyright.
Patch #4:
- Replace DRM_INFO with dev_info or dev_warn.
- Replace DRM_ERROR with dev_err.
- Return ret when cdns_mhdp_dpcd_read failed in function cdns_dp_aux_transferi().
- Remove unused parmeter in function cdns_dp_get_msa_misc
and use two separate variables for color space and bpc.
- Add year 2024 to copyright.
Patch #6:
- Return error code to replace -1 for function wait_for_ack().
- Set cdns_phy->power_up = false in phy_power_down function.
- Remove "RATE_8_1 = 810000", it is not used in driver.
- Add year 2024 to copyright.
Patch #7:
- Adjust clk disable order.
- Return error code to replace -1 for function wait_for_ack().
- Use bool for variable pclk_in.
- Add year 2024 to copyright.
v10->v11:
- rewrite cdns_mhdp_set_firmware_active() in mhdp8546 core driver, use cdns_mhdp_mailbox_send() to replace cdns_mhdp_mailbox_write() same as the other mailbox access functions.
- use static for cdns_mhdp_mailbox_write() and cdns_mhdp_mailbox_read() and remove them from EXPORT_SYMBOL_GPL().
- remove MODULE_ALIAS() from mhdp8501 driver.
v9->v10:
- Create mhdp helper driver to replace macro functions, move all mhdp mailbox access functions and common functions into the helper driver.
Patch #1:drm: bridge: Cadence: Creat mhdp helper driver it is totaly different with v9.
v8->v9:
- Remove compatible string "cdns,mhdp8501" that had removed from dt-bindings file in v8.
- Add Dmitry's R-b tag to patch #2
- Add Krzysztof's R-b tag to patch #3
v7->v8:
MHDP8501 HDMI/DP:
- Correct DT node name to "display-bridge".
- Remove "cdns,mhdp8501" from mhdp8501 dt-binding doc.
HDMI/DP PHY:
- Introduced functions wait_for_ack and wait_for_ack_clear to handle waiting with acknowledgment bits set and cleared respectively.
- Use FIELD_PRE() to set bitfields for both HDMI and DP PHY.
v6->v7:
MHDP8501 HDMI/DP:
- Combine HDMI and DP driver into one mhdp8501 driver. Use the connector type to load the corresponding functions.
- Remove connector init functions.
- Add <linux/hdmi.h> in phy_hdmi.h to reuse 'enum hdmi_colorspace'.
HDMI/DP PHY:
- Lowercase hex values
- Fix parameters indent issue on some functions
- Replace 'udelay' with 'usleep_range'
v5->v6:
HDMI/DP bridge driver
- 8501 is the part number of Cadence MHDP on i.MX8MQ.
Use MHDP8501 to name hdmi/dp drivers and files.
- Add compatible "fsl,imx8mq-mhdp8501-dp" for i.MX8MQ DP driver
- Add compatible "fsl,imx8mq-mhdp8501-hdmi" for i.MX8MQ HDMI driver
- Combine HDMI and DP dt-bindings into one file cdns,mhdp8501.yaml
- Fix HDMI scrambling is not enable issue when driver working in 4Kp60 mode.
- Add HDMI/DP PHY API mailbox protect.
HDMI/DP PHY driver:
- Rename DP and HDMI PHY files and move to folder phy/freescale/
- Remove properties num_lanes and link_rate from DP PHY driver.
- Combine HDMI and DP dt-bindings into one file fsl,imx8mq-dp-hdmi-phy.yaml
- Update compatible string to "fsl,imx8mq-dp-phy".
- Update compatible string to "fsl,imx8mq-hdmi-phy".
v4->v5:
- Drop "clk" suffix in clock name.
- Add output port property in the example of hdmi/dp.
v3->v4:
dt-bindings:
- Correct dt-bindings coding style and address review comments.
- Add apb_clk description.
- Add output port for HDMI/DP connector
PHY:
- Alphabetically sorted in Kconfig and Makefile for DP and HDMI PHY
- Remove unused registers define from HDMI and DP PHY drivers.
- More description in phy_hdmi.h.
- Add apb_clk to HDMI and DP phy driver.
HDMI/DP:
- Use get_unaligned_le32() to replace hardcode type conversion in HDMI AVI infoframe data fill function.
- Add mailbox mutex lock in HDMI/DP driver for phy functions to reslove race conditions between HDMI/DP and PHY drivers.
- Add apb_clk to both HDMI and DP driver.
- Rename some function names and add prefix with "cdns_hdmi/cdns_dp".
- Remove bpc 12 and 16 optional that not supported.
v2->v3:
Address comments for dt-bindings files.
- Correct dts-bindings file names
Rename phy-cadence-hdptx-dp.yaml to cdns,mhdp-imx8mq-dp.yaml Rename phy-cadence-hdptx-hdmi.yaml to cdns,mhdp-imx8mq-hdmi.yaml
- Drop redundant words and descriptions.
- Correct hdmi/dp node name.
v2 is a completely different version compared to v1. Previous v1 can be available here [1].
v1->v2:
- Reuse Cadence mailbox access functions from mhdp8546 instead of rockchip DP.
- Mailbox access functions be convert to marco functions that will be referenced by HDP-TX PHY(HDMI/DP) driver too.
- Plain bridge instead of component driver.
- Standalone Cadence HDP-TX PHY(HDMI/DP) driver.
- Audio driver are removed from the patch set, it will be add in another patch set later.
[1] https://patchwork.kernel.org/project/linux-rockchip/cover/[email protected]/
Alexander Stein (2):
arm64: dts: imx8mq: Add DCSS + HDMI/DP display pipeline
arm64: dts: imx8mq: tqma8mq-mba8mx: Enable HDMI support
Sandor Yu (7):
soc: cadence: Create helper functions for Cadence MHDP
drm: bridge: cadence: Update mhdp8546 mailbox access functions
phy: Add HDMI configuration options
dt-bindings: display: bridge: Add Cadence MHDP8501
drm: bridge: Cadence: Add MHDP8501 DP/HDMI driver
dt-bindings: phy: Add Freescale iMX8MQ DP and HDMI PHY
phy: freescale: Add DisplayPort/HDMI Combo-PHY driver for i.MX8MQ
.../display/bridge/cdns,mhdp8501.yaml | 121 ++ .../bindings/phy/fsl,imx8mq-dp-hdmi-phy.yaml | 51 + .../dts/freescale/imx8mq-tqma8mq-mba8mx.dts | 26 + arch/arm64/boot/dts/freescale/imx8mq.dtsi | 68 + arch/arm64/boot/dts/freescale/mba8mx.dtsi | 11 + drivers/gpu/drm/bridge/cadence/Kconfig | 17 + drivers/gpu/drm/bridge/cadence/Makefile | 2 + .../drm/bridge/cadence/cdns-mhdp8501-core.c | 379 +++++ .../drm/bridge/cadence/cdns-mhdp8501-core.h | 380 +++++ .../gpu/drm/bridge/cadence/cdns-mhdp8501-dp.c | 694 ++++++++++ .../drm/bridge/cadence/cdns-mhdp8501-hdmi.c | 745 ++++++++++ .../drm/bridge/cadence/cdns-mhdp8546-core.c | 487 ++----- .../drm/bridge/cadence/cdns-mhdp8546-core.h | 47 +- .../drm/bridge/cadence/cdns-mhdp8546-hdcp.c | 212 +-- .../drm/bridge/cadence/cdns-mhdp8546-hdcp.h | 18 +- drivers/phy/freescale/Kconfig | 10 + drivers/phy/freescale/Makefile | 1 + drivers/phy/freescale/phy-fsl-imx8mq-hdptx.c | 1231 +++++++++++++++++ drivers/soc/Kconfig | 1 + drivers/soc/Makefile | 1 + drivers/soc/cadence/Kconfig | 9 + drivers/soc/cadence/Makefile | 3 + drivers/soc/cadence/cdns-mhdp-helper.c | 565 ++++++++ include/linux/phy/phy-hdmi.h | 19 + include/linux/phy/phy.h | 7 +- include/soc/cadence/cdns-mhdp-helper.h | 129 ++ 26 files changed, 4572 insertions(+), 662 deletions(-) create mode 100644 Documentation/devicetree/bindings/display/bridge/cdns,mhdp8501.yaml create mode 100644 Documentation/devicetree/bindings/phy/fsl,imx8mq-dp-hdmi-phy.yaml create mode 100644 drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c create mode 100644 drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.h create mode 100644 drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-dp.c create mode 100644 drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c create mode 100644 drivers/phy/freescale/phy-fsl-imx8mq-hdptx.c create mode 100644 drivers/soc/cadence/Kconfig create mode 100644 drivers/soc/cadence/Makefile create mode 100644 drivers/soc/cadence/cdns-mhdp-helper.c create mode 100644 include/linux/phy/phy-hdmi.h create mode 100644 include/soc/cadence/cdns-mhdp-helper.h
Signature · 1 line
2.34.1
PATCH v20 1/9 soc: cadence: Create helper functions for Cadence MHDP
Cadence MHDP IP includes a firmware. Driver and firmware communicate through a mailbox. The basic mailbox access functions in this patch are derived from the DRM bridge MHDP8546 driver.
New mailbox access functions have been created based on different mailbox return values and security types, making them reusable across different MHDP driver versions and SOCs.
These helper fucntions will be reused in both the DRM bridge driver MDHP8501 and the i.MX8MQ HDPTX PHY driver.
Six mailbox access helper functions are introduced. Three for non-secure mailbox access:
- cdns_mhdp_mailbox_send()
- cdns_mhdp_mailbox_send_recv()
- cdns_mhdp_mailbox_send_recv_multi()
The other three for secure mailbox access:
- cdns_mhdp_secure_mailbox_send()
- cdns_mhdp_secure_mailbox_send_recv()
- cdns_mhdp_secure_mailbox_send_recv_multi()
All MHDP commands that need to be passed through the mailbox should be rewritten using these new helper functions.
The register read/write and DP DPCD read/write command functions are also included in this new helper driver.
---v19->v20:
- new patch in v20.
The patch split from Patch #1 in v19 and move to a new folder drivers/soc/cadence
drivers/soc/Kconfig | 1 + drivers/soc/Makefile | 1 + drivers/soc/cadence/Kconfig | 9 + drivers/soc/cadence/Makefile | 3 + drivers/soc/cadence/cdns-mhdp-helper.c | 565 +++++++++++++++++++++++++ include/soc/cadence/cdns-mhdp-helper.h | 129 ++++++ 6 files changed, 708 insertions(+) create mode 100644 drivers/soc/cadence/Kconfig create mode 100644 drivers/soc/cadence/Makefile create mode 100644 drivers/soc/cadence/cdns-mhdp-helper.c create mode 100644 include/soc/cadence/cdns-mhdp-helper.h
drivers/soc/Kconfig +1 -0
@@ -6,6 +6,7 @@ source "drivers/soc/apple/Kconfig" source "drivers/soc/aspeed/Kconfig" source "drivers/soc/atmel/Kconfig" source "drivers/soc/bcm/Kconfig" +source "drivers/soc/cadence/Kconfig" source "drivers/soc/canaan/Kconfig" source "drivers/soc/cirrus/Kconfig" source "drivers/soc/fsl/Kconfig"
drivers/soc/Makefile +1 -0
@@ -7,6 +7,7 @@ obj-y += apple/ obj-y += aspeed/ obj-$(CONFIG_ARCH_AT91) += atmel/ obj-y += bcm/ +obj-y += cadence/ obj-$(CONFIG_ARCH_CANAAN) += canaan/ obj-$(CONFIG_EP93XX_SOC) += cirrus/ obj-$(CONFIG_ARCH_DOVE) += dove/
drivers/soc/cadence/Kconfig new file +9 -0
@@ -0,0 +1,9 @@ +# SPDX-License-Identifier: GPL-2.0 + +config CDNS_MHDP_HELPER + tristate "Cadence MHDP Helper driver" + help + Enable Cadence MHDP helpers for mailbox, HDMI and DP. + This driver provides a foundational layer of mailbox communication for + various Cadence MHDP IP implementations, such as HDMI and DisplayPort. +
drivers/soc/cadence/Makefile new file +3 -0
@@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0-only + +obj-$(CONFIG_CDNS_MHDP_HELPER) += cdns-mhdp-helper.o
drivers/soc/cadence/cdns-mhdp-helper.c new file +565 -0
565 lines not on this page · raw message
include/soc/cadence/cdns-mhdp-helper.h new file +129 -0
129 lines not on this page · raw message
Signature · 1 line
2.34.1
Re: [PATCH v20 1/9] soc: cadence: Create helper functions for Cadence MHDP
Quoted 23 lines · Sandor Yu
Cadence MHDP IP includes a firmware. Driver and firmware communicate through a mailbox. The basic mailbox access functions in this patch are derived from the DRM bridge MHDP8546 driver.
New mailbox access functions have been created based on different mailbox return values and security types, making them reusable across different MHDP driver versions and SOCs.These helper fucntions will be reused in both the DRM bridge driver MDHP8501 and the i.MX8MQ HDPTX PHY driver.
Six mailbox access helper functions are introduced. Three for non-secure mailbox access:
-cdns_mhdp_mailbox_send()
-cdns_mhdp_mailbox_send_recv()
-cdns_mhdp_mailbox_send_recv_multi()
The other three for secure mailbox access:
-cdns_mhdp_secure_mailbox_send()
-cdns_mhdp_secure_mailbox_send_recv()
-cdns_mhdp_secure_mailbox_send_recv_multi()All MHDP commands that need to be passed through the mailbox should be rewritten using these new helper functions.
Quoted 8 lines
The register read/write and DP DPCD read/write command functions are also included in this new helper driver.
Signed-off-by Sandor Yu <[email protected]>---
v19->v20:
- new patch in v20.
The patch split from Patch #1 in v19 and move to a new folderdrivers/soc/cadence
It makes it harder to review, but granted that we have already past that, I think it's fine.
drivers/soc/cadence/Kconfig line 4
Quoted 11 lines
drivers/soc/cadence/Kconfig new file +4
-0@@ -0,0 +1,9 @@ +# SPDX-License-Identifier: GPL-2.0 + +config CDNS_MHDP_HELPER + tristate "Cadence MHDP Helper driver"
This symbol isn't supposed to be selected by the user. Please leave just tristate without the menu entry text (the help text is fine, please keep it).
LGTM otherwise.
Quoted 5 lines
drivers/soc/cadence/Kconfig new file +5
-0+ help + Enable Cadence MHDP helpers for mailbox, HDMI and DP. + This driver provides a foundational layer of mailbox communication for + various Cadence MHDP IP implementations, such as HDMI and DisplayPort. +
Signature · 2 lines
With best wishes Dmitry
RE: [EXT] Re: [PATCH v20 1/9] soc: cadence: Create helper functions for Cadence MHDP
Quoted 53 lines · Sandor Yu
Quoted 26 lines
Cadence MHDP IP includes a firmware. Driver and firmware communicate through a mailbox. The basic mailbox access functions in this patch are derived from the DRM bridge MHDP8546 driver.
New mailbox access functions have been created based on different mailbox return values and security types, making them reusable across different MHDP driver versions and SOCs.These helper fucntions will be reused in both the DRM bridge driver MDHP8501 and the i.MX8MQ HDPTX PHY driver.
Six mailbox access helper functions are introduced. Three for non-secure mailbox access:
-cdns_mhdp_mailbox_send()
-cdns_mhdp_mailbox_send_recv()
-cdns_mhdp_mailbox_send_recv_multi()
The other three for secure mailbox access:
-cdns_mhdp_secure_mailbox_send()
-cdns_mhdp_secure_mailbox_send_recv()
-cdns_mhdp_secure_mailbox_send_recv_multi()All MHDP commands that need to be passed through the mailbox should be rewritten using these new helper functions.
The register read/write and DP DPCD read/write command functions are also included in this new helper driver.
Quoted 6 lines
Signed-off-by Sandor Yu <[email protected]>---
v19->v20:
- new patch in v20.
The patch split from Patch #1 in v19 and move to a new folderdrivers/soc/cadenceIt makes it harder to review, but granted that we have already past that, I think it's fine.
drivers/soc/cadence/Kconfig line 4
Quoted 10 lines
drivers/soc/cadence/Kconfig new file +4
-0@@ -0,0 +1,9 @@ +# SPDX-License-Identifier: GPL-2.0 + +config CDNS_MHDP_HELPER + tristate "Cadence MHDP Helper driver"This symbol isn't supposed to be selected by the user. Please leave just tristate without the menu entry text (the help text is fine, please keep it).
Quoted 1 line
LGTM otherwise.
OK, thanks, I will remove the menu entry text.
B.R
Sandor
Quoted 12 lines
drivers/soc/cadence/Kconfig
Quoted 4 lines
drivers/soc/cadence/Kconfig new file +3
-0+ help + Enable Cadence MHDP helpers for mailbox, HDMI and DP. + This driver provides a foundational layer of mailboxcommunication for
drivers/soc/cadence/Kconfig line 8
Quoted 1 line
drivers/soc/cadence/Kconfig new file +1
-0+ various Cadence MHDP IP implementations, such as HDMI andDisplayPort.
drivers/soc/cadence/Kconfig line 9
Quoted 1 line
drivers/soc/cadence/Kconfig new file +1
-0+--
With best wishes
Dmitry
PATCH v20 2/9 drm: bridge: cadence: Update mhdp8546 mailbox access functions
In reply to Sandor YuBasic mailbox access functions are removed, they are replaced by mailbox helper functions:
- cdns_mhdp_mailbox_send()
- cdns_mhdp_mailbox_send_recv()
- cdns_mhdp_mailbox_send_recv_multi()
- cdns_mhdp_secure_mailbox_send()
- cdns_mhdp_secure_mailbox_send_recv()
- cdns_mhdp_secure_mailbox_send_recv_multi()
All MHDP commands that need to be passed through the mailbox have been rewritten using these new helper functions.
---v19->v20:
- remove mhdp helper functions from the patch.
v18->v19:
- Use guard(mutex)
- Add kerneldocs for all new APIs.
- Detail comments for mailbox access specific case.
- Remove cdns_mhdp_dp_reg_write() because it is not needed by driver now.
v17->v18:
- Create three ordinary mailbox access APIs cdns_mhdp_mailbox_send
cdns_mhdp_mailbox_send_recv cdns_mhdp_mailbox_send_recv_multi
- Create three secure mailbox access APIs cdns_mhdp_secure_mailbox_send cdns_mhdp_secure_mailbox_send_recv cdns_mhdp_secure_mailbox_send_recv_multi
- MHDP8546 DP and HDCP commands that need access mailbox are rewrited with above 6 API functions.
v16->v17:
- Replaces the local mutex mbox_mutex with a global mutex mhdp_mailbox_mutex
v12->v16:
*No change.
drivers/gpu/drm/bridge/cadence/Kconfig | 1 + .../drm/bridge/cadence/cdns-mhdp8546-core.c | 487 +++--------------- .../drm/bridge/cadence/cdns-mhdp8546-core.h | 47 +- .../drm/bridge/cadence/cdns-mhdp8546-hdcp.c | 212 +------- .../drm/bridge/cadence/cdns-mhdp8546-hdcp.h | 18 +- 5 files changed, 104 insertions(+), 661 deletions(-)
drivers/gpu/drm/bridge/cadence/Kconfig +1 -0
@@ -28,6 +28,7 @@ config DRM_CDNS_MHDP8546 select DRM_DISPLAY_HELPER select DRM_KMS_HELPER select DRM_PANEL_BRIDGE + select CDNS_MHDP_HELPER depends on OF help Support Cadence DPI to DP bridge. This is an internal
drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c +77 -410
731 lines not on this page · raw message
drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.h +4 -43
80 lines not on this page · raw message
drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-hdcp.c +21 -191
263 lines not on this page · raw message
drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-hdcp.h +1 -17
@@ -9,6 +9,7 @@#ifndef CDNS_MHDP8546_HDCP_H #define CDNS_MHDP8546_HDCP_H +#include <soc/cadence/cdns-mhdp-helper.h> #include "cdns-mhdp8546-core.h" #define HDCP_MAX_RECEIVERS 32
@@ -32,23 +33,6 @@ enum { HDCP_SET_SEED, }; -enum { -HDCP_TRAN_CONFIGURATION , -HDCP2X_TX_SET_PUBLIC_KEY_PARAMS , -HDCP2X_TX_SET_DEBUG_RANDOM_NUMBERS , -HDCP2X_TX_RESPOND_KM , -HDCP1_TX_SEND_KEYS , -HDCP1_TX_SEND_RANDOM_AN , -HDCP_TRAN_STATUS_CHANGE , -HDCP2X_TX_IS_KM_STORED , -HDCP2X_TX_STORE_KM , -HDCP_TRAN_IS_REC_ID_VALID , -HDCP_TRAN_RESPOND_RECEIVER_ID_VALID , -HDCP_TRAN_TEST_KEYS , -HDCP2X_TX_SET_KM_KEY_PARAMS , -HDCP_NUM_OF_SUPPORTED_MESSAGES -}; -enum {HDCP_CONTENT_TYPE_0 ,HDCP_CONTENT_TYPE_1 ,
Signature · 1 line
2.34.1
Re: [PATCH v20 2/9] drm: bridge: cadence: Update mhdp8546 mailbox access functions
Quoted 41 lines · Sandor Yu
Basic mailbox access functions are removed, they are replaced by mailbox helper functions:
-cdns_mhdp_mailbox_send()
-cdns_mhdp_mailbox_send_recv()
-cdns_mhdp_mailbox_send_recv_multi()
-cdns_mhdp_secure_mailbox_send()
-cdns_mhdp_secure_mailbox_send_recv()
-cdns_mhdp_secure_mailbox_send_recv_multi()All MHDP commands that need to be passed through the mailbox have been rewritten using these new helper functions.
Signed-off-by Sandor Yu <[email protected]>---
v19->v20:
- remove mhdp helper functions from the patch.
v18->v19:
- Use guard(mutex)
- Add kerneldocs for all new APIs.
- Detail comments for mailbox access specific case.
- Removecdns_mhdp_dp_reg_write()because it is not needed by driver now.
v17->v18:
- Create three ordinary mailbox access APIscdns_mhdp_mailbox_send
cdns_mhdp_mailbox_send_recvcdns_mhdp_mailbox_send_recv_multi
- Create three secure mailbox access APIscdns_mhdp_secure_mailbox_sendcdns_mhdp_secure_mailbox_send_recvcdns_mhdp_secure_mailbox_send_recv_multi
- MHDP8546 DP and HDCP commands that need access mailbox are rewrited with above 6 API functions.
v16->v17:
- Replaces the local mutexmbox_mutexwith a global mutexmhdp_mailbox_mutex
v12->v16:
*No change.
Quoted 7 lines
drivers/gpu/drm/bridge/cadence/Kconfig | 1 + .../drm/bridge/cadence/cdns-mhdp8546-core.c | 487 +++--------------- .../drm/bridge/cadence/cdns-mhdp8546-core.h | 47 +- .../drm/bridge/cadence/cdns-mhdp8546-hdcp.c | 212 +------- .../drm/bridge/cadence/cdns-mhdp8546-hdcp.h | 18 +- 5 files changed, 104 insertions(+), 661 deletions(-)
Signature · 2 lines
With best wishes Dmitry
PATCH v20 3/9 phy: Add HDMI configuration options
In reply to Sandor YuAllow HDMI PHYs to be configured through the generic functions through a custom structure added to the generic union.
The parameters added here are based on HDMI PHY implementation practices. The current set of parameters should cover the potential users.
---v19->v20:
- Add a-b tag.
v17->v19:
*No change.
v16->v17:
- remove headfile hdmi.h
- add 2024 year to copyright
- Add r-b tag.
include/linux/phy/phy-hdmi.h | 19 +++++++++++++++++++ include/linux/phy/phy.h | 7 ++++++- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 include/linux/phy/phy-hdmi.h
include/linux/phy/phy-hdmi.h new file +19 -0
@@ -0,0 +1,19 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright 2022,2024 NXP +*/ + +#ifndef __PHY_HDMI_H_ +#define __PHY_HDMI_H_ + +/** +* struct phy_configure_opts_hdmi - HDMI configuration set +* @tmds_char_rate: HDMI TMDS Character Rate in Hertz. +* +* This structure is used to represent the configuration state of a HDMI phy. +*/ +struct phy_configure_opts_hdmi { +unsigned long long tmds_char_rate; +}; + +#endif /* __PHY_HDMI_H_ */
include/linux/phy/phy.h +6 -1
@@ -17,6 +17,7 @@#include <linux/regulator/consumer.h> #include <linux/phy/phy-dp.h> +#include <linux/phy/phy-hdmi.h> #include <linux/phy/phy-lvds.h> #include <linux/phy/phy-mipi-dphy.h>
@@ -42,7 +43,8 @@ enum phy_mode {PHY_MODE_MIPI_DPHY ,PHY_MODE_SATA ,PHY_MODE_LVDS , -PHY_MODE_DP +PHY_MODE_DP , + PHY_MODE_HDMI, }; enum phy_media {
@@ -60,11 +62,14 @@ enum phy_media {* the DisplayPort protocol. * @lvds: Configuration set applicable for phys supporting * the LVDS phy mode. +* @hdmi: Configuration set applicable for phys supporting +* the HDMI phy mode. */ union phy_configure_opts {struct phy_configure_opts_mipi_dphy mipi_dphy;struct phy_configure_opts_dp dp;struct phy_configure_opts_lvds lvds; +struct phy_configure_opts_hdmi hdmi; };/**
Signature · 1 line
2.34.1
PATCH v20 4/9 dt-bindings: display: bridge: Add Cadence MHDP8501
In reply to Sandor YuAdd bindings for Cadence MHDP8501 DisplayPort/HDMI bridge.
---v19->v20:
- remove data type link of data-lanes.
v18->v19:
- move data-lanes property to endpoint of port@1
v17->v18:
- remove lane-mapping and replace it with data-lanes
- remove r-b tag as property changed.
v16->v17:
- Add lane-mapping property
v9->v16:
*No change
.../display/bridge/cdns,mhdp8501.yaml | 121 ++++++++++++++++++ 1 file changed, 121 insertions(+) create mode 100644 Documentation/devicetree/bindings/display/bridge/cdns,mhdp8501.yaml
Documentation/devicetree/bindings/display/bridge/cdns,mhdp8501.yaml new file +121 -0
@@ -0,0 +1,121 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/display/bridge/cdns,mhdp8501.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Cadence MHDP8501 DP/HDMI bridge + +maintainers: + - Sandor Yu <[email protected]> + +description: + Cadence MHDP8501 DisplayPort/HDMI interface. + +properties: + compatible: + enum: + - fsl,imx8mq-mhdp8501 + + reg: + maxItems: 1 + + clocks: + maxItems: 1 + description: MHDP8501 DP/HDMI APB clock. + + phys: + maxItems: 1 + description: + phandle to the DP/HDMI PHY + + interrupts: + items: + - description: Hotplug cable plugin. + - description: Hotplug cable plugout. + + interrupt-names: + items: + - const: plug_in + - const: plug_out + + ports: + $ref: /schemas/graph.yaml#/properties/ports + + properties: + port@0: + $ref: /schemas/graph.yaml#/properties/port + description: + Input port from display controller output. + + port@1: + $ref: /schemas/graph.yaml#/$defs/port-base + unevaluatedProperties: false + description: + Output port to DisplayPort or HDMI connector. + + properties: + endpoint: + $ref: /schemas/media/video-interfaces.yaml# + unevaluatedProperties: false + + properties: + data-lanes: + description: Lane reordering for HDMI or DisplayPort interface. + minItems: 4 + maxItems: 4 + + required: + - data-lanes + + required: + - port@0 + - port@1 + +required: + - compatible + - reg + - clocks + - interrupts + - interrupt-names + - phys + - ports + +additionalProperties: false + +examples: + - | + #include <dt-bindings/clock/imx8mq-clock.h> + #include <dt-bindings/interrupt-controller/arm-gic.h> + + mhdp: display-bridge@32c00000 { + compatible = "fsl,imx8mq-mhdp8501"; + reg = <0x32c00000 0x100000>; + interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "plug_in", "plug_out"; + clocks = <&clk IMX8MQ_CLK_DISP_APB_ROOT>; + phys = <&mdhp_phy>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + + mhdp_in: endpoint { + remote-endpoint = <&dcss_out>; + }; + }; + + port@1 { + reg = <1>; + + mhdp_out: endpoint { + remote-endpoint = <&dp_connector>; + data-lanes = <2 1 0 3>; + }; + }; + }; + };
Signature · 1 line
2.34.1
Re: [PATCH v20 4/9] dt-bindings: display: bridge: Add Cadence MHDP8501
Quoted 6 lines · Sandor Yu
Add bindings for Cadence MHDP8501 DisplayPort/HDMI bridge.
Signed-off-by Sandor Yu <[email protected]>---
v19->v20:
- remove data type link of data-lanes.
Best regards,
Krzysztof
PATCH v20 5/9 drm: bridge: Cadence: Add MHDP8501 DP/HDMI driver
In reply to Sandor YuAdd a new DRM DisplayPort and HDMI bridge driver for Candence MHDP8501 used in i.MX8MQ SOC. MHDP8501 could support HDMI or DisplayPort standards according embedded Firmware running in the uCPU.
For iMX8MQ SOC, the DisplayPort/HDMI FW was loaded and activated by SOC's ROM code. Bootload binary included respective specific firmware is required.
Driver will check display connector type and
then load the corresponding driver.
---v19->v20:
- Dump mhdp FW version by debugfs
- Combine HDMI and DP cable detect functions into one function
- Combine HDMI and DP cable bridge_mode_valid() functions into one function
- Rename cdns_hdmi_reset_link() to cdns_hdmi_handle_hotplug()
- Add comments for EDID in cdns_hdmi_handle_hotplug() and cdns_dp_check_link_state()
- Add atomic_get_input_bus_fmts() and bridge_atomic_check() for DP driver
- Remove bpc and color_fmt init in atomic_enable() function.
- More detail comments for DDC adapter only support SCDC_I2C_SLAVE_ADDRESS read and write in HDMI driver.
v18->v19:
- Get endpoint for data-lanes as it had move to endpoint of port@1
- Update clock management as devm_clk_get_enabled() introduced.
- Fix clear_infoframe() function is not work issue.
- Manage PHY power state via phy_power_on() and phy_power_off().
v17->v18:
- MHDP8501 HDMI and DP commands that need access mailbox are rewrited with new API functions created in patch #1.
- replace lane-mapping with data-lanes, use the value from data-lanes to reorder HDMI and DP lane mapping.
- create I2C adapter for HDMI SCDC, remove cdns_hdmi_scdc_write() function.
- Rewrite cdns_hdmi_sink_config() function, use HDMI SCDC helper function drm_scdc_set_high_tmds_clock_ratio() and drm_scdc_set_scrambling() to config HDMI sink TMDS.
- Remove struct video_info from HDMI driver.
- Remove tmds_char_rate_valid() be called in bridge_mode_valid(), community had patch in reviewing to implement the function.
- Remove warning message print when get unknown HPD cable status.
- Add more detail comments for HDP plugin and plugout interrupt.
- use dev_dbg to repleace DRM_INFO when cable HPD status changed.
- Remove t-b tag as above code change.
drivers/gpu/drm/bridge/cadence/Kconfig | 16 + drivers/gpu/drm/bridge/cadence/Makefile | 2 + .../drm/bridge/cadence/cdns-mhdp8501-core.c | 379 +++++++++ .../drm/bridge/cadence/cdns-mhdp8501-core.h | 380 +++++++++ .../gpu/drm/bridge/cadence/cdns-mhdp8501-dp.c | 694 ++++++++++++++++ .../drm/bridge/cadence/cdns-mhdp8501-hdmi.c | 745 ++++++++++++++++++ 6 files changed, 2216 insertions(+) create mode 100644 drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c create mode 100644 drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.h create mode 100644 drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-dp.c create mode 100644 drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
drivers/gpu/drm/bridge/cadence/Kconfig +16 -0
@@ -48,3 +48,19 @@ config DRM_CDNS_MHDP8546_J721E initializes the J721E Display Port and sets up the clock and data muxes. endif + +config DRM_CDNS_MHDP8501 + tristate "Cadence MHDP8501 DP/HDMI bridge" + select DRM_KMS_HELPER + select DRM_PANEL_BRIDGE + select DRM_DISPLAY_DP_HELPER + select DRM_DISPLAY_HELPER + select DRM_CDNS_AUDIO + select CDNS_MHDP_HELPER + depends on OF + help + Support Cadence MHDP8501 DisplayPort/HDMI bridge. + Cadence MHDP8501 support one or more protocols, + including DisplayPort and HDMI. + To use the DP and HDMI drivers, their respective + specific firmware is required.
drivers/gpu/drm/bridge/cadence/Makefile +2 -0
@@ -5,3 +5,5 @@ cdns-dsi-$(CONFIG_DRM_CDNS_DSI_J721E) += cdns-dsi-j721e.o obj-$(CONFIG_DRM_CDNS_MHDP8546) += cdns-mhdp8546.o cdns-mhdp8546-y := cdns-mhdp8546-core.o cdns-mhdp8546-hdcp.o cdns-mhdp8546-$(CONFIG_DRM_CDNS_MHDP8546_J721E) += cdns-mhdp8546-j721e.o +obj-$(CONFIG_DRM_CDNS_MHDP8501) += cdns-mhdp8501.o +cdns-mhdp8501-y := cdns-mhdp8501-core.o cdns-mhdp8501-dp.o cdns-mhdp8501-hdmi.o
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +379 -0
379 lines not on this page · raw message
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.h new file +380 -0
380 lines not on this page · raw message
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-dp.c new file +694 -0
694 lines not on this page · raw message
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +745 -0
745 lines not on this page · raw message
Signature · 1 line
2.34.1
Maxime Ripard
maintainerRe: [PATCH v20 5/9] drm: bridge: Cadence: Add MHDP8501 DP/HDMI driver
Hi,
Quoted 13 lines · Sandor Yu
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +13
-0+static ssize_t firmware_version_show (struct device *dev, +struct device_attribute *attr,char *buf); +static struct device_attribute firmware_version =__ATTR_RO (firmware_version); + +ssize_t firmware_version_show (struct device *dev, +struct device_attribute *attr,char *buf) +{ +struct cdns_mhdp8501_device *mhdp =dev_get_drvdata (dev); + +u32 version =readl (mhdp->base.regs +VER_L ) |readl (mhdp->base.regs +VER_H ) <<8 ; +u32 lib_version =readl (mhdp->base.regs +VER_LIB_L_ADDR ) | +readl (mhdp->base.regs +VER_LIB_H_ADDR ) <<8 ; +
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 41
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +10
-0+return sprintf (buf,"FW version %d, Lib version %d\n" , version, lib_version); +} + +static void cdns_mhdp8501_create_device_files (struct cdns_mhdp8501_device *mhdp) +{ +if (device_create_file (mhdp->dev, &firmware_version)) { +DRM_ERROR ("Unable to create firmware_version sysfs\n" ); +device_remove_file (mhdp->dev, &firmware_version); + } +}
sysfs files are part of the uABI, and need to be stable and documented.
For these kind of things, you should use debugfs.
Maxime
RE: [EXT] Re: [PATCH v20 5/9] drm: bridge: Cadence: Add MHDP8501 DP/HDMI driver
Quoted 31 lines
Hi,
Review
Quoted 2 lines · Sandor Yu
(quoted diff) +2
-0+static ssize_t firmware_version_show(struct device *dev, + struct device_attribute *attr, char *buf); staticstruct
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 7 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +7
-0+device_attribute firmware_version =__ATTR_RO (firmware_version); + +ssize_t firmware_version_show (struct device *dev, +struct device_attribute *attr,char *buf) { +struct cdns_mhdp8501_device *mhdp =dev_get_drvdata (dev); + + u32 version = readl(mhdp->base.regs + VER_L) | readl(mhdp->base.regs+
VER_H) << 8;drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 41
Quoted 13 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +13
-0+u32 lib_version =readl (mhdp->base.regs +VER_LIB_L_ADDR ) | +readl (mhdp->base.regs +VER_LIB_H_ADDR ) <<8 ; + +return sprintf (buf,"FW version %d, Lib version %d\n" , version, +lib_version); } + +static void cdns_mhdp8501_create_device_files (struct +cdns_mhdp8501_device *mhdp) { +if (device_create_file (mhdp->dev, &firmware_version)) { +DRM_ERROR ("Unable to create firmware_version sysfs\n" ); +device_remove_file (mhdp->dev, &firmware_version); + } +}sysfs files are part of the uABI, and need to be stable and documented.
Quoted 1 line
For these kind of things, you should use debugfs.
OK, thanks, I will change it.
Sandor
Quoted 2 lines
Maxime
Re: [PATCH v20 5/9] drm: bridge: Cadence: Add MHDP8501 DP/HDMI driver
In reply to Sandor YuQuoted 258 lines · Sandor Yu
Add a new DRM DisplayPort and HDMI bridge driver for Candence MHDP8501 used in i.MX8MQ SOC. MHDP8501 could support HDMI or DisplayPort standards according embedded Firmware running in the uCPU.
For iMX8MQ SOC, the DisplayPort/HDMI FW was loaded and activated by SOC's ROM code. Bootload binary included respective specific firmware is required.
Driver will check display connector type and
then load the corresponding driver.Signed-off-by Sandor Yu <[email protected]>---
v19->v20:
- Dump mhdp FW version by debugfs
- Combine HDMI and DP cable detect functions into one function
- Combine HDMI and DP cablebridge_mode_valid()functions into one function
- Renamecdns_hdmi_reset_link()tocdns_hdmi_handle_hotplug()
- Add comments for EDID incdns_hdmi_handle_hotplug()andcdns_dp_check_link_state()
- Addatomic_get_input_bus_fmts()andbridge_atomic_check()for DP driver
- Remove bpc andcolor_fmtinit inatomic_enable()function.
- More detail comments for DDC adapter only supportSCDC_I2C_SLAVE_ADDRESSread and write in HDMI driver.
v18->v19:
- Get endpoint for data-lanes as it had move to endpoint of port@1
- Update clock management asdevm_clk_get_enabled()introduced.
- Fixclear_infoframe()function is not work issue.
- Manage PHY power state viaphy_power_on()andphy_power_off().
v17->v18:
- MHDP8501 HDMI and DP commands that need access mailbox are rewrited with new API functions created in patch #1.
- replace lane-mapping with data-lanes, use the value from data-lanes to reorder HDMI and DP lane mapping.
- create I2C adapter for HDMI SCDC, removecdns_hdmi_scdc_write()function.
- Rewritecdns_hdmi_sink_config()function, use HDMI SCDC helper functiondrm_scdc_set_high_tmds_clock_ratio()anddrm_scdc_set_scrambling()to config HDMI sink TMDS.
- Remove structvideo_infofrom HDMI driver.
- Removetmds_char_rate_valid()be called inbridge_mode_valid(), community had patch in reviewing to implement the function.
- Remove warning message print when get unknown HPD cable status.
- Add more detail comments for HDP plugin and plugout interrupt.
- usedev_dbgto repleaceDRM_INFOwhen cable HPD status changed.
- Remove t-b tag as above code change.drivers/gpu/drm/bridge/cadence/Kconfig | 16 + drivers/gpu/drm/bridge/cadence/Makefile | 2 + .../drm/bridge/cadence/cdns-mhdp8501-core.c | 379 +++++++++ .../drm/bridge/cadence/cdns-mhdp8501-core.h | 380 +++++++++ .../gpu/drm/bridge/cadence/cdns-mhdp8501-dp.c | 694 ++++++++++++++++ .../drm/bridge/cadence/cdns-mhdp8501-hdmi.c | 745 ++++++++++++++++++ 6 files changed, 2216 insertions(+) create mode 100644 drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c create mode 100644 drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.h create mode 100644 drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-dp.c create mode 100644 drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.cdrivers/gpu/drm/bridge/cadence/Kconfig +16
-0@@ -48,3 +48,19 @@ config DRM_CDNS_MHDP8546_J721E initializes the J721E Display Port and sets up the clock and data muxes. endif + +config DRM_CDNS_MHDP8501 + tristate "Cadence MHDP8501 DP/HDMI bridge" + select DRM_KMS_HELPER + select DRM_PANEL_BRIDGE + select DRM_DISPLAY_DP_HELPER + select DRM_DISPLAY_HELPER + select DRM_CDNS_AUDIO + select CDNS_MHDP_HELPER + depends on OF + help + Support Cadence MHDP8501 DisplayPort/HDMI bridge. + Cadence MHDP8501 support one or more protocols, + including DisplayPort and HDMI. + To use the DP and HDMI drivers, their respective + specific firmware is required.drivers/gpu/drm/bridge/cadence/Makefile +2
-0@@ -5,3 +5,5 @@ cdns-dsi-$(CONFIG_DRM_CDNS_DSI_J721E) += cdns-dsi-j721e.o obj-$(CONFIG_DRM_CDNS_MHDP8546) += cdns-mhdp8546.o cdns-mhdp8546-y := cdns-mhdp8546-core.o cdns-mhdp8546-hdcp.o cdns-mhdp8546-$(CONFIG_DRM_CDNS_MHDP8546_J721E) += cdns-mhdp8546-j721e.o +obj-$(CONFIG_DRM_CDNS_MHDP8501) += cdns-mhdp8501.o +cdns-mhdp8501-y := cdns-mhdp8501-core.o cdns-mhdp8501-dp.o cdns-mhdp8501-hdmi.odrivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +158
-0@@ -0,0 +1,379 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Cadence Display Port Interface (DP) driver +* +* Copyright (C) 2023-2024 NXP Semiconductor, Inc. +* +*/ +#include <drm/drm_of.h> +#include <drm/drm_print.h> +#include <linux/clk.h> +#include <linux/irq.h> +#include <linux/mutex.h> +#include <linux/of_device.h> +#include <linux/platform_device.h> +#include <linux/phy/phy.h> + +#include "cdns-mhdp8501-core.h" + +static ssize_t firmware_version_show (struct device *dev, +struct device_attribute *attr,char *buf); +static struct device_attribute firmware_version =__ATTR_RO (firmware_version); + +ssize_t firmware_version_show (struct device *dev, +struct device_attribute *attr,char *buf) +{ +struct cdns_mhdp8501_device *mhdp =dev_get_drvdata (dev); + +u32 version =readl (mhdp->base.regs +VER_L ) |readl (mhdp->base.regs +VER_H ) <<8 ; +u32 lib_version =readl (mhdp->base.regs +VER_LIB_L_ADDR ) | +readl (mhdp->base.regs +VER_LIB_H_ADDR ) <<8 ; + +return sprintf (buf,"FW version %d, Lib version %d\n" , version, lib_version); +} + +static void cdns_mhdp8501_create_device_files (struct cdns_mhdp8501_device *mhdp) +{ +if (device_create_file (mhdp->dev, &firmware_version)) { +DRM_ERROR ("Unable to create firmware_version sysfs\n" ); +device_remove_file (mhdp->dev, &firmware_version); + } +} + +static void cdns_mhdp8501_remove_device_files (struct cdns_mhdp8501_device *mhdp) +{ +device_remove_file (mhdp->dev, &firmware_version); +} + +static int cdns_mhdp8501_read_hpd (struct cdns_mhdp8501_device *mhdp) +{ +u8 status; +int ret; + + ret =cdns_mhdp_mailbox_send_recv (&mhdp->base,MB_MODULE_ID_GENERAL , +GENERAL_GET_HPD_STATE , +0 ,NULL ,sizeof (status), &status); +if (ret) { +dev_err (mhdp->dev,"read hpd failed: %d\n" , ret); +return ret; + } + +return status; +} + +enum drm_connector_status cdns_mhdp8501_detect (struct drm_bridge *bridge) +{ +struct cdns_mhdp8501_device *mhdp = bridge->driver_private; + +u8 hpd =0xf ; + + hpd =cdns_mhdp8501_read_hpd (mhdp); +if (hpd ==1 ) +return connector_status_connected; +else if (hpd ==0 ) +return connector_status_disconnected; + +return connector_status_unknown; +} + +enum drm_mode_status +cdns_mhdp8501_mode_valid (struct drm_bridge *bridge, +const struct drm_display_info *info, +const struct drm_display_mode *mode) +{ +/* We don't support double-clocked */ +if (mode->flags &DRM_MODE_FLAG_DBLCLK ) +return MODE_BAD ; + +/* MAX support pixel clock rate 594MHz */ +if (mode->clock >594000 ) +return MODE_CLOCK_HIGH ; + +if (mode->hdisplay >3840 ) +return MODE_BAD_HVALUE ; + +if (mode->vdisplay >2160 ) +return MODE_BAD_VVALUE ; + +return MODE_OK ; +} + +static void hotplug_work_func (struct work_struct *work) +{ +struct cdns_mhdp8501_device *mhdp =container_of (work, + struct cdns_mhdp8501_device, + hotplug_work.work); +enum drm_connector_status status =cdns_mhdp8501_detect (&mhdp->bridge); + +drm_bridge_hpd_notify (&mhdp->bridge, status); + +/* +* iMX8MQ has two HPD interrupts: one for plugout and one for plugin. +* These interrupts cannot be masked and cleaned, so we must enable one +* and disable the other to avoid continuous interrupt generation. +*/ +if (status == connector_status_connected) { +/* Cable connected */ +dev_dbg (mhdp->dev,"HDMI/DP Cable Plug In\n" ); +enable_irq (mhdp->irq[IRQ_OUT ]); + +/* Reset HDMI/DP link with sink */ +if (mhdp->connector_type ==DRM_MODE_CONNECTOR_HDMIA ) +cdns_hdmi_handle_hotplug (mhdp); +else +cdns_dp_check_link_state (mhdp); + + }else if (status == connector_status_disconnected) { +/* Cable Disconnected */ +dev_dbg (mhdp->dev,"HDMI/DP Cable Plug Out\n" ); +enable_irq (mhdp->irq[IRQ_IN ]); + } +} + +static irqreturn_t cdns_mhdp8501_irq_thread (int irq,void *data) +{ +struct cdns_mhdp8501_device *mhdp = data; + +disable_irq_nosync (irq); + +mod_delayed_work (system_wq, &mhdp->hotplug_work, +msecs_to_jiffies (HOTPLUG_DEBOUNCE_MS )); + +return IRQ_HANDLED ; +} + +#define DATA_LANES_COUNT 4 +static int cdns_mhdp8501_dt_parse (struct cdns_mhdp8501_device *mhdp, +struct platform_device *pdev) +{ +struct device *dev = &pdev->dev; +struct device_node *np = dev->of_node; +struct device_node *remote, *endpoint; +u32 data_lanes[DATA_LANES_COUNT ]; +u32 lane_value; +int ret, i; + + remote =of_graph_get_remote_node (np,1 ,0 ); +if (!remote) { +dev_err (dev,"fail to get remote node\n" );
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 168
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +10
-0+of_node_put (remote); +return -EINVAL ; + } + +/* get connector type */ +if (of_device_is_compatible (remote,"hdmi-connector" )) { + mhdp->connector_type =DRM_MODE_CONNECTOR_HDMIA ; + + }else if (of_device_is_compatible (remote,"dp-connector" )) { + mhdp->connector_type = DRM_MODE_CONNECTOR_DisplayPort;
Interesting hack. What if somebody wraps DP signals with the USB-C controller in order to provide DP over USB-C?
Unfortunately I don't have a good solution here. There might be other format converters after your bridge, so you even can't look at the last bridge of the chain. You might want to examine the phy-mode property and use it to specify whether the PHY should work in the HDMI or in the DP mode.
Also, where do get the next bridge and attach it to the bridge chain?
Quoted 9 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +9
-0+ + }else { +dev_err (dev,"Unknown connector type\n" ); +of_node_put (remote); +return -EINVAL ; + } + +of_node_put (remote); +
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 187
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +10
-0+ endpoint =of_graph_get_endpoint_by_regs (np,1 ,-1 ); + +/* Get the data lanes ordering */ + ret =of_property_count_u32_elems (endpoint,"data-lanes" ); +if (ret <0 ) +return -EINVAL ; +if (ret !=DATA_LANES_COUNT ) { +dev_err (dev,"expected 4 data lanes\n" ); +return -EINVAL ; + }
Isn't it drm_of_get_data_lanes_count_ep()?
Quoted 19 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +19
-0+ + ret =of_property_read_u32_array (endpoint,"data-lanes" , + data_lanes,DATA_LANES_COUNT ); +if (ret) +return -EINVAL ; + + mhdp->lane_mapping =0 ; +for (i =0 ; i <DATA_LANES_COUNT ; i++) { + lane_value = (data_lanes[i] >=0 && data_lanes[i] <=3 ) ? data_lanes[i] :0 ; + mhdp->lane_mapping |= lane_value << (i *2 ); + } + +return true; +} + +static int cdns_mhdp8501_add_bridge (struct cdns_mhdp8501_device *mhdp) +{ + mhdp->bridge.type = mhdp->connector_type; + mhdp->bridge.driver_private = mhdp;
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 216
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +10
-0+ mhdp->bridge.of_node = mhdp->dev->of_node; + mhdp->bridge.vendor ="NXP" ; + mhdp->bridge.product ="i.MX8" ; + mhdp->bridge.ops =DRM_BRIDGE_OP_DETECT |DRM_BRIDGE_OP_EDID | +DRM_BRIDGE_OP_HPD ; + +if (mhdp->connector_type ==DRM_MODE_CONNECTOR_HDMIA ) { + mhdp->bridge.funcs = &cdns_hdmi_bridge_funcs; + mhdp->bridge.ops |=DRM_BRIDGE_OP_HDMI ; + mhdp->bridge.ddc =cdns_hdmi_i2c_adapter (mhdp);
I'd expect that bridge.ddc provides DDC service. Is it required to control the SCDC from userspace?
Quoted 135 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +135
-0+ }else if (mhdp->connector_type == DRM_MODE_CONNECTOR_DisplayPort) { + mhdp->bridge.funcs = &cdns_dp_bridge_funcs; + }else { +dev_err (mhdp->dev,"Unsupported connector type!\n" ); +return -EINVAL ; + } + +drm_bridge_add (&mhdp->bridge); + +return 0 ; +} + +static int cdns_mhdp8501_probe (struct platform_device *pdev) +{ +struct device *dev = &pdev->dev; +struct cdns_mhdp8501_device *mhdp; +struct resource *res; +enum phy_mode phy_mode; +u32 reg; +int ret; + + mhdp =devm_kzalloc (dev,sizeof (*mhdp),GFP_KERNEL ); +if (!mhdp) +return -ENOMEM ; + + mhdp->dev = dev; + +INIT_DELAYED_WORK (&mhdp->hotplug_work, hotplug_work_func); + + res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); +if (!res) +return -ENODEV ; + + mhdp->regs =devm_ioremap (dev, res->start,resource_size (res)); +if (IS_ERR (mhdp->regs)) +return PTR_ERR (mhdp->regs); + +cdns_mhdp8501_create_device_files (mhdp); + + ret =cdns_mhdp8501_dt_parse (mhdp, pdev); +if (ret <0 ) +return -EINVAL ; + + mhdp->phy =devm_of_phy_get_by_index (dev, pdev->dev.of_node,0 ); +if (IS_ERR (mhdp->phy)) +return dev_err_probe (dev,PTR_ERR (mhdp->phy),"no PHY configured\n" ); + + mhdp->irq[IRQ_IN ] =platform_get_irq_byname (pdev,"plug_in" ); +if (mhdp->irq[IRQ_IN ] <0 ) +return dev_err_probe (dev, mhdp->irq[IRQ_IN ],"No plug_in irq number\n" ); + + mhdp->irq[IRQ_OUT ] =platform_get_irq_byname (pdev,"plug_out" ); +if (mhdp->irq[IRQ_OUT ] <0 ) +return dev_err_probe (dev, mhdp->irq[IRQ_OUT ],"No plug_out irq number\n" ); + +irq_set_status_flags (mhdp->irq[IRQ_IN ],IRQ_NOAUTOEN ); + ret =devm_request_threaded_irq (dev, mhdp->irq[IRQ_IN ], +NULL , cdns_mhdp8501_irq_thread, +IRQF_ONESHOT ,dev_name (dev), mhdp); +if (ret <0 ) { +dev_err (dev,"can't claim irq %d\n" , mhdp->irq[IRQ_IN ]); +return -EINVAL ; + } + +irq_set_status_flags (mhdp->irq[IRQ_OUT ],IRQ_NOAUTOEN ); + ret =devm_request_threaded_irq (dev, mhdp->irq[IRQ_OUT ], +NULL , cdns_mhdp8501_irq_thread, +IRQF_ONESHOT ,dev_name (dev), mhdp); +if (ret <0 ) { +dev_err (dev,"can't claim irq %d\n" , mhdp->irq[IRQ_OUT ]); +return -EINVAL ; + } + +/* cdns_mhdp8501_dt_parse() ensures connector_type is valid */ +if (mhdp->connector_type == DRM_MODE_CONNECTOR_DisplayPort) + phy_mode =PHY_MODE_DP ; +else if (mhdp->connector_type ==DRM_MODE_CONNECTOR_HDMIA ) + phy_mode =PHY_MODE_HDMI ; + +dev_set_drvdata (dev, mhdp); + +/* init base struct for access mhdp mailbox */ + mhdp->base.dev = mhdp->dev; + mhdp->base.regs = mhdp->regs; + +if (mhdp->connector_type == DRM_MODE_CONNECTOR_DisplayPort) { +drm_dp_aux_init (&mhdp->dp.aux); + mhdp->dp.aux.name ="mhdp8501_dp_aux" ; + mhdp->dp.aux.dev = dev; + mhdp->dp.aux.transfer = cdns_dp_aux_transfer; + } + +/* Enable APB clock */ + mhdp->apb_clk =devm_clk_get_enabled (dev,NULL ); +if (IS_ERR (mhdp->apb_clk)) +return dev_err_probe (dev,PTR_ERR (mhdp->apb_clk), +"couldn't get apb clk\n" ); +/* +* Wait for the KEEP_ALIVE "message" on the first 8 bits. +* Updated each sched "tick" (~2ms) +*/ + ret =readl_poll_timeout (mhdp->regs +KEEP_ALIVE , reg, + reg &CDNS_KEEP_ALIVE_MASK ,500 , +CDNS_KEEP_ALIVE_TIMEOUT ); +if (ret) { +dev_err (dev,"device didn't give any life sign: reg %d\n" , reg); +return ret; + } + + ret =phy_init (mhdp->phy); +if (ret) { +dev_err (dev,"Failed to initialize PHY: %d\n" , ret); +return ret; + } + + ret =phy_set_mode (mhdp->phy, phy_mode); +if (ret) { +dev_err (dev,"Failed to configure PHY: %d\n" , ret); +return ret; + } + +/* Enable cable hotplug detect */ +if (cdns_mhdp8501_read_hpd (mhdp)) +enable_irq (mhdp->irq[IRQ_OUT ]); +else +enable_irq (mhdp->irq[IRQ_IN ]); + +return cdns_mhdp8501_add_bridge (mhdp); +} + +static void cdns_mhdp8501_remove (struct platform_device *pdev) +{ +struct cdns_mhdp8501_device *mhdp =platform_get_drvdata (pdev); + +cdns_mhdp8501_remove_device_files (mhdp);
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 361
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +10
-0+ +if (mhdp->connector_type == DRM_MODE_CONNECTOR_DisplayPort) +cdns_dp_aux_destroy (mhdp); + +drm_bridge_remove (&mhdp->bridge); +} + +static const struct of_device_id cdns_mhdp8501_dt_ids[] = { + { .compatible ="fsl,imx8mq-mhdp8501" , + },
Strange line wrapping, I'd say. Either it should all be on the same line, or take three lines.
Quoted 862 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +18
-0+ { }, +}; +MODULE_DEVICE_TABLE (of, cdns_mhdp8501_dt_ids); + +static struct platform_driver cdns_mhdp8501_driver = { + .probe = cdns_mhdp8501_probe, + .remove = cdns_mhdp8501_remove, + .driver = { + .name ="cdns-mhdp8501" , + .of_match_table = cdns_mhdp8501_dt_ids, + }, +}; + +module_platform_driver (cdns_mhdp8501_driver); + +MODULE_AUTHOR ("Sandor Yu <[email protected]>" ); +MODULE_DESCRIPTION ("Cadence MHDP8501 bridge driver" ); +MODULE_LICENSE ("GPL" );drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.h new file +380
-0@@ -0,0 +1,380 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Cadence MHDP 8501 Common head file +* +* Copyright (C) 2019-2024 NXP Semiconductor, Inc. +* +*/ + +#ifndef _CDNS_MHDP8501_CORE_H_ +#define _CDNS_MHDP8501_CORE_H_ + +#include <drm/drm_bridge.h> +#include <drm/drm_connector.h> +#include <drm/display/drm_dp_helper.h> +#include <linux/bitops.h> +#include <linux/i2c.h> +#include <soc/cadence/cdns-mhdp-helper.h> + +#define ADDR_IMEM 0x10000 +#define ADDR_DMEM 0x20000 + +/* APB CFG addr */ +#define APB_CTRL 0 +#define XT_INT_CTRL 0x04 +#define MAILBOX_FULL_ADDR 0x08 +#define MAILBOX_EMPTY_ADDR 0x0c +#define MAILBOX0_WR_DATA 0x10 +#define MAILBOX0_RD_DATA 0x14 +#define KEEP_ALIVE 0x18 +#define VER_L 0x1c +#define VER_H 0x20 +#define VER_LIB_L_ADDR 0x24 +#define VER_LIB_H_ADDR 0x28 +#define SW_DEBUG_L 0x2c +#define SW_DEBUG_H 0x30 +#define MAILBOX_INT_MASK 0x34 +#define MAILBOX_INT_STATUS 0x38 +#define SW_CLK_L 0x3c +#define SW_CLK_H 0x40 +#define SW_EVENTS0 0x44 +#define SW_EVENTS1 0x48 +#define SW_EVENTS2 0x4c +#define SW_EVENTS3 0x50 +#define XT_OCD_CTRL 0x60 +#define APB_INT_MASK 0x6c +#define APB_STATUS_MASK 0x70 + +/* Source phy comp */ +#define PHY_DATA_SEL 0x0818 +#define LANES_CONFIG 0x0814 + +/* Source CAR Addr */ +#define SOURCE_HDTX_CAR 0x0900 +#define SOURCE_DPTX_CAR 0x0904 +#define SOURCE_PHY_CAR 0x0908 +#define SOURCE_CEC_CAR 0x090c +#define SOURCE_CBUS_CAR 0x0910 +#define SOURCE_PKT_CAR 0x0918 +#define SOURCE_AIF_CAR 0x091c +#define SOURCE_CIPHER_CAR 0x0920 +#define SOURCE_CRYPTO_CAR 0x0924 + +/* clock meters addr */ +#define CM_CTRL 0x0a00 +#define CM_I2S_CTRL 0x0a04 +#define CM_SPDIF_CTRL 0x0a08 +#define CM_VID_CTRL 0x0a0c +#define CM_LANE_CTRL 0x0a10 +#define I2S_NM_STABLE 0x0a14 +#define I2S_NCTS_STABLE 0x0a18 +#define SPDIF_NM_STABLE 0x0a1c +#define SPDIF_NCTS_STABLE 0x0a20 +#define NMVID_MEAS_STABLE 0x0a24 +#define I2S_MEAS 0x0a40 +#define SPDIF_MEAS 0x0a80 +#define NMVID_MEAS 0x0ac0 + +/* source vif addr */ +#define BND_HSYNC2VSYNC 0x0b00 +#define HSYNC2VSYNC_F1_L1 0x0b04 +#define HSYNC2VSYNC_STATUS 0x0b0c +#define HSYNC2VSYNC_POL_CTRL 0x0b10 + +/* MHDP TX_top_comp */ +#define SCHEDULER_H_SIZE 0x1000 +#define SCHEDULER_V_SIZE 0x1004 +#define HDTX_SIGNAL_FRONT_WIDTH 0x100c +#define HDTX_SIGNAL_SYNC_WIDTH 0x1010 +#define HDTX_SIGNAL_BACK_WIDTH 0x1014 +#define HDTX_CONTROLLER 0x1018 +#define HDTX_HPD 0x1020 +#define HDTX_CLOCK_REG_0 0x1024 +#define HDTX_CLOCK_REG_1 0x1028 + +/* DPTX hpd addr */ +#define HPD_IRQ_DET_MIN_TIMER 0x2100 +#define HPD_IRQ_DET_MAX_TIMER 0x2104 +#define HPD_UNPLGED_DET_MIN_TIMER 0x2108 +#define HPD_STABLE_TIMER 0x210c +#define HPD_FILTER_TIMER 0x2110 +#define HPD_EVENT_MASK 0x211c +#define HPD_EVENT_DET 0x2120 + +/* DPTX framer addr */ +#define DP_FRAMER_GLOBAL_CONFIG 0x2200 +#define DP_SW_RESET 0x2204 +#define DP_FRAMER_TU 0x2208 +#define DP_FRAMER_PXL_REPR 0x220c +#define DP_FRAMER_SP 0x2210 +#define AUDIO_PACK_CONTROL 0x2214 +#define DP_VC_TABLE (x) (0x2218 + ((x) << 2)) +#define DP_VB_ID 0x2258 +#define DP_MTPH_LVP_CONTROL 0x225c +#define DP_MTPH_SYMBOL_VALUES 0x2260 +#define DP_MTPH_ECF_CONTROL 0x2264 +#define DP_MTPH_ACT_CONTROL 0x2268 +#define DP_MTPH_STATUS 0x226c +#define DP_INTERRUPT_SOURCE 0x2270 +#define DP_INTERRUPT_MASK 0x2274 +#define DP_FRONT_BACK_PORCH 0x2278 +#define DP_BYTE_COUNT 0x227c + +/* DPTX stream addr */ +#define MSA_HORIZONTAL_0 0x2280 +#define MSA_HORIZONTAL_1 0x2284 +#define MSA_VERTICAL_0 0x2288 +#define MSA_VERTICAL_1 0x228c +#define MSA_MISC 0x2290 +#define STREAM_CONFIG 0x2294 +#define AUDIO_PACK_STATUS 0x2298 +#define VIF_STATUS 0x229c +#define PCK_STUFF_STATUS_0 0x22a0 +#define PCK_STUFF_STATUS_1 0x22a4 +#define INFO_PACK_STATUS 0x22a8 +#define RATE_GOVERNOR_STATUS 0x22ac +#define DP_HORIZONTAL 0x22b0 +#define DP_VERTICAL_0 0x22b4 +#define DP_VERTICAL_1 0x22b8 +#define DP_BLOCK_SDP 0x22bc + +/* DPTX glbl addr */ +#define DPTX_LANE_EN 0x2300 +#define DPTX_ENHNCD 0x2304 +#define DPTX_INT_MASK 0x2308 +#define DPTX_INT_STATUS 0x230c + +/* DP AUX Addr */ +#define DP_AUX_HOST_CONTROL 0x2800 +#define DP_AUX_INTERRUPT_SOURCE 0x2804 +#define DP_AUX_INTERRUPT_MASK 0x2808 +#define DP_AUX_SWAP_INVERSION_CONTROL 0x280c +#define DP_AUX_SEND_NACK_TRANSACTION 0x2810 +#define DP_AUX_CLEAR_RX 0x2814 +#define DP_AUX_CLEAR_TX 0x2818 +#define DP_AUX_TIMER_STOP 0x281c +#define DP_AUX_TIMER_CLEAR 0x2820 +#define DP_AUX_RESET_SW 0x2824 +#define DP_AUX_DIVIDE_2M 0x2828 +#define DP_AUX_TX_PREACHARGE_LENGTH 0x282c +#define DP_AUX_FREQUENCY_1M_MAX 0x2830 +#define DP_AUX_FREQUENCY_1M_MIN 0x2834 +#define DP_AUX_RX_PRE_MIN 0x2838 +#define DP_AUX_RX_PRE_MAX 0x283c +#define DP_AUX_TIMER_PRESET 0x2840 +#define DP_AUX_NACK_FORMAT 0x2844 +#define DP_AUX_TX_DATA 0x2848 +#define DP_AUX_RX_DATA 0x284c +#define DP_AUX_TX_STATUS 0x2850 +#define DP_AUX_RX_STATUS 0x2854 +#define DP_AUX_RX_CYCLE_COUNTER 0x2858 +#define DP_AUX_MAIN_STATES 0x285c +#define DP_AUX_MAIN_TIMER 0x2860 +#define DP_AUX_AFE_OUT 0x2864 + +/* source pif addr */ +#define SOURCE_PIF_WR_ADDR 0x30800 +#define SOURCE_PIF_WR_REQ 0x30804 +#define SOURCE_PIF_RD_ADDR 0x30808 +#define SOURCE_PIF_RD_REQ 0x3080c +#define SOURCE_PIF_DATA_WR 0x30810 +#define SOURCE_PIF_DATA_RD 0x30814 +#define SOURCE_PIF_FIFO1_FLUSH 0x30818 +#define SOURCE_PIF_FIFO2_FLUSH 0x3081c +#define SOURCE_PIF_STATUS 0x30820 +#define SOURCE_PIF_INTERRUPT_SOURCE 0x30824 +#define SOURCE_PIF_INTERRUPT_MASK 0x30828 +#define SOURCE_PIF_PKT_ALLOC_REG 0x3082c +#define SOURCE_PIF_PKT_ALLOC_WR_EN 0x30830 +#define SOURCE_PIF_SW_RESET 0x30834 + +#define LINK_TRAINING_NOT_ACTIV 0 +#define LINK_TRAINING_RUN 1 +#define LINK_TRAINING_RESTART 2 + +#define CONTROL_VIDEO_IDLE 0 +#define CONTROL_VIDEO_VALID 1 + +#define INTERLACE_FMT_DET BIT(12) +#define VIF_BYPASS_INTERLACE BIT(13) +#define TU_CNT_RST_EN BIT(15) +#define INTERLACE_DTCT_WIN 0x20 + +#define DP_FRAMER_SP_INTERLACE_EN BIT(2) +#define DP_FRAMER_SP_HSP BIT(1) +#define DP_FRAMER_SP_VSP BIT(0) + +/* Capability */ +#define AUX_HOST_INVERT 3 +#define FAST_LT_SUPPORT 1 +#define FAST_LT_NOT_SUPPORT 0 +#define LANE_MAPPING_FLIPPED 0xe4 +#define ENHANCED 1 +#define SCRAMBLER_EN BIT(4) + +#define FULL_LT_STARTED BIT(0) +#define FASE_LT_STARTED BIT(1) +#define CLK_RECOVERY_FINISHED BIT(2) +#define EQ_PHASE_FINISHED BIT(3) +#define FASE_LT_START_FINISHED BIT(4) +#define CLK_RECOVERY_FAILED BIT(5) +#define EQ_PHASE_FAILED BIT(6) +#define FASE_LT_FAILED BIT(7) + +#define TU_SIZE 30 +#define CDNS_DP_MAX_LINK_RATE 540000 + +#define F_HDMI2_CTRL_IL_MODE (x) (((x) & ((1 << 1) - 1)) << 19) +#define F_HDMI2_PREAMBLE_EN (x) (((x) & ((1 << 1) - 1)) << 18) +#define F_HDMI_ENCODING (x) (((x) & ((1 << 2) - 1)) << 16) +#define F_DATA_EN (x) (((x) & ((1 << 1) - 1)) << 15) +#define F_CLEAR_AVMUTE (x) (((x) & ((1 << 1) - 1)) << 14) +#define F_SET_AVMUTE (x) (((x) & ((1 << 1) - 1)) << 13) +#define F_GCP_EN (x) (((x) & ((1 << 1) - 1)) << 12) +#define F_BCH_EN (x) (((x) & ((1 << 1) - 1)) << 11) +#define F_PIC_3D (x) (((x) & ((1 << 4) - 1)) << 7) +#define F_VIF_DATA_WIDTH (x) (((x) & ((1 << 2) - 1)) << 2) +#define F_HDMI_MODE (x) (((x) & ((1 << 2) - 1)) << 0) + +#define F_SOURCE_PHY_MHDP_SEL (x) (((x) & ((1 << 2) - 1)) << 3) + +#define F_HPD_GLITCH_WIDTH (x) (((x) & ((1 << 8) - 1)) << 12) +#define F_PACKET_TYPE (x) (((x) & ((1 << 8) - 1)) << 8) +#define F_HPD_VALID_WIDTH (x) (((x) & ((1 << 12) - 1)) << 0) + +#define F_SOURCE_PHY_LANE3_SWAP (x) (((x) & ((1 << 2) - 1)) << 6) +#define F_SOURCE_PHY_LANE2_SWAP (x) (((x) & ((1 << 2) - 1)) << 4) +#define F_SOURCE_PHY_LANE1_SWAP (x) (((x) & ((1 << 2) - 1)) << 2) +#define F_SOURCE_PHY_LANE0_SWAP (x) (((x) & ((1 << 2) - 1)) << 0) + +#define F_ACTIVE_IDLE_TYPE (x) (((x) & ((1 << 1) - 1)) << 17) +#define F_TYPE_VALID (x) (((x) & ((1 << 1) - 1)) << 16) +#define F_PKT_ALLOC_ADDRESS (x) (((x) & ((1 << 4) - 1)) << 0) + +#define F_FIFO1_FLUSH (x) (((x) & ((1 << 1) - 1)) << 0) +#define F_PKT_ALLOC_WR_EN (x) (((x) & ((1 << 1) - 1)) << 0) +#define F_DATA_WR (x) (x) +#define F_WR_ADDR (x) (((x) & ((1 << 4) - 1)) << 0) +#define F_HOST_WR (x) (((x) & ((1 << 1) - 1)) << 0) + +/* Reference cycles when using lane clock as reference */ +#define LANE_REF_CYC 0x8000 + +/* HPD Debounce */ +#define HOTPLUG_DEBOUNCE_MS 200 + +/* HPD IRQ Index */ +#define IRQ_IN 0 +#define IRQ_OUT 1 +#define IRQ_NUM 2 + +/* FW check alive timeout */ +#define CDNS_KEEP_ALIVE_TIMEOUT 2000 +#define CDNS_KEEP_ALIVE_MASK GENMASK(7, 0) + +enum voltage_swing_level { +VOLTAGE_LEVEL_0 , +VOLTAGE_LEVEL_1 , +VOLTAGE_LEVEL_2 , +VOLTAGE_LEVEL_3 , +}; + +enum pre_emphasis_level { +PRE_EMPHASIS_LEVEL_0 , +PRE_EMPHASIS_LEVEL_1 , +PRE_EMPHASIS_LEVEL_2 , +PRE_EMPHASIS_LEVEL_3 , +}; + +enum pattern_set { +PTS1 =BIT (0 ), +PTS2 =BIT (1 ), +PTS3 =BIT (2 ), +PTS4 =BIT (3 ), +DP_NONE =BIT (4 ) +}; + +enum vic_color_depth { +BCS_6 =0x1 , +BCS_8 =0x2 , +BCS_10 =0x4 , +BCS_12 =0x8 , +BCS_16 =0x10 , +}; + +enum vic_bt_type { +BT_601 =0x0 , +BT_709 =0x1 , +}; + +enum { +MODE_DVI , +MODE_HDMI_1_4 , +MODE_HDMI_2_0 , +}; + +struct video_info { +int bpc; +int color_fmt; +}; + +struct cdns_hdmi_i2c { +struct i2c_adapter adap; + +struct mutex lock;/* used to serialize data transfers */ +struct completion cmp; +u8 stat; + +u8 slave_reg; +bool is_regaddr; +bool is_segment; +}; + +struct cdns_mhdp8501_device { +struct cdns_mhdp_base base; + +struct device *dev; +void __iomem *regs; +struct drm_connector *curr_conn; +struct drm_bridge bridge; +struct clk *apb_clk; +struct phy *phy; + +struct video_info video_info; + +int irq[IRQ_NUM ]; +struct delayed_work hotplug_work; +int connector_type; +u32 lane_mapping; + +union { +struct _dp_data { +u32 rate; +u8 num_lanes; +struct drm_dp_aux aux; +u8 dpcd[DP_RECEIVER_CAP_SIZE ]; + } dp; +struct _hdmi_data { +u32 hdmi_type; +struct cdns_hdmi_i2c *i2c; + } hdmi; + }; +}; + +extern const struct drm_bridge_funcs cdns_dp_bridge_funcs; +extern const struct drm_bridge_funcs cdns_hdmi_bridge_funcs; + +enum drm_connector_status +cdns_mhdp8501_detect (struct drm_bridge *bridge); +enum drm_mode_status +cdns_mhdp8501_mode_valid (struct drm_bridge *bridge, +const struct drm_display_info *info, +const struct drm_display_mode *mode); + +ssize_t cdns_dp_aux_transfer (struct drm_dp_aux *aux,struct drm_dp_aux_msg *msg); +int cdns_dp_aux_destroy (struct cdns_mhdp8501_device *mhdp); +void cdns_dp_check_link_state (struct cdns_mhdp8501_device *mhdp); + +void cdns_hdmi_handle_hotplug (struct cdns_mhdp8501_device *mhdp); +struct i2c_adapter *cdns_hdmi_i2c_adapter (struct cdns_mhdp8501_device *mhdp); +#endif drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-dp.c new file +452
-0@@ -0,0 +1,694 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Cadence MHDP8501 DisplayPort(DP) bridge driver +* +* Copyright (C) 2019-2024 NXP Semiconductor, Inc. +* +*/ +#include <drm/drm_atomic_helper.h> +#include <drm/drm_edid.h> +#include <drm/drm_print.h> +#include <linux/media-bus-format.h> +#include <linux/phy/phy.h> +#include <linux/phy/phy-dp.h> + +#include "cdns-mhdp8501-core.h" + +#define LINK_TRAINING_TIMEOUT_MS 500 +#define LINK_TRAINING_RETRY_MS 20 + +ssize_t cdns_dp_aux_transfer (struct drm_dp_aux *aux, +struct drm_dp_aux_msg *msg) +{ +struct cdns_mhdp8501_device *mhdp =dev_get_drvdata (aux->dev); +bool native = msg->request & (DP_AUX_NATIVE_WRITE &DP_AUX_NATIVE_READ ); +int ret; + +/* Ignore address only message */ +if (!msg->size || !msg->buffer) { + msg->reply = native ? +DP_AUX_NATIVE_REPLY_ACK :DP_AUX_I2C_REPLY_ACK ; +return msg->size; + } + +if (!native) { +dev_err (mhdp->dev,"%s: only native messages supported\n" , __func__); +return -EINVAL ; + } + +/* msg sanity check */ +if (msg->size >DP_AUX_MAX_PAYLOAD_BYTES ) { +dev_err (mhdp->dev,"%s: invalid msg: size(%zu), request(%x)\n" , + __func__, msg->size, (unsigned int )msg->request); +return -EINVAL ; + } + +if (msg->request ==DP_AUX_NATIVE_WRITE ) { +const u8 *buf = msg->buffer; +int i; + +for (i =0 ; i < msg->size; ++i) { + ret =cdns_mhdp_dpcd_write (&mhdp->base, + msg->address + i, buf[i]); +if (ret <0 ) { +dev_err (mhdp->dev,"Failed to write DPCD\n" ); +return ret; + } + } + msg->reply =DP_AUX_NATIVE_REPLY_ACK ; +return msg->size; + } + +if (msg->request ==DP_AUX_NATIVE_READ ) { + ret =cdns_mhdp_dpcd_read (&mhdp->base, msg->address, + msg->buffer, msg->size); +if (ret <0 ) +return ret; + msg->reply =DP_AUX_NATIVE_REPLY_ACK ; +return msg->size; + } +return 0 ; +} + +int cdns_dp_aux_destroy (struct cdns_mhdp8501_device *mhdp) +{ +drm_dp_aux_unregister (&mhdp->dp.aux); + +return 0 ; +} + +static int cdns_dp_get_msa_misc (struct video_info *video) +{ +u32 msa_misc; +u8 color_space =0 ; +u8 bpc =0 ; + +switch (video->color_fmt) { +/* set YUV default color space conversion to BT601 */ +case DRM_COLOR_FORMAT_YCBCR444 : + color_space =6 +BT_601 *8 ; +break ; +case DRM_COLOR_FORMAT_YCBCR422 : + color_space =5 +BT_601 *8 ; +break ; +case DRM_COLOR_FORMAT_YCBCR420 : + color_space =5 ; +break ; +case DRM_COLOR_FORMAT_RGB444 : +default : + color_space =0 ; +break ; + }; + +switch (video->bpc) { +case 6 : + bpc =0 ; +break ; +case 10 : + bpc =2 ; +break ; +case 12 : + bpc =3 ; +break ; +case 16 : + bpc =4 ; +break ; +case 8 : +default : + bpc =1 ; +break ; + }; + + msa_misc = (bpc <<5 ) | (color_space <<1 ); + +return msa_misc; +} + +static int cdns_dp_config_video (struct cdns_mhdp8501_device *mhdp, +const struct drm_display_mode *mode) +{ +struct video_info *video = &mhdp->video_info; +bool h_sync_polarity, v_sync_polarity; +u64 symbol; +u32 val, link_rate, rem; +u8 bit_per_pix, tu_size_reg =TU_SIZE ; +int ret; + + bit_per_pix = (video->color_fmt ==DRM_COLOR_FORMAT_YCBCR422 ) ? + (video->bpc *2 ) : (video->bpc *3 ); + + link_rate = mhdp->dp.rate /1000 ; + + ret =cdns_mhdp_reg_write (&mhdp->base,BND_HSYNC2VSYNC ,VIF_BYPASS_INTERLACE ); +if (ret) + goto err_config_video; + + ret =cdns_mhdp_reg_write (&mhdp->base,HSYNC2VSYNC_POL_CTRL ,0 ); +if (ret) + goto err_config_video; + +/* +* get a best tu_size and valid symbol: +* 1. chose Lclk freq(162Mhz, 270Mhz, 540Mhz), set TU to 32 +* 2. calculate VS(valid symbol) = TU * Pclk * Bpp / (Lclk * Lanes) +* 3. if VS > *.85 or VS < *.1 or VS < 2 or TU < VS + 4, then set +* TU += 2 and repeat 2nd step. +*/ +do { + tu_size_reg +=2 ; + symbol = tu_size_reg * mode->clock * bit_per_pix; +do_div (symbol, mhdp->dp.num_lanes * link_rate *8 ); + rem =do_div (symbol,1000 ); +if (tu_size_reg >64 ) { + ret = -EINVAL ; +dev_err (mhdp->dev,"tu error, clk:%d, lanes:%d, rate:%d\n" , + mode->clock, mhdp->dp.num_lanes, link_rate); + goto err_config_video; + } + }while ((symbol <=1 ) || (tu_size_reg - symbol <4 ) || + (rem >850 ) || (rem <100 )); + + val = symbol + (tu_size_reg <<8 ); + val |=TU_CNT_RST_EN ; + ret =cdns_mhdp_reg_write (&mhdp->base,DP_FRAMER_TU , val); +if (ret) + goto err_config_video; + +/* set the FIFO Buffer size */ + val =div_u64 (mode->clock * (symbol +1 ),1000 ) + link_rate; + val /= (mhdp->dp.num_lanes * link_rate); + val =div_u64 (8 * (symbol +1 ), bit_per_pix) - val; + val +=2 ; + ret =cdns_mhdp_reg_write (&mhdp->base,DP_VC_TABLE (15 ), val); + +switch (video->bpc) { +case 6 : + val =BCS_6 ; +break ; +case 10 : + val =BCS_10 ; +break ; +case 12 : + val =BCS_12 ; +break ; +case 16 : + val =BCS_16 ; +break ; +case 8 : +default : + val =BCS_8 ; +break ; + }; + + val += video->color_fmt <<8 ; + ret =cdns_mhdp_reg_write (&mhdp->base,DP_FRAMER_PXL_REPR , val); +if (ret) + goto err_config_video; + + v_sync_polarity = !!(mode->flags &DRM_MODE_FLAG_NVSYNC ); + h_sync_polarity = !!(mode->flags &DRM_MODE_FLAG_NHSYNC ); + + val = h_sync_polarity ?DP_FRAMER_SP_HSP :0 ; + val |= v_sync_polarity ?DP_FRAMER_SP_VSP :0 ; + ret =cdns_mhdp_reg_write (&mhdp->base,DP_FRAMER_SP , val); +if (ret) + goto err_config_video; + + val = (mode->hsync_start - mode->hdisplay) <<16 ; + val |= mode->htotal - mode->hsync_end; + ret =cdns_mhdp_reg_write (&mhdp->base,DP_FRONT_BACK_PORCH , val); +if (ret) + goto err_config_video; + + val = mode->hdisplay * bit_per_pix /8 ; + ret =cdns_mhdp_reg_write (&mhdp->base,DP_BYTE_COUNT , val); +if (ret) + goto err_config_video; + + val = mode->htotal | ((mode->htotal - mode->hsync_start) <<16 ); + ret =cdns_mhdp_reg_write (&mhdp->base,MSA_HORIZONTAL_0 , val); +if (ret) + goto err_config_video; + + val = mode->hsync_end - mode->hsync_start; + val |= (mode->hdisplay <<16 ) | (h_sync_polarity <<15 ); + ret =cdns_mhdp_reg_write (&mhdp->base,MSA_HORIZONTAL_1 , val); +if (ret) + goto err_config_video; + + val = mode->vtotal; + val |= (mode->vtotal - mode->vsync_start) <<16 ; + ret =cdns_mhdp_reg_write (&mhdp->base,MSA_VERTICAL_0 , val); +if (ret) + goto err_config_video; + + val = mode->vsync_end - mode->vsync_start; + val |= (mode->vdisplay <<16 ) | (v_sync_polarity <<15 ); + ret =cdns_mhdp_reg_write (&mhdp->base,MSA_VERTICAL_1 , val); +if (ret) + goto err_config_video; + + val =cdns_dp_get_msa_misc (video); + ret =cdns_mhdp_reg_write (&mhdp->base,MSA_MISC , val); +if (ret) + goto err_config_video; + + ret =cdns_mhdp_reg_write (&mhdp->base,STREAM_CONFIG ,1 ); +if (ret) + goto err_config_video; + + val = mode->hsync_end - mode->hsync_start; + val |= mode->hdisplay <<16 ; + ret =cdns_mhdp_reg_write (&mhdp->base,DP_HORIZONTAL , val); +if (ret) + goto err_config_video; + + val = mode->vdisplay; + val |= (mode->vtotal - mode->vsync_start) <<16 ; + ret =cdns_mhdp_reg_write (&mhdp->base,DP_VERTICAL_0 , val); +if (ret) + goto err_config_video; + + val = mode->vtotal; + ret =cdns_mhdp_reg_write (&mhdp->base,DP_VERTICAL_1 , val); +if (ret) + goto err_config_video; + + ret =cdns_mhdp_dp_reg_write_bit (&mhdp->base,DP_VB_ID ,2 ,1 ,0 ); + +err_config_video: +if (ret) +dev_err (mhdp->dev,"config video failed: %d\n" , ret); +return ret; +} + +static void cdns_dp_pixel_clk_reset (struct cdns_mhdp8501_device *mhdp) +{ +u32 val; + +/* reset pixel clk */ +cdns_mhdp_reg_read (&mhdp->base,SOURCE_HDTX_CAR , &val); +cdns_mhdp_reg_write (&mhdp->base,SOURCE_HDTX_CAR , val &0xFD ); +cdns_mhdp_reg_write (&mhdp->base,SOURCE_HDTX_CAR , val); +} + +static int cdns_dp_set_video_status (struct cdns_mhdp8501_device *mhdp,int active) +{ +u8 msg; +int ret; + + msg = !!active; + + ret =cdns_mhdp_mailbox_send (&mhdp->base,MB_MODULE_ID_DP_TX , +DPTX_SET_VIDEO ,sizeof (msg), &msg); +if (ret) +dev_err (mhdp->dev,"set video status failed: %d\n" , ret); + +return ret; +} + +static int cdns_dp_training_start (struct cdns_mhdp8501_device *mhdp) +{ +unsigned long timeout; +u8 msg, event[2 ]; +int ret; + + msg =LINK_TRAINING_RUN ; + +/* start training */ + ret =cdns_mhdp_mailbox_send (&mhdp->base,MB_MODULE_ID_DP_TX , +DPTX_TRAINING_CONTROL ,sizeof (msg), &msg); +if (ret) +return ret; + + timeout = jiffies +msecs_to_jiffies (LINK_TRAINING_TIMEOUT_MS ); +while (time_before (jiffies, timeout)) { +msleep (LINK_TRAINING_RETRY_MS ); + ret =cdns_mhdp_mailbox_send_recv (&mhdp->base,MB_MODULE_ID_DP_TX , +DPTX_READ_EVENT , +0 ,NULL ,sizeof (event), event); +if (ret) +return ret; + +if (event[1 ] &CLK_RECOVERY_FAILED ) +dev_err (mhdp->dev,"clock recovery failed\n" ); +else if (event[1 ] &EQ_PHASE_FINISHED ) +return 0 ; + } + +return -ETIMEDOUT ; +} + +static int cdns_dp_get_training_status (struct cdns_mhdp8501_device *mhdp) +{ +u8 status[13 ]; +int ret; + + ret =cdns_mhdp_mailbox_send_recv (&mhdp->base,MB_MODULE_ID_DP_TX , +DPTX_READ_LINK_STAT , +0 ,NULL ,sizeof (status), status); +if (ret) +return ret; + + mhdp->dp.rate =drm_dp_bw_code_to_link_rate (status[0 ]); + mhdp->dp.num_lanes = status[1 ]; + +return ret; +} + +static int cdns_dp_train_link (struct cdns_mhdp8501_device *mhdp) +{ +int ret; + + ret =cdns_dp_training_start (mhdp); +if (ret) { +dev_err (mhdp->dev,"Failed to start training %d\n" , ret); +return ret; + } + + ret =cdns_dp_get_training_status (mhdp); +if (ret) { +dev_err (mhdp->dev,"Failed to get training stat %d\n" , ret); +return ret; + } + +dev_dbg (mhdp->dev,"rate:0x%x, lanes:%d\n" , mhdp->dp.rate, + mhdp->dp.num_lanes); +return ret; +} + +static int cdns_dp_set_host_cap (struct cdns_mhdp8501_device *mhdp) +{ +u8 msg[8 ]; +int ret; + + msg[0 ] =drm_dp_link_rate_to_bw_code (mhdp->dp.rate); + msg[1 ] = mhdp->dp.num_lanes |SCRAMBLER_EN ; + msg[2 ] =VOLTAGE_LEVEL_2 ; + msg[3 ] =PRE_EMPHASIS_LEVEL_3 ; + msg[4 ] =PTS1 |PTS2 |PTS3 |PTS4 ; + msg[5 ] =FAST_LT_NOT_SUPPORT ; + msg[6 ] = mhdp->lane_mapping; + msg[7 ] =ENHANCED ; + + ret =cdns_mhdp_mailbox_send (&mhdp->base,MB_MODULE_ID_DP_TX , +DPTX_SET_HOST_CAPABILITIES , +sizeof (msg), msg); +if (ret) +dev_err (mhdp->dev,"set host cap failed: %d\n" , ret); + +return ret; +} + +static int cdns_dp_get_edid_block (void *data,u8 *edid, +unsigned int block,size_t length) +{ +struct cdns_mhdp8501_device *mhdp = data; +u8 msg[2 ], reg[2 ], i; +int ret; + +for (i =0 ; i <4 ; i++) { + msg[0 ] = block /2 ; + msg[1 ] = block %2 ; + + ret =cdns_mhdp_mailbox_send_recv_multi (&mhdp->base, +MB_MODULE_ID_DP_TX , +DPTX_GET_EDID , +sizeof (msg), msg, +DPTX_GET_EDID , +sizeof (reg), reg, + length, edid); +if (ret) +continue ; + +if (reg[0 ] == length && reg[1 ] == block /2 ) +break ; + } + +if (ret) +dev_err (mhdp->dev,"get block[%d] edid failed: %d\n" , + block, ret); + +return ret; +} + +static void cdns_dp_mode_set (struct cdns_mhdp8501_device *mhdp, +const struct drm_display_mode *mode) +{ +union phy_configure_opts phy_cfg; +int ret; + +cdns_dp_pixel_clk_reset (mhdp); + +/* Get DP Caps */ + ret =drm_dp_dpcd_read (&mhdp->dp.aux,DP_DPCD_REV , mhdp->dp.dpcd, +DP_RECEIVER_CAP_SIZE ); +if (ret <0 ) { +dev_err (mhdp->dev,"Failed to get caps %d\n" , ret); +return ; + } + + mhdp->dp.rate =drm_dp_max_link_rate (mhdp->dp.dpcd); + mhdp->dp.num_lanes =drm_dp_max_lane_count (mhdp->dp.dpcd);
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-dp.c line 462
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-dp.c new file +10
-0+ +/* check the max link rate */ +if (mhdp->dp.rate >CDNS_DP_MAX_LINK_RATE ) + mhdp->dp.rate =CDNS_DP_MAX_LINK_RATE ; + + phy_cfg.dp.lanes = mhdp->dp.num_lanes; + phy_cfg.dp.link_rate = mhdp->dp.rate; + phy_cfg.dp.set_lanes = false; + phy_cfg.dp.set_rate = false; + phy_cfg.dp.set_voltages = false;
If all of those are false, then you can skip setting .lanes and .link_rate.
Quoted 78 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-dp.c new file +78
-0+ + ret =phy_configure (mhdp->phy, &phy_cfg); +if (ret) { +dev_err (mhdp->dev,"%s: phy_configure() failed: %d\n" , + __func__, ret); +return ; + } + +/* Video off */ + ret =cdns_dp_set_video_status (mhdp,CONTROL_VIDEO_IDLE ); +if (ret) { +dev_err (mhdp->dev,"Failed to valid video %d\n" , ret); +return ; + } + +/* Line swapping */ +cdns_mhdp_reg_write (&mhdp->base,LANES_CONFIG ,0x00400000 | mhdp->lane_mapping); + +/* Set DP host capability */ + ret =cdns_dp_set_host_cap (mhdp); +if (ret) { +dev_err (mhdp->dev,"Failed to set host cap %d\n" , ret); +return ; + } + + ret =cdns_mhdp_reg_write (&mhdp->base,DP_AUX_SWAP_INVERSION_CONTROL , +AUX_HOST_INVERT ); +if (ret) { +dev_err (mhdp->dev,"Failed to set host invert %d\n" , ret); +return ; + } + + ret =cdns_dp_config_video (mhdp, mode); +if (ret) +dev_err (mhdp->dev,"Failed to config video %d\n" , ret); +} + +static bool +cdns_dp_needs_link_retrain (struct cdns_mhdp8501_device *mhdp) +{ +u8 link_status[DP_LINK_STATUS_SIZE ]; + +if (drm_dp_dpcd_read_phy_link_status (&mhdp->dp.aux,DP_PHY_DPRX , + link_status) <0 ) +return false; + +/* Retrain if link not ok */ +return !drm_dp_channel_eq_ok (link_status, mhdp->dp.num_lanes); +} + +void cdns_dp_check_link_state (struct cdns_mhdp8501_device *mhdp) +{ +struct drm_connector *connector = mhdp->curr_conn; +const struct drm_edid *drm_edid; +struct drm_connector_state *conn_state; +struct drm_crtc_state *crtc_state; +struct drm_crtc *crtc; + +if (!connector) +return ; + +/* +* EDID data needs updating after each cable plugin +* due to potential display monitor changes +*/ + drm_edid =drm_edid_read_custom (connector, cdns_dp_get_edid_block, mhdp); +drm_edid_connector_update (connector, drm_edid); + +if (!drm_edid) +return ; + +drm_edid_free (drm_edid); + + conn_state = connector->state; + crtc = conn_state->crtc; +if (!crtc) +return ; +
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-dp.c line 550
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-dp.c new file +10
-0+ crtc_state = crtc->state; +if (!crtc_state->active) +return ; + +if (!cdns_dp_needs_link_retrain (mhdp)) +return ; + +/* DP link retrain */ +if (cdns_dp_train_link (mhdp)) +dev_err (mhdp->dev,"Failed link train\n" );
Won't this cause link traning to happen on the first monitor plug event? Is it okay to do even with the phy being powered off?
Quoted 5 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-dp.c new file +5
-0+} + +static int cdns_dp_bridge_attach (struct drm_bridge *bridge, +enum drm_bridge_attach_flags flags) +{
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-dp.c line 565
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-dp.c new file +10
-0+struct cdns_mhdp8501_device *mhdp = bridge->driver_private; + +if (!(flags &DRM_BRIDGE_ATTACH_NO_CONNECTOR )) { +dev_err (mhdp->dev,"do not support creating a drm_connector\n" ); +return -EINVAL ; + } + + mhdp->dp.aux.drm_dev = bridge->dev; + +return drm_dp_aux_register (&mhdp->dp.aux);
Why is it a part of the _attach callback? If there is anything on the DP AUX bus, it should be already registered by this point.
Quoted 44 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-dp.c new file +44
-0+} + +static const struct drm_edid +*cdns_dp_bridge_edid_read (struct drm_bridge *bridge, +struct drm_connector *connector) +{ +struct cdns_mhdp8501_device *mhdp = bridge->driver_private; + +return drm_edid_read_custom (connector, cdns_dp_get_edid_block, mhdp); +} + +/* Currently supported format */ +static const u32 mhdp8501_input_fmts[] = { +MEDIA_BUS_FMT_RGB888_1X24 , +MEDIA_BUS_FMT_RGB101010_1X30 , +}; + +static u32 *cdns_dp_bridge_atomic_get_input_bus_fmts (struct drm_bridge *bridge, +struct drm_bridge_state *bridge_state, +struct drm_crtc_state *crtc_state, +struct drm_connector_state *conn_state, +u32 output_fmt, +unsigned int *num_input_fmts) +{ +u32 *input_fmts; + + *num_input_fmts =0 ; + + input_fmts =kcalloc (ARRAY_SIZE (mhdp8501_input_fmts), +sizeof (*input_fmts), +GFP_KERNEL ); +if (!input_fmts) +return NULL ; + + *num_input_fmts =ARRAY_SIZE (mhdp8501_input_fmts); +memcpy (input_fmts, mhdp8501_input_fmts,sizeof (mhdp8501_input_fmts)); + +return input_fmts; +} + +static int cdns_dp_bridge_atomic_check (struct drm_bridge *bridge, +struct drm_bridge_state *bridge_state, +struct drm_crtc_state *crtc_state, +struct drm_connector_state *conn_state)
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-dp.c line 619
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-dp.c new file +10
-0+{ +struct cdns_mhdp8501_device *mhdp = bridge->driver_private; +struct video_info *video = &mhdp->video_info; + +if (bridge_state->input_bus_cfg.format ==MEDIA_BUS_FMT_RGB888_1X24 ) { + video->bpc =8 ; + video->color_fmt =DRM_COLOR_FORMAT_RGB444 ; + }else if (bridge_state->input_bus_cfg.format ==MEDIA_BUS_FMT_RGB101010_1X30 ) { + video->bpc =10 ; + video->color_fmt =DRM_COLOR_FORMAT_RGB444 ;
Which driver is going to select bus config for you?
Quoted 177 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-dp.c new file +75
-0+ }else { +return -EINVAL ; + } + +return 0 ; +} + +static void cdns_dp_bridge_atomic_disable (struct drm_bridge *bridge, +struct drm_bridge_state *old_state) +{ +struct cdns_mhdp8501_device *mhdp = bridge->driver_private; + +cdns_dp_set_video_status (mhdp,CONTROL_VIDEO_IDLE ); + mhdp->curr_conn =NULL ; + +phy_power_off (mhdp->phy); +} + +static void cdns_dp_bridge_atomic_enable (struct drm_bridge *bridge, +struct drm_bridge_state *old_state) +{ +struct cdns_mhdp8501_device *mhdp = bridge->driver_private; +struct drm_atomic_state *state = old_state->base.state; +struct drm_connector *connector; +struct drm_crtc_state *crtc_state; +struct drm_connector_state *conn_state; +int ret; + + connector =drm_atomic_get_new_connector_for_encoder (state, + bridge->encoder); +if (WARN_ON (!connector)) +return ; + + mhdp->curr_conn = connector; + + conn_state =drm_atomic_get_new_connector_state (state, connector); +if (WARN_ON (!conn_state)) +return ; + + crtc_state =drm_atomic_get_new_crtc_state (state, conn_state->crtc); +if (WARN_ON (!crtc_state)) +return ; + +cdns_dp_mode_set (mhdp, &crtc_state->adjusted_mode); + +/* Power up PHY before link training */ +phy_power_on (mhdp->phy); + +/* Link training */ + ret =cdns_dp_train_link (mhdp); +if (ret) { +dev_err (mhdp->dev,"Failed link train %d\n" , ret); +return ; + } + + ret =cdns_dp_set_video_status (mhdp,CONTROL_VIDEO_VALID ); +if (ret) { +dev_err (mhdp->dev,"Failed to valid video %d\n" , ret); +return ; + } +} + +const struct drm_bridge_funcs cdns_dp_bridge_funcs = { + .attach = cdns_dp_bridge_attach, + .detect = cdns_mhdp8501_detect, + .edid_read = cdns_dp_bridge_edid_read, + .mode_valid = cdns_mhdp8501_mode_valid, + .atomic_enable = cdns_dp_bridge_atomic_enable, + .atomic_disable = cdns_dp_bridge_atomic_disable, + .atomic_get_input_bus_fmts = cdns_dp_bridge_atomic_get_input_bus_fmts, + .atomic_check = cdns_dp_bridge_atomic_check, + .atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state, + .atomic_destroy_state = drm_atomic_helper_bridge_destroy_state, + .atomic_reset = drm_atomic_helper_bridge_reset, +};drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +96
-0@@ -0,0 +1,745 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Cadence MHDP8501 HDMI bridge driver +* +* Copyright (C) 2019-2024 NXP Semiconductor, Inc. +* +*/ +#include <drm/display/drm_hdmi_helper.h> +#include <drm/display/drm_hdmi_state_helper.h> +#include <drm/display/drm_scdc_helper.h> +#include <drm/drm_atomic_helper.h> +#include <drm/drm_edid.h> +#include <drm/drm_print.h> +#include <linux/phy/phy.h> +#include <linux/phy/phy-hdmi.h> + +#include "cdns-mhdp8501-core.h" + +/** +* cdns_hdmi_config_infoframe() - fill the HDMI infoframe +* @mhdp: phandle to mhdp device. +* @entry_id: The packet memory address in which the data is written. +* @len: length of infoframe. +* @buf: point to InfoFrame Packet. +* @type: Packet Type of InfoFrame in HDMI Specification. +* +*/ + +static void cdns_hdmi_clear_infoframe (struct cdns_mhdp8501_device *mhdp, +u8 entry_id,u8 type) +{ +u32 val; + +/* invalidate entry */ + val =F_ACTIVE_IDLE_TYPE (1 ) |F_PKT_ALLOC_ADDRESS (entry_id) | +F_PACKET_TYPE (type); +writel (val, mhdp->regs +SOURCE_PIF_PKT_ALLOC_REG ); +writel (F_PKT_ALLOC_WR_EN (1 ), mhdp->regs +SOURCE_PIF_PKT_ALLOC_WR_EN ); +} + +static void cdns_hdmi_config_infoframe (struct cdns_mhdp8501_device *mhdp, +u8 entry_id,u8 len, +const u8 *buf,u8 type) +{ +u8 packet[32 ], packet_len =32 ; +u32 packet32, len32; +u32 val, i; + +/* +* only support 32 bytes now +* packet[0] = 0 +* packet[1-3] = HB[0-2] InfoFrame Packet Header +* packet[4-31 = PB[0-27] InfoFrame Packet Contents +*/ +if (len >= (packet_len -1 )) +return ; + packet[0 ] =0 ; +memcpy (packet +1 , buf, len); + +cdns_hdmi_clear_infoframe (mhdp, entry_id, type); + +/* flush fifo 1 */ +writel (F_FIFO1_FLUSH (1 ), mhdp->regs +SOURCE_PIF_FIFO1_FLUSH ); + +/* write packet into memory */ + len32 = packet_len /4 ; +for (i =0 ; i < len32; i++) { + packet32 =get_unaligned_le32 (packet +4 * i); +writel (F_DATA_WR (packet32), mhdp->regs +SOURCE_PIF_DATA_WR ); + } + +/* write entry id */ +writel (F_WR_ADDR (entry_id), mhdp->regs +SOURCE_PIF_WR_ADDR ); + +/* write request */ +writel (F_HOST_WR (1 ), mhdp->regs +SOURCE_PIF_WR_REQ ); + +/* update entry */ + val =F_ACTIVE_IDLE_TYPE (1 ) |F_TYPE_VALID (1 ) | +F_PACKET_TYPE (type) |F_PKT_ALLOC_ADDRESS (entry_id); +writel (val, mhdp->regs +SOURCE_PIF_PKT_ALLOC_REG ); + +writel (F_PKT_ALLOC_WR_EN (1 ), mhdp->regs +SOURCE_PIF_PKT_ALLOC_WR_EN ); +} + +static int cdns_hdmi_get_edid_block (void *data,u8 *edid, +u32 block,size_t length) +{ +struct cdns_mhdp8501_device *mhdp = data; +u8 msg[2 ], reg[5 ], i; +int ret; + +for (i =0 ; i <4 ; i++) { + msg[0 ] = block /2 ; + msg[1 ] = block %2 ; +
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c line 106
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +10
-0+ ret =cdns_mhdp_mailbox_send_recv_multi (&mhdp->base, +MB_MODULE_ID_HDMI_TX , +HDMI_TX_EDID , +sizeof (msg), msg, +HDMI_TX_EDID , +sizeof (reg), reg, + length, edid); + +if (ret) +continue ;
Ignoring the error?
Quoted 642 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +639
-0+ +if ((reg[3 ] <<8 | reg[4 ]) == length) +break ; + } + +if (ret) +dev_err (mhdp->dev,"get block[%d] edid failed: %d\n" , block, ret); +return ret; +} + +static int cdns_hdmi_set_hdmi_mode_type (struct cdns_mhdp8501_device *mhdp) +{ +struct drm_connector_state *conn_state = mhdp->curr_conn->state; +u32 protocol = mhdp->hdmi.hdmi_type; +u32 val; + +if (protocol ==MODE_HDMI_2_0 && + conn_state->hdmi.tmds_char_rate >=340000000 ) { +cdns_mhdp_reg_write (&mhdp->base,HDTX_CLOCK_REG_0 ,0 ); +cdns_mhdp_reg_write (&mhdp->base,HDTX_CLOCK_REG_1 ,0xFFFFF ); + } + +cdns_mhdp_reg_read (&mhdp->base,HDTX_CONTROLLER , &val); + +/* set HDMI mode and preemble mode data enable */ + val |=F_HDMI_MODE (protocol) |F_HDMI2_PREAMBLE_EN (1 ) | +F_HDMI2_CTRL_IL_MODE (1 ); +return cdns_mhdp_reg_write (&mhdp->base,HDTX_CONTROLLER , val); +} + +static int cdns_hdmi_ctrl_init (struct cdns_mhdp8501_device *mhdp) +{ +u32 val; +int ret; + +/* Set PHY to HDMI data */ + ret =cdns_mhdp_reg_write (&mhdp->base,PHY_DATA_SEL ,F_SOURCE_PHY_MHDP_SEL (1 )); +if (ret <0 ) +return ret; + + ret =cdns_mhdp_reg_write (&mhdp->base,HDTX_HPD , +F_HPD_VALID_WIDTH (4 ) |F_HPD_GLITCH_WIDTH (0 )); +if (ret <0 ) +return ret; + +/* open CARS */ + ret =cdns_mhdp_reg_write (&mhdp->base,SOURCE_PHY_CAR ,0xF ); +if (ret <0 ) +return ret; + ret =cdns_mhdp_reg_write (&mhdp->base,SOURCE_HDTX_CAR ,0xFF ); +if (ret <0 ) +return ret; + ret =cdns_mhdp_reg_write (&mhdp->base,SOURCE_PKT_CAR ,0xF ); +if (ret <0 ) +return ret; + ret =cdns_mhdp_reg_write (&mhdp->base,SOURCE_AIF_CAR ,0xF ); +if (ret <0 ) +return ret; + ret =cdns_mhdp_reg_write (&mhdp->base,SOURCE_CIPHER_CAR ,0xF ); +if (ret <0 ) +return ret; + ret =cdns_mhdp_reg_write (&mhdp->base,SOURCE_CRYPTO_CAR ,0xF ); +if (ret <0 ) +return ret; + ret =cdns_mhdp_reg_write (&mhdp->base,SOURCE_CEC_CAR ,3 ); +if (ret <0 ) +return ret; + + ret =cdns_mhdp_reg_write (&mhdp->base,HDTX_CLOCK_REG_0 ,0x7c1f ); +if (ret <0 ) +return ret; + ret =cdns_mhdp_reg_write (&mhdp->base,HDTX_CLOCK_REG_1 ,0x7c1f ); +if (ret <0 ) +return ret; + +/* init HDMI Controller */ + val =F_BCH_EN (1 ) |F_PIC_3D (0xF ) |F_CLEAR_AVMUTE (1 ); + ret =cdns_mhdp_reg_write (&mhdp->base,HDTX_CONTROLLER , val); +if (ret <0 ) +return ret; + +return cdns_hdmi_set_hdmi_mode_type (mhdp); +} + +static int cdns_hdmi_mode_config (struct cdns_mhdp8501_device *mhdp, +struct drm_display_mode *mode, +struct drm_connector_hdmi_state *hdmi) +{ +u32 vsync_lines = mode->vsync_end - mode->vsync_start; +u32 eof_lines = mode->vsync_start - mode->vdisplay; +u32 sof_lines = mode->vtotal - mode->vsync_end; +u32 hblank = mode->htotal - mode->hdisplay; +u32 hactive = mode->hdisplay; +u32 vblank = mode->vtotal - mode->vdisplay; +u32 vactive = mode->vdisplay; +u32 hfront = mode->hsync_start - mode->hdisplay; +u32 hback = mode->htotal - mode->hsync_end; +u32 vfront = eof_lines; +u32 hsync = hblank - hfront - hback; +u32 vsync = vsync_lines; +u32 vback = sof_lines; +u32 v_h_polarity = ((mode->flags &DRM_MODE_FLAG_NHSYNC ) ?0 :1 ) + + ((mode->flags &DRM_MODE_FLAG_NVSYNC ) ?0 :2 ); +int ret; +u32 val; + + ret =cdns_mhdp_reg_write (&mhdp->base,SCHEDULER_H_SIZE , (hactive <<16 ) + hblank); +if (ret <0 ) +return ret; + + ret =cdns_mhdp_reg_write (&mhdp->base,SCHEDULER_V_SIZE , (vactive <<16 ) + vblank); +if (ret <0 ) +return ret; + + ret =cdns_mhdp_reg_write (&mhdp->base,HDTX_SIGNAL_FRONT_WIDTH , (vfront <<16 ) + hfront); +if (ret <0 ) +return ret; + + ret =cdns_mhdp_reg_write (&mhdp->base,HDTX_SIGNAL_SYNC_WIDTH , (vsync <<16 ) + hsync); +if (ret <0 ) +return ret; + + ret =cdns_mhdp_reg_write (&mhdp->base,HDTX_SIGNAL_BACK_WIDTH , (vback <<16 ) + hback); +if (ret <0 ) +return ret; + + ret =cdns_mhdp_reg_write (&mhdp->base,HSYNC2VSYNC_POL_CTRL , v_h_polarity); +if (ret <0 ) +return ret; + +/* Reset Data Enable */ +cdns_mhdp_reg_read (&mhdp->base,HDTX_CONTROLLER , &val); + val &= ~F_DATA_EN (1 ); + ret =cdns_mhdp_reg_write (&mhdp->base,HDTX_CONTROLLER , val); +if (ret <0 ) +return ret; + +/* Set bpc */ + val &= ~F_VIF_DATA_WIDTH (3 ); +switch (hdmi->output_bpc) { +case 10 : + val |=F_VIF_DATA_WIDTH (1 ); +break ; +case 12 : + val |=F_VIF_DATA_WIDTH (2 ); +break ; +case 16 : + val |=F_VIF_DATA_WIDTH (3 ); +break ; +case 8 : +default : + val |=F_VIF_DATA_WIDTH (0 ); +break ; + } + +/* select color encoding */ + val &= ~F_HDMI_ENCODING (3 ); +switch (hdmi->output_format) { +case HDMI_COLORSPACE_YUV444 : + val |=F_HDMI_ENCODING (2 ); +break ; +case HDMI_COLORSPACE_YUV422 : + val |=F_HDMI_ENCODING (1 ); +break ; +case HDMI_COLORSPACE_YUV420 : + val |=F_HDMI_ENCODING (3 ); +break ; +case HDMI_COLORSPACE_RGB : +default : + val |=F_HDMI_ENCODING (0 ); +break ; + } + + ret =cdns_mhdp_reg_write (&mhdp->base,HDTX_CONTROLLER , val); +if (ret <0 ) +return ret; + +/* set data enable */ + val |=F_DATA_EN (1 ); +return cdns_mhdp_reg_write (&mhdp->base,HDTX_CONTROLLER , val); +} + +static int cdns_hdmi_disable_gcp (struct cdns_mhdp8501_device *mhdp) +{ +u32 val; + +cdns_mhdp_reg_read (&mhdp->base,HDTX_CONTROLLER , &val); + val &= ~F_GCP_EN (1 ); + +return cdns_mhdp_reg_write (&mhdp->base,HDTX_CONTROLLER , val); +} + +static int cdns_hdmi_enable_gcp (struct cdns_mhdp8501_device *mhdp) +{ +u32 val; + +cdns_mhdp_reg_read (&mhdp->base,HDTX_CONTROLLER , &val); + val |=F_GCP_EN (1 ); + +return cdns_mhdp_reg_write (&mhdp->base,HDTX_CONTROLLER , val); +} + +#define HDMI_14_MAX_TMDS_CLK (340 * 1000 * 1000) +static void cdns_hdmi_sink_config (struct cdns_mhdp8501_device *mhdp, +unsigned long long tmds_char_rate) +{ +struct drm_connector *connector = mhdp->curr_conn; +struct drm_display_info *display = &connector->display_info; +struct drm_scdc *scdc = &display->hdmi.scdc; +bool hdmi_scrambling = false; +bool hdmi_high_tmds_clock_ratio = false; + +/* check sink type (HDMI or DVI) */ +if (!display->is_hdmi) { + mhdp->hdmi.hdmi_type =MODE_DVI ; +return ; + } + +/* Default work in HDMI1.4 */ + mhdp->hdmi.hdmi_type =MODE_HDMI_1_4 ; + +/* check sink support SCDC or not */ +if (!scdc->supported) { +dev_dbg (mhdp->dev,"Sink Not Support SCDC\n" ); +return ; + } + +if (tmds_char_rate >HDMI_14_MAX_TMDS_CLK ) { + hdmi_scrambling = true; + hdmi_high_tmds_clock_ratio = true; + mhdp->hdmi.hdmi_type =MODE_HDMI_2_0 ; + }else if (scdc->scrambling.low_rates) { + hdmi_scrambling = true; + mhdp->hdmi.hdmi_type =MODE_HDMI_2_0 ; + } + +/* Set TMDS bit clock ratio to 1/40 or 1/10, and enable/disable scrambling */ +drm_scdc_set_high_tmds_clock_ratio (connector, hdmi_high_tmds_clock_ratio); +drm_scdc_set_scrambling (connector, hdmi_scrambling); +} + +static int cdns_hdmi_bridge_attach (struct drm_bridge *bridge, +enum drm_bridge_attach_flags flags) +{ +struct cdns_mhdp8501_device *mhdp = bridge->driver_private; + +if (!(flags &DRM_BRIDGE_ATTACH_NO_CONNECTOR )) { +dev_err (mhdp->dev,"do not support creating a drm_connector\n" ); +return -EINVAL ; + } + +return 0 ; +} + +static int reset_pipe (struct drm_crtc *crtc) +{ +struct drm_atomic_state *state; +struct drm_crtc_state *crtc_state; +struct drm_modeset_acquire_ctx ctx; +int ret; + + state =drm_atomic_state_alloc (crtc->dev); +if (!state) +return -ENOMEM ; + +drm_modeset_acquire_init (&ctx,0 ); + + state->acquire_ctx = &ctx; + + crtc_state =drm_atomic_get_crtc_state (state, crtc); +if (IS_ERR (crtc_state)) { + ret =PTR_ERR (crtc_state); + goto out; + } + + crtc_state->connectors_changed = true; + + ret =drm_atomic_commit (state); +out: +drm_atomic_state_put (state); +drm_modeset_drop_locks (&ctx); +drm_modeset_acquire_fini (&ctx); + +return ret; +} + +void cdns_hdmi_handle_hotplug (struct cdns_mhdp8501_device *mhdp) +{ +struct drm_connector *connector = mhdp->curr_conn; +const struct drm_edid *drm_edid; +struct drm_connector_state *conn_state; +struct drm_crtc_state *crtc_state; +struct drm_crtc *crtc; + +if (!connector) +return ; + +/* +* EDID data needs updating after each cable plugin +* due to potential display monitor changes +*/ + drm_edid =drm_edid_read_custom (connector, cdns_hdmi_get_edid_block, mhdp); +drm_edid_connector_update (connector, drm_edid); + +if (!drm_edid) +return ; + +drm_edid_free (drm_edid); + + conn_state = connector->state; + crtc = conn_state->crtc; +if (!crtc) +return ; + + crtc_state = crtc->state; +if (!crtc_state->active) +return ; + +/* +* HDMI 2.0 says that one should not send scrambled data +* prior to configuring the sink scrambling, and that +* TMDS clock/data transmission should be suspended when +* changing the TMDS clock rate in the sink. So let's +* just do a full modeset here, even though some sinks +* would be perfectly happy if were to just reconfigure +* the SCDC settings on the fly. +*/ +reset_pipe (crtc); +} + +static int cdns_hdmi_i2c_write (struct cdns_mhdp8501_device *mhdp, +struct i2c_msg *msgs) +{ +u8 msg[5 ], reg[5 ]; +int ret; + + msg[0 ] = msgs->addr; + msg[1 ] = msgs->buf[0 ]; + msg[2 ] =0 ; + msg[3 ] =1 ; + msg[4 ] = msgs->buf[1 ]; + + ret =cdns_mhdp_mailbox_send_recv (&mhdp->base, +MB_MODULE_ID_HDMI_TX ,HDMI_TX_WRITE , +sizeof (msg), msg,sizeof (reg), reg); +if (ret) { +dev_err (mhdp->dev,"I2C write failed: %d\n" , ret); +return ret; + } + +if (reg[0 ] !=0 ) +return -EINVAL ; + +return 0 ; +} + +static int cdns_hdmi_i2c_read (struct cdns_mhdp8501_device *mhdp, +struct i2c_msg *msgs,int num) +{ +u8 msg[4 ], reg[5 ]; +u8 addr, offset, *buf, len; +int ret, i; + +for (i =0 ; i < num; i++) { +if (msgs[i].flags &I2C_M_RD ) { + addr = msgs[i].addr; + buf = msgs[i].buf; + len = msgs[i].len; + }else { + offset = msgs[i].buf[0 ]; + } + } + + msg[0 ] = addr; + msg[1 ] = offset; +put_unaligned_be16 (len, msg +2 ); + + ret =cdns_mhdp_mailbox_send_recv_multi (&mhdp->base, +MB_MODULE_ID_HDMI_TX ,HDMI_TX_READ , +sizeof (msg), msg, +HDMI_TX_READ , +sizeof (reg), reg, + len, buf); +if (ret) { +dev_err (mhdp->dev,"I2c Read failed: %d\n" , ret); +return ret; + } + +return 0 ; +} + +#define SCDC_I2C_SLAVE_ADDRESS 0x54 +static int cdns_hdmi_i2c_xfer (struct i2c_adapter *adap, +struct i2c_msg *msgs,int num) +{ +struct cdns_mhdp8501_device *mhdp =i2c_get_adapdata (adap); +struct cdns_hdmi_i2c *i2c = mhdp->hdmi.i2c; +int i, ret =0 ; + +/* +* MHDP FW provides mailbox APIs for SCDC registers access, but lacks direct I2C APIs. +* While individual I2C registers can be read/written using HDMI general register APIs, +* block reads (e.g., EDID) are not supported, making it a limited I2C interface. +*/ +for (i =0 ; i < num; i++) { +if (msgs[i].addr !=SCDC_I2C_SLAVE_ADDRESS ) { +dev_err (mhdp->dev,"ADDR=%0x is not supported\n" , msgs[i].addr); +return -EINVAL ; + } + } + +mutex_lock (&i2c->lock); + +if (num ==1 ) + ret =cdns_hdmi_i2c_write (mhdp, msgs); +else + ret =cdns_hdmi_i2c_read (mhdp, msgs, num); + +if (!ret) + ret = num; + +mutex_unlock (&i2c->lock); + +return ret; +} + +static u32 cdns_hdmi_i2c_func (struct i2c_adapter *adapter) +{ +return I2C_FUNC_I2C |I2C_FUNC_SMBUS_EMUL ; +} + +static const struct i2c_algorithm cdns_hdmi_algorithm = { + .master_xfer = cdns_hdmi_i2c_xfer, + .functionality = cdns_hdmi_i2c_func, +}; + +struct i2c_adapter *cdns_hdmi_i2c_adapter (struct cdns_mhdp8501_device *mhdp) +{ +struct i2c_adapter *adap; +struct cdns_hdmi_i2c *i2c; +int ret; + + i2c =devm_kzalloc (mhdp->dev,sizeof (*i2c),GFP_KERNEL ); +if (!i2c) +return ERR_PTR (-ENOMEM ); + +mutex_init (&i2c->lock); + + adap = &i2c->adap; + adap->owner =THIS_MODULE ; + adap->dev.parent = mhdp->dev; + adap->algo = &cdns_hdmi_algorithm; +strscpy (adap->name,"MHDP HDMI" ,sizeof (adap->name)); +i2c_set_adapdata (adap, mhdp); + + ret =i2c_add_adapter (adap); +if (ret) { +dev_warn (mhdp->dev,"cannot add %s I2C adapter\n" , adap->name); +devm_kfree (mhdp->dev, i2c); +return ERR_PTR (ret); + } + + mhdp->hdmi.i2c = i2c; + +return adap; +} + +static enum drm_mode_status +cdns_hdmi_tmds_char_rate_valid (const struct drm_bridge *bridge, +const struct drm_display_mode *mode, +unsigned long long tmds_rate) +{ +struct cdns_mhdp8501_device *mhdp = bridge->driver_private; +union phy_configure_opts phy_cfg; +int ret; + + phy_cfg.hdmi.tmds_char_rate = tmds_rate; + + ret =phy_validate (mhdp->phy,PHY_MODE_HDMI ,0 , &phy_cfg); +if (ret <0 ) +return MODE_CLOCK_RANGE ; + +return MODE_OK ; +} + +static const struct drm_edid +*cdns_hdmi_bridge_edid_read (struct drm_bridge *bridge, +struct drm_connector *connector) +{ +struct cdns_mhdp8501_device *mhdp = bridge->driver_private; + +return drm_edid_read_custom (connector, cdns_hdmi_get_edid_block, mhdp); +} + +static void cdns_hdmi_bridge_atomic_disable (struct drm_bridge *bridge, +struct drm_bridge_state *old_state) +{ +struct cdns_mhdp8501_device *mhdp = bridge->driver_private; + + mhdp->curr_conn =NULL ; + +phy_power_off (mhdp->phy); +} + +static void cdns_hdmi_bridge_atomic_enable (struct drm_bridge *bridge, +struct drm_bridge_state *old_state) +{ +struct cdns_mhdp8501_device *mhdp = bridge->driver_private; +struct drm_atomic_state *state = old_state->base.state; +struct drm_connector *connector; +struct drm_crtc_state *crtc_state; +struct drm_connector_state *conn_state; +struct drm_connector_hdmi_state *hdmi; +union phy_configure_opts phy_cfg; +int ret; + + connector =drm_atomic_get_new_connector_for_encoder (state, + bridge->encoder); +if (WARN_ON (!connector)) +return ; + + mhdp->curr_conn = connector; + + conn_state =drm_atomic_get_new_connector_state (state, connector); +if (WARN_ON (!conn_state)) +return ; + + crtc_state =drm_atomic_get_new_crtc_state (state, conn_state->crtc); +if (WARN_ON (!crtc_state)) +return ; + +drm_atomic_helper_connector_hdmi_update_infoframes (connector, state); + +/* Line swapping */ +cdns_mhdp_reg_write (&mhdp->base,LANES_CONFIG ,0x00400000 | mhdp->lane_mapping); + + hdmi = &conn_state->hdmi; +if (WARN_ON (!hdmi)) +return ; + + phy_cfg.hdmi.tmds_char_rate = hdmi->tmds_char_rate; + ret =phy_configure (mhdp->phy, &phy_cfg); +if (ret) { +dev_err (mhdp->dev,"%s: phy_configure() failed: %d\n" , + __func__, ret); +return ; + } + +phy_power_on (mhdp->phy); + +cdns_hdmi_sink_config (mhdp, hdmi->tmds_char_rate); + + ret =cdns_hdmi_ctrl_init (mhdp); +if (ret <0 ) { +dev_err (mhdp->dev,"hdmi ctrl init failed = %d\n" , ret); +return ; + } + +/* Config GCP */ +if (hdmi->output_bpc ==8 ) +cdns_hdmi_disable_gcp (mhdp); +else +cdns_hdmi_enable_gcp (mhdp); + + ret =cdns_hdmi_mode_config (mhdp, &crtc_state->adjusted_mode, hdmi); +if (ret <0 ) { +dev_err (mhdp->dev,"CDN_API_HDMITX_SetVic_blocking ret = %d\n" , ret); +return ; + } +} + +static int cdns_hdmi_bridge_clear_infoframe (struct drm_bridge *bridge, +enum hdmi_infoframe_type type) +{ +struct cdns_mhdp8501_device *mhdp = bridge->driver_private; + +switch (type) { +case HDMI_INFOFRAME_TYPE_AVI : +cdns_hdmi_clear_infoframe (mhdp,0 ,HDMI_INFOFRAME_TYPE_AVI ); +break ; +case HDMI_INFOFRAME_TYPE_SPD : +cdns_hdmi_clear_infoframe (mhdp,1 ,HDMI_INFOFRAME_TYPE_SPD ); +break ; +case HDMI_INFOFRAME_TYPE_VENDOR : +cdns_hdmi_clear_infoframe (mhdp,2 ,HDMI_INFOFRAME_TYPE_VENDOR ); +break ; +default : +dev_dbg (mhdp->dev,"Unsupported infoframe type %x\n" , type); + } + +return 0 ; +} + +static int cdns_hdmi_bridge_write_infoframe (struct drm_bridge *bridge, +enum hdmi_infoframe_type type, +const u8 *buffer,size_t len) +{ +struct cdns_mhdp8501_device *mhdp = bridge->driver_private; + +switch (type) { +case HDMI_INFOFRAME_TYPE_AVI : +cdns_hdmi_config_infoframe (mhdp,0 , len, buffer,HDMI_INFOFRAME_TYPE_AVI ); +break ; +case HDMI_INFOFRAME_TYPE_SPD : +cdns_hdmi_config_infoframe (mhdp,1 , len, buffer,HDMI_INFOFRAME_TYPE_SPD ); +break ; +case HDMI_INFOFRAME_TYPE_VENDOR : +cdns_hdmi_config_infoframe (mhdp,2 , len, buffer,HDMI_INFOFRAME_TYPE_VENDOR ); +break ; +default : +dev_dbg (mhdp->dev,"Unsupported infoframe type %x\n" , type); + } + +return 0 ; +} + +static int cdns_hdmi_bridge_atomic_check (struct drm_bridge *bridge, +struct drm_bridge_state *bridge_state, +struct drm_crtc_state *crtc_state, +struct drm_connector_state *conn_state) +{ +return drm_atomic_helper_connector_hdmi_check (conn_state->connector, conn_state->state); +} + +const struct drm_bridge_funcs cdns_hdmi_bridge_funcs = { + .attach = cdns_hdmi_bridge_attach, + .detect = cdns_mhdp8501_detect, + .edid_read = cdns_hdmi_bridge_edid_read, + .mode_valid = cdns_mhdp8501_mode_valid, + .atomic_enable = cdns_hdmi_bridge_atomic_enable, + .atomic_disable = cdns_hdmi_bridge_atomic_disable, + .atomic_check = cdns_hdmi_bridge_atomic_check, + .atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state, + .atomic_destroy_state = drm_atomic_helper_bridge_destroy_state, + .atomic_reset = drm_atomic_helper_bridge_reset, + .hdmi_clear_infoframe = cdns_hdmi_bridge_clear_infoframe, + .hdmi_write_infoframe = cdns_hdmi_bridge_write_infoframe, + .hdmi_tmds_char_rate_valid = cdns_hdmi_tmds_char_rate_valid, +};Signature · 1 line
2.34.1
Signature · 2 lines
With best wishes Dmitry
RE: [EXT] Re: [PATCH v20 5/9] drm: bridge: Cadence: Add MHDP8501 DP/HDMI driver
Quoted 306 lines · Sandor Yu
Quoted 1 line
Add a new DRM DisplayPort and HDMI bridge driver for Candence
MHDP8501
Quoted 10 lines
used in i.MX8MQ SOC. MHDP8501 could support HDMI or DisplayPort standards according embedded Firmware running in the uCPU.
For iMX8MQ SOC, the DisplayPort/HDMI FW was loaded and activated by SOC's ROM code. Bootload binary included respective specific firmware is required.
Driver will check display connector type and
then load the corresponding driver.Quoted 6 lines
Signed-off-by Sandor Yu <[email protected]>---
v19->v20:
- Dump mhdp FW version by debugfs
- Combine HDMI and DP cable detect functions into one function
- Combine HDMI and DP cablebridge_mode_valid()functions into onefunction
Quoted 2 lines
- Rename
cdns_hdmi_reset_link()tocdns_hdmi_handle_hotplug()
- Add comments for EDID incdns_hdmi_handle_hotplug()and
cdns_dp_check_link_state()Quoted 3 lines
- Add
atomic_get_input_bus_fmts()andbridge_atomic_check()for DP driver
- Remove bpc andcolor_fmtinit inatomic_enable()function.
- More detail comments for DDC adapter only support
SCDC_I2C_SLAVE_ADDRESSQuoted 11 lines
read and write in HDMI driver.
v18->v19:
- Get endpoint for data-lanes as it had move to endpoint of port@1
- Update clock management asdevm_clk_get_enabled()introduced.
- Fixclear_infoframe()function is not work issue.
- Manage PHY power state viaphy_power_on()andphy_power_off().
v17->v18:
- MHDP8501 HDMI and DP commands that need access mailbox arerewrited
Quoted 4 lines
with new API functions created in patch #1.
- replace lane-mapping with data-lanes, use the value from data-lanes to reorder HDMI and DP lane mapping.
- create I2C adapter for HDMI SCDC, removecdns_hdmi_scdc_write()function.
Quoted 11 lines
- Rewrite
cdns_hdmi_sink_config()function, use HDMI SCDC helper functiondrm_scdc_set_high_tmds_clock_ratio()anddrm_scdc_set_scrambling()to config HDMI sink TMDS.
- Remove structvideo_infofrom HDMI driver.
- Removetmds_char_rate_valid()be called inbridge_mode_valid(), community had patch in reviewing to implement the function.
- Remove warning message print when get unknown HPD cable status.
- Add more detail comments for HDP plugin and plugout interrupt.
- usedev_dbgto repleaceDRM_INFOwhen cable HPD status changed.
- Remove t-b tag as above code change.Quoted 5 lines
drivers/gpu/drm/bridge/cadence/Kconfig | 16 + drivers/gpu/drm/bridge/cadence/Makefile | 2 + .../drm/bridge/cadence/cdns-mhdp8501-core.c | 379 +++++++++ .../drm/bridge/cadence/cdns-mhdp8501-core.h | 380 +++++++++ .../gpu/drm/bridge/cadence/cdns-mhdp8501-dp.c | 694++++++++++++++++
Quoted 1 line
.../drm/bridge/cadence/cdns-mhdp8501-hdmi.c | 745++++++++++++++++++
Quoted 2 lines
6 files changed, 2216 insertions(+) create mode 100644
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.cQuoted 1 line
create mode 100644
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.hQuoted 1 line
create mode 100644
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-dp.cQuoted 1 line
create mode 100644
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.cReview
Quoted 2 lines
(quoted diff) +0
-0b/drivers/gpu/drm/bridge/cadence/Kconfig
Review
Quoted 24 lines
index
dbb06533ccab2..bd979f3e6df48100644drivers/gpu/drm/bridge/cadence/Kconfig +16
-0@@ -48,3 +48,19 @@ config DRM_CDNS_MHDP8546_J721E initializes the J721E Display Port and sets up the clock and data muxes. endif + +config DRM_CDNS_MHDP8501 + tristate "Cadence MHDP8501 DP/HDMI bridge" + select DRM_KMS_HELPER + select DRM_PANEL_BRIDGE + select DRM_DISPLAY_DP_HELPER + select DRM_DISPLAY_HELPER + select DRM_CDNS_AUDIO + select CDNS_MHDP_HELPER + depends on OF + help + Support Cadence MHDP8501 DisplayPort/HDMI bridge. + Cadence MHDP8501 support one or more protocols, + including DisplayPort and HDMI. + To use the DP and HDMI drivers, their respective + specific firmware is required.(quoted diff) +0
-0b/drivers/gpu/drm/bridge/cadence/Makefile
drivers/gpu/drm/bridge/cadence/Makefile cdns-dsi-$(CONFIG_DRM_CDNS_DSI_J721E) +=
Quoted 4 lines
index
c95fd5b81d137..ea327287d1c14100644drivers/gpu/drm/bridge/cadence/Makefile +0
-0@@ -5,3 +5,5 @@ cdns-dsi-$(CONFIG_DRM_CDNS_DSI_J721E) +=cdns-dsi-j721e.o
drivers/gpu/drm/bridge/cadence/Makefile cdns-dsi-$(CONFIG_DRM_CDNS_DSI_J721E) += cdns-dsi-j721e.o
Quoted 3 lines
drivers/gpu/drm/bridge/cadence/Makefile +0
-0obj-$(CONFIG_DRM_CDNS_MHDP8546) += cdns-mhdp8546.o cdns-mhdp8546-y := cdns-mhdp8546-core.o cdns-mhdp8546-hdcp.o cdns-mhdp8546-$(CONFIG_DRM_CDNS_MHDP8546_J721E) +=cdns-mhdp8546-j721e.o
drivers/gpu/drm/bridge/cadence/Makefile cdns-dsi-$(CONFIG_DRM_CDNS_DSI_J721E) += · line 9
Quoted 2 lines
drivers/gpu/drm/bridge/cadence/Makefile +2
-0+obj-$(CONFIG_DRM_CDNS_MHDP8501) += cdns-mhdp8501.o +cdns-mhdp8501-y := cdns-mhdp8501-core.o cdns-mhdp8501-dp.ocdns-mhdp8501-hdmi.o
Review
Quoted 1 line
(quoted diff) +0
-0
b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.cQuoted 15 lines
new file mode 100644
index 0000000000000..98116ef012fa3drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +10
-0@@ -0,0 +1,379 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Cadence Display Port Interface (DP) driver +* +* Copyright (C) 2023-2024 NXP Semiconductor, Inc. +* +*/ +#include <drm/drm_of.h> +#include <drm/drm_print.h> +#include <linux/clk.h> drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 20
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +10
-0+#include <linux/irq.h> +#include <linux/mutex.h> +#include <linux/of_device.h> +#include <linux/platform_device.h> +#include <linux/phy/phy.h> + +#include "cdns-mhdp8501-core.h" + +static ssize_t firmware_version_show(struct device *dev, + struct device_attribute *attr,char *buf);
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 21
Quoted 1 line
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +1
-0+static struct device_attribute firmware_version =
__ATTR_RO(firmware_version);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 7 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +7
-0+ +ssize_t firmware_version_show (struct device *dev, +struct device_attribute *attr,char *buf) +{ +struct cdns_mhdp8501_device *mhdp =dev_get_drvdata (dev); + + u32 version = readl(mhdp->base.regs + VER_L) |
readl(mhdp->base.regs + VER_H)<< 8;drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 30
Quoted 2 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +2
-0+u32 lib_version =readl (mhdp->base.regs +VER_LIB_L_ADDR ) | +readl (mhdp->base.regs +VER_LIB_H_ADDR )<< 8;
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 32
Quoted 2 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +2
-0+ + return sprintf(buf, "FW version %d, Lib version %d\n", version,
lib_version);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 3 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +3
-0+} + +static void cdns_mhdp8501_create_device_files(struct
cdns_mhdp8501_device*mhdp)drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 3 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +3
-0+{ +if (device_create_file (mhdp->dev, &firmware_version)) { + DRM_ERROR("Unable to create firmware_versionsysfs\n");
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 5 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +5
-0+device_remove_file (mhdp->dev, &firmware_version); + } +} + +static void cdns_mhdp8501_remove_device_files(struct
cdns_mhdp8501_device*mhdp)drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 5 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +5
-0+{ +device_remove_file (mhdp->dev, &firmware_version); +} + +static int cdns_mhdp8501_read_hpd(struct cdns_mhdp8501_device*mhdp)
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 5 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +5
-0+{ +u8 status; +int ret; + + ret = cdns_mhdp_mailbox_send_recv(&mhdp->base,
MB_MODULE_ID_GENERAL,drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 54
Quoted 1 line
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +1
-0+
GENERAL_GET_HPD_STATE,drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 55
Quoted 1 line
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +1
-0+ 0, NULL, sizeof(status),&status);
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 9 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +9
-0+if (ret) { +dev_err (mhdp->dev,"read hpd failed: %d\n" , ret); +return ret; + } + +return status; +} + +enum drm_connector_status cdns_mhdp8501_detect(struct drm_bridge*bridge)
Quoted 30 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +30
-0+{ +struct cdns_mhdp8501_device *mhdp = bridge->driver_private; + +u8 hpd =0xf ; + + hpd =cdns_mhdp8501_read_hpd (mhdp); +if (hpd ==1 ) +return connector_status_connected; +else if (hpd ==0 ) +return connector_status_disconnected; + +return connector_status_unknown; +} + +enum drm_mode_status +cdns_mhdp8501_mode_valid (struct drm_bridge *bridge, +const struct drm_display_info *info, +const struct drm_display_mode *mode) +{ +/* We don't support double-clocked */ +if (mode->flags &DRM_MODE_FLAG_DBLCLK ) +return MODE_BAD ; + +/* MAX support pixel clock rate 594MHz */ +if (mode->clock >594000 ) +return MODE_CLOCK_HIGH ; + +if (mode->hdisplay >3840 ) +return MODE_BAD_HVALUE ; +drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +10
-0+if (mode->vdisplay >2160 ) +return MODE_BAD_VVALUE ; + +return MODE_OK ; +} + +static void hotplug_work_func (struct work_struct *work) +{ +struct cdns_mhdp8501_device *mhdp =container_of (work, + struct
cdns_mhdp8501_device,drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 105
Quoted 1 line
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +1
-0+hotplug_work.work);
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 106
Quoted 1 line
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +1
-0+ enum drm_connector_status status =
cdns_mhdp8501_detect(&mhdp->bridge);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 5 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +5
-0+ +drm_bridge_hpd_notify (&mhdp->bridge, status); + +/* +* iMX8MQ has two HPD interrupts: one for plugout and one for plugin.
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 112
Quoted 1 line
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +1
-0+* These interrupts cannot be masked and cleaned, so we must enable one
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 9 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +9
-0+* and disable the other to avoid continuous interrupt generation. +*/ +if (status == connector_status_connected) { +/* Cable connected */ +dev_dbg (mhdp->dev,"HDMI/DP Cable Plug In\n" ); +enable_irq (mhdp->irq[IRQ_OUT ]); + +/* Reset HDMI/DP link with sink */ + if (mhdp->connector_type ==
DRM_MODE_CONNECTOR_HDMIA)Quoted 15 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +15
-0+cdns_hdmi_handle_hotplug (mhdp); + else +cdns_dp_check_link_state (mhdp ); + + }else if (status == connector_status_disconnected) { +/* Cable Disconnected */ +dev_dbg (mhdp->dev,"HDMI/DP Cable Plug Out\n" ); +enable_irq (mhdp->irq[IRQ_IN ]); + } +} + +static irqreturn_t cdns_mhdp8501_irq_thread (int irq,void *data) +{ +struct cdns_mhdp8501_device *mhdp = data; +drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +10
-0+disable_irq_nosync (irq); + +mod_delayed_work (system_wq, &mhdp->hotplug_work, +msecs_to_jiffies (HOTPLUG_DEBOUNCE_MS )); + +return IRQ_HANDLED ; +} + +#define DATA_LANES_COUNT 4 +static int cdns_mhdp8501_dt_parse(struct cdns_mhdp8501_device*mhdp,
Quoted 9 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +9
-0+ struct platform_device *pdev) +{ +struct device *dev = &pdev->dev; +struct device_node *np = dev->of_node; +struct device_node *remote, *endpoint; +u32 data_lanes[DATA_LANES_COUNT ]; +u32 lane_value; +int ret, i; +drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +10
-0+ remote =of_graph_get_remote_node (np,1 ,0 ); +if (!remote) { +dev_err (dev,"fail to get remote node\n" ); +of_node_put (remote); +return -EINVAL ; + } + +/* get connector type */ +if (of_device_is_compatible (remote,"hdmi-connector" )) { + mhdp->connector_type =
DRM_MODE_CONNECTOR_HDMIA;
Quoted 7 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 3 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +3
-0+ + }else if (of_device_is_compatible (remote,"dp-connector" )) { + mhdp->connector_type =
DRM_MODE_CONNECTOR_DisplayPort;Interesting hack. What if somebody wraps DP signals with the USB-C controller in order to provide DP over USB-C?
There is no such requirement now, and the supported types of display-connectors do not include Type-C DP connectors. If type-C DP connectors is added in the future, I think it would be acceptable to modify the code here.
Quoted 6 lines
Unfortunately I don't have a good solution here. There might be other format converters after your bridge, so you even can't look at the last bridge of the chain. You might want to examine the phy-mode property and use it to specify whether the PHY should work in the HDMI or in the DP mode.
MHDP supports either HDMI or DP based on its firmware.
The PHY doesn't provide a function to indicate which firmware is currently running,
and the controller driver doesn't have a mechanism to determine whether it's DP or HDMI. The users should select the corresponding firmware based on the connector type when their get the board.
For the driver, there must be an external input to determine whether it's currently running in HDMI or DP mode. In earlier versions, I used different compatible strings to distinguish between DP and HDMI. However, based on comments from other reviewers,
I changed the approach to checking the connector type, which is clearly a more suitable method.
Quoted 2 lines
Also, where do get the next bridge and attach it to the bridge chain?
next_bridge get and attach is missed in the driver, I will add it.
Quoted 14 lines
Quoted 14 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +13
-0+ + }else { +dev_err (dev,"Unknown connector type\n" ); +of_node_put (remote); +return -EINVAL ; + } + +of_node_put (remote); + + endpoint =of_graph_get_endpoint_by_regs (np,1 ,-1 ); + +/* Get the data lanes ordering */ + ret =of_property_count_u32_elems (endpoint,"data-lanes" );
Quoted 8 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 187
Quoted 6 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +6
-0+if (ret <0 ) +return -EINVAL ; +if (ret !=DATA_LANES_COUNT ) { +dev_err (dev,"expected 4 data lanes\n" ); +return -EINVAL ; + }Isn't it
drm_of_get_data_lanes_count_ep()?
drm_of_get_data_lanes_count will be used here in the next version.
Quoted 35 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 4 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +3
-0+ + ret = of_property_read_u32_array(endpoint, "data-lanes", + data_lanes,
DATA_LANES_COUNT);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 6 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +6
-0+if (ret) +return -EINVAL ; + + mhdp->lane_mapping =0 ; +for (i =0 ; i <DATA_LANES_COUNT ; i++) { + lane_value = (data_lanes[i] >= 0 && data_lanes[i] <= 3) ?data_lanes[i] : 0;
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 7 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +7
-0+ mhdp->lane_mapping |= lane_value << (i *2 ); + } + +return true; +} + +static int cdns_mhdp8501_add_bridge(struct cdns_mhdp8501_device*mhdp)
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 7 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +7
-0+{ + mhdp->bridge.type = mhdp->connector_type; + mhdp->bridge.driver_private = mhdp; + mhdp->bridge.of_node = mhdp->dev->of_node; + mhdp->bridge.vendor ="NXP" ; + mhdp->bridge.product ="i.MX8" ; + mhdp->bridge.ops = DRM_BRIDGE_OP_DETECT |
DRM_BRIDGE_OP_EDID|drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 216
Quoted 6 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +6
-0+DRM_BRIDGE_OP_HPD ; + +if (mhdp->connector_type ==DRM_MODE_CONNECTOR_HDMIA ) { + mhdp->bridge.funcs = &cdns_hdmi_bridge_funcs; + mhdp->bridge.ops |=DRM_BRIDGE_OP_HDMI ; + mhdp->bridge.ddc =cdns_hdmi_i2c_adapter (mhdp);
Quoted 2 lines
I'd expect that bridge.ddc provides DDC service. Is it required to control the SCDC from userspace?
I may not have fully understood your question.
The DDC here is used for the SCDC API functions like drm_scdc_set_XXX in HDMI driver. So far, I haven't encountered any cases where the user needs to control SCDC.
Quoted 156 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 217
Quoted 2 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +1
-0+ } else if (mhdp->connector_type ==
DRM_MODE_CONNECTOR_DisplayPort) {Quoted 33 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +33
-0+ mhdp->bridge.funcs = &cdns_dp_bridge_funcs; + }else { +dev_err (mhdp->dev,"Unsupported connector type!\n" ); +return -EINVAL ; + } + +drm_bridge_add (&mhdp->bridge); + +return 0 ; +} + +static int cdns_mhdp8501_probe (struct platform_device *pdev) +{ +struct device *dev = &pdev->dev; +struct cdns_mhdp8501_device *mhdp; +struct resource *res; +enum phy_mode phy_mode; +u32 reg; +int ret; + + mhdp =devm_kzalloc (dev,sizeof (*mhdp),GFP_KERNEL ); +if (!mhdp) +return -ENOMEM ; + + mhdp->dev = dev; + +INIT_DELAYED_WORK (&mhdp->hotplug_work, hotplug_work_func); + + res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); +if (!res) +return -ENODEV ; + + mhdp->regs =devm_ioremap (dev, res->start,resource_size (res));drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +10
-0+if (IS_ERR (mhdp->regs)) +return PTR_ERR (mhdp->regs); + +cdns_mhdp8501_create_device_files (mhdp); + + ret =cdns_mhdp8501_dt_parse (mhdp, pdev); +if (ret <0 ) +return -EINVAL ; + + mhdp->phy = devm_of_phy_get_by_index(dev, pdev->dev.of_node,0);
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 262
Quoted 2 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +2
-0+if (IS_ERR (mhdp->phy)) + return dev_err_probe(dev, PTR_ERR(mhdp->phy), "no PHYconfigured\n");
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 4 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +4
-0+ + mhdp->irq[IRQ_IN ] =platform_get_irq_byname (pdev,"plug_in" ); +if (mhdp->irq[IRQ_IN ] <0 ) + return dev_err_probe(dev, mhdp->irq[IRQ_IN], "No
plug_inirq number\n");drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 268
Quoted 2 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +2
-0+ + mhdp->irq[IRQ_OUT] = platform_get_irq_byname(pdev,"
plug_out");drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 270
Quoted 2 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +2
-0+if (mhdp->irq[IRQ_OUT ] <0 ) + return dev_err_probe(dev, mhdp->irq[IRQ_OUT], "No
plug_outirq number\n");drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 4 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +4
-0+ +irq_set_status_flags (mhdp->irq[IRQ_IN ],IRQ_NOAUTOEN ); + ret = devm_request_threaded_irq(dev, mhdp->irq[IRQ_IN], + NULL,
cdns_mhdp8501_irq_thread,drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 275
Quoted 1 line
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +1
-0+ IRQF_ONESHOT,
dev_name(dev), mhdp);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 8 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +8
-0+if (ret <0 ) { +dev_err (dev,"can't claim irq %d\n" , mhdp->irq[IRQ_IN ]); +return -EINVAL ; + } + +irq_set_status_flags (mhdp->irq[IRQ_OUT ],IRQ_NOAUTOEN ); + ret = devm_request_threaded_irq(dev, mhdp->irq[IRQ_OUT], + NULL,
cdns_mhdp8501_irq_thread,drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 284
Quoted 1 line
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +1
-0+ IRQF_ONESHOT,
dev_name(dev), mhdp);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 286
Quoted 2 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +2
-0+if (ret <0 ) { + dev_err(dev, "can't claim irq %d\n",mhdp->irq[IRQ_OUT]);
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 5 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +5
-0+return -EINVAL ; + } + +/* cdns_mhdp8501_dt_parse() ensures connector_type is valid */ + if (mhdp->connector_type ==
DRM_MODE_CONNECTOR_DisplayPort)drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 293
Quoted 2 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +2
-0+ phy_mode =PHY_MODE_DP ; + else if (mhdp->connector_type ==
DRM_MODE_CONNECTOR_HDMIA)drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 9 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +9
-0+ phy_mode =PHY_MODE_HDMI ; + +dev_set_drvdata (dev, mhdp); + +/* init base struct for access mhdp mailbox */ + mhdp->base.dev = mhdp->dev; + mhdp->base.regs = mhdp->regs; + + if (mhdp->connector_type ==
DRM_MODE_CONNECTOR_DisplayPort) {Quoted 7 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +7
-0+drm_dp_aux_init (&mhdp->dp.aux); + mhdp->dp.aux.name ="mhdp8501_dp_aux" ; + mhdp->dp.aux.dev = dev; + mhdp->dp.aux.transfer = cdns_dp_aux_transfer; + } + +/* Enable APB clock */ drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +10
-0+ mhdp->apb_clk =devm_clk_get_enabled (dev,NULL ); +if (IS_ERR (mhdp->apb_clk)) +return dev_err_probe (dev,PTR_ERR (mhdp->apb_clk), +"couldn't get apb clk\n" ); +/* +* Wait for the KEEP_ALIVE "message" on the first 8 bits. +* Updated each sched "tick" (~2ms) +*/ + ret = readl_poll_timeout(mhdp->regs + KEEP_ALIVE, reg, + reg & CDNS_KEEP_ALIVE_MASK,500,
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 3 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +3
-0+ CDNS_KEEP_ALIVE_TIMEOUT); +if (ret) { + dev_err(dev, "device didn't give any life sign: reg %d\n",reg);
Quoted 17 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +17
-0+return ret; + } + + ret =phy_init (mhdp->phy); +if (ret) { +dev_err (dev,"Failed to initialize PHY: %d\n" , ret); +return ret; + } + + ret =phy_set_mode (mhdp->phy, phy_mode); +if (ret) { +dev_err (dev,"Failed to configure PHY: %d\n" , ret); +return ret; + } + +/* Enable cable hotplug detect */ +if (cdns_mhdp8501_read_hpd (mhdp))drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +10
-0+enable_irq (mhdp->irq[IRQ_OUT ]); + else + enable_irq(mhdp->irq[IRQ_IN]); + +return cdns_mhdp8501_add_bridge (mhdp); +} + +static void cdns_mhdp8501_remove (struct platform_device *pdev) +{ + struct cdns_mhdp8501_device *mhdp =
platform_get_drvdata(pdev);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 4 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +4
-0+ +cdns_mhdp8501_remove_device_files (mhdp); + + if (mhdp->connector_type ==
DRM_MODE_CONNECTOR_DisplayPort)
Quoted 11 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 361
Quoted 8 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +8
-0+cdns_dp_aux_destroy (mhdp); + +drm_bridge_remove (&mhdp->bridge); +} + +static const struct of_device_id cdns_mhdp8501_dt_ids[] = { + { .compatible ="fsl,imx8mq-mhdp8501" , + },Strange line wrapping, I'd say. Either it should all be on the same line, or take three lines.
I will fix it.
Quoted 45 lines
Quoted 21 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +18
-0+ { }, +}; +MODULE_DEVICE_TABLE (of, cdns_mhdp8501_dt_ids); + +static struct platform_driver cdns_mhdp8501_driver = { + .probe = cdns_mhdp8501_probe, + .remove = cdns_mhdp8501_remove, + .driver = { + .name ="cdns-mhdp8501" , + .of_match_table = cdns_mhdp8501_dt_ids, + }, +}; + +module_platform_driver (cdns_mhdp8501_driver); + +MODULE_AUTHOR ("Sandor Yu <[email protected]>" ); +MODULE_DESCRIPTION ("Cadence MHDP8501 bridge driver" ); +MODULE_LICENSE ("GPL" );drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +10
-0+static void cdns_dp_mode_set (struct cdns_mhdp8501_device *mhdp, +const struct drm_display_mode *mode) +{ +union phy_configure_opts phy_cfg; +int ret; + +cdns_dp_pixel_clk_reset (mhdp); + +/* Get DP Caps */ + ret = drm_dp_dpcd_read(&mhdp->dp.aux, DP_DPCD_REV,
mhdp->dp.dpcd,Quoted 13 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +13
-0+ DP_RECEIVER_CAP_SIZE); +if (ret <0 ) { +dev_err (mhdp->dev,"Failed to get caps %d\n" , ret); +return ; + } + + mhdp->dp.rate =drm_dp_max_link_rate (mhdp->dp.dpcd); + mhdp->dp.num_lanes =drm_dp_max_lane_count (mhdp->dp.dpcd); + +/* check the max link rate */ +if (mhdp->dp.rate >CDNS_DP_MAX_LINK_RATE ) + mhdp->dp.rate =CDNS_DP_MAX_LINK_RATE ; +
Quoted 8 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 5 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +5
-0+ phy_cfg.dp.lanes = mhdp->dp.num_lanes; + phy_cfg.dp.link_rate = mhdp->dp.rate; + phy_cfg.dp.set_lanes = false; + phy_cfg.dp.set_rate = false; + phy_cfg.dp.set_voltages = false;If all of those are false, then you can skip setting .lanes and .link_rate.
I may have misunderstood the comments in the header file for these two flags. I'll check them again.
Quoted 88 lines
Quoted 8 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +7
-0+ + ret =phy_configure (mhdp->phy, &phy_cfg); +if (ret) { +dev_err (mhdp->dev,"%s: phy_configure() failed: %d\n" , + __func__, ret); +return ; + }drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +10
-0+ +/* Video off */ + ret =cdns_dp_set_video_status (mhdp,CONTROL_VIDEO_IDLE ); +if (ret) { +dev_err (mhdp->dev,"Failed to valid video %d\n" , ret); +return ; + } + +/* Line swapping */ + cdns_mhdp_reg_write(&mhdp->base, LANES_CONFIG, 0x00400000|
mhdp->lane_mapping);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 9 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +9
-0+ +/* Set DP host capability */ + ret =cdns_dp_set_host_cap (mhdp); +if (ret) { +dev_err (mhdp->dev,"Failed to set host cap %d\n" , ret); +return ; + } + + ret = cdns_mhdp_reg_write(&mhdp->base,
DP_AUX_SWAP_INVERSION_CONTROL,Quoted 7 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +7
-0+ AUX_HOST_INVERT); +if (ret) { +dev_err (mhdp->dev,"Failed to set host invert %d\n" , ret); +return ; + } + + ret =cdns_dp_config_video (mhdp, mode);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +10
-0+if (ret) +dev_err (mhdp->dev,"Failed to config video %d\n" , ret); +} + +static bool +cdns_dp_needs_link_retrain (struct cdns_mhdp8501_device *mhdp) +{ +u8 link_status[DP_LINK_STATUS_SIZE ]; + + if (drm_dp_dpcd_read_phy_link_status(&mhdp->dp.aux,
DP_PHY_DPRX,Quoted 13 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +13
-0+ link_status) < 0) +return false; + +/* Retrain if link not ok */ +return !drm_dp_channel_eq_ok (link_status, mhdp->dp.num_lanes); +} + +void cdns_dp_check_link_state (struct cdns_mhdp8501_device *mhdp) +{ +struct drm_connector *connector = mhdp->curr_conn; +const struct drm_edid *drm_edid; +struct drm_connector_state *conn_state; +struct drm_crtc_state *crtc_state;drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +10
-0+struct drm_crtc *crtc; + +if (!connector) +return ; + +/* +* EDID data needs updating after each cable plugin +* due to potential display monitor changes +*/ + drm_edid = drm_edid_read_custom(connector,
cdns_dp_get_edid_block, mhdp);Quoted 17 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +17
-0+drm_edid_connector_update (connector, drm_edid); + +if (!drm_edid) +return ; + +drm_edid_free (drm_edid); + + conn_state = connector->state; + crtc = conn_state->crtc; +if (!crtc) +return ; + + crtc_state = crtc->state; +if (!crtc_state->active) +return ; + +if (!cdns_dp_needs_link_retrain (mhdp))
Quoted 8 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 5 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +5
-0+return ; + +/* DP link retrain */ +if (cdns_dp_train_link (mhdp)) +dev_err (mhdp->dev,"Failed link train\n" );Won't this cause link traning to happen on the first monitor plug event? Is it okay to do even with the phy being powered off?
These two cases have already been excluded in the previous codes.
Quoted 11 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +9
-0+} + +static int cdns_dp_bridge_attach (struct drm_bridge *bridge, +enum drm_bridge_attach_flags flags) +{ +struct cdns_mhdp8501_device *mhdp = bridge->driver_private; + +if (!(flags &DRM_BRIDGE_ATTACH_NO_CONNECTOR )) { + dev_err(mhdp->dev, "do not support creating adrm_connector\n");
Quoted 9 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 6 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +6
-0+return -EINVAL ; + } + + mhdp->dp.aux.drm_dev = bridge->dev; + +return drm_dp_aux_register (&mhdp->dp.aux);Why is it a part of the
_attachcallback? If there is anything on the DP AUX bus, it should be already registered by this point.
Here, I've referenced other DP drivers and called drm_dp_aux_register in the attach function. No any special requirements for AUX in my DP driver.
Quoted 62 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +9
-0+} + +static const struct drm_edid +*cdns_dp_bridge_edid_read (struct drm_bridge *bridge, +struct drm_connector *connector) +{ +struct cdns_mhdp8501_device *mhdp = bridge->driver_private; + + return drm_edid_read_custom(connector, cdns_dp_get_edid_block,mhdp);
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 9 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +9
-0+} + +/* Currently supported format */ +static const u32 mhdp8501_input_fmts[] = { +MEDIA_BUS_FMT_RGB888_1X24 , +MEDIA_BUS_FMT_RGB101010_1X30 , +}; + +static u32 *cdns_dp_bridge_atomic_get_input_bus_fmts(struct
drm_bridge*bridge,Quoted 1 line
+ struct
drm_bridge_state*bridge_state,Quoted 1 line
+ struct
drm_crtc_state*crtc_state,Quoted 1 line
+ struct
drm_connector_state*conn_state,Quoted 1 line
+ u32
output_fmt,Quoted 1 line
+ unsigned int
*num_input_fmts)drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 13 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +13
-0+{ +u32 *input_fmts; + + *num_input_fmts =0 ; + + input_fmts =kcalloc (ARRAY_SIZE (mhdp8501_input_fmts), +sizeof (*input_fmts), +GFP_KERNEL ); +if (!input_fmts) +return NULL ; + + *num_input_fmts =ARRAY_SIZE (mhdp8501_input_fmts); + memcpy(input_fmts, mhdp8501_input_fmts,
sizeof(mhdp8501_input_fmts));drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 6 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +6
-0+ +return input_fmts; +} + +static int cdns_dp_bridge_atomic_check (struct drm_bridge *bridge, + struct drm_bridge_state
*bridge_state,Quoted 1 line
+ struct
drm_crtc_state
*crtc_state,Quoted 1 line
+ struct
drm_connector_state
*conn_state)drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 5 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +5
-0+{ +struct cdns_mhdp8501_device *mhdp = bridge->driver_private; +struct video_info *video = &mhdp->video_info; + + if (bridge_state->input_bus_cfg.format ==
MEDIA_BUS_FMT_RGB888_1X24) {
Quoted 8 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 3 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +3
-0+ video->bpc =8 ; + video->color_fmt =DRM_COLOR_FORMAT_RGB444 ; + } else if (bridge_state->input_bus_cfg.format ==
MEDIA_BUS_FMT_RGB101010_1X30) {drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 2 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +2
-0+ video->bpc =10 ; + video->color_fmt =DRM_COLOR_FORMAT_RGB444 ;Which driver is going to select bus config for you?
Oh, actually there isn't. The driver uses the first format in mhdp8501_input_fmts.
Quoted 204 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +9
-0+ }else { +return -EINVAL ; + } + +return 0 ; +} + +static void cdns_dp_bridge_atomic_disable (struct drm_bridge *bridge, + struct drm_bridge_state
*old_state)drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 11 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +11
-0+{ +struct cdns_mhdp8501_device *mhdp = bridge->driver_private; + +cdns_dp_set_video_status (mhdp,CONTROL_VIDEO_IDLE ); + mhdp->curr_conn =NULL ; + +phy_power_off (mhdp->phy); +} + +static void cdns_dp_bridge_atomic_enable (struct drm_bridge *bridge, + struct drm_bridge_state
*old_state)drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +10
-0+{ +struct cdns_mhdp8501_device *mhdp = bridge->driver_private; +struct drm_atomic_state *state = old_state->base.state; +struct drm_connector *connector; +struct drm_crtc_state *crtc_state; +struct drm_connector_state *conn_state; +int ret; + + connector = drm_atomic_get_new_connector_for_encoder(state, +
bridge->encoder);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 6 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +6
-0+if (WARN_ON (!connector)) +return ; + + mhdp->curr_conn = connector; + + conn_state = drm_atomic_get_new_connector_state(state,connector);
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 4 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +4
-0+if (WARN_ON (!conn_state)) +return ; + + crtc_state = drm_atomic_get_new_crtc_state(state,
conn_state->crtc);Quoted 20 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +20
-0+if (WARN_ON (!crtc_state)) +return ; + +cdns_dp_mode_set (mhdp, &crtc_state->adjusted_mode); + +/* Power up PHY before link training */ +phy_power_on (mhdp->phy); + +/* Link training */ + ret =cdns_dp_train_link (mhdp); +if (ret) { +dev_err (mhdp->dev,"Failed link train %d\n" , ret); +return ; + } + + ret =cdns_dp_set_video_status (mhdp,CONTROL_VIDEO_VALID ); +if (ret) { +dev_err (mhdp->dev,"Failed to valid video %d\n" , ret); +return ; + }drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +10
-0+} + +const struct drm_bridge_funcs cdns_dp_bridge_funcs = { + .attach = cdns_dp_bridge_attach, + .detect = cdns_mhdp8501_detect, + .edid_read = cdns_dp_bridge_edid_read, + .mode_valid = cdns_mhdp8501_mode_valid, + .atomic_enable = cdns_dp_bridge_atomic_enable, + .atomic_disable = cdns_dp_bridge_atomic_disable, + .atomic_get_input_bus_fmts =
cdns_dp_bridge_atomic_get_input_bus_fmts,drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 2 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +2
-0+ .atomic_check = cdns_dp_bridge_atomic_check, + .atomic_duplicate_state =
drm_atomic_helper_bridge_duplicate_state,Review
Quoted 4 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +3
-0+ .atomic_destroy_state = drm_atomic_helper_bridge_destroy_state, + .atomic_reset = drm_atomic_helper_bridge_reset, +};(quoted diff) +0
-0
b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.cQuoted 24 lines
new file mode 100644
index 0000000000000..9556d0929e21ddrivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +19
-0@@ -0,0 +1,745 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Cadence MHDP8501 HDMI bridge driver +* +* Copyright (C) 2019-2024 NXP Semiconductor, Inc. +* +*/ +#include <drm/display/drm_hdmi_helper.h> +#include <drm/display/drm_hdmi_state_helper.h> +#include <drm/display/drm_scdc_helper.h> +#include <drm/drm_atomic_helper.h> +#include <drm/drm_edid.h> +#include <drm/drm_print.h> +#include <linux/phy/phy.h> +#include <linux/phy/phy-hdmi.h> + +#include "cdns-mhdp8501-core.h" + +/** drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c line 29
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +10
-0+* cdns_hdmi_config_infoframe() - fill the HDMI infoframe +* @mhdp: phandle to mhdp device. +* @entry_id: The packet memory address in which the data is written. +* @len: length of infoframe. +* @buf: point to InfoFrame Packet. +* @type: Packet Type of InfoFrame in HDMI Specification. +* +*/ + +static void cdns_hdmi_clear_infoframe(struct cdns_mhdp8501_device*mhdp,
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 9 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +9
-0+ u8 entry_id, u8 type) +{ +u32 val; + +/* invalidate entry */ + val =F_ACTIVE_IDLE_TYPE (1 ) |F_PKT_ALLOC_ADDRESS (entry_id) | +F_PACKET_TYPE (type); +writel (val, mhdp->regs +SOURCE_PIF_PKT_ALLOC_REG ); + writel(F_PKT_ALLOC_WR_EN(1), mhdp->regs +
SOURCE_PIF_PKT_ALLOC_WR_EN);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c line 41
Quoted 3 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +3
-0+} + +static void cdns_hdmi_config_infoframe(struct cdns_mhdp8501_device*mhdp,
Quoted 12 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +12
-0+ u8 entry_id, u8 len, + const u8 *buf, u8 type) +{ + u8 packet[32], packet_len = 32; +u32 packet32, len32; +u32 val, i; + +/* +* only support 32 bytes now +* packet[0] = 0 +* packet[1-3] = HB[0-2] InfoFrame Packet Header +* packet[4-31 = PB[0-27] InfoFrame Packet Contents drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +10
-0+*/ +if (len >= (packet_len -1 )) +return ; + packet[0 ] =0 ; +memcpy (packet +1 , buf, len); + +cdns_hdmi_clear_infoframe (mhdp, entry_id, type); + +/* flush fifo 1 */ + writel(F_FIFO1_FLUSH(1), mhdp->regs +
SOURCE_PIF_FIFO1_FLUSH);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 6 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +6
-0+ +/* write packet into memory */ + len32 = packet_len /4 ; +for (i =0 ; i < len32; i++) { + packet32 =get_unaligned_le32 (packet +4 * i); + writel(F_DATA_WR(packet32), mhdp->regs +
SOURCE_PIF_DATA_WR);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 4 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +4
-0+ } + +/* write entry id */ + writel(F_WR_ADDR(entry_id), mhdp->regs +
SOURCE_PIF_WR_ADDR);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +10
-0+ +/* write request */ +writel (F_HOST_WR (1 ), mhdp->regs +SOURCE_PIF_WR_REQ ); + +/* update entry */ + val =F_ACTIVE_IDLE_TYPE (1 ) |F_TYPE_VALID (1 ) | +F_PACKET_TYPE (type) |F_PKT_ALLOC_ADDRESS (entry_id); +writel (val, mhdp->regs +SOURCE_PIF_PKT_ALLOC_REG ); + + writel(F_PKT_ALLOC_WR_EN(1), mhdp->regs +
SOURCE_PIF_PKT_ALLOC_WR_EN);Quoted 4 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +4
-0+} + +static int cdns_hdmi_get_edid_block (void *data,u8 *edid, +u32 block,size_t length)drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +10
-0+{ +struct cdns_mhdp8501_device *mhdp = data; +u8 msg[2 ], reg[5 ], i; +int ret; + +for (i =0 ; i <4 ; i++) { + msg[0 ] = block /2 ; + msg[1 ] = block %2 ; + + ret =cdns_mhdp_mailbox_send_recv_multi(&mhdp->base,
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c line 98
Quoted 1 line
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +1
-0+
MB_MODULE_ID_HDMI_TX,drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c line 99
Quoted 1 line
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +1
-0+
HDMI_TX_EDID,drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c line 100
Quoted 1 line
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +1
-0+sizeof(msg), msg,
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c line 101
Quoted 1 line
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +1
-0+
HDMI_TX_EDID,drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c line 102
Quoted 1 line
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +1
-0+
Quoted 8 lines
sizeof(reg), reg,
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c line 103
Quoted 1 line
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +1
-0+ length,edid);
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c line 106
Quoted 3 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +3
-0+ +if (ret) +continue ;Ignoring the error?
Yes. EDID read operations can be interrupted by various factors, but as long as the EDID is eventually read successfully, there's no issue.
B.R
Sandor
Quoted 716 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 8 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +7
-0+ +if ((reg[3 ] <<8 | reg[4 ]) == length) +break ; + } + +if (ret) + dev_err(mhdp->dev, "get block[%d] edid failed: %d\n",block, ret);
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c line 117
Quoted 4 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +4
-0+return ret; +} + +static int cdns_hdmi_set_hdmi_mode_type(struct cdns_mhdp8501_device*mhdp)
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 8 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +8
-0+{ +struct drm_connector_state *conn_state = mhdp->curr_conn->state; +u32 protocol = mhdp->hdmi.hdmi_type; +u32 val; + +if (protocol ==MODE_HDMI_2_0 && + conn_state->hdmi.tmds_char_rate >=340000000 ) { + cdns_mhdp_reg_write(&mhdp->base,
HDTX_CLOCK_REG_0, 0);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c line 126
Quoted 1 line
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +1
-0+ cdns_mhdp_reg_write(&mhdp->base,
HDTX_CLOCK_REG_1,0xFFFFF);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 8 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +8
-0+ } + +cdns_mhdp_reg_read (&mhdp->base,HDTX_CONTROLLER , &val); + +/* set HDMI mode and preemble mode data enable */ + val |=F_HDMI_MODE (protocol) |F_HDMI2_PREAMBLE_EN (1 ) | +F_HDMI2_CTRL_IL_MODE (1 ); + return cdns_mhdp_reg_write(&mhdp->base, HDTX_CONTROLLER,val);
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 9 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +9
-0+} + +static int cdns_hdmi_ctrl_init (struct cdns_mhdp8501_device *mhdp) +{ +u32 val; +int ret; + +/* Set PHY to HDMI data */ + ret = cdns_mhdp_reg_write(&mhdp->base, PHY_DATA_SEL,
F_SOURCE_PHY_MHDP_SEL(1));drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 5 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +5
-0+if (ret <0 ) +return ret; + + ret = cdns_mhdp_reg_write(&mhdp->base, HDTX_HPD, + F_HPD_VALID_WIDTH(4) |
F_HPD_GLITCH_WIDTH(0));drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 5 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +5
-0+if (ret <0 ) +return ret; + +/* open CARS */ + ret = cdns_mhdp_reg_write(&mhdp->base, SOURCE_PHY_CAR,
0xF);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c line 156
Quoted 3 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +3
-0+if (ret <0 ) +return ret; + ret = cdns_mhdp_reg_write(&mhdp->base, SOURCE_HDTX_CAR,
0xFF);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 9 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +9
-0+if (ret <0 ) +return ret; + ret =cdns_mhdp_reg_write (&mhdp->base,SOURCE_PKT_CAR ,0xF ); +if (ret <0 ) +return ret; + ret =cdns_mhdp_reg_write (&mhdp->base,SOURCE_AIF_CAR ,0xF ); +if (ret <0 ) +return ret; + ret = cdns_mhdp_reg_write(&mhdp->base, SOURCE_CIPHER_CAR,
0xF);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c line 168
Quoted 3 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +3
-0+if (ret <0 ) +return ret; + ret = cdns_mhdp_reg_write(&mhdp->base, SOURCE_CRYPTO_CAR,
0xF);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 7 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +7
-0+if (ret <0 ) +return ret; + ret =cdns_mhdp_reg_write (&mhdp->base,SOURCE_CEC_CAR ,3 ); +if (ret <0 ) +return ret; + + ret = cdns_mhdp_reg_write(&mhdp->base, HDTX_CLOCK_REG_0,
0x7c1f);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c line 178
Quoted 3 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +3
-0+if (ret <0 ) +return ret; + ret = cdns_mhdp_reg_write(&mhdp->base, HDTX_CLOCK_REG_1,
0x7c1f);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 6 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +6
-0+if (ret <0 ) +return ret; + +/* init HDMI Controller */ + val =F_BCH_EN (1 ) |F_PIC_3D (0xF ) |F_CLEAR_AVMUTE (1 ); + ret = cdns_mhdp_reg_write(&mhdp->base, HDTX_CONTROLLER,val);
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 9 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +9
-0+if (ret <0 ) +return ret; + +return cdns_hdmi_set_hdmi_mode_type (mhdp); +} + +static int cdns_hdmi_mode_config (struct cdns_mhdp8501_device *mhdp, +struct drm_display_mode *mode, + struct drm_connector_hdmi_state*hdmi)
Quoted 5 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +5
-0+{ +u32 vsync_lines = mode->vsync_end - mode->vsync_start; +u32 eof_lines = mode->vsync_start - mode->vdisplay; +u32 sof_lines = mode->vtotal - mode->vsync_end; +u32 hblank = mode->htotal - mode->hdisplay;drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +10
-0+u32 hactive = mode->hdisplay; +u32 vblank = mode->vtotal - mode->vdisplay; +u32 vactive = mode->vdisplay; +u32 hfront = mode->hsync_start - mode->hdisplay; +u32 hback = mode->htotal - mode->hsync_end; +u32 vfront = eof_lines; +u32 hsync = hblank - hfront - hback; +u32 vsync = vsync_lines; +u32 vback = sof_lines; + u32 v_h_polarity = ((mode->flags & DRM_MODE_FLAG_NHSYNC) ?0 : 1) +
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c line 209
Quoted 1 line
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +1
-0+ ((mode->flags &
DRM_MODE_FLAG_NVSYNC) ? 0 : 2);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 4 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +4
-0+int ret; +u32 val; + + ret = cdns_mhdp_reg_write(&mhdp->base, SCHEDULER_H_SIZE,(hactive << 16) + hblank);
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c line 217
Quoted 4 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +4
-0+if (ret <0 ) +return ret; + + ret = cdns_mhdp_reg_write(&mhdp->base, SCHEDULER_V_SIZE,(vactive << 16) + vblank);
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c line 221
Quoted 4 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +4
-0+if (ret <0 ) +return ret; + + ret = cdns_mhdp_reg_write(&mhdp->base,
HDTX_SIGNAL_FRONT_WIDTH, (vfront << 16) + hfront);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c line 225
Quoted 4 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +4
-0+if (ret <0 ) +return ret; + + ret = cdns_mhdp_reg_write(&mhdp->base,
HDTX_SIGNAL_SYNC_WIDTH, (vsync << 16) + hsync);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c line 229
Quoted 4 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +4
-0+if (ret <0 ) +return ret; + + ret = cdns_mhdp_reg_write(&mhdp->base,
HDTX_SIGNAL_BACK_WIDTH, (vback << 16) + hback);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c line 233
Quoted 4 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +4
-0+if (ret <0 ) +return ret; + + ret = cdns_mhdp_reg_write(&mhdp->base,
HSYNC2VSYNC_POL_CTRL,v_h_polarity);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 7 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +7
-0+if (ret <0 ) +return ret; + +/* Reset Data Enable */ +cdns_mhdp_reg_read (&mhdp->base,HDTX_CONTROLLER , &val); + val &= ~F_DATA_EN (1 ); + ret = cdns_mhdp_reg_write(&mhdp->base, HDTX_CONTROLLER,val);
Quoted 30 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +30
-0+if (ret <0 ) +return ret; + +/* Set bpc */ + val &= ~F_VIF_DATA_WIDTH (3 ); +switch (hdmi->output_bpc) { +case 10 : + val |=F_VIF_DATA_WIDTH (1 ); +break ; +case 12 : + val |=F_VIF_DATA_WIDTH (2 ); +break ; +case 16 : + val |=F_VIF_DATA_WIDTH (3 ); +break ; +case 8 : +default : + val |=F_VIF_DATA_WIDTH (0 ); +break ; + } + +/* select color encoding */ + val &= ~F_HDMI_ENCODING (3 ); +switch (hdmi->output_format) { +case HDMI_COLORSPACE_YUV444 : + val |=F_HDMI_ENCODING (2 ); +break ; +case HDMI_COLORSPACE_YUV422 : + val |=F_HDMI_ENCODING (1 ); +break ;drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +10
-0+case HDMI_COLORSPACE_YUV420 : + val |=F_HDMI_ENCODING (3 ); +break ; +case HDMI_COLORSPACE_RGB : +default : + val |=F_HDMI_ENCODING (0 ); +break ; + } + + ret = cdns_mhdp_reg_write(&mhdp->base, HDTX_CONTROLLER,val);
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 6 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +6
-0+if (ret <0 ) +return ret; + +/* set data enable */ + val |=F_DATA_EN (1 ); + return cdns_mhdp_reg_write(&mhdp->base, HDTX_CONTROLLER,val);
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +10
-0+} + +static int cdns_hdmi_disable_gcp (struct cdns_mhdp8501_device *mhdp) +{ +u32 val; + +cdns_mhdp_reg_read (&mhdp->base,HDTX_CONTROLLER , &val); + val &= ~F_GCP_EN (1 ); + + return cdns_mhdp_reg_write(&mhdp->base, HDTX_CONTROLLER,val);
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +10
-0+} + +static int cdns_hdmi_enable_gcp (struct cdns_mhdp8501_device *mhdp) +{ +u32 val; + +cdns_mhdp_reg_read (&mhdp->base,HDTX_CONTROLLER , &val); + val |=F_GCP_EN (1 ); + + return cdns_mhdp_reg_write(&mhdp->base, HDTX_CONTROLLER,val);
Quoted 27 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +27
-0+} + +#define HDMI_14_MAX_TMDS_CLK (340 * 1000 * 1000) +static void cdns_hdmi_sink_config (struct cdns_mhdp8501_device *mhdp, +unsigned long long tmds_char_rate) +{ +struct drm_connector *connector = mhdp->curr_conn; +struct drm_display_info *display = &connector->display_info; +struct drm_scdc *scdc = &display->hdmi.scdc; +bool hdmi_scrambling = false; +bool hdmi_high_tmds_clock_ratio = false; + +/* check sink type (HDMI or DVI) */ +if (!display->is_hdmi) { + mhdp->hdmi.hdmi_type =MODE_DVI ; +return ; + } + +/* Default work in HDMI1.4 */ + mhdp->hdmi.hdmi_type =MODE_HDMI_1_4 ; + +/* check sink support SCDC or not */ +if (!scdc->supported) { +dev_dbg (mhdp->dev,"Sink Not Support SCDC\n" ); +return ; + } +drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +10
-0+if (tmds_char_rate >HDMI_14_MAX_TMDS_CLK ) { + hdmi_scrambling = true; + hdmi_high_tmds_clock_ratio = true; + mhdp->hdmi.hdmi_type =MODE_HDMI_2_0 ; + }else if (scdc->scrambling.low_rates) { + hdmi_scrambling = true; + mhdp->hdmi.hdmi_type =MODE_HDMI_2_0 ; + } + +/* Set TMDS bit clock ratio to 1/40 or 1/10, and enable/disable scrambling */
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c line 344
Quoted 1 line
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +1
-0+ drm_scdc_set_high_tmds_clock_ratio(connector,
hdmi_high_tmds_clock_ratio);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 5 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +5
-0+drm_scdc_set_scrambling (connector, hdmi_scrambling); +} + +static int cdns_hdmi_bridge_attach (struct drm_bridge *bridge, + enum drm_bridge_attach_flagsflags)
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c line 354
Quoted 5 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +5
-0+{ +struct cdns_mhdp8501_device *mhdp = bridge->driver_private; + +if (!(flags &DRM_BRIDGE_ATTACH_NO_CONNECTOR )) { + dev_err(mhdp->dev, "do not support creating adrm_connector\n");
Quoted 44 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +44
-0+return -EINVAL ; + } + +return 0 ; +} + +static int reset_pipe (struct drm_crtc *crtc) +{ +struct drm_atomic_state *state; +struct drm_crtc_state *crtc_state; +struct drm_modeset_acquire_ctx ctx; +int ret; + + state =drm_atomic_state_alloc (crtc->dev); +if (!state) +return -ENOMEM ; + +drm_modeset_acquire_init (&ctx,0 ); + + state->acquire_ctx = &ctx; + + crtc_state =drm_atomic_get_crtc_state (state, crtc); +if (IS_ERR (crtc_state)) { + ret =PTR_ERR (crtc_state); + goto out; + } + + crtc_state->connectors_changed = true; + + ret =drm_atomic_commit (state); +out: +drm_atomic_state_put (state); +drm_modeset_drop_locks (&ctx); +drm_modeset_acquire_fini (&ctx); + +return ret; +} + +void cdns_hdmi_handle_hotplug (struct cdns_mhdp8501_device *mhdp) +{ +struct drm_connector *connector = mhdp->curr_conn; +const struct drm_edid *drm_edid; +struct drm_connector_state *conn_state; +struct drm_crtc_state *crtc_state;drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +10
-0+struct drm_crtc *crtc; + +if (!connector) +return ; + +/* +* EDID data needs updating after each cable plugin +* due to potential display monitor changes +*/ + drm_edid = drm_edid_read_custom(connector,
cdns_hdmi_get_edid_block, mhdp);Quoted 32 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +32
-0+drm_edid_connector_update (connector, drm_edid); + +if (!drm_edid) +return ; + +drm_edid_free (drm_edid); + + conn_state = connector->state; + crtc = conn_state->crtc; +if (!crtc) +return ; + + crtc_state = crtc->state; +if (!crtc_state->active) +return ; + +/* +* HDMI 2.0 says that one should not send scrambled data +* prior to configuring the sink scrambling, and that +* TMDS clock/data transmission should be suspended when +* changing the TMDS clock rate in the sink. So let's +* just do a full modeset here, even though some sinks +* would be perfectly happy if were to just reconfigure +* the SCDC settings on the fly. +*/ +reset_pipe (crtc); +} + +static int cdns_hdmi_i2c_write (struct cdns_mhdp8501_device *mhdp, +struct i2c_msg *msgs) +{ +u8 msg[5 ], reg[5 ];drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c line 456
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +10
-0+int ret; + + msg[0 ] = msgs->addr; + msg[1 ] = msgs->buf[0 ]; + msg[2 ] =0 ; + msg[3 ] =1 ; + msg[4 ] = msgs->buf[1 ]; + + ret = cdns_mhdp_mailbox_send_recv(&mhdp->base, +
MB_MODULE_ID_HDMI_TX,HDMI_TX_WRITE,drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c line 451
Quoted 1 line
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +1
-0+ sizeof(msg), msg,sizeof(reg), reg);
Quoted 24 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +24
-0+if (ret) { +dev_err (mhdp->dev,"I2C write failed: %d\n" , ret); +return ret; + } + +if (reg[0 ] !=0 ) +return -EINVAL ; + +return 0 ; +} + +static int cdns_hdmi_i2c_read (struct cdns_mhdp8501_device *mhdp, +struct i2c_msg *msgs,int num) +{ +u8 msg[4 ], reg[5 ]; +u8 addr, offset, *buf, len; +int ret, i; + +for (i =0 ; i < num; i++) { +if (msgs[i].flags &I2C_M_RD ) { + addr = msgs[i].addr; + buf = msgs[i].buf; + len = msgs[i].len; + }else {drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c line 494
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +10
-0+ offset = msgs[i].buf[0 ]; + } + } + + msg[0 ] = addr; + msg[1 ] = offset; +put_unaligned_be16 (len, msg +2 ); + + ret = cdns_mhdp_mailbox_send_recv_multi(&mhdp->base, +
MB_MODULE_ID_HDMI_TX,HDMI_TX_READ,Quoted 12 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +12
-0+sizeof (msg), msg, +HDMI_TX_READ , +sizeof (reg), reg, + len, buf); +if (ret) { +dev_err (mhdp->dev,"I2c Read failed: %d\n" , ret); +return ret; + } + +return 0 ; +} +drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +10
-0+#define SCDC_I2C_SLAVE_ADDRESS 0x54 +static int cdns_hdmi_i2c_xfer (struct i2c_adapter *adap, +struct i2c_msg *msgs,int num) +{ +struct cdns_mhdp8501_device *mhdp =i2c_get_adapdata (adap); +struct cdns_hdmi_i2c *i2c = mhdp->hdmi.i2c; +int i, ret =0 ; + +/* +* MHDP FW provides mailbox APIs for SCDC registers access, but lacks direct I2C APIs.
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c line 508
Quoted 1 line
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +1
-0+* While individual I2C registers can be read/written using HDMI general register APIs,
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c line 509
Quoted 1 line
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +1
-0+* block reads (e.g., EDID) are not supported, making it a limited I2C interface.
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 4 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +4
-0+*/ +for (i =0 ; i < num; i++) { +if (msgs[i].addr !=SCDC_I2C_SLAVE_ADDRESS ) { + dev_err(mhdp->dev, "ADDR=%0x is notsupported\n", msgs[i].addr);
Quoted 20 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +20
-0+return -EINVAL ; + } + } + +mutex_lock (&i2c->lock); + +if (num ==1 ) + ret =cdns_hdmi_i2c_write (mhdp, msgs); +else + ret =cdns_hdmi_i2c_read (mhdp, msgs, num); + +if (!ret) + ret = num; + +mutex_unlock (&i2c->lock); + +return ret; +} + +static u32 cdns_hdmi_i2c_func (struct i2c_adapter *adapter)drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +10
-0+{ +return I2C_FUNC_I2C |I2C_FUNC_SMBUS_EMUL ; +} + +static const struct i2c_algorithm cdns_hdmi_algorithm = { + .master_xfer = cdns_hdmi_i2c_xfer, + .functionality = cdns_hdmi_i2c_func, +}; + +struct i2c_adapter *cdns_hdmi_i2c_adapter(struct
cdns_mhdp8501_device*mhdp)Quoted 11 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +11
-0+{ +struct i2c_adapter *adap; +struct cdns_hdmi_i2c *i2c; +int ret; + + i2c =devm_kzalloc (mhdp->dev,sizeof (*i2c),GFP_KERNEL ); +if (!i2c) +return ERR_PTR (-ENOMEM ); + +mutex_init (&i2c->lock); +drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +10
-0+ adap = &i2c->adap; + adap->owner =THIS_MODULE ; + adap->dev.parent = mhdp->dev; + adap->algo = &cdns_hdmi_algorithm; +strscpy (adap->name,"MHDP HDMI" ,sizeof (adap->name)); +i2c_set_adapdata (adap, mhdp); + + ret =i2c_add_adapter (adap); +if (ret) { + dev_warn(mhdp->dev, "cannot add %s I2C adapter\n",
adap->name);Quoted 24 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +24
-0+devm_kfree (mhdp->dev, i2c); +return ERR_PTR (ret); + } + + mhdp->hdmi.i2c = i2c; + +return adap; +} + +static enum drm_mode_status +cdns_hdmi_tmds_char_rate_valid (const struct drm_bridge *bridge, +const struct drm_display_mode *mode, +unsigned long long tmds_rate) +{ +struct cdns_mhdp8501_device *mhdp = bridge->driver_private; +union phy_configure_opts phy_cfg; +int ret; + + phy_cfg.hdmi.tmds_char_rate = tmds_rate; + + ret =phy_validate (mhdp->phy,PHY_MODE_HDMI ,0 , &phy_cfg); +if (ret <0 ) +return MODE_CLOCK_RANGE ; +drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +10
-0+return MODE_OK ; +} + +static const struct drm_edid +*cdns_hdmi_bridge_edid_read (struct drm_bridge *bridge, +struct drm_connector *connector) +{ +struct cdns_mhdp8501_device *mhdp = bridge->driver_private; + + return drm_edid_read_custom(connector,
cdns_hdmi_get_edid_block, mhdp);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 4 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +4
-0+} + +static void cdns_hdmi_bridge_atomic_disable(struct drm_bridge *bridge, + struct
drm_bridge_state*old_state)drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +10
-0+{ +struct cdns_mhdp8501_device *mhdp = bridge->driver_private; + + mhdp->curr_conn =NULL ; + +phy_power_off (mhdp->phy); +} + +static void cdns_hdmi_bridge_atomic_enable (struct drm_bridge *bridge, + struct drm_bridge_state
*old_state)drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c line 627
Quoted 12 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +12
-0+{ +struct cdns_mhdp8501_device *mhdp = bridge->driver_private; +struct drm_atomic_state *state = old_state->base.state; +struct drm_connector *connector; +struct drm_crtc_state *crtc_state; +struct drm_connector_state *conn_state; +struct drm_connector_hdmi_state *hdmi; +union phy_configure_opts phy_cfg; +int ret; + + connector = drm_atomic_get_new_connector_for_encoder(state, +
bridge->encoder);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c line 630
Quoted 6 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +6
-0+if (WARN_ON (!connector)) +return ; + + mhdp->curr_conn = connector; + + conn_state = drm_atomic_get_new_connector_state(state,connector);
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c line 634
Quoted 4 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +4
-0+if (WARN_ON (!conn_state)) +return ; + + crtc_state = drm_atomic_get_new_crtc_state(state,
conn_state->crtc);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c line 638
Quoted 4 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +4
-0+if (WARN_ON (!crtc_state)) +return ; + + drm_atomic_helper_connector_hdmi_update_infoframes(connector,state);
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c line 641
Quoted 3 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +3
-0+ +/* Line swapping */ + cdns_mhdp_reg_write(&mhdp->base, LANES_CONFIG, 0x00400000|
mhdp->lane_mapping);Quoted 20 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +20
-0+ + hdmi = &conn_state->hdmi; +if (WARN_ON (!hdmi)) +return ; + + phy_cfg.hdmi.tmds_char_rate = hdmi->tmds_char_rate; + ret =phy_configure (mhdp->phy, &phy_cfg); +if (ret) { +dev_err (mhdp->dev,"%s: phy_configure() failed: %d\n" , + __func__, ret); +return ; + } + +phy_power_on (mhdp->phy); + +cdns_hdmi_sink_config (mhdp, hdmi->tmds_char_rate); + + ret =cdns_hdmi_ctrl_init (mhdp); +if (ret <0 ) { +dev_err (mhdp->dev,"hdmi ctrl init failed = %d\n" , ret);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +10
-0+return ; + } + +/* Config GCP */ +if (hdmi->output_bpc ==8 ) +cdns_hdmi_disable_gcp (mhdp); +else +cdns_hdmi_enable_gcp (mhdp); + + ret = cdns_hdmi_mode_config(mhdp, &crtc_state->adjusted_mode,hdmi);
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c line 673
Quoted 2 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +2
-0+if (ret <0 ) { + dev_err(mhdp->dev, "CDN_API_HDMITX_SetVic_blockingret = %d\n", ret);
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 6 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +6
-0+return ; + } +} + +static int cdns_hdmi_bridge_clear_infoframe(struct drm_bridge *bridge, + enum
hdmi_infoframe_typetype)drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 6 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +6
-0+{ +struct cdns_mhdp8501_device *mhdp = bridge->driver_private; + +switch (type) { +case HDMI_INFOFRAME_TYPE_AVI : + cdns_hdmi_clear_infoframe(mhdp, 0,
HDMI_INFOFRAME_TYPE_AVI);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 3 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +3
-0+break ; +case HDMI_INFOFRAME_TYPE_SPD : + cdns_hdmi_clear_infoframe(mhdp, 1,
HDMI_INFOFRAME_TYPE_SPD);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 3 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +3
-0+break ; +case HDMI_INFOFRAME_TYPE_VENDOR : + cdns_hdmi_clear_infoframe(mhdp, 2,
HDMI_INFOFRAME_TYPE_VENDOR);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c line 694
Quoted 3 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +3
-0+break ; +default : + dev_dbg(mhdp->dev, "Unsupported infoframe type %x\n",type);
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 7 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +7
-0+ } + +return 0 ; +} + +static int cdns_hdmi_bridge_write_infoframe(struct drm_bridge *bridge, + enum
hdmi_infoframe_typetype,drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c line 702
Quoted 1 line
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +1
-0+const u8 *buffer, size_tlen)
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 6 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +6
-0+{ +struct cdns_mhdp8501_device *mhdp = bridge->driver_private; + +switch (type) { +case HDMI_INFOFRAME_TYPE_AVI : + cdns_hdmi_config_infoframe(mhdp, 0, len, buffer,
HDMI_INFOFRAME_TYPE_AVI);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 3 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +3
-0+break ; +case HDMI_INFOFRAME_TYPE_SPD : + cdns_hdmi_config_infoframe(mhdp, 1, len, buffer,
HDMI_INFOFRAME_TYPE_SPD);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 3 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +3
-0+break ; +case HDMI_INFOFRAME_TYPE_VENDOR : + cdns_hdmi_config_infoframe(mhdp, 2, len, buffer,
HDMI_INFOFRAME_TYPE_VENDOR);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c line 717
Quoted 3 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +3
-0+break ; +default : + dev_dbg(mhdp->dev, "Unsupported infoframe type %x\n",type);
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 7 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +7
-0+ } + +return 0 ; +} + +static int cdns_hdmi_bridge_atomic_check (struct drm_bridge *bridge, + struct drm_bridge_state
*bridge_state,drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c line 725
Quoted 1 line
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +1
-0+struct drm_crtc_state
*crtc_state,drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c line 726
Quoted 1 line
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +1
-0+ struct
drm_connector_state*conn_state)drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c line 728
Quoted 2 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +2
-0+{ +return
drm_atomic_helper_connector_hdmi_check(conn_state->connector, conn_state->state);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 11 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +11
-0+} + +const struct drm_bridge_funcs cdns_hdmi_bridge_funcs = { + .attach = cdns_hdmi_bridge_attach, + .detect = cdns_mhdp8501_detect, + .edid_read = cdns_hdmi_bridge_edid_read, + .mode_valid = cdns_mhdp8501_mode_valid, + .atomic_enable = cdns_hdmi_bridge_atomic_enable, + .atomic_disable = cdns_hdmi_bridge_atomic_disable, + .atomic_check = cdns_hdmi_bridge_atomic_check, + .atomic_duplicate_state =
drm_atomic_helper_bridge_duplicate_state,Quoted 9 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +6
-1+ .atomic_destroy_state = drm_atomic_helper_bridge_destroy_state, + .atomic_reset = drm_atomic_helper_bridge_reset, + .hdmi_clear_infoframe = cdns_hdmi_bridge_clear_infoframe, + .hdmi_write_infoframe = cdns_hdmi_bridge_write_infoframe, + .hdmi_tmds_char_rate_valid = cdns_hdmi_tmds_char_rate_valid, +}; --2.34.1
--
With best wishes
Dmitry
Re: [EXT] Re: [PATCH v20 5/9] drm: bridge: Cadence: Add MHDP8501 DP/HDMI driver
Quoted 309 lines · Sandor Yu
Quoted 309 lines · Sandor Yu
Quoted 1 line
Add a new DRM DisplayPort and HDMI bridge driver for Candence
MHDP8501
Quoted 10 lines
used in i.MX8MQ SOC. MHDP8501 could support HDMI or DisplayPort standards according embedded Firmware running in the uCPU.
For iMX8MQ SOC, the DisplayPort/HDMI FW was loaded and activated by SOC's ROM code. Bootload binary included respective specific firmware is required.
Driver will check display connector type and
then load the corresponding driver.Quoted 6 lines
Signed-off-by Sandor Yu <[email protected]>---
v19->v20:
- Dump mhdp FW version by debugfs
- Combine HDMI and DP cable detect functions into one function
- Combine HDMI and DP cablebridge_mode_valid()functions into onefunction
Quoted 2 lines
- Rename
cdns_hdmi_reset_link()tocdns_hdmi_handle_hotplug()
- Add comments for EDID incdns_hdmi_handle_hotplug()and
cdns_dp_check_link_state()Quoted 3 lines
- Add
atomic_get_input_bus_fmts()andbridge_atomic_check()for DP driver
- Remove bpc andcolor_fmtinit inatomic_enable()function.
- More detail comments for DDC adapter only support
SCDC_I2C_SLAVE_ADDRESSQuoted 11 lines
read and write in HDMI driver.
v18->v19:
- Get endpoint for data-lanes as it had move to endpoint of port@1
- Update clock management asdevm_clk_get_enabled()introduced.
- Fixclear_infoframe()function is not work issue.
- Manage PHY power state viaphy_power_on()andphy_power_off().
v17->v18:
- MHDP8501 HDMI and DP commands that need access mailbox arerewrited
Quoted 4 lines
with new API functions created in patch #1.
- replace lane-mapping with data-lanes, use the value from data-lanes to reorder HDMI and DP lane mapping.
- create I2C adapter for HDMI SCDC, removecdns_hdmi_scdc_write()function.
Quoted 11 lines
- Rewrite
cdns_hdmi_sink_config()function, use HDMI SCDC helper functiondrm_scdc_set_high_tmds_clock_ratio()anddrm_scdc_set_scrambling()to config HDMI sink TMDS.
- Remove structvideo_infofrom HDMI driver.
- Removetmds_char_rate_valid()be called inbridge_mode_valid(), community had patch in reviewing to implement the function.
- Remove warning message print when get unknown HPD cable status.
- Add more detail comments for HDP plugin and plugout interrupt.
- usedev_dbgto repleaceDRM_INFOwhen cable HPD status changed.
- Remove t-b tag as above code change.Quoted 5 lines
drivers/gpu/drm/bridge/cadence/Kconfig | 16 + drivers/gpu/drm/bridge/cadence/Makefile | 2 + .../drm/bridge/cadence/cdns-mhdp8501-core.c | 379 +++++++++ .../drm/bridge/cadence/cdns-mhdp8501-core.h | 380 +++++++++ .../gpu/drm/bridge/cadence/cdns-mhdp8501-dp.c | 694++++++++++++++++
Quoted 1 line
.../drm/bridge/cadence/cdns-mhdp8501-hdmi.c | 745++++++++++++++++++
Quoted 2 lines
6 files changed, 2216 insertions(+) create mode 100644
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.cQuoted 1 line
create mode 100644
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.hQuoted 1 line
create mode 100644
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-dp.cQuoted 1 line
create mode 100644
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.cReview
Quoted 2 lines
(quoted diff) +0
-0b/drivers/gpu/drm/bridge/cadence/Kconfig
Review
Quoted 24 lines
index
dbb06533ccab2..bd979f3e6df48100644drivers/gpu/drm/bridge/cadence/Kconfig +16
-0@@ -48,3 +48,19 @@ config DRM_CDNS_MHDP8546_J721E initializes the J721E Display Port and sets up the clock and data muxes. endif + +config DRM_CDNS_MHDP8501 + tristate "Cadence MHDP8501 DP/HDMI bridge" + select DRM_KMS_HELPER + select DRM_PANEL_BRIDGE + select DRM_DISPLAY_DP_HELPER + select DRM_DISPLAY_HELPER + select DRM_CDNS_AUDIO + select CDNS_MHDP_HELPER + depends on OF + help + Support Cadence MHDP8501 DisplayPort/HDMI bridge. + Cadence MHDP8501 support one or more protocols, + including DisplayPort and HDMI. + To use the DP and HDMI drivers, their respective + specific firmware is required.(quoted diff) +0
-0b/drivers/gpu/drm/bridge/cadence/Makefile
drivers/gpu/drm/bridge/cadence/Makefile cdns-dsi-$(CONFIG_DRM_CDNS_DSI_J721E) +=
Quoted 4 lines
index
c95fd5b81d137..ea327287d1c14100644drivers/gpu/drm/bridge/cadence/Makefile +0
-0@@ -5,3 +5,5 @@ cdns-dsi-$(CONFIG_DRM_CDNS_DSI_J721E) +=cdns-dsi-j721e.o
drivers/gpu/drm/bridge/cadence/Makefile cdns-dsi-$(CONFIG_DRM_CDNS_DSI_J721E) += cdns-dsi-j721e.o
Quoted 3 lines
drivers/gpu/drm/bridge/cadence/Makefile +0
-0obj-$(CONFIG_DRM_CDNS_MHDP8546) += cdns-mhdp8546.o cdns-mhdp8546-y := cdns-mhdp8546-core.o cdns-mhdp8546-hdcp.o cdns-mhdp8546-$(CONFIG_DRM_CDNS_MHDP8546_J721E) +=cdns-mhdp8546-j721e.o
drivers/gpu/drm/bridge/cadence/Makefile cdns-dsi-$(CONFIG_DRM_CDNS_DSI_J721E) += · line 9
Quoted 2 lines
drivers/gpu/drm/bridge/cadence/Makefile +2
-0+obj-$(CONFIG_DRM_CDNS_MHDP8501) += cdns-mhdp8501.o +cdns-mhdp8501-y := cdns-mhdp8501-core.o cdns-mhdp8501-dp.ocdns-mhdp8501-hdmi.o
Review
Quoted 1 line
(quoted diff) +0
-0
b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.cQuoted 15 lines
new file mode 100644
index 0000000000000..98116ef012fa3drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +10
-0@@ -0,0 +1,379 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Cadence Display Port Interface (DP) driver +* +* Copyright (C) 2023-2024 NXP Semiconductor, Inc. +* +*/ +#include <drm/drm_of.h> +#include <drm/drm_print.h> +#include <linux/clk.h> drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 20
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +10
-0+#include <linux/irq.h> +#include <linux/mutex.h> +#include <linux/of_device.h> +#include <linux/platform_device.h> +#include <linux/phy/phy.h> + +#include "cdns-mhdp8501-core.h" + +static ssize_t firmware_version_show(struct device *dev, + struct device_attribute *attr,char *buf);
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 21
Quoted 1 line
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +1
-0+static struct device_attribute firmware_version =
__ATTR_RO(firmware_version);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 7 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +7
-0+ +ssize_t firmware_version_show (struct device *dev, +struct device_attribute *attr,char *buf) +{ +struct cdns_mhdp8501_device *mhdp =dev_get_drvdata (dev); + + u32 version = readl(mhdp->base.regs + VER_L) |
readl(mhdp->base.regs + VER_H)<< 8;drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 30
Quoted 2 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +2
-0+u32 lib_version =readl (mhdp->base.regs +VER_LIB_L_ADDR ) | +readl (mhdp->base.regs +VER_LIB_H_ADDR )<< 8;
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 32
Quoted 2 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +2
-0+ + return sprintf(buf, "FW version %d, Lib version %d\n", version,
lib_version);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 3 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +3
-0+} + +static void cdns_mhdp8501_create_device_files(struct
cdns_mhdp8501_device*mhdp)drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 3 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +3
-0+{ +if (device_create_file (mhdp->dev, &firmware_version)) { + DRM_ERROR("Unable to create firmware_versionsysfs\n");
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 5 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +5
-0+device_remove_file (mhdp->dev, &firmware_version); + } +} + +static void cdns_mhdp8501_remove_device_files(struct
cdns_mhdp8501_device*mhdp)drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 5 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +5
-0+{ +device_remove_file (mhdp->dev, &firmware_version); +} + +static int cdns_mhdp8501_read_hpd(struct cdns_mhdp8501_device*mhdp)
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 5 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +5
-0+{ +u8 status; +int ret; + + ret = cdns_mhdp_mailbox_send_recv(&mhdp->base,
MB_MODULE_ID_GENERAL,drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 54
Quoted 1 line
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +1
-0+
GENERAL_GET_HPD_STATE,drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 55
Quoted 1 line
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +1
-0+ 0, NULL, sizeof(status),&status);
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 9 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +9
-0+if (ret) { +dev_err (mhdp->dev,"read hpd failed: %d\n" , ret); +return ret; + } + +return status; +} + +enum drm_connector_status cdns_mhdp8501_detect(struct drm_bridge*bridge)
Quoted 30 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +30
-0+{ +struct cdns_mhdp8501_device *mhdp = bridge->driver_private; + +u8 hpd =0xf ; + + hpd =cdns_mhdp8501_read_hpd (mhdp); +if (hpd ==1 ) +return connector_status_connected; +else if (hpd ==0 ) +return connector_status_disconnected; + +return connector_status_unknown; +} + +enum drm_mode_status +cdns_mhdp8501_mode_valid (struct drm_bridge *bridge, +const struct drm_display_info *info, +const struct drm_display_mode *mode) +{ +/* We don't support double-clocked */ +if (mode->flags &DRM_MODE_FLAG_DBLCLK ) +return MODE_BAD ; + +/* MAX support pixel clock rate 594MHz */ +if (mode->clock >594000 ) +return MODE_CLOCK_HIGH ; + +if (mode->hdisplay >3840 ) +return MODE_BAD_HVALUE ; +drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +10
-0+if (mode->vdisplay >2160 ) +return MODE_BAD_VVALUE ; + +return MODE_OK ; +} + +static void hotplug_work_func (struct work_struct *work) +{ +struct cdns_mhdp8501_device *mhdp =container_of (work, + struct
cdns_mhdp8501_device,drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 105
Quoted 1 line
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +1
-0+hotplug_work.work);
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 106
Quoted 1 line
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +1
-0+ enum drm_connector_status status =
cdns_mhdp8501_detect(&mhdp->bridge);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 5 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +5
-0+ +drm_bridge_hpd_notify (&mhdp->bridge, status); + +/* +* iMX8MQ has two HPD interrupts: one for plugout and one for plugin.
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 112
Quoted 1 line
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +1
-0+* These interrupts cannot be masked and cleaned, so we must enable one
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 9 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +9
-0+* and disable the other to avoid continuous interrupt generation. +*/ +if (status == connector_status_connected) { +/* Cable connected */ +dev_dbg (mhdp->dev,"HDMI/DP Cable Plug In\n" ); +enable_irq (mhdp->irq[IRQ_OUT ]); + +/* Reset HDMI/DP link with sink */ + if (mhdp->connector_type ==
DRM_MODE_CONNECTOR_HDMIA)Quoted 15 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +15
-0+cdns_hdmi_handle_hotplug (mhdp); + else +cdns_dp_check_link_state (mhdp ); + + }else if (status == connector_status_disconnected) { +/* Cable Disconnected */ +dev_dbg (mhdp->dev,"HDMI/DP Cable Plug Out\n" ); +enable_irq (mhdp->irq[IRQ_IN ]); + } +} + +static irqreturn_t cdns_mhdp8501_irq_thread (int irq,void *data) +{ +struct cdns_mhdp8501_device *mhdp = data; +drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +10
-0+disable_irq_nosync (irq); + +mod_delayed_work (system_wq, &mhdp->hotplug_work, +msecs_to_jiffies (HOTPLUG_DEBOUNCE_MS )); + +return IRQ_HANDLED ; +} + +#define DATA_LANES_COUNT 4 +static int cdns_mhdp8501_dt_parse(struct cdns_mhdp8501_device*mhdp,
Quoted 9 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +9
-0+ struct platform_device *pdev) +{ +struct device *dev = &pdev->dev; +struct device_node *np = dev->of_node; +struct device_node *remote, *endpoint; +u32 data_lanes[DATA_LANES_COUNT ]; +u32 lane_value; +int ret, i; +drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +10
-0+ remote =of_graph_get_remote_node (np,1 ,0 ); +if (!remote) { +dev_err (dev,"fail to get remote node\n" ); +of_node_put (remote); +return -EINVAL ; + } + +/* get connector type */ +if (of_device_is_compatible (remote,"hdmi-connector" )) { + mhdp->connector_type =
DRM_MODE_CONNECTOR_HDMIA;Quoted 3 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +3
-0+ + }else if (of_device_is_compatible (remote,"dp-connector" )) { + mhdp->connector_type =
Quoted 7 lines
Quoted 4 lines
DRM_MODE_CONNECTOR_DisplayPort;Interesting hack. What if somebody wraps DP signals with the USB-C controller in order to provide DP over USB-C?
There is no such requirement now, and the supported types of display-connectors do not include Type-C DP connectors. If type-C DP connectors is added in the future, I think it would be acceptable to modify the code here.
It would be acceptable, but it most likely will also require chaning the DT bindings as there is no longer an easy way to identify the next bridge. Also you might not have that now, but it is pretty common to have DP retimers on the board in order to improve the sinal integrity. Thus I think it is not a proper solution to check the next node's compatible. I think we need a way to specify HDMI vs DP firmware / mode in the device tree.
Quoted 83 lines
Quoted 7 lines
Unfortunately I don't have a good solution here. There might be other format converters after your bridge, so you even can't look at the last bridge of the chain. You might want to examine the phy-mode property and use it to specify whether the PHY should work in the HDMI or in the DP mode.
MHDP supports either HDMI or DP based on its firmware.
The PHY doesn't provide a function to indicate which firmware is currently running,
and the controller driver doesn't have a mechanism to determine whether it's DP or HDMI. The users should select the corresponding firmware based on the connector type when their get the board.For the driver, there must be an external input to determine whether it's currently running in HDMI or DP mode. In earlier versions, I used different compatible strings to distinguish between DP and HDMI. However, based on comments from other reviewers,
I changed the approach to checking the connector type, which is clearly a more suitable method.Quoted 2 lines
Also, where do get the next bridge and attach it to the bridge chain?
next_bridgeget and attach is missed in the driver, I will add it.Quoted 14 lines
Quoted 14 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +13
-0+ + }else { +dev_err (dev,"Unknown connector type\n" ); +of_node_put (remote); +return -EINVAL ; + } + +of_node_put (remote); + + endpoint =of_graph_get_endpoint_by_regs (np,1 ,-1 ); + +/* Get the data lanes ordering */ + ret =of_property_count_u32_elems (endpoint,"data-lanes" );Quoted 8 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 187
Quoted 6 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +6
-0+if (ret <0 ) +return -EINVAL ; +if (ret !=DATA_LANES_COUNT ) { +dev_err (dev,"expected 4 data lanes\n" ); +return -EINVAL ; + }Isn't it
drm_of_get_data_lanes_count_ep()?
drm_of_get_data_lanes_countwill be used here in the next version.Quoted 35 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 4 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +3
-0+ + ret = of_property_read_u32_array(endpoint, "data-lanes", + data_lanes,
DATA_LANES_COUNT);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 6 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +6
-0+if (ret) +return -EINVAL ; + + mhdp->lane_mapping =0 ; +for (i =0 ; i <DATA_LANES_COUNT ; i++) { + lane_value = (data_lanes[i] >= 0 && data_lanes[i] <= 3) ?data_lanes[i] : 0;
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 7 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +7
-0+ mhdp->lane_mapping |= lane_value << (i *2 ); + } + +return true; +} + +static int cdns_mhdp8501_add_bridge(struct cdns_mhdp8501_device*mhdp)
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 7 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +7
-0+{ + mhdp->bridge.type = mhdp->connector_type; + mhdp->bridge.driver_private = mhdp; + mhdp->bridge.of_node = mhdp->dev->of_node; + mhdp->bridge.vendor ="NXP" ; + mhdp->bridge.product ="i.MX8" ; + mhdp->bridge.ops = DRM_BRIDGE_OP_DETECT |
DRM_BRIDGE_OP_EDID|Quoted 6 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +6
-0+DRM_BRIDGE_OP_HPD ; + +if (mhdp->connector_type ==DRM_MODE_CONNECTOR_HDMIA ) { + mhdp->bridge.funcs = &cdns_hdmi_bridge_funcs; + mhdp->bridge.ops |=DRM_BRIDGE_OP_HDMI ; + mhdp->bridge.ddc =cdns_hdmi_i2c_adapter (mhdp);
Quoted 6 lines
Quoted 2 lines
I'd expect that bridge.ddc provides DDC service. Is it required to control the SCDC from userspace?
I may not have fully understood your question.
The DDC here is used for the SCDC API functions likedrm_scdc_set_XXXin HDMI driver. So far, I haven't encountered any cases where the user needs to control SCDC.
Okay.
Quoted 348 lines
Quoted 157 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 217
Quoted 3 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +1
-0+ } else if (mhdp->connector_type ==
DRM_MODE_CONNECTOR_DisplayPort) {Quoted 33 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +33
-0+ mhdp->bridge.funcs = &cdns_dp_bridge_funcs; + }else { +dev_err (mhdp->dev,"Unsupported connector type!\n" ); +return -EINVAL ; + } + +drm_bridge_add (&mhdp->bridge); + +return 0 ; +} + +static int cdns_mhdp8501_probe (struct platform_device *pdev) +{ +struct device *dev = &pdev->dev; +struct cdns_mhdp8501_device *mhdp; +struct resource *res; +enum phy_mode phy_mode; +u32 reg; +int ret; + + mhdp =devm_kzalloc (dev,sizeof (*mhdp),GFP_KERNEL ); +if (!mhdp) +return -ENOMEM ; + + mhdp->dev = dev; + +INIT_DELAYED_WORK (&mhdp->hotplug_work, hotplug_work_func); + + res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); +if (!res) +return -ENODEV ; + + mhdp->regs =devm_ioremap (dev, res->start,resource_size (res));drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +10
-0+if (IS_ERR (mhdp->regs)) +return PTR_ERR (mhdp->regs); + +cdns_mhdp8501_create_device_files (mhdp); + + ret =cdns_mhdp8501_dt_parse (mhdp, pdev); +if (ret <0 ) +return -EINVAL ; + + mhdp->phy = devm_of_phy_get_by_index(dev, pdev->dev.of_node,0);
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 262
Quoted 2 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +2
-0+if (IS_ERR (mhdp->phy)) + return dev_err_probe(dev, PTR_ERR(mhdp->phy), "no PHYconfigured\n");
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 4 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +4
-0+ + mhdp->irq[IRQ_IN ] =platform_get_irq_byname (pdev,"plug_in" ); +if (mhdp->irq[IRQ_IN ] <0 ) + return dev_err_probe(dev, mhdp->irq[IRQ_IN], "No
plug_inirq number\n");drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 268
Quoted 2 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +2
-0+ + mhdp->irq[IRQ_OUT] = platform_get_irq_byname(pdev,"
plug_out");drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 270
Quoted 2 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +2
-0+if (mhdp->irq[IRQ_OUT ] <0 ) + return dev_err_probe(dev, mhdp->irq[IRQ_OUT], "No
plug_outirq number\n");drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 4 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +4
-0+ +irq_set_status_flags (mhdp->irq[IRQ_IN ],IRQ_NOAUTOEN ); + ret = devm_request_threaded_irq(dev, mhdp->irq[IRQ_IN], + NULL,
cdns_mhdp8501_irq_thread,drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 275
Quoted 1 line
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +1
-0+ IRQF_ONESHOT,
dev_name(dev), mhdp);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 8 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +8
-0+if (ret <0 ) { +dev_err (dev,"can't claim irq %d\n" , mhdp->irq[IRQ_IN ]); +return -EINVAL ; + } + +irq_set_status_flags (mhdp->irq[IRQ_OUT ],IRQ_NOAUTOEN ); + ret = devm_request_threaded_irq(dev, mhdp->irq[IRQ_OUT], + NULL,
cdns_mhdp8501_irq_thread,drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 284
Quoted 1 line
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +1
-0+ IRQF_ONESHOT,
dev_name(dev), mhdp);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 286
Quoted 2 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +2
-0+if (ret <0 ) { + dev_err(dev, "can't claim irq %d\n",mhdp->irq[IRQ_OUT]);
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 5 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +5
-0+return -EINVAL ; + } + +/* cdns_mhdp8501_dt_parse() ensures connector_type is valid */ + if (mhdp->connector_type ==
DRM_MODE_CONNECTOR_DisplayPort)drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 293
Quoted 2 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +2
-0+ phy_mode =PHY_MODE_DP ; + else if (mhdp->connector_type ==
DRM_MODE_CONNECTOR_HDMIA)drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 9 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +9
-0+ phy_mode =PHY_MODE_HDMI ; + +dev_set_drvdata (dev, mhdp); + +/* init base struct for access mhdp mailbox */ + mhdp->base.dev = mhdp->dev; + mhdp->base.regs = mhdp->regs; + + if (mhdp->connector_type ==
DRM_MODE_CONNECTOR_DisplayPort) {Quoted 7 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +7
-0+drm_dp_aux_init (&mhdp->dp.aux); + mhdp->dp.aux.name ="mhdp8501_dp_aux" ; + mhdp->dp.aux.dev = dev; + mhdp->dp.aux.transfer = cdns_dp_aux_transfer; + } + +/* Enable APB clock */ drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +10
-0+ mhdp->apb_clk =devm_clk_get_enabled (dev,NULL ); +if (IS_ERR (mhdp->apb_clk)) +return dev_err_probe (dev,PTR_ERR (mhdp->apb_clk), +"couldn't get apb clk\n" ); +/* +* Wait for the KEEP_ALIVE "message" on the first 8 bits. +* Updated each sched "tick" (~2ms) +*/ + ret = readl_poll_timeout(mhdp->regs + KEEP_ALIVE, reg, + reg & CDNS_KEEP_ALIVE_MASK,500,
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 3 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +3
-0+ CDNS_KEEP_ALIVE_TIMEOUT); +if (ret) { + dev_err(dev, "device didn't give any life sign: reg %d\n",reg);
Quoted 17 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +17
-0+return ret; + } + + ret =phy_init (mhdp->phy); +if (ret) { +dev_err (dev,"Failed to initialize PHY: %d\n" , ret); +return ret; + } + + ret =phy_set_mode (mhdp->phy, phy_mode); +if (ret) { +dev_err (dev,"Failed to configure PHY: %d\n" , ret); +return ret; + } + +/* Enable cable hotplug detect */ +if (cdns_mhdp8501_read_hpd (mhdp))drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +10
-0+enable_irq (mhdp->irq[IRQ_OUT ]); + else + enable_irq(mhdp->irq[IRQ_IN]); + +return cdns_mhdp8501_add_bridge (mhdp); +} + +static void cdns_mhdp8501_remove (struct platform_device *pdev) +{ + struct cdns_mhdp8501_device *mhdp =
platform_get_drvdata(pdev);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 4 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +4
-0+ +cdns_mhdp8501_remove_device_files (mhdp); + + if (mhdp->connector_type ==
DRM_MODE_CONNECTOR_DisplayPort)Quoted 11 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 361
Quoted 8 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +8
-0+cdns_dp_aux_destroy (mhdp); + +drm_bridge_remove (&mhdp->bridge); +} + +static const struct of_device_id cdns_mhdp8501_dt_ids[] = { + { .compatible ="fsl,imx8mq-mhdp8501" , + },Strange line wrapping, I'd say. Either it should all be on the same line, or take three lines.
I will fix it.
Quoted 45 lines
Quoted 21 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +18
-0+ { }, +}; +MODULE_DEVICE_TABLE (of, cdns_mhdp8501_dt_ids); + +static struct platform_driver cdns_mhdp8501_driver = { + .probe = cdns_mhdp8501_probe, + .remove = cdns_mhdp8501_remove, + .driver = { + .name ="cdns-mhdp8501" , + .of_match_table = cdns_mhdp8501_dt_ids, + }, +}; + +module_platform_driver (cdns_mhdp8501_driver); + +MODULE_AUTHOR ("Sandor Yu <[email protected]>" ); +MODULE_DESCRIPTION ("Cadence MHDP8501 bridge driver" ); +MODULE_LICENSE ("GPL" );drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +10
-0+static void cdns_dp_mode_set (struct cdns_mhdp8501_device *mhdp, +const struct drm_display_mode *mode) +{ +union phy_configure_opts phy_cfg; +int ret; + +cdns_dp_pixel_clk_reset (mhdp); + +/* Get DP Caps */ + ret = drm_dp_dpcd_read(&mhdp->dp.aux, DP_DPCD_REV,
mhdp->dp.dpcd,Quoted 13 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +13
-0+ DP_RECEIVER_CAP_SIZE); +if (ret <0 ) { +dev_err (mhdp->dev,"Failed to get caps %d\n" , ret); +return ; + } + + mhdp->dp.rate =drm_dp_max_link_rate (mhdp->dp.dpcd); + mhdp->dp.num_lanes =drm_dp_max_lane_count (mhdp->dp.dpcd); + +/* check the max link rate */ +if (mhdp->dp.rate >CDNS_DP_MAX_LINK_RATE ) + mhdp->dp.rate =CDNS_DP_MAX_LINK_RATE ; +Quoted 8 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 5 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +5
-0+ phy_cfg.dp.lanes = mhdp->dp.num_lanes; + phy_cfg.dp.link_rate = mhdp->dp.rate; + phy_cfg.dp.set_lanes = false; + phy_cfg.dp.set_rate = false; + phy_cfg.dp.set_voltages = false;If all of those are false, then you can skip setting .lanes and .link_rate.
I may have misunderstood the comments in the header file for these two flags. I'll check them again.
Quoted 88 lines
Quoted 8 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +7
-0+ + ret =phy_configure (mhdp->phy, &phy_cfg); +if (ret) { +dev_err (mhdp->dev,"%s: phy_configure() failed: %d\n" , + __func__, ret); +return ; + }drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +10
-0+ +/* Video off */ + ret =cdns_dp_set_video_status (mhdp,CONTROL_VIDEO_IDLE ); +if (ret) { +dev_err (mhdp->dev,"Failed to valid video %d\n" , ret); +return ; + } + +/* Line swapping */ + cdns_mhdp_reg_write(&mhdp->base, LANES_CONFIG, 0x00400000|
mhdp->lane_mapping);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 9 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +9
-0+ +/* Set DP host capability */ + ret =cdns_dp_set_host_cap (mhdp); +if (ret) { +dev_err (mhdp->dev,"Failed to set host cap %d\n" , ret); +return ; + } + + ret = cdns_mhdp_reg_write(&mhdp->base,
DP_AUX_SWAP_INVERSION_CONTROL,Quoted 7 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +7
-0+ AUX_HOST_INVERT); +if (ret) { +dev_err (mhdp->dev,"Failed to set host invert %d\n" , ret); +return ; + } + + ret =cdns_dp_config_video (mhdp, mode);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +10
-0+if (ret) +dev_err (mhdp->dev,"Failed to config video %d\n" , ret); +} + +static bool +cdns_dp_needs_link_retrain (struct cdns_mhdp8501_device *mhdp) +{ +u8 link_status[DP_LINK_STATUS_SIZE ]; + + if (drm_dp_dpcd_read_phy_link_status(&mhdp->dp.aux,
DP_PHY_DPRX,Quoted 13 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +13
-0+ link_status) < 0) +return false; + +/* Retrain if link not ok */ +return !drm_dp_channel_eq_ok (link_status, mhdp->dp.num_lanes); +} + +void cdns_dp_check_link_state (struct cdns_mhdp8501_device *mhdp) +{ +struct drm_connector *connector = mhdp->curr_conn; +const struct drm_edid *drm_edid; +struct drm_connector_state *conn_state; +struct drm_crtc_state *crtc_state;drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +10
-0+struct drm_crtc *crtc; + +if (!connector) +return ; + +/* +* EDID data needs updating after each cable plugin +* due to potential display monitor changes +*/ + drm_edid = drm_edid_read_custom(connector,
cdns_dp_get_edid_block, mhdp);Quoted 17 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +17
-0+drm_edid_connector_update (connector, drm_edid); + +if (!drm_edid) +return ; + +drm_edid_free (drm_edid); + + conn_state = connector->state; + crtc = conn_state->crtc; +if (!crtc) +return ; + + crtc_state = crtc->state; +if (!crtc_state->active) +return ; + +if (!cdns_dp_needs_link_retrain (mhdp))Quoted 8 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 5 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +5
-0+return ; + +/* DP link retrain */ +if (cdns_dp_train_link (mhdp)) +dev_err (mhdp->dev,"Failed link train\n" );Won't this cause link traning to happen on the first monitor plug event? Is it okay to do even with the phy being powered off?
These two cases have already been excluded in the previous codes.
Quoted 11 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +9
-0+} + +static int cdns_dp_bridge_attach (struct drm_bridge *bridge, +enum drm_bridge_attach_flags flags) +{ +struct cdns_mhdp8501_device *mhdp = bridge->driver_private; + +if (!(flags &DRM_BRIDGE_ATTACH_NO_CONNECTOR )) { + dev_err(mhdp->dev, "do not support creating adrm_connector\n");
Quoted 9 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 6 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +6
-0+return -EINVAL ; + } + + mhdp->dp.aux.drm_dev = bridge->dev; + +return drm_dp_aux_register (&mhdp->dp.aux);Why is it a part of the
_attachcallback? If there is anything on the DP AUX bus, it should be already registered by this point.
Quoted 2 lines
Here, I've referenced other DP drivers and called
drm_dp_aux_registerin the attach function. No any special requirements for AUX in my DP driver.
Oh, because it's DP, without eDP functionality. Okay.
Quoted 66 lines
Quoted 66 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 11 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +9
-0+} + +static const struct drm_edid +*cdns_dp_bridge_edid_read (struct drm_bridge *bridge, +struct drm_connector *connector) +{ +struct cdns_mhdp8501_device *mhdp = bridge->driver_private; + + return drm_edid_read_custom(connector, cdns_dp_get_edid_block,mhdp);
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 9 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +9
-0+} + +/* Currently supported format */ +static const u32 mhdp8501_input_fmts[] = { +MEDIA_BUS_FMT_RGB888_1X24 , +MEDIA_BUS_FMT_RGB101010_1X30 , +}; + +static u32 *cdns_dp_bridge_atomic_get_input_bus_fmts(struct
drm_bridge*bridge,Quoted 1 line
+ struct
drm_bridge_state*bridge_state,Quoted 1 line
+ struct
drm_crtc_state*crtc_state,Quoted 1 line
+ struct
drm_connector_state*conn_state,Quoted 1 line
+ u32
output_fmt,Quoted 1 line
+ unsigned int
*num_input_fmts)drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 13 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +13
-0+{ +u32 *input_fmts; + + *num_input_fmts =0 ; + + input_fmts =kcalloc (ARRAY_SIZE (mhdp8501_input_fmts), +sizeof (*input_fmts), +GFP_KERNEL ); +if (!input_fmts) +return NULL ; + + *num_input_fmts =ARRAY_SIZE (mhdp8501_input_fmts); + memcpy(input_fmts, mhdp8501_input_fmts,
sizeof(mhdp8501_input_fmts));drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 6 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +6
-0+ +return input_fmts; +} + +static int cdns_dp_bridge_atomic_check (struct drm_bridge *bridge, + struct drm_bridge_state
*bridge_state,Quoted 1 line
+ struct
drm_crtc_state
*crtc_state,Quoted 1 line
+ struct
drm_connector_state
*conn_state)drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 5 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +5
-0+{ +struct cdns_mhdp8501_device *mhdp = bridge->driver_private; +struct video_info *video = &mhdp->video_info; + + if (bridge_state->input_bus_cfg.format ==
MEDIA_BUS_FMT_RGB888_1X24) {Quoted 3 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +3
-0+ video->bpc =8 ; + video->color_fmt =DRM_COLOR_FORMAT_RGB444 ; + } else if (bridge_state->input_bus_cfg.format ==
Quoted 7 lines
Quoted 5 lines
MEDIA_BUS_FMT_RGB101010_1X30) {drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 2 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +2
-0+ video->bpc =10 ; + video->color_fmt =DRM_COLOR_FORMAT_RGB444 ;Which driver is going to select bus config for you?
Oh, actually there isn't. The driver uses the first format in
mhdp8501_input_fmts.
So, is this a dead code to be dropped?
Quoted 208 lines
Quoted 208 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 11 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +9
-0+ }else { +return -EINVAL ; + } + +return 0 ; +} + +static void cdns_dp_bridge_atomic_disable (struct drm_bridge *bridge, + struct drm_bridge_state
*old_state)drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 11 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +11
-0+{ +struct cdns_mhdp8501_device *mhdp = bridge->driver_private; + +cdns_dp_set_video_status (mhdp,CONTROL_VIDEO_IDLE ); + mhdp->curr_conn =NULL ; + +phy_power_off (mhdp->phy); +} + +static void cdns_dp_bridge_atomic_enable (struct drm_bridge *bridge, + struct drm_bridge_state
*old_state)drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +10
-0+{ +struct cdns_mhdp8501_device *mhdp = bridge->driver_private; +struct drm_atomic_state *state = old_state->base.state; +struct drm_connector *connector; +struct drm_crtc_state *crtc_state; +struct drm_connector_state *conn_state; +int ret; + + connector = drm_atomic_get_new_connector_for_encoder(state, +
bridge->encoder);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 6 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +6
-0+if (WARN_ON (!connector)) +return ; + + mhdp->curr_conn = connector; + + conn_state = drm_atomic_get_new_connector_state(state,connector);
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 4 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +4
-0+if (WARN_ON (!conn_state)) +return ; + + crtc_state = drm_atomic_get_new_crtc_state(state,
conn_state->crtc);Quoted 20 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +20
-0+if (WARN_ON (!crtc_state)) +return ; + +cdns_dp_mode_set (mhdp, &crtc_state->adjusted_mode); + +/* Power up PHY before link training */ +phy_power_on (mhdp->phy); + +/* Link training */ + ret =cdns_dp_train_link (mhdp); +if (ret) { +dev_err (mhdp->dev,"Failed link train %d\n" , ret); +return ; + } + + ret =cdns_dp_set_video_status (mhdp,CONTROL_VIDEO_VALID ); +if (ret) { +dev_err (mhdp->dev,"Failed to valid video %d\n" , ret); +return ; + }drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +10
-0+} + +const struct drm_bridge_funcs cdns_dp_bridge_funcs = { + .attach = cdns_dp_bridge_attach, + .detect = cdns_mhdp8501_detect, + .edid_read = cdns_dp_bridge_edid_read, + .mode_valid = cdns_mhdp8501_mode_valid, + .atomic_enable = cdns_dp_bridge_atomic_enable, + .atomic_disable = cdns_dp_bridge_atomic_disable, + .atomic_get_input_bus_fmts =
cdns_dp_bridge_atomic_get_input_bus_fmts,drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 2 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +2
-0+ .atomic_check = cdns_dp_bridge_atomic_check, + .atomic_duplicate_state =
drm_atomic_helper_bridge_duplicate_state,Review
Quoted 4 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +3
-0+ .atomic_destroy_state = drm_atomic_helper_bridge_destroy_state, + .atomic_reset = drm_atomic_helper_bridge_reset, +};(quoted diff) +0
-0
b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.cQuoted 24 lines
new file mode 100644
index 0000000000000..9556d0929e21ddrivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +19
-0@@ -0,0 +1,745 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Cadence MHDP8501 HDMI bridge driver +* +* Copyright (C) 2019-2024 NXP Semiconductor, Inc. +* +*/ +#include <drm/display/drm_hdmi_helper.h> +#include <drm/display/drm_hdmi_state_helper.h> +#include <drm/display/drm_scdc_helper.h> +#include <drm/drm_atomic_helper.h> +#include <drm/drm_edid.h> +#include <drm/drm_print.h> +#include <linux/phy/phy.h> +#include <linux/phy/phy-hdmi.h> + +#include "cdns-mhdp8501-core.h" + +/** drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c line 29
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +10
-0+* cdns_hdmi_config_infoframe() - fill the HDMI infoframe +* @mhdp: phandle to mhdp device. +* @entry_id: The packet memory address in which the data is written. +* @len: length of infoframe. +* @buf: point to InfoFrame Packet. +* @type: Packet Type of InfoFrame in HDMI Specification. +* +*/ + +static void cdns_hdmi_clear_infoframe(struct cdns_mhdp8501_device*mhdp,
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 9 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +9
-0+ u8 entry_id, u8 type) +{ +u32 val; + +/* invalidate entry */ + val =F_ACTIVE_IDLE_TYPE (1 ) |F_PKT_ALLOC_ADDRESS (entry_id) | +F_PACKET_TYPE (type); +writel (val, mhdp->regs +SOURCE_PIF_PKT_ALLOC_REG ); + writel(F_PKT_ALLOC_WR_EN(1), mhdp->regs +
SOURCE_PIF_PKT_ALLOC_WR_EN);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c line 41
Quoted 3 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +3
-0+} + +static void cdns_hdmi_config_infoframe(struct cdns_mhdp8501_device*mhdp,
Quoted 12 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +12
-0+ u8 entry_id, u8 len, + const u8 *buf, u8 type) +{ + u8 packet[32], packet_len = 32; +u32 packet32, len32; +u32 val, i; + +/* +* only support 32 bytes now +* packet[0] = 0 +* packet[1-3] = HB[0-2] InfoFrame Packet Header +* packet[4-31 = PB[0-27] InfoFrame Packet Contents drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +10
-0+*/ +if (len >= (packet_len -1 )) +return ; + packet[0 ] =0 ; +memcpy (packet +1 , buf, len); + +cdns_hdmi_clear_infoframe (mhdp, entry_id, type); + +/* flush fifo 1 */ + writel(F_FIFO1_FLUSH(1), mhdp->regs +
SOURCE_PIF_FIFO1_FLUSH);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 6 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +6
-0+ +/* write packet into memory */ + len32 = packet_len /4 ; +for (i =0 ; i < len32; i++) { + packet32 =get_unaligned_le32 (packet +4 * i); + writel(F_DATA_WR(packet32), mhdp->regs +
SOURCE_PIF_DATA_WR);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 4 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +4
-0+ } + +/* write entry id */ + writel(F_WR_ADDR(entry_id), mhdp->regs +
SOURCE_PIF_WR_ADDR);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +10
-0+ +/* write request */ +writel (F_HOST_WR (1 ), mhdp->regs +SOURCE_PIF_WR_REQ ); + +/* update entry */ + val =F_ACTIVE_IDLE_TYPE (1 ) |F_TYPE_VALID (1 ) | +F_PACKET_TYPE (type) |F_PKT_ALLOC_ADDRESS (entry_id); +writel (val, mhdp->regs +SOURCE_PIF_PKT_ALLOC_REG ); + + writel(F_PKT_ALLOC_WR_EN(1), mhdp->regs +
SOURCE_PIF_PKT_ALLOC_WR_EN);Quoted 4 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +4
-0+} + +static int cdns_hdmi_get_edid_block (void *data,u8 *edid, +u32 block,size_t length)drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +10
-0+{ +struct cdns_mhdp8501_device *mhdp = data; +u8 msg[2 ], reg[5 ], i; +int ret; + +for (i =0 ; i <4 ; i++) { + msg[0 ] = block /2 ; + msg[1 ] = block %2 ; + + ret =cdns_mhdp_mailbox_send_recv_multi(&mhdp->base,
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c line 98
Quoted 1 line
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +1
-0+
MB_MODULE_ID_HDMI_TX,drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c line 99
Quoted 1 line
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +1
-0+
HDMI_TX_EDID,drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c line 100
Quoted 1 line
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +1
-0+sizeof(msg), msg,
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c line 101
Quoted 1 line
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +1
-0+
HDMI_TX_EDID,drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c line 102
Quoted 1 line
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +1
-0+sizeof(reg), reg,
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c line 103
Quoted 1 line
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +1
-0+ length,edid);
Quoted 8 lines
Quoted 5 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c line 106
Quoted 3 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +3
-0+ +if (ret) +continue ;Ignoring the error?
Yes. EDID read operations can be interrupted by various factors, but as long as the EDID is eventually read successfully, there's no issue.
Okay... I'd still suggest a drm_dbg_dp() here.
Signature · 2 lines
With best wishes Dmitry
Re: [PATCH v20 5/9] drm: bridge: Cadence: Add MHDP8501 DP/HDMI driver
Quoted 324 lines · Sandor Yu
Quoted 40 lines
Quoted 40 lines · Sandor Yu
Quoted 1 line
Add a new DRM DisplayPort and HDMI bridge driver for Candence
MHDP8501
Quoted 10 lines
used in i.MX8MQ SOC. MHDP8501 could support HDMI or DisplayPort standards according embedded Firmware running in the uCPU.
For iMX8MQ SOC, the DisplayPort/HDMI FW was loaded and activated by SOC's ROM code. Bootload binary included respective specific firmware is required.
Driver will check display connector type and then load the corresponding driver.
Quoted 6 lines
Signed-off-by Sandor Yu <[email protected]>---
v19->v20:
- Dump mhdp FW version by debugfs
- Combine HDMI and DP cable detect functions into one function
- Combine HDMI and DP cablebridge_mode_valid()functions into onefunction
Quoted 2 lines
- Rename
cdns_hdmi_reset_link()tocdns_hdmi_handle_hotplug()
- Add comments for EDID incdns_hdmi_handle_hotplug()and
cdns_dp_check_link_state()Quoted 4 lines
- Add
atomic_get_input_bus_fmts()andbridge_atomic_check()for DP driver
- Remove bpc andcolor_fmtinit inatomic_enable()function.
- More detail comments for DDC adapter only support
SCDC_I2C_SLAVE_ADDRESSQuoted 11 lines
read and write in HDMI driver.
v18->v19:
- Get endpoint for data-lanes as it had move to endpoint of port@1
- Update clock management asdevm_clk_get_enabled()introduced.
- Fixclear_infoframe()function is not work issue.
- Manage PHY power state viaphy_power_on()andphy_power_off().
v17->v18:
- MHDP8501 HDMI and DP commands that need access mailbox areQuoted 7 lines
Quoted 7 lines
rewrited
Quoted 4 lines
with new API functions created in patch #1.
- replace lane-mapping with data-lanes, use the value from data-lanes to reorder HDMI and DP lane mapping.
- create I2C adapter for HDMI SCDC, removecdns_hdmi_scdc_write()function.
Quoted 1 line
- Rewrite
cdns_hdmi_sink_config()function, use HDMI SCDC helperfunction
Quoted 1 line
Quoted 1 line
Quoted 1 line
drm_scdc_set_high_tmds_clock_ratio()and
drm_scdc_set_scrambling()Quoted 102 lines
Quoted 102 lines
Quoted 9 lines
to config HDMI sink TMDS.
- Remove structvideo_infofrom HDMI driver.
- Removetmds_char_rate_valid()be called inbridge_mode_valid(), community had patch in reviewing to implement the function.
- Remove warning message print when get unknown HPD cable status.
- Add more detail comments for HDP plugin and plugout interrupt.
- usedev_dbgto repleaceDRM_INFOwhen cable HPD status changed.
- Remove t-b tag as above code change.Quoted 5 lines
drivers/gpu/drm/bridge/cadence/Kconfig | 16 + drivers/gpu/drm/bridge/cadence/Makefile | 2 + .../drm/bridge/cadence/cdns-mhdp8501-core.c | 379 +++++++++ .../drm/bridge/cadence/cdns-mhdp8501-core.h | 380 +++++++++ .../gpu/drm/bridge/cadence/cdns-mhdp8501-dp.c | 694++++++++++++++++
Quoted 1 line
.../drm/bridge/cadence/cdns-mhdp8501-hdmi.c | 745++++++++++++++++++
Quoted 1 line
6 files changed, 2216 insertions(+) create mode 100644
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.cQuoted 1 line
create mode 100644
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.hQuoted 1 line
create mode 100644
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-dp.cQuoted 1 line
create mode 100644
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.cReview
Quoted 2 lines
(quoted diff) +0
-0b/drivers/gpu/drm/bridge/cadence/Kconfig
Review
Quoted 24 lines
index
dbb06533ccab2..bd979f3e6df48100644drivers/gpu/drm/bridge/cadence/Kconfig +16
-0@@ -48,3 +48,19 @@ config DRM_CDNS_MHDP8546_J721E initializes the J721E Display Port and sets up the clock and data muxes. endif + +config DRM_CDNS_MHDP8501 + tristate "Cadence MHDP8501 DP/HDMI bridge" + select DRM_KMS_HELPER + select DRM_PANEL_BRIDGE + select DRM_DISPLAY_DP_HELPER + select DRM_DISPLAY_HELPER + select DRM_CDNS_AUDIO + select CDNS_MHDP_HELPER + depends on OF + help + Support Cadence MHDP8501 DisplayPort/HDMI bridge. + Cadence MHDP8501 support one or more protocols, + including DisplayPort and HDMI. + To use the DP and HDMI drivers, their respective + specific firmware is required.(quoted diff) +0
-0b/drivers/gpu/drm/bridge/cadence/Makefile
drivers/gpu/drm/bridge/cadence/Makefile cdns-dsi-$(CONFIG_DRM_CDNS_DSI_J721E) +=
Quoted 4 lines
index
c95fd5b81d137..ea327287d1c14100644drivers/gpu/drm/bridge/cadence/Makefile +0
-0@@ -5,3 +5,5 @@ cdns-dsi-$(CONFIG_DRM_CDNS_DSI_J721E) +=cdns-dsi-j721e.o
Quoted 3 lines
drivers/gpu/drm/bridge/cadence/Makefile +0
-0obj-$(CONFIG_DRM_CDNS_MHDP8546) += cdns-mhdp8546.ocdns-mhdp8546-y := cdns-mhdp8546-core.o cdns-mhdp8546-hdcp.o
cdns-mhdp8546-$(CONFIG_DRM_CDNS_MHDP8546_J721E) +=cdns-mhdp8546-j721e.o
drivers/gpu/drm/bridge/cadence/Makefile
Quoted 2 lines
drivers/gpu/drm/bridge/cadence/Makefile +2
-0+obj-$(CONFIG_DRM_CDNS_MHDP8501) += cdns-mhdp8501.o +cdns-mhdp8501-y := cdns-mhdp8501-core.o cdns-mhdp8501-dp.ocdns-mhdp8501-hdmi.o
Review
Quoted 1 line
(quoted diff) +0
-0
b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.cQuoted 14 lines
new file mode 100644
index 0000000000000..98116ef012fa3drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +9
-0@@ -0,0 +1,379 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Cadence Display Port Interface (DP) driver +* +* Copyright (C) 2023-2024 NXP Semiconductor, Inc. +* +*/ +#include <drm/drm_of.h> +#include <drm/drm_print.h> drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 19
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +10
-0+#include <linux/clk.h> +#include <linux/irq.h> +#include <linux/mutex.h> +#include <linux/of_device.h> +#include <linux/platform_device.h> #include <linux/phy/phy.h> + +#include "cdns-mhdp8501-core.h" + +static ssize_t firmware_version_show(struct device *dev, + struct device_attribute *attr,char *buf);
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 20
Quoted 1 line
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +1
-0+static struct device_attribute firmware_version =
__ATTR_RO(firmware_version);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 7 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +7
-0+ +ssize_t firmware_version_show (struct device *dev, +struct device_attribute *attr,char +*buf) { +struct cdns_mhdp8501_device *mhdp =dev_get_drvdata (dev); + + u32 version = readl(mhdp->base.regs + VER_L) |
readl(mhdp->base.regs + VER_H)<< 8;Quoted 2 lines
Quoted 2 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 29
Quoted 2 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +2
-0+u32 lib_version =readl (mhdp->base.regs +VER_LIB_L_ADDR ) | + readl(mhdp->base.regs +
VER_LIB_H_ADDR)Quoted 30 lines
Quoted 30 lines
<< 8;
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 32
Quoted 3 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +3
-0+ + return sprintf(buf, "FW version %d, Lib version %d\n", + version,
lib_version);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 3 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +3
-0+} + +static void cdns_mhdp8501_create_device_files(struct
cdns_mhdp8501_device*mhdp)drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 3 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +3
-0+{ +if (device_create_file (mhdp->dev, &firmware_version)) { + DRM_ERROR("Unable to create firmware_versionsysfs\n");
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 5 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +5
-0+device_remove_file (mhdp->dev, &firmware_version); + } +} + +static void cdns_mhdp8501_remove_device_files(struct
cdns_mhdp8501_device*mhdp)drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 4 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +4
-0+{ +device_remove_file (mhdp->dev, &firmware_version); } + +static int cdns_mhdp8501_read_hpd(struct cdns_mhdp8501_device*mhdp)
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 5 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +5
-0+{ +u8 status; +int ret; + + ret = cdns_mhdp_mailbox_send_recv(&mhdp->base,
MB_MODULE_ID_GENERAL,Quoted 3 lines
Quoted 3 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 53
Quoted 1 line
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +1
-0+
GENERAL_GET_HPD_STATE,Quoted 1 line
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +1
-0+ 0, NULL,sizeof(status),
Quoted 10 lines
Quoted 10 lines
&status);
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 9 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +9
-0+if (ret) { +dev_err (mhdp->dev,"read hpd failed: %d\n" , ret); +return ret; + } + +return status; +} + +enum drm_connector_status cdns_mhdp8501_detect(struct
drm_bridgeQuoted 50 lines
Quoted 50 lines
*bridge)
Quoted 27 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +27
-0+{ +struct cdns_mhdp8501_device *mhdp = bridge->driver_private; + +u8 hpd =0xf ; + + hpd =cdns_mhdp8501_read_hpd (mhdp); +if (hpd ==1 ) +return connector_status_connected; +else if (hpd ==0 ) +return connector_status_disconnected; + +return connector_status_unknown; } + +enum drm_mode_status +cdns_mhdp8501_mode_valid (struct drm_bridge *bridge, +const struct drm_display_info *info, +const struct drm_display_mode *mode) { +/* We don't support double-clocked */ +if (mode->flags &DRM_MODE_FLAG_DBLCLK ) +return MODE_BAD ; + +/* MAX support pixel clock rate 594MHz */ +if (mode->clock >594000 ) +return MODE_CLOCK_HIGH ; + +if (mode->hdisplay >3840 ) +return MODE_BAD_HVALUE ;drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +10
-0+ +if (mode->vdisplay >2160 ) +return MODE_BAD_VVALUE ; + +return MODE_OK ; +} + +static void hotplug_work_func (struct work_struct *work) { +struct cdns_mhdp8501_device *mhdp =container_of (work, + struct
cdns_mhdp8501_device,drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 101
Quoted 1 line
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +1
-0+hotplug_work.work);
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 102
Quoted 1 line
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +1
-0+ enum drm_connector_status status =
cdns_mhdp8501_detect(&mhdp->bridge);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 6 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +6
-0+ +drm_bridge_hpd_notify (&mhdp->bridge, status); + +/* +* iMX8MQ has two HPD interrupts: one for plugout and one +for plugin.
Quoted 3 lines
Quoted 3 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 109
Quoted 1 line
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +1
-0+* These interrupts cannot be masked and cleaned, so we must enable one
Quoted 1 line
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +1
-0+* and disable the other to avoid continuous interrupt generation.
Quoted 20 lines
Quoted 20 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 8 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +8
-0+*/ +if (status == connector_status_connected) { +/* Cable connected */ +dev_dbg (mhdp->dev,"HDMI/DP Cable Plug In\n" ); +enable_irq (mhdp->irq[IRQ_OUT ]); + +/* Reset HDMI/DP link with sink */ + if (mhdp->connector_type ==
DRM_MODE_CONNECTOR_HDMIA)Quoted 11 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +11
-0+cdns_hdmi_handle_hotplug (mhdp); + else +cdns_dp_check_link_state (mhdp ); + + }else if (status == connector_status_disconnected) { +/* Cable Disconnected */ +dev_dbg (mhdp->dev,"HDMI/DP Cable Plug Out\n" ); +enable_irq (mhdp->irq[IRQ_IN ]); + } +} +Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 141
Quoted 8 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +8
-0+static irqreturn_t cdns_mhdp8501_irq_thread (int irq,void *data) +{ +struct cdns_mhdp8501_device *mhdp = data; + +disable_irq_nosync (irq); + + mod_delayed_work(system_wq, &mhdp->hotplug_work, +
msecs_to_jiffies(HOTPLUG_DEBOUNCE_MS));Quoted 29 lines
Quoted 29 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 6 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +6
-0+ +return IRQ_HANDLED ; +} + +#define DATA_LANES_COUNT 4 +static int cdns_mhdp8501_dt_parse(struct cdns_mhdp8501_device*mhdp,
Quoted 8 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +8
-0+ struct platform_device *pdev) { +struct device *dev = &pdev->dev; +struct device_node *np = dev->of_node; +struct device_node *remote, *endpoint; +u32 data_lanes[DATA_LANES_COUNT ]; +u32 lane_value; +int ret, i; +drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +10
-0+ remote =of_graph_get_remote_node (np,1 ,0 ); +if (!remote) { +dev_err (dev,"fail to get remote node\n" ); +of_node_put (remote); +return -EINVAL ; + } + +/* get connector type */ +if (of_device_is_compatible (remote,"hdmi-connector" )) { + mhdp->connector_type =
DRM_MODE_CONNECTOR_HDMIA;Quoted 3 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +3
-0+ + }else if (of_device_is_compatible (remote,"dp-connector" )) { + mhdp->connector_type =Quoted 6 lines
Quoted 4 lines
DRM_MODE_CONNECTOR_DisplayPort;Interesting hack. What if somebody wraps DP signals with the USB-C controller in order to provide DP over USB-C?
There is no such requirement now, and the supported types of
display-connectors do not include Type-C DP connectors.
Quoted 1 line
If type-C DP connectors is added in the future, I think it would be acceptable
to modify the code here.
Quoted 8 lines
It would be acceptable, but it most likely will also require chaning the DT bindings as there is no longer an easy way to identify the next bridge. Also you might not have that now, but it is pretty common to have DP retimers on the board in order to improve the sinal integrity.
Thus I think it is not a proper solution to check the next node's compatible. I think we need a way to specify HDMI vs DP firmware / mode in the device tree.
Since there already have the connector type for HDMI or DP.
adding another parameter to the DT bindings to specify the PHY type seems redundant.
If anyone add DP retimer to the board, the similar code as followed may add to the driver.
last_remote = remote;
while (of_graph_get_remote_node(last_remote, 1, 0))
last_remote = of_graph_get_remote_node(last_remote, 1, 0);Before new requirements arise, I hope to keep the current implementation.
Quoted 536 lines
Quoted 11 lines
Quoted 7 lines
Unfortunately I don't have a good solution here. There might be other format converters after your bridge, so you even can't look at the last bridge of the chain. You might want to examine the phy-mode property and use it to specify whether the PHY should work in the HDMI or in the DP mode.
MHDP supports either HDMI or DP based on its firmware.
The PHY doesn't provide a function to indicate which firmware is currently running, and the controller driver doesn't have a mechanism todetermine whether it's DP or HDMI.
Quoted 1 line
The users should select the corresponding firmware based on the connector
type when their get the board.
Quoted 2 lines
For the driver, there must be an external input to determine whether it's
currently running in HDMI or DP mode.
Quoted 1 line
In earlier versions, I used different compatible strings to distinguish between
DP and HDMI.
Quoted 2 lines
However, based on comments from other reviewers, I changed the approach to checking the connector type, which is clearly a more suitable
method.
Quoted 29 lines
Quoted 3 lines
Also, where do get the next bridge and attach it to the bridge chain?
next_bridgeget and attach is missed in the driver, I will add it.Quoted 14 lines
Quoted 14 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +13
-0+ + }else { +dev_err (dev,"Unknown connector type\n" ); +of_node_put (remote); +return -EINVAL ; + } + +of_node_put (remote); + + endpoint =of_graph_get_endpoint_by_regs (np,1 ,-1 ); + +/* Get the data lanes ordering */ + ret =of_property_count_u32_elems (endpoint,"data-lanes" );Quoted 8 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 187
Quoted 6 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +6
-0+if (ret <0 ) +return -EINVAL ; +if (ret !=DATA_LANES_COUNT ) { +dev_err (dev,"expected 4 data lanes\n" ); +return -EINVAL ; + }Isn't it
drm_of_get_data_lanes_count_ep()?Quoted 13 lines
drm_of_get_data_lanes_countwill be used here in the next version.Quoted 11 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 4 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +3
-0+ + ret = of_property_read_u32_array(endpoint, "data-lanes", + data_lanes,
DATA_LANES_COUNT);Quoted 6 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +6
-0+if (ret) +return -EINVAL ; + + mhdp->lane_mapping =0 ; + for (i = 0; i < DATA_LANES_COUNT; i++) { + lane_value = (data_lanes[i] >= 0 && data_lanes[i] <=3) ?
Quoted 16 lines
Quoted 16 lines
data_lanes[i] : 0;
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 7 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +7
-0+ mhdp->lane_mapping |= lane_value << (i *2 ); + } + +return true; +} + +static int cdns_mhdp8501_add_bridge(struct cdns_mhdp8501_device*mhdp)
Quoted 7 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +7
-0+{ + mhdp->bridge.type = mhdp->connector_type; + mhdp->bridge.driver_private = mhdp; + mhdp->bridge.of_node = mhdp->dev->of_node; + mhdp->bridge.vendor ="NXP" ; + mhdp->bridge.product ="i.MX8" ; + mhdp->bridge.ops = DRM_BRIDGE_OP_DETECT |Quoted 4 lines
Quoted 4 lines
DRM_BRIDGE_OP_EDID|Quoted 3 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +3
-0+DRM_BRIDGE_OP_HPD ; + + if (mhdp->connector_type ==
DRM_MODE_CONNECTOR_HDMIA) {Quoted 9 lines
Quoted 6 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 216
Quoted 3 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +3
-0+ mhdp->bridge.funcs = &cdns_hdmi_bridge_funcs; + mhdp->bridge.ops |=DRM_BRIDGE_OP_HDMI ; + mhdp->bridge.ddc =cdns_hdmi_i2c_adapter (mhdp);I'd expect that bridge.ddc provides DDC service. Is it required to control the SCDC from userspace?
I may not have fully understood your question.
The DDC here is used for the SCDC API functions likedrm_scdc_set_XXXinHDMI driver.
Quoted 1 line
So far, I haven't encountered any cases where the user needs to control
SCDC.
Okay.
Quoted 7 lines
Quoted 7 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 213
Quoted 3 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +1
-0+ } else if (mhdp->connector_type ==
DRM_MODE_CONNECTOR_DisplayPort) {Quoted 3 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +3
-0+ mhdp->bridge.funcs = &cdns_dp_bridge_funcs; + }else { + dev_err(mhdp->dev, "Unsupported connectortype!\n");
Quoted 15 lines
Quoted 15 lines
Quoted 15 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +15
-0+return -EINVAL ; + } + +drm_bridge_add (&mhdp->bridge); + +return 0 ; +} + +static int cdns_mhdp8501_probe (struct platform_device *pdev) { +struct device *dev = &pdev->dev; +struct cdns_mhdp8501_device *mhdp; +struct resource *res; +enum phy_mode phy_mode; +u32 reg; +int ret;Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 8 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +8
-0+ + mhdp =devm_kzalloc (dev,sizeof (*mhdp),GFP_KERNEL ); +if (!mhdp) +return -ENOMEM ; + + mhdp->dev = dev; + + INIT_DELAYED_WORK(&mhdp->hotplug_work,
hotplug_work_func);Quoted 6 lines
Quoted 6 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 6 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +6
-0+ + res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); +if (!res) +return -ENODEV ; + + mhdp->regs = devm_ioremap(dev, res->start,
resource_size(res));Quoted 10 lines
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +10
-0+if (IS_ERR (mhdp->regs)) +return PTR_ERR (mhdp->regs); + +cdns_mhdp8501_create_device_files (mhdp); + + ret =cdns_mhdp8501_dt_parse (mhdp, pdev); +if (ret <0 ) +return -EINVAL ; + + mhdp->phy = devm_of_phy_get_by_index(dev,
pdev->dev.of_node,Quoted 20 lines
Quoted 20 lines
0);
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 258
Quoted 3 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +3
-0+if (IS_ERR (mhdp->phy)) + return dev_err_probe(dev, PTR_ERR(mhdp->phy), "no + PHYconfigured\n");
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 4 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +4
-0+ + mhdp->irq[IRQ_IN ] =platform_get_irq_byname (pdev,"plug_in" ); +if (mhdp->irq[IRQ_IN ] <0 ) + return dev_err_probe(dev, mhdp->irq[IRQ_IN], "No
plug_inirq number\n");drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 264
Quoted 2 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +2
-0+ + mhdp->irq[IRQ_OUT] = platform_get_irq_byname(pdev,"
plug_out");drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 266
Quoted 2 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +2
-0+if (mhdp->irq[IRQ_OUT ] <0 ) + return dev_err_probe(dev, mhdp->irq[IRQ_OUT], "No
plug_outirq number\n");Quoted 4 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +4
-0+ +irq_set_status_flags (mhdp->irq[IRQ_IN ],IRQ_NOAUTOEN ); + ret = devm_request_threaded_irq(dev, mhdp->irq[IRQ_IN], + NULL,Quoted 5 lines
Quoted 5 lines
cdns_mhdp8501_irq_thread,drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 271
Quoted 1 line
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +1
-0+ IRQF_ONESHOT,
dev_name(dev), mhdp);Quoted 2 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +2
-0+if (ret <0 ) { + dev_err(dev, "can't claim irq %d\n",mhdp->irq[IRQ_IN]);
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 6 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +6
-0+return -EINVAL ; + } + +irq_set_status_flags (mhdp->irq[IRQ_OUT ],IRQ_NOAUTOEN ); + ret = devm_request_threaded_irq(dev, mhdp->irq[IRQ_OUT], + NULL,
cdns_mhdp8501_irq_thread,Quoted 1 line
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +1
-0+ IRQF_ONESHOT,Quoted 8 lines
Quoted 8 lines
dev_name(dev), mhdp);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 282
Quoted 2 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +2
-0+if (ret <0 ) { + dev_err(dev, "can't claim irq %d\n",mhdp->irq[IRQ_OUT]);
Quoted 4 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +4
-0+return -EINVAL ; + } + +/* cdns_mhdp8501_dt_parse() ensures connector_type is valid */
Quoted 80 lines
Quoted 69 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 287
Quoted 1 line
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +1
-0+ if (mhdp->connector_type ==
DRM_MODE_CONNECTOR_DisplayPort)drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 289
Quoted 2 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +2
-0+ phy_mode =PHY_MODE_DP ; + else if (mhdp->connector_type ==
DRM_MODE_CONNECTOR_HDMIA)drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 9 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +9
-0+ phy_mode =PHY_MODE_HDMI ; + +dev_set_drvdata (dev, mhdp); + +/* init base struct for access mhdp mailbox */ + mhdp->base.dev = mhdp->dev; + mhdp->base.regs = mhdp->regs; + + if (mhdp->connector_type ==
DRM_MODE_CONNECTOR_DisplayPort) {Quoted 7 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +7
-0+drm_dp_aux_init (&mhdp->dp.aux); + mhdp->dp.aux.name ="mhdp8501_dp_aux" ; + mhdp->dp.aux.dev = dev; + mhdp->dp.aux.transfer = cdns_dp_aux_transfer; + } + +/* Enable APB clock */ drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +10
-0+ mhdp->apb_clk =devm_clk_get_enabled (dev,NULL ); +if (IS_ERR (mhdp->apb_clk)) +return dev_err_probe (dev,PTR_ERR (mhdp->apb_clk), +"couldn't get apb clk\n" ); +/* +* Wait for the KEEP_ALIVE "message" on the first 8 bits. +* Updated each sched "tick" (~2ms) +*/ + ret = readl_poll_timeout(mhdp->regs + KEEP_ALIVE, reg, + reg & CDNS_KEEP_ALIVE_MASK,500,
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 4 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +4
-0+ CDNS_KEEP_ALIVE_TIMEOUT); + if (ret) { + dev_err(dev, "device didn't give any life sign: reg + %d\n",reg);
Quoted 15 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +15
-0+return ret; + } + + ret =phy_init (mhdp->phy); +if (ret) { +dev_err (dev,"Failed to initialize PHY: %d\n" , ret); +return ret; + } + + ret =phy_set_mode (mhdp->phy, phy_mode); +if (ret) { +dev_err (dev,"Failed to configure PHY: %d\n" , ret); +return ret; + } +drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +10
-0+/* Enable cable hotplug detect */ +if (cdns_mhdp8501_read_hpd (mhdp)) +enable_irq (mhdp->irq[IRQ_OUT ]); +else +enable_irq (mhdp->irq[IRQ_IN ]); + +return cdns_mhdp8501_add_bridge (mhdp); } + +static void cdns_mhdp8501_remove (struct platform_device *pdev) { + struct cdns_mhdp8501_device *mhdp =
platform_get_drvdata(pdev);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 4 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +4
-0+ +cdns_mhdp8501_remove_device_files (mhdp); + + if (mhdp->connector_type ==
DRM_MODE_CONNECTOR_DisplayPort)Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 361
Quoted 7 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +7
-0+cdns_dp_aux_destroy (mhdp); + +drm_bridge_remove (&mhdp->bridge); } + +static const struct of_device_id cdns_mhdp8501_dt_ids[] = { + { .compatible ="fsl,imx8mq-mhdp8501" , + },Strange line wrapping, I'd say. Either it should all be on the same line, or take three lines.
Quoted 25 lines
I will fix it.
Quoted 23 lines
Quoted 23 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +20
-0+ { }, +}; +MODULE_DEVICE_TABLE (of, cdns_mhdp8501_dt_ids); + +static struct platform_driver cdns_mhdp8501_driver = { + .probe = cdns_mhdp8501_probe, + .remove = cdns_mhdp8501_remove, + .driver = { + .name ="cdns-mhdp8501" , + .of_match_table = cdns_mhdp8501_dt_ids, + }, +}; + +module_platform_driver (cdns_mhdp8501_driver); + +MODULE_AUTHOR ("Sandor Yu <[email protected]>" ); +MODULE_DESCRIPTION ("Cadence MHDP8501 bridge driver" ); +MODULE_LICENSE ("GPL" ); +static void cdns_dp_mode_set (struct cdns_mhdp8501_device *mhdp, +const struct drm_display_mode *mode){
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 7 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +7
-0+union phy_configure_opts phy_cfg; +int ret; + +cdns_dp_pixel_clk_reset (mhdp); + +/* Get DP Caps */ + ret = drm_dp_dpcd_read(&mhdp->dp.aux, DP_DPCD_REV,
mhdp->dp.dpcd,Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 8 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +8
-0+ DP_RECEIVER_CAP_SIZE); +if (ret <0 ) { +dev_err (mhdp->dev,"Failed to get caps %d\n" , ret); +return ; + } + + mhdp->dp.rate =drm_dp_max_link_rate (mhdp->dp.dpcd); + mhdp->dp.num_lanes =
drm_dp_max_lane_count(mhdp->dp.dpcd);Quoted 14 lines
Quoted 5 lines
Quoted 5 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +5
-0+ +/* check the max link rate */ +if (mhdp->dp.rate >CDNS_DP_MAX_LINK_RATE ) + mhdp->dp.rate =CDNS_DP_MAX_LINK_RATE ; +Quoted 8 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 5 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +5
-0+ phy_cfg.dp.lanes = mhdp->dp.num_lanes; + phy_cfg.dp.link_rate = mhdp->dp.rate; + phy_cfg.dp.set_lanes = false; + phy_cfg.dp.set_rate = false; + phy_cfg.dp.set_voltages = false;If all of those are false, then you can skip setting .lanes and .link_rate.
Quoted 1 line
I may have misunderstood the comments in the header file for these two
flags.
Quoted 7 lines
I'll check them again.
Quoted 5 lines
Quoted 5 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +4
-0+ + ret =phy_configure (mhdp->phy, &phy_cfg); +if (ret) { + dev_err(mhdp->dev, "%s: phy_configure()failed: %d\n",
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +5
-0+ __func__, ret); +return ; + } + +/* Video off */ Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 8 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +8
-0+ ret =cdns_dp_set_video_status (mhdp,CONTROL_VIDEO_IDLE ); +if (ret) { +dev_err (mhdp->dev,"Failed to valid video %d\n" , ret); +return ; + } + +/* Line swapping */ + cdns_mhdp_reg_write(&mhdp->base, LANES_CONFIG,
0x00400000Quoted 6 lines
Quoted 6 lines
|
mhdp->lane_mapping);Quoted 5 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +5
-0+ +/* Set DP host capability */ + ret =cdns_dp_set_host_cap (mhdp); +if (ret) { + dev_err(mhdp->dev, "Failed to set host cap %d\n",ret);
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 4 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +4
-0+return ; + } + + ret = cdns_mhdp_reg_write(&mhdp->base,
DP_AUX_SWAP_INVERSION_CONTROL,Quoted 3 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +3
-0+ AUX_HOST_INVERT); +if (ret) { + dev_err(mhdp->dev, "Failed to set host invert %d\n",ret);
Quoted 64 lines
Quoted 55 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 13 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +13
-0+return ; + } + + ret =cdns_dp_config_video (mhdp, mode); +if (ret) +dev_err (mhdp->dev,"Failed to config video %d\n" , +ret); } + +static bool +cdns_dp_needs_link_retrain (struct cdns_mhdp8501_device *mhdp) { +u8 link_status[DP_LINK_STATUS_SIZE ]; + + if (drm_dp_dpcd_read_phy_link_status(&mhdp->dp.aux,
DP_PHY_DPRX,Quoted 13 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +13
-0+ link_status) < 0) +return false; + +/* Retrain if link not ok */ +return !drm_dp_channel_eq_ok (link_status, +mhdp->dp.num_lanes); } + +void cdns_dp_check_link_state (struct cdns_mhdp8501_device *mhdp) +{ +struct drm_connector *connector = mhdp->curr_conn; +const struct drm_edid *drm_edid; +struct drm_connector_state *conn_state; +struct drm_crtc_state *crtc_state;drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +10
-0+struct drm_crtc *crtc; + +if (!connector) +return ; + +/* +* EDID data needs updating after each cable plugin +* due to potential display monitor changes +*/ + drm_edid = drm_edid_read_custom(connector,
cdns_dp_get_edid_block, mhdp);Quoted 17 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +17
-0+drm_edid_connector_update (connector, drm_edid); + +if (!drm_edid) +return ; + +drm_edid_free (drm_edid); + + conn_state = connector->state; + crtc = conn_state->crtc; +if (!crtc) +return ; + + crtc_state = crtc->state; +if (!crtc_state->active) +return ; + +if (!cdns_dp_needs_link_retrain (mhdp))Quoted 8 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 5 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +5
-0+return ; + +/* DP link retrain */ +if (cdns_dp_train_link (mhdp)) +dev_err (mhdp->dev,"Failed link train\n" );Won't this cause link traning to happen on the first monitor plug event? Is it okay to do even with the phy being powered off?
Quoted 7 lines
These two cases have already been excluded in the previous codes.
Quoted 5 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 5 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +4
-0+} + +static int cdns_dp_bridge_attach (struct drm_bridge *bridge, + enum drm_bridge_attach_flagsflags)
Quoted 16 lines
Quoted 6 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 5 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +5
-0+{ +struct cdns_mhdp8501_device *mhdp = bridge->driver_private; + +if (!(flags &DRM_BRIDGE_ATTACH_NO_CONNECTOR )) { + dev_err(mhdp->dev, "do not support creating adrm_connector\n");
Quoted 9 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 6 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +6
-0+return -EINVAL ; + } + + mhdp->dp.aux.drm_dev = bridge->dev; + +return drm_dp_aux_register (&mhdp->dp.aux);Why is it a part of the
_attachcallback? If there is anything on the DP AUX bus, it should be already registered by this point.Quoted 1 line
Here, I've referenced other DP drivers and called
drm_dp_aux_registerinthe attach function.
Quoted 1 line
No any special requirements for AUX in my DP driver.
Oh, because it's DP, without eDP functionality. Okay.
Quoted 22 lines
Quoted 22 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 11 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +9
-0+} + +static const struct drm_edid +*cdns_dp_bridge_edid_read (struct drm_bridge *bridge, +struct drm_connector *connector) { +struct cdns_mhdp8501_device *mhdp = bridge->driver_private; + + return drm_edid_read_custom(connector, + cdns_dp_get_edid_block,mhdp);
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 8 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +8
-0+} + +/* Currently supported format */ +static const u32 mhdp8501_input_fmts[] = { +MEDIA_BUS_FMT_RGB888_1X24 , +MEDIA_BUS_FMT_RGB101010_1X30 , }; + +static u32 *cdns_dp_bridge_atomic_get_input_bus_fmts(struct
drm_bridge*bridge,Quoted 1 line
+ struct
Quoted 8 lines
Quoted 8 lines
drm_bridge_state*bridge_state,Quoted 1 line
+ struct
drm_crtc_state*crtc_state,Quoted 1 line
+ struct
drm_connector_state*conn_state,Quoted 1 line
+ u32
output_fmt,Quoted 1 line
+
unsigned int
Quoted 22 lines
Quoted 22 lines
*num_input_fmts)drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 13 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +13
-0+{ +u32 *input_fmts; + + *num_input_fmts =0 ; + + input_fmts =kcalloc (ARRAY_SIZE (mhdp8501_input_fmts), +sizeof (*input_fmts), +GFP_KERNEL ); +if (!input_fmts) +return NULL ; + + *num_input_fmts =ARRAY_SIZE (mhdp8501_input_fmts); + memcpy(input_fmts, mhdp8501_input_fmts,
sizeof(mhdp8501_input_fmts));drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 6 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +6
-0+ +return input_fmts; +} + +static int cdns_dp_bridge_atomic_check (struct drm_bridge *bridge, + struct drm_bridge_state
*bridge_state,Quoted 3 lines
Quoted 3 lines
Quoted 1 line
+ struct
drm_crtc_state
*crtc_state,Quoted 1 line
+ struct
drm_connector_stateQuoted 14 lines
Quoted 14 lines
*conn_state)drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 5 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +5
-0+{ +struct cdns_mhdp8501_device *mhdp = bridge->driver_private; +struct video_info *video = &mhdp->video_info; + + if (bridge_state->input_bus_cfg.format ==
MEDIA_BUS_FMT_RGB888_1X24) {drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 3 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +3
-0+ video->bpc =8 ; + video->color_fmt =DRM_COLOR_FORMAT_RGB444 ; + } else if (bridge_state->input_bus_cfg.format ==
MEDIA_BUS_FMT_RGB101010_1X30) {Quoted 2 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +2
-0+ video->bpc =10 ; + video->color_fmt =DRM_COLOR_FORMAT_RGB444 ;
Quoted 6 lines
Quoted 3 lines
Quoted 1 line
Which driver is going to select bus config for you?
Oh, actually there isn't. The driver uses the first format in
mhdp8501_input_fmts.So, is this a dead code to be dropped?
OK, I will drop it.
Quoted 216 lines
Quoted 12 lines
Quoted 12 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 12 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +9
-0+ }else { +return -EINVAL ; + } + +return 0 ; +} + +static void cdns_dp_bridge_atomic_disable(struct drm_bridge *bridge, + struct
drm_bridge_stateQuoted 12 lines
Quoted 12 lines
*old_state)drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 11 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +11
-0+{ +struct cdns_mhdp8501_device *mhdp = bridge->driver_private; + +cdns_dp_set_video_status (mhdp,CONTROL_VIDEO_IDLE ); + mhdp->curr_conn =NULL ; + +phy_power_off (mhdp->phy); +} + +static void cdns_dp_bridge_atomic_enable(struct drm_bridge *bridge, + struct
drm_bridge_stateQuoted 10 lines
Quoted 10 lines
*old_state)drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 9 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +9
-0+{ +struct cdns_mhdp8501_device *mhdp = bridge->driver_private; +struct drm_atomic_state *state = old_state->base.state; +struct drm_connector *connector; +struct drm_crtc_state *crtc_state; +struct drm_connector_state *conn_state; +int ret; + + connector =drm_atomic_get_new_connector_for_encoder(state,
Quoted 14 lines
Quoted 14 lines
Quoted 1 line
+
bridge->encoder);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 6 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +6
-0+if (WARN_ON (!connector)) +return ; + + mhdp->curr_conn = connector; + + conn_state = drm_atomic_get_new_connector_state(state,connector);
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 4 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +4
-0+if (WARN_ON (!conn_state)) +return ; + + crtc_state = drm_atomic_get_new_crtc_state(state,
conn_state->crtc);Quoted 16 lines
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +8
-0+if (WARN_ON (!crtc_state)) +return ; + +cdns_dp_mode_set (mhdp, &crtc_state->adjusted_mode); + +/* Power up PHY before link training */ +phy_power_on (mhdp->phy); +Quoted 8 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 8 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +8
-0+/* Link training */ + ret =cdns_dp_train_link (mhdp); +if (ret) { +dev_err (mhdp->dev,"Failed link train %d\n" , ret); +return ; + } + + ret = cdns_dp_set_video_status(mhdp,
CONTROL_VIDEO_VALID);Quoted 15 lines
Quoted 15 lines
Quoted 4 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +4
-0+if (ret) { +dev_err (mhdp->dev,"Failed to valid video %d\n" , ret); +return ; + }drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +10
-0+} + +const struct drm_bridge_funcs cdns_dp_bridge_funcs = { + .attach = cdns_dp_bridge_attach, + .detect = cdns_mhdp8501_detect, + .edid_read = cdns_dp_bridge_edid_read, + .mode_valid = cdns_mhdp8501_mode_valid, + .atomic_enable = cdns_dp_bridge_atomic_enable, + .atomic_disable = cdns_dp_bridge_atomic_disable, + .atomic_get_input_bus_fmts =
cdns_dp_bridge_atomic_get_input_bus_fmts,Quoted 4 lines
Quoted 4 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 2 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +2
-0+ .atomic_check = cdns_dp_bridge_atomic_check, + .atomic_duplicate_state =
drm_atomic_helper_bridge_duplicate_state,Quoted 1 line
+ .atomic_destroy_state =
drm_atomic_helper_bridge_destroy_state,Quoted 36 lines
Quoted 36 lines
Review
Quoted 2 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +1
-0+ .atomic_reset = drm_atomic_helper_bridge_reset, };(quoted diff) +0
-0
b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.cQuoted 22 lines
new file mode 100644
index 0000000000000..9556d0929e21ddrivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +17
-0@@ -0,0 +1,745 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Cadence MHDP8501 HDMI bridge driver +* +* Copyright (C) 2019-2024 NXP Semiconductor, Inc. +* +*/ +#include <drm/display/drm_hdmi_helper.h> #include +<drm/display/drm_hdmi_state_helper.h> +#include <drm/display/drm_scdc_helper.h> #include +<drm/drm_atomic_helper.h> #include <drm/drm_edid.h> #include +<drm/drm_print.h> #include <linux/phy/phy.h> #include +<linux/phy/phy-hdmi.h> + +#include "cdns-mhdp8501-core.h" + +/** drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c line 27
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +10
-0+* cdns_hdmi_config_infoframe() - fill the HDMI infoframe +* @mhdp: phandle to mhdp device. +* @entry_id: The packet memory address in which the data is written. +* @len: length of infoframe. +* @buf: point to InfoFrame Packet. +* @type: Packet Type of InfoFrame in HDMI Specification. +* +*/ + +static void cdns_hdmi_clear_infoframe(struct cdns_mhdp8501_device*mhdp,
Quoted 5 lines
Quoted 5 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 5 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +5
-0+ u8 entry_id, u8 type) { +u32 val; + +/* invalidate entry */ + val = F_ACTIVE_IDLE_TYPE(1) |
F_PKT_ALLOC_ADDRESS(entry_id)|Quoted 42 lines
Quoted 42 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 3 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +3
-0+F_PACKET_TYPE (type); +writel (val, mhdp->regs +SOURCE_PIF_PKT_ALLOC_REG ); + writel(F_PKT_ALLOC_WR_EN(1), mhdp->regs +
SOURCE_PIF_PKT_ALLOC_WR_EN);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c line 39
Quoted 4 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +4
-0+} + +static void cdns_hdmi_config_infoframe (struct +cdns_mhdp8501_device*mhdp,
Quoted 11 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +11
-0+ u8 entry_id, u8 len, + const u8 *buf, u8 type) { + u8 packet[32], packet_len = 32; +u32 packet32, len32; +u32 val, i; + +/* +* only support 32 bytes now +* packet[0] = 0 +* packet[1-3] = HB[0-2] InfoFrame Packet Header +* packet[4-31 = PB[0-27] InfoFrame Packet Contents drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +10
-0+*/ +if (len >= (packet_len -1 )) +return ; + packet[0 ] =0 ; +memcpy (packet +1 , buf, len); + +cdns_hdmi_clear_infoframe (mhdp, entry_id, type); + +/* flush fifo 1 */ + writel(F_FIFO1_FLUSH(1), mhdp->regs +
SOURCE_PIF_FIFO1_FLUSH);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 6 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +6
-0+ +/* write packet into memory */ + len32 = packet_len /4 ; +for (i =0 ; i < len32; i++) { + packet32 =get_unaligned_le32 (packet +4 * i); + writel(F_DATA_WR(packet32), mhdp->regs +
SOURCE_PIF_DATA_WR);Quoted 4 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +4
-0+ } + +/* write entry id */ + writel(F_WR_ADDR(entry_id), mhdp->regs +Quoted 8 lines
Quoted 8 lines
SOURCE_PIF_WR_ADDR);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 7 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +7
-0+ +/* write request */ +writel (F_HOST_WR (1 ), mhdp->regs +SOURCE_PIF_WR_REQ ); + +/* update entry */ + val =F_ACTIVE_IDLE_TYPE (1 ) |F_TYPE_VALID (1 ) | + F_PACKET_TYPE(type) |
F_PKT_ALLOC_ADDRESS(entry_id);Quoted 21 lines
Quoted 21 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 3 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +3
-0+writel (val, mhdp->regs +SOURCE_PIF_PKT_ALLOC_REG ); + + writel(F_PKT_ALLOC_WR_EN(1), mhdp->regs +
SOURCE_PIF_PKT_ALLOC_WR_EN);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c
Quoted 13 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +13
-0+} + +static int cdns_hdmi_get_edid_block (void *data,u8 *edid, +u32 block,size_t length) { +struct cdns_mhdp8501_device *mhdp = data; +u8 msg[2 ], reg[5 ], i; +int ret; + +for (i =0 ; i <4 ; i++) { + msg[0 ] = block /2 ; + msg[1 ] = block %2 ; + + ret =cdns_mhdp_mailbox_send_recv_multi(&mhdp->base,
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c line 94
Quoted 1 line
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +1
-0+
MB_MODULE_ID_HDMI_TX,Quoted 1 line
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +1
-0+Quoted 8 lines
Quoted 8 lines
HDMI_TX_EDID,drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c line 96
Quoted 1 line
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +1
-0+sizeof(msg), msg,
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c line 97
Quoted 1 line
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +1
-0+
HDMI_TX_EDID,drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c line 98
Quoted 1 line
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +1
-0+sizeof(reg), reg,
Quoted 1 line
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +1
-0+length,
Quoted 5 lines
Quoted 5 lines
edid);
Quoted 3 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c new file +3
-0+ +if (ret) +continue ;
Quoted 7 lines
Quoted 4 lines
Quoted 1 line
Ignoring the error?
Yes. EDID read operations can be interrupted by various factors, but as long as the EDID is eventually read successfully, there's no issue.
Okay... I'd still suggest a
drm_dbg_dp()here.
OK, I will add it.
B.R
Sandor
Quoted 4 lines
--
With best wishes
Dmitry
Re: [PATCH v20 5/9] drm: bridge: Cadence: Add MHDP8501 DP/HDMI driver
Quoted 333 lines · Sandor Yu
Quoted 324 lines · Sandor Yu
Quoted 40 lines
Quoted 40 lines · Sandor Yu
Quoted 1 line
Add a new DRM DisplayPort and HDMI bridge driver for Candence
MHDP8501
Quoted 10 lines
used in i.MX8MQ SOC. MHDP8501 could support HDMI or DisplayPort standards according embedded Firmware running in the uCPU.
For iMX8MQ SOC, the DisplayPort/HDMI FW was loaded and activated by SOC's ROM code. Bootload binary included respective specific firmware is required.
Driver will check display connector type and then load the corresponding driver.
Quoted 6 lines
Signed-off-by Sandor Yu <[email protected]>---
v19->v20:
- Dump mhdp FW version by debugfs
- Combine HDMI and DP cable detect functions into one function
- Combine HDMI and DP cablebridge_mode_valid()functions into onefunction
Quoted 2 lines
- Rename
cdns_hdmi_reset_link()tocdns_hdmi_handle_hotplug()
- Add comments for EDID incdns_hdmi_handle_hotplug()and
cdns_dp_check_link_state()Quoted 4 lines
- Add
atomic_get_input_bus_fmts()andbridge_atomic_check()for DP driver
- Remove bpc andcolor_fmtinit inatomic_enable()function.
- More detail comments for DDC adapter only support
SCDC_I2C_SLAVE_ADDRESSQuoted 11 lines
read and write in HDMI driver.
v18->v19:
- Get endpoint for data-lanes as it had move to endpoint of port@1
- Update clock management asdevm_clk_get_enabled()introduced.
- Fixclear_infoframe()function is not work issue.
- Manage PHY power state viaphy_power_on()andphy_power_off().
v17->v18:
- MHDP8501 HDMI and DP commands that need access mailbox areQuoted 7 lines
Quoted 7 lines
rewrited
Quoted 4 lines
with new API functions created in patch #1.
- replace lane-mapping with data-lanes, use the value from data-lanes to reorder HDMI and DP lane mapping.
- create I2C adapter for HDMI SCDC, removecdns_hdmi_scdc_write()function.
Quoted 1 line
- Rewrite
cdns_hdmi_sink_config()function, use HDMI SCDC helperfunction
Quoted 1 line
Quoted 1 line
Quoted 1 line
drm_scdc_set_high_tmds_clock_ratio()and
drm_scdc_set_scrambling()Quoted 102 lines
Quoted 102 lines
Quoted 9 lines
to config HDMI sink TMDS.
- Remove structvideo_infofrom HDMI driver.
- Removetmds_char_rate_valid()be called inbridge_mode_valid(), community had patch in reviewing to implement the function.
- Remove warning message print when get unknown HPD cable status.
- Add more detail comments for HDP plugin and plugout interrupt.
- usedev_dbgto repleaceDRM_INFOwhen cable HPD status changed.
- Remove t-b tag as above code change.Quoted 5 lines
drivers/gpu/drm/bridge/cadence/Kconfig | 16 + drivers/gpu/drm/bridge/cadence/Makefile | 2 + .../drm/bridge/cadence/cdns-mhdp8501-core.c | 379 +++++++++ .../drm/bridge/cadence/cdns-mhdp8501-core.h | 380 +++++++++ .../gpu/drm/bridge/cadence/cdns-mhdp8501-dp.c | 694++++++++++++++++
Quoted 1 line
.../drm/bridge/cadence/cdns-mhdp8501-hdmi.c | 745++++++++++++++++++
Quoted 1 line
6 files changed, 2216 insertions(+) create mode 100644
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.cQuoted 1 line
create mode 100644
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.hQuoted 1 line
create mode 100644
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-dp.cQuoted 1 line
create mode 100644
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.cReview
Quoted 2 lines
(quoted diff) +0
-0b/drivers/gpu/drm/bridge/cadence/Kconfig
Review
Quoted 24 lines
index
dbb06533ccab2..bd979f3e6df48100644drivers/gpu/drm/bridge/cadence/Kconfig +16
-0@@ -48,3 +48,19 @@ config DRM_CDNS_MHDP8546_J721E initializes the J721E Display Port and sets up the clock and data muxes. endif + +config DRM_CDNS_MHDP8501 + tristate "Cadence MHDP8501 DP/HDMI bridge" + select DRM_KMS_HELPER + select DRM_PANEL_BRIDGE + select DRM_DISPLAY_DP_HELPER + select DRM_DISPLAY_HELPER + select DRM_CDNS_AUDIO + select CDNS_MHDP_HELPER + depends on OF + help + Support Cadence MHDP8501 DisplayPort/HDMI bridge. + Cadence MHDP8501 support one or more protocols, + including DisplayPort and HDMI. + To use the DP and HDMI drivers, their respective + specific firmware is required.(quoted diff) +0
-0b/drivers/gpu/drm/bridge/cadence/Makefile
drivers/gpu/drm/bridge/cadence/Makefile cdns-dsi-$(CONFIG_DRM_CDNS_DSI_J721E) +=
Quoted 4 lines
index
c95fd5b81d137..ea327287d1c14100644drivers/gpu/drm/bridge/cadence/Makefile +0
-0@@ -5,3 +5,5 @@ cdns-dsi-$(CONFIG_DRM_CDNS_DSI_J721E) +=cdns-dsi-j721e.o
Quoted 3 lines
drivers/gpu/drm/bridge/cadence/Makefile +0
-0obj-$(CONFIG_DRM_CDNS_MHDP8546) += cdns-mhdp8546.ocdns-mhdp8546-y := cdns-mhdp8546-core.o cdns-mhdp8546-hdcp.o
cdns-mhdp8546-$(CONFIG_DRM_CDNS_MHDP8546_J721E) +=cdns-mhdp8546-j721e.o
drivers/gpu/drm/bridge/cadence/Makefile
Quoted 2 lines
drivers/gpu/drm/bridge/cadence/Makefile +2
-0+obj-$(CONFIG_DRM_CDNS_MHDP8501) += cdns-mhdp8501.o +cdns-mhdp8501-y := cdns-mhdp8501-core.o cdns-mhdp8501-dp.ocdns-mhdp8501-hdmi.o
Review
Quoted 1 line
(quoted diff) +0
-0
b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.cQuoted 14 lines
new file mode 100644
index 0000000000000..98116ef012fa3drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +9
-0@@ -0,0 +1,379 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Cadence Display Port Interface (DP) driver +* +* Copyright (C) 2023-2024 NXP Semiconductor, Inc. +* +*/ +#include <drm/drm_of.h> +#include <drm/drm_print.h> drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 19
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +10
-0+#include <linux/clk.h> +#include <linux/irq.h> +#include <linux/mutex.h> +#include <linux/of_device.h> +#include <linux/platform_device.h> #include <linux/phy/phy.h> + +#include "cdns-mhdp8501-core.h" + +static ssize_t firmware_version_show(struct device *dev, + struct device_attribute *attr,char *buf);
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 20
Quoted 1 line
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +1
-0+static struct device_attribute firmware_version =
__ATTR_RO(firmware_version);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 7 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +7
-0+ +ssize_t firmware_version_show (struct device *dev, +struct device_attribute *attr,char +*buf) { +struct cdns_mhdp8501_device *mhdp =dev_get_drvdata (dev); + + u32 version = readl(mhdp->base.regs + VER_L) |
readl(mhdp->base.regs + VER_H)<< 8;Quoted 2 lines
Quoted 2 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 29
Quoted 2 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +2
-0+u32 lib_version =readl (mhdp->base.regs +VER_LIB_L_ADDR ) | + readl(mhdp->base.regs +
VER_LIB_H_ADDR)Quoted 30 lines
Quoted 30 lines
<< 8;
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 32
Quoted 3 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +3
-0+ + return sprintf(buf, "FW version %d, Lib version %d\n", + version,
lib_version);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 3 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +3
-0+} + +static void cdns_mhdp8501_create_device_files(struct
cdns_mhdp8501_device*mhdp)drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 3 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +3
-0+{ +if (device_create_file (mhdp->dev, &firmware_version)) { + DRM_ERROR("Unable to create firmware_versionsysfs\n");
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 5 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +5
-0+device_remove_file (mhdp->dev, &firmware_version); + } +} + +static void cdns_mhdp8501_remove_device_files(struct
cdns_mhdp8501_device*mhdp)drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 4 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +4
-0+{ +device_remove_file (mhdp->dev, &firmware_version); } + +static int cdns_mhdp8501_read_hpd(struct cdns_mhdp8501_device*mhdp)
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 5 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +5
-0+{ +u8 status; +int ret; + + ret = cdns_mhdp_mailbox_send_recv(&mhdp->base,
MB_MODULE_ID_GENERAL,Quoted 3 lines
Quoted 3 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 53
Quoted 1 line
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +1
-0+
GENERAL_GET_HPD_STATE,Quoted 1 line
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +1
-0+ 0, NULL,sizeof(status),
Quoted 10 lines
Quoted 10 lines
&status);
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 9 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +9
-0+if (ret) { +dev_err (mhdp->dev,"read hpd failed: %d\n" , ret); +return ret; + } + +return status; +} + +enum drm_connector_status cdns_mhdp8501_detect(struct
drm_bridgeQuoted 50 lines
Quoted 50 lines
*bridge)
Quoted 27 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +27
-0+{ +struct cdns_mhdp8501_device *mhdp = bridge->driver_private; + +u8 hpd =0xf ; + + hpd =cdns_mhdp8501_read_hpd (mhdp); +if (hpd ==1 ) +return connector_status_connected; +else if (hpd ==0 ) +return connector_status_disconnected; + +return connector_status_unknown; } + +enum drm_mode_status +cdns_mhdp8501_mode_valid (struct drm_bridge *bridge, +const struct drm_display_info *info, +const struct drm_display_mode *mode) { +/* We don't support double-clocked */ +if (mode->flags &DRM_MODE_FLAG_DBLCLK ) +return MODE_BAD ; + +/* MAX support pixel clock rate 594MHz */ +if (mode->clock >594000 ) +return MODE_CLOCK_HIGH ; + +if (mode->hdisplay >3840 ) +return MODE_BAD_HVALUE ;drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +10
-0+ +if (mode->vdisplay >2160 ) +return MODE_BAD_VVALUE ; + +return MODE_OK ; +} + +static void hotplug_work_func (struct work_struct *work) { +struct cdns_mhdp8501_device *mhdp =container_of (work, + struct
cdns_mhdp8501_device,drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 101
Quoted 1 line
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +1
-0+hotplug_work.work);
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 102
Quoted 1 line
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +1
-0+ enum drm_connector_status status =
cdns_mhdp8501_detect(&mhdp->bridge);drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 6 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +6
-0+ +drm_bridge_hpd_notify (&mhdp->bridge, status); + +/* +* iMX8MQ has two HPD interrupts: one for plugout and one +for plugin.
Quoted 3 lines
Quoted 3 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 109
Quoted 1 line
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +1
-0+* These interrupts cannot be masked and cleaned, so we must enable one
Quoted 1 line
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +1
-0+* and disable the other to avoid continuous interrupt generation.
Quoted 20 lines
Quoted 20 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 8 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +8
-0+*/ +if (status == connector_status_connected) { +/* Cable connected */ +dev_dbg (mhdp->dev,"HDMI/DP Cable Plug In\n" ); +enable_irq (mhdp->irq[IRQ_OUT ]); + +/* Reset HDMI/DP link with sink */ + if (mhdp->connector_type ==
DRM_MODE_CONNECTOR_HDMIA)Quoted 11 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +11
-0+cdns_hdmi_handle_hotplug (mhdp); + else +cdns_dp_check_link_state (mhdp ); + + }else if (status == connector_status_disconnected) { +/* Cable Disconnected */ +dev_dbg (mhdp->dev,"HDMI/DP Cable Plug Out\n" ); +enable_irq (mhdp->irq[IRQ_IN ]); + } +} +Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c line 141
Quoted 8 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +8
-0+static irqreturn_t cdns_mhdp8501_irq_thread (int irq,void *data) +{ +struct cdns_mhdp8501_device *mhdp = data; + +disable_irq_nosync (irq); + + mod_delayed_work(system_wq, &mhdp->hotplug_work, +
msecs_to_jiffies(HOTPLUG_DEBOUNCE_MS));Quoted 29 lines
Quoted 29 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 6 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +6
-0+ +return IRQ_HANDLED ; +} + +#define DATA_LANES_COUNT 4 +static int cdns_mhdp8501_dt_parse(struct cdns_mhdp8501_device*mhdp,
Quoted 8 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +8
-0+ struct platform_device *pdev) { +struct device *dev = &pdev->dev; +struct device_node *np = dev->of_node; +struct device_node *remote, *endpoint; +u32 data_lanes[DATA_LANES_COUNT ]; +u32 lane_value; +int ret, i; +drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c
Quoted 10 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +10
-0+ remote =of_graph_get_remote_node (np,1 ,0 ); +if (!remote) { +dev_err (dev,"fail to get remote node\n" ); +of_node_put (remote); +return -EINVAL ; + } + +/* get connector type */ +if (of_device_is_compatible (remote,"hdmi-connector" )) { + mhdp->connector_type =
DRM_MODE_CONNECTOR_HDMIA;Quoted 3 lines
drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c new file +3
-0+ + }else if (of_device_is_compatible (remote,"dp-connector" )) { + mhdp->connector_type =Quoted 6 lines
Quoted 4 lines
DRM_MODE_CONNECTOR_DisplayPort;Interesting hack. What if somebody wraps DP signals with the USB-C controller in order to provide DP over USB-C?
There is no such requirement now, and the supported types of
display-connectors do not include Type-C DP connectors.
Quoted 1 line
If type-C DP connectors is added in the future, I think it would be acceptable
to modify the code here.
Quoted 8 lines
It would be acceptable, but it most likely will also require chaning the DT bindings as there is no longer an easy way to identify the next bridge. Also you might not have that now, but it is pretty common to have DP retimers on the board in order to improve the sinal integrity.
Thus I think it is not a proper solution to check the next node's compatible. I think we need a way to specify HDMI vs DP firmware / mode in the device tree.
Quoted 7 lines
Since there already have the connector type for HDMI or DP.
adding another parameter to the DT bindings to specify the PHY type seems redundant.If anyone add DP retimer to the board, the similar code as followed may add to the driver.
last_remote = remote; while (of_graph_get_remote_node(last_remote, 1, 0)) last_remote = of_graph_get_remote_node(last_remote, 1, 0);
Definite NAK for such a code piece. It's not a host driver's business to traverse DT for other, independent devices. They might or might not follow the usb-switch.yaml
Quoted 2 lines
Before new requirements arise, I hope to keep the current implementation.
I'd say, no. Please make it good from the beginning.
Signature · 2 lines
With best wishes Dmitry
PATCH v20 6/9 dt-bindings: phy: Add Freescale iMX8MQ DP and HDMI PHY
In reply to Sandor YuAdd bindings for Freescale iMX8MQ DP and HDMI PHY.
---v9->v20:
*No change.
.../bindings/phy/fsl,imx8mq-dp-hdmi-phy.yaml | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 Documentation/devicetree/bindings/phy/fsl,imx8mq-dp-hdmi-phy.yaml
Documentation/devicetree/bindings/phy/fsl,imx8mq-dp-hdmi-phy.yaml new file +51 -0
@@ -0,0 +1,51 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/phy/fsl,imx8mq-dp-hdmi-phy.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Cadence HDP-TX DP/HDMI PHY for Freescale i.MX8MQ SoC + +maintainers: + - Sandor Yu <[email protected]> + +properties: + compatible: + const: fsl,imx8mq-hdptx-phy + + reg: + maxItems: 1 + + clocks: + items: + - description: PHY reference clock. + - description: APB clock. + + clock-names: + items: + - const: ref + - const: apb + + "#phy-cells": + const: 0 + +required: + - compatible + - reg + - clocks + - clock-names + - "#phy-cells" + +additionalProperties: false + +examples: + - | + #include <dt-bindings/clock/imx8mq-clock.h> + #include <dt-bindings/phy/phy.h> + dp_phy: phy@32c00000 { + compatible = "fsl,imx8mq-hdptx-phy"; + reg = <0x32c00000 0x100000>; + #phy-cells = <0>; + clocks = <&hdmi_phy_27m>, <&clk IMX8MQ_CLK_DISP_APB_ROOT>; + clock-names = "ref", "apb"; + };
Signature · 1 line
2.34.1
PATCH v20 7/9 phy: freescale: Add DisplayPort/HDMI Combo-PHY driver for i.MX8MQ
In reply to Sandor YuAdd Cadence HDP-TX DisplayPort and HDMI PHY driver for i.MX8MQ.
Cadence HDP-TX PHY could be put in either DP mode or HDMI mode base on the configuration chosen. DisplayPort or HDMI PHY mode is configured in the driver.
---v19->v20:
- implify DP configuration handling by directly copying
the configuration options to the driver's internal structure.
- return the error code directly instead of logging an error message in hdptx_clk_enable
- Remove redundant ref_clk_rate check
v18->v19:
- Simplify the PLL tables by removing unused and constant data
- Remove PHY power management, controller driver will handle them.
- Remove enum dp_link_rate
- Introduce read_pll_timeout.
- Update clock management as devm_clk_get_enabled() introduced.
- Remove cdns_hdptx_phy_init() and cdns_hdptx_phy_remove().
v17->v18:
- fix build error as code rebase to latest kernel version.
drivers/phy/freescale/Kconfig | 10 + drivers/phy/freescale/Makefile | 1 + drivers/phy/freescale/phy-fsl-imx8mq-hdptx.c | 1231 ++++++++++++++++++ 3 files changed, 1242 insertions(+) create mode 100644 drivers/phy/freescale/phy-fsl-imx8mq-hdptx.c
drivers/phy/freescale/Kconfig +10 -0
@@ -35,6 +35,16 @@ config PHY_FSL_IMX8M_PCIE Enable this to add support for the PCIE PHY as found on i.MX8M family of SOCs. +config PHY_FSL_IMX8MQ_HDPTX + tristate "Freescale i.MX8MQ DP/HDMI PHY support" + depends on OF && HAS_IOMEM + depends on COMMON_CLK + select GENERIC_PHY + select CDNS_MHDP_HELPER + help + Enable this to support the Cadence HDPTX DP/HDMI PHY driver + on i.MX8MQ SOC. + config PHY_FSL_IMX8QM_HSIO tristate "Freescale i.MX8QM HSIO PHY" depends on OF && HAS_IOMEM
drivers/phy/freescale/Makefile +1 -0
@@ -1,4 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only +obj-$(CONFIG_PHY_FSL_IMX8MQ_HDPTX) += phy-fsl-imx8mq-hdptx.o obj-$(CONFIG_PHY_FSL_IMX8MQ_USB) += phy-fsl-imx8mq-usb.o obj-$(CONFIG_PHY_MIXEL_LVDS_PHY) += phy-fsl-imx8qm-lvds-phy.o obj-$(CONFIG_PHY_MIXEL_MIPI_DPHY) += phy-fsl-imx8-mipi-dphy.o
drivers/phy/freescale/phy-fsl-imx8mq-hdptx.c new file +1231 -0
1,231 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v20 8/9 arm64: dts: imx8mq: Add DCSS + HDMI/DP display pipeline
In reply to Sandor YuFrom: Alexander Stein <[email protected]>
This adds DCSS + MHDP + MHDP PHY nodes. PHY mode (DP/HDMI) is selected by the connector type connected to mhdp port@1 endpoint.
---v17->v20:
*No change
arch/arm64/boot/dts/freescale/imx8mq.dtsi | 68 +++++++++++++++++++++++ 1 file changed, 68 insertions(+)
arch/arm64/boot/dts/freescale/imx8mq.dtsi +68 -0
@@ -1602,6 +1602,74 @@ aips4: bus@32c00000 { /* AIPS4 */ #size-cells = <1>; ranges = <0x32c00000 0x32c00000 0x400000>; + mdhp_phy: phy@32c00000 { + compatible = "fsl,imx8mq-hdptx-phy"; + reg = <0x32c00000 0x100000>; + #phy-cells = <0>; + clocks = <&hdmi_phy_27m>, <&clk IMX8MQ_CLK_DISP_APB_ROOT>; + clock-names = "ref", "apb"; + }; + + mhdp: bridge@32c00000 { + compatible = "fsl,imx8mq-mhdp8501"; + reg = <0x32c00000 0x100000>; + interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "plug_in", "plug_out"; + clocks = <&clk IMX8MQ_CLK_DISP_APB_ROOT>; + phys = <&mdhp_phy>; + status = "disabled"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + + mhdp_in: endpoint { + remote-endpoint = <&dcss_out>; + }; + }; + + port@1 { + reg = <1>; + + mhdp_out: endpoint { + }; + }; + }; + }; + + dcss: display-controller@32e00000 { + compatible = "nxp,imx8mq-dcss"; + reg = <0x32e00000 0x2d000>, <0x32e2f000 0x1000>; + interrupt-parent = <&irqsteer>; + interrupts = <6>, <8>, <9>; + interrupt-names = "ctxld", "ctxld_kick", "vblank"; + clocks = <&clk IMX8MQ_CLK_DISP_APB_ROOT>, + <&clk IMX8MQ_CLK_DISP_AXI_ROOT>, + <&clk IMX8MQ_CLK_DISP_RTRM_ROOT>, + <&clk IMX8MQ_VIDEO2_PLL_OUT>, + <&clk IMX8MQ_CLK_DISP_DTRC>; + clock-names = "apb", "axi", "rtrm", "pix", "dtrc"; + assigned-clocks = <&clk IMX8MQ_CLK_DISP_AXI>, + <&clk IMX8MQ_CLK_DISP_RTRM>, + <&clk IMX8MQ_VIDEO2_PLL1_REF_SEL>; + assigned-clock-parents = <&clk IMX8MQ_SYS1_PLL_800M>, + <&clk IMX8MQ_SYS1_PLL_800M>, + <&clk IMX8MQ_CLK_27M>; + assigned-clock-rates = <800000000>, + <400000000>; + status = "disabled"; + + port { + dcss_out: endpoint { + remote-endpoint = <&mhdp_in>; + }; + }; + }; + irqsteer: interrupt-controller@32e2d000 { compatible = "fsl,imx8m-irqsteer", "fsl,imx-irqsteer"; reg = <0x32e2d000 0x1000>;
Signature · 1 line
2.34.1
PATCH v20 9/9 arm64: dts: imx8mq: tqma8mq-mba8mx: Enable HDMI support
In reply to Sandor YuFrom: Alexander Stein <[email protected]>
Add HDMI connector and connect it to MHDP output. Enable peripherals for HDMI output.
---v19->v20:
*No change
v18->v19:
- Move property data-lanes to endpoint of port@1
v17->v18:
- replace lane-mapping with data-lanes
.../dts/freescale/imx8mq-tqma8mq-mba8mx.dts | 26 +++++++++++++++++++ arch/arm64/boot/dts/freescale/mba8mx.dtsi | 11 ++++++++ 2 files changed, 37 insertions(+)
arch/arm64/boot/dts/freescale/imx8mq-tqma8mq-mba8mx.dts +26 -0
@@ -53,6 +53,10 @@ &btn2 { gpios = <&gpio3 17 GPIO_ACTIVE_LOW>; }; +&dcss { + status = "okay"; +}; + &gpio_leds { led3 { label = "led3";
@@ -60,6 +64,14 @@ led3 { }; }; +&hdmi_connector { + port { + hdmi_connector_in: endpoint { + remote-endpoint = <&mhdp_out>; + }; + }; +}; + &i2c1 { expander2: gpio@25 { compatible = "nxp,pca9555";
@@ -91,6 +103,20 @@ &led2 { gpios = <&gpio3 16 GPIO_ACTIVE_HIGH>; }; +&mhdp { + status = "okay"; + ports { + port@1 { + reg = <1>; + + mhdp_out: endpoint { + remote-endpoint = <&hdmi_connector_in>; + data-lanes = <0 1 2 3>; + }; + }; + }; +}; + /* PCIe slot on X36 */ &pcie0 { reset-gpio = <&expander0 14 GPIO_ACTIVE_LOW>;
arch/arm64/boot/dts/freescale/mba8mx.dtsi +11 -0
@@ -89,6 +89,17 @@ gpio_delays: gpio-delays { gpio-line-names = "LVDS_BRIDGE_EN_1V8"; }; + hdmi_connector: connector { + compatible = "hdmi-connector"; + label = "X11"; + type = "a"; + + port { + hdmi_connector_in: endpoint { + }; + }; + }; + panel: panel-lvds { /* * Display is not fixed, so compatible has to be added from
Signature · 1 line
2.34.1
Hi Sandor,
thanks for the updates.
Am Dienstag, 17. Dezember 2024, 07:51:42 CET schrieb Sandor Yu:
Quoted 20 lines
The patch set initial support Cadence MHDP8501(HDMI/DP) DRM bridge driver and Cadence HDP-TX PHY(HDMI/DP) driver for Freescale i.MX8MQ.
The patch set compose of DRM bridge drivers and PHY driver.
Both of them need by patch #1 and #3 to pass build.
DRM bridges driver patches:
#1: soc: cadence: Create helper functions for Cadence MHDP #2: drm: bridge: cadence: Update mhdp8546 mailbox access functions #3: phy: Add HDMI configuration options
#4: dt-bindings: display: bridge: Add Cadence MHDP8501 #5: drm: bridge: Cadence: Add MHDP8501 DP/HDMI driverPHY driver patches:
#1: soc: cadence: Create helper functions for Cadence MHDP #3: phy: Add HDMI configuration options
#6: dt-bindings: phy: Add Freescale iMX8MQ DP and HDMI PHY #7: phy: freescale: Add DisplayPort/HDMI Combo-PHY driver for i.MX8MQ
Quoted 4 lines
i.MX8M/TQMa8Mx DT patches:
#8: Add DT nodes for DCSS/HDMI pipeline
#9: Enable HDMI for TQMa8Mx/MBa8Mx
I gave this version a new try but unfortunately the display stays black. Although the display pipeline is intialized and even wayland starts. Do you have any idea where to start looking?
Best regards,
Alexander
Signature · 4 lines
TQ-Systems GmbH | Mühlstraße 2, Gut Delling | 82229 Seefeld, Germany Amtsgericht München, HRB 105018 Geschäftsführer: Detlef Schneider, Rüdiger Stahl, Stefan Schneider http://www.tq-group.com/
Hi Alexander
It may cause by the first preferred mode in EDID is not supported by driver. Please use modetest or other user application to change the video mode to CTA standard modes. Such as148.5MHz 1080p60 or 594MHz 3840x2160p60.
B.R
Sandor
Quoted 50 lines
Hi Sandor,
thanks for the updates.
Am Dienstag, 17. Dezember 2024, 07:51:42 CET schrieb Sandor Yu:
Quoted 21 lines
The patch set initial support Cadence MHDP8501(HDMI/DP) DRM bridge driver and Cadence HDP-TX PHY(HDMI/DP) driver for Freescale i.MX8MQ.
The patch set compose of DRM bridge drivers and PHY driver.
Both of them need by patch #1 and #3 to pass build.
DRM bridges driver patches:
#1: soc: cadence: Create helper functions for Cadence MHDP #2: drm: bridge: cadence: Update mhdp8546 mailbox access functions #3: phy: Add HDMI configuration options
#4: dt-bindings: display: bridge: Add Cadence MHDP8501 #5: drm: bridge: Cadence: Add MHDP8501 DP/HDMI driverPHY driver patches:
#1: soc: cadence: Create helper functions for Cadence MHDP #3: phy: Add HDMI configuration options
#6: dt-bindings: phy: Add Freescale iMX8MQ DP and HDMI PHY #7: phy: freescale: Add DisplayPort/HDMI Combo-PHY driver for
i.MX8MQQuoted 4 lines
i.MX8M/TQMa8Mx DT patches:
#8: Add DT nodes for DCSS/HDMI pipeline
#9: Enable HDMI for TQMa8Mx/MBa8MxI gave this version a new try but unfortunately the display stays black. Although the display pipeline is intialized and even wayland starts. Do you have any idea where to start looking?
Best regards,
Alexander
--
TQ-Systems GmbH | Mühlstraße 2, Gut Delling | 82229 Seefeld, Germany Amtsgericht München, HRB 105018
Geschäftsführer: Detlef Schneider, Rüdiger Stahl, Stefan Schneider
http://www.tq/
-group.com%2F&data=05%7C02%7CSandor.yu%40nxp.com%7C734ea27ba98 140b7483e08dd2eed1276%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0% 7C0%7C638718317967624410%7CUnknown%7CTWFpbGZsb3d8eyJFbXB0eU 1hcGkiOnRydWUsIlYiOiIwLjAuMDAwMCIsIlAiOiJXaW4zMiIsIkFOIjoiTWFpbCIs IldUIjoyfQ%3D%3D%7C0%7C%7C%7C&sdata=1HdQdbye9p5AHoT7JCF3Md% 2FB9k9tyN%2FW25YKCEngvWM%3D&reserved=0
Hi,
Am Dienstag, 7. Januar 2025, 15:42:56 CET schrieb Sandor Yu:
Quoted 5 lines
Hi Alexander
It may cause by the first preferred mode in EDID is not supported by driver. Please use modetest or other user application to change the video mode to CTA standard modes. Such as148.5MHz 1080p60 or 594MHz 3840x2160p60.
No, the EDID does not affect the issue. I resurrected series v14 and HDMI does work without any issues at 1920x1080.
If I can find a time slot maybe I can check which series version regresses.
Best regards,
Alexander
Quoted 54 lines
Quoted 51 lines
Hi Sandor,
thanks for the updates.
Am Dienstag, 17. Dezember 2024, 07:51:42 CET schrieb Sandor Yu:
Quoted 21 lines
The patch set initial support Cadence MHDP8501(HDMI/DP) DRM bridge driver and Cadence HDP-TX PHY(HDMI/DP) driver for Freescale i.MX8MQ.
The patch set compose of DRM bridge drivers and PHY driver.
Both of them need by patch #1 and #3 to pass build.
DRM bridges driver patches:
#1: soc: cadence: Create helper functions for Cadence MHDP #2: drm: bridge: cadence: Update mhdp8546 mailbox access functions #3: phy: Add HDMI configuration options
#4: dt-bindings: display: bridge: Add Cadence MHDP8501 #5: drm: bridge: Cadence: Add MHDP8501 DP/HDMI driverPHY driver patches:
#1: soc: cadence: Create helper functions for Cadence MHDP #3: phy: Add HDMI configuration options
#6: dt-bindings: phy: Add Freescale iMX8MQ DP and HDMI PHY #7: phy: freescale: Add DisplayPort/HDMI Combo-PHY driver for
i.MX8MQQuoted 4 lines
i.MX8M/TQMa8Mx DT patches:
#8: Add DT nodes for DCSS/HDMI pipeline
#9: Enable HDMI for TQMa8Mx/MBa8MxI gave this version a new try but unfortunately the display stays black. Although the display pipeline is intialized and even wayland starts. Do you have any idea where to start looking?
Best regards,
Alexander
--
TQ-Systems GmbH | Mühlstraße 2, Gut Delling | 82229 Seefeld, Germany Amtsgericht München, HRB 105018
Geschäftsführer: Detlef Schneider, Rüdiger Stahl, Stefan Schneider
http://www.tq/
-group.com%2F&data=05%7C02%7CSandor.yu%40nxp.com%7C734ea27ba98 140b7483e08dd2eed1276%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0% 7C0%7C638718317967624410%7CUnknown%7CTWFpbGZsb3d8eyJFbXB0eU 1hcGkiOnRydWUsIlYiOiIwLjAuMDAwMCIsIlAiOiJXaW4zMiIsIkFOIjoiTWFpbCIs IldUIjoyfQ%3D%3D%7C0%7C%7C%7C&sdata=1HdQdbye9p5AHoT7JCF3Md% 2FB9k9tyN%2FW25YKCEngvWM%3D&reserved=0
Signature · 4 lines
TQ-Systems GmbH | Mühlstraße 2, Gut Delling | 82229 Seefeld, Germany Amtsgericht München, HRB 105018 Geschäftsführer: Detlef Schneider, Rüdiger Stahl, Stefan Schneider http://www.tq-group.com/
Quoted 7 lines
Hi,
Am Dienstag, 7. Januar 2025, 15:42:56 CET schrieb Sandor Yu:
Quoted 2 lines
Hi Alexander
Quoted 9 lines
Quoted 2 lines
It may cause by the first preferred mode in EDID is not supported by driver. Please use modetest or other user application to change the video mode to
CTA standard modes.
Quoted 1 line
Such as148.5MHz 1080p60 or 594MHz 3840x2160p60.
No, the EDID does not affect the issue. I resurrected series v14 and HDMI does work without any issues at 1920x1080.
If I can find a time slot maybe I can check which series version regresses.
Could you please list the all video modes by modetest when device bootup?
Sandor
Quoted 93 lines
Best regards,
AlexanderQuoted 9 lines
Quoted 9 lines
Hi Sandor,
thanks for the updates.
Am Dienstag, 17. Dezember 2024, 07:51:42 CET schrieb Sandor Yu:
Quoted 2 lines
The patch set initial support Cadence MHDP8501(HDMI/DP) DRM bridge driver and Cadence HDP-TX PHY(HDMI/DP) driver for Freescale
i.MX8MQ.
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
The patch set compose of DRM bridge drivers and PHY driver.
Both of them need by patch #1 and #3 to pass build.
DRM bridges driver patches:
#1: soc: cadence: Create helper functions for Cadence MHDP #2: drm: bridge: cadence: Update mhdp8546 mailbox accessfunctions
Quoted 20 lines
Quoted 20 lines
Quoted 11 lines
#3: phy: Add HDMI configuration options
#4: dt-bindings: display: bridge: Add Cadence MHDP8501 #5: drm: bridge: Cadence: Add MHDP8501 DP/HDMI driverPHY driver patches:
#1: soc: cadence: Create helper functions for Cadence MHDP #3: phy: Add HDMI configuration options
#6: dt-bindings: phy: Add Freescale iMX8MQ DP and HDMI PHY #7: phy: freescale: Add DisplayPort/HDMI Combo-PHY driver for
i.MX8MQQuoted 4 lines
i.MX8M/TQMa8Mx DT patches:
#8: Add DT nodes for DCSS/HDMI pipeline
#9: Enable HDMI for TQMa8Mx/MBa8MxI gave this version a new try but unfortunately the display stays black. Although the display pipeline is intialized and even wayland starts. Do you have any idea where to start looking?
Quoted 7 lines
Quoted 7 lines
Best regards,
Alexander
--
TQ-Systems GmbH | Mühlstraße 2, Gut Delling | 82229 Seefeld, Germany Amtsgericht München, HRB 105018
Geschäftsführer: Detlef Schneider, Rüdiger Stahl, Stefan SchneiderQuoted 1 line
Quoted 1 line
.tq%2F&data=05%7C02%7Csandor.yu%40nxp.com%7C23ba3321d4d5480
4b98f08ddQuoted 1 line
Quoted 1 line
2f35f3db%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C63871863 095591
Quoted 1 line
Quoted 1 line
6087%7CUnknown%7CTWFpbGZsb3d8eyJFbXB0eU1hcGkiOnRydWUsIlYiOiIw LjAuMDA
Quoted 1 line
Quoted 1 line
wMCIsIlAiOiJXaW4zMiIsIkFOIjoiTWFpbCIsIldUIjoyfQ%3D%3D%7C0%7C%7C% 7C&s
Quoted 1 line
Quoted 1 line
data=4Ip3wEX207cu0EreOtf11F%2BS%2ByNzAcI2C2iPjjlQzVg%3D&reserved= 0
Quoted 1 line
Quoted 1 line
-group.com%2F&data=05%7C02%7CSandor.yu%40nxp.com%7C734ea27ba98
Quoted 1 line
Quoted 1 line
140b7483e08dd2eed1276%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%
Quoted 1 line
Quoted 1 line
7C0%7C638718317967624410%7CUnknown%7CTWFpbGZsb3d8eyJFbXB0eU
Quoted 1 line
Quoted 1 line
1hcGkiOnRydWUsIlYiOiIwLjAuMDAwMCIsIlAiOiJXaW4zMiIsIkFOIjoiTWFpbCIs
Quoted 1 line
Quoted 1 line
IldUIjoyfQ%3D%3D%7C0%7C%7C%7C&sdata=1HdQdbye9p5AHoT7JCF3Md%
Quoted 5 lines
Quoted 2 lines
2FB9k9tyN%2FW25YKCEngvWM%3D&reserved=0
--
TQ-Systems GmbH | Mühlstraße 2, Gut Delling | 82229 Seefeld, Germany Amtsgericht München, HRB 105018
Geschäftsführer: Detlef Schneider, Rüdiger Stahl, Stefan Schneider
http://www.tq/
-group.com%2F&data=05%7C02%7Csandor.yu%40nxp.com%7C23ba3321d4d 54804b98f08dd2f35f3db%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C 0%7C638718630955952151%7CUnknown%7CTWFpbGZsb3d8eyJFbXB0eU1h cGkiOnRydWUsIlYiOiIwLjAuMDAwMCIsIlAiOiJXaW4zMiIsIkFOIjoiTWFpbCIsIld UIjoyfQ%3D%3D%7C0%7C%7C%7C&sdata=n3QmrbJru4JcdZvEM%2FxJp4rVf Vmifjoxpq0o9Wxzh2Y%3D&reserved=0
Hi,
Am Mittwoch, 8. Januar 2025, 01:31:11 CET schrieb Sandor Yu:
Quoted 8 lines
Quoted 8 lines
Hi,
Am Dienstag, 7. Januar 2025, 15:42:56 CET schrieb Sandor Yu:
Quoted 4 lines
Hi Alexander
It may cause by the first preferred mode in EDID is not supported by driver. Please use modetest or other user application to change the video mode to
CTA standard modes.
Quoted 8 lines
Quoted 6 lines
Quoted 1 line
Such as148.5MHz 1080p60 or 594MHz 3840x2160p60.
No, the EDID does not affect the issue. I resurrected series v14 and HDMI does work without any issues at 1920x1080.
If I can find a time slot maybe I can check which series version regresses.Could you please list the all video modes by modetest when device bootup?
This is the output of modeset command after directly bootup:
Quoted 147 lines
trying to open device 'imx-dcss'...done
Encoders:id crtc type possible crtcs possible clones 32 40 none 0x00000001 0x00000001Connectors:
id encoder status name size (mm) modes
encoders 33 32 connected HDMI-A-1 510x290 832>modes:
index name refresh (Hz) hdisp hss hse htot vdisp vss vse vtot#0 1920x1080 60.00 1920 2008 2052 2200 1080 1084 1089 1125 148500 flags:
phsync, pvsync; type: preferred, driver #1 1920x1080 50.00 1920 2448 2492 2640 1080 1084 1089 1125 148500 flags: phsync, pvsync; type: driver #2 1280x720 60.00 1280 1390 1430 1650 720 725 730 750 74250 flags: phsync, pvsync; type: driver #3 1280x720 50.00 1280 1720 1760 1980 720 725 730 750 74250 flags: phsync, pvsync; type: driver #4 1440x576 50.00 1440 1464 1592 1728 576 581 586 625 54000 flags: nhsync, nvsync; type: driver #5 1440x480 59.94 1440 1472 1596 1716 480 489 495 525 54000 flags: nhsync, nvsync; type: driver #6 720x576 50.00 720 732 796 864 576 581 586 625 27000 flags: nhsync, nvsync; type: driver #7 720x480 59.94 720 736 798 858 480 489 495 525 27000 flags: nhsync, nvsync; type: driver> props:1 EDID: flags: immutable blob blobs: value: 00ffffffffffff000469a2231f870200 0d1a010380331d782ae295a2554f9f26 115054b7ef00d1c0b300950081808140 81c0714f0101023a801871382d40582c 4500fd1e1100001e000000ff0047334c 4d54463136353636330a000000fd0032 4b185311000a202020202020000000fc 00415355532050423233380a20200194 020322714f0102031112130414050e0f 1d1e1f90230917078301000065030c00 10008c0ad08a20e02d10103e9600fd1e 11000018011d007251d01e206e285500 fd1e1100001e011d00bc52d01e20b828 5540fd1e1100001e8c0ad09020403120 0c405500fd1e11000018000000000000 00000000000000000000000000000069 2 DPMS: flags: enum enums: On=0 Standby=1 Suspend=2 Off=3 value: 0 5 link-status: flags: enum enums: Good=0 Bad=1 value: 0 6 non-desktop: flags: immutable range values: 0 1 value: 0 4 TILE: flags: immutable blob blobs: value: 34 max bpc: flags: range values: 8 8 value: 8CRTCs:
id fb pos size 40 43 (0,0) (1920x1080)#0 1920x1080 60.00 1920 2008 2052 2200 1080 1084 1089 1125 148500 flags:
phsync, pvsync; type: preferred, driver>
props:24 VRR_ENABLED: flags: range values: 0 1 value: 0Planes:
id crtc fb CRTC x,y x,y gamma size possible
crtcs 35 40 43 0,0 0,0 00x00000001>
formats: AR24 XR24 AB24 XB24 RA24 RX24 BA24 BX24 XR30 XB30 RX30 BX30 AR30 AB30 RA30 BA30>
props:8 type: flags: immutable enum enums: Overlay=0 Primary=1 Cursor=2 value: 1 30 IN_FORMATS: flags: immutable blob blobs: value: 01000000000000001000000018000000 03000000580000004152323458523234 41423234584232345241323452583234 42413234425832345852333058423330 52583330425833304152333041423330 52413330424133300310000000000000 00000000000000000100000000000006 03100000000000000000000000000000 0200000000000006ffff000000000000 00000000000000000000000000000000 in_formats blob decoded: AR24: VIVANTE_TILED(0x600000000000001) VIVANTE_SUPER_TILED(0x600000000000002) LINEAR(0x0) XR24: VIVANTE_TILED(0x600000000000001) VIVANTE_SUPER_TILED(0x600000000000002) LINEAR(0x0) AB24: LINEAR(0x0) XB24: LINEAR(0x0) RA24: LINEAR(0x0) RX24: LINEAR(0x0) BA24: LINEAR(0x0) BX24: LINEAR(0x0) XR30: LINEAR(0x0) XB30: LINEAR(0x0) RX30: LINEAR(0x0) BX30: LINEAR(0x0) AR30: VIVANTE_TILED(0x600000000000001) VIVANTE_SUPER_TILED(0x600000000000002) LINEAR(0x0) AB30: LINEAR(0x0) RA30: LINEAR(0x0) BA30: LINEAR(0x0) 37 zpos: flags: immutable range values: 0 0 value: 0 38 SCALING_FILTER: flags: enum enums: Default=0 Nearest Neighbor=1 value: 0 39 rotation: flags: bitmask values: rotate-0=0x1 rotate-90=0x2 rotate-180=0x4 rotate-270=0x8 reflect-x=0x10 reflect-y=0x20 value: 1
Quoted 2 lines
Frame buffers:
id size pitch
The listed modes don't change over the series versions. The only significant difference is that since v16 there is a "max bpc" property Also since series v16 the HDMI screen stays blank, as in no signal. I tried all from v14 to v20, v14 and v15 work, the others don't.
Best regards,
Alexander
Quoted 98 lines
Sandor
Quoted 93 lines
Best regards,
AlexanderQuoted 9 lines
Quoted 9 lines
Hi Sandor,
thanks for the updates.
Am Dienstag, 17. Dezember 2024, 07:51:42 CET schrieb Sandor Yu:
Quoted 2 lines
The patch set initial support Cadence MHDP8501(HDMI/DP) DRM bridge driver and Cadence HDP-TX PHY(HDMI/DP) driver for Freescale
i.MX8MQ.
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
The patch set compose of DRM bridge drivers and PHY driver.
Both of them need by patch #1 and #3 to pass build.
DRM bridges driver patches:
#1: soc: cadence: Create helper functions for Cadence MHDP #2: drm: bridge: cadence: Update mhdp8546 mailbox accessfunctions
Quoted 20 lines
Quoted 20 lines
Quoted 11 lines
#3: phy: Add HDMI configuration options
#4: dt-bindings: display: bridge: Add Cadence MHDP8501 #5: drm: bridge: Cadence: Add MHDP8501 DP/HDMI driverPHY driver patches:
#1: soc: cadence: Create helper functions for Cadence MHDP #3: phy: Add HDMI configuration options
#6: dt-bindings: phy: Add Freescale iMX8MQ DP and HDMI PHY #7: phy: freescale: Add DisplayPort/HDMI Combo-PHY driver for
i.MX8MQQuoted 4 lines
i.MX8M/TQMa8Mx DT patches:
#8: Add DT nodes for DCSS/HDMI pipeline
#9: Enable HDMI for TQMa8Mx/MBa8MxI gave this version a new try but unfortunately the display stays black. Although the display pipeline is intialized and even wayland starts. Do you have any idea where to start looking?
Quoted 7 lines
Quoted 7 lines
Best regards,
Alexander
--
TQ-Systems GmbH | Mühlstraße 2, Gut Delling | 82229 Seefeld, Germany Amtsgericht München, HRB 105018
Geschäftsführer: Detlef Schneider, Rüdiger Stahl, Stefan SchneiderQuoted 1 line
Quoted 1 line
.tq%2F&data=05%7C02%7Csandor.yu%40nxp.com%7C23ba3321d4d5480
4b98f08ddQuoted 1 line
Quoted 1 line
2f35f3db%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C63871863 095591
Quoted 1 line
Quoted 1 line
6087%7CUnknown%7CTWFpbGZsb3d8eyJFbXB0eU1hcGkiOnRydWUsIlYiOiIw LjAuMDA
Quoted 1 line
Quoted 1 line
wMCIsIlAiOiJXaW4zMiIsIkFOIjoiTWFpbCIsIldUIjoyfQ%3D%3D%7C0%7C%7C% 7C&s
Quoted 1 line
Quoted 1 line
data=4Ip3wEX207cu0EreOtf11F%2BS%2ByNzAcI2C2iPjjlQzVg%3D&reserved= 0
Quoted 1 line
Quoted 1 line
-group.com%2F&data=05%7C02%7CSandor.yu%40nxp.com%7C734ea27ba98
Quoted 1 line
Quoted 1 line
140b7483e08dd2eed1276%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%
Quoted 1 line
Quoted 1 line
7C0%7C638718317967624410%7CUnknown%7CTWFpbGZsb3d8eyJFbXB0eU
Quoted 1 line
Quoted 1 line
1hcGkiOnRydWUsIlYiOiIwLjAuMDAwMCIsIlAiOiJXaW4zMiIsIkFOIjoiTWFpbCIs
Quoted 1 line
Quoted 1 line
IldUIjoyfQ%3D%3D%7C0%7C%7C%7C&sdata=1HdQdbye9p5AHoT7JCF3Md%
Quoted 5 lines
Quoted 2 lines
2FB9k9tyN%2FW25YKCEngvWM%3D&reserved=0
--
TQ-Systems GmbH | Mühlstraße 2, Gut Delling | 82229 Seefeld, Germany Amtsgericht München, HRB 105018
Geschäftsführer: Detlef Schneider, Rüdiger Stahl, Stefan Schneider
http://www.tq/
-group.com%2F&data=05%7C02%7Csandor.yu%40nxp.com%7C23ba3321d4d 54804b98f08dd2f35f3db%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C 0%7C638718630955952151%7CUnknown%7CTWFpbGZsb3d8eyJFbXB0eU1h cGkiOnRydWUsIlYiOiIwLjAuMDAwMCIsIlAiOiJXaW4zMiIsIkFOIjoiTWFpbCIsIld UIjoyfQ%3D%3D%7C0%7C%7C%7C&sdata=n3QmrbJru4JcdZvEM%2FxJp4rVf Vmifjoxpq0o9Wxzh2Y%3D&reserved=0
Signature · 4 lines
TQ-Systems GmbH | Mühlstraße 2, Gut Delling | 82229 Seefeld, Germany Amtsgericht München, HRB 105018 Geschäftsführer: Detlef Schneider, Rüdiger Stahl, Stefan Schneider http://www.tq-group.com/
Hi Sandor,
Just following up on the status of a v21 and upstream status, as I note that with the release of kernel 6.15, the following patch is required to apply the v20 patchset to linux 6.15.
Thanks
Rudi
commit 4537b799d9af621587cfd6c23da620fe95c5b65e
Author: Rudi Heitbaum <[email protected]> Date: Sat May 24 14:13:25 2025 +0000
linux (NXP iMX8): rebase HDMI patches for 6.15
- https://lore.kernel.org/all/[email protected]/
- https://github.com/torvalds/linux/commit/c2b190bf2a8bd02ac196a5a41a00f2bbb73e8252
projects/NXP/devices/iMX8/patches/linux/0001-Initial-support-Cadence-MHDP8501-HDMI-DP-for-i-MX8MQ.patch +6 -8
@@ -3641,7 +3641,7 @@ new file mode 100644 index 0000000000000..157b4d44b9e2b --- /dev/null +++ b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-dp.c -@@ -0,0 +1,694 @@ +@@ -0,0 +1,693 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Cadence MHDP8501 DisplayPort(DP) bridge driver
@@ -4269,7 +4269,7 @@ index 0000000000000..157b4d44b9e2b +} + +static void cdns_dp_bridge_atomic_disable(struct drm_bridge *bridge, -+ struct drm_bridge_state *old_state) ++ struct drm_atomic_state *state) +{ + struct cdns_mhdp8501_device *mhdp = bridge->driver_private; +
@@ -4280,10 +4280,9 @@ index 0000000000000..157b4d44b9e2b +} + +static void cdns_dp_bridge_atomic_enable(struct drm_bridge *bridge, -+ struct drm_bridge_state *old_state) ++ struct drm_atomic_state *state) +{ + struct cdns_mhdp8501_device *mhdp = bridge->driver_private; -+ struct drm_atomic_state *state = old_state->base.state; + struct drm_connector *connector; + struct drm_crtc_state *crtc_state; + struct drm_connector_state *conn_state;
@@ -4341,7 +4340,7 @@ new file mode 100644 index 0000000000000..9556d0929e21d --- /dev/null +++ b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c -@@ -0,0 +1,745 @@ +@@ -0,0 +1,744 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Cadence MHDP8501 HDMI bridge driver
@@ -4943,7 +4942,7 @@ index 0000000000000..9556d0929e21d +} + +static void cdns_hdmi_bridge_atomic_disable(struct drm_bridge *bridge, -+ struct drm_bridge_state *old_state) ++ struct drm_atomic_state *state) +{ + struct cdns_mhdp8501_device *mhdp = bridge->driver_private; +
@@ -4953,10 +4952,9 @@ index 0000000000000..9556d0929e21d +} + +static void cdns_hdmi_bridge_atomic_enable(struct drm_bridge *bridge, -+ struct drm_bridge_state *old_state) ++ struct drm_atomic_state *state) +{ + struct cdns_mhdp8501_device *mhdp = bridge->driver_private; -+ struct drm_atomic_state *state = old_state->base.state; + struct drm_connector *connector; + struct drm_crtc_state *crtc_state; + struct drm_connector_state *conn_state;
Quoted 378 lines · Sandor Yu
The patch set initial support Cadence MHDP8501(HDMI/DP) DRM bridge driver and Cadence HDP-TX PHY(HDMI/DP) driver for Freescale i.MX8MQ.
The patch set compose of DRM bridge drivers and PHY driver.
Both of them need by patch #1 and #3 to pass build.
DRM bridges driver patches:
#1: soc: cadence: Create helper functions for Cadence MHDP #2: drm: bridge: cadence: Update mhdp8546 mailbox access functions #3: phy: Add HDMI configuration options
#4: dt-bindings: display: bridge: Add Cadence MHDP8501 #5: drm: bridge: Cadence: Add MHDP8501 DP/HDMI driverPHY driver patches:
#1: soc: cadence: Create helper functions for Cadence MHDP #3: phy: Add HDMI configuration options
#6: dt-bindings: phy: Add Freescale iMX8MQ DP and HDMI PHY #7: phy: freescale: Add DisplayPort/HDMI Combo-PHY driver for i.MX8MQi.MX8M/TQMa8Mx DT patches:
#8: Add DT nodes for DCSS/HDMI pipeline
#9: Enable HDMI for TQMa8Mx/MBa8Mx
v19->v20:
Patch #1: soc: cadence: Create helper functions for Cadence MHDP Patch #2: drm: bridge: cadence: Update mhdp8546 mailbox access functions
- The two patches are split from Patch #1 in v19.
The MHDP helper functions have been moved in a new "cadence" directory under the SOC directory in patch #1, in order to promote code reuse among MHDP8546, MHDP8501, and the i.MX8MQ HDMI/DP PHY drivers,Patch #3: phy: Add HDMI configuration options
- Add a-b tagPatch #4: dt-bindings: display: bridge: Add Cadence MHDP8501
- remove data type link of data-lanesPatch #5: drm: bridge: Cadence: Add MHDP8501 DP/HDMI driver
- Dump mhdp FW version by debugfs
- Combine HDMI and DP cable detect functions into one function
- Combine HDMI and DP cablebridge_mode_valid()functions into one function
- Renamecdns_hdmi_reset_link()tocdns_hdmi_handle_hotplug()
- Add comments for EDID incdns_hdmi_handle_hotplug()andcdns_dp_check_link_state()
- Addatomic_get_input_bus_fmts()andbridge_atomic_check()for DP driver
- Remove bpc andcolor_fmtinit inatomic_enable()function.
- More detail comments for DDC adapter only supportSCDC_I2C_SLAVE_ADDRESSread and write in HDMI driver.Patch #7: phy: freescale: Add DisplayPort/HDMI Combo-PHY driver for i.MX8MQ
- implify DP configuration handling by directly copying
the configuration options to the driver's internal structure.
- return the error code directly instead of logging an error message inhdptx_clk_enable
- Remove redundantref_clk_ratecheck
v18->v19:
Patch #1
- use guard(mutex)
- Add kerneldocs for all new APIs.
- Detail comments for mailbox access specific case.
- removecdns_mhdp_dp_reg_write()because it is not needed by driver now.Patch #3
- move property data-lanes to endpoint of port@1Patch #4
- get endpoint for data-lanes as it had move to endpoint of port@1
- update clock management asdevm_clk_get_enabled()introduced.
- Fixclear_infoframe()function is not work issue.
- Manage PHY power state viaphy_power_on()andphy_power_off().Patch #6
- Simplify the PLL table by removing unused and constant data
- Remove PHY power management, controller driver will handle them.
- Remove enumdp_link_rate
- introduceread_pll_timeout.
- update clock management asdevm_clk_get_enabled()introduced.
- removecdns_hdptx_phy_init()andcdns_hdptx_phy_remove().Patch #8:
- move property data-lanes to endpoint of port@1
v17->v18:
Patch #1
- Create three ordinary mailbox access APIscdns_mhdp_mailbox_send
cdns_mhdp_mailbox_send_recvcdns_mhdp_mailbox_send_recv_multi
- Create three secure mailbox access APIscdns_mhdp_secure_mailbox_sendcdns_mhdp_secure_mailbox_send_recvcdns_mhdp_secure_mailbox_send_recv_multi
- MHDP8546 DP and HDCP commands that need access mailbox are rewrited with above 6 API functions.Patch #3
- remove lane-mapping and replace it with data-lanes
- remove r-b tag as property changed.Patch #4
- MHDP8501 HDMI and DP commands that need access mailbox are rewrited with new API functions created in patch #1.
- replace lane-mapping with data-lanes, use the value from data-lanes to reorder HDMI and DP lane mapping.
- create I2C adapter for HDMI SCDC, removecdns_hdmi_scdc_write()function.
- Rewritecdns_hdmi_sink_config()function, use HDMI SCDC helper functiondrm_scdc_set_high_tmds_clock_ratio()anddrm_scdc_set_scrambling()to config HDMI sink TMDS.
- Remove structvideo_infofrom HDMI driver.
- Removetmds_char_rate_valid()be called inbridge_mode_valid(), community had patch in reviewing to implement the function.
- Remove warning message print when get unknown HPD cable status.
- Add more detail comments for HDP plugin and plugout interrupt.
- usedev_dbgto repleaceDRM_INFOwhen cable HPD status changed.
- Remove t-b tag as above code change.Patch #6
- fix build error as code rebase to latest kernel version.Patch #8:
- replace lane-mapping with data-lanes
v16->v17:
Patch #1:
- Replaces the local mutexmbox_mutexwith a global mutexmhdp_mailbox_mutex
Patch #2:
- removehdmi.h
- add 2024 year to copyright
- Add r-b tag.
Patch #3:
- Add lane-mapping property.
Patch #4:
- Reset the HDMI/DP link when an HPD (Hot Plug Detect) event is detected
- Move the HDMI protocol settings fromhdmi_ctrl_init()to a new functioncdns_hdmi_set_hdmi_mode_type(), to align with the introduced link reset functionality.
- Implement logic to check the type of HDMI sink.
If the sink is not a hdmi display, set the default mode to DVI.
- Implementhdmi_reset_infoframefunction
- Reorder certain bit definitions in the header file to follow a descending order.
- Add "lane-mapping" property for both HDMI and DP, remove platform data from driver.
lane-mapping should be setting in dts according different board layout.
- Remove variable mode in structcdns_mhdp8501_device, video mode could get from structdrm_crtc_state
- Remove variablechar_ratein structcdns_mhdp8501_device, it could get from struct struct drm_connector_state.hdmi
- Replaces the local mutexmbox_mutexwith a global mutexmhdp_mailbox_mutex
- Remove mutext protect forphy_apiaccess functions.
Patch #6:
- Removembox_mutex
v15->v16:
Patch #2:
- Removepixel_clk_rate, bpc andcolor_spacefields from structphy_configure_opts_hdmi, they were replaced by unsigned long longtmds_char_rate.
- Remove r-b and a-c tags because this patch have important change. Patch #4:
- AddDRM_BRIDGE_OP_HDMIflags for HDMI driver,
- Introduce the hdmi info frame helper functions,
addedhdmi_clear_infoframe(),hdmi_write_infoframe()andhdmi_tmds_char_rate_valid()according Dmitry's patch 'make use of the HDMI connector infrastructure' patchset ([2]).
-mode_fixup()is replaced byatomic_check().
- Fix video mode 4Kp30 did not work on some displays that supportLTE_340Mcsc_scramble.
- updated fortmds_char_rateadded in patch #2.
Patch #6:
- updated fortmds_char_rateadded in patch #2.
v14->v15:
Patch #6 + #7:
- Merged PHY driver into a single combo PHY driver Patch #7 + #8:
- Add DT patches for a running HDMI setup
v13->v14:
Patch #4:
- Rebase to next-20240219, replaceget_edidfunction byedid_readfunction as commitsd807ad80d811b("drm/bridge: add ->edid_read hook anddrm_bridge_edid_read()") and27b8f91c08d99("drm/bridge:
remove ->get_edid callback") had change the API.
v12->v13:
Patch #4:
- Explicitly includelinux/platform_device.hforcdns-mhdp8501-core.c
- Fix build warning
- Order bit bpc andcolor_spacein descending shit.
Patch #7:
- Fix build warning
v11->v12:
Patch #1:
- Move status initialize out ofmbox_mutex.
- Reorder API functions in alphabetical.
- Add notes for malibox access functions.
- Add year 2024 to copyright.
Patch #4:
- ReplaceDRM_INFOwithdev_infoordev_warn.
- ReplaceDRM_ERRORwithdev_err.
- Return ret whencdns_mhdp_dpcd_readfailed in functioncdns_dp_aux_transferi().
- Remove unused parmeter in functioncdns_dp_get_msa_misc
and use two separate variables for color space and bpc.
- Add year 2024 to copyright.
Patch #6:
- Return error code to replace -1 for functionwait_for_ack().
- Setcdns_phy->power_up= false inphy_power_downfunction.
- Remove "RATE_8_1= 810000", it is not used in driver.
- Add year 2024 to copyright.
Patch #7:
- Adjust clk disable order.
- Return error code to replace -1 for functionwait_for_ack().
- Use bool for variablepclk_in.
- Add year 2024 to copyright.
v10->v11:
- rewritecdns_mhdp_set_firmware_active()in mhdp8546 core driver, usecdns_mhdp_mailbox_send()to replacecdns_mhdp_mailbox_write()same as the other mailbox access functions.
- use static forcdns_mhdp_mailbox_write()andcdns_mhdp_mailbox_read()and remove them fromEXPORT_SYMBOL_GPL().
- removeMODULE_ALIAS()from mhdp8501 driver.
v9->v10:
- Create mhdp helper driver to replace macro functions, move all mhdp mailbox access functions and common functions into the helper driver.
Patch #1:drm: bridge: Cadence: Creat mhdp helper driver it is totaly different with v9.
v8->v9:
- Remove compatible string "cdns,mhdp8501" that had removed from dt-bindings file in v8.
- Add Dmitry's R-b tag to patch #2
- Add Krzysztof's R-b tag to patch #3
v7->v8:
MHDP8501 HDMI/DP:
- Correct DT node name to "display-bridge".
- Remove "cdns,mhdp8501" from mhdp8501 dt-binding doc.HDMI/DP PHY:
- Introduced functionswait_for_ackandwait_for_ack_clearto handle waiting with acknowledgment bits set and cleared respectively.
- UseFIELD_PRE()to set bitfields for both HDMI and DP PHY.
v6->v7:
MHDP8501 HDMI/DP:
- Combine HDMI and DP driver into one mhdp8501 driver. Use the connector type to load the corresponding functions.
- Remove connector init functions.
- Add <linux/hdmi.h> inphy_hdmi.hto reuse 'enumhdmi_colorspace'.HDMI/DP PHY:
- Lowercase hex values
- Fix parameters indent issue on some functions
- Replace 'udelay' with 'usleep_range'
v5->v6:
HDMI/DP bridge driver
- 8501 is the part number of Cadence MHDP on i.MX8MQ.
Use MHDP8501 to name hdmi/dp drivers and files.
- Add compatible "fsl,imx8mq-mhdp8501-dp" for i.MX8MQ DP driver
- Add compatible "fsl,imx8mq-mhdp8501-hdmi" for i.MX8MQ HDMI driver
- Combine HDMI and DP dt-bindings into one file cdns,mhdp8501.yaml
- Fix HDMI scrambling is not enable issue when driver working in 4Kp60 mode.
- Add HDMI/DP PHY API mailbox protect.HDMI/DP PHY driver:
- Rename DP and HDMI PHY files and move to folder phy/freescale/
- Remove propertiesnum_lanesandlink_ratefrom DP PHY driver.
- Combine HDMI and DP dt-bindings into one file fsl,imx8mq-dp-hdmi-phy.yaml
- Update compatible string to "fsl,imx8mq-dp-phy".
- Update compatible string to "fsl,imx8mq-hdmi-phy".
v4->v5:
- Drop "clk" suffix in clock name.
- Add output port property in the example of hdmi/dp.
v3->v4:
dt-bindings:
- Correct dt-bindings coding style and address review comments.
- Addapb_clkdescription.
- Add output port for HDMI/DP connector
PHY:
- Alphabetically sorted inKconfigandMakefilefor DP and HDMI PHY
- Remove unused registers define from HDMI and DP PHY drivers.
- More description inphy_hdmi.h.
- Addapb_clkto HDMI and DP phy driver.
HDMI/DP:
- Useget_unaligned_le32()to replace hardcode type conversion in HDMI AVI infoframe data fill function.
- Add mailbox mutex lock in HDMI/DP driver for phy functions to reslove race conditions between HDMI/DP and PHY drivers.
- Addapb_clkto both HDMI and DP driver.
- Rename some function names and add prefix with "cdns_hdmi/cdns_dp".
- Remove bpc 12 and 16 optional that not supported.
v2->v3:
Address comments for dt-bindings files.
- Correct dts-bindings file names
Renamephy-cadence-hdptx-dp.yamlto cdns,mhdp-imx8mq-dp.yaml Renamephy-cadence-hdptx-hdmi.yamlto cdns,mhdp-imx8mq-hdmi.yaml
- Drop redundant words and descriptions.
- Correct hdmi/dp node name.v2 is a completely different version compared to v1. Previous v1 can be available here [1].
v1->v2:
- Reuse Cadence mailbox access functions from mhdp8546 instead of rockchip DP.
- Mailbox access functions be convert to marco functions that will be referenced by HDP-TX PHY(HDMI/DP) driver too.
- Plain bridge instead of component driver.
- Standalone Cadence HDP-TX PHY(HDMI/DP) driver.
- Audio driver are removed from the patch set, it will be add in another patch set later.[1] https://patchwork.kernel.org/project/linux-rockchip/cover/[email protected]/
Alexander Stein (2):
arm64: dts: imx8mq: Add DCSS + HDMI/DP display pipeline
arm64: dts: imx8mq: tqma8mq-mba8mx: Enable HDMI supportSandor Yu (7):
soc: cadence: Create helper functions for Cadence MHDP
drm: bridge: cadence: Update mhdp8546 mailbox access functions
phy: Add HDMI configuration options
dt-bindings: display: bridge: Add Cadence MHDP8501
drm: bridge: Cadence: Add MHDP8501 DP/HDMI driver
dt-bindings: phy: Add Freescale iMX8MQ DP and HDMI PHY
phy: freescale: Add DisplayPort/HDMI Combo-PHY driver for i.MX8MQ.../display/bridge/cdns,mhdp8501.yaml | 121 ++ .../bindings/phy/fsl,imx8mq-dp-hdmi-phy.yaml | 51 + .../dts/freescale/imx8mq-tqma8mq-mba8mx.dts | 26 + arch/arm64/boot/dts/freescale/imx8mq.dtsi | 68 + arch/arm64/boot/dts/freescale/mba8mx.dtsi | 11 + drivers/gpu/drm/bridge/cadence/Kconfig | 17 + drivers/gpu/drm/bridge/cadence/Makefile | 2 + .../drm/bridge/cadence/cdns-mhdp8501-core.c | 379 +++++ .../drm/bridge/cadence/cdns-mhdp8501-core.h | 380 +++++ .../gpu/drm/bridge/cadence/cdns-mhdp8501-dp.c | 694 ++++++++++ .../drm/bridge/cadence/cdns-mhdp8501-hdmi.c | 745 ++++++++++ .../drm/bridge/cadence/cdns-mhdp8546-core.c | 487 ++----- .../drm/bridge/cadence/cdns-mhdp8546-core.h | 47 +- .../drm/bridge/cadence/cdns-mhdp8546-hdcp.c | 212 +-- .../drm/bridge/cadence/cdns-mhdp8546-hdcp.h | 18 +- drivers/phy/freescale/Kconfig | 10 + drivers/phy/freescale/Makefile | 1 + drivers/phy/freescale/phy-fsl-imx8mq-hdptx.c | 1231 +++++++++++++++++ drivers/soc/Kconfig | 1 + drivers/soc/Makefile | 1 + drivers/soc/cadence/Kconfig | 9 + drivers/soc/cadence/Makefile | 3 + drivers/soc/cadence/cdns-mhdp-helper.c | 565 ++++++++ include/linux/phy/phy-hdmi.h | 19 + include/linux/phy/phy.h | 7 +- include/soc/cadence/cdns-mhdp-helper.h | 129 ++ 26 files changed, 4572 insertions(+), 662 deletions(-) create mode 100644 Documentation/devicetree/bindings/display/bridge/cdns,mhdp8501.yaml create mode 100644 Documentation/devicetree/bindings/phy/fsl,imx8mq-dp-hdmi-phy.yaml create mode 100644 drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.c create mode 100644 drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-core.h create mode 100644 drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-dp.c create mode 100644 drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c create mode 100644 drivers/phy/freescale/phy-fsl-imx8mq-hdptx.c create mode 100644 drivers/soc/cadence/Kconfig create mode 100644 drivers/soc/cadence/Makefile create mode 100644 drivers/soc/cadence/cdns-mhdp-helper.c create mode 100644 include/linux/phy/phy-hdmi.h create mode 100644 include/soc/cadence/cdns-mhdp-helper.hSignature · 1 line
2.34.1