Add Analogix Core Display Port Driver
Subsystems (9)
v14 cover Add Analogix Core Display Port Driver
Hi all,
The Samsung Exynos eDP controller and Rockchip RK3288 eDP controller
share the same IP, so a lot of parts can be re-used. I split the common code into bridge directory, then rk3288 and exynos only need to keep some platform code. Cause I can't find the exact IP name of exynos dp controller, so I decide to name dp core driver with "analogix" which I find in rk3288 eDP TRM
But there are still three light registers setting different between exynos and rk3288.
1. RK3288 have five special pll registers which not indicate in exynos dp controller.
2. The address of DP_PHY_PD(dp phy power manager register) are different between rk3288 and exynos.
3. Rk3288 and exynos have different setting with AUX_HW_RETRY_CTL(dp debug register).
Due to Mark Yao have introduced the ATOMIC support to Rockchip drm, so it's okay to use the ATOMIC helpers functions in connector_funcs. No need to splict the connector init to platform driver anymore, and this is the biggest change since version 11.
This v14 didn't have lots of new changes which seems not the correct time to upgrade the version number, but I have changed ordering of patches (adding 2 more, and removing 2 out). Especially to prevent confusing people, so I updated the whole series.
Thanks,
- Yakir
Changes in v14:
- Rebase the new changes in imx-dp driver
- Split up this patch into 3 parts, make this easy to review (Heiko)
- Remove the Rockchip DP PHY to an separate thread (Heiko)
https://patchwork.kernel.org/patch/8312701/
Changes in v13:
- Use .enable instead of preprare/commit in encoder_helper_funcs (Heiko)
- Fix the missing parameters with drm_encoder_init() helper function. (Heiko)
Changes in v12:
- Move the connector init to analogix_dp driver, and using ATOMIC helper (Heiko)
- Add the ack from Jingoo
- Remove the enum link_rate_type struct, using the marcos in drm_dp_helper.h (Jingoo)
Changes in v11:
- Uses tabs to fix the indentation issues in analogix_dp_core.h (Heiko)
- Rename the "analogix,need-force-hpd" to common 'force-hpd' (Rob)
- Add the ack from Rob Herring
- Revert parts of Gustavo Padovan's changes in commit:
drm/exynos: do not start enabling DP at bind() phase
Add dp phy poweron function in bind time.
- Move the panel prepare from get_modes time to bind time, and move the panel unprepare from bridge->disable to unbind time. (Heiko)
Changes in v10:
- Add the ack from Rob Herring
- Correct the ROCKCHIP_ANALOGIX_DP indentation in Kconfig to tabs here (Heiko)
- Add the ack from Rob Herring
- Remove the surplus "plat_data" check. (Heiko)
- switch (dp->plat_data && dp->plat_data->dev_type) {
+ switch (dp->plat_data->dev_type) {
Changes in v9:
- Document more details for 'ports' property.
Changes in v8:
- Correct the right document path of display-timing.txt (Heiko)
- Correct the misspell of 'from' to 'frm'. (Heiko)
- Modify the commit subject name. (Heiko)
Changes in v7:
- Back to use the of_property_read_bool() interfacs to provoid backward compatibility of "hsync-active-high" "vsync-active-high" "interlaced" to avoid -EOVERFLOW error (Krzysztof)
Changes in v6:
- Fix the Kconfig recursive dependency (Javier)
- Fix Peach Pit hpd property name error:
- hpd-gpio = <&gpx2 6 0>;
+ hpd-gpios = <&gpx2 6 0>;
Changes in v5:
- Correct the check condition of gpio_is_valid when driver try to get the "hpd-gpios" DT propery. (Heiko)
- Move the platform attach callback in the front of core driver bridge attch function. Cause once platform failed at attach, core driver should still failed, so no need to init connector before platform attached (Krzysztof)
- Keep code style no changes with the previous exynos_dp_code.c in this patch, and update commit message about the new export symbol (Krzysztof)
- Gather the device type patch (v4 11/16) into this one. (Krzysztof)
- leave out the connector registration to analogix platform driver. (Thierry)
- Resequence this patch after analogix_dp driver have been split from exynos_dp code, and rephrase reasonable commit message, and remove some controversial style (Krzysztof)
- analogix_dp_write_byte_to_dpcd(
- dp, DP_TEST_RESPONSE,
+ analogix_dp_write_byte_to_dpcd(dp,
+ DP_TEST_RESPONSE,
DP_TEST_EDID_CHECKSUM_WRITE);- Switch video timing type to "u32", so driver could use "of_property_read_u32" to get the backword timing values. Krzysztof suggest me that driver could use the "of_property_read_bool" to get backword timing values, but that interfacs would modify the original drm_display_mode timing directly (whether those properties exists or not).
- Correct the misspell in commit message. (Krzysztof)
- Remove the empty line at the end of document, and correct the endpoint numbers in the example DT node, and remove the regulator iomux setting in driver code while using the pinctl in devicetree instead. (Heiko)
- Add device type declared, cause the previous "platform device type support (v4 11/16)" already merge into (v5 02/14).
- Implement connector registration code. (Thierry)
- Split binding doc's from driver changes. (Rob)
- Add eDP hotplug pinctrl property. (Heiko)
Changes in v4:
- Update "analogix,hpd-gpios" to "hpd-gpios" DT propery. (Rob)
- Rename "analogix_dp-exynos.c" file name to "exynos_dp.c" (Jingoo)
- Create a separate folder for analogix code in bridge/ (Archit)
- Update commit message more readable. (Jingoo)
- Adjust the order from 05 to 04
- Provide backword compatibility with samsung. (Krzysztof)
- Split all DTS changes, and provide backward compatibility. Mark old properties as deprecated but still support them. (Krzysztof)
- Update "analogix,hpd-gpio" to "hpd-gpios" prop name. (Rob)
- Deprecated some properties which could parsed from Edid/Mode/DPCD. (Thierry)
"analogix,color-space" & "analogix,color-depth" &
"analogix,link-rate" & "analogix,lane-count" &
"analogix,ycbcr-coeff" & "analogix,dynamic-range" &
"vsync-active-high" & "hsync-active-high" & "interlaces"
- Separate all DTS changes to a separate patch. (Krzysztof)
- Remove some deprecated DT properties in rockchip dp document.
- Seprate the link-rate and lane-count limit out with the device_type flag. (Thierry)
- Take Jingoo suggest, add commit messages.
- Call drm_panel_prepare() in .get_modes function, ensure panel should power on before driver try to read edid message.
Changes in v3:
- Move exynos's video_timing code to analogix_dp-exynos platform driver, add get_modes method to struct analogix_dp_plat_data. (Thierry)
- Rename some "samsung*" dts propery to "analogix*". (Heiko)
- The link_rate and lane_count shouldn't config to the DT property value directly, but we can take those as hardware limite. For example, RK3288 only support 4 physical lanes of 2.7/1.62 Gbps/lane, so DT property would like "link-rate = 0x0a" "lane-count = 4". (Thierry)
- Dynamic parse video timing info from struct drm_display_mode and struct drm_display_info. (Thierry)
- Add devicetree binding documents. (Heiko)
- Remove sync pol & colorimetry properies from the new analogix dp driver devicetree binding. (Thierry)
- Update the exist exynos dtsi file with the latest DP DT properies.
- Leave "sclk_edp_24m" to rockchip dp phy driver which name to "24m", and leave "sclk_edp" to analogix dp core driver which name to "dp", and leave "pclk_edp" to rockchip dp platform driver which name to "pclk". (Thierry & Heiko)
- Add devicetree binding document. (Heiko)
- Remove "rockchip,panel" DT property, take use of remote point to get panel node. (Heiko)
- Add the new function point dp_platdata->get_modes() init.
- Add "analogix,need-force-hpd" to indicate whether driver need foce hpd when hpd detect failed.
- move dp hpd detect to connector detect function.
- Add edid modes parse support
Changes in v2:
- Remove new copyright (Jingoo)
- Fix compiled failed due to analogix_dp_device misspell
- Improved commit message more readable, and avoid using some uncommon style like bellow: (Joe Preches)
- retval = exynos_dp_read_bytes_from_i2c(...
...);
+ retval =
+ exynos_dp_read_bytes_from_i2c(......);
- Get panel node with remote-endpoint method, and create devicetree binding for driver. (Heiko)
- Remove the clock enable/disbale with "sclk_edp" & "sclk_edp_24m", leave those clock to rockchip dp phy driver.
- Fix compile failed dut to phy_pd_addr variable misspell error
Heiko Stuebner (2):
drm/exynos: dp: rename implementation specific driver part
drm: bridge: analogix/dp: rename register constants
Yakir Yang (15):
drm: bridge: analogix/dp: split exynos dp driver to bridge directory
drm: bridge: analogix/dp: fix some obvious code style
drm: bridge: analogix/dp: remove duplicate configuration of link rate
and link count
drm: bridge: analogix/dp: dynamic parse sync_pol & interlace &
dynamic_range
dt-bindings: add document for analogix display port driver
ARM: dts: exynos/dp: remove some properties that deprecated by
analogix_dp driver
drm: rockchip: dp: add rockchip platform dp driver
dt-bindings: add document for rockchip variant of analogix_dp
drm: bridge: analogix/dp: add some rk3288 special registers setting
drm: bridge: analogix/dp: add max link rate and lane count limit for
RK3288
drm: bridge: analogix/dp: try force hpd after plug in lookup failed
drm: bridge: analogix/dp: move hpd detect to connector detect function
drm: bridge: analogix/dp: add edid modes parse in get_modes method
drm: bridge: analogix/dp: add panel prepare/unprepare in
suspend/resume time
drm: bridge: analogix/dp: Fix the possible dead lock in bridge disable
time
.../bindings/display/bridge/analogix_dp.txt | 52 +
.../bindings/display/exynos/exynos_dp.txt | 93 +-
.../display/rockchip/analogix_dp-rockchip.txt | 92 ++
arch/arm/boot/dts/exynos5250-arndale.dts | 2 -
arch/arm/boot/dts/exynos5250-smdk5250.dts | 2 -
arch/arm/boot/dts/exynos5250-snow-common.dtsi | 4 +-
arch/arm/boot/dts/exynos5250-spring.dts | 4 +-
arch/arm/boot/dts/exynos5420-peach-pit.dts | 4 +-
arch/arm/boot/dts/exynos5420-smdk5420.dts | 2 -
arch/arm/boot/dts/exynos5800-peach-pi.dts | 2 -
drivers/gpu/drm/bridge/Kconfig | 2 +
drivers/gpu/drm/bridge/Makefile | 1 +
drivers/gpu/drm/bridge/analogix/Kconfig | 3 +
drivers/gpu/drm/bridge/analogix/Makefile | 1 +
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 1430 ++++++++++++++++++
drivers/gpu/drm/bridge/analogix/analogix_dp_core.h | 281 ++++
drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 1320 +++++++++++++++++
.../analogix/analogix_dp_reg.h} | 270 ++--
drivers/gpu/drm/exynos/Kconfig | 3 +-
drivers/gpu/drm/exynos/Makefile | 2 +-
drivers/gpu/drm/exynos/exynos_dp.c | 324 +++++
drivers/gpu/drm/exynos/exynos_dp_core.c | 1510 --------------------
drivers/gpu/drm/exynos/exynos_dp_core.h | 282 ----
drivers/gpu/drm/exynos/exynos_dp_reg.c | 1263 ----------------
drivers/gpu/drm/rockchip/Kconfig | 9 +
drivers/gpu/drm/rockchip/Makefile | 1 +
drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 384 +++++
include/drm/bridge/analogix_dp.h | 41 +
28 files changed, 4115 insertions(+), 3269 deletions(-)
create mode 100644 Documentation/devicetree/bindings/display/bridge/analogix_dp.txt
create mode 100644 Documentation/devicetree/bindings/display/rockchip/analogix_dp-rockchip.txt
create mode 100644 drivers/gpu/drm/bridge/analogix/Kconfig
create mode 100644 drivers/gpu/drm/bridge/analogix/Makefile
create mode 100644 drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
create mode 100644 drivers/gpu/drm/bridge/analogix/analogix_dp_core.h
create mode 100644 drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
rename drivers/gpu/drm/{exynos/exynos_dp_reg.h => bridge/analogix/analogix_dp_reg.h} (62%)
create mode 100644 drivers/gpu/drm/exynos/exynos_dp.c
delete mode 100644 drivers/gpu/drm/exynos/exynos_dp_core.c
delete mode 100644 drivers/gpu/drm/exynos/exynos_dp_core.h
delete mode 100644 drivers/gpu/drm/exynos/exynos_dp_reg.c
create mode 100644 drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
create mode 100644 include/drm/bridge/analogix_dp.hSignature · 1 line
1.9.1
PATCH v14 1/17 drm: bridge: analogix/dp: split exynos dp driver to bridge directory
Split the dp core driver from exynos directory to bridge directory, and rename the core driver to analogix_dp_*, rename the platform code to exynos_dp.
Beside the new analogix_dp driver would export six hooks. "analogix_dp_bind()" and "analogix_dp_unbind()" "analogix_dp_suspned()" and "analogix_dp_resume()" "analogix_dp_detect()" and "analogix_dp_get_modes()"
The bind/unbind symbols is used for analogix platform driver to connect with analogix_dp core driver. And the detect/get_modes is used for analogix platform driver to init the connector.
They reason why connector need register in helper driver is rockchip drm haven't implement the atomic API, but Exynos drm have implement it, so there would need two different connector helper functions, that's why we leave the connector register in helper driver.
---
Changes in v14:
- Rebase the new changes in imx-dp driver
- Split up this patch into 3 parts, make this easy to review (Heiko)
Changes in v13: None
Changes in v12:
- Move the connector init to analogix_dp driver, and using ATOMIC helper (Heiko)
Changes in v11:
- Uses tabs to fix the indentation issues in analogix_dp_core.h (Heiko)
Changes in v10: None
Changes in v9: None
Changes in v8: None
Changes in v7: None
Changes in v6:
- Fix the Kconfig recursive dependency (Javier)
Changes in v5:
- Correct the check condition of gpio_is_valid when driver try to get the "hpd-gpios" DT propery. (Heiko)
- Move the platform attach callback in the front of core driver bridge attch function. Cause once platform failed at attach, core driver should still failed, so no need to init connector before platform attached (Krzysztof)
- Keep code style no changes with the previous exynos_dp_code.c in this patch, and update commit message about the new export symbol (Krzysztof)
- Gather the device type patch (v4 11/16) into this one. (Krzysztof)
- leave out the connector registration to analogix platform driver. (Thierry)
Changes in v4:
- Update "analogix,hpd-gpios" to "hpd-gpios" DT propery. (Rob)
- Rename "analogix_dp-exynos.c" file name to "exynos_dp.c" (Jingoo)
- Create a separate folder for analogix code in bridge/ (Archit)
Changes in v3:
- Move exynos's video_timing code to analogix_dp-exynos platform driver, add get_modes method to struct analogix_dp_plat_data. (Thierry)
- Rename some "samsung*" dts propery to "analogix*". (Heiko)
Changes in v2:
- Remove new copyright (Jingoo)
- Fix compiled failed due to analogix_dp_device misspell
drivers/gpu/drm/bridge/Kconfig | 2 +
drivers/gpu/drm/bridge/Makefile | 1 +
drivers/gpu/drm/bridge/analogix/Kconfig | 3 +
drivers/gpu/drm/bridge/analogix/Makefile | 1 +
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 1351 +++++++++++++++++++
drivers/gpu/drm/bridge/analogix/analogix_dp_core.h | 277 ++++
.../analogix/analogix_dp_reg.c} | 160 +--
.../analogix/analogix_dp_reg.h} | 8 +-
drivers/gpu/drm/exynos/Kconfig | 3 +-
drivers/gpu/drm/exynos/Makefile | 2 +-
drivers/gpu/drm/exynos/exynos_dp_core.c | 1352 ++------------------
drivers/gpu/drm/exynos/exynos_dp_core.h | 282 ----
include/drm/bridge/analogix_dp.h | 40 +
13 files changed, 1845 insertions(+), 1637 deletions(-)
create mode 100644 drivers/gpu/drm/bridge/analogix/Kconfig
create mode 100644 drivers/gpu/drm/bridge/analogix/Makefile
create mode 100644 drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
create mode 100644 drivers/gpu/drm/bridge/analogix/analogix_dp_core.h
rename drivers/gpu/drm/{exynos/exynos_dp_reg.c => bridge/analogix/analogix_dp_reg.c} (84%)
rename drivers/gpu/drm/{exynos/exynos_dp_reg.h => bridge/analogix/analogix_dp_reg.h} (98%)
delete mode 100644 drivers/gpu/drm/exynos/exynos_dp_core.h
create mode 100644 include/drm/bridge/analogix_dp.hdrivers/gpu/drm/bridge/Kconfig +2 -0
@@ -40,4 +40,6 @@ config DRM_PARADE_PS8622 ---help--- Parade eDP-LVDS bridge chip driver. +source "drivers/gpu/drm/bridge/analogix/Kconfig" + endmenu
drivers/gpu/drm/bridge/Makefile +1 -0
@@ -4,3 +4,4 @@ obj-$(CONFIG_DRM_DW_HDMI) += dw-hdmi.o obj-$(CONFIG_DRM_DW_HDMI_AHB_AUDIO) += dw-hdmi-ahb-audio.o obj-$(CONFIG_DRM_NXP_PTN3460) += nxp-ptn3460.o obj-$(CONFIG_DRM_PARADE_PS8622) += parade-ps8622.o +obj-$(CONFIG_DRM_ANALOGIX_DP) += analogix/
drivers/gpu/drm/bridge/analogix/Kconfig new file +3 -0
@@ -0,0 +1,3 @@ +config DRM_ANALOGIX_DP + tristate + depends on DRM
drivers/gpu/drm/bridge/analogix/Makefile new file +1 -0
@@ -0,0 +1 @@ +obj-$(CONFIG_DRM_ANALOGIX_DP) += analogix_dp_core.o analogix_dp_reg.o
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c new file +1351 -0
1,351 lines not on this page · raw message
drivers/gpu/drm/bridge/analogix/analogix_dp_core.h new file +277 -0
277 lines not on this page · raw message
drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c renamed from drivers/gpu/drm/exynos/exynos_dp_reg.c +80 -80
596 lines not on this page · raw message
drivers/gpu/drm/bridge/analogix/analogix_dp_reg.h renamed from drivers/gpu/drm/exynos/exynos_dp_reg.h +4 -4
@@ -1,5 +1,5 @@/* -* Register definition file for Samsung DP driver +* Register definition file for Analogix DP core driver * * Copyright (C) 2012 Samsung Electronics Co., Ltd. * Author: Jingoo Han <[email protected]>
@@ -9,8 +9,8 @@* published by the Free Software Foundation. */ -#ifndef _EXYNOS_DP_REG_H -#define _EXYNOS_DP_REG_H +#ifndef _ANALOGIX_DP_REG_H +#define _ANALOGIX_DP_REG_H#define EXYNOS_DP_TX_SW_RESET 0x14#define EXYNOS_DP_FUNC_EN_1 0x18
@@ -363,4 +363,4 @@#define VIDEO_MODE_SLAVE_MODE (0x1 << 0)#define VIDEO_MODE_MASTER_MODE (0x0 << 0) -#endif /* _EXYNOS_DP_REG_H */ +#endif /* _ANALOGIX_DP_REG_H */
drivers/gpu/drm/exynos/Kconfig +2 -1
@@ -71,8 +71,9 @@ config DRM_EXYNOS_DSI This enables support for Exynos MIPI-DSI device. config DRM_EXYNOS_DP - bool "Display Port" + bool "EXYNOS specific extensions for Analogix DP driver" depends on DRM_EXYNOS_FIMD || DRM_EXYNOS7_DECON + select DRM_ANALOGIX_DP default DRM_EXYNOS select DRM_PANEL help
drivers/gpu/drm/exynos/Makefile +1 -1
@@ -13,7 +13,7 @@ exynosdrm-$(CONFIG_DRM_EXYNOS5433_DECON) += exynos5433_drm_decon.o exynosdrm-$(CONFIG_DRM_EXYNOS7_DECON) += exynos7_drm_decon.o exynosdrm-$(CONFIG_DRM_EXYNOS_DPI) += exynos_drm_dpi.o exynosdrm-$(CONFIG_DRM_EXYNOS_DSI) += exynos_drm_dsi.o -exynosdrm-$(CONFIG_DRM_EXYNOS_DP) += exynos_dp_core.o exynos_dp_reg.o +exynosdrm-$(CONFIG_DRM_EXYNOS_DP) += exynos_dp_core.o exynosdrm-$(CONFIG_DRM_EXYNOS_MIXER) += exynos_mixer.o exynosdrm-$(CONFIG_DRM_EXYNOS_HDMI) += exynos_hdmi.o exynosdrm-$(CONFIG_DRM_EXYNOS_VIDI) += exynos_drm_vidi.o
drivers/gpu/drm/exynos/exynos_dp_core.c +83 -1269
723 lines not on this page · raw message
drivers/gpu/drm/exynos/exynos_dp_core.h deleted +0 -282
282 lines not on this page · raw message
include/drm/bridge/analogix_dp.h new file +40 -0
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 7 lines
1.9.1 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Part of the diff is not shown here. View the raw message.
Heiko Stübner
maintainerPATCH 1/17 drm: bridge: analogix/dp: split exynos dp driver to bridge directory
Split the dp core driver from exynos directory to bridge directory, and rename the core driver to analogix_dp_*, rename the platform code to exynos_dp.
Beside the new analogix_dp driver would export six hooks. "analogix_dp_bind()" and "analogix_dp_unbind()" "analogix_dp_suspned()" and "analogix_dp_resume()" "analogix_dp_detect()" and "analogix_dp_get_modes()"
The bind/unbind symbols is used for analogix platform driver to connect with analogix_dp core driver. And the detect/get_modes is used for analogix platform driver to init the connector.
They reason why connector need register in helper driver is rockchip drm haven't implement the atomic API, but Exynos drm have implement it, so there would need two different connector helper functions, that's why we leave the connector register in helper driver.
---
Changes in v14.1:
- Rebase against drm-next from 2016-03-17
(adapt to another round of exynos-dp changes)
Changes in v14:
- Rebase the new changes in imx-dp driver
- Split up this patch into 3 parts, make this easy to review (Heiko)
Changes in v13: None
Changes in v12:
- Move the connector init to analogix_dp driver, and using ATOMIC helper (Heiko)
Changes in v11:
- Uses tabs to fix the indentation issues in analogix_dp_core.h (Heiko)
Changes in v10: None
Changes in v9: None
Changes in v8: None
Changes in v7: None
Changes in v6:
- Fix the Kconfig recursive dependency (Javier)
Changes in v5:
- Correct the check condition of gpio_is_valid when driver try to get the "hpd-gpios" DT propery. (Heiko)
- Move the platform attach callback in the front of core driver bridge attch function. Cause once platform failed at attach, core driver should still failed, so no need to init connector before platform attached (Krzysztof)
- Keep code style no changes with the previous exynos_dp_code.c in this patch, and update commit message about the new export symbol (Krzysztof)
- Gather the device type patch (v4 11/16) into this one. (Krzysztof)
- leave out the connector registration to analogix platform driver. (Thierry)
Changes in v4:
- Update "analogix,hpd-gpios" to "hpd-gpios" DT propery. (Rob)
- Rename "analogix_dp-exynos.c" file name to "exynos_dp.c" (Jingoo)
- Create a separate folder for analogix code in bridge/ (Archit)
Changes in v3:
- Move exynos's video_timing code to analogix_dp-exynos platform driver, add get_modes method to struct analogix_dp_plat_data. (Thierry)
- Rename some "samsung*" dts propery to "analogix*". (Heiko)
Changes in v2:
- Remove new copyright (Jingoo)
- Fix compiled failed due to analogix_dp_device misspell
drivers/gpu/drm/bridge/Kconfig | 2 + drivers/gpu/drm/bridge/Makefile | 1 + drivers/gpu/drm/bridge/analogix/Kconfig | 3 + drivers/gpu/drm/bridge/analogix/Makefile | 1 + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 1351 +++++++++++++++++++ drivers/gpu/drm/bridge/analogix/analogix_dp_core.h | 277 ++++ drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 1263 ++++++++++++++++++ drivers/gpu/drm/bridge/analogix/analogix_dp_reg.h | 366 ++++++ drivers/gpu/drm/exynos/Kconfig | 3 +- drivers/gpu/drm/exynos/Makefile | 2 +- drivers/gpu/drm/exynos/exynos_dp_core.c | 1353 ++------------------ drivers/gpu/drm/exynos/exynos_dp_core.h | 282 ---- drivers/gpu/drm/exynos/exynos_dp_reg.c | 1263 ------------------ drivers/gpu/drm/exynos/exynos_dp_reg.h | 366 ------ include/drm/bridge/analogix_dp.h | 40 + 15 files changed, 3391 insertions(+), 3182 deletions(-) create mode 100644 drivers/gpu/drm/bridge/analogix/Kconfig create mode 100644 drivers/gpu/drm/bridge/analogix/Makefile create mode 100644 drivers/gpu/drm/bridge/analogix/analogix_dp_core.c create mode 100644 drivers/gpu/drm/bridge/analogix/analogix_dp_core.h create mode 100644 drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c create mode 100644 drivers/gpu/drm/bridge/analogix/analogix_dp_reg.h delete mode 100644 drivers/gpu/drm/exynos/exynos_dp_core.h delete mode 100644 drivers/gpu/drm/exynos/exynos_dp_reg.c delete mode 100644 drivers/gpu/drm/exynos/exynos_dp_reg.h create mode 100644 include/drm/bridge/analogix_dp.h
drivers/gpu/drm/bridge/Kconfig +2 -0
@@ -40,4 +40,6 @@ config DRM_PARADE_PS8622 ---help--- Parade eDP-LVDS bridge chip driver. +source "drivers/gpu/drm/bridge/analogix/Kconfig" + endmenu
drivers/gpu/drm/bridge/Makefile +1 -0
@@ -4,3 +4,4 @@ obj-$(CONFIG_DRM_DW_HDMI) += dw-hdmi.o obj-$(CONFIG_DRM_DW_HDMI_AHB_AUDIO) += dw-hdmi-ahb-audio.o obj-$(CONFIG_DRM_NXP_PTN3460) += nxp-ptn3460.o obj-$(CONFIG_DRM_PARADE_PS8622) += parade-ps8622.o +obj-$(CONFIG_DRM_ANALOGIX_DP) += analogix/
drivers/gpu/drm/bridge/analogix/Kconfig new file +3 -0
@@ -0,0 +1,3 @@ +config DRM_ANALOGIX_DP + tristate + depends on DRM
drivers/gpu/drm/bridge/analogix/Makefile new file +1 -0
@@ -0,0 +1 @@ +obj-$(CONFIG_DRM_ANALOGIX_DP) += analogix_dp_core.o analogix_dp_reg.o
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c new file +1351 -0
1,351 lines not on this page · raw message
drivers/gpu/drm/bridge/analogix/analogix_dp_core.h new file +277 -0
277 lines not on this page · raw message
drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c new file +1263 -0
1,263 lines not on this page · raw message
drivers/gpu/drm/bridge/analogix/analogix_dp_reg.h new file +366 -0
95 lines not on this page · raw message
drivers/gpu/drm/exynos/exynos_dp_core.c +84 -1269
1,353 lines not on this page · raw message
drivers/gpu/drm/exynos/exynos_dp_core.h deleted +0 -282
282 lines not on this page · raw message
drivers/gpu/drm/exynos/exynos_dp_reg.c deleted +0 -1263
1,263 lines not on this page · raw message
drivers/gpu/drm/exynos/exynos_dp_reg.h deleted +0 -366
366 lines not on this page · raw message
include/drm/bridge/analogix_dp.h new file +40 -0
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 7 lines
2.6.4 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Part of the diff is not shown here. View the raw message.
Re: [PATCH v14.1 01/17] drm: bridge: analogix/dp: split exynos dp driver to bridge directory
Hi Samsung Guys,
Can you take your time to test or review for exynos controller?:-)
Anyway, verified on rockchip controller.
So feel free add my test tag for this patch.
Quoted 13 lines · Heiko Stübner
Split the dp core driver from exynos directory to bridge directory, and rename the core driver to analogix_dp_*, rename the platform code to
exynos_dp.Beside the new
analogix_dpdriver would export six hooks. "analogix_dp_bind()" and "analogix_dp_unbind()" "analogix_dp_suspned()" and "analogix_dp_resume()" "analogix_dp_detect()" and "analogix_dp_get_modes()"The bind/unbind symbols is used for analogix platform driver to connect with
analogix_dpcore driver. And the detect/get_modes is used for analogix platform driver to init the connector.
Quoted 6 lines
They reason why connector need register in helper driver is rockchip drm haven't implement the atomic API, but Exynos drm have implement it, so there would need two different connector helper functions, that's why we leave the connector register in helper driver.
Signed-off-by Yakir Yang <[email protected]>
Quoted 6,915 lines
---
Changes in v14.1:
- Rebase against drm-next from 2016-03-17
(adapt to another round of exynos-dp changes)Changes in v14:
- Rebase the new changes in imx-dp driver
- Split up this patch into 3 parts, make this easy to review (Heiko)Changes in v13: None
Changes in v12:
- Move the connector init toanalogix_dpdriver, and using ATOMIC helper (Heiko)Changes in v11:
- Uses tabs to fix the indentation issues inanalogix_dp_core.h(Heiko)Changes in v10: None
Changes in v9: None
Changes in v8: None
Changes in v7: None
Changes in v6:
- Fix theKconfigrecursive dependency (Javier)Changes in v5:
- Correct the check condition ofgpio_is_validwhen driver try to get the "hpd-gpios" DT propery. (Heiko)
- Move the platform attach callback in the front of core driver bridge attch function. Cause once platform failed at attach, core driver should still failed, so no need to init connector before platform attached (Krzysztof)
- Keep code style no changes with the previousexynos_dp_code.cin this patch, and update commit message about the new export symbol (Krzysztof)
- Gather the device type patch (v4 11/16) into this one. (Krzysztof)
- leave out the connector registration to analogix platform driver. (Thierry)Changes in v4:
- Update "analogix,hpd-gpios" to "hpd-gpios" DT propery. (Rob)
- Rename "analogix_dp-exynos.c" file name to "exynos_dp.c" (Jingoo)
- Create a separate folder for analogix code in bridge/ (Archit)Changes in v3:
- Move exynos'svideo_timingcode to analogix_dp-exynos platform driver, addget_modesmethod to structanalogix_dp_plat_data. (Thierry)
- Rename some "samsung*" dts propery to "analogix*". (Heiko)Changes in v2:
- Remove new copyright (Jingoo)
- Fix compiled failed due toanalogix_dp_devicemisspelldrivers/gpu/drm/bridge/Kconfig | 2 + drivers/gpu/drm/bridge/Makefile | 1 + drivers/gpu/drm/bridge/analogix/Kconfig | 3 + drivers/gpu/drm/bridge/analogix/Makefile | 1 + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 1351 +++++++++++++++++++ drivers/gpu/drm/bridge/analogix/analogix_dp_core.h | 277 ++++ drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 1263 ++++++++++++++++++ drivers/gpu/drm/bridge/analogix/analogix_dp_reg.h | 366 ++++++ drivers/gpu/drm/exynos/Kconfig | 3 +- drivers/gpu/drm/exynos/Makefile | 2 +- drivers/gpu/drm/exynos/exynos_dp_core.c | 1353 ++------------------ drivers/gpu/drm/exynos/exynos_dp_core.h | 282 ---- drivers/gpu/drm/exynos/exynos_dp_reg.c | 1263 ------------------ drivers/gpu/drm/exynos/exynos_dp_reg.h | 366 ------ include/drm/bridge/analogix_dp.h | 40 + 15 files changed, 3391 insertions(+), 3182 deletions(-)create mode 100644
drivers/gpu/drm/bridge/analogix/Kconfigcreate mode 100644drivers/gpu/drm/bridge/analogix/Makefilecreate mode 100644drivers/gpu/drm/bridge/analogix/analogix_dp_core.ccreate mode 100644drivers/gpu/drm/bridge/analogix/analogix_dp_core.hcreate mode 100644drivers/gpu/drm/bridge/analogix/analogix_dp_reg.ccreate mode 100644drivers/gpu/drm/bridge/analogix/analogix_dp_reg.hdelete mode 100644drivers/gpu/drm/exynos/exynos_dp_core.hdelete mode 100644drivers/gpu/drm/exynos/exynos_dp_reg.cdelete mode 100644drivers/gpu/drm/exynos/exynos_dp_reg.hcreate mode 100644include/drm/bridge/analogix_dp.hdrivers/gpu/drm/bridge/Kconfig +2
-0@@ -40,4 +40,6 @@ config DRM_PARADE_PS8622 ---help--- Parade eDP-LVDS bridge chip driver. +source "drivers/gpu/drm/bridge/analogix/Kconfig" + endmenudrivers/gpu/drm/bridge/Makefile +1
-0@@ -4,3 +4,4 @@ obj-$(CONFIG_DRM_DW_HDMI) += dw-hdmi.o obj-$(CONFIG_DRM_DW_HDMI_AHB_AUDIO) += dw-hdmi-ahb-audio.o obj-$(CONFIG_DRM_NXP_PTN3460) += nxp-ptn3460.o obj-$(CONFIG_DRM_PARADE_PS8622) += parade-ps8622.o +obj-$(CONFIG_DRM_ANALOGIX_DP) += analogix/drivers/gpu/drm/bridge/analogix/Kconfig new file +3
-0@@ -0,0 +1,3 @@ +config DRM_ANALOGIX_DP + tristate + depends on DRMdrivers/gpu/drm/bridge/analogix/Makefile new file +1
-0@@ -0,0 +1 @@ +obj-$(CONFIG_DRM_ANALOGIX_DP) += analogix_dp_core.o analogix_dp_reg.odrivers/gpu/drm/bridge/analogix/analogix_dp_core.c new file +1351
-0@@ -0,0 +1,1351 @@ +/* +* Analogix DP (Display Port) core interface driver. +* +* Copyright (C) 2012 Samsung Electronics Co., Ltd. +* Author: Jingoo Han <[email protected]> +* +* This program is free software; you can redistribute it and/or modify it +* under the terms of the GNU General Public License as published by the +* Free Software Foundation; either version 2 of the License, or (at your +* option) any later version. +*/ + +#include <linux/module.h> +#include <linux/platform_device.h> +#include <linux/err.h> +#include <linux/clk.h> +#include <linux/io.h> +#include <linux/interrupt.h> +#include <linux/of.h> +#include <linux/of_gpio.h> +#include <linux/gpio.h> +#include <linux/component.h> +#include <linux/phy/phy.h> + +#include <drm/drmP.h> +#include <drm/drm_atomic_helper.h> +#include <drm/drm_crtc.h> +#include <drm/drm_crtc_helper.h> +#include <drm/drm_panel.h> + +#include <drm/bridge/analogix_dp.h> + +#include "analogix_dp_core.h" + +#define to_dp (nm) container_of(nm, struct analogix_dp_device, nm) + +struct bridge_init { +struct i2c_client *client; +struct device_node *node; +}; + +static void analogix_dp_init_dp (struct analogix_dp_device *dp) +{ +analogix_dp_reset (dp); + +analogix_dp_swreset (dp); + +analogix_dp_init_analog_param (dp); +analogix_dp_init_interrupt (dp); + +/* SW defined function Normal operation */ +analogix_dp_enable_sw_function (dp); + +analogix_dp_config_interrupt (dp); +analogix_dp_init_analog_func (dp); + +analogix_dp_init_hpd (dp); +analogix_dp_init_aux (dp); +} + +static int analogix_dp_detect_hpd (struct analogix_dp_device *dp) +{ +int timeout_loop =0 ; + +while (analogix_dp_get_plug_in_status (dp) !=0 ) { + timeout_loop++; +if (DP_TIMEOUT_LOOP_COUNT < timeout_loop) { +dev_err (dp->dev,"failed to get hpd plug status\n" ); +return -ETIMEDOUT ; + } +usleep_range (10 ,11 ); + } + +return 0 ; +} + +static unsigned char analogix_dp_calc_edid_check_sum (unsigned char *edid_data) +{ +int i; +unsigned char sum =0 ; + +for (i =0 ; i <EDID_BLOCK_LENGTH ; i++) + sum = sum + edid_data[i]; + +return sum; +} + +static int analogix_dp_read_edid (struct analogix_dp_device *dp) +{ +unsigned char edid[EDID_BLOCK_LENGTH *2 ]; +unsigned int extend_block =0 ; +unsigned char sum; +unsigned char test_vector; +int retval; + +/* +* EDID device address is 0x50. +* However, if necessary, you must have set upper address +* into E-EDID in I2C device, 0x30. +*/ + +/* Read Extension Flag, Number of 128-byte EDID extension blocks */ + retval =analogix_dp_read_byte_from_i2c (dp,I2C_EDID_DEVICE_ADDR , +EDID_EXTENSION_FLAG , + &extend_block); +if (retval) +return retval; + +if (extend_block >0 ) { +dev_dbg (dp->dev,"EDID data includes a single extension!\n" ); + +/* Read EDID data */ + retval =analogix_dp_read_bytes_from_i2c (dp,I2C_EDID_DEVICE_ADDR , +EDID_HEADER_PATTERN , +EDID_BLOCK_LENGTH , + &edid[EDID_HEADER_PATTERN ]); +if (retval !=0 ) { +dev_err (dp->dev,"EDID Read failed!\n" ); +return -EIO ; + } + sum =analogix_dp_calc_edid_check_sum (edid); +if (sum !=0 ) { +dev_err (dp->dev,"EDID bad checksum!\n" ); +return -EIO ; + } + +/* Read additional EDID data */ + retval =analogix_dp_read_bytes_from_i2c (dp, +I2C_EDID_DEVICE_ADDR , +EDID_BLOCK_LENGTH , +EDID_BLOCK_LENGTH , + &edid[EDID_BLOCK_LENGTH ]); +if (retval !=0 ) { +dev_err (dp->dev,"EDID Read failed!\n" ); +return -EIO ; + } + sum =analogix_dp_calc_edid_check_sum (&edid[EDID_BLOCK_LENGTH ]); +if (sum !=0 ) { +dev_err (dp->dev,"EDID bad checksum!\n" ); +return -EIO ; + } + +analogix_dp_read_byte_from_dpcd (dp,DP_TEST_REQUEST , + &test_vector); +if (test_vector &DP_TEST_LINK_EDID_READ ) { +analogix_dp_write_byte_to_dpcd (dp, +DP_TEST_EDID_CHECKSUM , + edid[EDID_BLOCK_LENGTH +EDID_CHECKSUM ]); +analogix_dp_write_byte_to_dpcd (dp, +DP_TEST_RESPONSE , +DP_TEST_EDID_CHECKSUM_WRITE ); + } + }else { +dev_info (dp->dev,"EDID data does not include any extensions.\n" ); + +/* Read EDID data */ + retval =analogix_dp_read_bytes_from_i2c (dp, +I2C_EDID_DEVICE_ADDR , +EDID_HEADER_PATTERN , +EDID_BLOCK_LENGTH , + &edid[EDID_HEADER_PATTERN ]); +if (retval !=0 ) { +dev_err (dp->dev,"EDID Read failed!\n" ); +return -EIO ; + } + sum =analogix_dp_calc_edid_check_sum (edid); +if (sum !=0 ) { +dev_err (dp->dev,"EDID bad checksum!\n" ); +return -EIO ; + } + +analogix_dp_read_byte_from_dpcd (dp, +DP_TEST_REQUEST , + &test_vector); +if (test_vector &DP_TEST_LINK_EDID_READ ) { +analogix_dp_write_byte_to_dpcd (dp, +DP_TEST_EDID_CHECKSUM , + edid[EDID_CHECKSUM ]); +analogix_dp_write_byte_to_dpcd (dp, +DP_TEST_RESPONSE , +DP_TEST_EDID_CHECKSUM_WRITE ); + } + } + +dev_dbg (dp->dev,"EDID Read success!\n" ); +return 0 ; +} + +static int analogix_dp_handle_edid (struct analogix_dp_device *dp) +{ +u8 buf[12 ]; +int i; +int retval; + +/* Read DPCD DP_DPCD_REV~RECEIVE_PORT1_CAP_1 */ + retval =analogix_dp_read_bytes_from_dpcd (dp,DP_DPCD_REV , +12 , buf); +if (retval) +return retval; + +/* Read EDID */ +for (i =0 ; i <3 ; i++) { + retval =analogix_dp_read_edid (dp); +if (!retval) +break ; + } + +return retval; +} + +static void analogix_dp_enable_rx_to_enhanced_mode (struct analogix_dp_device *dp, +bool enable) +{ +u8 data; + +analogix_dp_read_byte_from_dpcd (dp,DP_LANE_COUNT_SET , &data); + +if (enable) +analogix_dp_write_byte_to_dpcd (dp,DP_LANE_COUNT_SET , +DP_LANE_COUNT_ENHANCED_FRAME_EN | +DPCD_LANE_COUNT_SET (data)); +else +analogix_dp_write_byte_to_dpcd (dp,DP_LANE_COUNT_SET , +DPCD_LANE_COUNT_SET (data)); +} + +static int analogix_dp_is_enhanced_mode_available (struct analogix_dp_device *dp) +{ +u8 data; +int retval; + +analogix_dp_read_byte_from_dpcd (dp,DP_MAX_LANE_COUNT , &data); + retval =DPCD_ENHANCED_FRAME_CAP (data); + +return retval; +} + +static void analogix_dp_set_enhanced_mode (struct analogix_dp_device *dp) +{ +u8 data; + + data =analogix_dp_is_enhanced_mode_available (dp); +analogix_dp_enable_rx_to_enhanced_mode (dp, data); +analogix_dp_enable_enhanced_mode (dp, data); +} + +static void analogix_dp_training_pattern_dis (struct analogix_dp_device *dp) +{ +analogix_dp_set_training_pattern (dp,DP_NONE ); + +analogix_dp_write_byte_to_dpcd (dp, +DP_TRAINING_PATTERN_SET , +DP_TRAINING_PATTERN_DISABLE ); +} + +static void analogix_dp_set_lane_lane_pre_emphasis (struct analogix_dp_device *dp, +int pre_emphasis,int lane) +{ +switch (lane) { +case 0 : +analogix_dp_set_lane0_pre_emphasis (dp, pre_emphasis); +break ; +case 1 : +analogix_dp_set_lane1_pre_emphasis (dp, pre_emphasis); +break ; + +case 2 : +analogix_dp_set_lane2_pre_emphasis (dp, pre_emphasis); +break ; + +case 3 : +analogix_dp_set_lane3_pre_emphasis (dp, pre_emphasis); +break ; + } +} + +static int analogix_dp_link_start (struct analogix_dp_device *dp) +{ +u8 buf[4 ]; +int lane, lane_count, pll_tries, retval; + + lane_count = dp->link_train.lane_count; + + dp->link_train.lt_state =CLOCK_RECOVERY ; + dp->link_train.eq_loop =0 ; + +for (lane =0 ; lane < lane_count; lane++) + dp->link_train.cr_loop[lane] =0 ; + +/* Set link rate and count as you want to establish*/ +analogix_dp_set_link_bandwidth (dp, dp->link_train.link_rate); +analogix_dp_set_lane_count (dp, dp->link_train.lane_count); + +/* Setup RX configuration */ + buf[0 ] = dp->link_train.link_rate; + buf[1 ] = dp->link_train.lane_count; + retval =analogix_dp_write_bytes_to_dpcd (dp,DP_LINK_BW_SET , +2 , buf); +if (retval) +return retval; + +/* Set TX pre-emphasis to minimum */ +for (lane =0 ; lane < lane_count; lane++) +analogix_dp_set_lane_lane_pre_emphasis (dp, +PRE_EMPHASIS_LEVEL_0 , lane); + +/* Wait for PLL lock */ + pll_tries =0 ; +while (analogix_dp_get_pll_lock_status (dp) ==PLL_UNLOCKED ) { +if (pll_tries ==DP_TIMEOUT_LOOP_COUNT ) { +dev_err (dp->dev,"Wait for PLL lock timed out\n" ); +return -ETIMEDOUT ; + } + + pll_tries++; +usleep_range (90 ,120 ); + } + +/* Set training pattern 1 */ +analogix_dp_set_training_pattern (dp,TRAINING_PTN1 ); + +/* Set RX training pattern */ + retval =analogix_dp_write_byte_to_dpcd (dp, +DP_TRAINING_PATTERN_SET , +DP_LINK_SCRAMBLING_DISABLE |DP_TRAINING_PATTERN_1 ); +if (retval) +return retval; + +for (lane =0 ; lane < lane_count; lane++) + buf[lane] =DP_TRAIN_PRE_EMPH_LEVEL_0 | +DP_TRAIN_VOLTAGE_SWING_LEVEL_0 ; + + retval =analogix_dp_write_bytes_to_dpcd (dp,DP_TRAINING_LANE0_SET , + lane_count, buf); + +return retval; +} + +static unsigned char analogix_dp_get_lane_status (u8 link_status[2 ],int lane) +{ +int shift = (lane &1 ) *4 ; +u8 link_value = link_status[lane>>1 ]; + +return (link_value >> shift) &0xf ; +} + +static int analogix_dp_clock_recovery_ok (u8 link_status[2 ],int lane_count) +{ +int lane; +u8 lane_status; + +for (lane =0 ; lane < lane_count; lane++) { + lane_status =analogix_dp_get_lane_status (link_status, lane); +if ((lane_status &DP_LANE_CR_DONE ) ==0 ) +return -EINVAL ; + } +return 0 ; +} + +static int analogix_dp_channel_eq_ok (u8 link_status[2 ],u8 link_align, +int lane_count) +{ +int lane; +u8 lane_status; + +if ((link_align &DP_INTERLANE_ALIGN_DONE ) ==0 ) +return -EINVAL ; + +for (lane =0 ; lane < lane_count; lane++) { + lane_status =analogix_dp_get_lane_status (link_status, lane); + lane_status &=DP_CHANNEL_EQ_BITS ; +if (lane_status !=DP_CHANNEL_EQ_BITS ) +return -EINVAL ; + } + +return 0 ; +} + +static unsigned char analogix_dp_get_adjust_request_voltage (u8 adjust_request[2 ], +int lane) +{ +int shift = (lane &1 ) *4 ; +u8 link_value = adjust_request[lane>>1 ]; + +return (link_value >> shift) &0x3 ; +} + +static unsigned char analogix_dp_get_adjust_request_pre_emphasis ( +u8 adjust_request[2 ], +int lane) +{ +int shift = (lane &1 ) *4 ; +u8 link_value = adjust_request[lane>>1 ]; + +return ((link_value >> shift) &0xc ) >>2 ; +} + +static void analogix_dp_set_lane_link_training (struct analogix_dp_device *dp, +u8 training_lane_set,int lane) +{ +switch (lane) { +case 0 : +analogix_dp_set_lane0_link_training (dp, training_lane_set); +break ; +case 1 : +analogix_dp_set_lane1_link_training (dp, training_lane_set); +break ; + +case 2 : +analogix_dp_set_lane2_link_training (dp, training_lane_set); +break ; + +case 3 : +analogix_dp_set_lane3_link_training (dp, training_lane_set); +break ; + } +} + +static unsigned int analogix_dp_get_lane_link_training ( +struct analogix_dp_device *dp, +int lane) +{ +u32 reg; + +switch (lane) { +case 0 : + reg =analogix_dp_get_lane0_link_training (dp); +break ; +case 1 : + reg =analogix_dp_get_lane1_link_training (dp); +break ; +case 2 : + reg =analogix_dp_get_lane2_link_training (dp); +break ; +case 3 : + reg =analogix_dp_get_lane3_link_training (dp); +break ; +default : +WARN_ON (1 ); +return 0 ; + } + +return reg; +} + +static void analogix_dp_reduce_link_rate (struct analogix_dp_device *dp) +{ +analogix_dp_training_pattern_dis (dp); +analogix_dp_set_enhanced_mode (dp); + + dp->link_train.lt_state =FAILED ; +} + +static void analogix_dp_get_adjust_training_lane (struct analogix_dp_device *dp, +u8 adjust_request[2 ]) +{ +int lane, lane_count; +u8 voltage_swing, pre_emphasis, training_lane; + + lane_count = dp->link_train.lane_count; +for (lane =0 ; lane < lane_count; lane++) { + voltage_swing =analogix_dp_get_adjust_request_voltage ( + adjust_request, lane); + pre_emphasis =analogix_dp_get_adjust_request_pre_emphasis ( + adjust_request, lane); + training_lane =DPCD_VOLTAGE_SWING_SET (voltage_swing) | +DPCD_PRE_EMPHASIS_SET (pre_emphasis); + +if (voltage_swing ==VOLTAGE_LEVEL_3 ) + training_lane |=DP_TRAIN_MAX_SWING_REACHED ; +if (pre_emphasis ==PRE_EMPHASIS_LEVEL_3 ) + training_lane |=DP_TRAIN_MAX_PRE_EMPHASIS_REACHED ; + + dp->link_train.training_lane[lane] = training_lane; + } +} + +static int analogix_dp_process_clock_recovery (struct analogix_dp_device *dp) +{ +int lane, lane_count, retval; +u8 voltage_swing, pre_emphasis, training_lane; +u8 link_status[2 ], adjust_request[2 ]; + +usleep_range (100 ,101 ); + + lane_count = dp->link_train.lane_count; + + retval =analogix_dp_read_bytes_from_dpcd (dp, +DP_LANE0_1_STATUS ,2 , link_status); +if (retval) +return retval; + + retval =analogix_dp_read_bytes_from_dpcd (dp, +DP_ADJUST_REQUEST_LANE0_1 ,2 , adjust_request); +if (retval) +return retval; + +if (analogix_dp_clock_recovery_ok (link_status, lane_count) ==0 ) { +/* set training pattern 2 for EQ */ +analogix_dp_set_training_pattern (dp,TRAINING_PTN2 ); + + retval =analogix_dp_write_byte_to_dpcd (dp, +DP_TRAINING_PATTERN_SET , +DP_LINK_SCRAMBLING_DISABLE | +DP_TRAINING_PATTERN_2 ); +if (retval) +return retval; + +dev_info (dp->dev,"Link Training Clock Recovery success\n" ); + dp->link_train.lt_state =EQUALIZER_TRAINING ; + }else { +for (lane =0 ; lane < lane_count; lane++) { + training_lane =analogix_dp_get_lane_link_training ( + dp, lane); + voltage_swing =analogix_dp_get_adjust_request_voltage ( + adjust_request, lane); + pre_emphasis =analogix_dp_get_adjust_request_pre_emphasis ( + adjust_request, lane); + +if (DPCD_VOLTAGE_SWING_GET (training_lane) == + voltage_swing && +DPCD_PRE_EMPHASIS_GET (training_lane) == + pre_emphasis) + dp->link_train.cr_loop[lane]++; + +if (dp->link_train.cr_loop[lane] ==MAX_CR_LOOP || + voltage_swing ==VOLTAGE_LEVEL_3 || + pre_emphasis ==PRE_EMPHASIS_LEVEL_3 ) { +dev_err (dp->dev,"CR Max reached (%d,%d,%d)\n" , + dp->link_train.cr_loop[lane], + voltage_swing, pre_emphasis); +analogix_dp_reduce_link_rate (dp); +return -EIO ; + } + } + } + +analogix_dp_get_adjust_training_lane (dp, adjust_request); + +for (lane =0 ; lane < lane_count; lane++) +analogix_dp_set_lane_link_training (dp, + dp->link_train.training_lane[lane], lane); + + retval =analogix_dp_write_bytes_to_dpcd (dp, +DP_TRAINING_LANE0_SET , lane_count, + dp->link_train.training_lane); +if (retval) +return retval; + +return retval; +} + +static int analogix_dp_process_equalizer_training (struct analogix_dp_device *dp) +{ +int lane, lane_count, retval; +u32 reg; +u8 link_align, link_status[2 ], adjust_request[2 ]; + +usleep_range (400 ,401 ); + + lane_count = dp->link_train.lane_count; + + retval =analogix_dp_read_bytes_from_dpcd (dp, +DP_LANE0_1_STATUS ,2 , link_status); +if (retval) +return retval; + +if (analogix_dp_clock_recovery_ok (link_status, lane_count)) { +analogix_dp_reduce_link_rate (dp); +return -EIO ; + } + + retval =analogix_dp_read_bytes_from_dpcd (dp, +DP_ADJUST_REQUEST_LANE0_1 ,2 , adjust_request); +if (retval) +return retval; + + retval =analogix_dp_read_byte_from_dpcd (dp, +DP_LANE_ALIGN_STATUS_UPDATED , &link_align); +if (retval) +return retval; + +analogix_dp_get_adjust_training_lane (dp, adjust_request); + +if (!analogix_dp_channel_eq_ok (link_status, link_align, lane_count)) { +/* traing pattern Set to Normal */ +analogix_dp_training_pattern_dis (dp); + +dev_info (dp->dev,"Link Training success!\n" ); + +analogix_dp_get_link_bandwidth (dp, ®); + dp->link_train.link_rate = reg; +dev_dbg (dp->dev,"final bandwidth = %.2x\n" , + dp->link_train.link_rate); + +analogix_dp_get_lane_count (dp, ®); + dp->link_train.lane_count = reg; +dev_dbg (dp->dev,"final lane count = %.2x\n" , + dp->link_train.lane_count); + +/* set enhanced mode if available */ +analogix_dp_set_enhanced_mode (dp); + dp->link_train.lt_state =FINISHED ; + +return 0 ; + } + +/* not all locked */ + dp->link_train.eq_loop++; + +if (dp->link_train.eq_loop >MAX_EQ_LOOP ) { +dev_err (dp->dev,"EQ Max loop\n" ); +analogix_dp_reduce_link_rate (dp); +return -EIO ; + } + +for (lane =0 ; lane < lane_count; lane++) +analogix_dp_set_lane_link_training (dp, + dp->link_train.training_lane[lane], lane); + + retval =analogix_dp_write_bytes_to_dpcd (dp,DP_TRAINING_LANE0_SET , + lane_count, dp->link_train.training_lane); + +return retval; +} + +static void analogix_dp_get_max_rx_bandwidth (struct analogix_dp_device *dp, +u8 *bandwidth) +{ +u8 data; + +/* +* For DP rev.1.1, Maximum link rate of Main Link lanes +* 0x06 = 1.62 Gbps, 0x0a = 2.7 Gbps +*/ +analogix_dp_read_byte_from_dpcd (dp,DP_MAX_LINK_RATE , &data); + *bandwidth = data; +} + +static void analogix_dp_get_max_rx_lane_count (struct analogix_dp_device *dp, +u8 *lane_count) +{ +u8 data; + +/* +* For DP rev.1.1, Maximum number of Main Link lanes +* 0x01 = 1 lane, 0x02 = 2 lanes, 0x04 = 4 lanes +*/ +analogix_dp_read_byte_from_dpcd (dp,DP_MAX_LANE_COUNT , &data); + *lane_count =DPCD_MAX_LANE_COUNT (data); +} + +static void analogix_dp_init_training (struct analogix_dp_device *dp, +enum link_lane_count_type max_lane, +enum link_rate_type max_rate) +{ +/* +* MACRO_RST must be applied after the PLL_LOCK to avoid +* the DP inter pair skew issue for at least 10 us +*/ +analogix_dp_reset_macro (dp); + +/* Initialize by reading RX's DPCD */ +analogix_dp_get_max_rx_bandwidth (dp, &dp->link_train.link_rate); +analogix_dp_get_max_rx_lane_count (dp, &dp->link_train.lane_count); + +if ((dp->link_train.link_rate !=LINK_RATE_1_62GBPS ) && + (dp->link_train.link_rate !=LINK_RATE_2_70GBPS )) { +dev_err (dp->dev,"Rx Max Link Rate is abnormal :%x !\n" , + dp->link_train.link_rate); + dp->link_train.link_rate =LINK_RATE_1_62GBPS ; + } + +if (dp->link_train.lane_count ==0 ) { +dev_err (dp->dev,"Rx Max Lane count is abnormal :%x !\n" , + dp->link_train.lane_count); + dp->link_train.lane_count = (u8 )LANE_COUNT1 ; + } + +/* Setup TX lane count & rate */ +if (dp->link_train.lane_count > max_lane) + dp->link_train.lane_count = max_lane; +if (dp->link_train.link_rate > max_rate) + dp->link_train.link_rate = max_rate; + +/* All DP analog module power up */ +analogix_dp_set_analog_power_down (dp,POWER_ALL ,0 ); +} + +static int analogix_dp_sw_link_training (struct analogix_dp_device *dp) +{ +int retval =0 , training_finished =0 ; + + dp->link_train.lt_state =START ; + +/* Process here */ +while (!retval && !training_finished) { +switch (dp->link_train.lt_state) { +case START : + retval =analogix_dp_link_start (dp); +if (retval) +dev_err (dp->dev,"LT link start failed!\n" ); +break ; +case CLOCK_RECOVERY : + retval =analogix_dp_process_clock_recovery (dp); +if (retval) +dev_err (dp->dev,"LT CR failed!\n" ); +break ; +case EQUALIZER_TRAINING : + retval =analogix_dp_process_equalizer_training (dp); +if (retval) +dev_err (dp->dev,"LT EQ failed!\n" ); +break ; +case FINISHED : + training_finished =1 ; +break ; +case FAILED : +return -EREMOTEIO ; + } + } +if (retval) +dev_err (dp->dev,"eDP link training failed (%d)\n" , retval); + +return retval; +} + +static int analogix_dp_set_link_train (struct analogix_dp_device *dp, +u32 count, +u32 bwtype) +{ +int i; +int retval; + +for (i =0 ; i <DP_TIMEOUT_LOOP_COUNT ; i++) { +analogix_dp_init_training (dp, count, bwtype); + retval =analogix_dp_sw_link_training (dp); +if (retval ==0 ) +break ; + +usleep_range (100 ,110 ); + } + +return retval; +} + +static int analogix_dp_config_video (struct analogix_dp_device *dp) +{ +int retval =0 ; +int timeout_loop =0 ; +int done_count =0 ; + +analogix_dp_config_video_slave_mode (dp); + +analogix_dp_set_video_color_format (dp); + +if (analogix_dp_get_pll_lock_status (dp) ==PLL_UNLOCKED ) { +dev_err (dp->dev,"PLL is not locked yet.\n" ); +return -EINVAL ; + } + +for (;;) { + timeout_loop++; +if (analogix_dp_is_slave_video_stream_clock_on (dp) ==0 ) +break ; +if (DP_TIMEOUT_LOOP_COUNT < timeout_loop) { +dev_err (dp->dev,"Timeout of video streamclk ok\n" ); +return -ETIMEDOUT ; + } + +usleep_range (1 ,2 ); + } + +/* Set to use the register calculated M/N video */ +analogix_dp_set_video_cr_mn (dp,CALCULATED_M ,0 ,0 ); + +/* For video bist, Video timing must be generated by register */ +analogix_dp_set_video_timing_mode (dp,VIDEO_TIMING_FROM_CAPTURE ); + +/* Disable video mute */ +analogix_dp_enable_video_mute (dp,0 ); + +/* Configure video slave mode */ +analogix_dp_enable_video_master (dp,0 ); + + timeout_loop =0 ; + +for (;;) { + timeout_loop++; +if (analogix_dp_is_video_stream_on (dp) ==0 ) { + done_count++; +if (done_count >10 ) +break ; + }else if (done_count) { + done_count =0 ; + } +if (DP_TIMEOUT_LOOP_COUNT < timeout_loop) { +dev_err (dp->dev,"Timeout of video streamclk ok\n" ); +return -ETIMEDOUT ; + } + +usleep_range (1000 ,1001 ); + } + +if (retval !=0 ) +dev_err (dp->dev,"Video stream is not detected!\n" ); + +return retval; +} + +static void analogix_dp_enable_scramble (struct analogix_dp_device *dp,bool enable) +{ +u8 data; + +if (enable) { +analogix_dp_enable_scrambling (dp); + +analogix_dp_read_byte_from_dpcd (dp, +DP_TRAINING_PATTERN_SET , + &data); +analogix_dp_write_byte_to_dpcd (dp, +DP_TRAINING_PATTERN_SET , + (u8)(data & ~DP_LINK_SCRAMBLING_DISABLE )); + }else { +analogix_dp_disable_scrambling (dp); + +analogix_dp_read_byte_from_dpcd (dp, +DP_TRAINING_PATTERN_SET , + &data); +analogix_dp_write_byte_to_dpcd (dp, +DP_TRAINING_PATTERN_SET , + (u8)(data |DP_LINK_SCRAMBLING_DISABLE )); + } +} + +static irqreturn_t analogix_dp_irq_handler (int irq,void *arg) +{ +struct analogix_dp_device *dp = arg; + +enum dp_irq_type irq_type; + + irq_type =analogix_dp_get_irq_type (dp); +switch (irq_type) { +case DP_IRQ_TYPE_HP_CABLE_IN : +dev_dbg (dp->dev,"Received irq - cable in\n" ); +schedule_work (&dp->hotplug_work); +analogix_dp_clear_hotplug_interrupts (dp); +break ; +case DP_IRQ_TYPE_HP_CABLE_OUT : +dev_dbg (dp->dev,"Received irq - cable out\n" ); +analogix_dp_clear_hotplug_interrupts (dp); +break ; +case DP_IRQ_TYPE_HP_CHANGE : +/* +* We get these change notifications once in a while, but there +* is nothing we can do with them. Just ignore it for now and +* only handle cable changes. +*/ +dev_dbg (dp->dev,"Received irq - hotplug change; ignoring.\n" ); +analogix_dp_clear_hotplug_interrupts (dp); +break ; +default : +dev_err (dp->dev,"Received irq - unknown type!\n" ); +break ; + } +return IRQ_HANDLED ; +} + +static void analogix_dp_hotplug (struct work_struct *work) +{ +struct analogix_dp_device *dp; + + dp = container_of(work, struct analogix_dp_device, hotplug_work); + +if (dp->drm_dev) +drm_helper_hpd_irq_event (dp->drm_dev); +} + +static void analogix_dp_commit (struct analogix_dp_device *dp) +{ +int ret; + +/* Keep the panel disabled while we configure video */ +if (dp->plat_data->panel) { +if (drm_panel_disable (dp->plat_data->panel)) +DRM_ERROR ("failed to disable the panel\n" ); + } + + ret =analogix_dp_detect_hpd (dp); +if (ret) { +/* Cable has been disconnected, we're done */ +return ; + } + + ret =analogix_dp_handle_edid (dp); +if (ret) { +dev_err (dp->dev,"unable to handle edid\n" ); +return ; + } + + ret =analogix_dp_set_link_train (dp, dp->video_info->lane_count, + dp->video_info->link_rate); +if (ret) { +dev_err (dp->dev,"unable to do link train\n" ); +return ; + } + +analogix_dp_enable_scramble (dp,1 ); +analogix_dp_enable_rx_to_enhanced_mode (dp,1 ); +analogix_dp_enable_enhanced_mode (dp,1 ); + +analogix_dp_set_lane_count (dp, dp->video_info->lane_count); +analogix_dp_set_link_bandwidth (dp, dp->video_info->link_rate); + +analogix_dp_init_video (dp); + ret =analogix_dp_config_video (dp); +if (ret) +dev_err (dp->dev,"unable to config video\n" ); + +/* Safe to enable the panel now */ +if (dp->plat_data->panel) { +if (drm_panel_enable (dp->plat_data->panel)) +DRM_ERROR ("failed to enable the panel\n" ); + } + +/* Enable video */ +analogix_dp_start_video (dp); +} + +int analogix_dp_get_modes (struct drm_connector *connector) +{ +struct analogix_dp_device *dp =to_dp (connector); +int num_modes =0 ; + +if (dp->plat_data->panel) + num_modes +=drm_panel_get_modes (dp->plat_data->panel); + +if (dp->plat_data->get_modes) + num_modes += dp->plat_data->get_modes (dp->plat_data); + +return num_modes; +} + +static struct drm_encoder * +analogix_dp_best_encoder (struct drm_connector *connector) +{ +struct analogix_dp_device *dp =to_dp (connector); + +return dp->encoder; +} + +static const struct drm_connector_helper_funcs analogix_dp_connector_helper_funcs = { + .get_modes = analogix_dp_get_modes, + .best_encoder = analogix_dp_best_encoder, +}; + +enum drm_connector_status +analogix_dp_detect (struct drm_connector *connector,bool force) +{ +return connector_status_connected; +} + +static void analogix_dp_connector_destroy (struct drm_connector *connector) +{ +drm_connector_unregister (connector); +drm_connector_cleanup (connector); +} + +static const struct drm_connector_funcs analogix_dp_connector_funcs = { + .dpms = drm_atomic_helper_connector_dpms, + .fill_modes = drm_helper_probe_single_connector_modes, + .detect = analogix_dp_detect, + .destroy = analogix_dp_connector_destroy, + .reset = drm_atomic_helper_connector_reset, + .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, + .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, +}; + +static int analogix_dp_bridge_attach (struct drm_bridge *bridge) +{ +struct analogix_dp_device *dp = bridge->driver_private; +struct drm_encoder *encoder = dp->encoder; +struct drm_connector *connector = &dp->connector; +int ret; + +if (!bridge->encoder) { +DRM_ERROR ("Parent encoder object not found" ); +return -ENODEV ; + } + + connector->polled =DRM_CONNECTOR_POLL_HPD ; + + ret =drm_connector_init (dp->drm_dev, connector, + &analogix_dp_connector_funcs, + DRM_MODE_CONNECTOR_eDP); +if (ret) { +DRM_ERROR ("Failed to initialize connector with drm\n" ); +return ret; + } + +drm_connector_helper_add (connector, + &analogix_dp_connector_helper_funcs); +drm_mode_connector_attach_encoder (connector, encoder); + +/* +* NOTE: the connector registration is implemented in analogix +* platform driver, that to say connector would be exist after +* plat_data->attch return, that's why we record the connector +* point after plat attached. +*/ +if (dp->plat_data->attach) { + ret = dp->plat_data->attach (dp->plat_data, bridge, connector); +if (ret) { +DRM_ERROR ("Failed at platform attch func\n" ); +return ret; + } + } + +if (dp->plat_data->panel) { + ret =drm_panel_attach (dp->plat_data->panel, &dp->connector); +if (ret) { +DRM_ERROR ("Failed to attach panel\n" ); +return ret; + } + } + +return 0 ; +} + +static void analogix_dp_bridge_enable (struct drm_bridge *bridge) +{ +struct analogix_dp_device *dp = bridge->driver_private; + +if (dp->dpms_mode ==DRM_MODE_DPMS_ON ) +return ; + +pm_runtime_get_sync (dp->dev); + +if (dp->plat_data->panel) { +if (drm_panel_prepare (dp->plat_data->panel)) { +DRM_ERROR ("failed to setup the panel\n" ); +return ; + } + } + +if (dp->plat_data->power_on) + dp->plat_data->power_on (dp->plat_data); + +phy_power_on (dp->phy); +analogix_dp_init_dp (dp); +enable_irq (dp->irq); +analogix_dp_commit (dp); + + dp->dpms_mode =DRM_MODE_DPMS_ON ; +} + +static void analogix_dp_bridge_disable (struct drm_bridge *bridge) +{ +struct analogix_dp_device *dp = bridge->driver_private; + +if (dp->dpms_mode !=DRM_MODE_DPMS_ON ) +return ; + +if (dp->plat_data->panel) { +if (drm_panel_disable (dp->plat_data->panel)) { +DRM_ERROR ("failed to disable the panel\n" ); +return ; + } + } + +disable_irq (dp->irq); +flush_work (&dp->hotplug_work); +phy_power_off (dp->phy); + +if (dp->plat_data->power_off) + dp->plat_data->power_off (dp->plat_data); + +if (dp->plat_data->panel) { +if (drm_panel_unprepare (dp->plat_data->panel)) +DRM_ERROR ("failed to turnoff the panel\n" ); + } + +pm_runtime_put_sync (dp->dev); + + dp->dpms_mode =DRM_MODE_DPMS_OFF ; +} + +static void analogix_dp_bridge_nop (struct drm_bridge *bridge) +{ +/* do nothing */ +} + +static const struct drm_bridge_funcs analogix_dp_bridge_funcs = { + .enable = analogix_dp_bridge_enable, + .disable = analogix_dp_bridge_disable, + .pre_enable = analogix_dp_bridge_nop, + .post_disable = analogix_dp_bridge_nop, + .attach = analogix_dp_bridge_attach, +}; + +static int analogix_dp_create_bridge (struct drm_device *drm_dev, +struct analogix_dp_device *dp) +{ +struct drm_bridge *bridge; +int ret; + + bridge =devm_kzalloc (drm_dev->dev,sizeof (*bridge),GFP_KERNEL ); +if (!bridge) { +DRM_ERROR ("failed to allocate for drm bridge\n" ); +return -ENOMEM ; + } + + dp->bridge = bridge; + + dp->encoder->bridge = bridge; + bridge->driver_private = dp; + bridge->encoder = dp->encoder; + bridge->funcs = &analogix_dp_bridge_funcs; + + ret =drm_bridge_attach (drm_dev, bridge); +if (ret) { +DRM_ERROR ("failed to attach drm bridge\n" ); +return -EINVAL ; + } + +return 0 ; +} + +static struct video_info *analogix_dp_dt_parse_pdata (struct device *dev) +{ +struct device_node *dp_node = dev->of_node; +struct video_info *dp_video_config; + + dp_video_config =devm_kzalloc (dev, +sizeof (*dp_video_config),GFP_KERNEL ); +if (!dp_video_config) +return ERR_PTR (-ENOMEM ); + + dp_video_config->h_sync_polarity = +of_property_read_bool (dp_node,"hsync-active-high" ); + + dp_video_config->v_sync_polarity = +of_property_read_bool (dp_node,"vsync-active-high" ); + + dp_video_config->interlaced = +of_property_read_bool (dp_node,"interlaced" ); + +if (of_property_read_u32 (dp_node,"samsung,color-space" , + &dp_video_config->color_space)) { +dev_err (dev,"failed to get color-space\n" ); +return ERR_PTR (-EINVAL ); + } + +if (of_property_read_u32 (dp_node,"samsung,dynamic-range" , + &dp_video_config->dynamic_range)) { +dev_err (dev,"failed to get dynamic-range\n" ); +return ERR_PTR (-EINVAL ); + } + +if (of_property_read_u32 (dp_node,"samsung,ycbcr-coeff" , + &dp_video_config->ycbcr_coeff)) { +dev_err (dev,"failed to get ycbcr-coeff\n" ); +return ERR_PTR (-EINVAL ); + } + +if (of_property_read_u32 (dp_node,"samsung,color-depth" , + &dp_video_config->color_depth)) { +dev_err (dev,"failed to get color-depth\n" ); +return ERR_PTR (-EINVAL ); + } + +if (of_property_read_u32 (dp_node,"samsung,link-rate" , + &dp_video_config->link_rate)) { +dev_err (dev,"failed to get link-rate\n" ); +return ERR_PTR (-EINVAL ); + } + +if (of_property_read_u32 (dp_node,"samsung,lane-count" , + &dp_video_config->lane_count)) { +dev_err (dev,"failed to get lane-count\n" ); +return ERR_PTR (-EINVAL ); + } + +return dp_video_config; +} + +int analogix_dp_bind (struct device *dev,struct drm_device *drm_dev, +struct analogix_dp_plat_data *plat_data) +{ +struct platform_device *pdev =to_platform_device (dev); +struct analogix_dp_device *dp; +struct resource *res; +unsigned int irq_flags; +int ret; + +if (!plat_data) { +dev_err (dev,"Invalided input plat_data\n" ); +return -EINVAL ; + } + + dp =devm_kzalloc (dev,sizeof (struct analogix_dp_device ),GFP_KERNEL ); +if (!dp) +return -ENOMEM ; + +dev_set_drvdata (dev, dp); + + dp->dev = &pdev->dev; + dp->dpms_mode =DRM_MODE_DPMS_OFF ; + +/* +* platform dp driver need containor_of the plat_data to get +* the driver private data, so we need to store the point of +* plat_data, not the context of plat_data. +*/ + dp->plat_data = plat_data; + + dp->video_info =analogix_dp_dt_parse_pdata (&pdev->dev); +if (IS_ERR (dp->video_info)) +return PTR_ERR (dp->video_info); + + dp->phy =devm_phy_get (dp->dev,"dp" ); +if (IS_ERR (dp->phy)) { +dev_err (dp->dev,"no DP phy configured\n" ); + ret =PTR_ERR (dp->phy); +if (ret) { +/* +* phy itself is not enabled, so we can move forward +* assigning NULL to phy pointer. +*/ +if (ret == -ENOSYS || ret == -ENODEV ) + dp->phy =NULL ; +else +return ret; + } + } + + dp->clock =devm_clk_get (&pdev->dev,"dp" ); +if (IS_ERR (dp->clock)) { +dev_err (&pdev->dev,"failed to get clock\n" ); +return PTR_ERR (dp->clock); + } + +clk_prepare_enable (dp->clock); + + res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); + + dp->reg_base =devm_ioremap_resource (&pdev->dev, res); +if (IS_ERR (dp->reg_base)) +return PTR_ERR (dp->reg_base); + + dp->hpd_gpio =of_get_named_gpio (dev->of_node,"hpd-gpios" ,0 ); +if (!gpio_is_valid (dp->hpd_gpio)) + dp->hpd_gpio =of_get_named_gpio (dev->of_node, +"samsung,hpd-gpio" ,0 ); + +if (gpio_is_valid (dp->hpd_gpio)) { +/* +* Set up the hotplug GPIO from the device tree as an interrupt. +* Simply specifying a different interrupt in the device tree +* doesn't work since we handle hotplug rather differently when +* using a GPIO. We also need the actual GPIO specifier so +* that we can get the current state of the GPIO. +*/ + ret =devm_gpio_request_one (&pdev->dev, dp->hpd_gpio,GPIOF_IN , +"hpd_gpio" ); +if (ret) { +dev_err (&pdev->dev,"failed to get hpd gpio\n" ); +return ret; + } + dp->irq =gpio_to_irq (dp->hpd_gpio); + irq_flags =IRQF_TRIGGER_RISING |IRQF_TRIGGER_FALLING ; + }else { + dp->hpd_gpio = -ENODEV ; + dp->irq =platform_get_irq (pdev,0 ); + irq_flags =0 ; + } + +if (dp->irq == -ENXIO ) { +dev_err (&pdev->dev,"failed to get irq\n" ); +return -ENODEV ; + } + +INIT_WORK (&dp->hotplug_work, analogix_dp_hotplug); + +pm_runtime_enable (dev); + + ret =devm_request_irq (&pdev->dev, dp->irq, analogix_dp_irq_handler, + irq_flags,"analogix-dp" , dp); +if (ret) { +dev_err (&pdev->dev,"failed to request irq\n" ); + goto err_disable_pm_runtime; + } +disable_irq (dp->irq); + + dp->drm_dev = drm_dev; + dp->encoder = dp->plat_data->encoder; + + ret =analogix_dp_create_bridge (drm_dev, dp); +if (ret) { +DRM_ERROR ("failed to create bridge (%d)\n" , ret); +drm_encoder_cleanup (dp->encoder); + goto err_disable_pm_runtime; + } + +return 0 ; + +err_disable_pm_runtime: +pm_runtime_disable (dev); + +return ret; +} +EXPORT_SYMBOL_GPL (analogix_dp_bind); + +void analogix_dp_unbind (struct device *dev,struct device *master, +void *data) +{ +struct analogix_dp_device *dp =dev_get_drvdata (dev); + +analogix_dp_bridge_disable (dp->bridge); +pm_runtime_disable (dev); +} +EXPORT_SYMBOL_GPL (analogix_dp_unbind); + +#ifdef CONFIG_PM +int analogix_dp_suspend (struct device *dev) +{ +struct analogix_dp_device *dp =dev_get_drvdata (dev); + +clk_disable_unprepare (dp->clock); +return 0 ; +} +EXPORT_SYMBOL_GPL (analogix_dp_suspend); + +int analogix_dp_resume (struct device *dev) +{ +struct analogix_dp_device *dp =dev_get_drvdata (dev); +int ret; + + ret =clk_prepare_enable (dp->clock); +if (ret <0 ) { +DRM_ERROR ("Failed to prepare_enable the clock clk [%d]\n" , ret); +return ret; + } + +return 0 ; +} +EXPORT_SYMBOL_GPL (analogix_dp_resume); +#endif + +MODULE_AUTHOR ("Jingoo Han <[email protected]>" ); +MODULE_DESCRIPTION ("Analogix DP Core Driver" ); +MODULE_LICENSE ("GPL v2" );drivers/gpu/drm/bridge/analogix/analogix_dp_core.h new file +277
-0@@ -0,0 +1,277 @@ +/* +* Header file for Analogix DP (Display Port) core interface driver. +* +* Copyright (C) 2012 Samsung Electronics Co., Ltd. +* Author: Jingoo Han <[email protected]> +* +* This program is free software; you can redistribute it and/or modify it +* under the terms of the GNU General Public License as published by the +* Free Software Foundation; either version 2 of the License, or (at your +* option) any later version. +*/ + +#ifndef _ANALOGIX_DP_CORE_H +#define _ANALOGIX_DP_CORE_H + +#include <drm/drm_crtc.h> +#include <drm/drm_dp_helper.h> + +#define DP_TIMEOUT_LOOP_COUNT 100 +#define MAX_CR_LOOP 5 +#define MAX_EQ_LOOP 5 + +enum link_rate_type { +LINK_RATE_1_62GBPS =0x06 , +LINK_RATE_2_70GBPS =0x0a +}; + +enum link_lane_count_type { +LANE_COUNT1 =1 , +LANE_COUNT2 =2 , +LANE_COUNT4 =4 +}; + +enum link_training_state { +START , +CLOCK_RECOVERY , +EQUALIZER_TRAINING , +FINISHED , +FAILED +}; + +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 { +PRBS7 , +D10_2 , +TRAINING_PTN1 , +TRAINING_PTN2 , +DP_NONE +}; + +enum color_space { +COLOR_RGB , +COLOR_YCBCR422 , +COLOR_YCBCR444 +}; + +enum color_depth { +COLOR_6 , +COLOR_8 , +COLOR_10 , +COLOR_12 +}; + +enum color_coefficient { +COLOR_YCBCR601 , +COLOR_YCBCR709 +}; + +enum dynamic_range { +VESA , +CEA +}; + +enum pll_status { +PLL_UNLOCKED , +PLL_LOCKED +}; + +enum clock_recovery_m_value_type { +CALCULATED_M , +REGISTER_M +}; + +enum video_timing_recognition_type { +VIDEO_TIMING_FROM_CAPTURE , +VIDEO_TIMING_FROM_REGISTER +}; + +enum analog_power_block { +AUX_BLOCK , +CH0_BLOCK , +CH1_BLOCK , +CH2_BLOCK , +CH3_BLOCK , +ANALOG_TOTAL , +POWER_ALL +}; + +enum dp_irq_type { +DP_IRQ_TYPE_HP_CABLE_IN , +DP_IRQ_TYPE_HP_CABLE_OUT , +DP_IRQ_TYPE_HP_CHANGE , +DP_IRQ_TYPE_UNKNOWN , +}; + +struct video_info { +char *name; + +bool h_sync_polarity; +bool v_sync_polarity; +bool interlaced; + +enum color_space color_space; +enum dynamic_range dynamic_range; +enum color_coefficient ycbcr_coeff; +enum color_depth color_depth; + +enum link_rate_type link_rate; +enum link_lane_count_type lane_count; +}; + +struct link_train { +int eq_loop; +int cr_loop[4 ]; + +u8 link_rate; +u8 lane_count; +u8 training_lane[4 ]; + +enum link_training_state lt_state; +}; + +struct analogix_dp_device { +struct drm_encoder *encoder; +struct device *dev; +struct drm_device *drm_dev; +struct drm_connector connector; +struct drm_bridge *bridge; +struct clk *clock; +unsigned int irq; +void __iomem *reg_base; + +struct video_info *video_info; +struct link_train link_train; +struct work_struct hotplug_work; +struct phy *phy; +int dpms_mode; +int hpd_gpio; + +struct analogix_dp_plat_data *plat_data; +}; + +/* analogix_dp_reg.c */ +void analogix_dp_enable_video_mute (struct analogix_dp_device *dp,bool enable); +void analogix_dp_stop_video (struct analogix_dp_device *dp); +void analogix_dp_lane_swap (struct analogix_dp_device *dp,bool enable); +void analogix_dp_init_analog_param (struct analogix_dp_device *dp); +void analogix_dp_init_interrupt (struct analogix_dp_device *dp); +void analogix_dp_reset (struct analogix_dp_device *dp); +void analogix_dp_swreset (struct analogix_dp_device *dp); +void analogix_dp_config_interrupt (struct analogix_dp_device *dp); +enum pll_status analogix_dp_get_pll_lock_status (struct analogix_dp_device *dp); +void analogix_dp_set_pll_power_down (struct analogix_dp_device *dp,bool enable); +void analogix_dp_set_analog_power_down (struct analogix_dp_device *dp, +enum analog_power_block block, +bool enable); +void analogix_dp_init_analog_func (struct analogix_dp_device *dp); +void analogix_dp_init_hpd (struct analogix_dp_device *dp); +enum dp_irq_type analogix_dp_get_irq_type (struct analogix_dp_device *dp); +void analogix_dp_clear_hotplug_interrupts (struct analogix_dp_device *dp); +void analogix_dp_reset_aux (struct analogix_dp_device *dp); +void analogix_dp_init_aux (struct analogix_dp_device *dp); +int analogix_dp_get_plug_in_status (struct analogix_dp_device *dp); +void analogix_dp_enable_sw_function (struct analogix_dp_device *dp); +int analogix_dp_start_aux_transaction (struct analogix_dp_device *dp); +int analogix_dp_write_byte_to_dpcd (struct analogix_dp_device *dp, +unsigned int reg_addr, +unsigned char data); +int analogix_dp_read_byte_from_dpcd (struct analogix_dp_device *dp, +unsigned int reg_addr, +unsigned char *data); +int analogix_dp_write_bytes_to_dpcd (struct analogix_dp_device *dp, +unsigned int reg_addr, +unsigned int count, +unsigned char data[]); +int analogix_dp_read_bytes_from_dpcd (struct analogix_dp_device *dp, +unsigned int reg_addr, +unsigned int count, +unsigned char data[]); +int analogix_dp_select_i2c_device (struct analogix_dp_device *dp, +unsigned int device_addr, +unsigned int reg_addr); +int analogix_dp_read_byte_from_i2c (struct analogix_dp_device *dp, +unsigned int device_addr, +unsigned int reg_addr, +unsigned int *data); +int analogix_dp_read_bytes_from_i2c (struct analogix_dp_device *dp, +unsigned int device_addr, +unsigned int reg_addr, +unsigned int count, +unsigned char edid[]); +void analogix_dp_set_link_bandwidth (struct analogix_dp_device *dp,u32 bwtype); +void analogix_dp_get_link_bandwidth (struct analogix_dp_device *dp,u32 *bwtype); +void analogix_dp_set_lane_count (struct analogix_dp_device *dp,u32 count); +void analogix_dp_get_lane_count (struct analogix_dp_device *dp,u32 *count); +void analogix_dp_enable_enhanced_mode (struct analogix_dp_device *dp,bool enable); +void analogix_dp_set_training_pattern (struct analogix_dp_device *dp, +enum pattern_set pattern); +void analogix_dp_set_lane0_pre_emphasis (struct analogix_dp_device *dp,u32 level); +void analogix_dp_set_lane1_pre_emphasis (struct analogix_dp_device *dp,u32 level); +void analogix_dp_set_lane2_pre_emphasis (struct analogix_dp_device *dp,u32 level); +void analogix_dp_set_lane3_pre_emphasis (struct analogix_dp_device *dp,u32 level); +void analogix_dp_set_lane0_link_training (struct analogix_dp_device *dp, +u32 training_lane); +void analogix_dp_set_lane1_link_training (struct analogix_dp_device *dp, +u32 training_lane); +void analogix_dp_set_lane2_link_training (struct analogix_dp_device *dp, +u32 training_lane); +void analogix_dp_set_lane3_link_training (struct analogix_dp_device *dp, +u32 training_lane); +u32 analogix_dp_get_lane0_link_training (struct analogix_dp_device *dp); +u32 analogix_dp_get_lane1_link_training (struct analogix_dp_device *dp); +u32 analogix_dp_get_lane2_link_training (struct analogix_dp_device *dp); +u32 analogix_dp_get_lane3_link_training (struct analogix_dp_device *dp); +void analogix_dp_reset_macro (struct analogix_dp_device *dp); +void analogix_dp_init_video (struct analogix_dp_device *dp); + +void analogix_dp_set_video_color_format (struct analogix_dp_device *dp); +int analogix_dp_is_slave_video_stream_clock_on (struct analogix_dp_device *dp); +void analogix_dp_set_video_cr_mn (struct analogix_dp_device *dp, +enum clock_recovery_m_value_type type, +u32 m_value, +u32 n_value); +void analogix_dp_set_video_timing_mode (struct analogix_dp_device *dp,u32 type); +void analogix_dp_enable_video_master (struct analogix_dp_device *dp,bool enable); +void analogix_dp_start_video (struct analogix_dp_device *dp); +int analogix_dp_is_video_stream_on (struct analogix_dp_device *dp); +void analogix_dp_config_video_slave_mode (struct analogix_dp_device *dp); +void analogix_dp_enable_scrambling (struct analogix_dp_device *dp); +void analogix_dp_disable_scrambling (struct analogix_dp_device *dp); + +/* I2C EDID Chip ID, Slave Address */ +#define I2C_EDID_DEVICE_ADDR 0x50 +#define I2C_E_EDID_DEVICE_ADDR 0x30 + +#define EDID_BLOCK_LENGTH 0x80 +#define EDID_HEADER_PATTERN 0x00 +#define EDID_EXTENSION_FLAG 0x7e +#define EDID_CHECKSUM 0x7f + +/* DP_MAX_LANE_COUNT */ +#define DPCD_ENHANCED_FRAME_CAP (x) (((x) >> 7) & 0x1) +#define DPCD_MAX_LANE_COUNT (x) ((x) & 0x1f) + +/* DP_LANE_COUNT_SET */ +#define DPCD_LANE_COUNT_SET (x) ((x) & 0x1f) + +/* DP_TRAINING_LANE0_SET */ +#define DPCD_PRE_EMPHASIS_SET (x) (((x) & 0x3) << 3) +#define DPCD_PRE_EMPHASIS_GET (x) (((x) >> 3) & 0x3) +#define DPCD_VOLTAGE_SWING_SET (x) (((x) & 0x3) << 0) +#define DPCD_VOLTAGE_SWING_GET (x) (((x) >> 0) & 0x3) + +#endif /* _ANALOGIX_DP_CORE_H */ drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c new file +1263
-0@@ -0,0 +1,1263 @@ +/* +* Analogix DP (Display port) core register interface driver. +* +* Copyright (C) 2012 Samsung Electronics Co., Ltd. +* Author: Jingoo Han <[email protected]> +* +* This program is free software; you can redistribute it and/or modify it +* under the terms of the GNU General Public License as published by the +* Free Software Foundation; either version 2 of the License, or (at your +* option) any later version. +*/ + +#include <linux/device.h> +#include <linux/io.h> +#include <linux/delay.h> +#include <linux/gpio.h> + +#include "analogix_dp_core.h" +#include "analogix_dp_reg.h" + +#define COMMON_INT_MASK_1 0 +#define COMMON_INT_MASK_2 0 +#define COMMON_INT_MASK_3 0 +#define COMMON_INT_MASK_4 (HOTPLUG_CHG | HPD_LOST | PLUG) +#define INT_STA_MASK INT_HPD + +void analogix_dp_enable_video_mute (struct analogix_dp_device *dp,bool enable) +{ +u32 reg; + +if (enable) { + reg =readl (dp->reg_base +EXYNOS_DP_VIDEO_CTL_1 ); + reg |=HDCP_VIDEO_MUTE ; +writel (reg, dp->reg_base +EXYNOS_DP_VIDEO_CTL_1 ); + }else { + reg =readl (dp->reg_base +EXYNOS_DP_VIDEO_CTL_1 ); + reg &= ~HDCP_VIDEO_MUTE ; +writel (reg, dp->reg_base +EXYNOS_DP_VIDEO_CTL_1 ); + } +} + +void analogix_dp_stop_video (struct analogix_dp_device *dp) +{ +u32 reg; + + reg =readl (dp->reg_base +EXYNOS_DP_VIDEO_CTL_1 ); + reg &= ~VIDEO_EN ; +writel (reg, dp->reg_base +EXYNOS_DP_VIDEO_CTL_1 ); +} + +void analogix_dp_lane_swap (struct analogix_dp_device *dp,bool enable) +{ +u32 reg; + +if (enable) + reg =LANE3_MAP_LOGIC_LANE_0 |LANE2_MAP_LOGIC_LANE_1 | +LANE1_MAP_LOGIC_LANE_2 |LANE0_MAP_LOGIC_LANE_3 ; +else + reg =LANE3_MAP_LOGIC_LANE_3 |LANE2_MAP_LOGIC_LANE_2 | +LANE1_MAP_LOGIC_LANE_1 |LANE0_MAP_LOGIC_LANE_0 ; + +writel (reg, dp->reg_base +EXYNOS_DP_LANE_MAP ); +} + +void analogix_dp_init_analog_param (struct analogix_dp_device *dp) +{ +u32 reg; + + reg =TX_TERMINAL_CTRL_50_OHM ; +writel (reg, dp->reg_base +EXYNOS_DP_ANALOG_CTL_1 ); + + reg =SEL_24M |TX_DVDD_BIT_1_0625V ; +writel (reg, dp->reg_base +EXYNOS_DP_ANALOG_CTL_2 ); + + reg =DRIVE_DVDD_BIT_1_0625V |VCO_BIT_600_MICRO ; +writel (reg, dp->reg_base +EXYNOS_DP_ANALOG_CTL_3 ); + + reg =PD_RING_OSC |AUX_TERMINAL_CTRL_50_OHM | +TX_CUR1_2X |TX_CUR_16_MA ; +writel (reg, dp->reg_base +EXYNOS_DP_PLL_FILTER_CTL_1 ); + + reg =CH3_AMP_400_MV |CH2_AMP_400_MV | +CH1_AMP_400_MV |CH0_AMP_400_MV ; +writel (reg, dp->reg_base +EXYNOS_DP_TX_AMP_TUNING_CTL ); +} + +void analogix_dp_init_interrupt (struct analogix_dp_device *dp) +{ +/* Set interrupt pin assertion polarity as high */ +writel (INT_POL1 |INT_POL0 , dp->reg_base +EXYNOS_DP_INT_CTL ); + +/* Clear pending regisers */ +writel (0xff , dp->reg_base +EXYNOS_DP_COMMON_INT_STA_1 ); +writel (0x4f , dp->reg_base +EXYNOS_DP_COMMON_INT_STA_2 ); +writel (0xe0 , dp->reg_base +EXYNOS_DP_COMMON_INT_STA_3 ); +writel (0xe7 , dp->reg_base +EXYNOS_DP_COMMON_INT_STA_4 ); +writel (0x63 , dp->reg_base +EXYNOS_DP_INT_STA ); + +/* 0:mask,1: unmask */ +writel (0x00 , dp->reg_base +EXYNOS_DP_COMMON_INT_MASK_1 ); +writel (0x00 , dp->reg_base +EXYNOS_DP_COMMON_INT_MASK_2 ); +writel (0x00 , dp->reg_base +EXYNOS_DP_COMMON_INT_MASK_3 ); +writel (0x00 , dp->reg_base +EXYNOS_DP_COMMON_INT_MASK_4 ); +writel (0x00 , dp->reg_base +EXYNOS_DP_INT_STA_MASK ); +} + +void analogix_dp_reset (struct analogix_dp_device *dp) +{ +u32 reg; + +analogix_dp_stop_video (dp); +analogix_dp_enable_video_mute (dp,0 ); + + reg =MASTER_VID_FUNC_EN_N |SLAVE_VID_FUNC_EN_N | +AUD_FIFO_FUNC_EN_N |AUD_FUNC_EN_N | +HDCP_FUNC_EN_N |SW_FUNC_EN_N ; +writel (reg, dp->reg_base +EXYNOS_DP_FUNC_EN_1 ); + + reg =SSC_FUNC_EN_N |AUX_FUNC_EN_N | +SERDES_FIFO_FUNC_EN_N | +LS_CLK_DOMAIN_FUNC_EN_N ; +writel (reg, dp->reg_base +EXYNOS_DP_FUNC_EN_2 ); + +usleep_range (20 ,30 ); + +analogix_dp_lane_swap (dp,0 ); + +writel (0x0 , dp->reg_base +EXYNOS_DP_SYS_CTL_1 ); +writel (0x40 , dp->reg_base +EXYNOS_DP_SYS_CTL_2 ); +writel (0x0 , dp->reg_base +EXYNOS_DP_SYS_CTL_3 ); +writel (0x0 , dp->reg_base +EXYNOS_DP_SYS_CTL_4 ); + +writel (0x0 , dp->reg_base +EXYNOS_DP_PKT_SEND_CTL ); +writel (0x0 , dp->reg_base +EXYNOS_DP_HDCP_CTL ); + +writel (0x5e , dp->reg_base +EXYNOS_DP_HPD_DEGLITCH_L ); +writel (0x1a , dp->reg_base +EXYNOS_DP_HPD_DEGLITCH_H ); + +writel (0x10 , dp->reg_base +EXYNOS_DP_LINK_DEBUG_CTL ); + +writel (0x0 , dp->reg_base +EXYNOS_DP_PHY_TEST ); + +writel (0x0 , dp->reg_base +EXYNOS_DP_VIDEO_FIFO_THRD ); +writel (0x20 , dp->reg_base +EXYNOS_DP_AUDIO_MARGIN ); + +writel (0x4 , dp->reg_base +EXYNOS_DP_M_VID_GEN_FILTER_TH ); +writel (0x2 , dp->reg_base +EXYNOS_DP_M_AUD_GEN_FILTER_TH ); + +writel (0x00000101 , dp->reg_base +EXYNOS_DP_SOC_GENERAL_CTL ); +} + +void analogix_dp_swreset (struct analogix_dp_device *dp) +{ +writel (RESET_DP_TX , dp->reg_base +EXYNOS_DP_TX_SW_RESET ); +} + +void analogix_dp_config_interrupt (struct analogix_dp_device *dp) +{ +u32 reg; + +/* 0: mask, 1: unmask */ + reg =COMMON_INT_MASK_1 ; +writel (reg, dp->reg_base +EXYNOS_DP_COMMON_INT_MASK_1 ); + + reg =COMMON_INT_MASK_2 ; +writel (reg, dp->reg_base +EXYNOS_DP_COMMON_INT_MASK_2 ); + + reg =COMMON_INT_MASK_3 ; +writel (reg, dp->reg_base +EXYNOS_DP_COMMON_INT_MASK_3 ); + + reg =COMMON_INT_MASK_4 ; +writel (reg, dp->reg_base +EXYNOS_DP_COMMON_INT_MASK_4 ); + + reg =INT_STA_MASK ; +writel (reg, dp->reg_base +EXYNOS_DP_INT_STA_MASK ); +} + +enum pll_status analogix_dp_get_pll_lock_status (struct analogix_dp_device *dp) +{ +u32 reg; + + reg =readl (dp->reg_base +EXYNOS_DP_DEBUG_CTL ); +if (reg &PLL_LOCK ) +return PLL_LOCKED ; +else +return PLL_UNLOCKED ; +} + +void analogix_dp_set_pll_power_down (struct analogix_dp_device *dp,bool enable) +{ +u32 reg; + +if (enable) { + reg =readl (dp->reg_base +EXYNOS_DP_PLL_CTL ); + reg |=DP_PLL_PD ; +writel (reg, dp->reg_base +EXYNOS_DP_PLL_CTL ); + }else { + reg =readl (dp->reg_base +EXYNOS_DP_PLL_CTL ); + reg &= ~DP_PLL_PD ; +writel (reg, dp->reg_base +EXYNOS_DP_PLL_CTL ); + } +} + +void analogix_dp_set_analog_power_down (struct analogix_dp_device *dp, +enum analog_power_block block, +bool enable) +{ +u32 reg; + +switch (block) { +case AUX_BLOCK : +if (enable) { + reg =readl (dp->reg_base +EXYNOS_DP_PHY_PD ); + reg |=AUX_PD ; +writel (reg, dp->reg_base +EXYNOS_DP_PHY_PD ); + }else { + reg =readl (dp->reg_base +EXYNOS_DP_PHY_PD ); + reg &= ~AUX_PD ; +writel (reg, dp->reg_base +EXYNOS_DP_PHY_PD ); + } +break ; +case CH0_BLOCK : +if (enable) { + reg =readl (dp->reg_base +EXYNOS_DP_PHY_PD ); + reg |=CH0_PD ; +writel (reg, dp->reg_base +EXYNOS_DP_PHY_PD ); + }else { + reg =readl (dp->reg_base +EXYNOS_DP_PHY_PD ); + reg &= ~CH0_PD ; +writel (reg, dp->reg_base +EXYNOS_DP_PHY_PD ); + } +break ; +case CH1_BLOCK : +if (enable) { + reg =readl (dp->reg_base +EXYNOS_DP_PHY_PD ); + reg |=CH1_PD ; +writel (reg, dp->reg_base +EXYNOS_DP_PHY_PD ); + }else { + reg =readl (dp->reg_base +EXYNOS_DP_PHY_PD ); + reg &= ~CH1_PD ; +writel (reg, dp->reg_base +EXYNOS_DP_PHY_PD ); + } +break ; +case CH2_BLOCK : +if (enable) { + reg =readl (dp->reg_base +EXYNOS_DP_PHY_PD ); + reg |=CH2_PD ; +writel (reg, dp->reg_base +EXYNOS_DP_PHY_PD ); + }else { + reg =readl (dp->reg_base +EXYNOS_DP_PHY_PD ); + reg &= ~CH2_PD ; +writel (reg, dp->reg_base +EXYNOS_DP_PHY_PD ); + } +break ; +case CH3_BLOCK : +if (enable) { + reg =readl (dp->reg_base +EXYNOS_DP_PHY_PD ); + reg |=CH3_PD ; +writel (reg, dp->reg_base +EXYNOS_DP_PHY_PD ); + }else { + reg =readl (dp->reg_base +EXYNOS_DP_PHY_PD ); + reg &= ~CH3_PD ; +writel (reg, dp->reg_base +EXYNOS_DP_PHY_PD ); + } +break ; +case ANALOG_TOTAL : +if (enable) { + reg =readl (dp->reg_base +EXYNOS_DP_PHY_PD ); + reg |=DP_PHY_PD ; +writel (reg, dp->reg_base +EXYNOS_DP_PHY_PD ); + }else { + reg =readl (dp->reg_base +EXYNOS_DP_PHY_PD ); + reg &= ~DP_PHY_PD ; +writel (reg, dp->reg_base +EXYNOS_DP_PHY_PD ); + } +break ; +case POWER_ALL : +if (enable) { + reg =DP_PHY_PD |AUX_PD |CH3_PD |CH2_PD | +CH1_PD |CH0_PD ; +writel (reg, dp->reg_base +EXYNOS_DP_PHY_PD ); + }else { +writel (0x00 , dp->reg_base +EXYNOS_DP_PHY_PD ); + } +break ; +default : +break ; + } +} + +void analogix_dp_init_analog_func (struct analogix_dp_device *dp) +{ +u32 reg; +int timeout_loop =0 ; + +analogix_dp_set_analog_power_down (dp,POWER_ALL ,0 ); + + reg =PLL_LOCK_CHG ; +writel (reg, dp->reg_base +EXYNOS_DP_COMMON_INT_STA_1 ); + + reg =readl (dp->reg_base +EXYNOS_DP_DEBUG_CTL ); + reg &= ~(F_PLL_LOCK |PLL_LOCK_CTRL ); +writel (reg, dp->reg_base +EXYNOS_DP_DEBUG_CTL ); + +/* Power up PLL */ +if (analogix_dp_get_pll_lock_status (dp) ==PLL_UNLOCKED ) { +analogix_dp_set_pll_power_down (dp,0 ); + +while (analogix_dp_get_pll_lock_status (dp) ==PLL_UNLOCKED ) { + timeout_loop++; +if (DP_TIMEOUT_LOOP_COUNT < timeout_loop) { +dev_err (dp->dev,"failed to get pll lock status\n" ); +return ; + } +usleep_range (10 ,20 ); + } + } + +/* Enable Serdes FIFO function and Link symbol clock domain module */ + reg =readl (dp->reg_base +EXYNOS_DP_FUNC_EN_2 ); + reg &= ~(SERDES_FIFO_FUNC_EN_N |LS_CLK_DOMAIN_FUNC_EN_N + |AUX_FUNC_EN_N ); +writel (reg, dp->reg_base +EXYNOS_DP_FUNC_EN_2 ); +} + +void analogix_dp_clear_hotplug_interrupts (struct analogix_dp_device *dp) +{ +u32 reg; + +if (gpio_is_valid (dp->hpd_gpio)) +return ; + + reg =HOTPLUG_CHG |HPD_LOST |PLUG ; +writel (reg, dp->reg_base +EXYNOS_DP_COMMON_INT_STA_4 ); + + reg =INT_HPD ; +writel (reg, dp->reg_base +EXYNOS_DP_INT_STA ); +} + +void analogix_dp_init_hpd (struct analogix_dp_device *dp) +{ +u32 reg; + +if (gpio_is_valid (dp->hpd_gpio)) +return ; + +analogix_dp_clear_hotplug_interrupts (dp); + + reg =readl (dp->reg_base +EXYNOS_DP_SYS_CTL_3 ); + reg &= ~(F_HPD |HPD_CTRL ); +writel (reg, dp->reg_base +EXYNOS_DP_SYS_CTL_3 ); +} + +enum dp_irq_type analogix_dp_get_irq_type (struct analogix_dp_device *dp) +{ +u32 reg; + +if (gpio_is_valid (dp->hpd_gpio)) { + reg =gpio_get_value (dp->hpd_gpio); +if (reg) +return DP_IRQ_TYPE_HP_CABLE_IN ; +else +return DP_IRQ_TYPE_HP_CABLE_OUT ; + }else { +/* Parse hotplug interrupt status register */ + reg =readl (dp->reg_base +EXYNOS_DP_COMMON_INT_STA_4 ); + +if (reg &PLUG ) +return DP_IRQ_TYPE_HP_CABLE_IN ; + +if (reg &HPD_LOST ) +return DP_IRQ_TYPE_HP_CABLE_OUT ; + +if (reg &HOTPLUG_CHG ) +return DP_IRQ_TYPE_HP_CHANGE ; + +return DP_IRQ_TYPE_UNKNOWN ; + } +} + +void analogix_dp_reset_aux (struct analogix_dp_device *dp) +{ +u32 reg; + +/* Disable AUX channel module */ + reg =readl (dp->reg_base +EXYNOS_DP_FUNC_EN_2 ); + reg |=AUX_FUNC_EN_N ; +writel (reg, dp->reg_base +EXYNOS_DP_FUNC_EN_2 ); +} + +void analogix_dp_init_aux (struct analogix_dp_device *dp) +{ +u32 reg; + +/* Clear inerrupts related to AUX channel */ + reg =RPLY_RECEIV |AUX_ERR ; +writel (reg, dp->reg_base +EXYNOS_DP_INT_STA ); + +analogix_dp_reset_aux (dp); + +/* Disable AUX transaction H/W retry */ + reg =AUX_BIT_PERIOD_EXPECTED_DELAY (3 ) |AUX_HW_RETRY_COUNT_SEL (0 )| +AUX_HW_RETRY_INTERVAL_600_MICROSECONDS ; +writel (reg, dp->reg_base +EXYNOS_DP_AUX_HW_RETRY_CTL ); + +/* Receive AUX Channel DEFER commands equal to DEFFER_COUNT*64 */ + reg =DEFER_CTRL_EN |DEFER_COUNT (1 ); +writel (reg, dp->reg_base +EXYNOS_DP_AUX_CH_DEFER_CTL ); + +/* Enable AUX channel module */ + reg =readl (dp->reg_base +EXYNOS_DP_FUNC_EN_2 ); + reg &= ~AUX_FUNC_EN_N ; +writel (reg, dp->reg_base +EXYNOS_DP_FUNC_EN_2 ); +} + +int analogix_dp_get_plug_in_status (struct analogix_dp_device *dp) +{ +u32 reg; + +if (gpio_is_valid (dp->hpd_gpio)) { +if (gpio_get_value (dp->hpd_gpio)) +return 0 ; + }else { + reg =readl (dp->reg_base +EXYNOS_DP_SYS_CTL_3 ); +if (reg &HPD_STATUS ) +return 0 ; + } + +return -EINVAL ; +} + +void analogix_dp_enable_sw_function (struct analogix_dp_device *dp) +{ +u32 reg; + + reg =readl (dp->reg_base +EXYNOS_DP_FUNC_EN_1 ); + reg &= ~SW_FUNC_EN_N ; +writel (reg, dp->reg_base +EXYNOS_DP_FUNC_EN_1 ); +} + +int analogix_dp_start_aux_transaction (struct analogix_dp_device *dp) +{ +int reg; +int retval =0 ; +int timeout_loop =0 ; + +/* Enable AUX CH operation */ + reg =readl (dp->reg_base +EXYNOS_DP_AUX_CH_CTL_2 ); + reg |=AUX_EN ; +writel (reg, dp->reg_base +EXYNOS_DP_AUX_CH_CTL_2 ); + +/* Is AUX CH command reply received? */ + reg =readl (dp->reg_base +EXYNOS_DP_INT_STA ); +while (!(reg &RPLY_RECEIV )) { + timeout_loop++; +if (DP_TIMEOUT_LOOP_COUNT < timeout_loop) { +dev_err (dp->dev,"AUX CH command reply failed!\n" ); +return -ETIMEDOUT ; + } + reg =readl (dp->reg_base +EXYNOS_DP_INT_STA ); +usleep_range (10 ,11 ); + } + +/* Clear interrupt source for AUX CH command reply */ +writel (RPLY_RECEIV , dp->reg_base +EXYNOS_DP_INT_STA ); + +/* Clear interrupt source for AUX CH access error */ + reg =readl (dp->reg_base +EXYNOS_DP_INT_STA ); +if (reg &AUX_ERR ) { +writel (AUX_ERR , dp->reg_base +EXYNOS_DP_INT_STA ); +return -EREMOTEIO ; + } + +/* Check AUX CH error access status */ + reg =readl (dp->reg_base +EXYNOS_DP_AUX_CH_STA ); +if ((reg &AUX_STATUS_MASK ) !=0 ) { +dev_err (dp->dev,"AUX CH error happens: %d\n\n" , + reg &AUX_STATUS_MASK ); +return -EREMOTEIO ; + } + +return retval; +} + +int analogix_dp_write_byte_to_dpcd (struct analogix_dp_device *dp, +unsigned int reg_addr, +unsigned char data) +{ +u32 reg; +int i; +int retval; + +for (i =0 ; i <3 ; i++) { +/* Clear AUX CH data buffer */ + reg =BUF_CLR ; +writel (reg, dp->reg_base +EXYNOS_DP_BUFFER_DATA_CTL ); + +/* Select DPCD device address */ + reg =AUX_ADDR_7_0 (reg_addr); +writel (reg, dp->reg_base +EXYNOS_DP_AUX_ADDR_7_0 ); + reg =AUX_ADDR_15_8 (reg_addr); +writel (reg, dp->reg_base +EXYNOS_DP_AUX_ADDR_15_8 ); + reg =AUX_ADDR_19_16 (reg_addr); +writel (reg, dp->reg_base +EXYNOS_DP_AUX_ADDR_19_16 ); + +/* Write data buffer */ + reg = (unsigned int )data; +writel (reg, dp->reg_base +EXYNOS_DP_BUF_DATA_0 ); + +/* +* Set DisplayPort transaction and write 1 byte +* If bit 3 is 1, DisplayPort transaction. +* If Bit 3 is 0, I2C transaction. +*/ + reg =AUX_TX_COMM_DP_TRANSACTION |AUX_TX_COMM_WRITE ; +writel (reg, dp->reg_base +EXYNOS_DP_AUX_CH_CTL_1 ); + +/* Start AUX transaction */ + retval =analogix_dp_start_aux_transaction (dp); +if (retval ==0 ) +break ; +else +dev_dbg (dp->dev,"%s: Aux Transaction fail!\n" , + __func__); + } + +return retval; +} + +int analogix_dp_read_byte_from_dpcd (struct analogix_dp_device *dp, +unsigned int reg_addr, +unsigned char *data) +{ +u32 reg; +int i; +int retval; + +for (i =0 ; i <3 ; i++) { +/* Clear AUX CH data buffer */ + reg =BUF_CLR ; +writel (reg, dp->reg_base +EXYNOS_DP_BUFFER_DATA_CTL ); + +/* Select DPCD device address */ + reg =AUX_ADDR_7_0 (reg_addr); +writel (reg, dp->reg_base +EXYNOS_DP_AUX_ADDR_7_0 ); + reg =AUX_ADDR_15_8 (reg_addr); +writel (reg, dp->reg_base +EXYNOS_DP_AUX_ADDR_15_8 ); + reg =AUX_ADDR_19_16 (reg_addr); +writel (reg, dp->reg_base +EXYNOS_DP_AUX_ADDR_19_16 ); + +/* +* Set DisplayPort transaction and read 1 byte +* If bit 3 is 1, DisplayPort transaction. +* If Bit 3 is 0, I2C transaction. +*/ + reg =AUX_TX_COMM_DP_TRANSACTION |AUX_TX_COMM_READ ; +writel (reg, dp->reg_base +EXYNOS_DP_AUX_CH_CTL_1 ); + +/* Start AUX transaction */ + retval =analogix_dp_start_aux_transaction (dp); +if (retval ==0 ) +break ; +else +dev_dbg (dp->dev,"%s: Aux Transaction fail!\n" , + __func__); + } + +/* Read data buffer */ + reg =readl (dp->reg_base +EXYNOS_DP_BUF_DATA_0 ); + *data = (unsigned char )(reg &0xff ); + +return retval; +} + +int analogix_dp_write_bytes_to_dpcd (struct analogix_dp_device *dp, +unsigned int reg_addr, +unsigned int count, +unsigned char data[]) +{ +u32 reg; +unsigned int start_offset; +unsigned int cur_data_count; +unsigned int cur_data_idx; +int i; +int retval =0 ; + +/* Clear AUX CH data buffer */ + reg =BUF_CLR ; +writel (reg, dp->reg_base +EXYNOS_DP_BUFFER_DATA_CTL ); + + start_offset =0 ; +while (start_offset < count) { +/* Buffer size of AUX CH is 16 * 4bytes */ +if ((count - start_offset) >16 ) + cur_data_count =16 ; +else + cur_data_count = count - start_offset; + +for (i =0 ; i <3 ; i++) { +/* Select DPCD device address */ + reg =AUX_ADDR_7_0 (reg_addr + start_offset); +writel (reg, dp->reg_base +EXYNOS_DP_AUX_ADDR_7_0 ); + reg =AUX_ADDR_15_8 (reg_addr + start_offset); +writel (reg, dp->reg_base +EXYNOS_DP_AUX_ADDR_15_8 ); + reg =AUX_ADDR_19_16 (reg_addr + start_offset); +writel (reg, dp->reg_base +EXYNOS_DP_AUX_ADDR_19_16 ); + +for (cur_data_idx =0 ; cur_data_idx < cur_data_count; + cur_data_idx++) { + reg = data[start_offset + cur_data_idx]; +writel (reg, dp->reg_base +EXYNOS_DP_BUF_DATA_0 + +4 * cur_data_idx); + } + +/* +* Set DisplayPort transaction and write +* If bit 3 is 1, DisplayPort transaction. +* If Bit 3 is 0, I2C transaction. +*/ + reg =AUX_LENGTH (cur_data_count) | +AUX_TX_COMM_DP_TRANSACTION |AUX_TX_COMM_WRITE ; +writel (reg, dp->reg_base +EXYNOS_DP_AUX_CH_CTL_1 ); + +/* Start AUX transaction */ + retval =analogix_dp_start_aux_transaction (dp); +if (retval ==0 ) +break ; +else +dev_dbg (dp->dev,"%s: Aux Transaction fail!\n" , + __func__); + } + + start_offset += cur_data_count; + } + +return retval; +} + +int analogix_dp_read_bytes_from_dpcd (struct analogix_dp_device *dp, +unsigned int reg_addr, +unsigned int count, +unsigned char data[]) +{ +u32 reg; +unsigned int start_offset; +unsigned int cur_data_count; +unsigned int cur_data_idx; +int i; +int retval =0 ; + +/* Clear AUX CH data buffer */ + reg =BUF_CLR ; +writel (reg, dp->reg_base +EXYNOS_DP_BUFFER_DATA_CTL ); + + start_offset =0 ; +while (start_offset < count) { +/* Buffer size of AUX CH is 16 * 4bytes */ +if ((count - start_offset) >16 ) + cur_data_count =16 ; +else + cur_data_count = count - start_offset; + +/* AUX CH Request Transaction process */ +for (i =0 ; i <3 ; i++) { +/* Select DPCD device address */ + reg =AUX_ADDR_7_0 (reg_addr + start_offset); +writel (reg, dp->reg_base +EXYNOS_DP_AUX_ADDR_7_0 ); + reg =AUX_ADDR_15_8 (reg_addr + start_offset); +writel (reg, dp->reg_base +EXYNOS_DP_AUX_ADDR_15_8 ); + reg =AUX_ADDR_19_16 (reg_addr + start_offset); +writel (reg, dp->reg_base +EXYNOS_DP_AUX_ADDR_19_16 ); + +/* +* Set DisplayPort transaction and read +* If bit 3 is 1, DisplayPort transaction. +* If Bit 3 is 0, I2C transaction. +*/ + reg =AUX_LENGTH (cur_data_count) | +AUX_TX_COMM_DP_TRANSACTION |AUX_TX_COMM_READ ; +writel (reg, dp->reg_base +EXYNOS_DP_AUX_CH_CTL_1 ); + +/* Start AUX transaction */ + retval =analogix_dp_start_aux_transaction (dp); +if (retval ==0 ) +break ; +else +dev_dbg (dp->dev,"%s: Aux Transaction fail!\n" , + __func__); + } + +for (cur_data_idx =0 ; cur_data_idx < cur_data_count; + cur_data_idx++) { + reg =readl (dp->reg_base +EXYNOS_DP_BUF_DATA_0 + +4 * cur_data_idx); + data[start_offset + cur_data_idx] = + (unsigned char )reg; + } + + start_offset += cur_data_count; + } + +return retval; +} + +int analogix_dp_select_i2c_device (struct analogix_dp_device *dp, +unsigned int device_addr, +unsigned int reg_addr) +{ +u32 reg; +int retval; + +/* Set EDID device address */ + reg = device_addr; +writel (reg, dp->reg_base +EXYNOS_DP_AUX_ADDR_7_0 ); +writel (0x0 , dp->reg_base +EXYNOS_DP_AUX_ADDR_15_8 ); +writel (0x0 , dp->reg_base +EXYNOS_DP_AUX_ADDR_19_16 ); + +/* Set offset from base address of EDID device */ +writel (reg_addr, dp->reg_base +EXYNOS_DP_BUF_DATA_0 ); + +/* +* Set I2C transaction and write address +* If bit 3 is 1, DisplayPort transaction. +* If Bit 3 is 0, I2C transaction. +*/ + reg =AUX_TX_COMM_I2C_TRANSACTION |AUX_TX_COMM_MOT | +AUX_TX_COMM_WRITE ; +writel (reg, dp->reg_base +EXYNOS_DP_AUX_CH_CTL_1 ); + +/* Start AUX transaction */ + retval =analogix_dp_start_aux_transaction (dp); +if (retval !=0 ) +dev_dbg (dp->dev,"%s: Aux Transaction fail!\n" , __func__); + +return retval; +} + +int analogix_dp_read_byte_from_i2c (struct analogix_dp_device *dp, +unsigned int device_addr, +unsigned int reg_addr, +unsigned int *data) +{ +u32 reg; +int i; +int retval; + +for (i =0 ; i <3 ; i++) { +/* Clear AUX CH data buffer */ + reg =BUF_CLR ; +writel (reg, dp->reg_base +EXYNOS_DP_BUFFER_DATA_CTL ); + +/* Select EDID device */ + retval =analogix_dp_select_i2c_device (dp, device_addr, reg_addr); +if (retval !=0 ) +continue ; + +/* +* Set I2C transaction and read data +* If bit 3 is 1, DisplayPort transaction. +* If Bit 3 is 0, I2C transaction. +*/ + reg =AUX_TX_COMM_I2C_TRANSACTION | +AUX_TX_COMM_READ ; +writel (reg, dp->reg_base +EXYNOS_DP_AUX_CH_CTL_1 ); + +/* Start AUX transaction */ + retval =analogix_dp_start_aux_transaction (dp); +if (retval ==0 ) +break ; +else +dev_dbg (dp->dev,"%s: Aux Transaction fail!\n" , + __func__); + } + +/* Read data */ +if (retval ==0 ) + *data =readl (dp->reg_base +EXYNOS_DP_BUF_DATA_0 ); + +return retval; +} + +int analogix_dp_read_bytes_from_i2c (struct analogix_dp_device *dp, +unsigned int device_addr, +unsigned int reg_addr, +unsigned int count, +unsigned char edid[]) +{ +u32 reg; +unsigned int i, j; +unsigned int cur_data_idx; +unsigned int defer =0 ; +int retval =0 ; + +for (i =0 ; i < count; i +=16 ) { +for (j =0 ; j <3 ; j++) { +/* Clear AUX CH data buffer */ + reg =BUF_CLR ; +writel (reg, dp->reg_base +EXYNOS_DP_BUFFER_DATA_CTL ); + +/* Set normal AUX CH command */ + reg =readl (dp->reg_base +EXYNOS_DP_AUX_CH_CTL_2 ); + reg &= ~ADDR_ONLY ; +writel (reg, dp->reg_base +EXYNOS_DP_AUX_CH_CTL_2 ); + +/* +* If Rx sends defer, Tx sends only reads +* request without sending address +*/ +if (!defer) + retval =analogix_dp_select_i2c_device (dp, + device_addr, reg_addr + i); +else + defer =0 ; + +if (retval ==0 ) { +/* +* Set I2C transaction and write data +* If bit 3 is 1, DisplayPort transaction. +* If Bit 3 is 0, I2C transaction. +*/ + reg =AUX_LENGTH (16 ) | +AUX_TX_COMM_I2C_TRANSACTION | +AUX_TX_COMM_READ ; +writel (reg, dp->reg_base + +EXYNOS_DP_AUX_CH_CTL_1 ); + +/* Start AUX transaction */ + retval =analogix_dp_start_aux_transaction (dp); +if (retval ==0 ) +break ; +else +dev_dbg (dp->dev, +"%s: Aux Transaction fail!\n" , + __func__); + } +/* Check if Rx sends defer */ + reg =readl (dp->reg_base +EXYNOS_DP_AUX_RX_COMM ); +if (reg ==AUX_RX_COMM_AUX_DEFER || + reg ==AUX_RX_COMM_I2C_DEFER ) { +dev_err (dp->dev,"Defer: %d\n\n" , reg); + defer =1 ; + } + } + +for (cur_data_idx =0 ; cur_data_idx <16 ; cur_data_idx++) { + reg =readl (dp->reg_base +EXYNOS_DP_BUF_DATA_0 + +4 * cur_data_idx); + edid[i + cur_data_idx] = (unsigned char )reg; + } + } + +return retval; +} + +void analogix_dp_set_link_bandwidth (struct analogix_dp_device *dp,u32 bwtype) +{ +u32 reg; + + reg = bwtype; +if ((bwtype ==LINK_RATE_2_70GBPS ) || (bwtype ==LINK_RATE_1_62GBPS )) +writel (reg, dp->reg_base +EXYNOS_DP_LINK_BW_SET ); +} + +void analogix_dp_get_link_bandwidth (struct analogix_dp_device *dp,u32 *bwtype) +{ +u32 reg; + + reg =readl (dp->reg_base +EXYNOS_DP_LINK_BW_SET ); + *bwtype = reg; +} + +void analogix_dp_set_lane_count (struct analogix_dp_device *dp,u32 count) +{ +u32 reg; + + reg = count; +writel (reg, dp->reg_base +EXYNOS_DP_LANE_COUNT_SET ); +} + +void analogix_dp_get_lane_count (struct analogix_dp_device *dp,u32 *count) +{ +u32 reg; + + reg =readl (dp->reg_base +EXYNOS_DP_LANE_COUNT_SET ); + *count = reg; +} + +void analogix_dp_enable_enhanced_mode (struct analogix_dp_device *dp,bool enable) +{ +u32 reg; + +if (enable) { + reg =readl (dp->reg_base +EXYNOS_DP_SYS_CTL_4 ); + reg |=ENHANCED ; +writel (reg, dp->reg_base +EXYNOS_DP_SYS_CTL_4 ); + }else { + reg =readl (dp->reg_base +EXYNOS_DP_SYS_CTL_4 ); + reg &= ~ENHANCED ; +writel (reg, dp->reg_base +EXYNOS_DP_SYS_CTL_4 ); + } +} + +void analogix_dp_set_training_pattern (struct analogix_dp_device *dp, +enum pattern_set pattern) +{ +u32 reg; + +switch (pattern) { +case PRBS7 : + reg =SCRAMBLING_ENABLE |LINK_QUAL_PATTERN_SET_PRBS7 ; +writel (reg, dp->reg_base +EXYNOS_DP_TRAINING_PTN_SET ); +break ; +case D10_2 : + reg =SCRAMBLING_ENABLE |LINK_QUAL_PATTERN_SET_D10_2 ; +writel (reg, dp->reg_base +EXYNOS_DP_TRAINING_PTN_SET ); +break ; +case TRAINING_PTN1 : + reg =SCRAMBLING_DISABLE |SW_TRAINING_PATTERN_SET_PTN1 ; +writel (reg, dp->reg_base +EXYNOS_DP_TRAINING_PTN_SET ); +break ; +case TRAINING_PTN2 : + reg =SCRAMBLING_DISABLE |SW_TRAINING_PATTERN_SET_PTN2 ; +writel (reg, dp->reg_base +EXYNOS_DP_TRAINING_PTN_SET ); +break ; +case DP_NONE : + reg =SCRAMBLING_ENABLE | +LINK_QUAL_PATTERN_SET_DISABLE | +SW_TRAINING_PATTERN_SET_NORMAL ; +writel (reg, dp->reg_base +EXYNOS_DP_TRAINING_PTN_SET ); +break ; +default : +break ; + } +} + +void analogix_dp_set_lane0_pre_emphasis (struct analogix_dp_device *dp,u32 level) +{ +u32 reg; + + reg =readl (dp->reg_base +EXYNOS_DP_LN0_LINK_TRAINING_CTL ); + reg &= ~PRE_EMPHASIS_SET_MASK ; + reg |= level <<PRE_EMPHASIS_SET_SHIFT ; +writel (reg, dp->reg_base +EXYNOS_DP_LN0_LINK_TRAINING_CTL ); +} + +void analogix_dp_set_lane1_pre_emphasis (struct analogix_dp_device *dp,u32 level) +{ +u32 reg; + + reg =readl (dp->reg_base +EXYNOS_DP_LN1_LINK_TRAINING_CTL ); + reg &= ~PRE_EMPHASIS_SET_MASK ; + reg |= level <<PRE_EMPHASIS_SET_SHIFT ; +writel (reg, dp->reg_base +EXYNOS_DP_LN1_LINK_TRAINING_CTL ); +} + +void analogix_dp_set_lane2_pre_emphasis (struct analogix_dp_device *dp,u32 level) +{ +u32 reg; + + reg =readl (dp->reg_base +EXYNOS_DP_LN2_LINK_TRAINING_CTL ); + reg &= ~PRE_EMPHASIS_SET_MASK ; + reg |= level <<PRE_EMPHASIS_SET_SHIFT ; +writel (reg, dp->reg_base +EXYNOS_DP_LN2_LINK_TRAINING_CTL ); +} + +void analogix_dp_set_lane3_pre_emphasis (struct analogix_dp_device *dp,u32 level) +{ +u32 reg; + + reg =readl (dp->reg_base +EXYNOS_DP_LN3_LINK_TRAINING_CTL ); + reg &= ~PRE_EMPHASIS_SET_MASK ; + reg |= level <<PRE_EMPHASIS_SET_SHIFT ; +writel (reg, dp->reg_base +EXYNOS_DP_LN3_LINK_TRAINING_CTL ); +} + +void analogix_dp_set_lane0_link_training (struct analogix_dp_device *dp, +u32 training_lane) +{ +u32 reg; + + reg = training_lane; +writel (reg, dp->reg_base +EXYNOS_DP_LN0_LINK_TRAINING_CTL ); +} + +void analogix_dp_set_lane1_link_training (struct analogix_dp_device *dp, +u32 training_lane) +{ +u32 reg; + + reg = training_lane; +writel (reg, dp->reg_base +EXYNOS_DP_LN1_LINK_TRAINING_CTL ); +} + +void analogix_dp_set_lane2_link_training (struct analogix_dp_device *dp, +u32 training_lane) +{ +u32 reg; + + reg = training_lane; +writel (reg, dp->reg_base +EXYNOS_DP_LN2_LINK_TRAINING_CTL ); +} + +void analogix_dp_set_lane3_link_training (struct analogix_dp_device *dp, +u32 training_lane) +{ +u32 reg; + + reg = training_lane; +writel (reg, dp->reg_base +EXYNOS_DP_LN3_LINK_TRAINING_CTL ); +} + +u32 analogix_dp_get_lane0_link_training (struct analogix_dp_device *dp) +{ +u32 reg; + + reg =readl (dp->reg_base +EXYNOS_DP_LN0_LINK_TRAINING_CTL ); +return reg; +} + +u32 analogix_dp_get_lane1_link_training (struct analogix_dp_device *dp) +{ +u32 reg; + + reg =readl (dp->reg_base +EXYNOS_DP_LN1_LINK_TRAINING_CTL ); +return reg; +} + +u32 analogix_dp_get_lane2_link_training (struct analogix_dp_device *dp) +{ +u32 reg; + + reg =readl (dp->reg_base +EXYNOS_DP_LN2_LINK_TRAINING_CTL ); +return reg; +} + +u32 analogix_dp_get_lane3_link_training (struct analogix_dp_device *dp) +{ +u32 reg; + + reg =readl (dp->reg_base +EXYNOS_DP_LN3_LINK_TRAINING_CTL ); +return reg; +} + +void analogix_dp_reset_macro (struct analogix_dp_device *dp) +{ +u32 reg; + + reg =readl (dp->reg_base +EXYNOS_DP_PHY_TEST ); + reg |=MACRO_RST ; +writel (reg, dp->reg_base +EXYNOS_DP_PHY_TEST ); + +/* 10 us is the minimum reset time. */ +usleep_range (10 ,20 ); + + reg &= ~MACRO_RST ; +writel (reg, dp->reg_base +EXYNOS_DP_PHY_TEST ); +} + +void analogix_dp_init_video (struct analogix_dp_device *dp) +{ +u32 reg; + + reg =VSYNC_DET |VID_FORMAT_CHG |VID_CLK_CHG ; +writel (reg, dp->reg_base +EXYNOS_DP_COMMON_INT_STA_1 ); + + reg =0x0 ; +writel (reg, dp->reg_base +EXYNOS_DP_SYS_CTL_1 ); + + reg =CHA_CRI (4 ) |CHA_CTRL ; +writel (reg, dp->reg_base +EXYNOS_DP_SYS_CTL_2 ); + + reg =0x0 ; +writel (reg, dp->reg_base +EXYNOS_DP_SYS_CTL_3 ); + + reg =VID_HRES_TH (2 ) |VID_VRES_TH (0 ); +writel (reg, dp->reg_base +EXYNOS_DP_VIDEO_CTL_8 ); +} + +void analogix_dp_set_video_color_format (struct analogix_dp_device *dp) +{ +u32 reg; + +/* Configure the input color depth, color space, dynamic range */ + reg = (dp->video_info->dynamic_range <<IN_D_RANGE_SHIFT ) | + (dp->video_info->color_depth <<IN_BPC_SHIFT ) | + (dp->video_info->color_space <<IN_COLOR_F_SHIFT ); +writel (reg, dp->reg_base +EXYNOS_DP_VIDEO_CTL_2 ); + +/* Set Input Color YCbCr Coefficients to ITU601 or ITU709 */ + reg =readl (dp->reg_base +EXYNOS_DP_VIDEO_CTL_3 ); + reg &= ~IN_YC_COEFFI_MASK ; +if (dp->video_info->ycbcr_coeff) + reg |=IN_YC_COEFFI_ITU709 ; +else + reg |=IN_YC_COEFFI_ITU601 ; +writel (reg, dp->reg_base +EXYNOS_DP_VIDEO_CTL_3 ); +} + +int analogix_dp_is_slave_video_stream_clock_on (struct analogix_dp_device *dp) +{ +u32 reg; + + reg =readl (dp->reg_base +EXYNOS_DP_SYS_CTL_1 ); +writel (reg, dp->reg_base +EXYNOS_DP_SYS_CTL_1 ); + + reg =readl (dp->reg_base +EXYNOS_DP_SYS_CTL_1 ); + +if (!(reg &DET_STA )) { +dev_dbg (dp->dev,"Input stream clock not detected.\n" ); +return -EINVAL ; + } + + reg =readl (dp->reg_base +EXYNOS_DP_SYS_CTL_2 ); +writel (reg, dp->reg_base +EXYNOS_DP_SYS_CTL_2 ); + + reg =readl (dp->reg_base +EXYNOS_DP_SYS_CTL_2 ); +dev_dbg (dp->dev,"wait SYS_CTL_2.\n" ); + +if (reg &CHA_STA ) { +dev_dbg (dp->dev,"Input stream clk is changing\n" ); +return -EINVAL ; + } + +return 0 ; +} + +void analogix_dp_set_video_cr_mn (struct analogix_dp_device *dp, +enum clock_recovery_m_value_type type, +u32 m_value, +u32 n_value) +{ +u32 reg; + +if (type ==REGISTER_M ) { + reg =readl (dp->reg_base +EXYNOS_DP_SYS_CTL_4 ); + reg |=FIX_M_VID ; +writel (reg, dp->reg_base +EXYNOS_DP_SYS_CTL_4 ); + reg = m_value &0xff ; +writel (reg, dp->reg_base +EXYNOS_DP_M_VID_0 ); + reg = (m_value >>8 ) &0xff ; +writel (reg, dp->reg_base +EXYNOS_DP_M_VID_1 ); + reg = (m_value >>16 ) &0xff ; +writel (reg, dp->reg_base +EXYNOS_DP_M_VID_2 ); + + reg = n_value &0xff ; +writel (reg, dp->reg_base +EXYNOS_DP_N_VID_0 ); + reg = (n_value >>8 ) &0xff ; +writel (reg, dp->reg_base +EXYNOS_DP_N_VID_1 ); + reg = (n_value >>16 ) &0xff ; +writel (reg, dp->reg_base +EXYNOS_DP_N_VID_2 ); + }else { + reg =readl (dp->reg_base +EXYNOS_DP_SYS_CTL_4 ); + reg &= ~FIX_M_VID ; +writel (reg, dp->reg_base +EXYNOS_DP_SYS_CTL_4 ); + +writel (0x00 , dp->reg_base +EXYNOS_DP_N_VID_0 ); +writel (0x80 , dp->reg_base +EXYNOS_DP_N_VID_1 ); +writel (0x00 , dp->reg_base +EXYNOS_DP_N_VID_2 ); + } +} + +void analogix_dp_set_video_timing_mode (struct analogix_dp_device *dp,u32 type) +{ +u32 reg; + +if (type ==VIDEO_TIMING_FROM_CAPTURE ) { + reg =readl (dp->reg_base +EXYNOS_DP_VIDEO_CTL_10 ); + reg &= ~FORMAT_SEL ; +writel (reg, dp->reg_base +EXYNOS_DP_VIDEO_CTL_10 ); + }else { + reg =readl (dp->reg_base +EXYNOS_DP_VIDEO_CTL_10 ); + reg |=FORMAT_SEL ; +writel (reg, dp->reg_base +EXYNOS_DP_VIDEO_CTL_10 ); + } +} + +void analogix_dp_enable_video_master (struct analogix_dp_device *dp,bool enable) +{ +u32 reg; + +if (enable) { + reg =readl (dp->reg_base +EXYNOS_DP_SOC_GENERAL_CTL ); + reg &= ~VIDEO_MODE_MASK ; + reg |=VIDEO_MASTER_MODE_EN |VIDEO_MODE_MASTER_MODE ; +writel (reg, dp->reg_base +EXYNOS_DP_SOC_GENERAL_CTL ); + }else { + reg =readl (dp->reg_base +EXYNOS_DP_SOC_GENERAL_CTL ); + reg &= ~VIDEO_MODE_MASK ; + reg |=VIDEO_MODE_SLAVE_MODE ; +writel (reg, dp->reg_base +EXYNOS_DP_SOC_GENERAL_CTL ); + } +} + +void analogix_dp_start_video (struct analogix_dp_device *dp) +{ +u32 reg; + + reg =readl (dp->reg_base +EXYNOS_DP_VIDEO_CTL_1 ); + reg |=VIDEO_EN ; +writel (reg, dp->reg_base +EXYNOS_DP_VIDEO_CTL_1 ); +} + +int analogix_dp_is_video_stream_on (struct analogix_dp_device *dp) +{ +u32 reg; + + reg =readl (dp->reg_base +EXYNOS_DP_SYS_CTL_3 ); +writel (reg, dp->reg_base +EXYNOS_DP_SYS_CTL_3 ); + + reg =readl (dp->reg_base +EXYNOS_DP_SYS_CTL_3 ); +if (!(reg &STRM_VALID )) { +dev_dbg (dp->dev,"Input video stream is not detected.\n" ); +return -EINVAL ; + } + +return 0 ; +} + +void analogix_dp_config_video_slave_mode (struct analogix_dp_device *dp) +{ +u32 reg; + + reg =readl (dp->reg_base +EXYNOS_DP_FUNC_EN_1 ); + reg &= ~(MASTER_VID_FUNC_EN_N |SLAVE_VID_FUNC_EN_N ); + reg |=MASTER_VID_FUNC_EN_N ; +writel (reg, dp->reg_base +EXYNOS_DP_FUNC_EN_1 ); + + reg =readl (dp->reg_base +EXYNOS_DP_VIDEO_CTL_10 ); + reg &= ~INTERACE_SCAN_CFG ; + reg |= (dp->video_info->interlaced <<2 ); +writel (reg, dp->reg_base +EXYNOS_DP_VIDEO_CTL_10 ); + + reg =readl (dp->reg_base +EXYNOS_DP_VIDEO_CTL_10 ); + reg &= ~VSYNC_POLARITY_CFG ; + reg |= (dp->video_info->v_sync_polarity <<1 ); +writel (reg, dp->reg_base +EXYNOS_DP_VIDEO_CTL_10 ); + + reg =readl (dp->reg_base +EXYNOS_DP_VIDEO_CTL_10 ); + reg &= ~HSYNC_POLARITY_CFG ; + reg |= (dp->video_info->h_sync_polarity <<0 ); +writel (reg, dp->reg_base +EXYNOS_DP_VIDEO_CTL_10 ); + + reg =AUDIO_MODE_SPDIF_MODE |VIDEO_MODE_SLAVE_MODE ; +writel (reg, dp->reg_base +EXYNOS_DP_SOC_GENERAL_CTL ); +} + +void analogix_dp_enable_scrambling (struct analogix_dp_device *dp) +{ +u32 reg; + + reg =readl (dp->reg_base +EXYNOS_DP_TRAINING_PTN_SET ); + reg &= ~SCRAMBLING_DISABLE ; +writel (reg, dp->reg_base +EXYNOS_DP_TRAINING_PTN_SET ); +} + +void analogix_dp_disable_scrambling (struct analogix_dp_device *dp) +{ +u32 reg; + + reg =readl (dp->reg_base +EXYNOS_DP_TRAINING_PTN_SET ); + reg |=SCRAMBLING_DISABLE ; +writel (reg, dp->reg_base +EXYNOS_DP_TRAINING_PTN_SET ); +}drivers/gpu/drm/bridge/analogix/analogix_dp_reg.h new file +366
-0@@ -0,0 +1,366 @@ +/* +* Register definition file for Analogix DP core driver +* +* Copyright (C) 2012 Samsung Electronics Co., Ltd. +* Author: Jingoo Han <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +*/ + +#ifndef _ANALOGIX_DP_REG_H +#define _ANALOGIX_DP_REG_H + +#define EXYNOS_DP_TX_SW_RESET 0x14 +#define EXYNOS_DP_FUNC_EN_1 0x18 +#define EXYNOS_DP_FUNC_EN_2 0x1C +#define EXYNOS_DP_VIDEO_CTL_1 0x20 +#define EXYNOS_DP_VIDEO_CTL_2 0x24 +#define EXYNOS_DP_VIDEO_CTL_3 0x28 + +#define EXYNOS_DP_VIDEO_CTL_8 0x3C +#define EXYNOS_DP_VIDEO_CTL_10 0x44 + +#define EXYNOS_DP_LANE_MAP 0x35C + +#define EXYNOS_DP_ANALOG_CTL_1 0x370 +#define EXYNOS_DP_ANALOG_CTL_2 0x374 +#define EXYNOS_DP_ANALOG_CTL_3 0x378 +#define EXYNOS_DP_PLL_FILTER_CTL_1 0x37C +#define EXYNOS_DP_TX_AMP_TUNING_CTL 0x380 + +#define EXYNOS_DP_AUX_HW_RETRY_CTL 0x390 + +#define EXYNOS_DP_COMMON_INT_STA_1 0x3C4 +#define EXYNOS_DP_COMMON_INT_STA_2 0x3C8 +#define EXYNOS_DP_COMMON_INT_STA_3 0x3CC +#define EXYNOS_DP_COMMON_INT_STA_4 0x3D0 +#define EXYNOS_DP_INT_STA 0x3DC +#define EXYNOS_DP_COMMON_INT_MASK_1 0x3E0 +#define EXYNOS_DP_COMMON_INT_MASK_2 0x3E4 +#define EXYNOS_DP_COMMON_INT_MASK_3 0x3E8 +#define EXYNOS_DP_COMMON_INT_MASK_4 0x3EC +#define EXYNOS_DP_INT_STA_MASK 0x3F8 +#define EXYNOS_DP_INT_CTL 0x3FC + +#define EXYNOS_DP_SYS_CTL_1 0x600 +#define EXYNOS_DP_SYS_CTL_2 0x604 +#define EXYNOS_DP_SYS_CTL_3 0x608 +#define EXYNOS_DP_SYS_CTL_4 0x60C + +#define EXYNOS_DP_PKT_SEND_CTL 0x640 +#define EXYNOS_DP_HDCP_CTL 0x648 + +#define EXYNOS_DP_LINK_BW_SET 0x680 +#define EXYNOS_DP_LANE_COUNT_SET 0x684 +#define EXYNOS_DP_TRAINING_PTN_SET 0x688 +#define EXYNOS_DP_LN0_LINK_TRAINING_CTL 0x68C +#define EXYNOS_DP_LN1_LINK_TRAINING_CTL 0x690 +#define EXYNOS_DP_LN2_LINK_TRAINING_CTL 0x694 +#define EXYNOS_DP_LN3_LINK_TRAINING_CTL 0x698 + +#define EXYNOS_DP_DEBUG_CTL 0x6C0 +#define EXYNOS_DP_HPD_DEGLITCH_L 0x6C4 +#define EXYNOS_DP_HPD_DEGLITCH_H 0x6C8 +#define EXYNOS_DP_LINK_DEBUG_CTL 0x6E0 + +#define EXYNOS_DP_M_VID_0 0x700 +#define EXYNOS_DP_M_VID_1 0x704 +#define EXYNOS_DP_M_VID_2 0x708 +#define EXYNOS_DP_N_VID_0 0x70C +#define EXYNOS_DP_N_VID_1 0x710 +#define EXYNOS_DP_N_VID_2 0x714 + +#define EXYNOS_DP_PLL_CTL 0x71C +#define EXYNOS_DP_PHY_PD 0x720 +#define EXYNOS_DP_PHY_TEST 0x724 + +#define EXYNOS_DP_VIDEO_FIFO_THRD 0x730 +#define EXYNOS_DP_AUDIO_MARGIN 0x73C + +#define EXYNOS_DP_M_VID_GEN_FILTER_TH 0x764 +#define EXYNOS_DP_M_AUD_GEN_FILTER_TH 0x778 +#define EXYNOS_DP_AUX_CH_STA 0x780 +#define EXYNOS_DP_AUX_CH_DEFER_CTL 0x788 +#define EXYNOS_DP_AUX_RX_COMM 0x78C +#define EXYNOS_DP_BUFFER_DATA_CTL 0x790 +#define EXYNOS_DP_AUX_CH_CTL_1 0x794 +#define EXYNOS_DP_AUX_ADDR_7_0 0x798 +#define EXYNOS_DP_AUX_ADDR_15_8 0x79C +#define EXYNOS_DP_AUX_ADDR_19_16 0x7A0 +#define EXYNOS_DP_AUX_CH_CTL_2 0x7A4 + +#define EXYNOS_DP_BUF_DATA_0 0x7C0 +Lines of this file are not shown. View the raw message.
drivers/gpu/drm/exynos/exynos_dp_core.c +84
-1269Lines of this file are not shown. View the raw message.
drivers/gpu/drm/exynos/exynos_dp_core.h deleted +0
-282Lines of this file are not shown. View the raw message.
drivers/gpu/drm/exynos/exynos_dp_reg.c deleted +0
-1263Lines of this file are not shown. View the raw message.
drivers/gpu/drm/exynos/exynos_dp_reg.h deleted +0
-366Lines of this file are not shown. View the raw message.
include/drm/bridge/analogix_dp.h new file +40
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 7 lines
Thanks, Caesar -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Part of the diff is not shown here. View the raw message.
Re: [PATCH v14.1 01/17] drm: bridge: analogix/dp: split exynos dp driver to bridge directory
In reply to Heiko StübnerHello Yakir,
Quoted 13 lines · Heiko Stübner
Split the dp core driver from exynos directory to bridge directory, and rename the core driver to analogix_dp_*, rename the platform code to
exynos_dp.Beside the new
analogix_dpdriver would export six hooks. "analogix_dp_bind()" and "analogix_dp_unbind()" "analogix_dp_suspned()" and "analogix_dp_resume()" "analogix_dp_detect()" and "analogix_dp_get_modes()"The bind/unbind symbols is used for analogix platform driver to connect with
analogix_dpcore driver. And the detect/get_modes is used for analogix platform driver to init the connector.
Quoted 7 lines
They reason why connector need register in helper driver is rockchip drm haven't implement the atomic API, but Exynos drm have implement it, so there would need two different connector helper functions, that's why we leave the connector register in helper driver.
Signed-off-by Yakir Yang <[email protected]>---
Marc reported that his Exynos5250 Snow Chromebook fails to boot with v4.7-rc.
I've done a git bisect and tracked down to this commit. The problem is a NULL pointer dereference to connector->dev in drm_mode_create(connector->dev) when called from exynos_dp_get_modes(). The error log is at [1].
I'm trying to figure out the issue but wanted to mention in case you have any hints about what could be the cause. AFAICT the problem is related to the fact that drm_connector_init() is called in analogix_dp_bridge_attach() and the connector passed as argument is the one in struct analogix_dp_device *dp, but later exynos_dp_get_modes() calls drm_mode_create() passing the connector in struct exynos_dp_device *dp, which has not been previously initialized.
[1]
[ 4.175676] Unable to handle kernel NULL pointer dereference at virtual address 00000210 [ 4.182793] pgd = c0004000 [ 4.185171] [00000210] *pgd=00000000 [ 4.188657] Internal error: Oops: 5 [#1] PREEMPT SMP ARM [ 4.194164] Modules linked in: [ 4.196964] CPU: 1 PID: 68 Comm: kworker/1:1 Not tainted 4.7.0-rc2-next-20160606-00006-g876c3150327a #97 [ 4.206565] Hardware name: SAMSUNG EXYNOS (Flattened Device Tree) [ 4.212582] Workqueue: events hdmi_hotplug_work_func [ 4.217383] task: ed758000 ti: ed75c000 task.ti: ed75c000 [ 4.222887] PC is at __mutex_lock_slowpath+0x6c/0x404 [ 4.227913] LR is at preempt_count_add+0xa4/0x140 [ 4.232592] pc : [<c06d21d4>] lr : [<c0139de4>] psr: 60000093 [ 4.232592] sp : ed75dd80 ip : 00000000 fp : ee8c1180 [ 4.244193] r10: 00000300 r9 : ed758000 r8 : 00000001 [ 4.249262] r7 : 60000013 r6 : c0b473a8 r5 : 00000210 r4 : 0000020c [ 4.261955] r3 : 00000000 r2 : 00000001 r1 : ee8c2808 r0 : 00000000 [ 4.273270] Flags: nZCv IRQs off FIQs on Mode SVC_32 ISA ARM Segment none [ 4.285336] Control: 10c5387d Table: 4000406a DAC: 00000051 [ 4.295885] Process kworker/1:1 (pid: 68, stack limit = 0xed75c210) [ 4.306979] Stack: (0xed75dd80 to 0xed75e000) [ 4.316102] dd80: ee8c1180 c03dd21c ee8f0820 00000001 0000020c 0000020c 00000000 00000000 [ 4.329201] dda0: 00000001 dededede 00000300 c06d2578 ee8c2808 c03d00f4 ee801d80 c0b0261c [ 4.342362] ddc0: 00000041 ee8c2800 00000000 00000001 ee8f0810 ee8f0b65 c074d2b4 c03d35b0 [ 4.353140] dde0: 00000000 00000300 ee8c1180 c03d81d0 c387cf74 ee8f0820 00000001 c03eaffc [ 4.361811] de00: 00000000 ee8f0820 00000001 c03f28bc ee8f0b65 c06d400c ee8c1180 006d40a4 [ 4.370483] de20: 00000000 01820a11 81010300 00000100 00000064 ee8f085c ee8f0820 c0b1f894 [ 4.379150] de40: c3872800 c0b82fac c074d2b4 c03b7550 c0b13274 c0327974 00000001 eefb8530 [ 4.387805] de60: 00000556 00000000 c38729b0 c3872800 ee8c1180 00000001 ee8c7000 00000000 [ 4.396467] de80: 00000556 00000300 c38729b0 00000002 ee8c1180 c03c107c ee8c7000 c3872800 [ 4.405121] dea0: ee8c7240 c3872800 c0b82fac c03c3268 c3872ad4 00000001 c3872ae0 c03b7af0 [ 4.413776] dec0: eefb8000 c0139804 00000000 c0136484 ee8a0000 ee8c1180 c3870b4c eefb7b00 [ 4.422415] dee0: eefbb000 00000000 00000000 eefb7b00 ee8c1180 c012ff2c 00000008 eefb7b24 [ 4.431045] df00: eefb7b00 ee8c1198 00000008 eefb7b24 c0b02100 ed75c000 eefb7b00 c0130178 [ 4.439664] df20: ed75c000 ee863040 ee8c1180 00000000 ee863040 ee8c1180 c0130140 00000000 [ 4.448274] df40: 00000000 00000000 00000000 c0135454 00000000 00000000 00000000 ee8c1180 [ 4.456879] df60: 00000000 00000000 dead4ead ffffffff ffffffff ed75df74 ed75df74 00000000 [ 4.465462] df80: 00000000 dead4ead ffffffff ffffffff ed75df90 ed75df90 ed75dfac ee863040 [ 4.474028] dfa0: c0135378 00000000 00000000 c0107978 00000000 00000000 00000000 00000000 [ 4.482597] dfc0: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 [ 4.491133] dfe0: 00000000 00000000 00000000 00000000 00000013 00000000 00000000 00000000 [ 4.499643] [<c06d21d4>] (__mutex_lock_slowpath) from [<c06d2578>] (mutex_lock+0xc/0x24) [ 4.507102] IPv6: ADDRCONF(NETDEV_UP): eth0: link is not ready [ 4.514264] [<c06d2578>] (mutex_lock) from [<c03d00f4>] (drm_mode_object_get_reg+0x28/0x80) [ 4.522981] [<c03d00f4>] (drm_mode_object_get_reg) from [<c03d35b0>] (drm_mode_object_get+0x18/0x20) [ 4.532491] [<c03d35b0>] (drm_mode_object_get) from [<c03d81d0>] (drm_mode_create+0x3c/0x58) [ 4.541316] [<c03d81d0>] (drm_mode_create) from [<c03eaffc>] (exynos_dp_get_modes+0x24/0x80) [ 4.550160] [<c03eaffc>] (exynos_dp_get_modes) from [<c03f28bc>] (analogix_dp_get_modes+0x198/0x278) [ 4.559735] [<c03f28bc>] (analogix_dp_get_modes) from [<c03b7550>] (drm_helper_probe_single_connector_modes+0x114/0x554) [ 4.571078] [<c03b7550>] (drm_helper_probe_single_connector_modes) from [<c03c107c>] (drm_fb_helper_probe_connector_modes+0x48/0x68) [ 4.583513] [<c03c107c>] (drm_fb_helper_probe_connector_modes) from [<c03c3268>] (drm_fb_helper_hotplug_event+0x70/0xdc) [ 4.594921] [<c03c3268>] (drm_fb_helper_hotplug_event) from [<c03b7af0>] (drm_helper_hpd_irq_event+0xd4/0x160) [ 4.605474] [<c03b7af0>] (drm_helper_hpd_irq_event) from [<c012ff2c>] (process_one_work+0x124/0x338) [ 4.615144] [<c012ff2c>] (process_one_work) from [<c0130178>] (worker_thread+0x38/0x4d4) [ 4.623764] [<c0130178>] (worker_thread) from [<c0135454>] (kthread+0xdc/0xf4) [ 4.631512] [<c0135454>] (kthread) from [<c0107978>] (ret_from_fork+0x14/0x3c) [ 4.639239] Code: e10f7000 f10c0080 e2845004 f595f000 (e1953f9f) [ 4.645845] ---[ end trace 3bfc770b9638a54b ]---
Best regards,
Signature · 3 lines
Javier Martinez Canillas Open Source Group Samsung Research America
Re: [PATCH v14.1 01/17] drm: bridge: analogix/dp: split exynos dp driver to bridge directory
Hi Javier,
Quoted 29 lines · Javier Martinez Canillas
Hello Yakir,
Quoted 13 lines · Heiko Stübner
Split the dp core driver from exynos directory to bridge directory, and rename the core driver to analogix_dp_*, rename the platform code to
exynos_dp.Beside the new
analogix_dpdriver would export six hooks. "analogix_dp_bind()" and "analogix_dp_unbind()" "analogix_dp_suspned()" and "analogix_dp_resume()" "analogix_dp_detect()" and "analogix_dp_get_modes()"The bind/unbind symbols is used for analogix platform driver to connect with
analogix_dpcore driver. And the detect/get_modes is used for analogix platform driver to init the connector.Quoted 7 lines
They reason why connector need register in helper driver is rockchip drm haven't implement the atomic API, but Exynos drm have implement it, so there would need two different connector helper functions, that's why we leave the connector register in helper driver.
Signed-off-by Yakir Yang <[email protected]>---
Marc reported that his Exynos5250 Snow Chromebook fails to boot with v4.7-rc.
I've done a git bisect and tracked down to this commit. The problem is a NULL pointer dereference to
connector->devindrm_mode_create(connector->dev)when called fromexynos_dp_get_modes(). The error log is at [1].
Quoted 6 lines
I'm trying to figure out the issue but wanted to mention in case you have any hints about what could be the cause. AFAICT the problem is related to the fact that
drm_connector_init()is called inanalogix_dp_bridge_attach()and the connector passed as argument is the one in structanalogix_dp_device*dp, but laterexynos_dp_get_modes()callsdrm_mode_create()passing the connector in structexynos_dp_device*dp, which has not been previously initialized.
Agree, this should be the problem, exynos_dp->connector haven't been initialized, driver should make exynos_dp->dp to a connector point, and record the passing connector in exynos_dp_bridge_attach(), that should fix this problem.
Thanks,
- Yakir
drivers/gpu/drm/exynos/exynos_dp.c +3 -2
@@ -34,7 +34,7 @@struct exynos_dp_device {struct drm_encoder encoder; -struct drm_connector connector; +struct drm_connector *connector;struct drm_bridge *ptn_bridge;struct drm_device *drm_dev;struct device *dev;
@@ -70,7 +70,7 @@ static int exynos_dp_poweroff(struct analogix_dp_plat_data *plat_data)static int exynos_dp_get_modes (struct analogix_dp_plat_data *plat_data) {struct exynos_dp_device *dp =to_dp (plat_data); -struct drm_connector *connector = &dp->connector; +struct drm_connector *connector = dp->connector;struct drm_display_mode *mode;int num_modes =0 ;
@@ -103,6 +103,7 @@ static int exynos_dp_bridge_attach(struct analogix_dp_plat_data *plat_data,int ret;drm_connector_register (connector); + dp->connector = connector;/* Pre-empt DP connector creation if there's a bridge */ if (dp->ptn_bridge) {
Quoted 60 lines
[1]
[ 4.175676] Unable to handle kernel NULL pointer dereference at virtual address 00000210 [ 4.182793] pgd = c0004000 [ 4.185171] [00000210] *pgd=00000000 [ 4.188657] Internal error: Oops: 5 [#1] PREEMPT SMP ARM [ 4.194164] Modules linked in: [ 4.196964] CPU: 1 PID: 68 Comm: kworker/1:1 Not tainted 4.7.0-rc2-next-20160606-00006-g876c3150327a #97 [ 4.206565] Hardware name: SAMSUNG EXYNOS (Flattened Device Tree) [ 4.212582] Workqueue: events hdmi_hotplug_work_func [ 4.217383] task: ed758000 ti: ed75c000 task.ti: ed75c000 [ 4.222887] PC is at __mutex_lock_slowpath+0x6c/0x404 [ 4.227913] LR is at preempt_count_add+0xa4/0x140 [ 4.232592] pc : [<c06d21d4>] lr : [<c0139de4>] psr: 60000093 [ 4.232592] sp : ed75dd80 ip : 00000000 fp : ee8c1180 [ 4.244193] r10: 00000300 r9 : ed758000 r8 : 00000001 [ 4.249262] r7 : 60000013 r6 : c0b473a8 r5 : 00000210 r4 : 0000020c [ 4.261955] r3 : 00000000 r2 : 00000001 r1 : ee8c2808 r0 : 00000000 [ 4.273270] Flags: nZCv IRQs off FIQs on Mode SVC_32 ISA ARM Segment none [ 4.285336] Control: 10c5387d Table: 4000406a DAC: 00000051 [ 4.295885] Process kworker/1:1 (pid: 68, stack limit = 0xed75c210) [ 4.306979] Stack: (0xed75dd80 to 0xed75e000) [ 4.316102] dd80: ee8c1180 c03dd21c ee8f0820 00000001 0000020c 0000020c 00000000 00000000 [ 4.329201] dda0: 00000001 dededede 00000300 c06d2578 ee8c2808 c03d00f4 ee801d80 c0b0261c [ 4.342362] ddc0: 00000041 ee8c2800 00000000 00000001 ee8f0810 ee8f0b65 c074d2b4 c03d35b0 [ 4.353140] dde0: 00000000 00000300 ee8c1180 c03d81d0 c387cf74 ee8f0820 00000001 c03eaffc [ 4.361811] de00: 00000000 ee8f0820 00000001 c03f28bc ee8f0b65 c06d400c ee8c1180 006d40a4 [ 4.370483] de20: 00000000 01820a11 81010300 00000100 00000064 ee8f085c ee8f0820 c0b1f894 [ 4.379150] de40: c3872800 c0b82fac c074d2b4 c03b7550 c0b13274 c0327974 00000001 eefb8530 [ 4.387805] de60: 00000556 00000000 c38729b0 c3872800 ee8c1180 00000001 ee8c7000 00000000 [ 4.396467] de80: 00000556 00000300 c38729b0 00000002 ee8c1180 c03c107c ee8c7000 c3872800 [ 4.405121] dea0: ee8c7240 c3872800 c0b82fac c03c3268 c3872ad4 00000001 c3872ae0 c03b7af0 [ 4.413776] dec0: eefb8000 c0139804 00000000 c0136484 ee8a0000 ee8c1180 c3870b4c eefb7b00 [ 4.422415] dee0: eefbb000 00000000 00000000 eefb7b00 ee8c1180 c012ff2c 00000008 eefb7b24 [ 4.431045] df00: eefb7b00 ee8c1198 00000008 eefb7b24 c0b02100 ed75c000 eefb7b00 c0130178 [ 4.439664] df20: ed75c000 ee863040 ee8c1180 00000000 ee863040 ee8c1180 c0130140 00000000 [ 4.448274] df40: 00000000 00000000 00000000 c0135454 00000000 00000000 00000000 ee8c1180 [ 4.456879] df60: 00000000 00000000 dead4ead ffffffff ffffffff ed75df74 ed75df74 00000000 [ 4.465462] df80: 00000000 dead4ead ffffffff ffffffff ed75df90 ed75df90 ed75dfac ee863040 [ 4.474028] dfa0: c0135378 00000000 00000000 c0107978 00000000 00000000 00000000 00000000 [ 4.482597] dfc0: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 [ 4.491133] dfe0: 00000000 00000000 00000000 00000000 00000013 00000000 00000000 00000000 [ 4.499643] [<c06d21d4>] (__mutex_lock_slowpath) from [<c06d2578>] (mutex_lock+0xc/0x24) [ 4.507102] IPv6: ADDRCONF(NETDEV_UP): eth0: link is not ready [ 4.514264] [<c06d2578>] (mutex_lock) from [<c03d00f4>] (drm_mode_object_get_reg+0x28/0x80) [ 4.522981] [<c03d00f4>] (drm_mode_object_get_reg) from [<c03d35b0>] (drm_mode_object_get+0x18/0x20) [ 4.532491] [<c03d35b0>] (drm_mode_object_get) from [<c03d81d0>] (drm_mode_create+0x3c/0x58) [ 4.541316] [<c03d81d0>] (drm_mode_create) from [<c03eaffc>] (exynos_dp_get_modes+0x24/0x80) [ 4.550160] [<c03eaffc>] (exynos_dp_get_modes) from [<c03f28bc>] (analogix_dp_get_modes+0x198/0x278) [ 4.559735] [<c03f28bc>] (analogix_dp_get_modes) from [<c03b7550>] (drm_helper_probe_single_connector_modes+0x114/0x554) [ 4.571078] [<c03b7550>] (drm_helper_probe_single_connector_modes) from [<c03c107c>] (drm_fb_helper_probe_connector_modes+0x48/0x68) [ 4.583513] [<c03c107c>] (drm_fb_helper_probe_connector_modes) from [<c03c3268>] (drm_fb_helper_hotplug_event+0x70/0xdc) [ 4.594921] [<c03c3268>] (drm_fb_helper_hotplug_event) from [<c03b7af0>] (drm_helper_hpd_irq_event+0xd4/0x160) [ 4.605474] [<c03b7af0>] (drm_helper_hpd_irq_event) from [<c012ff2c>] (process_one_work+0x124/0x338) [ 4.615144] [<c012ff2c>] (process_one_work) from [<c0130178>] (worker_thread+0x38/0x4d4) [ 4.623764] [<c0130178>] (worker_thread) from [<c0135454>] (kthread+0xdc/0xf4) [ 4.631512] [<c0135454>] (kthread) from [<c0107978>] (ret_from_fork+0x14/0x3c) [ 4.639239] Code: e10f7000 f10c0080 e2845004 f595f000 (e1953f9f) [ 4.645845] ---[ end trace 3bfc770b9638a54b ]---Best regards,
Marc Zyngier
Tested-byRe: [PATCH v14.1 01/17] drm: bridge: analogix/dp: split exynos dp driver to bridge directory
Quoted 81 lines · On Wed, 8 Jun 2016 09:28:32 +0800 Yakir Yang…
Hi Javier,
Quoted 29 lines · Javier Martinez Canillas
Hello Yakir,
Quoted 13 lines · Heiko Stübner
Split the dp core driver from exynos directory to bridge directory, and rename the core driver to analogix_dp_*, rename the platform code to
exynos_dp.Beside the new
analogix_dpdriver would export six hooks. "analogix_dp_bind()" and "analogix_dp_unbind()" "analogix_dp_suspned()" and "analogix_dp_resume()" "analogix_dp_detect()" and "analogix_dp_get_modes()"The bind/unbind symbols is used for analogix platform driver to connect with
analogix_dpcore driver. And the detect/get_modes is used for analogix platform driver to init the connector.Quoted 7 lines
They reason why connector need register in helper driver is rockchip drm haven't implement the atomic API, but Exynos drm have implement it, so there would need two different connector helper functions, that's why we leave the connector register in helper driver.
Signed-off-by Yakir Yang <[email protected]>---
Marc reported that his Exynos5250 Snow Chromebook fails to boot with v4.7-rc.
I've done a git bisect and tracked down to this commit. The problem is a NULL pointer dereference to
connector->devindrm_mode_create(connector->dev)when called fromexynos_dp_get_modes(). The error log is at [1].Quoted 6 lines
I'm trying to figure out the issue but wanted to mention in case you have any hints about what could be the cause. AFAICT the problem is related to the fact that
drm_connector_init()is called inanalogix_dp_bridge_attach()and the connector passed as argument is the one in structanalogix_dp_device*dp, but laterexynos_dp_get_modes()callsdrm_mode_create()passing the connector in structexynos_dp_device*dp, which has not been previously initialized.Agree, this should be the problem,
exynos_dp->connectorhaven't been initialized, driver should makeexynos_dp->dpto a connector point, and record the passing connector inexynos_dp_bridge_attach(), that should fix this problem.Thanks,
- Yakirdrivers/gpu/drm/exynos/exynos_dp.c +3
-2@@ -34,7 +34,7 @@struct exynos_dp_device {struct drm_encoder encoder; -struct drm_connector connector; +struct drm_connector *connector;struct drm_bridge *ptn_bridge;struct drm_device *drm_dev;struct device *dev;@@ -70,7 +70,7 @@ static int exynos_dp_poweroff(struct analogix_dp_plat_data *plat_data)static int exynos_dp_get_modes (struct analogix_dp_plat_data *plat_data) {struct exynos_dp_device *dp =to_dp (plat_data); -struct drm_connector *connector = &dp->connector; +struct drm_connector *connector = dp->connector;struct drm_display_mode *mode;int num_modes =0 ;@@ -103,6 +103,7 @@ static int exynos_dp_bridge_attach(structanalogix_dp_plat_data *plat_data, int ret;drm_connector_register (connector); + dp->connector = connector;/* Pre-empt DP connector creation if there's a bridge */
Quoted 2 lines
if (dp->ptn_bridge) {I've just tested this change, and in combination with Javier's DT patch, my Snow is back to its useful state (I'm writing this email from that very Chromebook).
Once you make this a proper patch, please add my:
to it.
Thanks a lot to you and Javier for tracking this down!
M.
Signature · 5 lines
Jazz is not dead. It just smells funny. -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v14.1 01/17] drm: bridge: analogix/dp: split exynos dp driver to bridge directory
Marc, Javier
Quoted 89 lines · Marc Zyngier
Quoted 80 lines · On Wed, 8 Jun 2016 09:28:32 +0800 Yakir Yang <[email protected]> wrote:
Hi Javier,
Quoted 29 lines · Javier Martinez Canillas
Hello Yakir,
Quoted 13 lines · Heiko Stübner
Split the dp core driver from exynos directory to bridge directory, and rename the core driver to analogix_dp_*, rename the platform code to
exynos_dp.Beside the new
analogix_dpdriver would export six hooks. "analogix_dp_bind()" and "analogix_dp_unbind()" "analogix_dp_suspned()" and "analogix_dp_resume()" "analogix_dp_detect()" and "analogix_dp_get_modes()"The bind/unbind symbols is used for analogix platform driver to connect with
analogix_dpcore driver. And the detect/get_modes is used for analogix platform driver to init the connector.Quoted 7 lines
They reason why connector need register in helper driver is rockchip drm haven't implement the atomic API, but Exynos drm have implement it, so there would need two different connector helper functions, that's why we leave the connector register in helper driver.
Signed-off-by Yakir Yang <[email protected]>---
Marc reported that his Exynos5250 Snow Chromebook fails to boot with v4.7-rc.
I've done a git bisect and tracked down to this commit. The problem is a NULL pointer dereference to
connector->devindrm_mode_create(connector->dev)when called fromexynos_dp_get_modes(). The error log is at [1].Quoted 6 lines
I'm trying to figure out the issue but wanted to mention in case you have any hints about what could be the cause. AFAICT the problem is related to the fact that
drm_connector_init()is called inanalogix_dp_bridge_attach()and the connector passed as argument is the one in structanalogix_dp_device*dp, but laterexynos_dp_get_modes()callsdrm_mode_create()passing the connector in structexynos_dp_device*dp, which has not been previously initialized.Agree, this should be the problem,
exynos_dp->connectorhaven't been initialized, driver should makeexynos_dp->dpto a connector point, and record the passing connector inexynos_dp_bridge_attach(), that should fix this problem.Thanks,
- Yakirdrivers/gpu/drm/exynos/exynos_dp.c +3
-2@@ -34,7 +34,7 @@struct exynos_dp_device {struct drm_encoder encoder; -struct drm_connector connector; +struct drm_connector *connector;struct drm_bridge *ptn_bridge;struct drm_device *drm_dev;struct device *dev;@@ -70,7 +70,7 @@ static int exynos_dp_poweroff(struct analogix_dp_plat_data *plat_data)static int exynos_dp_get_modes (struct analogix_dp_plat_data *plat_data) {struct exynos_dp_device *dp =to_dp (plat_data); -struct drm_connector *connector = &dp->connector; +struct drm_connector *connector = dp->connector;struct drm_display_mode *mode;int num_modes =0 ;@@ -103,6 +103,7 @@ static int exynos_dp_bridge_attach(structanalogix_dp_plat_data *plat_data, int ret;drm_connector_register (connector); + dp->connector = connector;/* Pre-empt DP connector creation if there's a bridge */ Quoted 2 lines
if (dp->ptn_bridge) {I've just tested this change, and in combination with Javier's DT patch, my Snow is back to its useful state (I'm writing this email from that very Chromebook).
Quoted 3 lines
Once you make this a proper patch, please add my:
Tested-by Marc Zyngier <[email protected]>
I guess Javier should be the best one to create this patch, if he have no time, i would do it for him. thanks for your report ;)
- Yakir
Quoted 5 lines
to it.
Thanks a lot to you and Javier for tracking this down!
M.
Re: [PATCH v14.1 01/17] drm: bridge: analogix/dp: split exynos dp driver to bridge directory
Quoted 92 lines · Yakir Yang
Marc, Javier
Quoted 89 lines · Marc Zyngier
Quoted 80 lines · On Wed, 8 Jun 2016 09:28:32 +0800 Yakir Yang <[email protected]> wrote:
Hi Javier,
Quoted 29 lines · Javier Martinez Canillas
Hello Yakir,
Quoted 13 lines · Heiko Stübner
Split the dp core driver from exynos directory to bridge directory, and rename the core driver to analogix_dp_*, rename the platform code to
exynos_dp.Beside the new
analogix_dpdriver would export six hooks. "analogix_dp_bind()" and "analogix_dp_unbind()" "analogix_dp_suspned()" and "analogix_dp_resume()" "analogix_dp_detect()" and "analogix_dp_get_modes()"The bind/unbind symbols is used for analogix platform driver to connect with
analogix_dpcore driver. And the detect/get_modes is used for analogix platform driver to init the connector.Quoted 7 lines
They reason why connector need register in helper driver is rockchip drm haven't implement the atomic API, but Exynos drm have implement it, so there would need two different connector helper functions, that's why we leave the connector register in helper driver.
Signed-off-by Yakir Yang <[email protected]>---
Marc reported that his Exynos5250 Snow Chromebook fails to boot with v4.7-rc.
I've done a git bisect and tracked down to this commit. The problem is a NULL pointer dereference to
connector->devindrm_mode_create(connector->dev)when called fromexynos_dp_get_modes(). The error log is at [1].Quoted 6 lines
I'm trying to figure out the issue but wanted to mention in case you have any hints about what could be the cause. AFAICT the problem is related to the fact that
drm_connector_init()is called inanalogix_dp_bridge_attach()and the connector passed as argument is the one in structanalogix_dp_device*dp, but laterexynos_dp_get_modes()callsdrm_mode_create()passing the connector in structexynos_dp_device*dp, which has not been previously initialized.Agree, this should be the problem,
exynos_dp->connectorhaven't been initialized, driver should makeexynos_dp->dpto a connector point, and record the passing connector inexynos_dp_bridge_attach(), that should fix this problem.Thanks,
- Yakirdrivers/gpu/drm/exynos/exynos_dp.c +3
-2@@ -34,7 +34,7 @@struct exynos_dp_device {struct drm_encoder encoder; -struct drm_connector connector; +struct drm_connector *connector;struct drm_bridge *ptn_bridge;struct drm_device *drm_dev;struct device *dev;@@ -70,7 +70,7 @@ static int exynos_dp_poweroff(struct analogix_dp_plat_data *plat_data)static int exynos_dp_get_modes (struct analogix_dp_plat_data *plat_data) {struct exynos_dp_device *dp =to_dp (plat_data); -struct drm_connector *connector = &dp->connector; +struct drm_connector *connector = dp->connector;struct drm_display_mode *mode;int num_modes =0 ;@@ -103,6 +103,7 @@ static int exynos_dp_bridge_attach(structanalogix_dp_plat_data *plat_data, int ret;drm_connector_register (connector); + dp->connector = connector;/* Pre-empt DP connector creation if there's a bridge */ Quoted 2 lines
if (dp->ptn_bridge) {I've just tested this change, and in combination with Javier's DT patch, my Snow is back to its useful state (I'm writing this email from that very Chromebook).
Great. I also tested and the Snow booted but I don't have physical access to check if the display was brought correctly, So thanks a lot for testing.
Quoted 6 lines
Quoted 3 lines
Once you make this a proper patch, please add my:
Tested-by Marc Zyngier <[email protected]>I guess Javier should be the best one to create this patch, if he have no time, i would do it for him. thanks for your report ;)
Done.
Quoted 6 lines
- Yakir
Quoted 4 lines
to it.
Thanks a lot to you and Javier for tracking this down!
Thanks to you for reporting all the issues!
Best regards,
Signature · 3 lines
Javier Martinez Canillas Open Source Group Samsung Research America
Re: [v14, 01/17] drm: bridge: analogix/dp: split exynos dp driver to bridge directory
In reply to Yakir YangHi,
Quoted 20 lines · Yakir Yang
Split the dp core driver from exynos directory to bridge directory, and rename the core driver to analogix_dp_*, rename the platform code to
exynos_dp.Beside the new
analogix_dpdriver would export six hooks. "analogix_dp_bind()" and "analogix_dp_unbind()" "analogix_dp_suspned()" and "analogix_dp_resume()" "analogix_dp_detect()" and "analogix_dp_get_modes()"The bind/unbind symbols is used for analogix platform driver to connect with
analogix_dpcore driver. And the detect/get_modes is used for analogix platform driver to init the connector.They reason why connector need register in helper driver is rockchip drm haven't implement the atomic API, but Exynos drm have implement it, so there would need two different connector helper functions, that's why we leave the connector register in helper driver.
Signed-off-by Yakir Yang <[email protected]>
[ ... ]
drivers/gpu/drm/bridge/analogix/Makefile line 1
Quoted 7 lines
drivers/gpu/drm/bridge/analogix/Makefile new file +1
-0@@ -0,0 +1 @@ +obj-$(CONFIG_DRM_ANALOGIX_DP) += analogix_dp_core.o analogix_dp_reg.o
This results in the following build errors if DRM_ANALOGIX_DP is configured as module.
ERROR: "analogix_dp_start_video" [drivers/gpu/drm/bridge/analogix/analogix_dp_core.ko] undefined!
ERROR: "analogix_dp_get_lane0_link_training" [drivers/gpu/drm/bridge/analogix/analogix_dp_core.ko] undefined!
ERROR: "analogix_dp_get_lane1_link_training" [drivers/gpu/drm/bridge/analogix/analogix_dp_core.ko] undefined!
ERROR: "analogix_dp_get_lane2_link_training" [drivers/gpu/drm/bridge/analogix/analogix_dp_core.ko] undefined!
ERROR: "analogix_dp_get_lane3_link_training" [drivers/gpu/drm/bridge/analogix/analogix_dp_core.ko] undefined!
ERROR: "analogix_dp_get_lane_count" [drivers/gpu/drm/bridge/analogix/analogix_dp_core.ko] undefined!
ERROR: "analogix_dp_get_link_bandwidth" [drivers/gpu/drm/bridge/analogix/analogix_dp_core.ko] undefined!
[ and so on ]
It should probably be something like
analogix_dp-objs := analogix_dp_core.o analogix_dp_reg.o obj-$(CONFIG_DRM_ANALOGIX_DP) += analogix_dp.o
Guenter
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [v14, 01/17] drm: bridge: analogix/dp: split exynos dp driver to bridge directory
Quoted 44 lines · Guenter Roeck
Hi,
Quoted 20 lines · Yakir Yang
Split the dp core driver from exynos directory to bridge directory, and rename the core driver to analogix_dp_*, rename the platform code to
exynos_dp.Beside the new
analogix_dpdriver would export six hooks. "analogix_dp_bind()" and "analogix_dp_unbind()" "analogix_dp_suspned()" and "analogix_dp_resume()" "analogix_dp_detect()" and "analogix_dp_get_modes()"The bind/unbind symbols is used for analogix platform driver to connect with
analogix_dpcore driver. And the detect/get_modes is used for analogix platform driver to init the connector.They reason why connector need register in helper driver is rockchip drm haven't implement the atomic API, but Exynos drm have implement it, so there would need two different connector helper functions, that's why we leave the connector register in helper driver.
Signed-off-by Yakir Yang <[email protected]>[ ... ]
drivers/gpu/drm/bridge/analogix/Makefile line 1
Quoted 7 lines
drivers/gpu/drm/bridge/analogix/Makefile new file +1
-0@@ -0,0 +1 @@ +obj-$(CONFIG_DRM_ANALOGIX_DP) += analogix_dp_core.o analogix_dp_reg.oThis results in the following build errors if
DRM_ANALOGIX_DPis configured as module.ERROR: "
analogix_dp_start_video" [drivers/gpu/drm/bridge/analogix/analogix_dp_core.ko] undefined!
ERROR: "analogix_dp_get_lane0_link_training" [drivers/gpu/drm/bridge/analogix/analogix_dp_core.ko] undefined!
ERROR: "analogix_dp_get_lane1_link_training" [drivers/gpu/drm/bridge/analogix/analogix_dp_core.ko] undefined!
ERROR: "analogix_dp_get_lane2_link_training" [drivers/gpu/drm/bridge/analogix/analogix_dp_core.ko] undefined!
ERROR: "analogix_dp_get_lane3_link_training" [drivers/gpu/drm/bridge/analogix/analogix_dp_core.ko] undefined!
ERROR: "analogix_dp_get_lane_count" [drivers/gpu/drm/bridge/analogix/analogix_dp_core.ko] undefined!
ERROR: "analogix_dp_get_link_bandwidth" [drivers/gpu/drm/bridge/analogix/analogix_dp_core.ko] undefined!
Quoted 1 line
[ and so on ]
Ugh... most of these functions shouldn't be there in the first place. We have helpers in the core that already do this. Most of the functionality is duplicated in this driver.
I realize that this is a problem that existed in the Exynos DP driver, but somebody really ought to rewrite those parts to make use of the DRM DP helpers.
Thierry
Re: [v14, 01/17] drm: bridge: analogix/dp: split exynos dp driver to bridge directory
Hi,
Quoted 7 lines · Thierry Reding
Ugh... most of these functions shouldn't be there in the first place. We have helpers in the core that already do this. Most of the functionality is duplicated in this driver.
I realize that this is a problem that existed in the Exynos DP driver, but somebody really ought to rewrite those parts to make use of the DRM DP helpers.
As I understand it from discussions in
<http://article.gmane.org/gmane.linux.drivers.devicetree/162059> and
<http://article.gmane.org/gmane.linux.kernel.samsung-soc/53048>, we shouldn't block merging the series but someone should pick up this work after the merge.
So probably Yakir should fixup the problem pointed out by Guenter and send a new pull.
-Doug
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [v14, 01/17] drm: bridge: analogix/dp: split exynos dp driver to bridge directory
Quoted 10 lines · Doug Anderson
Hi,
Quoted 7 lines · Thierry Reding
Ugh... most of these functions shouldn't be there in the first place. We have helpers in the core that already do this. Most of the functionality is duplicated in this driver.
I realize that this is a problem that existed in the Exynos DP driver, but somebody really ought to rewrite those parts to make use of the DRM DP helpers.
Quoted 8 lines
As I understand it from discussions in
<http://article.gmane.org/gmane.linux.drivers.devicetree/162059> and
<http://article.gmane.org/gmane.linux.kernel.samsung-soc/53048>, we shouldn't block merging the series but someone should pick up this work after the merge.So probably Yakir should fixup the problem pointed out by Guenter and send a new pull.
Yep, should I just update the pull request. Or I should send v15 first and then update the pull request ?
- Yakir
Quoted 4 lines
-Doug
Re: [v14, 01/17] drm: bridge: analogix/dp: split exynos dp driver to bridge directory
In reply to Guenter RoeckHi,
Quoted 11 lines · Guenter Roeck
This results in the following build errors if
DRM_ANALOGIX_DPis configured as module.ERROR: "
analogix_dp_start_video" [drivers/gpu/drm/bridge/analogix/analogix_dp_core.ko] undefined!
ERROR: "analogix_dp_get_lane0_link_training" [drivers/gpu/drm/bridge/analogix/analogix_dp_core.ko] undefined!
ERROR: "analogix_dp_get_lane1_link_training" [drivers/gpu/drm/bridge/analogix/analogix_dp_core.ko] undefined!
ERROR: "analogix_dp_get_lane2_link_training" [drivers/gpu/drm/bridge/analogix/analogix_dp_core.ko] undefined!
ERROR: "analogix_dp_get_lane3_link_training" [drivers/gpu/drm/bridge/analogix/analogix_dp_core.ko] undefined!
ERROR: "analogix_dp_get_lane_count" [drivers/gpu/drm/bridge/analogix/analogix_dp_core.ko] undefined!
ERROR: "analogix_dp_get_link_bandwidth" [drivers/gpu/drm/bridge/analogix/analogix_dp_core.ko] undefined!
Quoted 6 lines
[ and so on ]
It should probably be something like
analogix_dp-objs := analogix_dp_core.o analogix_dp_reg.o obj-$(CONFIG_DRM_ANALOGIX_DP) += analogix_dp.o
Sounds like this is a major problem. Presumably Yakir should fix and send a new pull request?
-Doug
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [v14, 01/17] drm: bridge: analogix/dp: split exynos dp driver to bridge directory
In reply to Guenter RoeckHi Guenter
Quoted 43 lines · Guenter Roeck
Hi,
Quoted 20 lines · Yakir Yang
Split the dp core driver from exynos directory to bridge directory, and rename the core driver to analogix_dp_*, rename the platform code to
exynos_dp.Beside the new
analogix_dpdriver would export six hooks. "analogix_dp_bind()" and "analogix_dp_unbind()" "analogix_dp_suspned()" and "analogix_dp_resume()" "analogix_dp_detect()" and "analogix_dp_get_modes()"The bind/unbind symbols is used for analogix platform driver to connect with
analogix_dpcore driver. And the detect/get_modes is used for analogix platform driver to init the connector.They reason why connector need register in helper driver is rockchip drm haven't implement the atomic API, but Exynos drm have implement it, so there would need two different connector helper functions, that's why we leave the connector register in helper driver.
Signed-off-by Yakir Yang <[email protected]>[ ... ]
drivers/gpu/drm/bridge/analogix/Makefile line 1
Quoted 7 lines
drivers/gpu/drm/bridge/analogix/Makefile new file +1
-0@@ -0,0 +1 @@ +obj-$(CONFIG_DRM_ANALOGIX_DP) += analogix_dp_core.o analogix_dp_reg.oThis results in the following build errors if
DRM_ANALOGIX_DPis configured as module.ERROR: "
analogix_dp_start_video" [drivers/gpu/drm/bridge/analogix/analogix_dp_core.ko] undefined!
ERROR: "analogix_dp_get_lane0_link_training" [drivers/gpu/drm/bridge/analogix/analogix_dp_core.ko] undefined!
ERROR: "analogix_dp_get_lane1_link_training" [drivers/gpu/drm/bridge/analogix/analogix_dp_core.ko] undefined!
ERROR: "analogix_dp_get_lane2_link_training" [drivers/gpu/drm/bridge/analogix/analogix_dp_core.ko] undefined!
ERROR: "analogix_dp_get_lane3_link_training" [drivers/gpu/drm/bridge/analogix/analogix_dp_core.ko] undefined!
ERROR: "analogix_dp_get_lane_count" [drivers/gpu/drm/bridge/analogix/analogix_dp_core.ko] undefined!
ERROR: "analogix_dp_get_link_bandwidth" [drivers/gpu/drm/bridge/analogix/analogix_dp_core.ko] undefined!
Quoted 6 lines
[ and so on ]
It should probably be something like
analogix_dp-objs := analogix_dp_core.o analogix_dp_reg.o obj-$(CONFIG_DRM_ANALOGIX_DP) += analogix_dp.o
Thanks, good catch, will fix it now.
- Yakir
Quoted 4 lines
Guenter
PATCH v14 2/17 drm/exynos: dp: rename implementation specific driver part
In reply to Yakir YangFrom: Heiko Stuebner <[email protected]>
The core functionality now resides in the generic bridge part so the exynos-specific implementation details can get a more suitable nameing.
---
Changes in v14: None
Changes in v13: None
Changes in v12: None
Changes in v11: None
Changes in v10: None
Changes in v9: None
Changes in v8: None
Changes in v7: None
Changes in v6: None
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None
drivers/gpu/drm/exynos/Makefile | 2 +-
drivers/gpu/drm/exynos/{exynos_dp_core.c => exynos_dp.c} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
rename drivers/gpu/drm/exynos/{exynos_dp_core.c => exynos_dp.c} (100%)drivers/gpu/drm/exynos/Makefile +1 -1
@@ -13,7 +13,7 @@ exynosdrm-$(CONFIG_DRM_EXYNOS5433_DECON) += exynos5433_drm_decon.o exynosdrm-$(CONFIG_DRM_EXYNOS7_DECON) += exynos7_drm_decon.o exynosdrm-$(CONFIG_DRM_EXYNOS_DPI) += exynos_drm_dpi.o exynosdrm-$(CONFIG_DRM_EXYNOS_DSI) += exynos_drm_dsi.o -exynosdrm-$(CONFIG_DRM_EXYNOS_DP) += exynos_dp_core.o +exynosdrm-$(CONFIG_DRM_EXYNOS_DP) += exynos_dp.o exynosdrm-$(CONFIG_DRM_EXYNOS_MIXER) += exynos_mixer.o exynosdrm-$(CONFIG_DRM_EXYNOS_HDMI) += exynos_hdmi.o exynosdrm-$(CONFIG_DRM_EXYNOS_VIDI) += exynos_drm_vidi.o
drivers/gpu/drm/exynos/exynos_dp.c renamed from drivers/gpu/drm/exynos/exynos_dp_core.c +0 -0
Signature · 1 line
1.9.1
PATCH v14 3/17 drm: bridge: analogix/dp: rename register constants
In reply to Yakir YangFrom: Heiko Stuebner <[email protected]>
In the original split we kept the register constants intact to keep the diff small. Still the constants are Analogix-specific, so rename them now.
---
Changes in v14: None
Changes in v13: None
Changes in v12: None
Changes in v11: None
Changes in v10: None
Changes in v9: None
Changes in v8: None
Changes in v7: None
Changes in v6: None
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None
drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 456 +++++++++++----------- drivers/gpu/drm/bridge/analogix/analogix_dp_reg.h | 248 ++++++------ 2 files changed, 352 insertions(+), 352 deletions(-)
drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c +228 -228
@@ -29,13 +29,13 @@ void analogix_dp_enable_video_mute(struct analogix_dp_device *dp, bool enable)u32 reg;if (enable) { - reg =readl (dp->reg_base +EXYNOS_DP_VIDEO_CTL_1 ); + reg =readl (dp->reg_base +ANALOGIX_DP_VIDEO_CTL_1 ); reg |=HDCP_VIDEO_MUTE ; -writel (reg, dp->reg_base +EXYNOS_DP_VIDEO_CTL_1 ); +writel (reg, dp->reg_base +ANALOGIX_DP_VIDEO_CTL_1 ); }else { - reg =readl (dp->reg_base +EXYNOS_DP_VIDEO_CTL_1 ); + reg =readl (dp->reg_base +ANALOGIX_DP_VIDEO_CTL_1 ); reg &= ~HDCP_VIDEO_MUTE ; -writel (reg, dp->reg_base +EXYNOS_DP_VIDEO_CTL_1 ); +writel (reg, dp->reg_base +ANALOGIX_DP_VIDEO_CTL_1 ); } }
@@ -43,9 +43,9 @@ void analogix_dp_stop_video(struct analogix_dp_device *dp) {u32 reg; - reg =readl (dp->reg_base +EXYNOS_DP_VIDEO_CTL_1 ); + reg =readl (dp->reg_base +ANALOGIX_DP_VIDEO_CTL_1 ); reg &= ~VIDEO_EN ; -writel (reg, dp->reg_base +EXYNOS_DP_VIDEO_CTL_1 ); +writel (reg, dp->reg_base +ANALOGIX_DP_VIDEO_CTL_1 ); }void analogix_dp_lane_swap (struct analogix_dp_device *dp,bool enable)
@@ -59,7 +59,7 @@ void analogix_dp_lane_swap(struct analogix_dp_device *dp, bool enable) reg =LANE3_MAP_LOGIC_LANE_3 |LANE2_MAP_LOGIC_LANE_2 |LANE1_MAP_LOGIC_LANE_1 |LANE0_MAP_LOGIC_LANE_0 ; -writel (reg, dp->reg_base +EXYNOS_DP_LANE_MAP ); +writel (reg, dp->reg_base +ANALOGIX_DP_LANE_MAP ); }void analogix_dp_init_analog_param (struct analogix_dp_device *dp)
@@ -67,41 +67,41 @@ void analogix_dp_init_analog_param(struct analogix_dp_device *dp)u32 reg; reg =TX_TERMINAL_CTRL_50_OHM ; -writel (reg, dp->reg_base +EXYNOS_DP_ANALOG_CTL_1 ); +writel (reg, dp->reg_base +ANALOGIX_DP_ANALOG_CTL_1 ); reg =SEL_24M |TX_DVDD_BIT_1_0625V ; -writel (reg, dp->reg_base +EXYNOS_DP_ANALOG_CTL_2 ); +writel (reg, dp->reg_base +ANALOGIX_DP_ANALOG_CTL_2 ); reg =DRIVE_DVDD_BIT_1_0625V |VCO_BIT_600_MICRO ; -writel (reg, dp->reg_base +EXYNOS_DP_ANALOG_CTL_3 ); +writel (reg, dp->reg_base +ANALOGIX_DP_ANALOG_CTL_3 ); reg =PD_RING_OSC |AUX_TERMINAL_CTRL_50_OHM |TX_CUR1_2X |TX_CUR_16_MA ; -writel (reg, dp->reg_base +EXYNOS_DP_PLL_FILTER_CTL_1 ); +writel (reg, dp->reg_base +ANALOGIX_DP_PLL_FILTER_CTL_1 ); reg =CH3_AMP_400_MV |CH2_AMP_400_MV |CH1_AMP_400_MV |CH0_AMP_400_MV ; -writel (reg, dp->reg_base +EXYNOS_DP_TX_AMP_TUNING_CTL ); +writel (reg, dp->reg_base +ANALOGIX_DP_TX_AMP_TUNING_CTL ); }void analogix_dp_init_interrupt (struct analogix_dp_device *dp) {/* Set interrupt pin assertion polarity as high */ -writel (INT_POL1 |INT_POL0 , dp->reg_base +EXYNOS_DP_INT_CTL ); +writel (INT_POL1 |INT_POL0 , dp->reg_base +ANALOGIX_DP_INT_CTL );/* Clear pending regisers */ -writel (0xff , dp->reg_base +EXYNOS_DP_COMMON_INT_STA_1 ); -writel (0x4f , dp->reg_base +EXYNOS_DP_COMMON_INT_STA_2 ); -writel (0xe0 , dp->reg_base +EXYNOS_DP_COMMON_INT_STA_3 ); -writel (0xe7 , dp->reg_base +EXYNOS_DP_COMMON_INT_STA_4 ); -writel (0x63 , dp->reg_base +EXYNOS_DP_INT_STA ); +writel (0xff , dp->reg_base +ANALOGIX_DP_COMMON_INT_STA_1 ); +writel (0x4f , dp->reg_base +ANALOGIX_DP_COMMON_INT_STA_2 ); +writel (0xe0 , dp->reg_base +ANALOGIX_DP_COMMON_INT_STA_3 ); +writel (0xe7 , dp->reg_base +ANALOGIX_DP_COMMON_INT_STA_4 ); +writel (0x63 , dp->reg_base +ANALOGIX_DP_INT_STA );/* 0:mask,1: unmask */ -writel (0x00 , dp->reg_base +EXYNOS_DP_COMMON_INT_MASK_1 ); -writel (0x00 , dp->reg_base +EXYNOS_DP_COMMON_INT_MASK_2 ); -writel (0x00 , dp->reg_base +EXYNOS_DP_COMMON_INT_MASK_3 ); -writel (0x00 , dp->reg_base +EXYNOS_DP_COMMON_INT_MASK_4 ); -writel (0x00 , dp->reg_base +EXYNOS_DP_INT_STA_MASK ); +writel (0x00 , dp->reg_base +ANALOGIX_DP_COMMON_INT_MASK_1 ); +writel (0x00 , dp->reg_base +ANALOGIX_DP_COMMON_INT_MASK_2 ); +writel (0x00 , dp->reg_base +ANALOGIX_DP_COMMON_INT_MASK_3 ); +writel (0x00 , dp->reg_base +ANALOGIX_DP_COMMON_INT_MASK_4 ); +writel (0x00 , dp->reg_base +ANALOGIX_DP_INT_STA_MASK ); }void analogix_dp_reset (struct analogix_dp_device *dp)
@@ -114,44 +114,44 @@ void analogix_dp_reset(struct analogix_dp_device *dp) reg =MASTER_VID_FUNC_EN_N |SLAVE_VID_FUNC_EN_N |AUD_FIFO_FUNC_EN_N |AUD_FUNC_EN_N |HDCP_FUNC_EN_N |SW_FUNC_EN_N ; -writel (reg, dp->reg_base +EXYNOS_DP_FUNC_EN_1 ); +writel (reg, dp->reg_base +ANALOGIX_DP_FUNC_EN_1 ); reg =SSC_FUNC_EN_N |AUX_FUNC_EN_N |SERDES_FIFO_FUNC_EN_N |LS_CLK_DOMAIN_FUNC_EN_N ; -writel (reg, dp->reg_base +EXYNOS_DP_FUNC_EN_2 ); +writel (reg, dp->reg_base +ANALOGIX_DP_FUNC_EN_2 );usleep_range (20 ,30 );analogix_dp_lane_swap (dp,0 ); -writel (0x0 , dp->reg_base +EXYNOS_DP_SYS_CTL_1 ); -writel (0x40 , dp->reg_base +EXYNOS_DP_SYS_CTL_2 ); -writel (0x0 , dp->reg_base +EXYNOS_DP_SYS_CTL_3 ); -writel (0x0 , dp->reg_base +EXYNOS_DP_SYS_CTL_4 ); +writel (0x0 , dp->reg_base +ANALOGIX_DP_SYS_CTL_1 ); +writel (0x40 , dp->reg_base +ANALOGIX_DP_SYS_CTL_2 ); +writel (0x0 , dp->reg_base +ANALOGIX_DP_SYS_CTL_3 ); +writel (0x0 , dp->reg_base +ANALOGIX_DP_SYS_CTL_4 ); -writel (0x0 , dp->reg_base +EXYNOS_DP_PKT_SEND_CTL ); -writel (0x0 , dp->reg_base +EXYNOS_DP_HDCP_CTL ); +writel (0x0 , dp->reg_base +ANALOGIX_DP_PKT_SEND_CTL ); +writel (0x0 , dp->reg_base +ANALOGIX_DP_HDCP_CTL ); -writel (0x5e , dp->reg_base +EXYNOS_DP_HPD_DEGLITCH_L ); -writel (0x1a , dp->reg_base +EXYNOS_DP_HPD_DEGLITCH_H ); +writel (0x5e , dp->reg_base +ANALOGIX_DP_HPD_DEGLITCH_L ); +writel (0x1a , dp->reg_base +ANALOGIX_DP_HPD_DEGLITCH_H ); -writel (0x10 , dp->reg_base +EXYNOS_DP_LINK_DEBUG_CTL ); +writel (0x10 , dp->reg_base +ANALOGIX_DP_LINK_DEBUG_CTL ); -writel (0x0 , dp->reg_base +EXYNOS_DP_PHY_TEST ); +writel (0x0 , dp->reg_base +ANALOGIX_DP_PHY_TEST ); -writel (0x0 , dp->reg_base +EXYNOS_DP_VIDEO_FIFO_THRD ); -writel (0x20 , dp->reg_base +EXYNOS_DP_AUDIO_MARGIN ); +writel (0x0 , dp->reg_base +ANALOGIX_DP_VIDEO_FIFO_THRD ); +writel (0x20 , dp->reg_base +ANALOGIX_DP_AUDIO_MARGIN ); -writel (0x4 , dp->reg_base +EXYNOS_DP_M_VID_GEN_FILTER_TH ); -writel (0x2 , dp->reg_base +EXYNOS_DP_M_AUD_GEN_FILTER_TH ); +writel (0x4 , dp->reg_base +ANALOGIX_DP_M_VID_GEN_FILTER_TH ); +writel (0x2 , dp->reg_base +ANALOGIX_DP_M_AUD_GEN_FILTER_TH ); -writel (0x00000101 , dp->reg_base +EXYNOS_DP_SOC_GENERAL_CTL ); +writel (0x00000101 , dp->reg_base +ANALOGIX_DP_SOC_GENERAL_CTL ); }void analogix_dp_swreset (struct analogix_dp_device *dp) { -writel (RESET_DP_TX , dp->reg_base +EXYNOS_DP_TX_SW_RESET ); +writel (RESET_DP_TX , dp->reg_base +ANALOGIX_DP_TX_SW_RESET ); }void analogix_dp_config_interrupt (struct analogix_dp_device *dp)
@@ -160,26 +160,26 @@ void analogix_dp_config_interrupt(struct analogix_dp_device *dp)/* 0: mask, 1: unmask */ reg =COMMON_INT_MASK_1 ; -writel (reg, dp->reg_base +EXYNOS_DP_COMMON_INT_MASK_1 ); +writel (reg, dp->reg_base +ANALOGIX_DP_COMMON_INT_MASK_1 ); reg =COMMON_INT_MASK_2 ; -writel (reg, dp->reg_base +EXYNOS_DP_COMMON_INT_MASK_2 ); +writel (reg, dp->reg_base +ANALOGIX_DP_COMMON_INT_MASK_2 ); reg =COMMON_INT_MASK_3 ; -writel (reg, dp->reg_base +EXYNOS_DP_COMMON_INT_MASK_3 ); +writel (reg, dp->reg_base +ANALOGIX_DP_COMMON_INT_MASK_3 ); reg =COMMON_INT_MASK_4 ; -writel (reg, dp->reg_base +EXYNOS_DP_COMMON_INT_MASK_4 ); +writel (reg, dp->reg_base +ANALOGIX_DP_COMMON_INT_MASK_4 ); reg =INT_STA_MASK ; -writel (reg, dp->reg_base +EXYNOS_DP_INT_STA_MASK ); +writel (reg, dp->reg_base +ANALOGIX_DP_INT_STA_MASK ); }enum pll_status analogix_dp_get_pll_lock_status (struct analogix_dp_device *dp) {u32 reg; - reg =readl (dp->reg_base +EXYNOS_DP_DEBUG_CTL ); + reg =readl (dp->reg_base +ANALOGIX_DP_DEBUG_CTL );if (reg &PLL_LOCK )return PLL_LOCKED ;else
@@ -191,13 +191,13 @@ void analogix_dp_set_pll_power_down(struct analogix_dp_device *dp, bool enable)u32 reg;if (enable) { - reg =readl (dp->reg_base +EXYNOS_DP_PLL_CTL ); + reg =readl (dp->reg_base +ANALOGIX_DP_PLL_CTL ); reg |=DP_PLL_PD ; -writel (reg, dp->reg_base +EXYNOS_DP_PLL_CTL ); +writel (reg, dp->reg_base +ANALOGIX_DP_PLL_CTL ); }else { - reg =readl (dp->reg_base +EXYNOS_DP_PLL_CTL ); + reg =readl (dp->reg_base +ANALOGIX_DP_PLL_CTL ); reg &= ~DP_PLL_PD ; -writel (reg, dp->reg_base +EXYNOS_DP_PLL_CTL ); +writel (reg, dp->reg_base +ANALOGIX_DP_PLL_CTL ); } }
@@ -210,77 +210,77 @@ void analogix_dp_set_analog_power_down(struct analogix_dp_device *dp,switch (block) {case AUX_BLOCK :if (enable) { - reg =readl (dp->reg_base +EXYNOS_DP_PHY_PD ); + reg =readl (dp->reg_base +ANALOGIX_DP_PHY_PD ); reg |=AUX_PD ; -writel (reg, dp->reg_base +EXYNOS_DP_PHY_PD ); +writel (reg, dp->reg_base +ANALOGIX_DP_PHY_PD ); }else { - reg =readl (dp->reg_base +EXYNOS_DP_PHY_PD ); + reg =readl (dp->reg_base +ANALOGIX_DP_PHY_PD ); reg &= ~AUX_PD ; -writel (reg, dp->reg_base +EXYNOS_DP_PHY_PD ); +writel (reg, dp->reg_base +ANALOGIX_DP_PHY_PD ); }break ;case CH0_BLOCK :if (enable) { - reg =readl (dp->reg_base +EXYNOS_DP_PHY_PD ); + reg =readl (dp->reg_base +ANALOGIX_DP_PHY_PD ); reg |=CH0_PD ; -writel (reg, dp->reg_base +EXYNOS_DP_PHY_PD ); +writel (reg, dp->reg_base +ANALOGIX_DP_PHY_PD ); }else { - reg =readl (dp->reg_base +EXYNOS_DP_PHY_PD ); + reg =readl (dp->reg_base +ANALOGIX_DP_PHY_PD ); reg &= ~CH0_PD ; -writel (reg, dp->reg_base +EXYNOS_DP_PHY_PD ); +writel (reg, dp->reg_base +ANALOGIX_DP_PHY_PD ); }break ;case CH1_BLOCK :if (enable) { - reg =readl (dp->reg_base +EXYNOS_DP_PHY_PD ); + reg =readl (dp->reg_base +ANALOGIX_DP_PHY_PD ); reg |=CH1_PD ; -writel (reg, dp->reg_base +EXYNOS_DP_PHY_PD ); +writel (reg, dp->reg_base +ANALOGIX_DP_PHY_PD ); }else { - reg =readl (dp->reg_base +EXYNOS_DP_PHY_PD ); + reg =readl (dp->reg_base +ANALOGIX_DP_PHY_PD ); reg &= ~CH1_PD ; -writel (reg, dp->reg_base +EXYNOS_DP_PHY_PD ); +writel (reg, dp->reg_base +ANALOGIX_DP_PHY_PD ); }break ;case CH2_BLOCK :if (enable) { - reg =readl (dp->reg_base +EXYNOS_DP_PHY_PD ); + reg =readl (dp->reg_base +ANALOGIX_DP_PHY_PD ); reg |=CH2_PD ; -writel (reg, dp->reg_base +EXYNOS_DP_PHY_PD ); +writel (reg, dp->reg_base +ANALOGIX_DP_PHY_PD ); }else { - reg =readl (dp->reg_base +EXYNOS_DP_PHY_PD ); + reg =readl (dp->reg_base +ANALOGIX_DP_PHY_PD ); reg &= ~CH2_PD ; -writel (reg, dp->reg_base +EXYNOS_DP_PHY_PD ); +writel (reg, dp->reg_base +ANALOGIX_DP_PHY_PD ); }break ;case CH3_BLOCK :if (enable) { - reg =readl (dp->reg_base +EXYNOS_DP_PHY_PD ); + reg =readl (dp->reg_base +ANALOGIX_DP_PHY_PD ); reg |=CH3_PD ; -writel (reg, dp->reg_base +EXYNOS_DP_PHY_PD ); +writel (reg, dp->reg_base +ANALOGIX_DP_PHY_PD ); }else { - reg =readl (dp->reg_base +EXYNOS_DP_PHY_PD ); + reg =readl (dp->reg_base +ANALOGIX_DP_PHY_PD ); reg &= ~CH3_PD ; -writel (reg, dp->reg_base +EXYNOS_DP_PHY_PD ); +writel (reg, dp->reg_base +ANALOGIX_DP_PHY_PD ); }break ;case ANALOG_TOTAL :if (enable) { - reg =readl (dp->reg_base +EXYNOS_DP_PHY_PD ); + reg =readl (dp->reg_base +ANALOGIX_DP_PHY_PD ); reg |=DP_PHY_PD ; -writel (reg, dp->reg_base +EXYNOS_DP_PHY_PD ); +writel (reg, dp->reg_base +ANALOGIX_DP_PHY_PD ); }else { - reg =readl (dp->reg_base +EXYNOS_DP_PHY_PD ); + reg =readl (dp->reg_base +ANALOGIX_DP_PHY_PD ); reg &= ~DP_PHY_PD ; -writel (reg, dp->reg_base +EXYNOS_DP_PHY_PD ); +writel (reg, dp->reg_base +ANALOGIX_DP_PHY_PD ); }break ;case POWER_ALL :if (enable) { reg =DP_PHY_PD |AUX_PD |CH3_PD |CH2_PD |CH1_PD |CH0_PD ; -writel (reg, dp->reg_base +EXYNOS_DP_PHY_PD ); +writel (reg, dp->reg_base +ANALOGIX_DP_PHY_PD ); }else { -writel (0x00 , dp->reg_base +EXYNOS_DP_PHY_PD ); +writel (0x00 , dp->reg_base +ANALOGIX_DP_PHY_PD ); }break ;default :
@@ -296,11 +296,11 @@ void analogix_dp_init_analog_func(struct analogix_dp_device *dp)analogix_dp_set_analog_power_down (dp,POWER_ALL ,0 ); reg =PLL_LOCK_CHG ; -writel (reg, dp->reg_base +EXYNOS_DP_COMMON_INT_STA_1 ); +writel (reg, dp->reg_base +ANALOGIX_DP_COMMON_INT_STA_1 ); - reg =readl (dp->reg_base +EXYNOS_DP_DEBUG_CTL ); + reg =readl (dp->reg_base +ANALOGIX_DP_DEBUG_CTL ); reg &= ~(F_PLL_LOCK |PLL_LOCK_CTRL ); -writel (reg, dp->reg_base +EXYNOS_DP_DEBUG_CTL ); +writel (reg, dp->reg_base +ANALOGIX_DP_DEBUG_CTL );/* Power up PLL */ if (analogix_dp_get_pll_lock_status (dp) ==PLL_UNLOCKED ) {
@@ -317,10 +317,10 @@ void analogix_dp_init_analog_func(struct analogix_dp_device *dp) }/* Enable Serdes FIFO function and Link symbol clock domain module */ - reg =readl (dp->reg_base +EXYNOS_DP_FUNC_EN_2 ); + reg =readl (dp->reg_base +ANALOGIX_DP_FUNC_EN_2 ); reg &= ~(SERDES_FIFO_FUNC_EN_N |LS_CLK_DOMAIN_FUNC_EN_N |AUX_FUNC_EN_N ); -writel (reg, dp->reg_base +EXYNOS_DP_FUNC_EN_2 ); +writel (reg, dp->reg_base +ANALOGIX_DP_FUNC_EN_2 ); }void analogix_dp_clear_hotplug_interrupts (struct analogix_dp_device *dp)
@@ -331,10 +331,10 @@ void analogix_dp_clear_hotplug_interrupts(struct analogix_dp_device *dp)return ; reg =HOTPLUG_CHG |HPD_LOST |PLUG ; -writel (reg, dp->reg_base +EXYNOS_DP_COMMON_INT_STA_4 ); +writel (reg, dp->reg_base +ANALOGIX_DP_COMMON_INT_STA_4 ); reg =INT_HPD ; -writel (reg, dp->reg_base +EXYNOS_DP_INT_STA ); +writel (reg, dp->reg_base +ANALOGIX_DP_INT_STA ); }void analogix_dp_init_hpd (struct analogix_dp_device *dp)
@@ -346,9 +346,9 @@ void analogix_dp_init_hpd(struct analogix_dp_device *dp)analogix_dp_clear_hotplug_interrupts (dp); - reg =readl (dp->reg_base +EXYNOS_DP_SYS_CTL_3 ); + reg =readl (dp->reg_base +ANALOGIX_DP_SYS_CTL_3 ); reg &= ~(F_HPD |HPD_CTRL ); -writel (reg, dp->reg_base +EXYNOS_DP_SYS_CTL_3 ); +writel (reg, dp->reg_base +ANALOGIX_DP_SYS_CTL_3 ); }enum dp_irq_type analogix_dp_get_irq_type (struct analogix_dp_device *dp)
@@ -363,7 +363,7 @@ enum dp_irq_type analogix_dp_get_irq_type(struct analogix_dp_device *dp)return DP_IRQ_TYPE_HP_CABLE_OUT ; }else {/* Parse hotplug interrupt status register */ - reg =readl (dp->reg_base +EXYNOS_DP_COMMON_INT_STA_4 ); + reg =readl (dp->reg_base +ANALOGIX_DP_COMMON_INT_STA_4 );if (reg &PLUG )return DP_IRQ_TYPE_HP_CABLE_IN ;
@@ -383,9 +383,9 @@ void analogix_dp_reset_aux(struct analogix_dp_device *dp)u32 reg;/* Disable AUX channel module */ - reg =readl (dp->reg_base +EXYNOS_DP_FUNC_EN_2 ); + reg =readl (dp->reg_base +ANALOGIX_DP_FUNC_EN_2 ); reg |=AUX_FUNC_EN_N ; -writel (reg, dp->reg_base +EXYNOS_DP_FUNC_EN_2 ); +writel (reg, dp->reg_base +ANALOGIX_DP_FUNC_EN_2 ); }void analogix_dp_init_aux (struct analogix_dp_device *dp)
@@ -394,23 +394,23 @@ void analogix_dp_init_aux(struct analogix_dp_device *dp)/* Clear inerrupts related to AUX channel */ reg =RPLY_RECEIV |AUX_ERR ; -writel (reg, dp->reg_base +EXYNOS_DP_INT_STA ); +writel (reg, dp->reg_base +ANALOGIX_DP_INT_STA );analogix_dp_reset_aux (dp);/* Disable AUX transaction H/W retry */ reg =AUX_BIT_PERIOD_EXPECTED_DELAY (3 ) |AUX_HW_RETRY_COUNT_SEL (0 )|AUX_HW_RETRY_INTERVAL_600_MICROSECONDS ; -writel (reg, dp->reg_base +EXYNOS_DP_AUX_HW_RETRY_CTL ); +writel (reg, dp->reg_base +ANALOGIX_DP_AUX_HW_RETRY_CTL );/* Receive AUX Channel DEFER commands equal to DEFFER_COUNT*64 */ reg =DEFER_CTRL_EN |DEFER_COUNT (1 ); -writel (reg, dp->reg_base +EXYNOS_DP_AUX_CH_DEFER_CTL ); +writel (reg, dp->reg_base +ANALOGIX_DP_AUX_CH_DEFER_CTL );/* Enable AUX channel module */ - reg =readl (dp->reg_base +EXYNOS_DP_FUNC_EN_2 ); + reg =readl (dp->reg_base +ANALOGIX_DP_FUNC_EN_2 ); reg &= ~AUX_FUNC_EN_N ; -writel (reg, dp->reg_base +EXYNOS_DP_FUNC_EN_2 ); +writel (reg, dp->reg_base +ANALOGIX_DP_FUNC_EN_2 ); }int analogix_dp_get_plug_in_status (struct analogix_dp_device *dp)
@@ -421,7 +421,7 @@ int analogix_dp_get_plug_in_status(struct analogix_dp_device *dp)if (gpio_get_value (dp->hpd_gpio))return 0 ; }else { - reg =readl (dp->reg_base +EXYNOS_DP_SYS_CTL_3 ); + reg =readl (dp->reg_base +ANALOGIX_DP_SYS_CTL_3 );if (reg &HPD_STATUS )return 0 ; }
@@ -433,9 +433,9 @@ void analogix_dp_enable_sw_function(struct analogix_dp_device *dp) {u32 reg; - reg =readl (dp->reg_base +EXYNOS_DP_FUNC_EN_1 ); + reg =readl (dp->reg_base +ANALOGIX_DP_FUNC_EN_1 ); reg &= ~SW_FUNC_EN_N ; -writel (reg, dp->reg_base +EXYNOS_DP_FUNC_EN_1 ); +writel (reg, dp->reg_base +ANALOGIX_DP_FUNC_EN_1 ); }int analogix_dp_start_aux_transaction (struct analogix_dp_device *dp)
@@ -445,34 +445,34 @@ int analogix_dp_start_aux_transaction(struct analogix_dp_device *dp)int timeout_loop =0 ;/* Enable AUX CH operation */ - reg =readl (dp->reg_base +EXYNOS_DP_AUX_CH_CTL_2 ); + reg =readl (dp->reg_base +ANALOGIX_DP_AUX_CH_CTL_2 ); reg |=AUX_EN ; -writel (reg, dp->reg_base +EXYNOS_DP_AUX_CH_CTL_2 ); +writel (reg, dp->reg_base +ANALOGIX_DP_AUX_CH_CTL_2 );/* Is AUX CH command reply received? */ - reg =readl (dp->reg_base +EXYNOS_DP_INT_STA ); + reg =readl (dp->reg_base +ANALOGIX_DP_INT_STA );while (!(reg &RPLY_RECEIV )) { timeout_loop++;if (DP_TIMEOUT_LOOP_COUNT < timeout_loop) {dev_err (dp->dev,"AUX CH command reply failed!\n" );return -ETIMEDOUT ; } - reg =readl (dp->reg_base +EXYNOS_DP_INT_STA ); + reg =readl (dp->reg_base +ANALOGIX_DP_INT_STA );usleep_range (10 ,11 ); }/* Clear interrupt source for AUX CH command reply */ -writel (RPLY_RECEIV , dp->reg_base +EXYNOS_DP_INT_STA ); +writel (RPLY_RECEIV , dp->reg_base +ANALOGIX_DP_INT_STA );/* Clear interrupt source for AUX CH access error */ - reg =readl (dp->reg_base +EXYNOS_DP_INT_STA ); + reg =readl (dp->reg_base +ANALOGIX_DP_INT_STA );if (reg &AUX_ERR ) { -writel (AUX_ERR , dp->reg_base +EXYNOS_DP_INT_STA ); +writel (AUX_ERR , dp->reg_base +ANALOGIX_DP_INT_STA );return -EREMOTEIO ; }/* Check AUX CH error access status */ - reg =readl (dp->reg_base +EXYNOS_DP_AUX_CH_STA ); + reg =readl (dp->reg_base +ANALOGIX_DP_AUX_CH_STA );if ((reg &AUX_STATUS_MASK ) !=0 ) {dev_err (dp->dev,"AUX CH error happens: %d\n\n" , reg &AUX_STATUS_MASK );
@@ -493,19 +493,19 @@ int analogix_dp_write_byte_to_dpcd(struct analogix_dp_device *dp,for (i =0 ; i <3 ; i++) {/* Clear AUX CH data buffer */ reg =BUF_CLR ; -writel (reg, dp->reg_base +EXYNOS_DP_BUFFER_DATA_CTL ); +writel (reg, dp->reg_base +ANALOGIX_DP_BUFFER_DATA_CTL );/* Select DPCD device address */ reg =AUX_ADDR_7_0 (reg_addr); -writel (reg, dp->reg_base +EXYNOS_DP_AUX_ADDR_7_0 ); +writel (reg, dp->reg_base +ANALOGIX_DP_AUX_ADDR_7_0 ); reg =AUX_ADDR_15_8 (reg_addr); -writel (reg, dp->reg_base +EXYNOS_DP_AUX_ADDR_15_8 ); +writel (reg, dp->reg_base +ANALOGIX_DP_AUX_ADDR_15_8 ); reg =AUX_ADDR_19_16 (reg_addr); -writel (reg, dp->reg_base +EXYNOS_DP_AUX_ADDR_19_16 ); +writel (reg, dp->reg_base +ANALOGIX_DP_AUX_ADDR_19_16 );/* Write data buffer */ reg = (unsigned int )data; -writel (reg, dp->reg_base +EXYNOS_DP_BUF_DATA_0 ); +writel (reg, dp->reg_base +ANALOGIX_DP_BUF_DATA_0 );/* * Set DisplayPort transaction and write 1 byte
@@ -513,7 +513,7 @@ int analogix_dp_write_byte_to_dpcd(struct analogix_dp_device *dp,* If Bit 3 is 0, I2C transaction. */ reg =AUX_TX_COMM_DP_TRANSACTION |AUX_TX_COMM_WRITE ; -writel (reg, dp->reg_base +EXYNOS_DP_AUX_CH_CTL_1 ); +writel (reg, dp->reg_base +ANALOGIX_DP_AUX_CH_CTL_1 );/* Start AUX transaction */ retval =analogix_dp_start_aux_transaction (dp);
@@ -538,15 +538,15 @@ int analogix_dp_read_byte_from_dpcd(struct analogix_dp_device *dp,for (i =0 ; i <3 ; i++) {/* Clear AUX CH data buffer */ reg =BUF_CLR ; -writel (reg, dp->reg_base +EXYNOS_DP_BUFFER_DATA_CTL ); +writel (reg, dp->reg_base +ANALOGIX_DP_BUFFER_DATA_CTL );/* Select DPCD device address */ reg =AUX_ADDR_7_0 (reg_addr); -writel (reg, dp->reg_base +EXYNOS_DP_AUX_ADDR_7_0 ); +writel (reg, dp->reg_base +ANALOGIX_DP_AUX_ADDR_7_0 ); reg =AUX_ADDR_15_8 (reg_addr); -writel (reg, dp->reg_base +EXYNOS_DP_AUX_ADDR_15_8 ); +writel (reg, dp->reg_base +ANALOGIX_DP_AUX_ADDR_15_8 ); reg =AUX_ADDR_19_16 (reg_addr); -writel (reg, dp->reg_base +EXYNOS_DP_AUX_ADDR_19_16 ); +writel (reg, dp->reg_base +ANALOGIX_DP_AUX_ADDR_19_16 );/* * Set DisplayPort transaction and read 1 byte
@@ -554,7 +554,7 @@ int analogix_dp_read_byte_from_dpcd(struct analogix_dp_device *dp,* If Bit 3 is 0, I2C transaction. */ reg =AUX_TX_COMM_DP_TRANSACTION |AUX_TX_COMM_READ ; -writel (reg, dp->reg_base +EXYNOS_DP_AUX_CH_CTL_1 ); +writel (reg, dp->reg_base +ANALOGIX_DP_AUX_CH_CTL_1 );/* Start AUX transaction */ retval =analogix_dp_start_aux_transaction (dp);
@@ -566,7 +566,7 @@ int analogix_dp_read_byte_from_dpcd(struct analogix_dp_device *dp, }/* Read data buffer */ - reg =readl (dp->reg_base +EXYNOS_DP_BUF_DATA_0 ); + reg =readl (dp->reg_base +ANALOGIX_DP_BUF_DATA_0 ); *data = (unsigned char )(reg &0xff );return retval;
@@ -586,7 +586,7 @@ int analogix_dp_write_bytes_to_dpcd(struct analogix_dp_device *dp,/* Clear AUX CH data buffer */ reg =BUF_CLR ; -writel (reg, dp->reg_base +EXYNOS_DP_BUFFER_DATA_CTL ); +writel (reg, dp->reg_base +ANALOGIX_DP_BUFFER_DATA_CTL ); start_offset =0 ;while (start_offset < count) {
@@ -599,16 +599,16 @@ int analogix_dp_write_bytes_to_dpcd(struct analogix_dp_device *dp,for (i =0 ; i <3 ; i++) {/* Select DPCD device address */ reg =AUX_ADDR_7_0 (reg_addr + start_offset); -writel (reg, dp->reg_base +EXYNOS_DP_AUX_ADDR_7_0 ); +writel (reg, dp->reg_base +ANALOGIX_DP_AUX_ADDR_7_0 ); reg =AUX_ADDR_15_8 (reg_addr + start_offset); -writel (reg, dp->reg_base +EXYNOS_DP_AUX_ADDR_15_8 ); +writel (reg, dp->reg_base +ANALOGIX_DP_AUX_ADDR_15_8 ); reg =AUX_ADDR_19_16 (reg_addr + start_offset); -writel (reg, dp->reg_base +EXYNOS_DP_AUX_ADDR_19_16 ); +writel (reg, dp->reg_base +ANALOGIX_DP_AUX_ADDR_19_16 );for (cur_data_idx =0 ; cur_data_idx < cur_data_count; cur_data_idx++) { reg = data[start_offset + cur_data_idx]; -writel (reg, dp->reg_base +EXYNOS_DP_BUF_DATA_0 +writel (reg, dp->reg_base +ANALOGIX_DP_BUF_DATA_0 +4 * cur_data_idx); }
@@ -619,7 +619,7 @@ int analogix_dp_write_bytes_to_dpcd(struct analogix_dp_device *dp,*/ reg =AUX_LENGTH (cur_data_count) |AUX_TX_COMM_DP_TRANSACTION |AUX_TX_COMM_WRITE ; -writel (reg, dp->reg_base +EXYNOS_DP_AUX_CH_CTL_1 ); +writel (reg, dp->reg_base +ANALOGIX_DP_AUX_CH_CTL_1 );/* Start AUX transaction */ retval =analogix_dp_start_aux_transaction (dp);
@@ -650,7 +650,7 @@ int analogix_dp_read_bytes_from_dpcd(struct analogix_dp_device *dp,/* Clear AUX CH data buffer */ reg =BUF_CLR ; -writel (reg, dp->reg_base +EXYNOS_DP_BUFFER_DATA_CTL ); +writel (reg, dp->reg_base +ANALOGIX_DP_BUFFER_DATA_CTL ); start_offset =0 ;while (start_offset < count) {
@@ -664,11 +664,11 @@ int analogix_dp_read_bytes_from_dpcd(struct analogix_dp_device *dp,for (i =0 ; i <3 ; i++) {/* Select DPCD device address */ reg =AUX_ADDR_7_0 (reg_addr + start_offset); -writel (reg, dp->reg_base +EXYNOS_DP_AUX_ADDR_7_0 ); +writel (reg, dp->reg_base +ANALOGIX_DP_AUX_ADDR_7_0 ); reg =AUX_ADDR_15_8 (reg_addr + start_offset); -writel (reg, dp->reg_base +EXYNOS_DP_AUX_ADDR_15_8 ); +writel (reg, dp->reg_base +ANALOGIX_DP_AUX_ADDR_15_8 ); reg =AUX_ADDR_19_16 (reg_addr + start_offset); -writel (reg, dp->reg_base +EXYNOS_DP_AUX_ADDR_19_16 ); +writel (reg, dp->reg_base +ANALOGIX_DP_AUX_ADDR_19_16 );/* * Set DisplayPort transaction and read
@@ -677,7 +677,7 @@ int analogix_dp_read_bytes_from_dpcd(struct analogix_dp_device *dp,*/ reg =AUX_LENGTH (cur_data_count) |AUX_TX_COMM_DP_TRANSACTION |AUX_TX_COMM_READ ; -writel (reg, dp->reg_base +EXYNOS_DP_AUX_CH_CTL_1 ); +writel (reg, dp->reg_base +ANALOGIX_DP_AUX_CH_CTL_1 );/* Start AUX transaction */ retval =analogix_dp_start_aux_transaction (dp);
@@ -690,7 +690,7 @@ int analogix_dp_read_bytes_from_dpcd(struct analogix_dp_device *dp,for (cur_data_idx =0 ; cur_data_idx < cur_data_count; cur_data_idx++) { - reg =readl (dp->reg_base +EXYNOS_DP_BUF_DATA_0 + reg =readl (dp->reg_base +ANALOGIX_DP_BUF_DATA_0 +4 * cur_data_idx); data[start_offset + cur_data_idx] = (unsigned char )reg;
@@ -711,12 +711,12 @@ int analogix_dp_select_i2c_device(struct analogix_dp_device *dp,/* Set EDID device address */ reg = device_addr; -writel (reg, dp->reg_base +EXYNOS_DP_AUX_ADDR_7_0 ); -writel (0x0 , dp->reg_base +EXYNOS_DP_AUX_ADDR_15_8 ); -writel (0x0 , dp->reg_base +EXYNOS_DP_AUX_ADDR_19_16 ); +writel (reg, dp->reg_base +ANALOGIX_DP_AUX_ADDR_7_0 ); +writel (0x0 , dp->reg_base +ANALOGIX_DP_AUX_ADDR_15_8 ); +writel (0x0 , dp->reg_base +ANALOGIX_DP_AUX_ADDR_19_16 );/* Set offset from base address of EDID device */ -writel (reg_addr, dp->reg_base +EXYNOS_DP_BUF_DATA_0 ); +writel (reg_addr, dp->reg_base +ANALOGIX_DP_BUF_DATA_0 );/* * Set I2C transaction and write address
@@ -725,7 +725,7 @@ int analogix_dp_select_i2c_device(struct analogix_dp_device *dp,*/ reg =AUX_TX_COMM_I2C_TRANSACTION |AUX_TX_COMM_MOT |AUX_TX_COMM_WRITE ; -writel (reg, dp->reg_base +EXYNOS_DP_AUX_CH_CTL_1 ); +writel (reg, dp->reg_base +ANALOGIX_DP_AUX_CH_CTL_1 );/* Start AUX transaction */ retval =analogix_dp_start_aux_transaction (dp);
@@ -747,7 +747,7 @@ int analogix_dp_read_byte_from_i2c(struct analogix_dp_device *dp,for (i =0 ; i <3 ; i++) {/* Clear AUX CH data buffer */ reg =BUF_CLR ; -writel (reg, dp->reg_base +EXYNOS_DP_BUFFER_DATA_CTL ); +writel (reg, dp->reg_base +ANALOGIX_DP_BUFFER_DATA_CTL );/* Select EDID device */ retval =analogix_dp_select_i2c_device (dp, device_addr, reg_addr);
@@ -761,7 +761,7 @@ int analogix_dp_read_byte_from_i2c(struct analogix_dp_device *dp,*/ reg =AUX_TX_COMM_I2C_TRANSACTION |AUX_TX_COMM_READ ; -writel (reg, dp->reg_base +EXYNOS_DP_AUX_CH_CTL_1 ); +writel (reg, dp->reg_base +ANALOGIX_DP_AUX_CH_CTL_1 );/* Start AUX transaction */ retval =analogix_dp_start_aux_transaction (dp);
@@ -774,7 +774,7 @@ int analogix_dp_read_byte_from_i2c(struct analogix_dp_device *dp,/* Read data */ if (retval ==0 ) - *data =readl (dp->reg_base +EXYNOS_DP_BUF_DATA_0 ); + *data =readl (dp->reg_base +ANALOGIX_DP_BUF_DATA_0 );return retval; }
@@ -795,12 +795,12 @@ int analogix_dp_read_bytes_from_i2c(struct analogix_dp_device *dp,for (j =0 ; j <3 ; j++) {/* Clear AUX CH data buffer */ reg =BUF_CLR ; -writel (reg, dp->reg_base +EXYNOS_DP_BUFFER_DATA_CTL ); +writel (reg, dp->reg_base +ANALOGIX_DP_BUFFER_DATA_CTL );/* Set normal AUX CH command */ - reg =readl (dp->reg_base +EXYNOS_DP_AUX_CH_CTL_2 ); + reg =readl (dp->reg_base +ANALOGIX_DP_AUX_CH_CTL_2 ); reg &= ~ADDR_ONLY ; -writel (reg, dp->reg_base +EXYNOS_DP_AUX_CH_CTL_2 ); +writel (reg, dp->reg_base +ANALOGIX_DP_AUX_CH_CTL_2 );/* * If Rx sends defer, Tx sends only reads
@@ -822,7 +822,7 @@ int analogix_dp_read_bytes_from_i2c(struct analogix_dp_device *dp,AUX_TX_COMM_I2C_TRANSACTION |AUX_TX_COMM_READ ;writel (reg, dp->reg_base + -EXYNOS_DP_AUX_CH_CTL_1 ); +ANALOGIX_DP_AUX_CH_CTL_1 );/* Start AUX transaction */ retval =analogix_dp_start_aux_transaction (dp);
@@ -834,7 +834,7 @@ int analogix_dp_read_bytes_from_i2c(struct analogix_dp_device *dp, __func__); }/* Check if Rx sends defer */ - reg =readl (dp->reg_base +EXYNOS_DP_AUX_RX_COMM ); + reg =readl (dp->reg_base +ANALOGIX_DP_AUX_RX_COMM );if (reg ==AUX_RX_COMM_AUX_DEFER || reg ==AUX_RX_COMM_I2C_DEFER ) {dev_err (dp->dev,"Defer: %d\n\n" , reg);
@@ -843,7 +843,7 @@ int analogix_dp_read_bytes_from_i2c(struct analogix_dp_device *dp, }for (cur_data_idx =0 ; cur_data_idx <16 ; cur_data_idx++) { - reg =readl (dp->reg_base +EXYNOS_DP_BUF_DATA_0 + reg =readl (dp->reg_base +ANALOGIX_DP_BUF_DATA_0 +4 * cur_data_idx); edid[i + cur_data_idx] = (unsigned char )reg; }
@@ -858,14 +858,14 @@ void analogix_dp_set_link_bandwidth(struct analogix_dp_device *dp, u32 bwtype) reg = bwtype;if ((bwtype ==LINK_RATE_2_70GBPS ) || (bwtype ==LINK_RATE_1_62GBPS )) -writel (reg, dp->reg_base +EXYNOS_DP_LINK_BW_SET ); +writel (reg, dp->reg_base +ANALOGIX_DP_LINK_BW_SET ); }void analogix_dp_get_link_bandwidth (struct analogix_dp_device *dp,u32 *bwtype) {u32 reg; - reg =readl (dp->reg_base +EXYNOS_DP_LINK_BW_SET ); + reg =readl (dp->reg_base +ANALOGIX_DP_LINK_BW_SET ); *bwtype = reg; }
@@ -874,14 +874,14 @@ void analogix_dp_set_lane_count(struct analogix_dp_device *dp, u32 count)u32 reg; reg = count; -writel (reg, dp->reg_base +EXYNOS_DP_LANE_COUNT_SET ); +writel (reg, dp->reg_base +ANALOGIX_DP_LANE_COUNT_SET ); }void analogix_dp_get_lane_count (struct analogix_dp_device *dp,u32 *count) {u32 reg; - reg =readl (dp->reg_base +EXYNOS_DP_LANE_COUNT_SET ); + reg =readl (dp->reg_base +ANALOGIX_DP_LANE_COUNT_SET ); *count = reg; }
@@ -890,13 +890,13 @@ void analogix_dp_enable_enhanced_mode(struct analogix_dp_device *dp, bool enableu32 reg;if (enable) { - reg =readl (dp->reg_base +EXYNOS_DP_SYS_CTL_4 ); + reg =readl (dp->reg_base +ANALOGIX_DP_SYS_CTL_4 ); reg |=ENHANCED ; -writel (reg, dp->reg_base +EXYNOS_DP_SYS_CTL_4 ); +writel (reg, dp->reg_base +ANALOGIX_DP_SYS_CTL_4 ); }else { - reg =readl (dp->reg_base +EXYNOS_DP_SYS_CTL_4 ); + reg =readl (dp->reg_base +ANALOGIX_DP_SYS_CTL_4 ); reg &= ~ENHANCED ; -writel (reg, dp->reg_base +EXYNOS_DP_SYS_CTL_4 ); +writel (reg, dp->reg_base +ANALOGIX_DP_SYS_CTL_4 ); } }
@@ -908,25 +908,25 @@ void analogix_dp_set_training_pattern(struct analogix_dp_device *dp,switch (pattern) {case PRBS7 : reg =SCRAMBLING_ENABLE |LINK_QUAL_PATTERN_SET_PRBS7 ; -writel (reg, dp->reg_base +EXYNOS_DP_TRAINING_PTN_SET ); +writel (reg, dp->reg_base +ANALOGIX_DP_TRAINING_PTN_SET );break ;case D10_2 : reg =SCRAMBLING_ENABLE |LINK_QUAL_PATTERN_SET_D10_2 ; -writel (reg, dp->reg_base +EXYNOS_DP_TRAINING_PTN_SET ); +writel (reg, dp->reg_base +ANALOGIX_DP_TRAINING_PTN_SET );break ;case TRAINING_PTN1 : reg =SCRAMBLING_DISABLE |SW_TRAINING_PATTERN_SET_PTN1 ; -writel (reg, dp->reg_base +EXYNOS_DP_TRAINING_PTN_SET ); +writel (reg, dp->reg_base +ANALOGIX_DP_TRAINING_PTN_SET );break ;case TRAINING_PTN2 : reg =SCRAMBLING_DISABLE |SW_TRAINING_PATTERN_SET_PTN2 ; -writel (reg, dp->reg_base +EXYNOS_DP_TRAINING_PTN_SET ); +writel (reg, dp->reg_base +ANALOGIX_DP_TRAINING_PTN_SET );break ;case DP_NONE : reg =SCRAMBLING_ENABLE |LINK_QUAL_PATTERN_SET_DISABLE |SW_TRAINING_PATTERN_SET_NORMAL ; -writel (reg, dp->reg_base +EXYNOS_DP_TRAINING_PTN_SET ); +writel (reg, dp->reg_base +ANALOGIX_DP_TRAINING_PTN_SET );break ;default :break ;
@@ -937,40 +937,40 @@ void analogix_dp_set_lane0_pre_emphasis(struct analogix_dp_device *dp, u32 level {u32 reg; - reg =readl (dp->reg_base +EXYNOS_DP_LN0_LINK_TRAINING_CTL ); + reg =readl (dp->reg_base +ANALOGIX_DP_LN0_LINK_TRAINING_CTL ); reg &= ~PRE_EMPHASIS_SET_MASK ; reg |= level <<PRE_EMPHASIS_SET_SHIFT ; -writel (reg, dp->reg_base +EXYNOS_DP_LN0_LINK_TRAINING_CTL ); +writel (reg, dp->reg_base +ANALOGIX_DP_LN0_LINK_TRAINING_CTL ); }void analogix_dp_set_lane1_pre_emphasis (struct analogix_dp_device *dp,u32 level) {u32 reg; - reg =readl (dp->reg_base +EXYNOS_DP_LN1_LINK_TRAINING_CTL ); + reg =readl (dp->reg_base +ANALOGIX_DP_LN1_LINK_TRAINING_CTL ); reg &= ~PRE_EMPHASIS_SET_MASK ; reg |= level <<PRE_EMPHASIS_SET_SHIFT ; -writel (reg, dp->reg_base +EXYNOS_DP_LN1_LINK_TRAINING_CTL ); +writel (reg, dp->reg_base +ANALOGIX_DP_LN1_LINK_TRAINING_CTL ); }void analogix_dp_set_lane2_pre_emphasis (struct analogix_dp_device *dp,u32 level) {u32 reg; - reg =readl (dp->reg_base +EXYNOS_DP_LN2_LINK_TRAINING_CTL ); + reg =readl (dp->reg_base +ANALOGIX_DP_LN2_LINK_TRAINING_CTL ); reg &= ~PRE_EMPHASIS_SET_MASK ; reg |= level <<PRE_EMPHASIS_SET_SHIFT ; -writel (reg, dp->reg_base +EXYNOS_DP_LN2_LINK_TRAINING_CTL ); +writel (reg, dp->reg_base +ANALOGIX_DP_LN2_LINK_TRAINING_CTL ); }void analogix_dp_set_lane3_pre_emphasis (struct analogix_dp_device *dp,u32 level) {u32 reg; - reg =readl (dp->reg_base +EXYNOS_DP_LN3_LINK_TRAINING_CTL ); + reg =readl (dp->reg_base +ANALOGIX_DP_LN3_LINK_TRAINING_CTL ); reg &= ~PRE_EMPHASIS_SET_MASK ; reg |= level <<PRE_EMPHASIS_SET_SHIFT ; -writel (reg, dp->reg_base +EXYNOS_DP_LN3_LINK_TRAINING_CTL ); +writel (reg, dp->reg_base +ANALOGIX_DP_LN3_LINK_TRAINING_CTL ); } void analogix_dp_set_lane0_link_training(struct analogix_dp_device *dp,
@@ -979,7 +979,7 @@ void analogix_dp_set_lane0_link_training(struct analogix_dp_device *dp,u32 reg; reg = training_lane; -writel (reg, dp->reg_base +EXYNOS_DP_LN0_LINK_TRAINING_CTL ); +writel (reg, dp->reg_base +ANALOGIX_DP_LN0_LINK_TRAINING_CTL ); } void analogix_dp_set_lane1_link_training(struct analogix_dp_device *dp,
@@ -988,7 +988,7 @@ void analogix_dp_set_lane1_link_training(struct analogix_dp_device *dp,u32 reg; reg = training_lane; -writel (reg, dp->reg_base +EXYNOS_DP_LN1_LINK_TRAINING_CTL ); +writel (reg, dp->reg_base +ANALOGIX_DP_LN1_LINK_TRAINING_CTL ); } void analogix_dp_set_lane2_link_training(struct analogix_dp_device *dp,
@@ -997,7 +997,7 @@ void analogix_dp_set_lane2_link_training(struct analogix_dp_device *dp,u32 reg; reg = training_lane; -writel (reg, dp->reg_base +EXYNOS_DP_LN2_LINK_TRAINING_CTL ); +writel (reg, dp->reg_base +ANALOGIX_DP_LN2_LINK_TRAINING_CTL ); } void analogix_dp_set_lane3_link_training(struct analogix_dp_device *dp,
@@ -1006,14 +1006,14 @@ void analogix_dp_set_lane3_link_training(struct analogix_dp_device *dp,u32 reg; reg = training_lane; -writel (reg, dp->reg_base +EXYNOS_DP_LN3_LINK_TRAINING_CTL ); +writel (reg, dp->reg_base +ANALOGIX_DP_LN3_LINK_TRAINING_CTL ); }u32 analogix_dp_get_lane0_link_training (struct analogix_dp_device *dp) {u32 reg; - reg =readl (dp->reg_base +EXYNOS_DP_LN0_LINK_TRAINING_CTL ); + reg =readl (dp->reg_base +ANALOGIX_DP_LN0_LINK_TRAINING_CTL );return reg; }
@@ -1021,7 +1021,7 @@ u32 analogix_dp_get_lane1_link_training(struct analogix_dp_device *dp) {u32 reg; - reg =readl (dp->reg_base +EXYNOS_DP_LN1_LINK_TRAINING_CTL ); + reg =readl (dp->reg_base +ANALOGIX_DP_LN1_LINK_TRAINING_CTL );return reg; }
@@ -1029,7 +1029,7 @@ u32 analogix_dp_get_lane2_link_training(struct analogix_dp_device *dp) {u32 reg; - reg =readl (dp->reg_base +EXYNOS_DP_LN2_LINK_TRAINING_CTL ); + reg =readl (dp->reg_base +ANALOGIX_DP_LN2_LINK_TRAINING_CTL );return reg; }
@@ -1037,7 +1037,7 @@ u32 analogix_dp_get_lane3_link_training(struct analogix_dp_device *dp) {u32 reg; - reg =readl (dp->reg_base +EXYNOS_DP_LN3_LINK_TRAINING_CTL ); + reg =readl (dp->reg_base +ANALOGIX_DP_LN3_LINK_TRAINING_CTL );return reg; }
@@ -1045,15 +1045,15 @@ void analogix_dp_reset_macro(struct analogix_dp_device *dp) {u32 reg; - reg =readl (dp->reg_base +EXYNOS_DP_PHY_TEST ); + reg =readl (dp->reg_base +ANALOGIX_DP_PHY_TEST ); reg |=MACRO_RST ; -writel (reg, dp->reg_base +EXYNOS_DP_PHY_TEST ); +writel (reg, dp->reg_base +ANALOGIX_DP_PHY_TEST );/* 10 us is the minimum reset time. */ usleep_range (10 ,20 ); reg &= ~MACRO_RST ; -writel (reg, dp->reg_base +EXYNOS_DP_PHY_TEST ); +writel (reg, dp->reg_base +ANALOGIX_DP_PHY_TEST ); }void analogix_dp_init_video (struct analogix_dp_device *dp)
@@ -1061,19 +1061,19 @@ void analogix_dp_init_video(struct analogix_dp_device *dp)u32 reg; reg =VSYNC_DET |VID_FORMAT_CHG |VID_CLK_CHG ; -writel (reg, dp->reg_base +EXYNOS_DP_COMMON_INT_STA_1 ); +writel (reg, dp->reg_base +ANALOGIX_DP_COMMON_INT_STA_1 ); reg =0x0 ; -writel (reg, dp->reg_base +EXYNOS_DP_SYS_CTL_1 ); +writel (reg, dp->reg_base +ANALOGIX_DP_SYS_CTL_1 ); reg =CHA_CRI (4 ) |CHA_CTRL ; -writel (reg, dp->reg_base +EXYNOS_DP_SYS_CTL_2 ); +writel (reg, dp->reg_base +ANALOGIX_DP_SYS_CTL_2 ); reg =0x0 ; -writel (reg, dp->reg_base +EXYNOS_DP_SYS_CTL_3 ); +writel (reg, dp->reg_base +ANALOGIX_DP_SYS_CTL_3 ); reg =VID_HRES_TH (2 ) |VID_VRES_TH (0 ); -writel (reg, dp->reg_base +EXYNOS_DP_VIDEO_CTL_8 ); +writel (reg, dp->reg_base +ANALOGIX_DP_VIDEO_CTL_8 ); }void analogix_dp_set_video_color_format (struct analogix_dp_device *dp)
@@ -1084,36 +1084,36 @@ void analogix_dp_set_video_color_format(struct analogix_dp_device *dp) reg = (dp->video_info->dynamic_range <<IN_D_RANGE_SHIFT ) | (dp->video_info->color_depth <<IN_BPC_SHIFT ) | (dp->video_info->color_space <<IN_COLOR_F_SHIFT ); -writel (reg, dp->reg_base +EXYNOS_DP_VIDEO_CTL_2 ); +writel (reg, dp->reg_base +ANALOGIX_DP_VIDEO_CTL_2 );/* Set Input Color YCbCr Coefficients to ITU601 or ITU709 */ - reg =readl (dp->reg_base +EXYNOS_DP_VIDEO_CTL_3 ); + reg =readl (dp->reg_base +ANALOGIX_DP_VIDEO_CTL_3 ); reg &= ~IN_YC_COEFFI_MASK ;if (dp->video_info->ycbcr_coeff) reg |=IN_YC_COEFFI_ITU709 ;else reg |=IN_YC_COEFFI_ITU601 ; -writel (reg, dp->reg_base +EXYNOS_DP_VIDEO_CTL_3 ); +writel (reg, dp->reg_base +ANALOGIX_DP_VIDEO_CTL_3 ); }int analogix_dp_is_slave_video_stream_clock_on (struct analogix_dp_device *dp) {u32 reg; - reg =readl (dp->reg_base +EXYNOS_DP_SYS_CTL_1 ); -writel (reg, dp->reg_base +EXYNOS_DP_SYS_CTL_1 ); + reg =readl (dp->reg_base +ANALOGIX_DP_SYS_CTL_1 ); +writel (reg, dp->reg_base +ANALOGIX_DP_SYS_CTL_1 ); - reg =readl (dp->reg_base +EXYNOS_DP_SYS_CTL_1 ); + reg =readl (dp->reg_base +ANALOGIX_DP_SYS_CTL_1 );if (!(reg &DET_STA )) {dev_dbg (dp->dev,"Input stream clock not detected.\n" );return -EINVAL ; } - reg =readl (dp->reg_base +EXYNOS_DP_SYS_CTL_2 ); -writel (reg, dp->reg_base +EXYNOS_DP_SYS_CTL_2 ); + reg =readl (dp->reg_base +ANALOGIX_DP_SYS_CTL_2 ); +writel (reg, dp->reg_base +ANALOGIX_DP_SYS_CTL_2 ); - reg =readl (dp->reg_base +EXYNOS_DP_SYS_CTL_2 ); + reg =readl (dp->reg_base +ANALOGIX_DP_SYS_CTL_2 );dev_dbg (dp->dev,"wait SYS_CTL_2.\n" );if (reg &CHA_STA ) {
@@ -1132,30 +1132,30 @@ void analogix_dp_set_video_cr_mn(struct analogix_dp_device *dp,u32 reg;if (type ==REGISTER_M ) { - reg =readl (dp->reg_base +EXYNOS_DP_SYS_CTL_4 ); + reg =readl (dp->reg_base +ANALOGIX_DP_SYS_CTL_4 ); reg |=FIX_M_VID ; -writel (reg, dp->reg_base +EXYNOS_DP_SYS_CTL_4 ); +writel (reg, dp->reg_base +ANALOGIX_DP_SYS_CTL_4 ); reg = m_value &0xff ; -writel (reg, dp->reg_base +EXYNOS_DP_M_VID_0 ); +writel (reg, dp->reg_base +ANALOGIX_DP_M_VID_0 ); reg = (m_value >>8 ) &0xff ; -writel (reg, dp->reg_base +EXYNOS_DP_M_VID_1 ); +writel (reg, dp->reg_base +ANALOGIX_DP_M_VID_1 ); reg = (m_value >>16 ) &0xff ; -writel (reg, dp->reg_base +EXYNOS_DP_M_VID_2 ); +writel (reg, dp->reg_base +ANALOGIX_DP_M_VID_2 ); reg = n_value &0xff ; -writel (reg, dp->reg_base +EXYNOS_DP_N_VID_0 ); +writel (reg, dp->reg_base +ANALOGIX_DP_N_VID_0 ); reg = (n_value >>8 ) &0xff ; -writel (reg, dp->reg_base +EXYNOS_DP_N_VID_1 ); +writel (reg, dp->reg_base +ANALOGIX_DP_N_VID_1 ); reg = (n_value >>16 ) &0xff ; -writel (reg, dp->reg_base +EXYNOS_DP_N_VID_2 ); +writel (reg, dp->reg_base +ANALOGIX_DP_N_VID_2 ); }else { - reg =readl (dp->reg_base +EXYNOS_DP_SYS_CTL_4 ); + reg =readl (dp->reg_base +ANALOGIX_DP_SYS_CTL_4 ); reg &= ~FIX_M_VID ; -writel (reg, dp->reg_base +EXYNOS_DP_SYS_CTL_4 ); +writel (reg, dp->reg_base +ANALOGIX_DP_SYS_CTL_4 ); -writel (0x00 , dp->reg_base +EXYNOS_DP_N_VID_0 ); -writel (0x80 , dp->reg_base +EXYNOS_DP_N_VID_1 ); -writel (0x00 , dp->reg_base +EXYNOS_DP_N_VID_2 ); +writel (0x00 , dp->reg_base +ANALOGIX_DP_N_VID_0 ); +writel (0x80 , dp->reg_base +ANALOGIX_DP_N_VID_1 ); +writel (0x00 , dp->reg_base +ANALOGIX_DP_N_VID_2 ); } }
@@ -1164,13 +1164,13 @@ void analogix_dp_set_video_timing_mode(struct analogix_dp_device *dp, u32 type)u32 reg;if (type ==VIDEO_TIMING_FROM_CAPTURE ) { - reg =readl (dp->reg_base +EXYNOS_DP_VIDEO_CTL_10 ); + reg =readl (dp->reg_base +ANALOGIX_DP_VIDEO_CTL_10 ); reg &= ~FORMAT_SEL ; -writel (reg, dp->reg_base +EXYNOS_DP_VIDEO_CTL_10 ); +writel (reg, dp->reg_base +ANALOGIX_DP_VIDEO_CTL_10 ); }else { - reg =readl (dp->reg_base +EXYNOS_DP_VIDEO_CTL_10 ); + reg =readl (dp->reg_base +ANALOGIX_DP_VIDEO_CTL_10 ); reg |=FORMAT_SEL ; -writel (reg, dp->reg_base +EXYNOS_DP_VIDEO_CTL_10 ); +writel (reg, dp->reg_base +ANALOGIX_DP_VIDEO_CTL_10 ); } }
@@ -1179,15 +1179,15 @@ void analogix_dp_enable_video_master(struct analogix_dp_device *dp, bool enable)u32 reg;if (enable) { - reg =readl (dp->reg_base +EXYNOS_DP_SOC_GENERAL_CTL ); + reg =readl (dp->reg_base +ANALOGIX_DP_SOC_GENERAL_CTL ); reg &= ~VIDEO_MODE_MASK ; reg |=VIDEO_MASTER_MODE_EN |VIDEO_MODE_MASTER_MODE ; -writel (reg, dp->reg_base +EXYNOS_DP_SOC_GENERAL_CTL ); +writel (reg, dp->reg_base +ANALOGIX_DP_SOC_GENERAL_CTL ); }else { - reg =readl (dp->reg_base +EXYNOS_DP_SOC_GENERAL_CTL ); + reg =readl (dp->reg_base +ANALOGIX_DP_SOC_GENERAL_CTL ); reg &= ~VIDEO_MODE_MASK ; reg |=VIDEO_MODE_SLAVE_MODE ; -writel (reg, dp->reg_base +EXYNOS_DP_SOC_GENERAL_CTL ); +writel (reg, dp->reg_base +ANALOGIX_DP_SOC_GENERAL_CTL ); } }
@@ -1195,19 +1195,19 @@ void analogix_dp_start_video(struct analogix_dp_device *dp) {u32 reg; - reg =readl (dp->reg_base +EXYNOS_DP_VIDEO_CTL_1 ); + reg =readl (dp->reg_base +ANALOGIX_DP_VIDEO_CTL_1 ); reg |=VIDEO_EN ; -writel (reg, dp->reg_base +EXYNOS_DP_VIDEO_CTL_1 ); +writel (reg, dp->reg_base +ANALOGIX_DP_VIDEO_CTL_1 ); }int analogix_dp_is_video_stream_on (struct analogix_dp_device *dp) {u32 reg; - reg =readl (dp->reg_base +EXYNOS_DP_SYS_CTL_3 ); -writel (reg, dp->reg_base +EXYNOS_DP_SYS_CTL_3 ); + reg =readl (dp->reg_base +ANALOGIX_DP_SYS_CTL_3 ); +writel (reg, dp->reg_base +ANALOGIX_DP_SYS_CTL_3 ); - reg =readl (dp->reg_base +EXYNOS_DP_SYS_CTL_3 ); + reg =readl (dp->reg_base +ANALOGIX_DP_SYS_CTL_3 );if (!(reg &STRM_VALID )) {dev_dbg (dp->dev,"Input video stream is not detected.\n" );return -EINVAL ;
@@ -1220,44 +1220,44 @@ void analogix_dp_config_video_slave_mode(struct analogix_dp_device *dp) {u32 reg; - reg =readl (dp->reg_base +EXYNOS_DP_FUNC_EN_1 ); + reg =readl (dp->reg_base +ANALOGIX_DP_FUNC_EN_1 ); reg &= ~(MASTER_VID_FUNC_EN_N |SLAVE_VID_FUNC_EN_N ); reg |=MASTER_VID_FUNC_EN_N ; -writel (reg, dp->reg_base +EXYNOS_DP_FUNC_EN_1 ); +writel (reg, dp->reg_base +ANALOGIX_DP_FUNC_EN_1 ); - reg =readl (dp->reg_base +EXYNOS_DP_VIDEO_CTL_10 ); + reg =readl (dp->reg_base +ANALOGIX_DP_VIDEO_CTL_10 ); reg &= ~INTERACE_SCAN_CFG ; reg |= (dp->video_info->interlaced <<2 ); -writel (reg, dp->reg_base +EXYNOS_DP_VIDEO_CTL_10 ); +writel (reg, dp->reg_base +ANALOGIX_DP_VIDEO_CTL_10 ); - reg =readl (dp->reg_base +EXYNOS_DP_VIDEO_CTL_10 ); + reg =readl (dp->reg_base +ANALOGIX_DP_VIDEO_CTL_10 ); reg &= ~VSYNC_POLARITY_CFG ; reg |= (dp->video_info->v_sync_polarity <<1 ); -writel (reg, dp->reg_base +EXYNOS_DP_VIDEO_CTL_10 ); +writel (reg, dp->reg_base +ANALOGIX_DP_VIDEO_CTL_10 ); - reg =readl (dp->reg_base +EXYNOS_DP_VIDEO_CTL_10 ); + reg =readl (dp->reg_base +ANALOGIX_DP_VIDEO_CTL_10 ); reg &= ~HSYNC_POLARITY_CFG ; reg |= (dp->video_info->h_sync_polarity <<0 ); -writel (reg, dp->reg_base +EXYNOS_DP_VIDEO_CTL_10 ); +writel (reg, dp->reg_base +ANALOGIX_DP_VIDEO_CTL_10 ); reg =AUDIO_MODE_SPDIF_MODE |VIDEO_MODE_SLAVE_MODE ; -writel (reg, dp->reg_base +EXYNOS_DP_SOC_GENERAL_CTL ); +writel (reg, dp->reg_base +ANALOGIX_DP_SOC_GENERAL_CTL ); }void analogix_dp_enable_scrambling (struct analogix_dp_device *dp) {u32 reg; - reg =readl (dp->reg_base +EXYNOS_DP_TRAINING_PTN_SET ); + reg =readl (dp->reg_base +ANALOGIX_DP_TRAINING_PTN_SET ); reg &= ~SCRAMBLING_DISABLE ; -writel (reg, dp->reg_base +EXYNOS_DP_TRAINING_PTN_SET ); +writel (reg, dp->reg_base +ANALOGIX_DP_TRAINING_PTN_SET ); }void analogix_dp_disable_scrambling (struct analogix_dp_device *dp) {u32 reg; - reg =readl (dp->reg_base +EXYNOS_DP_TRAINING_PTN_SET ); + reg =readl (dp->reg_base +ANALOGIX_DP_TRAINING_PTN_SET ); reg |=SCRAMBLING_DISABLE ; -writel (reg, dp->reg_base +EXYNOS_DP_TRAINING_PTN_SET ); +writel (reg, dp->reg_base +ANALOGIX_DP_TRAINING_PTN_SET ); }
drivers/gpu/drm/bridge/analogix/analogix_dp_reg.h +124 -124
428 lines not on this page · raw message
Signature · 1 line
1.9.1
PATCH v14 4/17 drm: bridge: analogix/dp: fix some obvious code style
In reply to Yakir YangFix some obvious alignment problems, like alignment and line over 80 characters problems, make this easy to be maintained later.
---
Changes in v14: None
Changes in v13: None
Changes in v12:
- Add the ack from Jingoo
Changes in v11: None
Changes in v10: None
Changes in v9: None
Changes in v8: None
Changes in v7: None
Changes in v6: None
Changes in v5:
- Resequence this patch after analogix_dp driver have been split from exynos_dp code, and rephrase reasonable commit message, and remove some controversial style (Krzysztof)
- analogix_dp_write_byte_to_dpcd(
- dp, DP_TEST_RESPONSE,
+ analogix_dp_write_byte_to_dpcd(dp,
+ DP_TEST_RESPONSE,
DP_TEST_EDID_CHECKSUM_WRITE);Changes in v4: None
Changes in v3: None
Changes in v2:
- Improved commit message more readable, and avoid using some uncommon style like bellow: (Joe Preches)
- retval = exynos_dp_read_bytes_from_i2c(... ...);
+ retval =
+ exynos_dp_read_bytes_from_i2c(......);
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 129 ++++++++++----------- drivers/gpu/drm/bridge/analogix/analogix_dp_core.h | 72 ++++++------ drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 124 ++++++++++---------- drivers/gpu/drm/exynos/exynos_dp.c | 6 +- 4 files changed, 166 insertions(+), 165 deletions(-)
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +61 -68
@@ -64,7 +64,7 @@ static int analogix_dp_detect_hpd(struct analogix_dp_device *dp)while (analogix_dp_get_plug_in_status (dp) !=0 ) { timeout_loop++; -if (DP_TIMEOUT_LOOP_COUNT < timeout_loop) { +if (timeout_loop >DP_TIMEOUT_LOOP_COUNT ) {dev_err (dp->dev,"failed to get hpd plug status\n" );return -ETIMEDOUT ; }
@@ -101,8 +101,8 @@ static int analogix_dp_read_edid(struct analogix_dp_device *dp)/* Read Extension Flag, Number of 128-byte EDID extension blocks */ retval =analogix_dp_read_byte_from_i2c (dp,I2C_EDID_DEVICE_ADDR , -EDID_EXTENSION_FLAG , - &extend_block); +EDID_EXTENSION_FLAG , + &extend_block);if (retval)return retval;
@@ -110,7 +110,8 @@ static int analogix_dp_read_edid(struct analogix_dp_device *dp)dev_dbg (dp->dev,"EDID data includes a single extension!\n" );/* Read EDID data */ - retval =analogix_dp_read_bytes_from_i2c (dp,I2C_EDID_DEVICE_ADDR , + retval =analogix_dp_read_bytes_from_i2c (dp, +I2C_EDID_DEVICE_ADDR ,EDID_HEADER_PATTERN ,EDID_BLOCK_LENGTH , &edid[EDID_HEADER_PATTERN ]);
@@ -141,7 +142,7 @@ static int analogix_dp_read_edid(struct analogix_dp_device *dp) }analogix_dp_read_byte_from_dpcd (dp,DP_TEST_REQUEST , - &test_vector); + &test_vector);if (test_vector &DP_TEST_LINK_EDID_READ ) { analogix_dp_write_byte_to_dpcd(dp, DP_TEST_EDID_CHECKSUM,
@@ -155,10 +156,8 @@ static int analogix_dp_read_edid(struct analogix_dp_device *dp)/* Read EDID data */ retval =analogix_dp_read_bytes_from_i2c (dp, -I2C_EDID_DEVICE_ADDR , -EDID_HEADER_PATTERN , -EDID_BLOCK_LENGTH , - &edid[EDID_HEADER_PATTERN ]); +I2C_EDID_DEVICE_ADDR ,EDID_HEADER_PATTERN , +EDID_BLOCK_LENGTH , &edid[EDID_HEADER_PATTERN ]);if (retval !=0 ) {dev_err (dp->dev,"EDID Read failed!\n" );return -EIO ;
@@ -169,16 +168,13 @@ static int analogix_dp_read_edid(struct analogix_dp_device *dp)return -EIO ; } -analogix_dp_read_byte_from_dpcd (dp, -DP_TEST_REQUEST , - &test_vector); +analogix_dp_read_byte_from_dpcd (dp,DP_TEST_REQUEST , + &test_vector);if (test_vector &DP_TEST_LINK_EDID_READ ) {analogix_dp_write_byte_to_dpcd (dp, -DP_TEST_EDID_CHECKSUM , - edid[EDID_CHECKSUM ]); +DP_TEST_EDID_CHECKSUM , edid[EDID_CHECKSUM ]);analogix_dp_write_byte_to_dpcd (dp, -DP_TEST_RESPONSE , -DP_TEST_EDID_CHECKSUM_WRITE ); +DP_TEST_RESPONSE ,DP_TEST_EDID_CHECKSUM_WRITE ); } }
@@ -193,8 +189,7 @@ static int analogix_dp_handle_edid(struct analogix_dp_device *dp)int retval;/* Read DPCD DP_DPCD_REV~RECEIVE_PORT1_CAP_1 */ - retval =analogix_dp_read_bytes_from_dpcd (dp,DP_DPCD_REV , -12 , buf); + retval =analogix_dp_read_bytes_from_dpcd (dp,DP_DPCD_REV ,12 , buf);if (retval)return retval;
@@ -208,8 +203,9 @@ static int analogix_dp_handle_edid(struct analogix_dp_device *dp)return retval; } -static void analogix_dp_enable_rx_to_enhanced_mode (struct analogix_dp_device *dp, -bool enable) +static void +analogix_dp_enable_rx_to_enhanced_mode (struct analogix_dp_device *dp, +bool enable) {u8 data;
@@ -217,11 +213,11 @@ static void analogix_dp_enable_rx_to_enhanced_mode(struct analogix_dp_device *dpif (enable)analogix_dp_write_byte_to_dpcd (dp,DP_LANE_COUNT_SET , -DP_LANE_COUNT_ENHANCED_FRAME_EN | -DPCD_LANE_COUNT_SET (data)); +DP_LANE_COUNT_ENHANCED_FRAME_EN | +DPCD_LANE_COUNT_SET (data));else analogix_dp_write_byte_to_dpcd (dp,DP_LANE_COUNT_SET , -DPCD_LANE_COUNT_SET (data)); +DPCD_LANE_COUNT_SET (data)); }static int analogix_dp_is_enhanced_mode_available (struct analogix_dp_device *dp)
@@ -248,13 +244,13 @@ static void analogix_dp_training_pattern_dis(struct analogix_dp_device *dp) {analogix_dp_set_training_pattern (dp,DP_NONE ); -analogix_dp_write_byte_to_dpcd (dp, -DP_TRAINING_PATTERN_SET , -DP_TRAINING_PATTERN_DISABLE ); +analogix_dp_write_byte_to_dpcd (dp,DP_TRAINING_PATTERN_SET , +DP_TRAINING_PATTERN_DISABLE ); } -static void analogix_dp_set_lane_lane_pre_emphasis (struct analogix_dp_device *dp, -int pre_emphasis,int lane) +static void +analogix_dp_set_lane_lane_pre_emphasis (struct analogix_dp_device *dp, +int pre_emphasis,int lane) {switch (lane) {case 0 :
@@ -294,8 +290,7 @@ static int analogix_dp_link_start(struct analogix_dp_device *dp)/* Setup RX configuration */ buf[0 ] = dp->link_train.link_rate; buf[1 ] = dp->link_train.lane_count; - retval =analogix_dp_write_bytes_to_dpcd (dp,DP_LINK_BW_SET , -2 , buf); + retval =analogix_dp_write_bytes_to_dpcd (dp,DP_LINK_BW_SET ,2 , buf);if (retval)return retval;
@@ -331,7 +326,7 @@ static int analogix_dp_link_start(struct analogix_dp_device *dp)DP_TRAIN_VOLTAGE_SWING_LEVEL_0 ; retval =analogix_dp_write_bytes_to_dpcd (dp,DP_TRAINING_LANE0_SET , - lane_count, buf); + lane_count, buf);return retval; }
@@ -339,7 +334,7 @@ static int analogix_dp_link_start(struct analogix_dp_device *dp)static unsigned char analogix_dp_get_lane_status (u8 link_status[2 ],int lane) {int shift = (lane &1 ) *4 ; -u8 link_value = link_status[lane>>1 ]; +u8 link_value = link_status[lane >>1 ];return (link_value >> shift) &0xf ; }
@@ -358,7 +353,7 @@ static int analogix_dp_clock_recovery_ok(u8 link_status[2], int lane_count) }static int analogix_dp_channel_eq_ok (u8 link_status[2 ],u8 link_align, -int lane_count) +int lane_count) {int lane;u8 lane_status;
@@ -376,11 +371,11 @@ static int analogix_dp_channel_eq_ok(u8 link_status[2], u8 link_align,return 0 ; } -static unsigned char analogix_dp_get_adjust_request_voltage (u8 adjust_request[2 ], -int lane) +static unsigned char +analogix_dp_get_adjust_request_voltage (u8 adjust_request[2 ],int lane) {int shift = (lane &1 ) *4 ; -u8 link_value = adjust_request[lane>>1 ]; +u8 link_value = adjust_request[lane >>1 ];return (link_value >> shift) &0x3 ; }
@@ -390,13 +385,13 @@ static unsigned char analogix_dp_get_adjust_request_pre_emphasis( int lane) {int shift = (lane &1 ) *4 ; -u8 link_value = adjust_request[lane>>1 ]; +u8 link_value = adjust_request[lane >>1 ];return ((link_value >> shift) &0xc ) >>2 ; }static void analogix_dp_set_lane_link_training (struct analogix_dp_device *dp, -u8 training_lane_set,int lane) +u8 training_lane_set,int lane) {switch (lane) {case 0 :
@@ -416,9 +411,9 @@ static void analogix_dp_set_lane_link_training(struct analogix_dp_device *dp, } } -static unsigned int analogix_dp_get_lane_link_training ( -struct analogix_dp_device *dp, -int lane) +static unsigned int +analogix_dp_get_lane_link_training (struct analogix_dp_device *dp, +int lane) {u32 reg;
@@ -452,7 +447,7 @@ static void analogix_dp_reduce_link_rate(struct analogix_dp_device *dp) }static void analogix_dp_get_adjust_training_lane (struct analogix_dp_device *dp, -u8 adjust_request[2 ]) +u8 adjust_request[2 ]) {int lane, lane_count;u8 voltage_swing, pre_emphasis, training_lane;
@@ -625,7 +620,7 @@ static int analogix_dp_process_equalizer_training(struct analogix_dp_device *dp) }static void analogix_dp_get_max_rx_bandwidth (struct analogix_dp_device *dp, -u8 *bandwidth) +u8 *bandwidth) {u8 data;
@@ -638,7 +633,7 @@ static void analogix_dp_get_max_rx_bandwidth(struct analogix_dp_device *dp, }static void analogix_dp_get_max_rx_lane_count (struct analogix_dp_device *dp, -u8 *lane_count) +u8 *lane_count) {u8 data;
@@ -651,8 +646,8 @@ static void analogix_dp_get_max_rx_lane_count(struct analogix_dp_device *dp, }static void analogix_dp_init_training (struct analogix_dp_device *dp, -enum link_lane_count_type max_lane, -enum link_rate_type max_rate) +enum link_lane_count_type max_lane, +enum link_rate_type max_rate) {/* * MACRO_RST must be applied after the PLL_LOCK to avoid
@@ -665,7 +660,7 @@ static void analogix_dp_init_training(struct analogix_dp_device *dp,analogix_dp_get_max_rx_lane_count (dp, &dp->link_train.lane_count);if ((dp->link_train.link_rate !=LINK_RATE_1_62GBPS ) && - (dp->link_train.link_rate !=LINK_RATE_2_70GBPS )) { + (dp->link_train.link_rate !=LINK_RATE_2_70GBPS )) {dev_err (dp->dev,"Rx Max Link Rate is abnormal :%x !\n" , dp->link_train.link_rate); dp->link_train.link_rate =LINK_RATE_1_62GBPS ;
@@ -725,8 +720,7 @@ static int analogix_dp_sw_link_training(struct analogix_dp_device *dp) }static int analogix_dp_set_link_train (struct analogix_dp_device *dp, -u32 count, -u32 bwtype) +u32 count,u32 bwtype) {int i;int retval;
@@ -762,7 +756,7 @@ static int analogix_dp_config_video(struct analogix_dp_device *dp) timeout_loop++;if (analogix_dp_is_slave_video_stream_clock_on (dp) ==0 )break ; -if (DP_TIMEOUT_LOOP_COUNT < timeout_loop) { +if (timeout_loop >DP_TIMEOUT_LOOP_COUNT ) {dev_err (dp->dev,"Timeout of video streamclk ok\n" );return -ETIMEDOUT ; }
@@ -793,7 +787,7 @@ static int analogix_dp_config_video(struct analogix_dp_device *dp) }else if (done_count) { done_count =0 ; } -if (DP_TIMEOUT_LOOP_COUNT < timeout_loop) { +if (timeout_loop >DP_TIMEOUT_LOOP_COUNT ) {dev_err (dp->dev,"Timeout of video streamclk ok\n" );return -ETIMEDOUT ; }
@@ -807,25 +801,24 @@ static int analogix_dp_config_video(struct analogix_dp_device *dp)return retval; } -static void analogix_dp_enable_scramble (struct analogix_dp_device *dp,bool enable) +static void analogix_dp_enable_scramble (struct analogix_dp_device *dp, +bool enable) {u8 data;if (enable) {analogix_dp_enable_scrambling (dp); -analogix_dp_read_byte_from_dpcd (dp, -DP_TRAINING_PATTERN_SET , - &data); +analogix_dp_read_byte_from_dpcd (dp,DP_TRAINING_PATTERN_SET , + &data);analogix_dp_write_byte_to_dpcd (dp,DP_TRAINING_PATTERN_SET , (u8)(data & ~DP_LINK_SCRAMBLING_DISABLE )); }else {analogix_dp_disable_scrambling (dp); -analogix_dp_read_byte_from_dpcd (dp, -DP_TRAINING_PATTERN_SET , - &data); +analogix_dp_read_byte_from_dpcd (dp,DP_TRAINING_PATTERN_SET , + &data);analogix_dp_write_byte_to_dpcd (dp,DP_TRAINING_PATTERN_SET , (u8)(data |DP_LINK_SCRAMBLING_DISABLE ));
@@ -898,7 +891,7 @@ static void analogix_dp_commit(struct analogix_dp_device *dp) } ret =analogix_dp_set_link_train (dp, dp->video_info->lane_count, - dp->video_info->link_rate); + dp->video_info->link_rate);if (ret) {dev_err (dp->dev,"unable to do link train\n" );return ;
@@ -1130,8 +1123,8 @@ static struct video_info *analogix_dp_dt_parse_pdata(struct device *dev)struct device_node *dp_node = dev->of_node;struct video_info *dp_video_config; - dp_video_config =devm_kzalloc (dev, -sizeof (*dp_video_config),GFP_KERNEL ); + dp_video_config =devm_kzalloc (dev,sizeof (*dp_video_config), +GFP_KERNEL );if (!dp_video_config)return ERR_PTR (-ENOMEM );
@@ -1145,37 +1138,37 @@ static struct video_info *analogix_dp_dt_parse_pdata(struct device *dev)of_property_read_bool (dp_node,"interlaced" );if (of_property_read_u32 (dp_node,"samsung,color-space" , - &dp_video_config->color_space)) { + &dp_video_config->color_space)) {dev_err (dev,"failed to get color-space\n" );return ERR_PTR (-EINVAL ); }if (of_property_read_u32 (dp_node,"samsung,dynamic-range" , - &dp_video_config->dynamic_range)) { + &dp_video_config->dynamic_range)) {dev_err (dev,"failed to get dynamic-range\n" );return ERR_PTR (-EINVAL ); }if (of_property_read_u32 (dp_node,"samsung,ycbcr-coeff" , - &dp_video_config->ycbcr_coeff)) { + &dp_video_config->ycbcr_coeff)) {dev_err (dev,"failed to get ycbcr-coeff\n" );return ERR_PTR (-EINVAL ); }if (of_property_read_u32 (dp_node,"samsung,color-depth" , - &dp_video_config->color_depth)) { + &dp_video_config->color_depth)) {dev_err (dev,"failed to get color-depth\n" );return ERR_PTR (-EINVAL ); }if (of_property_read_u32 (dp_node,"samsung,link-rate" , - &dp_video_config->link_rate)) { + &dp_video_config->link_rate)) {dev_err (dev,"failed to get link-rate\n" );return ERR_PTR (-EINVAL ); }if (of_property_read_u32 (dp_node,"samsung,lane-count" , - &dp_video_config->lane_count)) { + &dp_video_config->lane_count)) {dev_err (dev,"failed to get lane-count\n" );return ERR_PTR (-EINVAL ); }
@@ -1284,7 +1277,7 @@ int analogix_dp_bind(struct device *dev, struct drm_device *drm_dev,pm_runtime_enable (dev); ret =devm_request_irq (&pdev->dev, dp->irq, analogix_dp_irq_handler, - irq_flags,"analogix-dp" , dp); + irq_flags,"analogix-dp" , dp);if (ret) {dev_err (&pdev->dev,"failed to request irq\n" ); goto err_disable_pm_runtime;
drivers/gpu/drm/bridge/analogix/analogix_dp_core.h +39 -33
100 lines not on this page · raw message
drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c +63 -61
304 lines not on this page · raw message
drivers/gpu/drm/exynos/exynos_dp.c +3 -3
@@ -157,7 +157,7 @@ static int exynos_dp_dt_parse_panel(struct exynos_dp_device *dp)int ret; ret =of_get_videomode (dp->dev->of_node, &dp->priv.vm, -OF_USE_NATIVE_MODE ); +OF_USE_NATIVE_MODE );if (ret) {DRM_ERROR ("failed: of_get_videomode() : %d\n" , ret);return ret;
@@ -214,7 +214,7 @@ static int exynos_dp_bind(struct device *dev, struct device *master, void *data) }static void exynos_dp_unbind (struct device *dev,struct device *master, -void *data) +void *data) {return analogix_dp_unbind (dev, master, data); }
@@ -231,7 +231,7 @@ static int exynos_dp_probe(struct platform_device *pdev)struct exynos_dp_device *dp; dp =devm_kzalloc (&pdev->dev,sizeof (struct exynos_dp_device ), -GFP_KERNEL ); +GFP_KERNEL );if (!dp)return -ENOMEM ;
Signature · 1 line
1.9.1
Heiko Stübner
maintainer Acked-by Jingoo Han Reviewed-by Krzysztof Kozlowski Tested-by Javier Martinez Canillas on v14 4/17Re: [PATCH v14 04/17] drm: bridge: analogix/dp: fix some obvious code style
Fix some obvious alignment problems, like alignment and line over 80 characters problems, make this easy to be maintained later.
---
Changes in v14.1:
- Rebase against drm-next from 2016-03-17
Changes in v14: None
Changes in v13: None
Changes in v12:
- Add the ack from Jingoo
Changes in v11: None
Changes in v10: None
Changes in v9: None
Changes in v8: None
Changes in v7: None
Changes in v6: None
Changes in v5:
- Resequence this patch after analogix_dp driver have been split from exynos_dp code, and rephrase reasonable commit message, and remove some controversial style (Krzysztof)
- analogix_dp_write_byte_to_dpcd(
- dp, DP_TEST_RESPONSE,
+ analogix_dp_write_byte_to_dpcd(dp,
+ DP_TEST_RESPONSE,
DP_TEST_EDID_CHECKSUM_WRITE);
Changes in v4: None
Changes in v3: None
Changes in v2:
- Improved commit message more readable, and avoid using some uncommon style like bellow: (Joe Preches)
- retval = exynos_dp_read_bytes_from_i2c(... ...);
+ retval =
+ exynos_dp_read_bytes_from_i2c(......);
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 129 ++++++++++----------- drivers/gpu/drm/bridge/analogix/analogix_dp_core.h | 72 ++++++------ drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 124 ++++++++++---------- drivers/gpu/drm/exynos/exynos_dp.c | 4 +- 4 files changed, 165 insertions(+), 164 deletions(-)
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +61 -68
@@ -64,7 +64,7 @@ static int analogix_dp_detect_hpd(struct analogix_dp_device *dp)while (analogix_dp_get_plug_in_status (dp) !=0 ) { timeout_loop++; -if (DP_TIMEOUT_LOOP_COUNT < timeout_loop) { +if (timeout_loop >DP_TIMEOUT_LOOP_COUNT ) {dev_err (dp->dev,"failed to get hpd plug status\n" );return -ETIMEDOUT ; }
@@ -101,8 +101,8 @@ static int analogix_dp_read_edid(struct analogix_dp_device *dp)/* Read Extension Flag, Number of 128-byte EDID extension blocks */ retval =analogix_dp_read_byte_from_i2c (dp,I2C_EDID_DEVICE_ADDR , -EDID_EXTENSION_FLAG , - &extend_block); +EDID_EXTENSION_FLAG , + &extend_block);if (retval)return retval;
@@ -110,7 +110,8 @@ static int analogix_dp_read_edid(struct analogix_dp_device *dp)dev_dbg (dp->dev,"EDID data includes a single extension!\n" );/* Read EDID data */ - retval =analogix_dp_read_bytes_from_i2c (dp,I2C_EDID_DEVICE_ADDR , + retval =analogix_dp_read_bytes_from_i2c (dp, +I2C_EDID_DEVICE_ADDR ,EDID_HEADER_PATTERN ,EDID_BLOCK_LENGTH , &edid[EDID_HEADER_PATTERN ]);
@@ -141,7 +142,7 @@ static int analogix_dp_read_edid(struct analogix_dp_device *dp) }analogix_dp_read_byte_from_dpcd (dp,DP_TEST_REQUEST , - &test_vector); + &test_vector);if (test_vector &DP_TEST_LINK_EDID_READ ) { analogix_dp_write_byte_to_dpcd(dp, DP_TEST_EDID_CHECKSUM,
@@ -155,10 +156,8 @@ static int analogix_dp_read_edid(struct analogix_dp_device *dp)/* Read EDID data */ retval =analogix_dp_read_bytes_from_i2c (dp, -I2C_EDID_DEVICE_ADDR , -EDID_HEADER_PATTERN , -EDID_BLOCK_LENGTH , - &edid[EDID_HEADER_PATTERN ]); +I2C_EDID_DEVICE_ADDR ,EDID_HEADER_PATTERN , +EDID_BLOCK_LENGTH , &edid[EDID_HEADER_PATTERN ]);if (retval !=0 ) {dev_err (dp->dev,"EDID Read failed!\n" );return -EIO ;
@@ -169,16 +168,13 @@ static int analogix_dp_read_edid(struct analogix_dp_device *dp)return -EIO ; } -analogix_dp_read_byte_from_dpcd (dp, -DP_TEST_REQUEST , - &test_vector); +analogix_dp_read_byte_from_dpcd (dp,DP_TEST_REQUEST , + &test_vector);if (test_vector &DP_TEST_LINK_EDID_READ ) {analogix_dp_write_byte_to_dpcd (dp, -DP_TEST_EDID_CHECKSUM , - edid[EDID_CHECKSUM ]); +DP_TEST_EDID_CHECKSUM , edid[EDID_CHECKSUM ]);analogix_dp_write_byte_to_dpcd (dp, -DP_TEST_RESPONSE , -DP_TEST_EDID_CHECKSUM_WRITE ); +DP_TEST_RESPONSE ,DP_TEST_EDID_CHECKSUM_WRITE ); } }
@@ -193,8 +189,7 @@ static int analogix_dp_handle_edid(struct analogix_dp_device *dp)int retval;/* Read DPCD DP_DPCD_REV~RECEIVE_PORT1_CAP_1 */ - retval =analogix_dp_read_bytes_from_dpcd (dp,DP_DPCD_REV , -12 , buf); + retval =analogix_dp_read_bytes_from_dpcd (dp,DP_DPCD_REV ,12 , buf);if (retval)return retval;
@@ -208,8 +203,9 @@ static int analogix_dp_handle_edid(struct analogix_dp_device *dp)return retval; } -static void analogix_dp_enable_rx_to_enhanced_mode (struct analogix_dp_device *dp, -bool enable) +static void +analogix_dp_enable_rx_to_enhanced_mode (struct analogix_dp_device *dp, +bool enable) {u8 data;
@@ -217,11 +213,11 @@ static void analogix_dp_enable_rx_to_enhanced_mode(struct analogix_dp_device *dpif (enable)analogix_dp_write_byte_to_dpcd (dp,DP_LANE_COUNT_SET , -DP_LANE_COUNT_ENHANCED_FRAME_EN | -DPCD_LANE_COUNT_SET (data)); +DP_LANE_COUNT_ENHANCED_FRAME_EN | +DPCD_LANE_COUNT_SET (data));else analogix_dp_write_byte_to_dpcd (dp,DP_LANE_COUNT_SET , -DPCD_LANE_COUNT_SET (data)); +DPCD_LANE_COUNT_SET (data)); }static int analogix_dp_is_enhanced_mode_available (struct analogix_dp_device *dp)
@@ -248,13 +244,13 @@ static void analogix_dp_training_pattern_dis(struct analogix_dp_device *dp) {analogix_dp_set_training_pattern (dp,DP_NONE ); -analogix_dp_write_byte_to_dpcd (dp, -DP_TRAINING_PATTERN_SET , -DP_TRAINING_PATTERN_DISABLE ); +analogix_dp_write_byte_to_dpcd (dp,DP_TRAINING_PATTERN_SET , +DP_TRAINING_PATTERN_DISABLE ); } -static void analogix_dp_set_lane_lane_pre_emphasis (struct analogix_dp_device *dp, -int pre_emphasis,int lane) +static void +analogix_dp_set_lane_lane_pre_emphasis (struct analogix_dp_device *dp, +int pre_emphasis,int lane) {switch (lane) {case 0 :
@@ -294,8 +290,7 @@ static int analogix_dp_link_start(struct analogix_dp_device *dp)/* Setup RX configuration */ buf[0 ] = dp->link_train.link_rate; buf[1 ] = dp->link_train.lane_count; - retval =analogix_dp_write_bytes_to_dpcd (dp,DP_LINK_BW_SET , -2 , buf); + retval =analogix_dp_write_bytes_to_dpcd (dp,DP_LINK_BW_SET ,2 , buf);if (retval)return retval;
@@ -331,7 +326,7 @@ static int analogix_dp_link_start(struct analogix_dp_device *dp)DP_TRAIN_VOLTAGE_SWING_LEVEL_0 ; retval =analogix_dp_write_bytes_to_dpcd (dp,DP_TRAINING_LANE0_SET , - lane_count, buf); + lane_count, buf);return retval; }
@@ -339,7 +334,7 @@ static int analogix_dp_link_start(struct analogix_dp_device *dp)static unsigned char analogix_dp_get_lane_status (u8 link_status[2 ],int lane) {int shift = (lane &1 ) *4 ; -u8 link_value = link_status[lane>>1 ]; +u8 link_value = link_status[lane >>1 ];return (link_value >> shift) &0xf ; }
@@ -358,7 +353,7 @@ static int analogix_dp_clock_recovery_ok(u8 link_status[2], int lane_count) }static int analogix_dp_channel_eq_ok (u8 link_status[2 ],u8 link_align, -int lane_count) +int lane_count) {int lane;u8 lane_status;
@@ -376,11 +371,11 @@ static int analogix_dp_channel_eq_ok(u8 link_status[2], u8 link_align,return 0 ; } -static unsigned char analogix_dp_get_adjust_request_voltage (u8 adjust_request[2 ], -int lane) +static unsigned char +analogix_dp_get_adjust_request_voltage (u8 adjust_request[2 ],int lane) {int shift = (lane &1 ) *4 ; -u8 link_value = adjust_request[lane>>1 ]; +u8 link_value = adjust_request[lane >>1 ];return (link_value >> shift) &0x3 ; }
@@ -390,13 +385,13 @@ static unsigned char analogix_dp_get_adjust_request_pre_emphasis( int lane) {int shift = (lane &1 ) *4 ; -u8 link_value = adjust_request[lane>>1 ]; +u8 link_value = adjust_request[lane >>1 ];return ((link_value >> shift) &0xc ) >>2 ; }static void analogix_dp_set_lane_link_training (struct analogix_dp_device *dp, -u8 training_lane_set,int lane) +u8 training_lane_set,int lane) {switch (lane) {case 0 :
@@ -416,9 +411,9 @@ static void analogix_dp_set_lane_link_training(struct analogix_dp_device *dp, } } -static unsigned int analogix_dp_get_lane_link_training ( -struct analogix_dp_device *dp, -int lane) +static unsigned int +analogix_dp_get_lane_link_training (struct analogix_dp_device *dp, +int lane) {u32 reg;
@@ -452,7 +447,7 @@ static void analogix_dp_reduce_link_rate(struct analogix_dp_device *dp) }static void analogix_dp_get_adjust_training_lane (struct analogix_dp_device *dp, -u8 adjust_request[2 ]) +u8 adjust_request[2 ]) {int lane, lane_count;u8 voltage_swing, pre_emphasis, training_lane;
@@ -625,7 +620,7 @@ static int analogix_dp_process_equalizer_training(struct analogix_dp_device *dp) }static void analogix_dp_get_max_rx_bandwidth (struct analogix_dp_device *dp, -u8 *bandwidth) +u8 *bandwidth) {u8 data;
@@ -638,7 +633,7 @@ static void analogix_dp_get_max_rx_bandwidth(struct analogix_dp_device *dp, }static void analogix_dp_get_max_rx_lane_count (struct analogix_dp_device *dp, -u8 *lane_count) +u8 *lane_count) {u8 data;
@@ -651,8 +646,8 @@ static void analogix_dp_get_max_rx_lane_count(struct analogix_dp_device *dp, }static void analogix_dp_init_training (struct analogix_dp_device *dp, -enum link_lane_count_type max_lane, -enum link_rate_type max_rate) +enum link_lane_count_type max_lane, +enum link_rate_type max_rate) {/* * MACRO_RST must be applied after the PLL_LOCK to avoid
@@ -665,7 +660,7 @@ static void analogix_dp_init_training(struct analogix_dp_device *dp,analogix_dp_get_max_rx_lane_count (dp, &dp->link_train.lane_count);if ((dp->link_train.link_rate !=LINK_RATE_1_62GBPS ) && - (dp->link_train.link_rate !=LINK_RATE_2_70GBPS )) { + (dp->link_train.link_rate !=LINK_RATE_2_70GBPS )) {dev_err (dp->dev,"Rx Max Link Rate is abnormal :%x !\n" , dp->link_train.link_rate); dp->link_train.link_rate =LINK_RATE_1_62GBPS ;
@@ -725,8 +720,7 @@ static int analogix_dp_sw_link_training(struct analogix_dp_device *dp) }static int analogix_dp_set_link_train (struct analogix_dp_device *dp, -u32 count, -u32 bwtype) +u32 count,u32 bwtype) {int i;int retval;
@@ -762,7 +756,7 @@ static int analogix_dp_config_video(struct analogix_dp_device *dp) timeout_loop++;if (analogix_dp_is_slave_video_stream_clock_on (dp) ==0 )break ; -if (DP_TIMEOUT_LOOP_COUNT < timeout_loop) { +if (timeout_loop >DP_TIMEOUT_LOOP_COUNT ) {dev_err (dp->dev,"Timeout of video streamclk ok\n" );return -ETIMEDOUT ; }
@@ -793,7 +787,7 @@ static int analogix_dp_config_video(struct analogix_dp_device *dp) }else if (done_count) { done_count =0 ; } -if (DP_TIMEOUT_LOOP_COUNT < timeout_loop) { +if (timeout_loop >DP_TIMEOUT_LOOP_COUNT ) {dev_err (dp->dev,"Timeout of video streamclk ok\n" );return -ETIMEDOUT ; }
@@ -807,25 +801,24 @@ static int analogix_dp_config_video(struct analogix_dp_device *dp)return retval; } -static void analogix_dp_enable_scramble (struct analogix_dp_device *dp,bool enable) +static void analogix_dp_enable_scramble (struct analogix_dp_device *dp, +bool enable) {u8 data;if (enable) {analogix_dp_enable_scrambling (dp); -analogix_dp_read_byte_from_dpcd (dp, -DP_TRAINING_PATTERN_SET , - &data); +analogix_dp_read_byte_from_dpcd (dp,DP_TRAINING_PATTERN_SET , + &data);analogix_dp_write_byte_to_dpcd (dp,DP_TRAINING_PATTERN_SET , (u8)(data & ~DP_LINK_SCRAMBLING_DISABLE )); }else {analogix_dp_disable_scrambling (dp); -analogix_dp_read_byte_from_dpcd (dp, -DP_TRAINING_PATTERN_SET , - &data); +analogix_dp_read_byte_from_dpcd (dp,DP_TRAINING_PATTERN_SET , + &data);analogix_dp_write_byte_to_dpcd (dp,DP_TRAINING_PATTERN_SET , (u8)(data |DP_LINK_SCRAMBLING_DISABLE ));
@@ -898,7 +891,7 @@ static void analogix_dp_commit(struct analogix_dp_device *dp) } ret =analogix_dp_set_link_train (dp, dp->video_info->lane_count, - dp->video_info->link_rate); + dp->video_info->link_rate);if (ret) {dev_err (dp->dev,"unable to do link train\n" );return ;
@@ -1130,8 +1123,8 @@ static struct video_info *analogix_dp_dt_parse_pdata(struct device *dev)struct device_node *dp_node = dev->of_node;struct video_info *dp_video_config; - dp_video_config =devm_kzalloc (dev, -sizeof (*dp_video_config),GFP_KERNEL ); + dp_video_config =devm_kzalloc (dev,sizeof (*dp_video_config), +GFP_KERNEL );if (!dp_video_config)return ERR_PTR (-ENOMEM );
@@ -1145,37 +1138,37 @@ static struct video_info *analogix_dp_dt_parse_pdata(struct device *dev)of_property_read_bool (dp_node,"interlaced" );if (of_property_read_u32 (dp_node,"samsung,color-space" , - &dp_video_config->color_space)) { + &dp_video_config->color_space)) {dev_err (dev,"failed to get color-space\n" );return ERR_PTR (-EINVAL ); }if (of_property_read_u32 (dp_node,"samsung,dynamic-range" , - &dp_video_config->dynamic_range)) { + &dp_video_config->dynamic_range)) {dev_err (dev,"failed to get dynamic-range\n" );return ERR_PTR (-EINVAL ); }if (of_property_read_u32 (dp_node,"samsung,ycbcr-coeff" , - &dp_video_config->ycbcr_coeff)) { + &dp_video_config->ycbcr_coeff)) {dev_err (dev,"failed to get ycbcr-coeff\n" );return ERR_PTR (-EINVAL ); }if (of_property_read_u32 (dp_node,"samsung,color-depth" , - &dp_video_config->color_depth)) { + &dp_video_config->color_depth)) {dev_err (dev,"failed to get color-depth\n" );return ERR_PTR (-EINVAL ); }if (of_property_read_u32 (dp_node,"samsung,link-rate" , - &dp_video_config->link_rate)) { + &dp_video_config->link_rate)) {dev_err (dev,"failed to get link-rate\n" );return ERR_PTR (-EINVAL ); }if (of_property_read_u32 (dp_node,"samsung,lane-count" , - &dp_video_config->lane_count)) { + &dp_video_config->lane_count)) {dev_err (dev,"failed to get lane-count\n" );return ERR_PTR (-EINVAL ); }
@@ -1284,7 +1277,7 @@ int analogix_dp_bind(struct device *dev, struct drm_device *drm_dev,pm_runtime_enable (dev); ret =devm_request_irq (&pdev->dev, dp->irq, analogix_dp_irq_handler, - irq_flags,"analogix-dp" , dp); + irq_flags,"analogix-dp" , dp);if (ret) {dev_err (&pdev->dev,"failed to request irq\n" ); goto err_disable_pm_runtime;
drivers/gpu/drm/bridge/analogix/analogix_dp_core.h +39 -33
100 lines not on this page · raw message
drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c +63 -61
304 lines not on this page · raw message
drivers/gpu/drm/exynos/exynos_dp.c +2 -2
@@ -204,7 +204,7 @@ static int exynos_dp_bind(struct device *dev, struct device *master, void *data) }static void exynos_dp_unbind (struct device *dev,struct device *master, -void *data) +void *data) {return analogix_dp_unbind (dev, master, data); }
@@ -221,7 +221,7 @@ static int exynos_dp_probe(struct platform_device *pdev)struct exynos_dp_device *dp; dp =devm_kzalloc (&pdev->dev,sizeof (struct exynos_dp_device ), -GFP_KERNEL ); +GFP_KERNEL );if (!dp)return -ENOMEM ;
Signature · 1 line
2.6.4
Heiko Stübner
maintainerPATCH 4/17 drm: bridge: analogix/dp: fix some obvious code style
In reply to Yakir YangFix some obvious alignment problems, like alignment and line over 80 characters problems, make this easy to be maintained later.
---
Changes in v14.1:
- Rebase against drm-next from 2016-03-17
Changes in v14: None
Changes in v13: None
Changes in v12:
- Add the ack from Jingoo
Changes in v11: None
Changes in v10: None
Changes in v9: None
Changes in v8: None
Changes in v7: None
Changes in v6: None
Changes in v5:
- Resequence this patch after analogix_dp driver have been split from exynos_dp code, and rephrase reasonable commit message, and remove some controversial style (Krzysztof)
- analogix_dp_write_byte_to_dpcd(
- dp, DP_TEST_RESPONSE,
+ analogix_dp_write_byte_to_dpcd(dp,
+ DP_TEST_RESPONSE,
DP_TEST_EDID_CHECKSUM_WRITE);
Changes in v4: None
Changes in v3: None
Changes in v2:
- Improved commit message more readable, and avoid using some uncommon style like bellow: (Joe Preches)
- retval = exynos_dp_read_bytes_from_i2c(... ...);
+ retval =
+ exynos_dp_read_bytes_from_i2c(......);
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 129 ++++++++++----------- drivers/gpu/drm/bridge/analogix/analogix_dp_core.h | 72 ++++++------ drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 124 ++++++++++---------- drivers/gpu/drm/exynos/exynos_dp.c | 4 +- 4 files changed, 165 insertions(+), 164 deletions(-)
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +61 -68
@@ -64,7 +64,7 @@ static int analogix_dp_detect_hpd(struct analogix_dp_device *dp)while (analogix_dp_get_plug_in_status (dp) !=0 ) { timeout_loop++; -if (DP_TIMEOUT_LOOP_COUNT < timeout_loop) { +if (timeout_loop >DP_TIMEOUT_LOOP_COUNT ) {dev_err (dp->dev,"failed to get hpd plug status\n" );return -ETIMEDOUT ; }
@@ -101,8 +101,8 @@ static int analogix_dp_read_edid(struct analogix_dp_device *dp)/* Read Extension Flag, Number of 128-byte EDID extension blocks */ retval =analogix_dp_read_byte_from_i2c (dp,I2C_EDID_DEVICE_ADDR , -EDID_EXTENSION_FLAG , - &extend_block); +EDID_EXTENSION_FLAG , + &extend_block);if (retval)return retval;
@@ -110,7 +110,8 @@ static int analogix_dp_read_edid(struct analogix_dp_device *dp)dev_dbg (dp->dev,"EDID data includes a single extension!\n" );/* Read EDID data */ - retval =analogix_dp_read_bytes_from_i2c (dp,I2C_EDID_DEVICE_ADDR , + retval =analogix_dp_read_bytes_from_i2c (dp, +I2C_EDID_DEVICE_ADDR ,EDID_HEADER_PATTERN ,EDID_BLOCK_LENGTH , &edid[EDID_HEADER_PATTERN ]);
@@ -141,7 +142,7 @@ static int analogix_dp_read_edid(struct analogix_dp_device *dp) }analogix_dp_read_byte_from_dpcd (dp,DP_TEST_REQUEST , - &test_vector); + &test_vector);if (test_vector &DP_TEST_LINK_EDID_READ ) { analogix_dp_write_byte_to_dpcd(dp, DP_TEST_EDID_CHECKSUM,
@@ -155,10 +156,8 @@ static int analogix_dp_read_edid(struct analogix_dp_device *dp)/* Read EDID data */ retval =analogix_dp_read_bytes_from_i2c (dp, -I2C_EDID_DEVICE_ADDR , -EDID_HEADER_PATTERN , -EDID_BLOCK_LENGTH , - &edid[EDID_HEADER_PATTERN ]); +I2C_EDID_DEVICE_ADDR ,EDID_HEADER_PATTERN , +EDID_BLOCK_LENGTH , &edid[EDID_HEADER_PATTERN ]);if (retval !=0 ) {dev_err (dp->dev,"EDID Read failed!\n" );return -EIO ;
@@ -169,16 +168,13 @@ static int analogix_dp_read_edid(struct analogix_dp_device *dp)return -EIO ; } -analogix_dp_read_byte_from_dpcd (dp, -DP_TEST_REQUEST , - &test_vector); +analogix_dp_read_byte_from_dpcd (dp,DP_TEST_REQUEST , + &test_vector);if (test_vector &DP_TEST_LINK_EDID_READ ) {analogix_dp_write_byte_to_dpcd (dp, -DP_TEST_EDID_CHECKSUM , - edid[EDID_CHECKSUM ]); +DP_TEST_EDID_CHECKSUM , edid[EDID_CHECKSUM ]);analogix_dp_write_byte_to_dpcd (dp, -DP_TEST_RESPONSE , -DP_TEST_EDID_CHECKSUM_WRITE ); +DP_TEST_RESPONSE ,DP_TEST_EDID_CHECKSUM_WRITE ); } }
@@ -193,8 +189,7 @@ static int analogix_dp_handle_edid(struct analogix_dp_device *dp)int retval;/* Read DPCD DP_DPCD_REV~RECEIVE_PORT1_CAP_1 */ - retval =analogix_dp_read_bytes_from_dpcd (dp,DP_DPCD_REV , -12 , buf); + retval =analogix_dp_read_bytes_from_dpcd (dp,DP_DPCD_REV ,12 , buf);if (retval)return retval;
@@ -208,8 +203,9 @@ static int analogix_dp_handle_edid(struct analogix_dp_device *dp)return retval; } -static void analogix_dp_enable_rx_to_enhanced_mode (struct analogix_dp_device *dp, -bool enable) +static void +analogix_dp_enable_rx_to_enhanced_mode (struct analogix_dp_device *dp, +bool enable) {u8 data;
@@ -217,11 +213,11 @@ static void analogix_dp_enable_rx_to_enhanced_mode(struct analogix_dp_device *dpif (enable)analogix_dp_write_byte_to_dpcd (dp,DP_LANE_COUNT_SET , -DP_LANE_COUNT_ENHANCED_FRAME_EN | -DPCD_LANE_COUNT_SET (data)); +DP_LANE_COUNT_ENHANCED_FRAME_EN | +DPCD_LANE_COUNT_SET (data));else analogix_dp_write_byte_to_dpcd (dp,DP_LANE_COUNT_SET , -DPCD_LANE_COUNT_SET (data)); +DPCD_LANE_COUNT_SET (data)); }static int analogix_dp_is_enhanced_mode_available (struct analogix_dp_device *dp)
@@ -248,13 +244,13 @@ static void analogix_dp_training_pattern_dis(struct analogix_dp_device *dp) {analogix_dp_set_training_pattern (dp,DP_NONE ); -analogix_dp_write_byte_to_dpcd (dp, -DP_TRAINING_PATTERN_SET , -DP_TRAINING_PATTERN_DISABLE ); +analogix_dp_write_byte_to_dpcd (dp,DP_TRAINING_PATTERN_SET , +DP_TRAINING_PATTERN_DISABLE ); } -static void analogix_dp_set_lane_lane_pre_emphasis (struct analogix_dp_device *dp, -int pre_emphasis,int lane) +static void +analogix_dp_set_lane_lane_pre_emphasis (struct analogix_dp_device *dp, +int pre_emphasis,int lane) {switch (lane) {case 0 :
@@ -294,8 +290,7 @@ static int analogix_dp_link_start(struct analogix_dp_device *dp)/* Setup RX configuration */ buf[0 ] = dp->link_train.link_rate; buf[1 ] = dp->link_train.lane_count; - retval =analogix_dp_write_bytes_to_dpcd (dp,DP_LINK_BW_SET , -2 , buf); + retval =analogix_dp_write_bytes_to_dpcd (dp,DP_LINK_BW_SET ,2 , buf);if (retval)return retval;
@@ -331,7 +326,7 @@ static int analogix_dp_link_start(struct analogix_dp_device *dp)DP_TRAIN_VOLTAGE_SWING_LEVEL_0 ; retval =analogix_dp_write_bytes_to_dpcd (dp,DP_TRAINING_LANE0_SET , - lane_count, buf); + lane_count, buf);return retval; }
@@ -339,7 +334,7 @@ static int analogix_dp_link_start(struct analogix_dp_device *dp)static unsigned char analogix_dp_get_lane_status (u8 link_status[2 ],int lane) {int shift = (lane &1 ) *4 ; -u8 link_value = link_status[lane>>1 ]; +u8 link_value = link_status[lane >>1 ];return (link_value >> shift) &0xf ; }
@@ -358,7 +353,7 @@ static int analogix_dp_clock_recovery_ok(u8 link_status[2], int lane_count) }static int analogix_dp_channel_eq_ok (u8 link_status[2 ],u8 link_align, -int lane_count) +int lane_count) {int lane;u8 lane_status;
@@ -376,11 +371,11 @@ static int analogix_dp_channel_eq_ok(u8 link_status[2], u8 link_align,return 0 ; } -static unsigned char analogix_dp_get_adjust_request_voltage (u8 adjust_request[2 ], -int lane) +static unsigned char +analogix_dp_get_adjust_request_voltage (u8 adjust_request[2 ],int lane) {int shift = (lane &1 ) *4 ; -u8 link_value = adjust_request[lane>>1 ]; +u8 link_value = adjust_request[lane >>1 ];return (link_value >> shift) &0x3 ; }
@@ -390,13 +385,13 @@ static unsigned char analogix_dp_get_adjust_request_pre_emphasis( int lane) {int shift = (lane &1 ) *4 ; -u8 link_value = adjust_request[lane>>1 ]; +u8 link_value = adjust_request[lane >>1 ];return ((link_value >> shift) &0xc ) >>2 ; }static void analogix_dp_set_lane_link_training (struct analogix_dp_device *dp, -u8 training_lane_set,int lane) +u8 training_lane_set,int lane) {switch (lane) {case 0 :
@@ -416,9 +411,9 @@ static void analogix_dp_set_lane_link_training(struct analogix_dp_device *dp, } } -static unsigned int analogix_dp_get_lane_link_training ( -struct analogix_dp_device *dp, -int lane) +static unsigned int +analogix_dp_get_lane_link_training (struct analogix_dp_device *dp, +int lane) {u32 reg;
@@ -452,7 +447,7 @@ static void analogix_dp_reduce_link_rate(struct analogix_dp_device *dp) }static void analogix_dp_get_adjust_training_lane (struct analogix_dp_device *dp, -u8 adjust_request[2 ]) +u8 adjust_request[2 ]) {int lane, lane_count;u8 voltage_swing, pre_emphasis, training_lane;
@@ -625,7 +620,7 @@ static int analogix_dp_process_equalizer_training(struct analogix_dp_device *dp) }static void analogix_dp_get_max_rx_bandwidth (struct analogix_dp_device *dp, -u8 *bandwidth) +u8 *bandwidth) {u8 data;
@@ -638,7 +633,7 @@ static void analogix_dp_get_max_rx_bandwidth(struct analogix_dp_device *dp, }static void analogix_dp_get_max_rx_lane_count (struct analogix_dp_device *dp, -u8 *lane_count) +u8 *lane_count) {u8 data;
@@ -651,8 +646,8 @@ static void analogix_dp_get_max_rx_lane_count(struct analogix_dp_device *dp, }static void analogix_dp_init_training (struct analogix_dp_device *dp, -enum link_lane_count_type max_lane, -enum link_rate_type max_rate) +enum link_lane_count_type max_lane, +enum link_rate_type max_rate) {/* * MACRO_RST must be applied after the PLL_LOCK to avoid
@@ -665,7 +660,7 @@ static void analogix_dp_init_training(struct analogix_dp_device *dp,analogix_dp_get_max_rx_lane_count (dp, &dp->link_train.lane_count);if ((dp->link_train.link_rate !=LINK_RATE_1_62GBPS ) && - (dp->link_train.link_rate !=LINK_RATE_2_70GBPS )) { + (dp->link_train.link_rate !=LINK_RATE_2_70GBPS )) {dev_err (dp->dev,"Rx Max Link Rate is abnormal :%x !\n" , dp->link_train.link_rate); dp->link_train.link_rate =LINK_RATE_1_62GBPS ;
@@ -725,8 +720,7 @@ static int analogix_dp_sw_link_training(struct analogix_dp_device *dp) }static int analogix_dp_set_link_train (struct analogix_dp_device *dp, -u32 count, -u32 bwtype) +u32 count,u32 bwtype) {int i;int retval;
@@ -762,7 +756,7 @@ static int analogix_dp_config_video(struct analogix_dp_device *dp) timeout_loop++;if (analogix_dp_is_slave_video_stream_clock_on (dp) ==0 )break ; -if (DP_TIMEOUT_LOOP_COUNT < timeout_loop) { +if (timeout_loop >DP_TIMEOUT_LOOP_COUNT ) {dev_err (dp->dev,"Timeout of video streamclk ok\n" );return -ETIMEDOUT ; }
@@ -793,7 +787,7 @@ static int analogix_dp_config_video(struct analogix_dp_device *dp) }else if (done_count) { done_count =0 ; } -if (DP_TIMEOUT_LOOP_COUNT < timeout_loop) { +if (timeout_loop >DP_TIMEOUT_LOOP_COUNT ) {dev_err (dp->dev,"Timeout of video streamclk ok\n" );return -ETIMEDOUT ; }
@@ -807,25 +801,24 @@ static int analogix_dp_config_video(struct analogix_dp_device *dp)return retval; } -static void analogix_dp_enable_scramble (struct analogix_dp_device *dp,bool enable) +static void analogix_dp_enable_scramble (struct analogix_dp_device *dp, +bool enable) {u8 data;if (enable) {analogix_dp_enable_scrambling (dp); -analogix_dp_read_byte_from_dpcd (dp, -DP_TRAINING_PATTERN_SET , - &data); +analogix_dp_read_byte_from_dpcd (dp,DP_TRAINING_PATTERN_SET , + &data);analogix_dp_write_byte_to_dpcd (dp,DP_TRAINING_PATTERN_SET , (u8)(data & ~DP_LINK_SCRAMBLING_DISABLE )); }else {analogix_dp_disable_scrambling (dp); -analogix_dp_read_byte_from_dpcd (dp, -DP_TRAINING_PATTERN_SET , - &data); +analogix_dp_read_byte_from_dpcd (dp,DP_TRAINING_PATTERN_SET , + &data);analogix_dp_write_byte_to_dpcd (dp,DP_TRAINING_PATTERN_SET , (u8)(data |DP_LINK_SCRAMBLING_DISABLE ));
@@ -898,7 +891,7 @@ static void analogix_dp_commit(struct analogix_dp_device *dp) } ret =analogix_dp_set_link_train (dp, dp->video_info->lane_count, - dp->video_info->link_rate); + dp->video_info->link_rate);if (ret) {dev_err (dp->dev,"unable to do link train\n" );return ;
@@ -1130,8 +1123,8 @@ static struct video_info *analogix_dp_dt_parse_pdata(struct device *dev)struct device_node *dp_node = dev->of_node;struct video_info *dp_video_config; - dp_video_config =devm_kzalloc (dev, -sizeof (*dp_video_config),GFP_KERNEL ); + dp_video_config =devm_kzalloc (dev,sizeof (*dp_video_config), +GFP_KERNEL );if (!dp_video_config)return ERR_PTR (-ENOMEM );
@@ -1145,37 +1138,37 @@ static struct video_info *analogix_dp_dt_parse_pdata(struct device *dev)of_property_read_bool (dp_node,"interlaced" );if (of_property_read_u32 (dp_node,"samsung,color-space" , - &dp_video_config->color_space)) { + &dp_video_config->color_space)) {dev_err (dev,"failed to get color-space\n" );return ERR_PTR (-EINVAL ); }if (of_property_read_u32 (dp_node,"samsung,dynamic-range" , - &dp_video_config->dynamic_range)) { + &dp_video_config->dynamic_range)) {dev_err (dev,"failed to get dynamic-range\n" );return ERR_PTR (-EINVAL ); }if (of_property_read_u32 (dp_node,"samsung,ycbcr-coeff" , - &dp_video_config->ycbcr_coeff)) { + &dp_video_config->ycbcr_coeff)) {dev_err (dev,"failed to get ycbcr-coeff\n" );return ERR_PTR (-EINVAL ); }if (of_property_read_u32 (dp_node,"samsung,color-depth" , - &dp_video_config->color_depth)) { + &dp_video_config->color_depth)) {dev_err (dev,"failed to get color-depth\n" );return ERR_PTR (-EINVAL ); }if (of_property_read_u32 (dp_node,"samsung,link-rate" , - &dp_video_config->link_rate)) { + &dp_video_config->link_rate)) {dev_err (dev,"failed to get link-rate\n" );return ERR_PTR (-EINVAL ); }if (of_property_read_u32 (dp_node,"samsung,lane-count" , - &dp_video_config->lane_count)) { + &dp_video_config->lane_count)) {dev_err (dev,"failed to get lane-count\n" );return ERR_PTR (-EINVAL ); }
@@ -1284,7 +1277,7 @@ int analogix_dp_bind(struct device *dev, struct drm_device *drm_dev,pm_runtime_enable (dev); ret =devm_request_irq (&pdev->dev, dp->irq, analogix_dp_irq_handler, - irq_flags,"analogix-dp" , dp); + irq_flags,"analogix-dp" , dp);if (ret) {dev_err (&pdev->dev,"failed to request irq\n" ); goto err_disable_pm_runtime;
drivers/gpu/drm/bridge/analogix/analogix_dp_core.h +39 -33
100 lines not on this page · raw message
drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c +63 -61
304 lines not on this page · raw message
drivers/gpu/drm/exynos/exynos_dp.c +2 -2
@@ -204,7 +204,7 @@ static int exynos_dp_bind(struct device *dev, struct device *master, void *data) }static void exynos_dp_unbind (struct device *dev,struct device *master, -void *data) +void *data) {return analogix_dp_unbind (dev, master, data); }
@@ -221,7 +221,7 @@ static int exynos_dp_probe(struct platform_device *pdev)struct exynos_dp_device *dp; dp =devm_kzalloc (&pdev->dev,sizeof (struct exynos_dp_device ), -GFP_KERNEL ); +GFP_KERNEL );if (!dp)return -ENOMEM ;
Signature · 1 line
2.6.4
PATCH v14 5/17 drm: bridge: analogix/dp: remove duplicate configuration of link rate and link count
In reply to Yakir Yanglink_rate and lane_count already configured in analogix_dp_set_link_train(), so we don't need to config those repeatly after training finished, just remove them out.
Beside Display Port 1.2 already support 5.4Gbps link rate, the maximum sets would change from {1.62Gbps, 2.7Gbps} to {1.62Gbps, 2.7Gbps, 5.4Gbps}.
---
Changes in v14: None
Changes in v13: None
Changes in v12:
- Remove the enum link_rate_type struct, using the marcos in drm_dp_helper.h (Jingoo)
Changes in v11: None
Changes in v10: None
Changes in v9: None
Changes in v8: None
Changes in v7: None
Changes in v6: None
Changes in v5: None
Changes in v4:
- Update commit message more readable. (Jingoo)
- Adjust the order from 05 to 04
Changes in v3:
- The link_rate and lane_count shouldn't config to the DT property value directly, but we can take those as hardware limite. For example, RK3288 only support 4 physical lanes of 2.7/1.62 Gbps/lane, so DT property would like "link-rate = 0x0a" "lane-count = 4". (Thierry)
Changes in v2: None
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 14 +++++++------- drivers/gpu/drm/bridge/analogix/analogix_dp_core.h | 7 +------ drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 2 +- 3 files changed, 9 insertions(+), 14 deletions(-)
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +7 -7
@@ -627,6 +627,8 @@ static void analogix_dp_get_max_rx_bandwidth(struct analogix_dp_device *dp,/* * For DP rev.1.1, Maximum link rate of Main Link lanes * 0x06 = 1.62 Gbps, 0x0a = 2.7 Gbps +* For DP rev.1.2, Maximum link rate of Main Link lanes +* 0x06 = 1.62 Gbps, 0x0a = 2.7 Gbps, 0x14 = 5.4Gbps */ analogix_dp_read_byte_from_dpcd (dp,DP_MAX_LINK_RATE , &data); *bandwidth = data;
@@ -647,7 +649,7 @@ static void analogix_dp_get_max_rx_lane_count(struct analogix_dp_device *dp,static void analogix_dp_init_training (struct analogix_dp_device *dp,enum link_lane_count_type max_lane, -enum link_rate_type max_rate) +int max_rate) {/* * MACRO_RST must be applied after the PLL_LOCK to avoid
@@ -659,11 +661,12 @@ static void analogix_dp_init_training(struct analogix_dp_device *dp,analogix_dp_get_max_rx_bandwidth (dp, &dp->link_train.link_rate);analogix_dp_get_max_rx_lane_count (dp, &dp->link_train.lane_count); -if ((dp->link_train.link_rate !=LINK_RATE_1_62GBPS ) && - (dp->link_train.link_rate !=LINK_RATE_2_70GBPS )) { +if ((dp->link_train.link_rate !=DP_LINK_BW_1_62 ) && + (dp->link_train.link_rate !=DP_LINK_BW_2_7 ) && + (dp->link_train.link_rate !=DP_LINK_BW_5_4 )) {dev_err (dp->dev,"Rx Max Link Rate is abnormal :%x !\n" , dp->link_train.link_rate); - dp->link_train.link_rate =LINK_RATE_1_62GBPS ; + dp->link_train.link_rate =DP_LINK_BW_1_62 ; }if (dp->link_train.lane_count ==0 ) {
@@ -901,9 +904,6 @@ static void analogix_dp_commit(struct analogix_dp_device *dp)analogix_dp_enable_rx_to_enhanced_mode (dp,1 );analogix_dp_enable_enhanced_mode (dp,1 ); -analogix_dp_set_lane_count (dp, dp->video_info->lane_count); -analogix_dp_set_link_bandwidth (dp, dp->video_info->link_rate); -analogix_dp_init_video (dp); ret =analogix_dp_config_video (dp);if (ret)
drivers/gpu/drm/bridge/analogix/analogix_dp_core.h +1 -6
@@ -20,11 +20,6 @@#define MAX_CR_LOOP 5#define MAX_EQ_LOOP 5 -enum link_rate_type { -LINK_RATE_1_62GBPS =0x06 , -LINK_RATE_2_70GBPS =0x0a -}; -enum link_lane_count_type {LANE_COUNT1 =1 ,LANE_COUNT2 =2 ,
@@ -128,7 +123,7 @@ struct video_info {enum color_coefficient ycbcr_coeff;enum color_depth color_depth; -enum link_rate_type link_rate; +int link_rate;enum link_lane_count_type lane_count; };
drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c +1 -1
@@ -855,7 +855,7 @@ void analogix_dp_set_link_bandwidth(struct analogix_dp_device *dp, u32 bwtype)u32 reg; reg = bwtype; -if ((bwtype ==LINK_RATE_2_70GBPS ) || (bwtype ==LINK_RATE_1_62GBPS )) +if ((bwtype ==DP_LINK_BW_2_7 ) || (bwtype ==DP_LINK_BW_1_62 ))writel (reg, dp->reg_base +ANALOGIX_DP_LINK_BW_SET ); }
Signature · 1 line
1.9.1
PATCH v14 6/17 drm: bridge: analogix/dp: dynamic parse sync_pol & interlace & dynamic_range
In reply to Yakir YangBoth hsync/vsync polarity and interlace mode can be parsed from drm display mode, and dynamic_range and ycbcr_coeff can be judge by the video code.
But presumably Exynos still relies on the DT properties, so take good use of mode_fixup() in to achieve the compatibility hacks.
---
Changes in v14: None
Changes in v13: None
Changes in v12: None
Changes in v11: None
Changes in v10: None
Changes in v9: None
Changes in v8: None
Changes in v7:
- Back to use the of_property_read_bool() interfacs to provoid backward compatibility of "hsync-active-high" "vsync-active-high" "interlaced" to avoid -EOVERFLOW error (Krzysztof)
Changes in v6: None
Changes in v5:
- Switch video timing type to "u32", so driver could use "of_property_read_u32" to get the backword timing values. Krzysztof suggest me that driver could use the "of_property_read_bool" to get backword timing values, but that interfacs would modify the original drm_display_mode timing directly (whether those properties exists or not).
Changes in v4:
- Provide backword compatibility with samsung. (Krzysztof)
Changes in v3:
- Dynamic parse video timing info from struct drm_display_mode and struct drm_display_info. (Thierry)
Changes in v2: None
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 148 +++++++++++++-------- drivers/gpu/drm/bridge/analogix/analogix_dp_core.h | 2 +- drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 14 +- 3 files changed, 103 insertions(+), 61 deletions(-)
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +95 -53
@@ -893,8 +893,8 @@ static void analogix_dp_commit(struct analogix_dp_device *dp)return ; } - ret =analogix_dp_set_link_train (dp, dp->video_info->lane_count, - dp->video_info->link_rate); + ret =analogix_dp_set_link_train (dp, dp->video_info.lane_count, + dp->video_info.link_rate);if (ret) {dev_err (dp->dev,"unable to do link train\n" );return ;
@@ -1077,6 +1077,85 @@ static void analogix_dp_bridge_disable(struct drm_bridge *bridge) dp->dpms_mode =DRM_MODE_DPMS_OFF ; } +static void analogix_dp_bridge_mode_set (struct drm_bridge *bridge, +struct drm_display_mode *orig_mode, +struct drm_display_mode *mode) +{ +struct analogix_dp_device *dp = bridge->driver_private; +struct drm_display_info *display_info = &dp->connector.display_info; +struct video_info *video = &dp->video_info; +struct device_node *dp_node = dp->dev->of_node; +int vic; + +/* Input video interlaces & hsync pol & vsync pol */ + video->interlaced = !!(mode->flags &DRM_MODE_FLAG_INTERLACE ); + video->v_sync_polarity = !!(mode->flags &DRM_MODE_FLAG_NVSYNC ); + video->h_sync_polarity = !!(mode->flags &DRM_MODE_FLAG_NHSYNC ); + +/* Input video dynamic_range & colorimetry */ + vic =drm_match_cea_mode (mode); +if ((vic ==6 ) || (vic ==7 ) || (vic ==21 ) || (vic ==22 ) || + (vic ==2 ) || (vic ==3 ) || (vic ==17 ) || (vic ==18 )) { + video->dynamic_range =CEA ; + video->ycbcr_coeff =COLOR_YCBCR601 ; + }else if (vic) { + video->dynamic_range =CEA ; + video->ycbcr_coeff =COLOR_YCBCR709 ; + }else { + video->dynamic_range =VESA ; + video->ycbcr_coeff =COLOR_YCBCR709 ; + } + +/* Input vide bpc and color_formats */ +switch (display_info->bpc) { +case 12 : + video->color_depth =COLOR_12 ; +break ; +case 10 : + video->color_depth =COLOR_10 ; +break ; +case 8 : + video->color_depth =COLOR_8 ; +break ; +case 6 : + video->color_depth =COLOR_6 ; +break ; +default : + video->color_depth =COLOR_8 ; +break ; + } +if (display_info->color_formats &DRM_COLOR_FORMAT_YCRCB444 ) + video->color_space =COLOR_YCBCR444 ; +else if (display_info->color_formats &DRM_COLOR_FORMAT_YCRCB422 ) + video->color_space =COLOR_YCBCR422 ; +else if (display_info->color_formats &DRM_COLOR_FORMAT_RGB444 ) + video->color_space =COLOR_RGB ; +else + video->color_space =COLOR_RGB ; + +/* +* NOTE: those property parsing code is used for providing backward +* compatibility for samsung platform. +* Due to we used the "of_property_read_u32" interfaces, when this +* property isn't present, the "video_info" can keep the original +* values and wouldn't be modified. +*/ +of_property_read_u32 (dp_node,"samsung,color-space" , + &video->color_space); +of_property_read_u32 (dp_node,"samsung,dynamic-range" , + &video->dynamic_range); +of_property_read_u32 (dp_node,"samsung,ycbcr-coeff" , + &video->ycbcr_coeff); +of_property_read_u32 (dp_node,"samsung,color-depth" , + &video->color_depth); +if (of_property_read_bool (dp_node,"hsync-active-high" )) + video->h_sync_polarity = true; +if (of_property_read_bool (dp_node,"vsync-active-high" )) + video->v_sync_polarity = true; +if (of_property_read_bool (dp_node,"interlaced" )) + video->interlaced = true; +} +static void analogix_dp_bridge_nop (struct drm_bridge *bridge) {/* do nothing */
@@ -1087,6 +1166,7 @@ static const struct drm_bridge_funcs analogix_dp_bridge_funcs = { .disable = analogix_dp_bridge_disable, .pre_enable = analogix_dp_bridge_nop, .post_disable = analogix_dp_bridge_nop, + .mode_set = analogix_dp_bridge_mode_set, .attach = analogix_dp_bridge_attach, };
@@ -1118,62 +1198,24 @@ static int analogix_dp_create_bridge(struct drm_device *drm_dev,return 0 ; } -static struct video_info *analogix_dp_dt_parse_pdata (struct device *dev) +static int analogix_dp_dt_parse_pdata (struct analogix_dp_device *dp) { -struct device_node *dp_node = dev->of_node; -struct video_info *dp_video_config; - - dp_video_config =devm_kzalloc (dev,sizeof (*dp_video_config), -GFP_KERNEL ); -if (!dp_video_config) -return ERR_PTR (-ENOMEM ); - - dp_video_config->h_sync_polarity = -of_property_read_bool (dp_node,"hsync-active-high" ); - - dp_video_config->v_sync_polarity = -of_property_read_bool (dp_node,"vsync-active-high" ); - - dp_video_config->interlaced = -of_property_read_bool (dp_node,"interlaced" ); - -if (of_property_read_u32 (dp_node,"samsung,color-space" , - &dp_video_config->color_space)) { -dev_err (dev,"failed to get color-space\n" ); -return ERR_PTR (-EINVAL ); - } - -if (of_property_read_u32 (dp_node,"samsung,dynamic-range" , - &dp_video_config->dynamic_range)) { -dev_err (dev,"failed to get dynamic-range\n" ); -return ERR_PTR (-EINVAL ); - } - -if (of_property_read_u32 (dp_node,"samsung,ycbcr-coeff" , - &dp_video_config->ycbcr_coeff)) { -dev_err (dev,"failed to get ycbcr-coeff\n" ); -return ERR_PTR (-EINVAL ); - } - -if (of_property_read_u32 (dp_node,"samsung,color-depth" , - &dp_video_config->color_depth)) { -dev_err (dev,"failed to get color-depth\n" ); -return ERR_PTR (-EINVAL ); - } +struct device_node *dp_node = dp->dev->of_node; +struct video_info *video_info = &dp->video_info;if (of_property_read_u32 (dp_node,"samsung,link-rate" , - &dp_video_config->link_rate)) { -dev_err (dev,"failed to get link-rate\n" ); -return ERR_PTR (-EINVAL ); + &video_info->link_rate)) { +dev_err (dp->dev,"failed to get link-rate\n" ); +return -EINVAL ; }if (of_property_read_u32 (dp_node,"samsung,lane-count" , - &dp_video_config->lane_count)) { -dev_err (dev,"failed to get lane-count\n" ); -return ERR_PTR (-EINVAL ); + &video_info->lane_count)) { +dev_err (dp->dev,"failed to get lane-count\n" ); +return -EINVAL ; } -return dp_video_config; +return 0 ; } int analogix_dp_bind(struct device *dev, struct drm_device *drm_dev,
@@ -1206,9 +1248,9 @@ int analogix_dp_bind(struct device *dev, struct drm_device *drm_dev,*/ dp->plat_data = plat_data; - dp->video_info =analogix_dp_dt_parse_pdata (&pdev->dev); -if (IS_ERR (dp->video_info)) -return PTR_ERR (dp->video_info); + ret =analogix_dp_dt_parse_pdata (dp); +if (ret) +return ret; dp->phy =devm_phy_get (dp->dev,"dp" );if (IS_ERR (dp->phy)) {
drivers/gpu/drm/bridge/analogix/analogix_dp_core.h +1 -1
@@ -148,7 +148,7 @@ struct analogix_dp_device {unsigned int irq;void __iomem *reg_base; -struct video_info *video_info; +struct video_info video_info;struct link_train link_train;struct work_struct hotplug_work;struct phy *phy;
drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c +7 -7
@@ -1084,15 +1084,15 @@ void analogix_dp_set_video_color_format(struct analogix_dp_device *dp)u32 reg;/* Configure the input color depth, color space, dynamic range */ - reg = (dp->video_info->dynamic_range <<IN_D_RANGE_SHIFT ) | - (dp->video_info->color_depth <<IN_BPC_SHIFT ) | - (dp->video_info->color_space <<IN_COLOR_F_SHIFT ); + reg = (dp->video_info.dynamic_range <<IN_D_RANGE_SHIFT ) | + (dp->video_info.color_depth <<IN_BPC_SHIFT ) | + (dp->video_info.color_space <<IN_COLOR_F_SHIFT );writel (reg, dp->reg_base +ANALOGIX_DP_VIDEO_CTL_2 );/* Set Input Color YCbCr Coefficients to ITU601 or ITU709 */ reg =readl (dp->reg_base +ANALOGIX_DP_VIDEO_CTL_3 ); reg &= ~IN_YC_COEFFI_MASK ; -if (dp->video_info->ycbcr_coeff) +if (dp->video_info.ycbcr_coeff) reg |=IN_YC_COEFFI_ITU709 ;else reg |=IN_YC_COEFFI_ITU601 ;
@@ -1229,17 +1229,17 @@ void analogix_dp_config_video_slave_mode(struct analogix_dp_device *dp) reg =readl (dp->reg_base +ANALOGIX_DP_VIDEO_CTL_10 ); reg &= ~INTERACE_SCAN_CFG ; - reg |= (dp->video_info->interlaced <<2 ); + reg |= (dp->video_info.interlaced <<2 );writel (reg, dp->reg_base +ANALOGIX_DP_VIDEO_CTL_10 ); reg =readl (dp->reg_base +ANALOGIX_DP_VIDEO_CTL_10 ); reg &= ~VSYNC_POLARITY_CFG ; - reg |= (dp->video_info->v_sync_polarity <<1 ); + reg |= (dp->video_info.v_sync_polarity <<1 );writel (reg, dp->reg_base +ANALOGIX_DP_VIDEO_CTL_10 ); reg =readl (dp->reg_base +ANALOGIX_DP_VIDEO_CTL_10 ); reg &= ~HSYNC_POLARITY_CFG ; - reg |= (dp->video_info->h_sync_polarity <<0 ); + reg |= (dp->video_info.h_sync_polarity <<0 );writel (reg, dp->reg_base +ANALOGIX_DP_VIDEO_CTL_10 ); reg =AUDIO_MODE_SPDIF_MODE |VIDEO_MODE_SLAVE_MODE ;
Signature · 1 line
1.9.1
PATCH v14 7/17 dt-bindings: add document for analogix display port driver
In reply to Yakir YangAnalogix dp driver is split from exynos dp driver, so we just make an copy of exynos_dp.txt, and then simplify exynos_dp.txt
Beside update some exynos dtsi file with the latest change according to the devicetree binding documents.
---
Changes in v14: None
Changes in v13: None
Changes in v12: None
Changes in v11: None
Changes in v10:
- Add the ack from Rob Herring
Changes in v9: None
Changes in v8:
- Correct the right document path of display-timing.txt (Heiko)
- Correct the misspell of 'from' to 'frm'. (Heiko)
Changes in v7: None
Changes in v6: None
Changes in v5: None
Changes in v4:
- Split all DTS changes, and provide backward compatibility. Mark old properties as deprecated but still support them. (Krzysztof)
- Update "analogix,hpd-gpio" to "hpd-gpios" prop name. (Rob)
- Deprecated some properties which could parsed from Edid/Mode/DPCD. (Thierry)
"analogix,color-space" & "analogix,color-depth" &
"analogix,link-rate" & "analogix,lane-count" &
"analogix,ycbcr-coeff" & "analogix,dynamic-range" &
"vsync-active-high" & "hsync-active-high" & "interlaces"
Changes in v3:
- Add devicetree binding documents. (Heiko)
- Remove sync pol & colorimetry properies from the new analogix dp driver devicetree binding. (Thierry)
- Update the exist exynos dtsi file with the latest DP DT properies.
Changes in v2: None
.../bindings/display/bridge/analogix_dp.txt | 50 ++++++++++++ .../bindings/display/exynos/exynos_dp.txt | 92 ++++++---------------- 2 files changed, 76 insertions(+), 66 deletions(-) create mode 100644 Documentation/devicetree/bindings/display/bridge/analogix_dp.txt
Documentation/devicetree/bindings/display/bridge/analogix_dp.txt new file +50 -0
@@ -0,0 +1,50 @@ +Analogix Display Port bridge bindings + +Required properties for dp-controller: + -compatible: + platform specific such as: + * "samsung,exynos5-dp" + * "rockchip,rk3288-dp" + -reg: + physical base address of the controller and length + of memory mapped region. + -interrupts: + interrupt combiner values. + -clocks: + from common clock binding: handle to dp clock. + -clock-names: + from common clock binding: Shall be "dp". + -interrupt-parent: + phandle to Interrupt combiner node. + -phys: + from general PHY binding: the phandle for the PHY device. + -phy-names: + from general PHY binding: Should be "dp". + +Optional properties for dp-controller: + -hpd-gpios: + Hotplug detect GPIO. + Indicates which GPIO should be used for hotplug detection + -port@[X]: SoC specific port nodes with endpoint definitions as defined + in Documentation/devicetree/bindings/media/video-interfaces.txt, + please refer to the SoC specific binding document: + * Documentation/devicetree/bindings/display/exynos/exynos_dp.txt + * Documentation/devicetree/bindings/video/analogix_dp-rockchip.txt + + +[1]: Documentation/devicetree/bindings/media/video-interfaces.txt +------------------------------------------------------------------------------- + +Example: + + dp-controller { + compatible = "samsung,exynos5-dp"; + reg = <0x145b0000 0x10000>; + interrupts = <10 3>; + interrupt-parent = <&combiner>; + clocks = <&clock 342>; + clock-names = "dp"; + + phys = <&dp_phy>; + phy-names = "dp"; + };
Documentation/devicetree/bindings/display/exynos/exynos_dp.txt +26 -66
120 lines not on this page · raw message
Signature · 1 line
1.9.1
PATCH v14 8/17 ARM: dts: exynos/dp: remove some properties that deprecated by analogix_dp driver
In reply to Yakir YangAfter exynos_dp have been split the common IP code into analogix_dp driver, the analogix_dp driver have deprecated some Samsung platform properties which could be dynamically parsed from EDID/MODE/DPCD message, so this is an update for Exynos DTS file for dp-controller.
Beside the backward compatibility is fully preserved, so there are no bisectability break that make this change in a separate patch.
---
Changes in v14: None
Changes in v13: None
Changes in v12: None
Changes in v11: None
Changes in v10: None
Changes in v9: None
Changes in v8: None
Changes in v7: None
Changes in v6:
- Fix Peach Pit hpd property name error:
- hpd-gpio = <&gpx2 6 0>;
+ hpd-gpios = <&gpx2 6 0>;
Changes in v5:
- Correct the misspell in commit message. (Krzysztof)
Changes in v4:
- Separate all DTS changes to a separate patch. (Krzysztof)
Changes in v3: None
Changes in v2: None
arch/arm/boot/dts/exynos5250-arndale.dts | 2 -- arch/arm/boot/dts/exynos5250-smdk5250.dts | 2 -- arch/arm/boot/dts/exynos5250-snow-common.dtsi | 4 +--- arch/arm/boot/dts/exynos5250-spring.dts | 4 +--- arch/arm/boot/dts/exynos5420-peach-pit.dts | 4 +--- arch/arm/boot/dts/exynos5420-smdk5420.dts | 2 -- arch/arm/boot/dts/exynos5800-peach-pi.dts | 2 -- 7 files changed, 3 insertions(+), 17 deletions(-)
arch/arm/boot/dts/exynos5250-arndale.dts +0 -2
@@ -124,8 +124,6 @@ &dp { status = "okay"; samsung,color-space = <0>; - samsung,dynamic-range = <0>; - samsung,ycbcr-coeff = <0>; samsung,color-depth = <1>; samsung,link-rate = <0x0a>; samsung,lane-count = <4>;
arch/arm/boot/dts/exynos5250-smdk5250.dts +0 -2
@@ -80,8 +80,6 @@ &dp { samsung,color-space = <0>; - samsung,dynamic-range = <0>; - samsung,ycbcr-coeff = <0>; samsung,color-depth = <1>; samsung,link-rate = <0x0a>; samsung,lane-count = <4>;
arch/arm/boot/dts/exynos5250-snow-common.dtsi +1 -3
@@ -236,12 +236,10 @@ pinctrl-names = "default"; pinctrl-0 = <&dp_hpd>; samsung,color-space = <0>; - samsung,dynamic-range = <0>; - samsung,ycbcr-coeff = <0>; samsung,color-depth = <1>; samsung,link-rate = <0x0a>; samsung,lane-count = <2>; - samsung,hpd-gpio = <&gpx0 7 GPIO_ACTIVE_HIGH>; + hpd-gpios = <&gpx0 7 GPIO_ACTIVE_HIGH>; ports { port@0 {
arch/arm/boot/dts/exynos5250-spring.dts +1 -3
@@ -74,12 +74,10 @@ pinctrl-names = "default"; pinctrl-0 = <&dp_hpd_gpio>; samsung,color-space = <0>; - samsung,dynamic-range = <0>; - samsung,ycbcr-coeff = <0>; samsung,color-depth = <1>; samsung,link-rate = <0x0a>; samsung,lane-count = <1>; - samsung,hpd-gpio = <&gpc3 0 GPIO_ACTIVE_HIGH>; + hpd-gpios = <&gpc3 0 GPIO_ACTIVE_HIGH>; }; &ehci {
arch/arm/boot/dts/exynos5420-peach-pit.dts +1 -3
@@ -148,12 +148,10 @@ pinctrl-names = "default"; pinctrl-0 = <&dp_hpd_gpio>; samsung,color-space = <0>; - samsung,dynamic-range = <0>; - samsung,ycbcr-coeff = <0>; samsung,color-depth = <1>; samsung,link-rate = <0x06>; samsung,lane-count = <2>; - samsung,hpd-gpio = <&gpx2 6 GPIO_ACTIVE_HIGH>; + hpd-gpios = <&gpx2 6 GPIO_ACTIVE_HIGH>; ports { port@0 {
arch/arm/boot/dts/exynos5420-smdk5420.dts +0 -2
@@ -93,8 +93,6 @@ pinctrl-names = "default"; pinctrl-0 = <&dp_hpd>; samsung,color-space = <0>; - samsung,dynamic-range = <0>; - samsung,ycbcr-coeff = <0>; samsung,color-depth = <1>; samsung,link-rate = <0x0a>; samsung,lane-count = <4>;
arch/arm/boot/dts/exynos5800-peach-pi.dts +0 -2
@@ -148,8 +148,6 @@ pinctrl-names = "default"; pinctrl-0 = <&dp_hpd_gpio>; samsung,color-space = <0>; - samsung,dynamic-range = <0>; - samsung,ycbcr-coeff = <0>; samsung,color-depth = <1>; samsung,link-rate = <0x0a>; samsung,lane-count = <2>;
Signature · 1 line
1.9.1
PATCH v14 9/17 drm: rockchip: dp: add rockchip platform dp driver
In reply to Yakir YangRockchip have three clocks for dp controller, we leave pclk_edp to analogix_dp driver control, and keep the sclk_edp_24m and sclk_edp in platform driver.
---
Changes in v14: None
Changes in v13:
- Use .enable instead of preprare/commit in encoder_helper_funcs (Heiko)
- Fix the missing parameters with drm_encoder_init() helper function. (Heiko)
Changes in v12: None
Changes in v11: None
Changes in v10:
- Correct the ROCKCHIP_ANALOGIX_DP indentation in Kconfig to tabs here (Heiko)
Changes in v9: None
Changes in v8: None
Changes in v7: None
Changes in v6: None
Changes in v5:
- Remove the empty line at the end of document, and correct the endpoint numbers in the example DT node, and remove the regulator iomux setting in driver code while using the pinctl in devicetree instead. (Heiko)
- Add device type declared, cause the previous "platform device type support (v4 11/16)" already merge into (v5 02/14).
- Implement connector registration code. (Thierry)
Changes in v4:
- Remove some deprecated DT properties in rockchip dp document.
Changes in v3:
- Leave "sclk_edp_24m" to rockchip dp phy driver which name to "24m", and leave "sclk_edp" to analogix dp core driver which name to "dp", and leave "pclk_edp" to rockchip dp platform driver which name to "pclk". (Thierry & Heiko)
- Add devicetree binding document. (Heiko)
- Remove "rockchip,panel" DT property, take use of remote point to get panel node. (Heiko)
- Add the new function point dp_platdata->get_modes() init.
Changes in v2:
- Get panel node with remote-endpoint method, and create devicetree binding for driver. (Heiko)
- Remove the clock enable/disbale with "sclk_edp" & "sclk_edp_24m", leave those clock to rockchip dp phy driver.
drivers/gpu/drm/rockchip/Kconfig | 9 + drivers/gpu/drm/rockchip/Makefile | 1 + drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 384 ++++++++++++++++++++++++ include/drm/bridge/analogix_dp.h | 1 + 4 files changed, 395 insertions(+) create mode 100644 drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
drivers/gpu/drm/rockchip/Kconfig +9 -0
@@ -35,3 +35,12 @@ config ROCKCHIP_DW_MIPI_DSI for the Synopsys DesignWare HDMI driver. If you want to enable MIPI DSI on RK3288 based SoC, you should selet this option. + +config ROCKCHIP_ANALOGIX_DP + tristate "Rockchip specific extensions for Analogix DP driver" + depends on DRM_ROCKCHIP + select DRM_ANALOGIX_DP + help + This selects support for Rockchip SoC specific extensions + for the Analogix Core DP driver. If you want to enable DP + on RK3288 based SoC, you should selet this option.
drivers/gpu/drm/rockchip/Makefile +1 -0
@@ -8,5 +8,6 @@ rockchipdrm-$(CONFIG_DRM_FBDEV_EMULATION) += rockchip_drm_fbdev.o obj-$(CONFIG_ROCKCHIP_DW_HDMI) += dw_hdmi-rockchip.o obj-$(CONFIG_ROCKCHIP_DW_MIPI_DSI) += dw-mipi-dsi.o +obj-$(CONFIG_ROCKCHIP_ANALOGIX_DP) += analogix_dp-rockchip.o obj-$(CONFIG_DRM_ROCKCHIP) += rockchipdrm.o rockchip_vop_reg.o
drivers/gpu/drm/rockchip/analogix_dp-rockchip.c new file +384 -0
384 lines not on this page · raw message
include/drm/bridge/analogix_dp.h +1 -0
@@ -15,6 +15,7 @@enum analogix_dp_devtype {EXYNOS_DP , +RK3288_DP , };struct analogix_dp_plat_data {
Signature · 1 line
1.9.1
Heiko Stübner
maintainerPATCH 9/17 drm: rockchip: dp: add rockchip platform dp driver
Rockchip have three clocks for dp controller, we leave pclk_edp to analogix_dp driver control, and keep the sclk_edp_24m and sclk_edp in platform driver.
---
Changes in v14.1:
- replace rockchip_drm_encoder_get_mux_id with the new drm_of_encoder_active_endpoint_id
Changes in v14: None
Changes in v13:
- Use .enable instead of preprare/commit in encoder_helper_funcs (Heiko)
- Fix the missing parameters with drm_encoder_init() helper function. (Heiko)
Changes in v12: None
Changes in v11: None
Changes in v10:
- Correct the ROCKCHIP_ANALOGIX_DP indentation in Kconfig to tabs here (Heiko)
Changes in v9: None
Changes in v8: None
Changes in v7: None
Changes in v6: None
Changes in v5:
- Remove the empty line at the end of document, and correct the endpoint numbers in the example DT node, and remove the regulator iomux setting in driver code while using the pinctl in devicetree instead. (Heiko)
- Add device type declared, cause the previous "platform device type support (v4 11/16)" already merge into (v5 02/14).
- Implement connector registration code. (Thierry)
Changes in v4:
- Remove some deprecated DT properties in rockchip dp document.
Changes in v3:
- Leave "sclk_edp_24m" to rockchip dp phy driver which name to "24m", and leave "sclk_edp" to analogix dp core driver which name to "dp", and leave "pclk_edp" to rockchip dp platform driver which name to "pclk". (Thierry & Heiko)
- Add devicetree binding document. (Heiko)
- Remove "rockchip,panel" DT property, take use of remote point to get panel node. (Heiko)
- Add the new function point dp_platdata->get_modes() init.
Changes in v2:
- Get panel node with remote-endpoint method, and create devicetree binding for driver. (Heiko)
- Remove the clock enable/disbale with "sclk_edp" & "sclk_edp_24m", leave those clock to rockchip dp phy driver.
drivers/gpu/drm/rockchip/Kconfig | 9 + drivers/gpu/drm/rockchip/Makefile | 1 + drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 384 ++++++++++++++++++++++++ include/drm/bridge/analogix_dp.h | 1 + 4 files changed, 395 insertions(+) create mode 100644 drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
drivers/gpu/drm/rockchip/Kconfig +9 -0
@@ -16,6 +16,15 @@ config DRM_ROCKCHIP 2D or 3D acceleration; acceleration is performed by other IP found on the SoC. +config ROCKCHIP_ANALOGIX_DP + tristate "Rockchip specific extensions for Analogix DP driver" + depends on DRM_ROCKCHIP + select DRM_ANALOGIX_DP + help + This selects support for Rockchip SoC specific extensions + for the Analogix Core DP driver. If you want to enable DP + on RK3288 based SoC, you should selet this option. + config ROCKCHIP_DW_HDMI tristate "Rockchip specific extensions for Synopsys DW HDMI" depends on DRM_ROCKCHIP
drivers/gpu/drm/rockchip/Makefile +1 -0
@@ -6,6 +6,7 @@ rockchipdrm-y := rockchip_drm_drv.o rockchip_drm_fb.o \ rockchip_drm_gem.o rockchip_drm_vop.o rockchipdrm-$(CONFIG_DRM_FBDEV_EMULATION) += rockchip_drm_fbdev.o +obj-$(CONFIG_ROCKCHIP_ANALOGIX_DP) += analogix_dp-rockchip.o obj-$(CONFIG_ROCKCHIP_DW_HDMI) += dw_hdmi-rockchip.o obj-$(CONFIG_ROCKCHIP_DW_MIPI_DSI) += dw-mipi-dsi.o obj-$(CONFIG_ROCKCHIP_INNO_HDMI) += inno_hdmi.o
drivers/gpu/drm/rockchip/analogix_dp-rockchip.c new file +384 -0
384 lines not on this page · raw message
include/drm/bridge/analogix_dp.h +1 -0
@@ -15,6 +15,7 @@enum analogix_dp_devtype {EXYNOS_DP , +RK3288_DP , };struct analogix_dp_plat_data {
Signature · 1 line
2.6.4
Re: [PATCH v14.1 09/17] drm: rockchip: dp: add rockchip platform dp driver
Quoted 6 lines · Heiko Stübner
Rockchip have three clocks for dp controller, we leave
pclk_edptoanalogix_dpdriver control, and keep thesclk_edp_24mandsclk_edpin platform driver.Signed-off-by Yakir Yang <[email protected]>
As the cover-letter said, verified on https://github.com/Caesar-github/rockchip/tree/veyron/next-stable-chromeos
with linux-next for 20160317.
Quoted 487 lines
---
Changes in v14.1:
- replacerockchip_drm_encoder_get_mux_idwith the newdrm_of_encoder_active_endpoint_idChanges in v14: None
Changes in v13:
- Use .enable instead of preprare/commit inencoder_helper_funcs(Heiko)
- Fix the missing parameters withdrm_encoder_init()helper function. (Heiko)Changes in v12: None
Changes in v11: None
Changes in v10:
- Correct theROCKCHIP_ANALOGIX_DPindentation inKconfigto tabs here (Heiko)Changes in v9: None
Changes in v8: None
Changes in v7: None
Changes in v6: None
Changes in v5:
- Remove the empty line at the end of document, and correct the endpoint numbers in the example DT node, and remove the regulator iomux setting in driver code while using the pinctl in devicetree instead. (Heiko)
- Add device type declared, cause the previous "platform device type support (v4 11/16)" already merge into (v5 02/14).
- Implement connector registration code. (Thierry)Changes in v4:
- Remove some deprecated DT properties in rockchip dp document.Changes in v3:
- Leave "sclk_edp_24m" to rockchip dp phy driver which name to "24m", and leave "sclk_edp" to analogix dp core driver which name to "dp", and leave "pclk_edp" to rockchip dp platform driver which name to "pclk". (Thierry & Heiko)
- Add devicetree binding document. (Heiko)
- Remove "rockchip,panel" DT property, take use of remote point to get panel node. (Heiko)
- Add the new function pointdp_platdata->get_modes()init.Changes in v2:
- Get panel node with remote-endpoint method, and create devicetree binding for driver. (Heiko)
- Remove the clock enable/disbale with "sclk_edp" & "sclk_edp_24m", leave those clock to rockchip dp phy driver.drivers/gpu/drm/rockchip/Kconfig | 9 + drivers/gpu/drm/rockchip/Makefile | 1 + drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 384 ++++++++++++++++++++++++ include/drm/bridge/analogix_dp.h | 1 + 4 files changed, 395 insertions(+)create mode 100644
drivers/gpu/drm/rockchip/analogix_dp-rockchip.cdrivers/gpu/drm/rockchip/Kconfig +9
-0@@ -16,6 +16,15 @@ config DRM_ROCKCHIP 2D or 3D acceleration; acceleration is performed by other IP found on the SoC. +config ROCKCHIP_ANALOGIX_DP + tristate "Rockchip specific extensions for Analogix DP driver" + depends on DRM_ROCKCHIP + select DRM_ANALOGIX_DP + help + This selects support for Rockchip SoC specific extensions + for the Analogix Core DP driver. If you want to enable DP + on RK3288 based SoC, you should selet this option. + config ROCKCHIP_DW_HDMI tristate "Rockchip specific extensions for Synopsys DW HDMI" depends on DRM_ROCKCHIPdrivers/gpu/drm/rockchip/Makefile +1
-0@@ -6,6 +6,7 @@ rockchipdrm-y := rockchip_drm_drv.o rockchip_drm_fb.o \ rockchip_drm_gem.o rockchip_drm_vop.o rockchipdrm-$(CONFIG_DRM_FBDEV_EMULATION) += rockchip_drm_fbdev.o +obj-$(CONFIG_ROCKCHIP_ANALOGIX_DP) += analogix_dp-rockchip.o obj-$(CONFIG_ROCKCHIP_DW_HDMI) += dw_hdmi-rockchip.o obj-$(CONFIG_ROCKCHIP_DW_MIPI_DSI) += dw-mipi-dsi.o obj-$(CONFIG_ROCKCHIP_INNO_HDMI) += inno_hdmi.odrivers/gpu/drm/rockchip/analogix_dp-rockchip.c new file +384
-0@@ -0,0 +1,384 @@ +/* +* Rockchip SoC DP (Display Port) interface driver. +* +* Copyright (C) Fuzhou Rockchip Electronics Co., Ltd. +* Author: Andy Yan <[email protected]> +* Yakir Yang <[email protected]> +* Jeff Chen <[email protected]> +* +* This program is free software; you can redistribute it and/or modify it +* under the terms of the GNU General Public License as published by the +* Free Software Foundation; either version 2 of the License, or (at your +* option) any later version. +*/ + +#include <linux/component.h> +#include <linux/mfd/syscon.h> +#include <linux/of_graph.h> +#include <linux/regmap.h> +#include <linux/reset.h> +#include <linux/clk.h> + +#include <drm/drmP.h> +#include <drm/drm_crtc_helper.h> +#include <drm/drm_dp_helper.h> +#include <drm/drm_of.h> +#include <drm/drm_panel.h> + +#include <video/of_videomode.h> +#include <video/videomode.h> + +#include <drm/bridge/analogix_dp.h> + +#include "rockchip_drm_drv.h" +#include "rockchip_drm_vop.h" + +#define to_dp (nm) container_of(nm, struct rockchip_dp_device, nm) + +/* dp grf register offset */ +#define GRF_SOC_CON6 0x025c +#define GRF_EDP_LCD_SEL_MASK BIT(5) +#define GRF_EDP_SEL_VOP_LIT BIT(5) +#define GRF_EDP_SEL_VOP_BIG 0 + +struct rockchip_dp_device { +struct drm_device *drm_dev; +struct device *dev; +struct drm_encoder encoder; +struct drm_display_mode mode; + +struct clk *pclk; +struct regmap *grf; +struct reset_control *rst; + +struct analogix_dp_plat_data plat_data; +}; + +static int rockchip_dp_pre_init (struct rockchip_dp_device *dp) +{ +reset_control_assert (dp->rst); +usleep_range (10 ,20 ); +reset_control_deassert (dp->rst); + +return 0 ; +} + +static int rockchip_dp_poweron (struct analogix_dp_plat_data *plat_data) +{ +struct rockchip_dp_device *dp =to_dp (plat_data); +int ret; + + ret =clk_prepare_enable (dp->pclk); +if (ret <0 ) { +dev_err (dp->dev,"failed to enable pclk %d\n" , ret); +return ret; + } + + ret =rockchip_dp_pre_init (dp); +if (ret <0 ) { +dev_err (dp->dev,"failed to dp pre init %d\n" , ret); +return ret; + } + +return 0 ; +} + +static int rockchip_dp_powerdown (struct analogix_dp_plat_data *plat_data) +{ +struct rockchip_dp_device *dp =to_dp (plat_data); + +clk_disable_unprepare (dp->pclk); + +return 0 ; +} + +static bool +rockchip_dp_drm_encoder_mode_fixup (struct drm_encoder *encoder, +const struct drm_display_mode *mode, +struct drm_display_mode *adjusted_mode) +{ +/* do nothing */ +return true; +} + +static void rockchip_dp_drm_encoder_mode_set (struct drm_encoder *encoder, +struct drm_display_mode *mode, +struct drm_display_mode *adjusted) +{ +/* do nothing */ +} + +static void rockchip_dp_drm_encoder_enable (struct drm_encoder *encoder) +{ +struct rockchip_dp_device *dp =to_dp (encoder); +int ret; +u32 val; + +/* +* FIXME(Yakir): driver should configure the CRTC output video +* mode with the display information which indicated the monitor +* support colorimetry. +* +* But don't know why the CRTC driver seems could only output the +* RGBaaa rightly. For example, if connect the "innolux,n116bge" +* eDP screen, EDID would indicated that screen only accepted the +* 6bpc mode. But if I configure CRTC to RGB666 output, then eDP +* screen would show a blue picture (RGB888 show a green picture). +* But if I configure CTRC to RGBaaa, and eDP driver still keep +* RGB666 input video mode, then screen would works prefect. +*/ + ret =rockchip_drm_crtc_mode_config (encoder->crtc, + DRM_MODE_CONNECTOR_eDP, +ROCKCHIP_OUT_MODE_AAAA ); +if (ret <0 ) { +dev_err (dp->dev,"Could not set crtc mode config (%d)\n" , ret); +return ; + } + + ret =drm_of_encoder_active_endpoint_id (dp->dev->of_node, encoder); +if (ret <0 ) +return ; + +if (ret) + val =GRF_EDP_SEL_VOP_LIT | (GRF_EDP_LCD_SEL_MASK <<16 ); +else + val =GRF_EDP_SEL_VOP_BIG | (GRF_EDP_LCD_SEL_MASK <<16 ); + +dev_dbg (dp->dev,"vop %s output to dp\n" , (ret) ?"LIT" :"BIG" ); + + ret =regmap_write (dp->grf,GRF_SOC_CON6 , val); +if (ret !=0 ) { +dev_err (dp->dev,"Could not write to GRF: %d\n" , ret); +return ; + } +} + +static void rockchip_dp_drm_encoder_nop (struct drm_encoder *encoder) +{ +/* do nothing */ +} + +static struct drm_encoder_helper_funcs rockchip_dp_encoder_helper_funcs = { + .mode_fixup = rockchip_dp_drm_encoder_mode_fixup, + .mode_set = rockchip_dp_drm_encoder_mode_set, + .enable = rockchip_dp_drm_encoder_enable, + .disable = rockchip_dp_drm_encoder_nop, +}; + +static void rockchip_dp_drm_encoder_destroy (struct drm_encoder *encoder) +{ +drm_encoder_cleanup (encoder); +} + +static struct drm_encoder_funcs rockchip_dp_encoder_funcs = { + .destroy = rockchip_dp_drm_encoder_destroy, +}; + +static int rockchip_dp_init (struct rockchip_dp_device *dp) +{ +struct device *dev = dp->dev; +struct device_node *np = dev->of_node; +int ret; + + dp->grf =syscon_regmap_lookup_by_phandle (np,"rockchip,grf" ); +if (IS_ERR (dp->grf)) { +dev_err (dev,"failed to get rockchip,grf property\n" ); +return PTR_ERR (dp->grf); + } + + dp->pclk =devm_clk_get (dev,"pclk" ); +if (IS_ERR (dp->pclk)) { +dev_err (dev,"failed to get pclk property\n" ); +return PTR_ERR (dp->pclk); + } + + dp->rst =devm_reset_control_get (dev,"dp" ); +if (IS_ERR (dp->rst)) { +dev_err (dev,"failed to get dp reset control\n" ); +return PTR_ERR (dp->rst); + } + + ret =clk_prepare_enable (dp->pclk); +if (ret <0 ) { +dev_err (dp->dev,"failed to enable pclk %d\n" , ret); +return ret; + } + + ret =rockchip_dp_pre_init (dp); +if (ret <0 ) { +dev_err (dp->dev,"failed to pre init %d\n" , ret); +return ret; + } + +return 0 ; +} + +static int rockchip_dp_drm_create_encoder (struct rockchip_dp_device *dp) +{ +struct drm_encoder *encoder = &dp->encoder; +struct drm_device *drm_dev = dp->drm_dev; +struct device *dev = dp->dev; +int ret; + + encoder->possible_crtcs =drm_of_find_possible_crtcs (drm_dev, + dev->of_node); +DRM_DEBUG_KMS ("possible_crtcs = 0x%x\n" , encoder->possible_crtcs); + + ret =drm_encoder_init (drm_dev, encoder, &rockchip_dp_encoder_funcs, +DRM_MODE_ENCODER_TMDS ,NULL ); +if (ret) { +DRM_ERROR ("failed to initialize encoder with drm\n" ); +return ret; + } + +drm_encoder_helper_add (encoder, &rockchip_dp_encoder_helper_funcs); + +return 0 ; +} + +static int rockchip_dp_bind (struct device *dev,struct device *master, +void *data) +{ +struct rockchip_dp_device *dp =dev_get_drvdata (dev); +struct drm_device *drm_dev = data; +int ret; + +/* +* Just like the probe function said, we don't need the +* device drvrate anymore, we should leave the charge to +* analogix dp driver, set the device drvdata to NULL. +*/ +dev_set_drvdata (dev,NULL ); + + ret =rockchip_dp_init (dp); +if (ret <0 ) +return ret; + + dp->drm_dev = drm_dev; + + ret =rockchip_dp_drm_create_encoder (dp); +if (ret) { +DRM_ERROR ("failed to create drm encoder\n" ); +return ret; + } + + dp->plat_data.encoder = &dp->encoder; + + dp->plat_data.dev_type =RK3288_DP ; + dp->plat_data.power_on = rockchip_dp_poweron; + dp->plat_data.power_off = rockchip_dp_powerdown; + +return analogix_dp_bind (dev, dp->drm_dev, &dp->plat_data); +} + +static void rockchip_dp_unbind (struct device *dev,struct device *master, +void *data) +{ +return analogix_dp_unbind (dev, master, data); +} + +static const struct component_ops rockchip_dp_component_ops = { + .bind = rockchip_dp_bind, + .unbind = rockchip_dp_unbind, +}; + +static int rockchip_dp_probe (struct platform_device *pdev) +{ +struct device *dev = &pdev->dev; +struct device_node *panel_node, *port, *endpoint; +struct rockchip_dp_device *dp; +struct drm_panel *panel; + + port =of_graph_get_port_by_id (dev->of_node,1 ); +if (!port) { +dev_err (dev,"can't find output port\n" ); +return -EINVAL ; + } + + endpoint =of_get_child_by_name (port,"endpoint" ); +of_node_put (port); +if (!endpoint) { +dev_err (dev,"no output endpoint found\n" ); +return -EINVAL ; + } + + panel_node =of_graph_get_remote_port_parent (endpoint); +of_node_put (endpoint); +if (!panel_node) { +dev_err (dev,"no output node found\n" ); +return -EINVAL ; + } + + panel =of_drm_find_panel (panel_node); +if (!panel) { +DRM_ERROR ("failed to find panel\n" ); +of_node_put (panel_node); +return -EPROBE_DEFER ; + } + +of_node_put (panel_node); + + dp =devm_kzalloc (dev,sizeof (*dp),GFP_KERNEL ); +if (!dp) +return -ENOMEM ; + + dp->dev = dev; + + dp->plat_data.panel = panel; + +/* +* We just use the drvdata until driver run into component +* add function, and then we would set drvdata to null, so +* that analogix dp driver could take charge of the drvdata. +*/ +platform_set_drvdata (pdev, dp); + +return component_add (dev, &rockchip_dp_component_ops); +} + +static int rockchip_dp_remove (struct platform_device *pdev) +{ +component_del (&pdev->dev, &rockchip_dp_component_ops); + +return 0 ; +} + +#ifdef CONFIG_PM_SLEEP +static int rockchip_dp_suspend (struct device *dev) +{ +return analogix_dp_suspend (dev); +} + +static int rockchip_dp_resume (struct device *dev) +{ +return analogix_dp_resume (dev); +} +#endif + +static const struct dev_pm_ops rockchip_dp_pm_ops = { +SET_SYSTEM_SLEEP_PM_OPS (rockchip_dp_suspend, rockchip_dp_resume) +}; + +static const struct of_device_id rockchip_dp_dt_ids[] = { + {.compatible ="rockchip,rk3288-dp" ,}, + {} +}; +MODULE_DEVICE_TABLE (of, rockchip_dp_dt_ids); + +static struct platform_driver rockchip_dp_driver = { + .probe = rockchip_dp_probe, + .remove = rockchip_dp_remove, + .driver = { + .name ="rockchip-dp" , + .owner =THIS_MODULE , + .pm = &rockchip_dp_pm_ops, + .of_match_table =of_match_ptr (rockchip_dp_dt_ids), + }, +}; + +module_platform_driver (rockchip_dp_driver); + +MODULE_AUTHOR ("Yakir Yang <[email protected]>" ); +MODULE_AUTHOR ("Jeff chen <[email protected]>" ); +MODULE_DESCRIPTION ("Rockchip Specific Analogix-DP Driver Extension" ); +MODULE_LICENSE ("GPL v2" );include/drm/bridge/analogix_dp.h +1
-0@@ -15,6 +15,7 @@enum analogix_dp_devtype {EXYNOS_DP , +RK3288_DP , };struct analogix_dp_plat_data {
Signature · 2 lines
Thanks, Caesar
Re: [PATCH v14 09/17] drm: rockchip: dp: add rockchip platform dp driver
In reply to Yakir YangQuoted 6 lines · Yakir Yang
Rockchip have three clocks for dp controller, we leave
pclk_edptoanalogix_dpdriver control, and keep thesclk_edp_24mandsclk_edpin platform driver.Signed-off-by Yakir Yang<[email protected]>
It looks good for me, I like it, So
Signature · 7 lines
Mark Yao -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v14 10/17 dt-bindings: add document for rockchip variant of analogix_dp
In reply to Yakir YangRockchip DP driver is a helper driver of analogix_dp coder driver, so most of the DT property should be descriped in analogix_dp document.
---
Changes in v14: None
Changes in v13: None
Changes in v12: None
Changes in v11: None
Changes in v10:
- Add the ack from Rob Herring
Changes in v9:
- Document more details for 'ports' property.
Changes in v8:
- Modify the commit subject name. (Heiko)
Changes in v7: None
Changes in v6: None
Changes in v5:
- Split binding doc's from driver changes. (Rob)
- Add eDP hotplug pinctrl property. (Heiko)
Changes in v4: None
Changes in v3: None
Changes in v2: None
.../display/rockchip/analogix_dp-rockchip.txt | 91 ++++++++++++++++++++++ 1 file changed, 91 insertions(+) create mode 100644 Documentation/devicetree/bindings/display/rockchip/analogix_dp-rockchip.txt
Documentation/devicetree/bindings/display/rockchip/analogix_dp-rockchip.txt new file +91 -0
@@ -0,0 +1,91 @@ +Rockchip RK3288 specific extensions to the Analogix Display Port +================================ + +Required properties: +- compatible: "rockchip,rk3288-edp"; + +- reg: physical base address of the controller and length + +- clocks: from common clock binding: handle to dp clock. + of memory mapped region. + +- clock-names: from common clock binding: + Required elements: "dp" "pclk" + +- resets: Must contain an entry for each entry in reset-names. + See ../reset/reset.txt for details. + +- pinctrl-names: Names corresponding to the chip hotplug pinctrl states. +- pinctrl-0: pin-control mode. should be <&edp_hpd> + +- reset-names: Must include the name "dp" + +- rockchip,grf: this soc should set GRF regs, so need get grf here. + +- ports: there are 2 port nodes with endpoint definitions as defined in + Documentation/devicetree/bindings/media/video-interfaces.txt. + Port 0: contained 2 endpoints, connecting to the output of vop. + Port 1: contained 1 endpoint, connecting to the input of panel. + +For the below properties, please refer to Analogix DP binding document: + * Documentation/devicetree/bindings/drm/bridge/analogix_dp.txt +- phys (required) +- phy-names (required) +- hpd-gpios (optional) +------------------------------------------------------------------------------- + +Example: + dp-controller: dp@ff970000 { + compatible = "rockchip,rk3288-dp"; + reg = <0xff970000 0x4000>; + interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&cru SCLK_EDP>, <&cru PCLK_EDP_CTRL>; + clock-names = "dp", "pclk"; + phys = <&dp_phy>; + phy-names = "dp"; + + rockchip,grf = <&grf>; + resets = <&cru 111>; + reset-names = "dp"; + + pinctrl-names = "default"; + pinctrl-0 = <&edp_hpd>; + + status = "disabled"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + edp_in: port@0 { + reg = <0>; + #address-cells = <1>; + #size-cells = <0>; + edp_in_vopb: endpoint@0 { + reg = <0>; + remote-endpoint = <&vopb_out_edp>; + }; + edp_in_vopl: endpoint@1 { + reg = <1>; + remote-endpoint = <&vopl_out_edp>; + }; + }; + + edp_out: port@1 { + reg = <1>; + #address-cells = <1>; + #size-cells = <0>; + edp_out_panel: endpoint { + reg = <0>; + remote-endpoint = <&panel_in_edp> + }; + }; + }; + }; + + pinctrl { + edp { + edp_hpd: edp-hpd { + rockchip,pins = <7 11 RK_FUNC_2 &pcfg_pull_none>; + }; + }; + };
Signature · 1 line
1.9.1
PATCH v14 11/17 drm: bridge: analogix/dp: add some rk3288 special registers setting
In reply to Yakir YangRK3288 need some special registers setting, we can separate them out by the dev_type of plat_data.
---
Changes in v14: None
Changes in v13: None
Changes in v12: None
Changes in v11: None
Changes in v10: None
Changes in v9: None
Changes in v8: None
Changes in v7: None
Changes in v6: None
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2:
- Fix compile failed dut to phy_pd_addr variable misspell error
drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 76 ++++++++++++++--------- drivers/gpu/drm/bridge/analogix/analogix_dp_reg.h | 12 ++++ 2 files changed, 60 insertions(+), 28 deletions(-)
drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c +48 -28
@@ -15,6 +15,8 @@#include <linux/delay.h> #include <linux/gpio.h> +#include <drm/bridge/analogix_dp.h> +#include "analogix_dp_core.h" #include "analogix_dp_reg.h"
@@ -72,6 +74,14 @@ void analogix_dp_init_analog_param(struct analogix_dp_device *dp) reg =SEL_24M |TX_DVDD_BIT_1_0625V ;writel (reg, dp->reg_base +ANALOGIX_DP_ANALOG_CTL_2 ); +if (dp->plat_data && (dp->plat_data->dev_type ==RK3288_DP )) { +writel (REF_CLK_24M , dp->reg_base +ANALOGIX_DP_PLL_REG_1 ); +writel (0x95 , dp->reg_base +ANALOGIX_DP_PLL_REG_2 ); +writel (0x40 , dp->reg_base +ANALOGIX_DP_PLL_REG_3 ); +writel (0x58 , dp->reg_base +ANALOGIX_DP_PLL_REG_4 ); +writel (0x22 , dp->reg_base +ANALOGIX_DP_PLL_REG_5 ); + } + reg =DRIVE_DVDD_BIT_1_0625V |VCO_BIT_600_MICRO ;writel (reg, dp->reg_base +ANALOGIX_DP_ANALOG_CTL_3 );
@@ -206,81 +216,85 @@ void analogix_dp_set_analog_power_down(struct analogix_dp_device *dp, bool enable) {u32 reg; +u32 phy_pd_addr =ANALOGIX_DP_PHY_PD ; + +if (dp->plat_data && (dp->plat_data->dev_type ==RK3288_DP )) + phy_pd_addr =ANALOGIX_DP_PD ;switch (block) {case AUX_BLOCK :if (enable) { - reg =readl (dp->reg_base +ANALOGIX_DP_PHY_PD ); + reg =readl (dp->reg_base + phy_pd_addr); reg |=AUX_PD ; -writel (reg, dp->reg_base +ANALOGIX_DP_PHY_PD ); +writel (reg, dp->reg_base + phy_pd_addr); }else { - reg =readl (dp->reg_base +ANALOGIX_DP_PHY_PD ); + reg =readl (dp->reg_base + phy_pd_addr); reg &= ~AUX_PD ; -writel (reg, dp->reg_base +ANALOGIX_DP_PHY_PD ); +writel (reg, dp->reg_base + phy_pd_addr); }break ;case CH0_BLOCK :if (enable) { - reg =readl (dp->reg_base +ANALOGIX_DP_PHY_PD ); + reg =readl (dp->reg_base + phy_pd_addr); reg |=CH0_PD ; -writel (reg, dp->reg_base +ANALOGIX_DP_PHY_PD ); +writel (reg, dp->reg_base + phy_pd_addr); }else { - reg =readl (dp->reg_base +ANALOGIX_DP_PHY_PD ); + reg =readl (dp->reg_base + phy_pd_addr); reg &= ~CH0_PD ; -writel (reg, dp->reg_base +ANALOGIX_DP_PHY_PD ); +writel (reg, dp->reg_base + phy_pd_addr); }break ;case CH1_BLOCK :if (enable) { - reg =readl (dp->reg_base +ANALOGIX_DP_PHY_PD ); + reg =readl (dp->reg_base + phy_pd_addr); reg |=CH1_PD ; -writel (reg, dp->reg_base +ANALOGIX_DP_PHY_PD ); +writel (reg, dp->reg_base + phy_pd_addr); }else { - reg =readl (dp->reg_base +ANALOGIX_DP_PHY_PD ); + reg =readl (dp->reg_base + phy_pd_addr); reg &= ~CH1_PD ; -writel (reg, dp->reg_base +ANALOGIX_DP_PHY_PD ); +writel (reg, dp->reg_base + phy_pd_addr); }break ;case CH2_BLOCK :if (enable) { - reg =readl (dp->reg_base +ANALOGIX_DP_PHY_PD ); + reg =readl (dp->reg_base + phy_pd_addr); reg |=CH2_PD ; -writel (reg, dp->reg_base +ANALOGIX_DP_PHY_PD ); +writel (reg, dp->reg_base + phy_pd_addr); }else { - reg =readl (dp->reg_base +ANALOGIX_DP_PHY_PD ); + reg =readl (dp->reg_base + phy_pd_addr); reg &= ~CH2_PD ; -writel (reg, dp->reg_base +ANALOGIX_DP_PHY_PD ); +writel (reg, dp->reg_base + phy_pd_addr); }break ;case CH3_BLOCK :if (enable) { - reg =readl (dp->reg_base +ANALOGIX_DP_PHY_PD ); + reg =readl (dp->reg_base + phy_pd_addr); reg |=CH3_PD ; -writel (reg, dp->reg_base +ANALOGIX_DP_PHY_PD ); +writel (reg, dp->reg_base + phy_pd_addr); }else { - reg =readl (dp->reg_base +ANALOGIX_DP_PHY_PD ); + reg =readl (dp->reg_base + phy_pd_addr); reg &= ~CH3_PD ; -writel (reg, dp->reg_base +ANALOGIX_DP_PHY_PD ); +writel (reg, dp->reg_base + phy_pd_addr); }break ;case ANALOG_TOTAL :if (enable) { - reg =readl (dp->reg_base +ANALOGIX_DP_PHY_PD ); + reg =readl (dp->reg_base + phy_pd_addr); reg |=DP_PHY_PD ; -writel (reg, dp->reg_base +ANALOGIX_DP_PHY_PD ); +writel (reg, dp->reg_base + phy_pd_addr); }else { - reg =readl (dp->reg_base +ANALOGIX_DP_PHY_PD ); + reg =readl (dp->reg_base + phy_pd_addr); reg &= ~DP_PHY_PD ; -writel (reg, dp->reg_base +ANALOGIX_DP_PHY_PD ); +writel (reg, dp->reg_base + phy_pd_addr); }break ;case POWER_ALL :if (enable) { reg =DP_PHY_PD |AUX_PD |CH3_PD |CH2_PD |CH1_PD |CH0_PD ; -writel (reg, dp->reg_base +ANALOGIX_DP_PHY_PD ); +writel (reg, dp->reg_base + phy_pd_addr); }else { -writel (0x00 , dp->reg_base +ANALOGIX_DP_PHY_PD ); +writel (0x00 , dp->reg_base + phy_pd_addr); }break ;default :
@@ -399,8 +413,14 @@ void analogix_dp_init_aux(struct analogix_dp_device *dp)analogix_dp_reset_aux (dp);/* Disable AUX transaction H/W retry */ - reg =AUX_BIT_PERIOD_EXPECTED_DELAY (3 ) |AUX_HW_RETRY_COUNT_SEL (0 ) | -AUX_HW_RETRY_INTERVAL_600_MICROSECONDS ; +if (dp->plat_data && (dp->plat_data->dev_type ==RK3288_DP )) + reg =AUX_BIT_PERIOD_EXPECTED_DELAY (0 ) | +AUX_HW_RETRY_COUNT_SEL (3 ) | +AUX_HW_RETRY_INTERVAL_600_MICROSECONDS ; +else + reg =AUX_BIT_PERIOD_EXPECTED_DELAY (3 ) | +AUX_HW_RETRY_COUNT_SEL (0 ) | +AUX_HW_RETRY_INTERVAL_600_MICROSECONDS ;writel (reg, dp->reg_base +ANALOGIX_DP_AUX_HW_RETRY_CTL );/* Receive AUX Channel DEFER commands equal to DEFFER_COUNT*64 */
drivers/gpu/drm/bridge/analogix/analogix_dp_reg.h +12 -0
@@ -22,6 +22,14 @@#define ANALOGIX_DP_VIDEO_CTL_8 0x3C#define ANALOGIX_DP_VIDEO_CTL_10 0x44 +#define ANALOGIX_DP_PLL_REG_1 0xfc +#define ANALOGIX_DP_PLL_REG_2 0x9e4 +#define ANALOGIX_DP_PLL_REG_3 0x9e8 +#define ANALOGIX_DP_PLL_REG_4 0x9ec +#define ANALOGIX_DP_PLL_REG_5 0xa00 + +#define ANALOGIX_DP_PD 0x12c +#define ANALOGIX_DP_LANE_MAP 0x35C#define ANALOGIX_DP_ANALOG_CTL_1 0x370
@@ -154,6 +162,10 @@#define VSYNC_POLARITY_CFG (0x1 << 1)#define HSYNC_POLARITY_CFG (0x1 << 0) +/* ANALOGIX_DP_PLL_REG_1 */ +#define REF_CLK_24M (0x1 << 1) +#define REF_CLK_27M (0x0 << 1) +/* ANALOGIX_DP_LANE_MAP */ #define LANE3_MAP_LOGIC_LANE_0 (0x0 << 6)#define LANE3_MAP_LOGIC_LANE_1 (0x1 << 6)
Signature · 1 line
1.9.1
Re: [PATCH v14 11/17] drm: bridge: analogix/dp: add some rk3288 special registers setting
Quoted 4 lines · Yakir Yang
RK3288 need some special registers setting, we can separate them out by the
dev_typeofplat_data.Signed-off-by Yakir Yang <[email protected]>
Quoted 35 lines
---
Changes in v14: None
Changes in v13: None
Changes in v12: None
Changes in v11: None
Changes in v10: None
Changes in v9: None
Changes in v8: None
Changes in v7: None
Changes in v6: None
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2:
- Fix compile failed dut tophy_pd_addrvariable misspell errordrivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 76 ++++++++++++++--------- drivers/gpu/drm/bridge/analogix/analogix_dp_reg.h | 12 ++++ 2 files changed, 60 insertions(+), 28 deletions(-)drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c +2
-0@@ -15,6 +15,8 @@#include <linux/delay.h> #include <linux/gpio.h> +#include <drm/bridge/analogix_dp.h> +#include "analogix_dp_core.h" #include "analogix_dp_reg.h" @@ -72,6 +74,14 @@ void analogix_dp_init_analog_param(struct analogix_dp_device *dp) reg =SEL_24M |TX_DVDD_BIT_1_0625V ;
drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c void analogix_dp_init_analog_param(struct analogix_dp_device *dp) · line 84
Quoted 10 lines
drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c +8
-0writel (reg, dp->reg_base +ANALOGIX_DP_ANALOG_CTL_2 ); +if (dp->plat_data && (dp->plat_data->dev_type ==RK3288_DP )) { +writel (REF_CLK_24M , dp->reg_base +ANALOGIX_DP_PLL_REG_1 ); +writel (0x95 , dp->reg_base +ANALOGIX_DP_PLL_REG_2 ); +writel (0x40 , dp->reg_base +ANALOGIX_DP_PLL_REG_3 ); +writel (0x58 , dp->reg_base +ANALOGIX_DP_PLL_REG_4 ); +writel (0x22 , dp->reg_base +ANALOGIX_DP_PLL_REG_5 ); + } +
In general, I will say what's mean for the number.
Okay that's the rk3288 special registers setting.
Quoted 162 lines
drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c +38
-28reg =DRIVE_DVDD_BIT_1_0625V |VCO_BIT_600_MICRO ;writel (reg, dp->reg_base +ANALOGIX_DP_ANALOG_CTL_3 );@@ -206,81 +216,85 @@ void analogix_dp_set_analog_power_down(struct analogix_dp_device *dp, bool enable) {u32 reg; +u32 phy_pd_addr =ANALOGIX_DP_PHY_PD ; + +if (dp->plat_data && (dp->plat_data->dev_type ==RK3288_DP )) + phy_pd_addr =ANALOGIX_DP_PD ;switch (block) {case AUX_BLOCK :if (enable) { - reg =readl (dp->reg_base +ANALOGIX_DP_PHY_PD ); + reg =readl (dp->reg_base + phy_pd_addr); reg |=AUX_PD ; -writel (reg, dp->reg_base +ANALOGIX_DP_PHY_PD ); +writel (reg, dp->reg_base + phy_pd_addr); }else { - reg =readl (dp->reg_base +ANALOGIX_DP_PHY_PD ); + reg =readl (dp->reg_base + phy_pd_addr); reg &= ~AUX_PD ; -writel (reg, dp->reg_base +ANALOGIX_DP_PHY_PD ); +writel (reg, dp->reg_base + phy_pd_addr); }break ;case CH0_BLOCK :if (enable) { - reg =readl (dp->reg_base +ANALOGIX_DP_PHY_PD ); + reg =readl (dp->reg_base + phy_pd_addr); reg |=CH0_PD ; -writel (reg, dp->reg_base +ANALOGIX_DP_PHY_PD ); +writel (reg, dp->reg_base + phy_pd_addr); }else { - reg =readl (dp->reg_base +ANALOGIX_DP_PHY_PD ); + reg =readl (dp->reg_base + phy_pd_addr); reg &= ~CH0_PD ; -writel (reg, dp->reg_base +ANALOGIX_DP_PHY_PD ); +writel (reg, dp->reg_base + phy_pd_addr); }break ;case CH1_BLOCK :if (enable) { - reg =readl (dp->reg_base +ANALOGIX_DP_PHY_PD ); + reg =readl (dp->reg_base + phy_pd_addr); reg |=CH1_PD ; -writel (reg, dp->reg_base +ANALOGIX_DP_PHY_PD ); +writel (reg, dp->reg_base + phy_pd_addr); }else { - reg =readl (dp->reg_base +ANALOGIX_DP_PHY_PD ); + reg =readl (dp->reg_base + phy_pd_addr); reg &= ~CH1_PD ; -writel (reg, dp->reg_base +ANALOGIX_DP_PHY_PD ); +writel (reg, dp->reg_base + phy_pd_addr); }break ;case CH2_BLOCK :if (enable) { - reg =readl (dp->reg_base +ANALOGIX_DP_PHY_PD ); + reg =readl (dp->reg_base + phy_pd_addr); reg |=CH2_PD ; -writel (reg, dp->reg_base +ANALOGIX_DP_PHY_PD ); +writel (reg, dp->reg_base + phy_pd_addr); }else { - reg =readl (dp->reg_base +ANALOGIX_DP_PHY_PD ); + reg =readl (dp->reg_base + phy_pd_addr); reg &= ~CH2_PD ; -writel (reg, dp->reg_base +ANALOGIX_DP_PHY_PD ); +writel (reg, dp->reg_base + phy_pd_addr); }break ;case CH3_BLOCK :if (enable) { - reg =readl (dp->reg_base +ANALOGIX_DP_PHY_PD ); + reg =readl (dp->reg_base + phy_pd_addr); reg |=CH3_PD ; -writel (reg, dp->reg_base +ANALOGIX_DP_PHY_PD ); +writel (reg, dp->reg_base + phy_pd_addr); }else { - reg =readl (dp->reg_base +ANALOGIX_DP_PHY_PD ); + reg =readl (dp->reg_base + phy_pd_addr); reg &= ~CH3_PD ; -writel (reg, dp->reg_base +ANALOGIX_DP_PHY_PD ); +writel (reg, dp->reg_base + phy_pd_addr); }break ;case ANALOG_TOTAL :if (enable) { - reg =readl (dp->reg_base +ANALOGIX_DP_PHY_PD ); + reg =readl (dp->reg_base + phy_pd_addr); reg |=DP_PHY_PD ; -writel (reg, dp->reg_base +ANALOGIX_DP_PHY_PD ); +writel (reg, dp->reg_base + phy_pd_addr); }else { - reg =readl (dp->reg_base +ANALOGIX_DP_PHY_PD ); + reg =readl (dp->reg_base + phy_pd_addr); reg &= ~DP_PHY_PD ; -writel (reg, dp->reg_base +ANALOGIX_DP_PHY_PD ); +writel (reg, dp->reg_base + phy_pd_addr); }break ;case POWER_ALL :if (enable) { reg =DP_PHY_PD |AUX_PD |CH3_PD |CH2_PD |CH1_PD |CH0_PD ; -writel (reg, dp->reg_base +ANALOGIX_DP_PHY_PD ); +writel (reg, dp->reg_base + phy_pd_addr); }else { -writel (0x00 , dp->reg_base +ANALOGIX_DP_PHY_PD ); +writel (0x00 , dp->reg_base + phy_pd_addr); }break ;default :@@ -399,8 +413,14 @@ void analogix_dp_init_aux(struct analogix_dp_device *dp)analogix_dp_reset_aux (dp);/* Disable AUX transaction H/W retry */ - reg =AUX_BIT_PERIOD_EXPECTED_DELAY (3 ) |AUX_HW_RETRY_COUNT_SEL (0 ) | -AUX_HW_RETRY_INTERVAL_600_MICROSECONDS ; +if (dp->plat_data && (dp->plat_data->dev_type ==RK3288_DP )) + reg =AUX_BIT_PERIOD_EXPECTED_DELAY (0 ) | +AUX_HW_RETRY_COUNT_SEL (3 ) | +AUX_HW_RETRY_INTERVAL_600_MICROSECONDS ; +else + reg =AUX_BIT_PERIOD_EXPECTED_DELAY (3 ) | +AUX_HW_RETRY_COUNT_SEL (0 ) | +AUX_HW_RETRY_INTERVAL_600_MICROSECONDS ;writel (reg, dp->reg_base +ANALOGIX_DP_AUX_HW_RETRY_CTL );/* Receive AUX Channel DEFER commands equal to DEFFER_COUNT*64 */ drivers/gpu/drm/bridge/analogix/analogix_dp_reg.h +12
-0@@ -22,6 +22,14 @@#define ANALOGIX_DP_VIDEO_CTL_8 0x3C#define ANALOGIX_DP_VIDEO_CTL_10 0x44 +#define ANALOGIX_DP_PLL_REG_1 0xfc +#define ANALOGIX_DP_PLL_REG_2 0x9e4 +#define ANALOGIX_DP_PLL_REG_3 0x9e8 +#define ANALOGIX_DP_PLL_REG_4 0x9ec +#define ANALOGIX_DP_PLL_REG_5 0xa00 + +#define ANALOGIX_DP_PD 0x12c +#define ANALOGIX_DP_LANE_MAP 0x35C#define ANALOGIX_DP_ANALOG_CTL_1 0x370@@ -154,6 +162,10 @@#define VSYNC_POLARITY_CFG (0x1 << 1)#define HSYNC_POLARITY_CFG (0x1 << 0) +/* ANALOGIX_DP_PLL_REG_1 */ +#define REF_CLK_24M (0x1 << 1) +#define REF_CLK_27M (0x0 << 1) +/* ANALOGIX_DP_LANE_MAP */ #define LANE3_MAP_LOGIC_LANE_0 (0x0 << 6)#define LANE3_MAP_LOGIC_LANE_1 (0x1 << 6)
Signature · 2 lines
Thanks, Caesar
PATCH v14 12/17 drm: bridge: analogix/dp: add max link rate and lane count limit for RK3288
In reply to Yakir YangThere are some IP limit on rk3288 that only support 4 physical lanes of 2.7/1.6 Gbps/lane, so seprate them out by device_type flag.
---
Changes in v14: None
Changes in v13: None
Changes in v12: None
Changes in v11: None
Changes in v10:
- Remove the surplus "plat_data" check. (Heiko)
- switch (dp->plat_data && dp->plat_data->dev_type) {
+ switch (dp->plat_data->dev_type) {
Changes in v9: None
Changes in v8: None
Changes in v7: None
Changes in v6: None
Changes in v5: None
Changes in v4:
- Seprate the link-rate and lane-count limit out with the device_type flag. (Thierry)
Changes in v3: None
Changes in v2: None
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 33 ++++++++++++++-------- drivers/gpu/drm/bridge/analogix/analogix_dp_core.h | 4 +-- 2 files changed, 23 insertions(+), 14 deletions(-)
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +21 -12
@@ -893,8 +893,8 @@ static void analogix_dp_commit(struct analogix_dp_device *dp)return ; } - ret =analogix_dp_set_link_train (dp, dp->video_info.lane_count, - dp->video_info.link_rate); + ret =analogix_dp_set_link_train (dp, dp->video_info.max_lane_count, + dp->video_info.max_link_rate);if (ret) {dev_err (dp->dev,"unable to do link train\n" );return ;
@@ -1203,16 +1203,25 @@ static int analogix_dp_dt_parse_pdata(struct analogix_dp_device *dp)struct device_node *dp_node = dp->dev->of_node;struct video_info *video_info = &dp->video_info; -if (of_property_read_u32 (dp_node,"samsung,link-rate" , - &video_info->link_rate)) { -dev_err (dp->dev,"failed to get link-rate\n" ); -return -EINVAL ; - } - -if (of_property_read_u32 (dp_node,"samsung,lane-count" , - &video_info->lane_count)) { -dev_err (dp->dev,"failed to get lane-count\n" ); -return -EINVAL ; +switch (dp->plat_data->dev_type) { +case RK3288_DP : +/* +* Like Rk3288 DisplayPort TRM indicate that "Main link +* containing 4 physical lanes of 2.7/1.62 Gbps/lane". +*/ + video_info->max_link_rate =0x0A ; + video_info->max_lane_count =0x04 ; +break ; +case EXYNOS_DP : +/* +* NOTE: those property parseing code is used for +* providing backward compatibility for samsung platform. +*/ +of_property_read_u32 (dp_node,"samsung,link-rate" , + &video_info->max_link_rate); +of_property_read_u32 (dp_node,"samsung,lane-count" , + &video_info->max_lane_count); +break ; }return 0 ;
drivers/gpu/drm/bridge/analogix/analogix_dp_core.h +2 -2
@@ -123,8 +123,8 @@ struct video_info {enum color_coefficient ycbcr_coeff;enum color_depth color_depth; -int link_rate; -enum link_lane_count_type lane_count; +int max_link_rate; +enum link_lane_count_type max_lane_count; };struct link_train {
Signature · 1 line
1.9.1
PATCH v14 13/17 drm: bridge: analogix/dp: try force hpd after plug in lookup failed
In reply to Yakir YangSome edp screen do not have hpd signal, so we can't just return failed when hpd plug in detect failed.
This is an hardware property, so we need add a devicetree property "analogix,need-force-hpd" to indicate this sutiation.
---
Changes in v14: None
Changes in v13: None
Changes in v12: None
Changes in v11:
- Rename the "analogix,need-force-hpd" to common 'force-hpd' (Rob)
- Add the ack from Rob Herring
Changes in v10: None
Changes in v9: None
Changes in v8: None
Changes in v7: None
Changes in v6: None
Changes in v5: None
Changes in v4: None
Changes in v3:
- Add "analogix,need-force-hpd" to indicate whether driver need foce hpd when hpd detect failed.
Changes in v2: None
.../bindings/display/bridge/analogix_dp.txt | 4 ++- .../bindings/display/exynos/exynos_dp.txt | 1 + .../display/rockchip/analogix_dp-rockchip.txt | 1 + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 35 ++++++++++++++++++---- drivers/gpu/drm/bridge/analogix/analogix_dp_core.h | 2 ++ drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 9 ++++++ 6 files changed, 46 insertions(+), 6 deletions(-)
Documentation/devicetree/bindings/display/bridge/analogix_dp.txt +3 -1
@@ -22,6 +22,9 @@ Required properties for dp-controller: from general PHY binding: Should be "dp". Optional properties for dp-controller: + -force-hpd: + Indicate driver need force hpd when hpd detect failed, this + is used for some eDP screen which don't have hpd signal. -hpd-gpios: Hotplug detect GPIO. Indicates which GPIO should be used for hotplug detection
@@ -31,7 +34,6 @@ Optional properties for dp-controller: * Documentation/devicetree/bindings/display/exynos/exynos_dp.txt * Documentation/devicetree/bindings/video/analogix_dp-rockchip.txt - [1]: Documentation/devicetree/bindings/media/video-interfaces.txt -------------------------------------------------------------------------------
Documentation/devicetree/bindings/display/exynos/exynos_dp.txt +1 -0
@@ -56,6 +56,7 @@ For the below properties, please refer to Analogix DP binding document: -phys (required) -phy-names (required) -hpd-gpios (optional) + force-hpd (optional) Deprecated properties for DisplayPort: -interlaced: deprecated prop that can parsed from drm_display_mode.
Documentation/devicetree/bindings/display/rockchip/analogix_dp-rockchip.txt +1 -0
@@ -32,6 +32,7 @@ For the below properties, please refer to Analogix DP binding document: - phys (required) - phy-names (required) - hpd-gpios (optional) +- force-hpd (optional) ------------------------------------------------------------------------------- Example:
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +30 -5
@@ -62,15 +62,38 @@ static int analogix_dp_detect_hpd(struct analogix_dp_device *dp) {int timeout_loop =0 ; -while (analogix_dp_get_plug_in_status (dp) !=0 ) { +while (timeout_loop <DP_TIMEOUT_LOOP_COUNT ) { +if (analogix_dp_get_plug_in_status (dp) ==0 ) +return 0 ; + timeout_loop++; -if (timeout_loop >DP_TIMEOUT_LOOP_COUNT ) { -dev_err (dp->dev,"failed to get hpd plug status\n" ); -return -ETIMEDOUT ; - }usleep_range (10 ,11 ); } +/* +* Some edp screen do not have hpd signal, so we can't just +* return failed when hpd plug in detect failed, DT property +* "force-hpd" would indicate whether driver need this. +*/ +if (!dp->force_hpd) +return -ETIMEDOUT ; + +/* +* The eDP TRM indicate that if HPD_STATUS(RO) is 0, AUX CH +* will not work, so we need to give a force hpd action to +* set HPD_STATUS manually. +*/ +dev_dbg (dp->dev,"failed to get hpd plug status, try to force hpd\n" ); + +analogix_dp_force_hpd (dp); + +if (analogix_dp_get_plug_in_status (dp) !=0 ) { +dev_err (dp->dev,"failed to get hpd plug in status\n" ); +return -EINVAL ; + } + +dev_dbg (dp->dev,"success to get plug in status after force hpd\n" ); +return 0 ; }
@@ -1291,6 +1314,8 @@ int analogix_dp_bind(struct device *dev, struct drm_device *drm_dev,if (IS_ERR (dp->reg_base))return PTR_ERR (dp->reg_base); + dp->force_hpd =of_property_read_bool (dev->of_node,"force-hpd" ); + dp->hpd_gpio =of_get_named_gpio (dev->of_node,"hpd-gpios" ,0 );if (!gpio_is_valid (dp->hpd_gpio)) dp->hpd_gpio = of_get_named_gpio(dev->of_node,
drivers/gpu/drm/bridge/analogix/analogix_dp_core.h +2 -0
@@ -154,6 +154,7 @@ struct analogix_dp_device {struct phy *phy;int dpms_mode;int hpd_gpio; +bool force_hpd;struct analogix_dp_plat_data *plat_data; };
@@ -174,6 +175,7 @@ void analogix_dp_set_analog_power_down(struct analogix_dp_device *dp, bool enable);void analogix_dp_init_analog_func (struct analogix_dp_device *dp);void analogix_dp_init_hpd (struct analogix_dp_device *dp); +void analogix_dp_force_hpd (struct analogix_dp_device *dp);enum dp_irq_type analogix_dp_get_irq_type (struct analogix_dp_device *dp);void analogix_dp_clear_hotplug_interrupts (struct analogix_dp_device *dp);void analogix_dp_reset_aux (struct analogix_dp_device *dp);
drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c +9 -0
@@ -365,6 +365,15 @@ void analogix_dp_init_hpd(struct analogix_dp_device *dp)writel (reg, dp->reg_base +ANALOGIX_DP_SYS_CTL_3 ); } +void analogix_dp_force_hpd (struct analogix_dp_device *dp) +{ +u32 reg; + + reg =readl (dp->reg_base +ANALOGIX_DP_SYS_CTL_3 ); + reg = (F_HPD |HPD_CTRL ); +writel (reg, dp->reg_base +ANALOGIX_DP_SYS_CTL_3 ); +} +enum dp_irq_type analogix_dp_get_irq_type (struct analogix_dp_device *dp) {u32 reg;
Signature · 1 line
1.9.1
PATCH v14 14/17 drm: bridge: analogix/dp: move hpd detect to connector detect function
In reply to Yakir YangThis change just make a little clean to make code more like drm core expect, move hdp detect code from bridge->enable(), and place them into connector->detect().
Note: Gustavo Padovan try to remove the controller and phy power on function in bind time at bellow commit:
drm/exynos: do not start enabling DP at bind() phase
But for now the connector status don't hardcode to connected, need to operate dp phy in .detect function, so we need to revert parts if Gustavo Padovan's changes, add phy poweron function in bind time.
---
Changes in v14: None
Changes in v13: None
Changes in v12: None
Changes in v11:
- Revert parts of Gustavo Padovan's changes in commit:
drm/exynos: do not start enabling DP at bind() phase
Add dp phy poweron function in bind time.
- Move the panel prepare from get_modes time to bind time, and move the panel unprepare from bridge->disable to unbind time. (Heiko)
Changes in v10: None
Changes in v9: None
Changes in v8: None
Changes in v7: None
Changes in v6: None
Changes in v5: None
Changes in v4:
- Take Jingoo suggest, add commit messages.
Changes in v3:
- move dp hpd detect to connector detect function.
Changes in v2: None
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 38 ++++++++++++---------- 1 file changed, 20 insertions(+), 18 deletions(-)
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +20 -18
@@ -904,12 +904,6 @@ static void analogix_dp_commit(struct analogix_dp_device *dp)DRM_ERROR ("failed to disable the panel\n" ); } - ret =analogix_dp_detect_hpd (dp); -if (ret) { -/* Cable has been disconnected, we're done */ -return ; - } - ret =analogix_dp_handle_edid (dp);if (ret) {dev_err (dp->dev,"unable to handle edid\n" );
@@ -972,6 +966,11 @@ static const struct drm_connector_helper_funcs analogix_dp_connector_helper_funcenum drm_connector_status analogix_dp_detect (struct drm_connector *connector,bool force) { +struct analogix_dp_device *dp =to_dp (connector); + +if (analogix_dp_detect_hpd (dp)) +return connector_status_disconnected; +return connector_status_connected; }
@@ -1051,13 +1050,6 @@ static void analogix_dp_bridge_enable(struct drm_bridge *bridge)pm_runtime_get_sync (dp->dev); -if (dp->plat_data->panel) { -if (drm_panel_prepare (dp->plat_data->panel)) { -DRM_ERROR ("failed to setup the panel\n" ); -return ; - } - } -if (dp->plat_data->power_on) dp->plat_data->power_on (dp->plat_data);
@@ -1090,11 +1082,6 @@ static void analogix_dp_bridge_disable(struct drm_bridge *bridge)if (dp->plat_data->power_off) dp->plat_data->power_off (dp->plat_data); -if (dp->plat_data->panel) { -if (drm_panel_unprepare (dp->plat_data->panel)) -DRM_ERROR ("failed to turnoff the panel\n" ); - } -pm_runtime_put_sync (dp->dev); dp->dpms_mode =DRM_MODE_DPMS_OFF ;
@@ -1352,6 +1339,15 @@ int analogix_dp_bind(struct device *dev, struct drm_device *drm_dev,pm_runtime_enable (dev); +phy_power_on (dp->phy); + +if (dp->plat_data->panel) { +if (drm_panel_prepare (dp->plat_data->panel)) { +DRM_ERROR ("failed to setup the panel\n" ); +return -EBUSY ; + } + } + ret =devm_request_irq (&pdev->dev, dp->irq, analogix_dp_irq_handler, irq_flags,"analogix-dp" , dp);if (ret) {
@@ -1385,6 +1381,12 @@ void analogix_dp_unbind(struct device *dev, struct device *master,struct analogix_dp_device *dp =dev_get_drvdata (dev);analogix_dp_bridge_disable (dp->bridge); + +if (dp->plat_data->panel) { +if (drm_panel_unprepare (dp->plat_data->panel)) +DRM_ERROR ("failed to turnoff the panel\n" ); + } +pm_runtime_disable (dev); }EXPORT_SYMBOL_GPL (analogix_dp_unbind);
Signature · 1 line
1.9.1
PATCH v14 15/17 drm: bridge: analogix/dp: add edid modes parse in get_modes method
In reply to Yakir YangDisplay Port monitor could support kinds of mode which indicate in monitor edid, not just one single display resolution which defined in panel or devivetree property display timing.
Note: Gustavo Padovan try to remove the controller and phy power on function in bind time at bellow commit:
drm/exynos: do not start enabling DP at bind() phase
But for now driver need to read edid message in .get_modes() function, so controller must be inited in bind time, so we need to add controller init back.
---
Changes in v14: None
Changes in v13: None
Changes in v12: None
Changes in v11: None
Changes in v10: None
Changes in v9: None
Changes in v8: None
Changes in v7: None
Changes in v6: None
Changes in v5: None
Changes in v4:
- Call drm_panel_prepare() in .get_modes function, ensure panel should power on before driver try to read edid message.
Changes in v3:
- Add edid modes parse support
Changes in v2: None
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 17 ++++---- drivers/gpu/drm/bridge/analogix/analogix_dp_core.h | 46 +++++++++++----------- 2 files changed, 33 insertions(+), 30 deletions(-)
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +10 -7
@@ -110,7 +110,7 @@ static unsigned char analogix_dp_calc_edid_check_sum(unsigned char *edid_data)static int analogix_dp_read_edid (struct analogix_dp_device *dp) { -unsigned char edid[EDID_BLOCK_LENGTH *2 ]; +unsigned char *edid = dp->edid;unsigned int extend_block =0 ;unsigned char sum;unsigned char test_vector;
@@ -904,12 +904,6 @@ static void analogix_dp_commit(struct analogix_dp_device *dp)DRM_ERROR ("failed to disable the panel\n" ); } - ret =analogix_dp_handle_edid (dp); -if (ret) { -dev_err (dp->dev,"unable to handle edid\n" ); -return ; - } - ret =analogix_dp_set_link_train (dp, dp->video_info.max_lane_count, dp->video_info.max_link_rate);if (ret) {
@@ -939,8 +933,14 @@ static void analogix_dp_commit(struct analogix_dp_device *dp)int analogix_dp_get_modes (struct drm_connector *connector) {struct analogix_dp_device *dp =to_dp (connector); +struct edid *edid = (struct edid *)dp->edid;int num_modes =0 ; +if (analogix_dp_handle_edid (dp) ==0 ) { +drm_mode_connector_update_edid_property (&dp->connector, edid); + num_modes +=drm_add_edid_modes (&dp->connector, edid); + } +if (dp->plat_data->panel) num_modes +=drm_panel_get_modes (dp->plat_data->panel);
@@ -978,6 +978,7 @@ static void analogix_dp_connector_destroy(struct drm_connector *connector) {drm_connector_unregister (connector);drm_connector_cleanup (connector); + }static const struct drm_connector_funcs analogix_dp_connector_funcs = {
@@ -1348,6 +1349,8 @@ int analogix_dp_bind(struct device *dev, struct drm_device *drm_dev, } } +analogix_dp_init_dp (dp); + ret =devm_request_irq (&pdev->dev, dp->irq, analogix_dp_irq_handler, irq_flags,"analogix-dp" , dp);if (ret) {
drivers/gpu/drm/bridge/analogix/analogix_dp_core.h +23 -23
62 lines not on this page · raw message
Signature · 1 line
1.9.1
PATCH v14 16/17 drm: bridge: analogix/dp: add panel prepare/unprepare in suspend/resume time
In reply to Yakir YangTurn off the panel power in suspend time would help to reduce power waste.
---
Changes in v14: None
Changes in v13: None
Changes in v12: None
Changes in v11: None
Changes in v10: None
Changes in v9: None
Changes in v8: None
Changes in v7: None
Changes in v6: None
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +13 -0
@@ -1400,6 +1400,12 @@ int analogix_dp_suspend(struct device *dev)struct analogix_dp_device *dp =dev_get_drvdata (dev);clk_disable_unprepare (dp->clock); + +if (dp->plat_data->panel) { +if (drm_panel_unprepare (dp->plat_data->panel)) +DRM_ERROR ("failed to turnoff the panel\n" ); + } +return 0 ; }EXPORT_SYMBOL_GPL (analogix_dp_suspend);
@@ -1415,6 +1421,13 @@ int analogix_dp_resume(struct device *dev)return ret; } +if (dp->plat_data->panel) { +if (drm_panel_prepare (dp->plat_data->panel)) { +DRM_ERROR ("failed to setup the panel\n" ); +return -EBUSY ; + } + } +return 0 ; }EXPORT_SYMBOL_GPL (analogix_dp_resume);
Signature · 1 line
1.9.1
PATCH v14 17/17 drm: bridge: analogix/dp: Fix the possible dead lock in bridge disable time
In reply to Yakir YangIt may caused a dead lock if we flush the hpd work in bridge disable time.
The normal flow would like:
IN --> DRM IOCTL
1. Acquire crtc_ww_class_mutex (DRM IOCTL)
IN --> analogix_dp_bridge
2. Acquire hpd work lock (Flush hpd work)
3. HPD work already in idle, no need to run the work function.
OUT <-- analogix_dp_bridge
OUT <-- DRM IOCTL
The dead lock flow would like:
IN --> DRM IOCTL
1. Acquire crtc_ww_class_mutex (DRM IOCTL)
IN --> analogix_dp_bridge
2. Acquire hpd work lock (Flush hpd work)
IN --> analogix_dp_hotplug
IN --> drm_helper_hpd_irq_event
3. Acquire mode_config lock (This lock already have been acquired in previous step 1)
** Dead Lock Now **
It's wrong to flush the hpd work in bridge->disable time, I guess the original code just want to ensure the delay work must be finish before encoder disabled.
The flush work in bridge disable time is try to ensure the HPD event won't be missed before display card disabled, actually we can take a fast respond way(interrupt thread) to update DRM HPD event to fix the delay update and possible dead lock.
---
Changes in v14: None
Changes in v13: None
Changes in v12: None
Changes in v11: None
Changes in v10: None
Changes in v9: None
Changes in v8: None
Changes in v7: None
Changes in v6: None
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 62 ++++++++++------------ drivers/gpu/drm/bridge/analogix/analogix_dp_core.h | 3 +- drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 26 +++++++++ 3 files changed, 55 insertions(+), 36 deletions(-)
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +27 -35
@@ -851,47 +851,40 @@ static void analogix_dp_enable_scramble(struct analogix_dp_device *dp, } } -static irqreturn_t analogix_dp_irq_handler (int irq,void *arg) +static irqreturn_t analogix_dp_hardirq (int irq,void *arg) {struct analogix_dp_device *dp = arg; - +irqreturn_t ret =IRQ_NONE ;enum dp_irq_type irq_type; irq_type =analogix_dp_get_irq_type (dp); -switch (irq_type) { -case DP_IRQ_TYPE_HP_CABLE_IN : -dev_dbg (dp->dev,"Received irq - cable in\n" ); -schedule_work (&dp->hotplug_work); -analogix_dp_clear_hotplug_interrupts (dp); -break ; -case DP_IRQ_TYPE_HP_CABLE_OUT : -dev_dbg (dp->dev,"Received irq - cable out\n" ); -analogix_dp_clear_hotplug_interrupts (dp); -break ; -case DP_IRQ_TYPE_HP_CHANGE : -/* -* We get these change notifications once in a while, but there -* is nothing we can do with them. Just ignore it for now and -* only handle cable changes. -*/ -dev_dbg (dp->dev,"Received irq - hotplug change; ignoring.\n" ); -analogix_dp_clear_hotplug_interrupts (dp); -break ; -default : -dev_err (dp->dev,"Received irq - unknown type!\n" ); -break ; +if (irq_type !=DP_IRQ_TYPE_UNKNOWN ) { +analogix_dp_mute_hpd_interrupt (dp); + ret =IRQ_WAKE_THREAD ; } -return IRQ_HANDLED ; + +return ret; } -static void analogix_dp_hotplug (struct work_struct *work) +static irqreturn_t analogix_dp_irq_thread (int irq,void *arg) { -struct analogix_dp_device *dp; +struct analogix_dp_device *dp = arg; +enum dp_irq_type irq_type; + + irq_type =analogix_dp_get_irq_type (dp); +if (irq_type &DP_IRQ_TYPE_HP_CABLE_IN || + irq_type &DP_IRQ_TYPE_HP_CABLE_OUT ) { +dev_dbg (dp->dev,"Detected cable status changed!\n" ); +if (dp->drm_dev) +drm_helper_hpd_irq_event (dp->drm_dev); + } - dp = container_of(work, struct analogix_dp_device, hotplug_work); +if (irq_type !=DP_IRQ_TYPE_UNKNOWN ) { +analogix_dp_clear_hotplug_interrupts (dp); +analogix_dp_unmute_hpd_interrupt (dp); + } -if (dp->drm_dev) -drm_helper_hpd_irq_event (dp->drm_dev); +return IRQ_HANDLED ; }static void analogix_dp_commit (struct analogix_dp_device *dp)
@@ -1077,7 +1070,6 @@ static void analogix_dp_bridge_disable(struct drm_bridge *bridge) }disable_irq (dp->irq); -flush_work (&dp->hotplug_work);phy_power_off (dp->phy);if (dp->plat_data->power_off)
@@ -1336,8 +1328,6 @@ int analogix_dp_bind(struct device *dev, struct drm_device *drm_dev,return -ENODEV ; } -INIT_WORK (&dp->hotplug_work, analogix_dp_hotplug); -pm_runtime_enable (dev);phy_power_on (dp->phy);
@@ -1351,8 +1341,10 @@ int analogix_dp_bind(struct device *dev, struct drm_device *drm_dev,analogix_dp_init_dp (dp); - ret =devm_request_irq (&pdev->dev, dp->irq, analogix_dp_irq_handler, - irq_flags,"analogix-dp" , dp); + ret =devm_request_threaded_irq (&pdev->dev, dp->irq, + analogix_dp_hardirq, + analogix_dp_irq_thread, + irq_flags,"analogix-dp" , dp);if (ret) {dev_err (&pdev->dev,"failed to request irq\n" ); goto err_disable_pm_runtime;
drivers/gpu/drm/bridge/analogix/analogix_dp_core.h +2 -1
@@ -172,7 +172,6 @@ struct analogix_dp_device {struct video_info video_info;struct link_train link_train; -struct work_struct hotplug_work;struct phy *phy;int dpms_mode;int hpd_gpio;
@@ -191,6 +190,8 @@ void analogix_dp_init_interrupt(struct analogix_dp_device *dp);void analogix_dp_reset (struct analogix_dp_device *dp);void analogix_dp_swreset (struct analogix_dp_device *dp);void analogix_dp_config_interrupt (struct analogix_dp_device *dp); +void analogix_dp_mute_hpd_interrupt (struct analogix_dp_device *dp); +void analogix_dp_unmute_hpd_interrupt (struct analogix_dp_device *dp);enum pll_status analogix_dp_get_pll_lock_status (struct analogix_dp_device *dp);void analogix_dp_set_pll_power_down (struct analogix_dp_device *dp,bool enable); void analogix_dp_set_analog_power_down(struct analogix_dp_device *dp,
drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c +26 -0
@@ -185,6 +185,32 @@ void analogix_dp_config_interrupt(struct analogix_dp_device *dp)writel (reg, dp->reg_base +ANALOGIX_DP_INT_STA_MASK ); } +void analogix_dp_mute_hpd_interrupt (struct analogix_dp_device *dp) +{ +u32 reg; + +/* 0: mask, 1: unmask */ + reg =readl (dp->reg_base +ANALOGIX_DP_COMMON_INT_MASK_4 ); + reg &= ~COMMON_INT_MASK_4 ; +writel (reg, dp->reg_base +ANALOGIX_DP_COMMON_INT_MASK_4 ); + + reg =readl (dp->reg_base +ANALOGIX_DP_INT_STA_MASK ); + reg &= ~INT_STA_MASK ; +writel (reg, dp->reg_base +ANALOGIX_DP_INT_STA_MASK ); +} + +void analogix_dp_unmute_hpd_interrupt (struct analogix_dp_device *dp) +{ +u32 reg; + +/* 0: mask, 1: unmask */ + reg =COMMON_INT_MASK_4 ; +writel (reg, dp->reg_base +ANALOGIX_DP_COMMON_INT_MASK_4 ); + + reg =INT_STA_MASK ; +writel (reg, dp->reg_base +ANALOGIX_DP_INT_STA_MASK ); +} +enum pll_status analogix_dp_get_pll_lock_status (struct analogix_dp_device *dp) {u32 reg;
Signature · 1 line
1.9.1
Hi all,
I pick this series up and test on C101PA chromebook, after Heiko update the 3 patches.
[v14.1,09/17] drm: rockchip: dp: add rockchip platform dp driver [v14.1,04/17] drm: bridge: analogix/dp: fix some obvious code style [v14.1,01/17] drm: bridge: analogix/dp: split exynos dp driver to bridge directory
C101PA chromebook:
http://www.amazon.co.uk/10-1-Inch-Chromebook-Rockchip-Integrated-Graphics/dp/B0107N7WT6/ref=lp_758129031_1_4?s=computers&ie=UTF8&qid=1458282912&sr=1-4
So, verified for the rockchip eDp contrller on my github.
https://github.com/Caesar-github/rockchip/tree/veyron/next-stable-chromeos
Quoted 253 lines · Yakir Yang
Hi all,
The Samsung Exynos eDP controller and Rockchip RK3288 eDP controller
share the same IP, so a lot of parts can be re-used. I split the common code into bridge directory, then rk3288 and exynos only need to keep some platform code. Cause I can't find the exact IP name of exynos dp controller, so I decide to name dp core driver with "analogix" which I find in rk3288 eDP TRMBut there are still three light registers setting different between exynos and rk3288.
1. RK3288 have five special pll registers which not indicate in exynos dp controller.
2. The address ofDP_PHY_PD(dp phy power manager register)are different between rk3288 and exynos.
3. Rk3288 and exynos have different setting withAUX_HW_RETRY_CTL(dp debug register).Due to Mark Yao have introduced the ATOMIC support to Rockchip drm, so it's okay to use the ATOMIC helpers functions in
connector_funcs. No need to splict the connector init to platform driver anymore, and this is the biggest change since version 11.This v14 didn't have lots of new changes which seems not the correct time to upgrade the version number, but I have changed ordering of patches (adding 2 more, and removing 2 out). Especially to prevent confusing people, so I updated the whole series.
Thanks,
- YakirChanges in v14:
- Rebase the new changes in imx-dp driver
- Split up this patch into 3 parts, make this easy to review (Heiko)
- Remove the Rockchip DP PHY to an separate thread (Heiko)https://patchwork.kernel.org/patch/8312701/Changes in v13:
- Use .enable instead of preprare/commit inencoder_helper_funcs(Heiko)
- Fix the missing parameters withdrm_encoder_init()helper function. (Heiko)Changes in v12:
- Move the connector init toanalogix_dpdriver, and using ATOMIC helper (Heiko)
- Add the ack from Jingoo
- Remove the enumlink_rate_typestruct, using the marcos indrm_dp_helper.h(Jingoo)Changes in v11:
- Uses tabs to fix the indentation issues inanalogix_dp_core.h(Heiko)
- Rename the "analogix,need-force-hpd" to common 'force-hpd' (Rob)
- Add the ack from Rob Herring
- Revert parts of Gustavo Padovan's changes in commit:
drm/exynos: do not start enabling DP atbind()phase
Add dp phy poweron function in bind time.
- Move the panel prepare fromget_modestime to bind time, and move the panel unprepare frombridge->disableto unbind time. (Heiko)Changes in v10:
- Add the ack from Rob Herring
- Correct theROCKCHIP_ANALOGIX_DPindentation inKconfigto tabs here (Heiko)
- Add the ack from Rob Herring
- Remove the surplus "plat_data" check. (Heiko)(quoted diff) +1
-1- switch (dp->plat_data && dp->plat_data->dev_type) { + switch (dp->plat_data->dev_type) {Changes in v9:
- Document more details for 'ports' property.Changes in v8:
- Correct the right document path of display-timing.txt (Heiko)
- Correct the misspell of 'from' to 'frm'. (Heiko)
- Modify the commit subject name. (Heiko)Changes in v7:
- Back to use theof_property_read_bool()interfacs to provoid backward compatibility of "hsync-active-high" "vsync-active-high" "interlaced" to avoid-EOVERFLOWerror (Krzysztof)Changes in v6:
- Fix theKconfigrecursive dependency (Javier)
- Fix Peach Pit hpd property name error:(quoted diff) +1
-1- hpd-gpio = <&gpx2 6 0>; + hpd-gpios = <&gpx2 6 0>;Changes in v5:
- Correct the check condition ofgpio_is_validwhen driver try to get the "hpd-gpios" DT propery. (Heiko)
- Move the platform attach callback in the front of core driver bridge attch function. Cause once platform failed at attach, core driver should still failed, so no need to init connector before platform attached (Krzysztof)
- Keep code style no changes with the previousexynos_dp_code.cin this patch, and update commit message about the new export symbol (Krzysztof)
- Gather the device type patch (v4 11/16) into this one. (Krzysztof)
- leave out the connector registration to analogix platform driver. (Thierry)
- Resequence this patch afteranalogix_dpdriver have been split
fromexynos_dpcode, and rephrase reasonable commit message, and remove some controversial style (Krzysztof)- analogix_dp_write_byte_to_dpcd( - dp, DP_TEST_RESPONSE, + analogix_dp_write_byte_to_dpcd(dp, + DP_TEST_RESPONSE, DP_TEST_EDID_CHECKSUM_WRITE);- Switch video timing type to "u32", so driver could use "
of_property_read_u32" to get the backword timing values. Krzysztof suggest me that driver could use the "of_property_read_bool" to get backword timing values, but that interfacs would modify the originaldrm_display_modetiming directly (whether those properties exists or not).
- Correct the misspell in commit message. (Krzysztof)
- Remove the empty line at the end of document, and correct the endpoint numbers in the example DT node, and remove the regulator iomux setting in driver code while using the pinctl in devicetree instead. (Heiko)
- Add device type declared, cause the previous "platform device type support (v4 11/16)" already merge into (v5 02/14).
- Implement connector registration code. (Thierry)
- Split binding doc's from driver changes. (Rob)
- Add eDP hotplug pinctrl property. (Heiko)Changes in v4:
- Update "analogix,hpd-gpios" to "hpd-gpios" DT propery. (Rob)
- Rename "analogix_dp-exynos.c" file name to "exynos_dp.c" (Jingoo)
- Create a separate folder for analogix code in bridge/ (Archit)
- Update commit message more readable. (Jingoo)
- Adjust the order from 05 to 04
- Provide backword compatibility with samsung. (Krzysztof)
- Split all DTS changes, and provide backward compatibility. Mark old properties as deprecated but still support them. (Krzysztof)
- Update "analogix,hpd-gpio" to "hpd-gpios" prop name. (Rob)
- Deprecated some properties which could parsed from Edid/Mode/DPCD. (Thierry)
"analogix,color-space" & "analogix,color-depth" &
"analogix,link-rate" & "analogix,lane-count" &
"analogix,ycbcr-coeff" & "analogix,dynamic-range" &
"vsync-active-high" & "hsync-active-high" & "interlaces"
- Separate all DTS changes to a separate patch. (Krzysztof)
- Remove some deprecated DT properties in rockchip dp document.
- Seprate the link-rate and lane-count limit out with thedevice_typeflag. (Thierry)
- Take Jingoo suggest, add commit messages.
- Calldrm_panel_prepare()in .get_modes function, ensure panel should power on before driver try to read edid message.Changes in v3:
- Move exynos'svideo_timingcode to analogix_dp-exynos platform driver, addget_modesmethod to structanalogix_dp_plat_data. (Thierry)
- Rename some "samsung*" dts propery to "analogix*". (Heiko)
- Thelink_rateandlane_countshouldn't config to the DT property value directly, but we can take those as hardware limite. For example, RK3288 only support 4 physical lanes of 2.7/1.62 Gbps/lane, so DT property would like "link-rate =0x0a" "lane-count = 4". (Thierry)
- Dynamic parse video timing info from structdrm_display_modeand structdrm_display_info. (Thierry)
- Add devicetree binding documents. (Heiko)
- Remove sync pol & colorimetry properies from the new analogix dp driver devicetree binding. (Thierry)
- Update the exist exynos dtsi file with the latest DP DT properies.
- Leave "sclk_edp_24m" to rockchip dp phy driver which name to "24m", and leave "sclk_edp" to analogix dp core driver which name to "dp", and leave "pclk_edp" to rockchip dp platform driver which name to "pclk". (Thierry & Heiko)
- Add devicetree binding document. (Heiko)
- Remove "rockchip,panel" DT property, take use of remote point to get panel node. (Heiko)
- Add the new function pointdp_platdata->get_modes()init.
- Add "analogix,need-force-hpd" to indicate whether driver need foce hpd when hpd detect failed.
- move dp hpd detect to connector detect function.
- Add edid modes parse supportChanges in v2:
- Remove new copyright (Jingoo)
- Fix compiled failed due toanalogix_dp_devicemisspell
- Improved commit message more readable, and avoid using some uncommon style like bellow: (Joe Preches)
- retval = exynos_dp_read_bytes_from_i2c(...
...);
+ retval =
+exynos_dp_read_bytes_from_i2c(......);
- Get panel node with remote-endpoint method, and create devicetree binding for driver. (Heiko)
- Remove the clock enable/disbale with "sclk_edp" & "sclk_edp_24m", leave those clock to rockchip dp phy driver.
- Fix compile failed dut tophy_pd_addrvariable misspell errorHeiko Stuebner (2):
drm/exynos: dp: rename implementation specific driver part
drm: bridge: analogix/dp: rename register constantsYakir Yang (15):
drm: bridge: analogix/dp: split exynos dp driver to bridge directory
drm: bridge: analogix/dp: fix some obvious code style
drm: bridge: analogix/dp: remove duplicate configuration of link rate
and link count
drm: bridge: analogix/dp: dynamic parsesync_pol& interlace &
dynamic_range
dt-bindings: add document for analogix display port driver
ARM: dts: exynos/dp: remove some properties that deprecated by
analogix_dpdriver
drm: rockchip: dp: add rockchip platform dp driver
dt-bindings: add document for rockchip variant ofanalogix_dp
drm: bridge: analogix/dp: add some rk3288 special registers setting
drm: bridge: analogix/dp: add max link rate and lane count limit forRK3288drm: bridge: analogix/dp: try force hpd after plug in lookup failed
drm: bridge: analogix/dp: move hpd detect to connector detect function
drm: bridge: analogix/dp: add edid modes parse inget_modesmethod
drm: bridge: analogix/dp: add panel prepare/unprepare in
suspend/resume time
drm: bridge: analogix/dp: Fix the possible dead lock in bridge disable
time.../bindings/display/bridge/analogix_dp.txt | 52 + .../bindings/display/exynos/exynos_dp.txt | 93 +- .../display/rockchip/analogix_dp-rockchip.txt | 92 ++ arch/arm/boot/dts/exynos5250-arndale.dts | 2 - arch/arm/boot/dts/exynos5250-smdk5250.dts | 2 - arch/arm/boot/dts/exynos5250-snow-common.dtsi | 4 +- arch/arm/boot/dts/exynos5250-spring.dts | 4 +- arch/arm/boot/dts/exynos5420-peach-pit.dts | 4 +- arch/arm/boot/dts/exynos5420-smdk5420.dts | 2 - arch/arm/boot/dts/exynos5800-peach-pi.dts | 2 - drivers/gpu/drm/bridge/Kconfig | 2 + drivers/gpu/drm/bridge/Makefile | 1 + drivers/gpu/drm/bridge/analogix/Kconfig | 3 + drivers/gpu/drm/bridge/analogix/Makefile | 1 + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 1430 ++++++++++++++++++ drivers/gpu/drm/bridge/analogix/analogix_dp_core.h | 281 ++++ drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 1320 +++++++++++++++++ .../analogix/analogix_dp_reg.h} | 270 ++-- drivers/gpu/drm/exynos/Kconfig | 3 +- drivers/gpu/drm/exynos/Makefile | 2 +- drivers/gpu/drm/exynos/exynos_dp.c | 324 +++++ drivers/gpu/drm/exynos/exynos_dp_core.c | 1510 -------------------- drivers/gpu/drm/exynos/exynos_dp_core.h | 282 ---- drivers/gpu/drm/exynos/exynos_dp_reg.c | 1263 ---------------- drivers/gpu/drm/rockchip/Kconfig | 9 + drivers/gpu/drm/rockchip/Makefile | 1 + drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 384 +++++ include/drm/bridge/analogix_dp.h | 41 + 28 files changed, 4115 insertions(+), 3269 deletions(-)create mode 100644
Documentation/devicetree/bindings/display/bridge/analogix_dp.txtcreate mode 100644Documentation/devicetree/bindings/display/rockchip/analogix_dp-rockchip.txtcreate mode 100644drivers/gpu/drm/bridge/analogix/Kconfig
create mode 100644drivers/gpu/drm/bridge/analogix/Makefile
create mode 100644drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
create mode 100644drivers/gpu/drm/bridge/analogix/analogix_dp_core.h
create mode 100644drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
renamedrivers/gpu/drm/{exynos/exynos_dp_reg.h=>bridge/analogix/analogix_dp_reg.h} (62%) create mode 100644drivers/gpu/drm/exynos/exynos_dp.c
delete mode 100644drivers/gpu/drm/exynos/exynos_dp_core.c
delete mode 100644drivers/gpu/drm/exynos/exynos_dp_core.h
delete mode 100644drivers/gpu/drm/exynos/exynos_dp_reg.c
create mode 100644drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
create mode 100644include/drm/bridge/analogix_dp.h
Signature · 7 lines
Thanks, Caesar -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Doug Anderson
Tested-byHi,
Quoted 10 lines · Caesar Wang
Hi all,
I pick this series up and test on C101PA chromebook, after Heiko update the 3 patches.
[v14.1,09/17] drm: rockchip: dp: add rockchip platform dp driver [v14.1,04/17] drm: bridge: analogix/dp: fix some obvious code style [v14.1,01/17] drm: bridge: analogix/dp: split exynos dp driver to bridge directory
Quoted 5 lines
C101PA chromebook:
http://www.amazon.co.uk/10-1-Inch-Chromebook-Rockchip-Integrated-Graphics/dp/B0107N7WT6/ref=lp_758129031_1_4?s=computers&ie=UTF8&qid=1458282912&sr=1-4So, verified for the rockchip eDp contrller on my github.
https://github.com/Caesar-github/rockchip/tree/veyron/next-stable-chromeos
I did similar to Caesar but I tested on veyron-jerry instead of veyron-mickey. Like Caesar, I picked these together Heiko's v14.1 patches to resolve merge conflicts. I also picked into a slightly different tree (mine was a 4.4-based tree with backports, including Heiko's latest eDP device tree patches).
Tough I haven't reviewed the code and am not a graphics expert, I'd very much love to see this landed, presumably right after the merge window closes. Yakir's first patch
<https://patchwork.kernel.org/patch/6959211/> is nearly 1 year old and it really seems like if there were any major objections left they'd have been stated by now. v14 appears to be about 1 month old with no major comments.
-Doug
Javier Martinez Canillas
Tested-byHello,
Quoted 16 lines · Doug Anderson
Hi,
Quoted 13 lines · Caesar Wang
Hi all,
I pick this series up and test on C101PA chromebook, after Heiko update the 3 patches.
[v14.1,09/17] drm: rockchip: dp: add rockchip platform dp driver [v14.1,04/17] drm: bridge: analogix/dp: fix some obvious code style [v14.1,01/17] drm: bridge: analogix/dp: split exynos dp driver to bridge directory
C101PA chromebook:
http://www.amazon.co.uk/10-1-Inch-Chromebook-Rockchip-Integrated-Graphics/dp/B0107N7WT6/ref=lp_758129031_1_4?s=computers&ie=UTF8&qid=1458282912&sr=1-4
Quoted 9 lines
Quoted 2 lines
So, verified for the rockchip eDp contrller on my github.
https://github.com/Caesar-github/rockchip/tree/veyron/next-stable-chromeosI did similar to Caesar but I tested on veyron-jerry instead of veyron-mickey. Like Caesar, I picked these together Heiko's v14.1 patches to resolve merge conflicts. I also picked into a slightly different tree (mine was a 4.4-based tree with backports, including Heiko's latest eDP device tree patches).
I also tested this series on an Exynos5800 Peach Pi Chromebook, using Heiko's branch [0] that is based on today's mainline (968f3e374fa).
I've seen no regressions with these patches, DP is working fine and also comes up after a S2R and DPMS on/off using the exynos-drm sysfs.
NOTE: I had to cherry-pick a SPI core fix [1] in order to make the Pi to boot. Not related to this series of course but I just mention it in case someone else wants to do the same test on this machine.
Quoted 8 lines
Tough I haven't reviewed the code and am not a graphics expert, I'd very much love to see this landed, presumably right after the merge window closes. Yakir's first patch
<https://patchwork.kernel.org/patch/6959211/> is nearly 1 year old and it really seems like if there were any major objections left they'd have been stated by now. v14 appears to be about 1 month old with no major comments.
Same here, this is the second time I tested this series (first time was v6 on October 25 [2]) and I think that has been out there for too long.
Quoted 2 lines
Tested-by Douglas Anderson <[email protected]>
Quoted 3 lines
-Doug
[0]: git://github.com/mmind/linux-rockchip.git tmp/analogix-dp-clean [1]: http://comments.gmane.org/gmane.linux.kernel.spi.devel/23563
[2]: http://lists.infradead.org/pipermail/linux-rockchip/2015-October/004884.html
Best regards,
Signature · 3 lines
Javier Martinez Canillas Open Source Group Samsung Research America
Heiko Stübner
maintainerWho is going to merge it [Was: Re: [PATCH v14 0/17] Add Analogix Core Display Port Driver]
Hi,
Am Dienstag, 22. März 2016, 16:19:37 schrieb Javier Martinez Canillas:
Quoted 2 lines · Doug Anderson
Quoted 1 line
On Thu, Mar 17, 2016 at 11:41 PM, Caesar Wang <[email protected]>
Quoted 5 lines · wrote:
Same here, this is the second time I tested this series (first time was v6 on October 25 [2]) and I think that has been out there for too long.
Quoted 1 line
Tested-by Douglas Anderson <[email protected]>
So we have 3 tests (Doug, Caesar and me) for the Rockchip side as well as Javier for the Exynos side based on the most recent drm state.
As said by a lot of people it would be cool to get this merged soon - hopefully directly after -rc1. The only remaining question is through which tree it should go.
I guess there are two basic options:
- Inki takes the series - we could see the Rockchip-Ack being implied but maybe Mark can provide an explicit one
- Mark takes the series with an Ack from Inki for the shared parts
Inki, Mark do you have a preference?
Thanks
Heiko
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Inki Dae
maintainerRe: Who is going to merge it [Was: Re: [PATCH v14 0/17] Add Analogix Core Display Port Driver]
+ Ajay kumar with Samsung email
Hi,
2016년 03월 23일 07:12에 Heiko Stübner 이(가) 쓴 글:
Quoted 19 lines
Hi,
Am Dienstag, 22. März 2016, 16:19:37 schrieb Javier Martinez Canillas:
Quoted 2 lines · Doug Anderson
Quoted 1 line
On Thu, Mar 17, 2016 at 11:41 PM, Caesar Wang <[email protected]>
Quoted 5 lines · wrote:
Same here, this is the second time I tested this series (first time was v6 on October 25 [2]) and I think that has been out there for too long.
Quoted 1 line
Tested-by Douglas Anderson <[email protected]>So we have 3 tests (Doug, Caesar and me) for the Rockchip side as well as Javier for the Exynos side based on the most recent drm state.
As said by a lot of people it would be cool to get this merged soon - hopefully directly after -rc1. The only remaining question is through which tree it should go.
Quoted 6 lines
I guess there are two basic options:
- Inki takes the series - we could see the Rockchip-Ack being implied but maybe Mark can provide an explicit one
- Mark takes the series with an Ack from Inki for the shared partsInki, Mark do you have a preference?
The problem would be that there is no drm bridge maintainer. I think the most suitable person as the maintainer would be Ajay Kumar who is an author of drm bridge framework. Of course, I could take them and have pull-request again. But it seems a little late. Dave had already pull-request.
To Ajay,
How about adding you as a drm bridge maintainer? DRM SoC driver maintainers would need a person who can manage the drm bridge relevant pathes.
Thanks,
Inki Dae
Quoted 5 lines
Thanks
Heiko
Heiko Stübner
maintainerRe: Who is going to merge it [Was: Re: [PATCH v14 0/17] Add Analogix Core Display Port Driver]
Am Mittwoch, 23. März 2016, 07:44:59 schrieb Inki Dae:
Quoted 33 lines
+ Ajay kumar with Samsung email
Hi,
2016년 03월 23일 07:12에 Heiko Stübner 이(가) 쓴 글:
Quoted 28 lines
Hi,
Am Dienstag, 22. März 2016, 16:19:37 schrieb Javier Martinez Canillas:
Quoted 3 lines · Doug Anderson
Quoted 2 lines
On Thu, Mar 17, 2016 at 11:41 PM, Caesar Wang
<[email protected]>Quoted 6 lines · wrote:
Same here, this is the second time I tested this series (first time was v6 on October 25 [2]) and I think that has been out there for too long.
Quoted 1 line
Tested-by Douglas Anderson <[email protected]>So we have 3 tests (Doug, Caesar and me) for the Rockchip side as well as Javier for the Exynos side based on the most recent drm state.
As said by a lot of people it would be cool to get this merged soon - hopefully directly after -rc1. The only remaining question is through which
tree it should go.I guess there are two basic options:
- Inki takes the series - we could see the Rockchip-Ack being implied but maybe Mark can provide an explicit one
- Mark takes the series with an Ack from Inki for the shared parts
Quoted 6 lines
Quoted 1 line
Inki, Mark do you have a preference?
The problem would be that there is no drm bridge maintainer. I think the most suitable person as the maintainer would be Ajay Kumar who is an author of drm bridge framework. Of course, I could take them and have pull-request again. But it seems a little late. Dave had already pull-request.
I really meant that for 4.7, not for the current merge window. I just want to make sure it goes into a maintainer tree shortly after v4.6-rc1, before something else changes the exynos-dp again :-) .
Quoted 3 lines
To Ajay,
How about adding you as a drm bridge maintainer? DRM SoC driver maintainers would need a person who can manage the drm bridge relevant pathes.
The previous example (dw_hdmi generalization between imx and rockchip) did just go through the imx tree. So either the Samsung or Rockchip drm-trees might be enough?
Heiko
Inki Dae
maintainerRe: Who is going to merge it [Was: Re: [PATCH v14 0/17] Add Analogix Core Display Port Driver]
2016년 03월 23일 07:52에 Heiko Stübner 이(가) 쓴 글:
Quoted 46 lines
Am Mittwoch, 23. März 2016, 07:44:59 schrieb Inki Dae:
Quoted 33 lines
+ Ajay kumar with Samsung email
Hi,
2016년 03월 23일 07:12에 Heiko Stübner 이(가) 쓴 글:
Quoted 28 lines
Hi,
Am Dienstag, 22. März 2016, 16:19:37 schrieb Javier Martinez Canillas:
Quoted 3 lines · Doug Anderson
Quoted 2 lines
On Thu, Mar 17, 2016 at 11:41 PM, Caesar Wang
<[email protected]>Quoted 6 lines · wrote:
Same here, this is the second time I tested this series (first time was v6 on October 25 [2]) and I think that has been out there for too long.
Quoted 1 line
Tested-by Douglas Anderson <[email protected]>So we have 3 tests (Doug, Caesar and me) for the Rockchip side as well as Javier for the Exynos side based on the most recent drm state.
As said by a lot of people it would be cool to get this merged soon - hopefully directly after -rc1. The only remaining question is through which
tree it should go.I guess there are two basic options:
- Inki takes the series - we could see the Rockchip-Ack being implied but maybe Mark can provide an explicit one
- Mark takes the series with an Ack from Inki for the shared partsQuoted 6 lines
Quoted 1 line
Inki, Mark do you have a preference?
The problem would be that there is no drm bridge maintainer. I think the most suitable person as the maintainer would be Ajay Kumar who is an author of drm bridge framework. Of course, I could take them and have pull-request again. But it seems a little late. Dave had already pull-request.
I really meant that for 4.7, not for the current merge window. I just want to make sure it goes into a maintainer tree shortly after v4.6-rc1, before something else changes the exynos-dp again :-).
Quoted 7 lines
Quoted 3 lines
To Ajay,
How about adding you as a drm bridge maintainer? DRM SoC driver maintainers would need a person who can manage the drm bridge relevant pathes.The previous example (
dw_hdmigeneralization between imx and rockchip) did just go through the imx tree. So either the Samsung or Rockchip drm-trees might be enough?
In this case, someone else may send an email again like you "who is going to merge?" That would be why we need a maintainer.
drm panel is already managed well by Thierry Reding without such confusion.
Thanks,
Inki Dae
Quoted 5 lines
Heiko
_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
Re: Who is going to merge it [Was: Re: [PATCH v14 0/17] Add Analogix Core Display Port Driver]
Quoted 4 lines · Inki Dae
In this case, someone else may send an email again like you "who is going to merge?" That would be why we need a maintainer.
drm panel is already managed well by Thierry Reding without such confusion.
You don't need a maintainer for every subdirectory just because it's a subdirectory...
Sometimes, having too many maintainers adds beaurocracy which becomes counter-productive. dw_hdmi seems to be adequately managed so far without there needing to be a "DRM bridge maintainer".
Signature · 3 lines
RMK's Patch system: http://www.arm.linux.org.uk/developer/patches/ FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net.
Inki Dae
maintainerRe: Who is going to merge it [Was: Re: [PATCH v14 0/17] Add Analogix Core Display Port Driver]
2016년 03월 23일 08:39에 Russell King - ARM Linux 이(가) 쓴 글:
Quoted 10 lines · Inki Dae
Quoted 4 lines
In this case, someone else may send an email again like you "who is going to merge?" That would be why we need a maintainer.
drm panel is already managed well by Thierry Reding without such confusion.
You don't need a maintainer for every subdirectory just because it's a subdirectory...
Sometimes, having too many maintainers adds beaurocracy which becomes
Yes, but... if there is no someone who is responsible for maintainership, then we would receive such emails like Heiko sent "who is going to merge"
I don't also want adding many maintainers unnecessary but drm bridge - although the framework is a thin and small - is used *over the ARM SoC* so that many confusions may happen for upstream.
So although it's small framework or just subdirectory, we would need someone who can manage the framework to avoid further confusion if necessary.
Thanks,
Inki Dae
Quoted 3 lines
counter-productive.
dw_hdmiseems to be adequately managed so far without there needing to be a "DRM bridge maintainer".
Re: Who is going to merge it [Was: Re: [PATCH v14 0/17] Add Analogix Core Display Port Driver]
Quoted 1 line · Inki Dae
Please wrap your long lines.
Quoted 11 lines
2016년 03월 23일 08:39에 Russell King - ARM Linux 이(가) 쓴 글:
Quoted 9 lines · Inki Dae
Quoted 4 lines
In this case, someone else may send an email again like you "who is going to merge?" That would be why we need a maintainer.
drm panel is already managed well by Thierry Reding without such confusion.
You don't need a maintainer for every subdirectory just because it's a subdirectory...
Quoted 7 lines
Quoted 1 line
Sometimes, having too many maintainers adds beaurocracy which becomes
Yes, but... if there is no someone who is responsible for maintainership, then we would receive such emails like Heiko sent "who is going to merge" I don't also want adding many maintainers unnecessary but drm bridge - although the framework is a thin and small - is used *over the ARM SoC* so that many confusions may happen for upstream.
Just because someone asks doesn't mean someone needs to be appointed. Maybe the question that should be asked instead is whether the original author is willing to maintain their driver.
Quoted 3 lines
So although it's small framework or just subdirectory, we would need someone who can manage the framework to avoid further confusion if necessary.
So maybe it just doesn't need a maintainer, and maybe those the owner of the bridge driver should be responsible for choosing the tree which it's merged through along with updates. That's how dw-hdmi has been managed on the whole.
It also means that the bridge driver maintainer is able to test changes to the bridge driver, rather than having some over-arching bridge subdirectory maintainer who doesn't have a clue whether the changes work on the hardware.
IMHO, having bridge driver authors/maintainers look after their own code has many advantages.
Signature · 3 lines
RMK's Patch system: http://www.arm.linux.org.uk/developer/patches/ FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net.
Dave Airlie
maintainerRe: Who is going to merge it [Was: Re: [PATCH v14 0/17] Add Analogix Core Display Port Driver]
Quoted 10 lines
Quoted 4 lines
So although it's small framework or just subdirectory, we would need someone who can manage the framework to avoid further confusion if necessary.
So maybe it just doesn't need a maintainer, and maybe those the owner of the bridge driver should be responsible for choosing the tree which it's merged through along with updates. That's how dw-hdmi has been managed on the whole.
Quoted 7 lines
It also means that the bridge driver maintainer is able to test changes to the bridge driver, rather than having some over-arching bridge subdirectory maintainer who doesn't have a clue whether the changes work on the hardware.
IMHO, having bridge driver authors/maintainers look after their own code has many advantages.
The author just send me a pull request with acks from a git tree that hopefully both people agreed and tested from. No need to send this via another maintainer layer.
Dave.
Re: Who is going to merge it [Was: Re: [PATCH v14 0/17] Add Analogix Core Display Port Driver]
Quoted 13 lines · Dave Airlie
Quoted 13 lines
Quoted 3 lines
So although it's small framework or just subdirectory, we would need someone who can manage the framework to avoid further confusion if necessary.
So maybe it just doesn't need a maintainer, and maybe those the owner of the bridge driver should be responsible for choosing the tree which it's merged through along with updates. That's how dw-hdmi has been managed on the whole.
It also means that the bridge driver maintainer is able to test changes to the bridge driver, rather than having some over-arching bridge subdirectory maintainer who doesn't have a clue whether the changes work on the hardware.
Quoted 10 lines
Quoted 2 lines
IMHO, having bridge driver authors/maintainers look after their own code has many advantages.
The author just send me a pull request with acks from a git tree that hopefully both people agreed and tested from. No need to send this via another maintainer layer.
Dave.
Sure, these patches looks cool, I think it's ready to be merged, I'd like to give a Acked-by on rockchip side.
Signature · 7 lines
Mark Yao -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: Who is going to merge it [Was: Re: [PATCH v14 0/17] Add Analogix Core Display Port Driver]
In reply to Dave AirlieQuoted 15 lines · Dave Airlie
Quoted 15 lines
Quoted 4 lines
So although it's small framework or just subdirectory, we would need someone who can manage the framework to avoid further confusion if necessary.
So maybe it just doesn't need a maintainer, and maybe those the owner of the bridge driver should be responsible for choosing the tree which it's merged through along with updates. That's how dw-hdmi has been managed on the whole.
It also means that the bridge driver maintainer is able to test changes to the bridge driver, rather than having some over-arching bridge subdirectory maintainer who doesn't have a clue whether the changes work on the hardware.
Quoted 6 lines
Quoted 2 lines
IMHO, having bridge driver authors/maintainers look after their own code has many advantages.
The author just send me a pull request with acks from a git tree that hopefully both people agreed and tested from. No need to send this via another maintainer layer.
I have in the past "maintained" bridge drivers as part of the panel tree, but I have no objections at all for this to go in via one of the trees where it is used and can actually be tested.
Thierry
Re: Who is going to merge it [Was: Re: [PATCH v14 0/17] Add Analogix Core Display Port Driver]
In reply to Dave AirlieQuoted 13 lines · Dave Airlie
Quoted 13 lines
Quoted 3 lines
So although it's small framework or just subdirectory, we would need someone who can manage the framework to avoid further confusion if necessary.
So maybe it just doesn't need a maintainer, and maybe those the owner of the bridge driver should be responsible for choosing the tree which it's merged through along with updates. That's how dw-hdmi has been managed on the whole.
It also means that the bridge driver maintainer is able to test changes to the bridge driver, rather than having some over-arching bridge subdirectory maintainer who doesn't have a clue whether the changes work on the hardware.
Quoted 8 lines
Quoted 2 lines
IMHO, having bridge driver authors/maintainers look after their own code has many advantages.
The author just send me a pull request with acks from a git tree that hopefully both people agreed and tested from. No need to send this via another maintainer layer.
Dave.
Wow, thanks all ! such cool news :-D I'll prepare my pull request soon
- Yakir
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: Who is going to merge it [Was: Re: [PATCH v14 0/17] Add Analogix Core Display Port Driver]
In reply to Dave AirlieQuoted 13 lines · Dave Airlie
Quoted 13 lines
Quoted 3 lines
So although it's small framework or just subdirectory, we would need someone who can manage the framework to avoid further confusion if necessary.
So maybe it just doesn't need a maintainer, and maybe those the owner of the bridge driver should be responsible for choosing the tree which it's merged through along with updates. That's how dw-hdmi has been managed on the whole.
It also means that the bridge driver maintainer is able to test changes to the bridge driver, rather than having some over-arching bridge subdirectory maintainer who doesn't have a clue whether the changes work on the hardware.
Quoted 8 lines
Quoted 2 lines
IMHO, having bridge driver authors/maintainers look after their own code has many advantages.
The author just send me a pull request with acks from a git tree that hopefully both people agreed and tested from. No need to send this via another maintainer layer.
Dave.
Wow, thanks all ! such cool news :-D I'll prepare my pull request soon
- Yakir
Re: Who is going to merge it [Was: Re: [PATCH v14 0/17] Add Analogix Core Display Port Driver]
In reply to Dave AirlieQuoted 13 lines · Dave Airlie
Quoted 13 lines
Quoted 3 lines
So although it's small framework or just subdirectory, we would need someone who can manage the framework to avoid further confusion if necessary.
So maybe it just doesn't need a maintainer, and maybe those the owner of the bridge driver should be responsible for choosing the tree which it's merged through along with updates. That's how dw-hdmi has been managed on the whole.
It also means that the bridge driver maintainer is able to test changes to the bridge driver, rather than having some over-arching bridge subdirectory maintainer who doesn't have a clue whether the changes work on the hardware.
Quoted 8 lines
Quoted 2 lines
IMHO, having bridge driver authors/maintainers look after their own code has many advantages.
The author just send me a pull request with acks from a git tree that hopefully both people agreed and tested from. No need to send this via another maintainer layer.
Dave.
Wow, thanks all ! such cool news :-D I'll prepare my pull request soon
- Yakir
Re: Who is going to merge it [Was: Re: [PATCH v14 0/17] Add Analogix Core Display Port Driver]
In reply to Dave AirlieQuoted 13 lines · Dave Airlie
Quoted 13 lines
Quoted 3 lines
So although it's small framework or just subdirectory, we would need someone who can manage the framework to avoid further confusion if necessary.
So maybe it just doesn't need a maintainer, and maybe those the owner of the bridge driver should be responsible for choosing the tree which it's merged through along with updates. That's how dw-hdmi has been managed on the whole.
It also means that the bridge driver maintainer is able to test changes to the bridge driver, rather than having some over-arching bridge subdirectory maintainer who doesn't have a clue whether the changes work on the hardware.
Quoted 8 lines
Quoted 2 lines
IMHO, having bridge driver authors/maintainers look after their own code has many advantages.
The author just send me a pull request with acks from a git tree that hopefully both people agreed and tested from. No need to send this via another maintainer layer.
Dave.
Wow, thanks all ! such cool news :-D I'll prepare my pull request soon
- Yakir
A message that is not in the archive (sent off-list or not yet received): CAPM=9tz9_rbGJFuv-+YN=Sicfng++tHTDLrOX5Ohtwft+VnwtA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org
Re: Who is going to merge it [Was: Re: [PATCH v14 0/17] Add Analogix Core Display Port Driver]
Quoted 13 lines · Dave Airlie
Quoted 13 lines
Quoted 3 lines
So although it's small framework or just subdirectory, we would need someone who can manage the framework to avoid further confusion if necessary.
So maybe it just doesn't need a maintainer, and maybe those the owner of the bridge driver should be responsible for choosing the tree which it's merged through along with updates. That's how dw-hdmi has been managed on the whole.
It also means that the bridge driver maintainer is able to test changes to the bridge driver, rather than having some over-arching bridge subdirectory maintainer who doesn't have a clue whether the changes work on the hardware.
Quoted 8 lines
Quoted 2 lines
IMHO, having bridge driver authors/maintainers look after their own code has many advantages.
The author just send me a pull request with acks from a git tree that hopefully both people agreed and tested from. No need to send this via another maintainer layer.
Dave.
Wow, thanks all ! such cool news :-D I'll prepare my pull request soon
- Yakir
Re: Who is going to merge it [Was: Re: [PATCH v14 0/17] Add Analogix Core Display Port Driver]
In reply to Dave AirlieQuoted 13 lines · Dave Airlie
Quoted 13 lines
Quoted 3 lines
So although it's small framework or just subdirectory, we would need someone who can manage the framework to avoid further confusion if necessary.
So maybe it just doesn't need a maintainer, and maybe those the owner of the bridge driver should be responsible for choosing the tree which it's merged through along with updates. That's how dw-hdmi has been managed on the whole.
It also means that the bridge driver maintainer is able to test changes to the bridge driver, rather than having some over-arching bridge subdirectory maintainer who doesn't have a clue whether the changes work on the hardware.
Quoted 8 lines
Quoted 2 lines
IMHO, having bridge driver authors/maintainers look after their own code has many advantages.
The author just send me a pull request with acks from a git tree that hopefully both people agreed and tested from. No need to send this via another maintainer layer.
Dave.
Wow, thanks all ! such cool news :-D I'll prepare my pull request soon
- Yakir
Am Montag, 15. Februar 2016, 19:08:05 schrieb Yakir Yang:
Quoted 23 lines
Hi all,
The Samsung Exynos eDP controller and Rockchip RK3288 eDP controller
share the same IP, so a lot of parts can be re-used. I split the common code into bridge directory, then rk3288 and exynos only need to keep some platform code. Cause I can't find the exact IP name of exynos dp controller, so I decide to name dp core driver with "analogix" which I find in rk3288 eDP TRMBut there are still three light registers setting different between exynos and rk3288.
1. RK3288 have five special pll registers which not indicate in exynos dp controller.
2. The address ofDP_PHY_PD(dp phy power manager register)are different between rk3288 and exynos.
3. Rk3288 and exynos have different setting withAUX_HW_RETRY_CTL(dp debug register).Due to Mark Yao have introduced the ATOMIC support to Rockchip drm, so it's okay to use the ATOMIC helpers functions in
connector_funcs. No need to splict the connector init to platform driver anymore, and this is the biggest change since version 11.
Quoted 4 lines
This v14 didn't have lots of new changes which seems not the correct time to upgrade the version number, but I have changed ordering of patches (adding 2 more, and removing 2 out). Especially to prevent confusing people, so I updated the whole series.
I guess I never said that explicitly, but of course I have tested this numerous times, so
This series
Quoted 24 lines · Yakir Yang
Hi all,
The Samsung Exynos eDP controller and Rockchip RK3288 eDP controller
share the same IP, so a lot of parts can be re-used. I split the common code into bridge directory, then rk3288 and exynos only need to keep some platform code. Cause I can't find the exact IP name of exynos dp controller, so I decide to name dp core driver with "analogix" which I find in rk3288 eDP TRMBut there are still three light registers setting different between exynos and rk3288.
1. RK3288 have five special pll registers which not indicate in exynos dp controller.
2. The address ofDP_PHY_PD(dp phy power manager register)are different between rk3288 and exynos.
3. Rk3288 and exynos have different setting withAUX_HW_RETRY_CTL(dp debug register).Due to Mark Yao have introduced the ATOMIC support to Rockchip drm, so it's okay to use the ATOMIC helpers functions in
connector_funcs. No need to splict the connector init to platform driver anymore, and this is the biggest change since version 11.
Quoted 4 lines
This v14 didn't have lots of new changes which seems not the correct time to upgrade the version number, but I have changed ordering of patches (adding 2 more, and removing 2 out). Especially to prevent confusing people, so I updated the whole series.
So I'm jumping into this part way late, but just noticed (well Thierry pointed this out to me) that the exynos dp driver reinvents all the dp and dp-aux helpers we already. That's somewhat okish for a private driver (and exynos has a reputation for that kind of stuff), but imo not ok for a shared driver.
Not saying this should block merging this patch, but it really needs to be addressed. All the dp aux and edid read code in the current exynos_dp_core/reg.c files needs to be replaced with dp helpers and the core i2c edid reading code.
Who's going to sign up to do this?
-Daniel
Quoted 234 lines
Thanks,
- YakirChanges in v14:
- Rebase the new changes in imx-dp driver
- Split up this patch into 3 parts, make this easy to review (Heiko)
- Remove the Rockchip DP PHY to an separate thread (Heiko)https://patchwork.kernel.org/patch/8312701/Changes in v13:
- Use .enable instead of preprare/commit inencoder_helper_funcs(Heiko)
- Fix the missing parameters withdrm_encoder_init()helper function. (Heiko)Changes in v12:
- Move the connector init toanalogix_dpdriver, and using ATOMIC helper (Heiko)
- Add the ack from Jingoo
- Remove the enumlink_rate_typestruct, using the marcos indrm_dp_helper.h(Jingoo)Changes in v11:
- Uses tabs to fix the indentation issues inanalogix_dp_core.h(Heiko)
- Rename the "analogix,need-force-hpd" to common 'force-hpd' (Rob)
- Add the ack from Rob Herring
- Revert parts of Gustavo Padovan's changes in commit:
drm/exynos: do not start enabling DP atbind()phase
Add dp phy poweron function in bind time.
- Move the panel prepare fromget_modestime to bind time, and move the panel unprepare frombridge->disableto unbind time. (Heiko)Changes in v10:
- Add the ack from Rob Herring
- Correct theROCKCHIP_ANALOGIX_DPindentation inKconfigto tabs here (Heiko)
- Add the ack from Rob Herring
- Remove the surplus "plat_data" check. (Heiko)(quoted diff) +1
-1- switch (dp->plat_data && dp->plat_data->dev_type) { + switch (dp->plat_data->dev_type) {Changes in v9:
- Document more details for 'ports' property.Changes in v8:
- Correct the right document path of display-timing.txt (Heiko)
- Correct the misspell of 'from' to 'frm'. (Heiko)
- Modify the commit subject name. (Heiko)Changes in v7:
- Back to use theof_property_read_bool()interfacs to provoid backward compatibility of "hsync-active-high" "vsync-active-high" "interlaced" to avoid-EOVERFLOWerror (Krzysztof)Changes in v6:
- Fix theKconfigrecursive dependency (Javier)
- Fix Peach Pit hpd property name error:(quoted diff) +1
-1- hpd-gpio = <&gpx2 6 0>; + hpd-gpios = <&gpx2 6 0>;Changes in v5:
- Correct the check condition ofgpio_is_validwhen driver try to get the "hpd-gpios" DT propery. (Heiko)
- Move the platform attach callback in the front of core driver bridge attch function. Cause once platform failed at attach, core driver should still failed, so no need to init connector before platform attached (Krzysztof)
- Keep code style no changes with the previousexynos_dp_code.cin this patch, and update commit message about the new export symbol (Krzysztof)
- Gather the device type patch (v4 11/16) into this one. (Krzysztof)
- leave out the connector registration to analogix platform driver. (Thierry)
- Resequence this patch afteranalogix_dpdriver have been split fromexynos_dpcode, and rephrase reasonable commit message, and remove some controversial style (Krzysztof)- analogix_dp_write_byte_to_dpcd( - dp, DP_TEST_RESPONSE, + analogix_dp_write_byte_to_dpcd(dp, + DP_TEST_RESPONSE, DP_TEST_EDID_CHECKSUM_WRITE);- Switch video timing type to "u32", so driver could use "
of_property_read_u32" to get the backword timing values. Krzysztof suggest me that driver could use the "of_property_read_bool" to get backword timing values, but that interfacs would modify the originaldrm_display_modetiming directly (whether those properties exists or not).
- Correct the misspell in commit message. (Krzysztof)
- Remove the empty line at the end of document, and correct the endpoint numbers in the example DT node, and remove the regulator iomux setting in driver code while using the pinctl in devicetree instead. (Heiko)
- Add device type declared, cause the previous "platform device type support (v4 11/16)" already merge into (v5 02/14).
- Implement connector registration code. (Thierry)
- Split binding doc's from driver changes. (Rob)
- Add eDP hotplug pinctrl property. (Heiko)Changes in v4:
- Update "analogix,hpd-gpios" to "hpd-gpios" DT propery. (Rob)
- Rename "analogix_dp-exynos.c" file name to "exynos_dp.c" (Jingoo)
- Create a separate folder for analogix code in bridge/ (Archit)
- Update commit message more readable. (Jingoo)
- Adjust the order from 05 to 04
- Provide backword compatibility with samsung. (Krzysztof)
- Split all DTS changes, and provide backward compatibility. Mark old properties as deprecated but still support them. (Krzysztof)
- Update "analogix,hpd-gpio" to "hpd-gpios" prop name. (Rob)
- Deprecated some properties which could parsed from Edid/Mode/DPCD. (Thierry)
"analogix,color-space" & "analogix,color-depth" &
"analogix,link-rate" & "analogix,lane-count" &
"analogix,ycbcr-coeff" & "analogix,dynamic-range" &
"vsync-active-high" & "hsync-active-high" & "interlaces"
- Separate all DTS changes to a separate patch. (Krzysztof)
- Remove some deprecated DT properties in rockchip dp document.
- Seprate the link-rate and lane-count limit out with thedevice_typeflag. (Thierry)
- Take Jingoo suggest, add commit messages.
- Calldrm_panel_prepare()in .get_modes function, ensure panel should power on before driver try to read edid message.Changes in v3:
- Move exynos'svideo_timingcode to analogix_dp-exynos platform driver, addget_modesmethod to structanalogix_dp_plat_data. (Thierry)
- Rename some "samsung*" dts propery to "analogix*". (Heiko)
- Thelink_rateandlane_countshouldn't config to the DT property value directly, but we can take those as hardware limite. For example, RK3288 only support 4 physical lanes of 2.7/1.62 Gbps/lane, so DT property would like "link-rate =0x0a" "lane-count = 4". (Thierry)
- Dynamic parse video timing info from structdrm_display_modeand structdrm_display_info. (Thierry)
- Add devicetree binding documents. (Heiko)
- Remove sync pol & colorimetry properies from the new analogix dp driver devicetree binding. (Thierry)
- Update the exist exynos dtsi file with the latest DP DT properies.
- Leave "sclk_edp_24m" to rockchip dp phy driver which name to "24m", and leave "sclk_edp" to analogix dp core driver which name to "dp", and leave "pclk_edp" to rockchip dp platform driver which name to "pclk". (Thierry & Heiko)
- Add devicetree binding document. (Heiko)
- Remove "rockchip,panel" DT property, take use of remote point to get panel node. (Heiko)
- Add the new function pointdp_platdata->get_modes()init.
- Add "analogix,need-force-hpd" to indicate whether driver need foce hpd when hpd detect failed.
- move dp hpd detect to connector detect function.
- Add edid modes parse supportChanges in v2:
- Remove new copyright (Jingoo)
- Fix compiled failed due toanalogix_dp_devicemisspell
- Improved commit message more readable, and avoid using some uncommon style like bellow: (Joe Preches)
- retval = exynos_dp_read_bytes_from_i2c(...
...);
+ retval =
+exynos_dp_read_bytes_from_i2c(......);
- Get panel node with remote-endpoint method, and create devicetree binding for driver. (Heiko)
- Remove the clock enable/disbale with "sclk_edp" & "sclk_edp_24m", leave those clock to rockchip dp phy driver.
- Fix compile failed dut tophy_pd_addrvariable misspell errorHeiko Stuebner (2):
drm/exynos: dp: rename implementation specific driver part
drm: bridge: analogix/dp: rename register constantsYakir Yang (15):
drm: bridge: analogix/dp: split exynos dp driver to bridge directory
drm: bridge: analogix/dp: fix some obvious code style
drm: bridge: analogix/dp: remove duplicate configuration of link rate
and link count
drm: bridge: analogix/dp: dynamic parsesync_pol& interlace &
dynamic_range
dt-bindings: add document for analogix display port driver
ARM: dts: exynos/dp: remove some properties that deprecated by
analogix_dpdriver
drm: rockchip: dp: add rockchip platform dp driver
dt-bindings: add document for rockchip variant ofanalogix_dp
drm: bridge: analogix/dp: add some rk3288 special registers setting
drm: bridge: analogix/dp: add max link rate and lane count limit forRK3288drm: bridge: analogix/dp: try force hpd after plug in lookup failed
drm: bridge: analogix/dp: move hpd detect to connector detect function
drm: bridge: analogix/dp: add edid modes parse inget_modesmethod
drm: bridge: analogix/dp: add panel prepare/unprepare in
suspend/resume time
drm: bridge: analogix/dp: Fix the possible dead lock in bridge disable
time.../bindings/display/bridge/analogix_dp.txt | 52 + .../bindings/display/exynos/exynos_dp.txt | 93 +- .../display/rockchip/analogix_dp-rockchip.txt | 92 ++ arch/arm/boot/dts/exynos5250-arndale.dts | 2 - arch/arm/boot/dts/exynos5250-smdk5250.dts | 2 - arch/arm/boot/dts/exynos5250-snow-common.dtsi | 4 +- arch/arm/boot/dts/exynos5250-spring.dts | 4 +- arch/arm/boot/dts/exynos5420-peach-pit.dts | 4 +- arch/arm/boot/dts/exynos5420-smdk5420.dts | 2 - arch/arm/boot/dts/exynos5800-peach-pi.dts | 2 - drivers/gpu/drm/bridge/Kconfig | 2 + drivers/gpu/drm/bridge/Makefile | 1 + drivers/gpu/drm/bridge/analogix/Kconfig | 3 + drivers/gpu/drm/bridge/analogix/Makefile | 1 + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 1430 ++++++++++++++++++ drivers/gpu/drm/bridge/analogix/analogix_dp_core.h | 281 ++++ drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 1320 +++++++++++++++++ .../analogix/analogix_dp_reg.h} | 270 ++-- drivers/gpu/drm/exynos/Kconfig | 3 +- drivers/gpu/drm/exynos/Makefile | 2 +- drivers/gpu/drm/exynos/exynos_dp.c | 324 +++++ drivers/gpu/drm/exynos/exynos_dp_core.c | 1510 -------------------- drivers/gpu/drm/exynos/exynos_dp_core.h | 282 ---- drivers/gpu/drm/exynos/exynos_dp_reg.c | 1263 ---------------- drivers/gpu/drm/rockchip/Kconfig | 9 + drivers/gpu/drm/rockchip/Makefile | 1 + drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 384 +++++ include/drm/bridge/analogix_dp.h | 41 + 28 files changed, 4115 insertions(+), 3269 deletions(-) create mode 100644 Documentation/devicetree/bindings/display/bridge/analogix_dp.txt create mode 100644 Documentation/devicetree/bindings/display/rockchip/analogix_dp-rockchip.txt create mode 100644 drivers/gpu/drm/bridge/analogix/Kconfig create mode 100644 drivers/gpu/drm/bridge/analogix/Makefile create mode 100644 drivers/gpu/drm/bridge/analogix/analogix_dp_core.c create mode 100644 drivers/gpu/drm/bridge/analogix/analogix_dp_core.h create mode 100644 drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c rename drivers/gpu/drm/{exynos/exynos_dp_reg.h => bridge/analogix/analogix_dp_reg.h} (62%) create mode 100644 drivers/gpu/drm/exynos/exynos_dp.c delete mode 100644 drivers/gpu/drm/exynos/exynos_dp_core.c delete mode 100644 drivers/gpu/drm/exynos/exynos_dp_core.h delete mode 100644 drivers/gpu/drm/exynos/exynos_dp_reg.c create mode 100644 drivers/gpu/drm/rockchip/analogix_dp-rockchip.c create mode 100644 include/drm/bridge/analogix_dp.hSignature · 7 lines
1.9.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 36 lines · Daniel Vetter
Quoted 24 lines · Yakir Yang
Hi all,
The Samsung Exynos eDP controller and Rockchip RK3288 eDP controller
share the same IP, so a lot of parts can be re-used. I split the common code into bridge directory, then rk3288 and exynos only need to keep some platform code. Cause I can't find the exact IP name of exynos dp controller, so I decide to name dp core driver with "analogix" which I find in rk3288 eDP TRMBut there are still three light registers setting different between exynos and rk3288.
1. RK3288 have five special pll registers which not indicate in exynos dp controller.
2. The address ofDP_PHY_PD(dp phy power manager register)are different between rk3288 and exynos.
3. Rk3288 and exynos have different setting withAUX_HW_RETRY_CTL(dp debug register).Due to Mark Yao have introduced the ATOMIC support to Rockchip drm, so it's okay to use the ATOMIC helpers functions in
connector_funcs. No need to splict the connector init to platform driver anymore, and this is the biggest change since version 11.Quoted 4 lines
This v14 didn't have lots of new changes which seems not the correct time to upgrade the version number, but I have changed ordering of patches (adding 2 more, and removing 2 out). Especially to prevent confusing people, so I updated the whole series.
So I'm jumping into this part way late, but just noticed (well Thierry pointed this out to me) that the exynos dp driver reinvents all the dp and dp-aux helpers we already. That's somewhat okish for a private driver (and exynos has a reputation for that kind of stuff), but imo not ok for a shared driver.
Quoted 4 lines
Not saying this should block merging this patch, but it really needs to be addressed. All the dp aux and edid read code in the current
exynos_dp_core/reg.cfiles needs to be replaced with dp helpers and the core i2c edid reading code.
Agreed. I think a first step would be to implement and register a drm_dp_aux object for Analogix DP hardware. That will give you access to a slew of helpers that allow to read DPCD, parse link status and use the standard EDID reading routines that the DRM core already has. This should remove a lot of duplication from this driver.
For extra incentive, doing this might even fix a bug or two.
Thierry
Hi Daniel,
Quoted 34 lines · Daniel Vetter
Quoted 23 lines · Yakir Yang
Hi all,
The Samsung Exynos eDP controller and Rockchip RK3288 eDP controller
share the same IP, so a lot of parts can be re-used. I split the common code into bridge directory, then rk3288 and exynos only need to keep some platform code. Cause I can't find the exact IP name of exynos dp controller, so I decide to name dp core driver with "analogix" which I find in rk3288 eDP TRMBut there are still three light registers setting different between exynos and rk3288.
1. RK3288 have five special pll registers which not indicate in exynos dp controller.
2. The address ofDP_PHY_PD(dp phy power manager register)are different between rk3288 and exynos.
3. Rk3288 and exynos have different setting withAUX_HW_RETRY_CTL(dp debug register).Due to Mark Yao have introduced the ATOMIC support to Rockchip drm, so it's okay to use the ATOMIC helpers functions in
connector_funcs. No need to splict the connector init to platform driver anymore, and this is the biggest change since version 11.Quoted 4 lines
This v14 didn't have lots of new changes which seems not the correct time to upgrade the version number, but I have changed ordering of patches (adding 2 more, and removing 2 out). Especially to prevent confusing people, so I updated the whole series.
So I'm jumping into this part way late, but just noticed (well Thierry pointed this out to me) that the exynos dp driver reinvents all the dp and dp-aux helpers we already. That's somewhat okish for a private driver (and exynos has a reputation for that kind of stuff), but imo not ok for a shared driver.
Quoted 6 lines
Not saying this should block merging this patch, but it really needs to be addressed. All the dp aux and edid read code in the current
exynos_dp_core/reg.cfiles needs to be replaced with dp helpers and the core i2c edid reading code.Who's going to sign up to do this?
Volunteer to that, after finish this thread, I would send new series to switch to take use of dp helper.
:-D
- Yakir
Quoted 235 lines
-Daniel
Quoted 233 lines
Thanks,
- YakirChanges in v14:
- Rebase the new changes in imx-dp driver
- Split up this patch into 3 parts, make this easy to review (Heiko)
- Remove the Rockchip DP PHY to an separate thread (Heiko)https://patchwork.kernel.org/patch/8312701/Changes in v13:
- Use .enable instead of preprare/commit inencoder_helper_funcs(Heiko)
- Fix the missing parameters withdrm_encoder_init()helper function. (Heiko)Changes in v12:
- Move the connector init toanalogix_dpdriver, and using ATOMIC helper (Heiko)
- Add the ack from Jingoo
- Remove the enumlink_rate_typestruct, using the marcos indrm_dp_helper.h(Jingoo)Changes in v11:
- Uses tabs to fix the indentation issues inanalogix_dp_core.h(Heiko)
- Rename the "analogix,need-force-hpd" to common 'force-hpd' (Rob)
- Add the ack from Rob Herring
- Revert parts of Gustavo Padovan's changes in commit:
drm/exynos: do not start enabling DP atbind()phase
Add dp phy poweron function in bind time.
- Move the panel prepare fromget_modestime to bind time, and move the panel unprepare frombridge->disableto unbind time. (Heiko)Changes in v10:
- Add the ack from Rob Herring
- Correct theROCKCHIP_ANALOGIX_DPindentation inKconfigto tabs here (Heiko)
- Add the ack from Rob Herring
- Remove the surplus "plat_data" check. (Heiko)(quoted diff) +1
-1- switch (dp->plat_data && dp->plat_data->dev_type) { + switch (dp->plat_data->dev_type) {Changes in v9:
- Document more details for 'ports' property.Changes in v8:
- Correct the right document path of display-timing.txt (Heiko)
- Correct the misspell of 'from' to 'frm'. (Heiko)
- Modify the commit subject name. (Heiko)Changes in v7:
- Back to use theof_property_read_bool()interfacs to provoid backward compatibility of "hsync-active-high" "vsync-active-high" "interlaced" to avoid-EOVERFLOWerror (Krzysztof)Changes in v6:
- Fix theKconfigrecursive dependency (Javier)
- Fix Peach Pit hpd property name error:(quoted diff) +1
-1- hpd-gpio = <&gpx2 6 0>; + hpd-gpios = <&gpx2 6 0>;Changes in v5:
- Correct the check condition ofgpio_is_validwhen driver try to get the "hpd-gpios" DT propery. (Heiko)
- Move the platform attach callback in the front of core driver bridge attch function. Cause once platform failed at attach, core driver should still failed, so no need to init connector before platform attached (Krzysztof)
- Keep code style no changes with the previousexynos_dp_code.cin this patch, and update commit message about the new export symbol (Krzysztof)
- Gather the device type patch (v4 11/16) into this one. (Krzysztof)
- leave out the connector registration to analogix platform driver. (Thierry)
- Resequence this patch afteranalogix_dpdriver have been split
fromexynos_dpcode, and rephrase reasonable commit message, and remove some controversial style (Krzysztof)- analogix_dp_write_byte_to_dpcd( - dp, DP_TEST_RESPONSE, + analogix_dp_write_byte_to_dpcd(dp, + DP_TEST_RESPONSE, DP_TEST_EDID_CHECKSUM_WRITE);- Switch video timing type to "u32", so driver could use "
of_property_read_u32" to get the backword timing values. Krzysztof suggest me that driver could use the "of_property_read_bool" to get backword timing values, but that interfacs would modify the originaldrm_display_modetiming directly (whether those properties exists or not).
- Correct the misspell in commit message. (Krzysztof)
- Remove the empty line at the end of document, and correct the endpoint numbers in the example DT node, and remove the regulator iomux setting in driver code while using the pinctl in devicetree instead. (Heiko)
- Add device type declared, cause the previous "platform device type support (v4 11/16)" already merge into (v5 02/14).
- Implement connector registration code. (Thierry)
- Split binding doc's from driver changes. (Rob)
- Add eDP hotplug pinctrl property. (Heiko)Changes in v4:
- Update "analogix,hpd-gpios" to "hpd-gpios" DT propery. (Rob)
- Rename "analogix_dp-exynos.c" file name to "exynos_dp.c" (Jingoo)
- Create a separate folder for analogix code in bridge/ (Archit)
- Update commit message more readable. (Jingoo)
- Adjust the order from 05 to 04
- Provide backword compatibility with samsung. (Krzysztof)
- Split all DTS changes, and provide backward compatibility. Mark old properties as deprecated but still support them. (Krzysztof)
- Update "analogix,hpd-gpio" to "hpd-gpios" prop name. (Rob)
- Deprecated some properties which could parsed from Edid/Mode/DPCD. (Thierry)
"analogix,color-space" & "analogix,color-depth" &
"analogix,link-rate" & "analogix,lane-count" &
"analogix,ycbcr-coeff" & "analogix,dynamic-range" &
"vsync-active-high" & "hsync-active-high" & "interlaces"
- Separate all DTS changes to a separate patch. (Krzysztof)
- Remove some deprecated DT properties in rockchip dp document.
- Seprate the link-rate and lane-count limit out with thedevice_typeflag. (Thierry)
- Take Jingoo suggest, add commit messages.
- Calldrm_panel_prepare()in .get_modes function, ensure panel should power on before driver try to read edid message.Changes in v3:
- Move exynos'svideo_timingcode to analogix_dp-exynos platform driver, addget_modesmethod to structanalogix_dp_plat_data. (Thierry)
- Rename some "samsung*" dts propery to "analogix*". (Heiko)
- Thelink_rateandlane_countshouldn't config to the DT property value directly, but we can take those as hardware limite. For example, RK3288 only support 4 physical lanes of 2.7/1.62 Gbps/lane, so DT property would like "link-rate =0x0a" "lane-count = 4". (Thierry)
- Dynamic parse video timing info from structdrm_display_modeand structdrm_display_info. (Thierry)
- Add devicetree binding documents. (Heiko)
- Remove sync pol & colorimetry properies from the new analogix dp driver devicetree binding. (Thierry)
- Update the exist exynos dtsi file with the latest DP DT properies.
- Leave "sclk_edp_24m" to rockchip dp phy driver which name to "24m", and leave "sclk_edp" to analogix dp core driver which name to "dp", and leave "pclk_edp" to rockchip dp platform driver which name to "pclk". (Thierry & Heiko)
- Add devicetree binding document. (Heiko)
- Remove "rockchip,panel" DT property, take use of remote point to get panel node. (Heiko)
- Add the new function pointdp_platdata->get_modes()init.
- Add "analogix,need-force-hpd" to indicate whether driver need foce hpd when hpd detect failed.
- move dp hpd detect to connector detect function.
- Add edid modes parse supportChanges in v2:
- Remove new copyright (Jingoo)
- Fix compiled failed due toanalogix_dp_devicemisspell
- Improved commit message more readable, and avoid using some uncommon style like bellow: (Joe Preches)
- retval = exynos_dp_read_bytes_from_i2c(...
...);
+ retval =
+exynos_dp_read_bytes_from_i2c(......);
- Get panel node with remote-endpoint method, and create devicetree binding for driver. (Heiko)
- Remove the clock enable/disbale with "sclk_edp" & "sclk_edp_24m", leave those clock to rockchip dp phy driver.
- Fix compile failed dut tophy_pd_addrvariable misspell errorHeiko Stuebner (2):
drm/exynos: dp: rename implementation specific driver part
drm: bridge: analogix/dp: rename register constantsYakir Yang (15):
drm: bridge: analogix/dp: split exynos dp driver to bridge directory
drm: bridge: analogix/dp: fix some obvious code style
drm: bridge: analogix/dp: remove duplicate configuration of link rate
and link count
drm: bridge: analogix/dp: dynamic parsesync_pol& interlace &
dynamic_range
dt-bindings: add document for analogix display port driver
ARM: dts: exynos/dp: remove some properties that deprecated by
analogix_dpdriver
drm: rockchip: dp: add rockchip platform dp driver
dt-bindings: add document for rockchip variant ofanalogix_dp
drm: bridge: analogix/dp: add some rk3288 special registers setting
drm: bridge: analogix/dp: add max link rate and lane count limit forRK3288drm: bridge: analogix/dp: try force hpd after plug in lookup failed
drm: bridge: analogix/dp: move hpd detect to connector detect function
drm: bridge: analogix/dp: add edid modes parse inget_modesmethod
drm: bridge: analogix/dp: add panel prepare/unprepare in
suspend/resume time
drm: bridge: analogix/dp: Fix the possible dead lock in bridge disable
time.../bindings/display/bridge/analogix_dp.txt | 52 + .../bindings/display/exynos/exynos_dp.txt | 93 +- .../display/rockchip/analogix_dp-rockchip.txt | 92 ++ arch/arm/boot/dts/exynos5250-arndale.dts | 2 - arch/arm/boot/dts/exynos5250-smdk5250.dts | 2 - arch/arm/boot/dts/exynos5250-snow-common.dtsi | 4 +- arch/arm/boot/dts/exynos5250-spring.dts | 4 +- arch/arm/boot/dts/exynos5420-peach-pit.dts | 4 +- arch/arm/boot/dts/exynos5420-smdk5420.dts | 2 - arch/arm/boot/dts/exynos5800-peach-pi.dts | 2 - drivers/gpu/drm/bridge/Kconfig | 2 + drivers/gpu/drm/bridge/Makefile | 1 + drivers/gpu/drm/bridge/analogix/Kconfig | 3 + drivers/gpu/drm/bridge/analogix/Makefile | 1 + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 1430 ++++++++++++++++++ drivers/gpu/drm/bridge/analogix/analogix_dp_core.h | 281 ++++ drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 1320 +++++++++++++++++ .../analogix/analogix_dp_reg.h} | 270 ++-- drivers/gpu/drm/exynos/Kconfig | 3 +- drivers/gpu/drm/exynos/Makefile | 2 +- drivers/gpu/drm/exynos/exynos_dp.c | 324 +++++ drivers/gpu/drm/exynos/exynos_dp_core.c | 1510 -------------------- drivers/gpu/drm/exynos/exynos_dp_core.h | 282 ---- drivers/gpu/drm/exynos/exynos_dp_reg.c | 1263 ---------------- drivers/gpu/drm/rockchip/Kconfig | 9 + drivers/gpu/drm/rockchip/Makefile | 1 + drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 384 +++++ include/drm/bridge/analogix_dp.h | 41 + 28 files changed, 4115 insertions(+), 3269 deletions(-)create mode 100644
Documentation/devicetree/bindings/display/bridge/analogix_dp.txtcreate mode 100644Documentation/devicetree/bindings/display/rockchip/analogix_dp-rockchip.txtcreate mode 100644drivers/gpu/drm/bridge/analogix/Kconfig
create mode 100644drivers/gpu/drm/bridge/analogix/Makefile
create mode 100644drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
create mode 100644drivers/gpu/drm/bridge/analogix/analogix_dp_core.h
create mode 100644drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
renamedrivers/gpu/drm/{exynos/exynos_dp_reg.h=>bridge/analogix/analogix_dp_reg.h} (62%) create mode 100644drivers/gpu/drm/exynos/exynos_dp.c
delete mode 100644drivers/gpu/drm/exynos/exynos_dp_core.c
delete mode 100644drivers/gpu/drm/exynos/exynos_dp_core.h
delete mode 100644drivers/gpu/drm/exynos/exynos_dp_reg.c
create mode 100644drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
create mode 100644include/drm/bridge/analogix_dp.hSignature · 7 lines
1.9.1 _______________________________________________ dri-devel mailing list dri-devel at lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 53 lines · Yakir Yang
Hi Daniel,
Quoted 49 lines · Daniel Vetter
Quoted 28 lines · Yakir Yang
Hi all,
The Samsung Exynos eDP controller and Rockchip RK3288 eDP controller
share the same IP, so a lot of parts can be re-used. I split the common code into bridge directory, then rk3288 and exynos only need to keep some platform code. Cause I can't find the exact IP name of exynos dp controller, so I decide to name dp core driver with "analogix" which I find in rk3288 eDP TRMBut there are still three light registers setting different between exynos and rk3288.
1. RK3288 have five special pll registers which not indicate in exynos dp controller.
2. The address ofDP_PHY_PD(dp phy power manager register)are different between rk3288 and exynos.
3. Rk3288 and exynos have different setting with AUX_HW_RETRY_CTL(dp debug
register).Due to Mark Yao have introduced the ATOMIC support to Rockchip drm, so it's
okay to use the ATOMIC helpers functions inconnector_funcs. No need to splict
the connector init to platform driver anymore, and this is the biggest change
since version 11.Quoted 7 lines
This v14 didn't have lots of new changes which seems not the correct time to
upgrade the version number, but I have changed ordering of patches (adding 2
more, and removing 2 out). Especially to prevent confusing people, so I updated
the whole series.So I'm jumping into this part way late, but just noticed (well Thierry pointed this out to me) that the exynos dp driver reinvents all the dp and dp-aux helpers we already. That's somewhat okish for a private driver (and exynos has a reputation for that kind of stuff), but imo not ok for a shared driver.
Not saying this should block merging this patch, but it really needs to be addressed. All the dp aux and edid read code in the current
exynos_dp_core/reg.cfiles needs to be replaced with dp helpers and the core i2c edid reading code.
Quoted 5 lines
Quoted 1 line
Who's going to sign up to do this?
Volunteer to that, after finish this thread, I would send new series to switch to take use of dp helper.
Hi Yakir,
do you have plans to do this work in the short term? If not, I can tackle it.
Regards,
Tomeu
Quoted 270 lines
:-D
- YakirQuoted 259 lines
-Daniel
Quoted 257 lines
Thanks,
- YakirChanges in v14:
- Rebase the new changes in imx-dp driver
- Split up this patch into 3 parts, make this easy to review (Heiko)
- Remove the Rockchip DP PHY to an separate thread (Heiko)https://patchwork.kernel.org/patch/8312701/Changes in v13:
- Use .enable instead of preprare/commit inencoder_helper_funcs(Heiko)
- Fix the missing parameters withdrm_encoder_init()helper function. (Heiko)Changes in v12:
- Move the connector init toanalogix_dpdriver, and using ATOMIC helper (Heiko)
- Add the ack from Jingoo
- Remove the enumlink_rate_typestruct, using the marcos indrm_dp_helper.h(Jingoo)Changes in v11:
- Uses tabs to fix the indentation issues inanalogix_dp_core.h(Heiko)
- Rename the "analogix,need-force-hpd" to common 'force-hpd' (Rob)
- Add the ack from Rob Herring
- Revert parts of Gustavo Padovan's changes in commit:
drm/exynos: do not start enabling DP atbind()phase
Add dp phy poweron function in bind time.
- Move the panel prepare fromget_modestime to bind time, and move the panel unprepare frombridge->disableto unbind time. (Heiko)Changes in v10:
- Add the ack from Rob Herring
- Correct theROCKCHIP_ANALOGIX_DPindentation inKconfigto tabs here (Heiko)
- Add the ack from Rob Herring
- Remove the surplus "plat_data" check. (Heiko)(quoted diff) +1
-1- switch (dp->plat_data && dp->plat_data->dev_type) { + switch (dp->plat_data->dev_type) {Changes in v9:
- Document more details for 'ports' property.Changes in v8:
- Correct the right document path of display-timing.txt (Heiko)
- Correct the misspell of 'from' to 'frm'. (Heiko)
- Modify the commit subject name. (Heiko)Changes in v7:
- Back to use theof_property_read_bool()interfacs to provoid backward compatibility of "hsync-active-high" "vsync-active-high" "interlaced" to avoid-EOVERFLOWerror (Krzysztof)Changes in v6:
- Fix theKconfigrecursive dependency (Javier)
- Fix Peach Pit hpd property name error:(quoted diff) +1
-1- hpd-gpio = <&gpx2 6 0>; + hpd-gpios = <&gpx2 6 0>;Changes in v5:
- Correct the check condition ofgpio_is_validwhen driver try to get the "hpd-gpios" DT propery. (Heiko)
- Move the platform attach callback in the front of core driver bridge attch function. Cause once platform failed at attach, core driver
should
still failed, so no need to init connector before platform attached
(Krzysztof)
- Keep code style no changes with the previousexynos_dp_code.cin this patch, and update commit message about the new export symbol
(Krzysztof)
- Gather the device type patch (v4 11/16) into this one. (Krzysztof)
- leave out the connector registration to analogix platform driver. (Thierry)
- Resequence this patch afteranalogix_dpdriver have been split fromexynos_dpcode, and rephrase reasonable commit message, and remove some controversial style (Krzysztof)
- analogix_dp_write_byte_to_dpcd(
- dp,DP_TEST_RESPONSE,
+ analogix_dp_write_byte_to_dpcd(dp,
+DP_TEST_RESPONSE,
DP_TEST_EDID_CHECKSUM_WRITE);
- Switch video timing type to "u32", so driver could use "of_property_read_u32"
to get the backword timing values. Krzysztof suggest me that driver
could use
the "of_property_read_bool" to get backword timing values, but that
interfacs
would modify the originaldrm_display_modetiming directly (whether
those
properties exists or not).
- Correct the misspell in commit message. (Krzysztof)
- Remove the empty line at the end of document, and correct the endpoint numbers in the example DT node, and remove the regulator iomux setting in driver code while using the pinctl in devicetree instead. (Heiko)
- Add device type declared, cause the previous "platform device type support (v4 11/16)" already merge into (v5 02/14).
- Implement connector registration code. (Thierry)
- Split binding doc's from driver changes. (Rob)
- Add eDP hotplug pinctrl property. (Heiko)Changes in v4:
- Update "analogix,hpd-gpios" to "hpd-gpios" DT propery. (Rob)
- Rename "analogix_dp-exynos.c" file name to "exynos_dp.c" (Jingoo)
- Create a separate folder for analogix code in bridge/ (Archit)
- Update commit message more readable. (Jingoo)
- Adjust the order from 05 to 04
- Provide backword compatibility with samsung. (Krzysztof)
- Split all DTS changes, and provide backward compatibility. Mark old properties as deprecated but still support them. (Krzysztof)
- Update "analogix,hpd-gpio" to "hpd-gpios" prop name. (Rob)
- Deprecated some properties which could parsed from Edid/Mode/DPCD. (Thierry)
"analogix,color-space" & "analogix,color-depth" &
"analogix,link-rate" & "analogix,lane-count" &
"analogix,ycbcr-coeff" & "analogix,dynamic-range" &
"vsync-active-high" & "hsync-active-high" & "interlaces"
- Separate all DTS changes to a separate patch. (Krzysztof)
- Remove some deprecated DT properties in rockchip dp document.
- Seprate the link-rate and lane-count limit out with thedevice_typeflag. (Thierry)
- Take Jingoo suggest, add commit messages.
- Calldrm_panel_prepare()in .get_modes function, ensure panel should power on before driver try to read edid message.Changes in v3:
- Move exynos'svideo_timingcode to analogix_dp-exynos platform driver, addget_modesmethod to structanalogix_dp_plat_data. (Thierry)
- Rename some "samsung*" dts propery to "analogix*". (Heiko)
- Thelink_rateandlane_countshouldn't config to the DT property value directly, but we can take those as hardware limite. For example,
RK3288
only support 4 physical lanes of 2.7/1.62 Gbps/lane, so DT property
would
like "link-rate =0x0a" "lane-count = 4". (Thierry)
- Dynamic parse video timing info from structdrm_display_modeand structdrm_display_info. (Thierry)
- Add devicetree binding documents. (Heiko)
- Remove sync pol & colorimetry properies from the new analogix dp driver devicetree binding. (Thierry)
- Update the exist exynos dtsi file with the latest DP DT properies.
- Leave "sclk_edp_24m" to rockchip dp phy driver which name to "24m", and leave "sclk_edp" to analogix dp core driver which name to "dp", and leave "pclk_edp" to rockchip dp platform driver which name to "pclk". (Thierry & Heiko)
- Add devicetree binding document. (Heiko)
- Remove "rockchip,panel" DT property, take use of remote point to get panel
node. (Heiko)
- Add the new function pointdp_platdata->get_modes()init.
- Add "analogix,need-force-hpd" to indicate whether driver need foce hpd when hpd detect failed.
- move dp hpd detect to connector detect function.
- Add edid modes parse supportChanges in v2:
- Remove new copyright (Jingoo)
- Fix compiled failed due toanalogix_dp_devicemisspell
- Improved commit message more readable, and avoid using some uncommon style like bellow: (Joe Preches)
- retval = exynos_dp_read_bytes_from_i2c(...
...);
+ retval =
+exynos_dp_read_bytes_from_i2c(......);
- Get panel node with remote-endpoint method, and create devicetree binding
for driver. (Heiko)
- Remove the clock enable/disbale with "sclk_edp" & "sclk_edp_24m", leave those clock to rockchip dp phy driver.
- Fix compile failed dut tophy_pd_addrvariable misspell errorHeiko Stuebner (2):
drm/exynos: dp: rename implementation specific driver part
drm: bridge: analogix/dp: rename register constantsYakir Yang (15):
drm: bridge: analogix/dp: split exynos dp driver to bridge directory
drm: bridge: analogix/dp: fix some obvious code style
drm: bridge: analogix/dp: remove duplicate configuration of link rate
and link count
drm: bridge: analogix/dp: dynamic parsesync_pol& interlace &
dynamic_range
dt-bindings: add document for analogix display port driver
ARM: dts: exynos/dp: remove some properties that deprecated by
analogix_dpdriver
drm: rockchip: dp: add rockchip platform dp driver
dt-bindings: add document for rockchip variant ofanalogix_dp
drm: bridge: analogix/dp: add some rk3288 special registers setting
drm: bridge: analogix/dp: add max link rate and lane count limit forRK3288drm: bridge: analogix/dp: try force hpd after plug in lookup failed
drm: bridge: analogix/dp: move hpd detect to connector detect function
drm: bridge: analogix/dp: add edid modes parse inget_modesmethod
drm: bridge: analogix/dp: add panel prepare/unprepare in
suspend/resume time
drm: bridge: analogix/dp: Fix the possible dead lock in bridge disable
time.../bindings/display/bridge/analogix_dp.txt | 52 + .../bindings/display/exynos/exynos_dp.txt | 93 +- .../display/rockchip/analogix_dp-rockchip.txt | 92 ++ arch/arm/boot/dts/exynos5250-arndale.dts | 2 - arch/arm/boot/dts/exynos5250-smdk5250.dts | 2 - arch/arm/boot/dts/exynos5250-snow-common.dtsi | 4 +- arch/arm/boot/dts/exynos5250-spring.dts | 4 +- arch/arm/boot/dts/exynos5420-peach-pit.dts | 4 +- arch/arm/boot/dts/exynos5420-smdk5420.dts | 2 - arch/arm/boot/dts/exynos5800-peach-pi.dts | 2 - drivers/gpu/drm/bridge/Kconfig | 2 + drivers/gpu/drm/bridge/Makefile | 1 + drivers/gpu/drm/bridge/analogix/Kconfig | 3 + drivers/gpu/drm/bridge/analogix/Makefile | 1 + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 1430 ++++++++++++++++++ drivers/gpu/drm/bridge/analogix/analogix_dp_core.h | 281 ++++ drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 1320 +++++++++++++++++ .../analogix/analogix_dp_reg.h} | 270 ++-- drivers/gpu/drm/exynos/Kconfig | 3 +- drivers/gpu/drm/exynos/Makefile | 2 +- drivers/gpu/drm/exynos/exynos_dp.c | 324 +++++ drivers/gpu/drm/exynos/exynos_dp_core.c | 1510 -------------------- drivers/gpu/drm/exynos/exynos_dp_core.h | 282 ---- drivers/gpu/drm/exynos/exynos_dp_reg.c | 1263 ---------------- drivers/gpu/drm/rockchip/Kconfig | 9 + drivers/gpu/drm/rockchip/Makefile | 1 + drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 384 +++++ include/drm/bridge/analogix_dp.h | 41 + 28 files changed, 4115 insertions(+), 3269 deletions(-)create mode 100644
Documentation/devicetree/bindings/display/bridge/analogix_dp.txt
create mode 100644Documentation/devicetree/bindings/display/rockchip/analogix_dp-rockchip.txt
create mode 100644drivers/gpu/drm/bridge/analogix/Kconfigcreate mode 100644drivers/gpu/drm/bridge/analogix/Makefilecreate mode 100644drivers/gpu/drm/bridge/analogix/analogix_dp_core.ccreate mode 100644drivers/gpu/drm/bridge/analogix/analogix_dp_core.hcreate mode 100644drivers/gpu/drm/bridge/analogix/analogix_dp_reg.crenamedrivers/gpu/drm/{exynos/exynos_dp_reg.h=>bridge/analogix/analogix_dp_reg.h} (62%)
create mode 100644drivers/gpu/drm/exynos/exynos_dp.c
delete mode 100644drivers/gpu/drm/exynos/exynos_dp_core.cdelete mode 100644drivers/gpu/drm/exynos/exynos_dp_core.hdelete mode 100644drivers/gpu/drm/exynos/exynos_dp_reg.ccreate mode 100644drivers/gpu/drm/rockchip/analogix_dp-rockchip.ccreate mode 100644include/drm/bridge/analogix_dp.h--
1.9.1_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 51 lines · Tomeu Vizoso
Quoted 50 lines · Yakir Yang
Hi Daniel,
Quoted 46 lines · Daniel Vetter
Quoted 27 lines · Yakir Yang
Hi all,
The Samsung Exynos eDP controller and Rockchip RK3288 eDP controller
share the same IP, so a lot of parts can be re-used. I split the common code into bridge directory, then rk3288 and exynos only need to keep some platform code. Cause I can't find the exact IP name of exynos dp controller, so I decide to name dp core driver with "analogix" which I find in rk3288 eDP TRMBut there are still three light registers setting different between exynos and rk3288.
1. RK3288 have five special pll registers which not indicate in exynos dp controller.
2. The address ofDP_PHY_PD(dp phy power manager register)are different between rk3288 and exynos.
3. Rk3288 and exynos have different setting with AUX_HW_RETRY_CTL(dp debug
register).Due to Mark Yao have introduced the ATOMIC support to Rockchip drm, so it's
okay to use the ATOMIC helpers functions inconnector_funcs. No need to splict
the connector init to platform driver anymore, and this is the biggest change
since version 11.Quoted 7 lines
This v14 didn't have lots of new changes which seems not the correct time to
upgrade the version number, but I have changed ordering of patches (adding 2
more, and removing 2 out). Especially to prevent confusing people, so I updated
the whole series.So I'm jumping into this part way late, but just noticed (well Thierry pointed this out to me) that the exynos dp driver reinvents all the dp and dp-aux helpers we already. That's somewhat okish for a private driver (and exynos has a reputation for that kind of stuff), but imo not ok for a shared driver.
Not saying this should block merging this patch, but it really needs to be addressed. All the dp aux and edid read code in the current
exynos_dp_core/reg.cfiles needs to be replaced with dp helpers and the core i2c edid reading code.
Quoted 7 lines
Quoted 4 lines
Quoted 1 line
Who's going to sign up to do this?
Volunteer to that, after finish this thread, I would send new series to switch to take use of dp helper.
Hi Yakir,
do you have plans to do this work in the short term? If not, I can tackle it.
Wow, that would be great if you like to tackle it :-D
I always keep this in my mind, but haven't found an chance to finish it. I would like to sit in your Cc list when you post them out ;)
Best Regards,
- Yakir
Quoted 275 lines
Regards,
Tomeu
Quoted 269 lines
:-D
- YakirQuoted 259 lines
-Daniel
Quoted 257 lines
Thanks,
- YakirChanges in v14:
- Rebase the new changes in imx-dp driver
- Split up this patch into 3 parts, make this easy to review (Heiko)
- Remove the Rockchip DP PHY to an separate thread (Heiko)https://patchwork.kernel.org/patch/8312701/Changes in v13:
- Use .enable instead of preprare/commit inencoder_helper_funcs(Heiko)
- Fix the missing parameters withdrm_encoder_init()helper function. (Heiko)Changes in v12:
- Move the connector init toanalogix_dpdriver, and using ATOMIC helper (Heiko)
- Add the ack from Jingoo
- Remove the enumlink_rate_typestruct, using the marcos indrm_dp_helper.h(Jingoo)Changes in v11:
- Uses tabs to fix the indentation issues inanalogix_dp_core.h(Heiko)
- Rename the "analogix,need-force-hpd" to common 'force-hpd' (Rob)
- Add the ack from Rob Herring
- Revert parts of Gustavo Padovan's changes in commit:
drm/exynos: do not start enabling DP atbind()phase
Add dp phy poweron function in bind time.
- Move the panel prepare fromget_modestime to bind time, and movethe panel unprepare from bridge->disable to unbind time. (Heiko)Changes in v10:
- Add the ack from Rob Herring
- Correct theROCKCHIP_ANALOGIX_DPindentation inKconfigto tabs here (Heiko)
- Add the ack from Rob Herring
- Remove the surplus "plat_data" check. (Heiko)(quoted diff) +1
-1- switch (dp->plat_data && dp->plat_data->dev_type) { + switch (dp->plat_data->dev_type) {Changes in v9:
- Document more details for 'ports' property.Changes in v8:
- Correct the right document path of display-timing.txt (Heiko)
- Correct the misspell of 'from' to 'frm'. (Heiko)
- Modify the commit subject name. (Heiko)Changes in v7:
- Back to use theof_property_read_bool()interfacs to provoid backward compatibility of "hsync-active-high" "vsync-active-high" "interlaced" to avoid-EOVERFLOWerror (Krzysztof)Changes in v6:
- Fix theKconfigrecursive dependency (Javier)
- Fix Peach Pit hpd property name error:(quoted diff) +1
-1- hpd-gpio = <&gpx2 6 0>; + hpd-gpios = <&gpx2 6 0>;Changes in v5:
- Correct the check condition ofgpio_is_validwhen driver try to get the "hpd-gpios" DT propery. (Heiko)
- Move the platform attach callback in the front of core driver bridge attch function. Cause once platform failed at attach, core driver
should
still failed, so no need to init connector before platform attached
(Krzysztof)
- Keep code style no changes with the previousexynos_dp_code.cin this patch, and update commit message about the new export symbol
(Krzysztof)
- Gather the device type patch (v4 11/16) into this one. (Krzysztof)
- leave out the connector registration to analogix platform driver. (Thierry)
- Resequence this patch afteranalogix_dpdriver have been split fromexynos_dpcode, and rephrase reasonable commit message, and remove some controversial style (Krzysztof)
- analogix_dp_write_byte_to_dpcd(
- dp,DP_TEST_RESPONSE,
+ analogix_dp_write_byte_to_dpcd(dp,
+DP_TEST_RESPONSE,
DP_TEST_EDID_CHECKSUM_WRITE);
- Switch video timing type to "u32", so driver could use "of_property_read_u32"
to get the backword timing values. Krzysztof suggest me that driver
could use
the "of_property_read_bool" to get backword timing values, but that
interfacs
would modify the originaldrm_display_modetiming directly (whether
those
properties exists or not).
- Correct the misspell in commit message. (Krzysztof)
- Remove the empty line at the end of document, and correct the endpoint numbers in the example DT node, and remove the regulator iomux setting in driver code while using the pinctl in devicetree instead. (Heiko)
- Add device type declared, cause the previous "platform device typesupport (v4 11/16)" already merge into (v5 02/14).- Implement connector registration code. (Thierry)
- Split binding doc's from driver changes. (Rob)
- Add eDP hotplug pinctrl property. (Heiko)Changes in v4:
- Update "analogix,hpd-gpios" to "hpd-gpios" DT propery. (Rob)
- Rename "analogix_dp-exynos.c" file name to "exynos_dp.c" (Jingoo)
- Create a separate folder for analogix code in bridge/ (Archit)
- Update commit message more readable. (Jingoo)
- Adjust the order from 05 to 04
- Provide backword compatibility with samsung. (Krzysztof)
- Split all DTS changes, and provide backward compatibility. Mark old properties as deprecated but still support them. (Krzysztof)
- Update "analogix,hpd-gpio" to "hpd-gpios" prop name. (Rob)
- Deprecated some properties which could parsed from Edid/Mode/DPCD. (Thierry)
"analogix,color-space" & "analogix,color-depth" &
"analogix,link-rate" & "analogix,lane-count" &
"analogix,ycbcr-coeff" & "analogix,dynamic-range" &
"vsync-active-high" & "hsync-active-high" & "interlaces"
- Separate all DTS changes to a separate patch. (Krzysztof)
- Remove some deprecated DT properties in rockchip dp document.
- Seprate the link-rate and lane-count limit out with thedevice_typeflag. (Thierry)
- Take Jingoo suggest, add commit messages.
- Calldrm_panel_prepare()in .get_modes function, ensure panel should power on before driver try to read edid message.Changes in v3:
- Move exynos'svideo_timingcode to analogix_dp-exynos platform driver, addget_modesmethod to structanalogix_dp_plat_data. (Thierry)
- Rename some "samsung*" dts propery to "analogix*". (Heiko)
- Thelink_rateandlane_countshouldn't config to the DT property value directly, but we can take those as hardware limite. For example,
RK3288
only support 4 physical lanes of 2.7/1.62 Gbps/lane, so DT property
wouldlike "link-rate = 0x0a" "lane-count = 4". (Thierry)- Dynamic parse video timing info from struct
drm_display_modeand structdrm_display_info. (Thierry)
- Add devicetree binding documents. (Heiko)
- Remove sync pol & colorimetry properies from the new analogix dp driver devicetree binding. (Thierry)
- Update the exist exynos dtsi file with the latest DP DT properies.
- Leave "sclk_edp_24m" to rockchip dp phy driver which name to "24m", and leave "sclk_edp" to analogix dp core driver which name to "dp", and leave "pclk_edp" to rockchip dp platform driver which name to "pclk". (Thierry & Heiko)
- Add devicetree binding document. (Heiko)
- Remove "rockchip,panel" DT property, take use of remote point to get panel
node. (Heiko)
- Add the new function pointdp_platdata->get_modes()init.
- Add "analogix,need-force-hpd" to indicate whether driver need foce hpd when hpd detect failed.
- move dp hpd detect to connector detect function.
- Add edid modes parse supportChanges in v2:
- Remove new copyright (Jingoo)
- Fix compiled failed due toanalogix_dp_devicemisspell
- Improved commit message more readable, and avoid using some uncommon style like bellow: (Joe Preches)
- retval = exynos_dp_read_bytes_from_i2c(... ...);
+ retval =
+exynos_dp_read_bytes_from_i2c(......);
- Get panel node with remote-endpoint method, and create devicetree binding
for driver. (Heiko)
- Remove the clock enable/disbale with "sclk_edp" & "sclk_edp_24m", leave those clock to rockchip dp phy driver.
- Fix compile failed dut tophy_pd_addrvariable misspell errorHeiko Stuebner (2):
drm/exynos: dp: rename implementation specific driver part
drm: bridge: analogix/dp: rename register constantsYakir Yang (15):
drm: bridge: analogix/dp: split exynos dp driver to bridge directory
drm: bridge: analogix/dp: fix some obvious code style
drm: bridge: analogix/dp: remove duplicate configuration of link rate
and link count
drm: bridge: analogix/dp: dynamic parsesync_pol& interlace &
dynamic_range
dt-bindings: add document for analogix display port driver
ARM: dts: exynos/dp: remove some properties that deprecated by
analogix_dpdriver
drm: rockchip: dp: add rockchip platform dp driver
dt-bindings: add document for rockchip variant ofanalogix_dp
drm: bridge: analogix/dp: add some rk3288 special registers setting
drm: bridge: analogix/dp: add max link rate and lane count limit for
RK3288
drm: bridge: analogix/dp: try force hpd after plug in lookup failed
drm: bridge: analogix/dp: move hpd detect to connector detect function
drm: bridge: analogix/dp: add edid modes parse inget_modesmethod
drm: bridge: analogix/dp: add panel prepare/unprepare in
suspend/resume time
drm: bridge: analogix/dp: Fix the possible dead lock in bridge disable
time.../bindings/display/bridge/analogix_dp.txt | 52 + .../bindings/display/exynos/exynos_dp.txt | 93 +- .../display/rockchip/analogix_dp-rockchip.txt | 92 ++ arch/arm/boot/dts/exynos5250-arndale.dts | 2 - arch/arm/boot/dts/exynos5250-smdk5250.dts | 2 - arch/arm/boot/dts/exynos5250-snow-common.dtsi | 4 +- arch/arm/boot/dts/exynos5250-spring.dts | 4 +- arch/arm/boot/dts/exynos5420-peach-pit.dts | 4 +- arch/arm/boot/dts/exynos5420-smdk5420.dts | 2 - arch/arm/boot/dts/exynos5800-peach-pi.dts | 2 - drivers/gpu/drm/bridge/Kconfig | 2 + drivers/gpu/drm/bridge/Makefile | 1 + drivers/gpu/drm/bridge/analogix/Kconfig | 3 + drivers/gpu/drm/bridge/analogix/Makefile | 1 + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 1430 ++++++++++++++++++ drivers/gpu/drm/bridge/analogix/analogix_dp_core.h | 281 ++++ drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 1320 +++++++++++++++++ .../analogix/analogix_dp_reg.h} | 270 ++-- drivers/gpu/drm/exynos/Kconfig | 3 +- drivers/gpu/drm/exynos/Makefile | 2 +- drivers/gpu/drm/exynos/exynos_dp.c | 324 +++++ drivers/gpu/drm/exynos/exynos_dp_core.c | 1510 -------------------- drivers/gpu/drm/exynos/exynos_dp_core.h | 282 ---- drivers/gpu/drm/exynos/exynos_dp_reg.c | 1263 ---------------- drivers/gpu/drm/rockchip/Kconfig | 9 + drivers/gpu/drm/rockchip/Makefile | 1 + drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 384 +++++ include/drm/bridge/analogix_dp.h | 41 + 28 files changed, 4115 insertions(+), 3269 deletions(-)create mode 100644
Documentation/devicetree/bindings/display/bridge/analogix_dp.txt
create mode 100644Documentation/devicetree/bindings/display/rockchip/analogix_dp-rockchip.txt
create mode 100644drivers/gpu/drm/bridge/analogix/Kconfigcreate mode 100644drivers/gpu/drm/bridge/analogix/Makefilecreate mode 100644drivers/gpu/drm/bridge/analogix/analogix_dp_core.ccreate mode 100644drivers/gpu/drm/bridge/analogix/analogix_dp_core.hcreate mode 100644drivers/gpu/drm/bridge/analogix/analogix_dp_reg.crenamedrivers/gpu/drm/{exynos/exynos_dp_reg.h=>bridge/analogix/analogix_dp_reg.h} (62%)
create mode 100644drivers/gpu/drm/exynos/exynos_dp.c
delete mode 100644drivers/gpu/drm/exynos/exynos_dp_core.cdelete mode 100644drivers/gpu/drm/exynos/exynos_dp_core.hdelete mode 100644drivers/gpu/drm/exynos/exynos_dp_reg.ccreate mode 100644drivers/gpu/drm/rockchip/analogix_dp-rockchip.ccreate mode 100644include/drm/bridge/analogix_dp.h--
1.9.1_______________________________________________
dri-devel mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel_______________________________________________
dri-devel mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel