* [PATCH v4 0/4] Add support rockchip RGB output interface
@ 2017-11-01 7:52 Sandy Huang
2017-11-01 7:52 ` [PATCH v4 1/4] devicetree/bindings: display: Add doucument for RGB panels Sandy Huang
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Sandy Huang @ 2017-11-01 7:52 UTC (permalink / raw)
To: Thierry Reding, David Airlie, Rob Herring, Mark Rutland,
Mark Yao, Heiko Stuebner
Cc: dri-devel, devicetree, linux-kernel, linux-arm-kernel,
linux-rockchip, Sandy Huang
This patches add support rockchip RGB output, Some Rockchip CRTCs, like rv1108,
can directly output parallel and serial RGB data to panel or to conversion chip.
So we add this driver to probe encoder and connector to support this case.
Sandy Huang (4):
devicetree/bindings: display: Add doucument for RGB panels
devicetree/bindings: display: Add document for rockchip RGB output
drm/rockchip: Add support for Rockchip Soc RGB output interface
drm/rockchip: vop: Add more RGB output interface type
.../bindings/display/panel/panel-rgb.txt | 116 +++++++
.../bindings/display/rockchip/rockchip-rgb.txt | 72 +++++
drivers/gpu/drm/rockchip/Kconfig | 11 +
drivers/gpu/drm/rockchip/Makefile | 1 +
drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 2 +
drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 1 +
drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 2 +
drivers/gpu/drm/rockchip/rockchip_rgb.c | 344 +++++++++++++++++++++
8 files changed, 549 insertions(+)
create mode 100644 Documentation/devicetree/bindings/display/panel/panel-rgb.txt
create mode 100644 Documentation/devicetree/bindings/display/rockchip/rockchip-rgb.txt
create mode 100644 drivers/gpu/drm/rockchip/rockchip_rgb.c
--
2.7.4
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH v4 1/4] devicetree/bindings: display: Add doucument for RGB panels 2017-11-01 7:52 [PATCH v4 0/4] Add support rockchip RGB output interface Sandy Huang @ 2017-11-01 7:52 ` Sandy Huang 2017-11-02 0:22 ` Rob Herring 2017-11-01 7:52 ` [PATCH v4 2/4] devicetree/bindings: display: Add document for rockchip RGB output Sandy Huang ` (2 subsequent siblings) 3 siblings, 1 reply; 6+ messages in thread From: Sandy Huang @ 2017-11-01 7:52 UTC (permalink / raw) To: Thierry Reding, David Airlie, Rob Herring, Mark Rutland Cc: Sandy Huang, dri-devel, devicetree, linux-kernel Describe the panel property rgb-mode for parallel and serial RGB output interface, include the connection relations for each mode. Signed-off-by: Sandy Huang <hjc@rock-chips.com> --- Changes: .../bindings/display/panel/panel-rgb.txt | 116 +++++++++++++++++++++ 1 file changed, 116 insertions(+) create mode 100644 Documentation/devicetree/bindings/display/panel/panel-rgb.txt diff --git a/Documentation/devicetree/bindings/display/panel/panel-rgb.txt b/Documentation/devicetree/bindings/display/panel/panel-rgb.txt new file mode 100644 index 0000000..0c5b054 --- /dev/null +++ b/Documentation/devicetree/bindings/display/panel/panel-rgb.txt @@ -0,0 +1,116 @@ +RGB Display Panel +================== + +This describe the panel property rgb-mode for parallel and serial +RGB output interface. rgb-mode should be "p888", "p666", "p565", "s888" +and "s888-dummy", the following describe the connection relations. + +p888 mode: + ___ ___ ___ ___ ___ ___ ___ +dclk __/ \___/ \___/ \___/ \___/ \___/ \___/ \___ + ______ ______ ______ ______ ______ ______ ______ +DATA23 ><__R7__><__R7__><__R7__><__R7__><__R7__><__R7__><__R7__>< +DATA22 ><__R6__><__R6__><__R6__><__R6__><__R6__><__R6__><__R6__>< +DATA21 ><__R5__><__R5__><__R5__><__R5__><__R5__><__R5__><__R5__>< +DATA20 ><__R4__><__R4__><__R4__><__R4__><__R4__><__R4__><__R4__>< +DATA19 ><__R3__><__R3__><__R3__><__R3__><__R3__><__R3__><__R3__>< +DATA18 ><__R2__><__R2__><__R2__><__R2__><__R2__><__R2__><__R2__>< +DATA17 ><__R1__><__R1__><__R1__><__R1__><__R1__><__R1__><__R1__>< +DATA16 ><__R0__><__R0__><__R0__><__R0__><__R0__><__R0__><__R0__>< + ______ ______ ______ ______ ______ ______ ______ +DATA15 ><__G7__><__G7__><__G7__><__G7__><__G7__><__G7__><__G7__>< +DATA14 ><__G6__><__G6__><__G6__><__G6__><__G6__><__G6__><__G6__>< +DATA13 ><__G5__><__G5__><__G5__><__G5__><__G5__><__G5__><__G5__>< +DATA12 ><__G4__><__G4__><__G4__><__G4__><__G4__><__G4__><__G4__>< +DATA11 ><__G3__><__G3__><__G3__><__G3__><__G3__><__G3__><__G3__>< +DATA10 ><__G2__><__G2__><__G2__><__G2__><__G2__><__G2__><__G2__>< +DATA9 ><__G1__><__G1__><__G1__><__G1__><__G1__><__G1__><__G1__>< +DATA8 ><__G0__><__G0__><__G0__><__G0__><__G0__><__G0__><__G0__>< + ______ ______ ______ ______ ______ ______ ______ +DATA7 ><__B7__><__B7__><__B7__><__B7__><__B7__><__B7__><__B7__>< +DATA6 ><__B6__><__B6__><__B6__><__B6__><__B6__><__B6__><__B6__>< +DATA5 ><__B5__><__B5__><__B5__><__B5__><__B5__><__B5__><__B5__>< +DATA4 ><__B4__><__B4__><__B4__><__B4__><__B4__><__B4__><__B4__>< +DATA3 ><__B3__><__B3__><__B3__><__B3__><__B3__><__B3__><__B3__>< +DATA2 ><__B2__><__B2__><__B2__><__B2__><__B2__><__B2__><__B2__>< +DATA1 ><__B1__><__B1__><__B1__><__B1__><__B1__><__B1__><__B1__>< +DATA0 ><__B0__><__B0__><__B0__><__B0__><__B0__><__B0__><__B0__>< +pixel | n | n+1 | n+3 | n+4 | n+5 | n+6 | n+7 | + +p666 mode: + ___ ___ ___ ___ ___ ___ ___ +dclk __/ \___/ \___/ \___/ \___/ \___/ \___/ \___ + ______ ______ ______ ______ ______ ______ ______ +DATA17 ><__R5__><__R5__><__R5__><__R5__><__R5__><__R5__><__R5__>< +DATA16 ><__R4__><__R4__><__R4__><__R4__><__R4__><__R4__><__R4__>< +DATA15 ><__R3__><__R3__><__R3__><__R3__><__R3__><__R3__><__R3__>< +DATA14 ><__R2__><__R2__><__R2__><__R2__><__R2__><__R2__><__R2__>< +DATA13 ><__R1__><__R1__><__R1__><__R1__><__R1__><__R1__><__R1__>< +DATA12 ><__R0__><__R0__><__R0__><__R0__><__R0__><__R0__><__R0__>< + ______ ______ ______ ______ ______ ______ ______ +DATA11 ><__G5__><__G5__><__G5__><__G5__><__G5__><__G5__><__G5__>< +DATA10 ><__G4__><__G4__><__G4__><__G4__><__G4__><__G4__><__G4__>< +DATA9 ><__G3__><__G3__><__G3__><__G3__><__G3__><__G3__><__G3__>< +DATA8 ><__G2__><__G2__><__G2__><__G2__><__G2__><__G2__><__G2__>< +DATA7 ><__G1__><__G1__><__G1__><__G1__><__G1__><__G1__><__G1__>< +DATA6 ><__G0__><__G0__><__G0__><__G0__><__G0__><__G0__><__G0__>< + ______ ______ ______ ______ ______ ______ ______ +DATA5 ><__B5__><__B5__><__B5__><__B5__><__B5__><__B5__><__B5__>< +DATA4 ><__B4__><__B4__><__B4__><__B4__><__B4__><__B4__><__B4__>< +DATA3 ><__B3__><__B3__><__B3__><__B3__><__B3__><__B3__><__B3__>< +DATA2 ><__B2__><__B2__><__B2__><__B2__><__B2__><__B2__><__B2__>< +DATA1 ><__B1__><__B1__><__B1__><__B1__><__B1__><__B1__><__B1__>< +DATA0 ><__B0__><__B0__><__B0__><__B0__><__B0__><__B0__><__B0__>< +pixel | n | n+1 | n+3 | n+4 | n+5 | n+6 | n+7 | + +p565 mode: + ___ ___ ___ ___ ___ ___ ___ +dclk __/ \___/ \___/ \___/ \___/ \___/ \___/ \___ + ______ ______ ______ ______ ______ ______ ______ +DATA15 ><__R4__><__R4__><__R4__><__R4__><__R4__><__R4__><__R4__>< +DATA14 ><__R3__><__R3__><__R3__><__R3__><__R3__><__R3__><__R3__>< +DATA13 ><__R2__><__R2__><__R2__><__R2__><__R2__><__R2__><__R2__>< +DATA12 ><__R1__><__R1__><__R1__><__R1__><__R1__><__R1__><__R1__>< +DATA11 ><__R0__><__R0__><__R0__><__R0__><__R0__><__R0__><__R0__>< + ______ ______ ______ ______ ______ ______ ______ +DATA10 ><__G5__><__G5__><__G5__><__G5__><__G5__><__G5__><__G5__>< +DATA9 ><__G4__><__G4__><__G4__><__G4__><__G4__><__G4__><__G4__>< +DATA8 ><__G3__><__G3__><__G3__><__G3__><__G3__><__G3__><__G3__>< +DATA7 ><__G2__><__G2__><__G2__><__G2__><__G2__><__G2__><__G2__>< +DATA6 ><__G1__><__G1__><__G1__><__G1__><__G1__><__G1__><__G1__>< +DATA5 ><__G0__><__G0__><__G0__><__G0__><__G0__><__G0__><__G0__>< + ______ ______ ______ ______ ______ ______ ______ +DATA4 ><__B4__><__B4__><__B4__><__B4__><__B4__><__B4__><__B4__>< +DATA3 ><__B3__><__B3__><__B3__><__B3__><__B3__><__B3__><__B3__>< +DATA2 ><__B2__><__B2__><__B2__><__B2__><__B2__><__B2__><__B2__>< +DATA1 ><__B1__><__B1__><__B1__><__B1__><__B1__><__B1__><__B1__>< +DATA0 ><__B0__><__B0__><__B0__><__B0__><__B0__><__B0__><__B0__>< +pixel | n | n+1 | n+3 | n+4 | n+5 | n+6 | n+7 | + +s888 mode: + ___ ___ ___ ___ ___ ___ ___ +dclk __/ \___/ \___/ \___/ \___/ \___/ \___/ \___ + ______ ______ ______ ______ ______ ______ ______ +DATA7 ><__R7__><__G7__><__B7__><__R7__><__G7__><__B7__><__R7__>< +DATA6 ><__R6__><__G6__><__B6__><__R6__><__G6__><__B6__><__R6__>< +DATA5 ><__R5__><__G5__><__B5__><__R5__><__G5__><__B5__><__R5__>< +DATA4 ><__R4__><__G4__><__B4__><__R4__><__G4__><__B4__><__R4__>< +DATA3 ><__R3__><__G3__><__B3__><__R3__><__G3__><__B3__><__R3__>< +DATA2 ><__R2__><__G2__><__B2__><__R2__><__G2__><__B2__><__R2__>< +DATA1 ><__R1__><__G1__><__B1__><__R1__><__G1__><__B1__><__R1__>< +DATA0 ><__R0__><__G0__><__B0__><__R0__><__G0__><__B0__><__R0__>< +pixel | --------- n --------- | ------- n + 1 ------- | -------- + +s888-dummy mode: + ___ ___ ___ ___ ___ ___ ___ ___ +dclk __/ \___/ \___/ \___/ \___/ \___/ \___/ \___/ \___ + ______ ______ ______ ______ ______ ______ ______ ______ +DATA7 ><__R7__><__G7__><__B7__><_NULL_><__R7__><__G7__><__B7__><_NULL_>< +DATA6 ><__R6__><__G6__><__B6__><_NULL_><__R6__><__G6__><__B6__><_NULL_>< +DATA5 ><__R5__><__G5__><__B5__><_NULL_><__R5__><__G5__><__B5__><_NULL_>< +DATA4 ><__R4__><__G4__><__B4__><_NULL_><__R4__><__G4__><__B4__><_NULL_>< +DATA3 ><__R3__><__G3__><__B3__><_NULL_><__R3__><__G3__><__B3__><_NULL_>< +DATA2 ><__R2__><__G2__><__B2__><_NULL_><__R2__><__G2__><__B2__><_NULL_>< +DATA1 ><__R1__><__G1__><__B1__><_NULL_><__R1__><__G1__><__B1__><_NULL_>< +DATA0 ><__R0__><__G0__><__B0__><_NULL_><__R0__><__G0__><__B0__><_NULL_>< +pixel | ------------- n ------------- | ----------- n + 1 ----------- | -- 2.7.4 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v4 1/4] devicetree/bindings: display: Add doucument for RGB panels 2017-11-01 7:52 ` [PATCH v4 1/4] devicetree/bindings: display: Add doucument for RGB panels Sandy Huang @ 2017-11-02 0:22 ` Rob Herring 0 siblings, 0 replies; 6+ messages in thread From: Rob Herring @ 2017-11-02 0:22 UTC (permalink / raw) To: Sandy Huang Cc: Thierry Reding, David Airlie, Mark Rutland, dri-devel, devicetree, linux-kernel On Wed, Nov 01, 2017 at 03:52:38PM +0800, Sandy Huang wrote: > Describe the panel property rgb-mode for parallel and serial > RGB output interface, include the connection relations for each > mode. > > Signed-off-by: Sandy Huang <hjc@rock-chips.com> > --- > Changes: > .../bindings/display/panel/panel-rgb.txt | 116 +++++++++++++++++++++ > 1 file changed, 116 insertions(+) > create mode 100644 Documentation/devicetree/bindings/display/panel/panel-rgb.txt There's a couple of attempts to do the same thing[1] and I'm not taking more than 1. I'd suggest you split this from the rest of your series and work out this part separately with others. Rob [1] https://patchwork.kernel.org/patch/9999407/ ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v4 2/4] devicetree/bindings: display: Add document for rockchip RGB output 2017-11-01 7:52 [PATCH v4 0/4] Add support rockchip RGB output interface Sandy Huang 2017-11-01 7:52 ` [PATCH v4 1/4] devicetree/bindings: display: Add doucument for RGB panels Sandy Huang @ 2017-11-01 7:52 ` Sandy Huang 2017-11-01 7:54 ` [PATCH v4 3/4] drm/rockchip: Add support for Rockchip Soc RGB output interface Sandy Huang 2017-11-01 7:55 ` [PATCH v4 4/4] drm/rockchip: vop: Add more RGB output interface type Sandy Huang 3 siblings, 0 replies; 6+ messages in thread From: Sandy Huang @ 2017-11-01 7:52 UTC (permalink / raw) To: Mark Yao, David Airlie, Rob Herring, Mark Rutland, Heiko Stuebner Cc: Sandy Huang, dri-devel, devicetree, linux-arm-kernel, linux-rockchip, linux-kernel This path add support rv1108 rgb output interface driver. Signed-off-by: Sandy Huang <hjc@rock-chips.com> --- Changes in v4: None Changes in v3: move rgb-mode to panel node which describe at: Documentation/devicetree/bindings/display/panel/panel-rgb.txt Changes in v2: 1. rename rockchip,rgb-mode to rgb-mode; 2. delete reg for signle endpoint; .../bindings/display/rockchip/rockchip-rgb.txt | 72 ++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 Documentation/devicetree/bindings/display/rockchip/rockchip-rgb.txt diff --git a/Documentation/devicetree/bindings/display/rockchip/rockchip-rgb.txt b/Documentation/devicetree/bindings/display/rockchip/rockchip-rgb.txt new file mode 100644 index 0000000..d91a7bf --- /dev/null +++ b/Documentation/devicetree/bindings/display/rockchip/rockchip-rgb.txt @@ -0,0 +1,72 @@ +Rockchip RV1108 RGB interface +================================ + +Required properties: +- compatible: matching the soc type: + - "rockchip,rv1108-rgb"; + +Optional properties: +- pinctrl-names: must contain a "lcdc" entry. +- pinctrl-0: pin control group to be used for this interface. + +The rgb has two video ports described by: + Documentation/devicetree/bindings/media/video-interfaces.txt +Their connections are modeled using the OF graph bindings specified in + Documentation/devicetree/bindings/graph.txt. + +- video port 0 for the VOP input, the remote endpoint maybe vopb/vopl/vop +- video port 1 for either a panel or subsequent encoder + +the panel described by: + Documentation/devicetree/bindings/display/panel/simple-panel.txt +rgb-mode nodes described by: + Documentation/devicetree/bindings/display/panel/panel-rgb.txt +Panel other required properties: +- ports for remote rgb output. + +Example: + +panel: panel { + compatible = "auo,b101ean01"; + enable-gpios = <&gpio7 21 GPIO_ACTIVE_HIGH>; + rgb-mode = "p888"; + + ports { + panel_in_rgb: endpoint { + remote-endpoint = <&rgb_out_panel>; + }; + }; +}; + +For Rockchip RV1108: + + rgb: rgb { + compatible = "rockchip,rv1108-rgb"; + pinctrl-names = "lcdc"; + pinctrl-0 = <&lcdc_ctl>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + rgb_in: port@0 { + reg = <0>; + #address-cells = <1>; + #size-cells = <0>; + + rgb_in_vop: endpoint { + remote-endpoint = <&vop_out_rgb>; + }; + }; + + rgb_out: port@1 { + reg = <1>; + #address-cells = <1>; + #size-cells = <0>; + + rgb_out_panel: endpoint { + remote-endpoint = <&panel_in_rgb>; + }; + }; + }; + }; -- 2.7.4 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v4 3/4] drm/rockchip: Add support for Rockchip Soc RGB output interface 2017-11-01 7:52 [PATCH v4 0/4] Add support rockchip RGB output interface Sandy Huang 2017-11-01 7:52 ` [PATCH v4 1/4] devicetree/bindings: display: Add doucument for RGB panels Sandy Huang 2017-11-01 7:52 ` [PATCH v4 2/4] devicetree/bindings: display: Add document for rockchip RGB output Sandy Huang @ 2017-11-01 7:54 ` Sandy Huang 2017-11-01 7:55 ` [PATCH v4 4/4] drm/rockchip: vop: Add more RGB output interface type Sandy Huang 3 siblings, 0 replies; 6+ messages in thread From: Sandy Huang @ 2017-11-01 7:54 UTC (permalink / raw) To: Mark Yao, David Airlie, Heiko Stuebner Cc: Sandy Huang, linux-kernel, dri-devel, linux-arm-kernel, linux-rockchip Some Rockchip CRTCs, like rv1108, can directly output parallel and serial RGB data to panel or conversion chip, so we add this driver to probe encoder and connector. Signed-off-by: Sandy Huang <hjc@rock-chips.com> Reviewed-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Mark Yao <mark.yao@rock-chips.com> --- Changes in v4: 1. add ROCKCHIP_RGB depend on DRM_ROCKCHIP and PINCTRL; 2. drm_connector_cleanup be gated on rgb->panel; Changes in v3: update for rgb-mode move to panel node. Changes in v2: 1. add error log when probe failed; 2. update name_to_output_mode() according to sean's suggest; 3. Fix uninitialized use of ret. drivers/gpu/drm/rockchip/Kconfig | 11 + drivers/gpu/drm/rockchip/Makefile | 1 + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 2 + drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 1 + drivers/gpu/drm/rockchip/rockchip_rgb.c | 344 ++++++++++++++++++++++++++++ 5 files changed, 359 insertions(+) create mode 100644 drivers/gpu/drm/rockchip/rockchip_rgb.c diff --git a/drivers/gpu/drm/rockchip/Kconfig b/drivers/gpu/drm/rockchip/Kconfig index 3c70c62..51b1570 100644 --- a/drivers/gpu/drm/rockchip/Kconfig +++ b/drivers/gpu/drm/rockchip/Kconfig @@ -8,6 +8,7 @@ config DRM_ROCKCHIP select DRM_ANALOGIX_DP if ROCKCHIP_ANALOGIX_DP select DRM_DW_HDMI if ROCKCHIP_DW_HDMI select DRM_MIPI_DSI if ROCKCHIP_DW_MIPI_DSI + select DRM_RGB if ROCKCHIP_RGB select SND_SOC_HDMI_CODEC if ROCKCHIP_CDN_DP && SND_SOC help Choose this option if you have a Rockchip soc chipset. @@ -66,4 +67,14 @@ config ROCKCHIP_LVDS Rockchip rk3288 SoC has LVDS TX Controller can be used, and it support LVDS, rgb, dual LVDS output mode. say Y to enable its driver. + +config ROCKCHIP_RGB + bool "Rockchip RGB support" + depends on DRM_ROCKCHIP + depends on PINCTRL + help + Choose this option to enable support for Rockchip RGB output. + Some Rockchip CRTCs, like rv1108, can directly output parallel + and serial RGB format to panel or connect to a conversion chip. + say Y to enable its driver. endif diff --git a/drivers/gpu/drm/rockchip/Makefile b/drivers/gpu/drm/rockchip/Makefile index a881d2c..f32a17f 100644 --- a/drivers/gpu/drm/rockchip/Makefile +++ b/drivers/gpu/drm/rockchip/Makefile @@ -13,5 +13,6 @@ rockchipdrm-$(CONFIG_ROCKCHIP_DW_HDMI) += dw_hdmi-rockchip.o rockchipdrm-$(CONFIG_ROCKCHIP_DW_MIPI_DSI) += dw-mipi-dsi.o rockchipdrm-$(CONFIG_ROCKCHIP_INNO_HDMI) += inno_hdmi.o rockchipdrm-$(CONFIG_ROCKCHIP_LVDS) += rockchip_lvds.o +rockchipdrm-$(CONFIG_ROCKCHIP_RGB) += rockchip_rgb.o obj-$(CONFIG_DRM_ROCKCHIP) += rockchipdrm.o diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c index 76d63de..265597c 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c @@ -459,6 +459,8 @@ static int __init rockchip_drm_init(void) CONFIG_ROCKCHIP_LVDS); ADD_ROCKCHIP_SUB_DRIVER(rockchip_dp_driver, CONFIG_ROCKCHIP_ANALOGIX_DP); + ADD_ROCKCHIP_SUB_DRIVER(rockchip_rgb_driver, + CONFIG_ROCKCHIP_RGB); ADD_ROCKCHIP_SUB_DRIVER(cdn_dp_driver, CONFIG_ROCKCHIP_CDN_DP); ADD_ROCKCHIP_SUB_DRIVER(dw_hdmi_rockchip_pltfm_driver, CONFIG_ROCKCHIP_DW_HDMI); diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h index 498dfbc..6b0ec7e 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h @@ -70,5 +70,6 @@ extern struct platform_driver dw_mipi_dsi_driver; extern struct platform_driver inno_hdmi_driver; extern struct platform_driver rockchip_dp_driver; extern struct platform_driver rockchip_lvds_driver; +extern struct platform_driver rockchip_rgb_driver; extern struct platform_driver vop_platform_driver; #endif /* _ROCKCHIP_DRM_DRV_H_ */ diff --git a/drivers/gpu/drm/rockchip/rockchip_rgb.c b/drivers/gpu/drm/rockchip/rockchip_rgb.c new file mode 100644 index 0000000..1831897 --- /dev/null +++ b/drivers/gpu/drm/rockchip/rockchip_rgb.c @@ -0,0 +1,344 @@ +/* + * Copyright (C) Fuzhou Rockchip Electronics Co.Ltd + * Author: + * Sandy Huang <hjc@rock-chips.com> + * + * This software is licensed under the terms of the GNU General Public + * License version 2, as published by the Free Software Foundation, and + * may be copied, distributed, and modified under those terms. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <drm/drmP.h> +#include <drm/drm_atomic_helper.h> +#include <drm/drm_crtc_helper.h> +#include <drm/drm_dp_helper.h> +#include <drm/drm_panel.h> +#include <drm/drm_of.h> + +#include <linux/component.h> +#include <linux/of_graph.h> + +#include "rockchip_drm_drv.h" +#include "rockchip_drm_vop.h" + +#define connector_to_rgb(c) container_of(c, struct rockchip_rgb, connector) +#define encoder_to_rgb(c) container_of(c, struct rockchip_rgb, encoder) + +struct rockchip_rgb { + struct device *dev; + struct drm_device *drm_dev; + struct drm_panel *panel; + struct drm_bridge *bridge; + struct drm_connector connector; + struct drm_encoder encoder; + struct dev_pin_info *pins; + int output_mode; +}; + +static inline int name_to_output_mode(const char *s) +{ + static const struct { + const char *name; + int format; + } formats[] = { + { "p888", ROCKCHIP_OUT_MODE_P888 }, + { "p666", ROCKCHIP_OUT_MODE_P666 }, + { "p565", ROCKCHIP_OUT_MODE_P565 }, + { "s888", ROCKCHIP_OUT_MODE_S888 }, + { "s888_dummy", ROCKCHIP_OUT_MODE_S888_DUMMY } + }; + int i; + + for (i = 0; i < ARRAY_SIZE(formats); i++) + if (!strncmp(s, formats[i].name, strlen(formats[i].name))) + return formats[i].format; + + return -EINVAL; +} + +static const struct drm_connector_funcs rockchip_rgb_connector_funcs = { + .fill_modes = drm_helper_probe_single_connector_modes, + .destroy = drm_connector_cleanup, + .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 rockchip_rgb_connector_get_modes(struct drm_connector *connector) +{ + struct rockchip_rgb *rgb = connector_to_rgb(connector); + struct drm_panel *panel = rgb->panel; + + return drm_panel_get_modes(panel); +} + +static const +struct drm_connector_helper_funcs rockchip_rgb_connector_helper_funcs = { + .get_modes = rockchip_rgb_connector_get_modes, +}; + +static void rockchip_rgb_encoder_enable(struct drm_encoder *encoder) +{ + struct rockchip_rgb *rgb = encoder_to_rgb(encoder); + + drm_panel_prepare(rgb->panel); + /* iomux to LCD data/sync mode */ + if (rgb->pins && !IS_ERR(rgb->pins->default_state)) + pinctrl_select_state(rgb->pins->p, rgb->pins->default_state); + + drm_panel_enable(rgb->panel); +} + +static void rockchip_rgb_encoder_disable(struct drm_encoder *encoder) +{ + struct rockchip_rgb *rgb = encoder_to_rgb(encoder); + + drm_panel_disable(rgb->panel); + drm_panel_unprepare(rgb->panel); +} + +static int +rockchip_rgb_encoder_atomic_check(struct drm_encoder *encoder, + struct drm_crtc_state *crtc_state, + struct drm_connector_state *conn_state) +{ + struct rockchip_crtc_state *s = to_rockchip_crtc_state(crtc_state); + struct rockchip_rgb *rgb = encoder_to_rgb(encoder); + + s->output_mode = rgb->output_mode; + s->output_type = DRM_MODE_CONNECTOR_LVDS; + + return 0; +} + +static const +struct drm_encoder_helper_funcs rockchip_rgb_encoder_helper_funcs = { + .enable = rockchip_rgb_encoder_enable, + .disable = rockchip_rgb_encoder_disable, + .atomic_check = rockchip_rgb_encoder_atomic_check, +}; + +static const struct drm_encoder_funcs rockchip_rgb_encoder_funcs = { + .destroy = drm_encoder_cleanup, +}; + +static const struct of_device_id rockchip_rgb_dt_ids[] = { + { + .compatible = "rockchip,rv1108-rgb", + }, + {} +}; + +MODULE_DEVICE_TABLE(of, rockchip_rgb_dt_ids); + +static int rockchip_rgb_bind(struct device *dev, struct device *master, + void *data) +{ + struct rockchip_rgb *rgb = dev_get_drvdata(dev); + struct drm_device *drm_dev = data; + struct drm_encoder *encoder; + struct drm_connector *connector; + struct device_node *remote = NULL; + struct device_node *port, *endpoint; + u32 endpoint_id; + const char *name; + int ret = 0, child_count = 0; + + rgb->drm_dev = drm_dev; + port = of_graph_get_port_by_id(dev->of_node, 1); + if (!port) { + DRM_DEV_ERROR(dev, + "can't found port point, please init rgb panel port!\n"); + return -EINVAL; + } + for_each_child_of_node(port, endpoint) { + child_count++; + if (of_property_read_u32(endpoint, "reg", &endpoint_id)) + endpoint_id = 0; + ret = drm_of_find_panel_or_bridge(dev->of_node, 1, endpoint_id, + &rgb->panel, &rgb->bridge); + if (!ret) + break; + } + if (!child_count) { + DRM_DEV_ERROR(dev, "rgb port does not have any children\n"); + ret = -EINVAL; + goto err_put_port; + } else if (ret) { + DRM_DEV_ERROR(dev, "failed to find panel and bridge node\n"); + ret = -EPROBE_DEFER; + goto err_put_port; + } + if (rgb->panel) + remote = rgb->panel->dev->of_node; + else + remote = rgb->bridge->of_node; + if (of_property_read_string(remote, "rgb-mode", &name)) + /* default set it as output mode P888 */ + rgb->output_mode = ROCKCHIP_OUT_MODE_P888; + else + rgb->output_mode = name_to_output_mode(name); + if (rgb->output_mode < 0) { + DRM_DEV_ERROR(dev, "invalid rockchip,rgb-mode [%s]\n", name); + ret = rgb->output_mode; + goto err_put_remote; + } + + encoder = &rgb->encoder; + encoder->possible_crtcs = drm_of_find_possible_crtcs(drm_dev, + dev->of_node); + + ret = drm_encoder_init(drm_dev, encoder, &rockchip_rgb_encoder_funcs, + DRM_MODE_ENCODER_NONE, NULL); + if (ret < 0) { + DRM_DEV_ERROR(drm_dev->dev, + "failed to initialize encoder: %d\n", ret); + goto err_put_remote; + } + + drm_encoder_helper_add(encoder, &rockchip_rgb_encoder_helper_funcs); + + if (rgb->panel) { + connector = &rgb->connector; + connector->dpms = DRM_MODE_DPMS_OFF; + ret = drm_connector_init(drm_dev, connector, + &rockchip_rgb_connector_funcs, + DRM_MODE_CONNECTOR_Unknown); + if (ret < 0) { + DRM_DEV_ERROR(drm_dev->dev, + "failed to initialize connector: %d\n", + ret); + goto err_free_encoder; + } + + drm_connector_helper_add(connector, + &rockchip_rgb_connector_helper_funcs); + + ret = drm_mode_connector_attach_encoder(connector, encoder); + if (ret < 0) { + DRM_DEV_ERROR(drm_dev->dev, + "failed to attach encoder: %d\n", ret); + goto err_free_connector; + } + + ret = drm_panel_attach(rgb->panel, connector); + if (ret < 0) { + DRM_DEV_ERROR(drm_dev->dev, + "failed to attach panel: %d\n", ret); + goto err_free_connector; + } + } else { + rgb->bridge->encoder = encoder; + ret = drm_bridge_attach(encoder, rgb->bridge, NULL); + if (ret) { + DRM_DEV_ERROR(drm_dev->dev, + "failed to attach bridge: %d\n", ret); + goto err_free_encoder; + } + encoder->bridge = rgb->bridge; + } + + of_node_put(remote); + of_node_put(port); + + return 0; + +err_free_connector: + drm_connector_cleanup(connector); +err_free_encoder: + drm_encoder_cleanup(encoder); +err_put_remote: + of_node_put(remote); +err_put_port: + of_node_put(port); + + return ret; +} + +static void rockchip_rgb_unbind(struct device *dev, struct device *master, + void *data) +{ + struct rockchip_rgb *rgb = dev_get_drvdata(dev); + + rockchip_rgb_encoder_disable(&rgb->encoder); + if (rgb->panel) { + drm_panel_detach(rgb->panel); + drm_connector_cleanup(&rgb->connector); + } + drm_encoder_cleanup(&rgb->encoder); +} + +static const struct component_ops rockchip_rgb_component_ops = { + .bind = rockchip_rgb_bind, + .unbind = rockchip_rgb_unbind, +}; + +static int rockchip_rgb_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct rockchip_rgb *rgb; + const struct of_device_id *match; + int ret; + + if (!dev->of_node) { + DRM_DEV_ERROR(dev, "dev->of_node is null\n"); + return -ENODEV; + } + + rgb = devm_kzalloc(&pdev->dev, sizeof(*rgb), GFP_KERNEL); + if (!rgb) + return -ENOMEM; + + rgb->dev = dev; + match = of_match_node(rockchip_rgb_dt_ids, dev->of_node); + if (!match) { + DRM_DEV_ERROR(dev, "match node failed\n"); + return -ENODEV; + } + + rgb->pins = devm_kzalloc(rgb->dev, sizeof(*rgb->pins), GFP_KERNEL); + if (!rgb->pins) + return -ENOMEM; + rgb->pins->p = devm_pinctrl_get(rgb->dev); + if (IS_ERR(rgb->pins->p)) { + DRM_DEV_ERROR(dev, "no pinctrl handle\n"); + devm_kfree(rgb->dev, rgb->pins); + rgb->pins = NULL; + } else { + rgb->pins->default_state = + pinctrl_lookup_state(rgb->pins->p, "lcdc"); + if (IS_ERR(rgb->pins->default_state)) { + DRM_DEV_ERROR(dev, "no default pinctrl state\n"); + devm_kfree(rgb->dev, rgb->pins); + rgb->pins = NULL; + } + } + + dev_set_drvdata(dev, rgb); + ret = component_add(&pdev->dev, &rockchip_rgb_component_ops); + if (ret < 0) + DRM_DEV_ERROR(dev, "failed to add component\n"); + + return ret; +} + +static int rockchip_rgb_remove(struct platform_device *pdev) +{ + component_del(&pdev->dev, &rockchip_rgb_component_ops); + + return 0; +} + +struct platform_driver rockchip_rgb_driver = { + .probe = rockchip_rgb_probe, + .remove = rockchip_rgb_remove, + .driver = { + .name = "rockchip-rgb", + .of_match_table = of_match_ptr(rockchip_rgb_dt_ids), + }, +}; -- 2.7.4 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v4 4/4] drm/rockchip: vop: Add more RGB output interface type 2017-11-01 7:52 [PATCH v4 0/4] Add support rockchip RGB output interface Sandy Huang ` (2 preceding siblings ...) 2017-11-01 7:54 ` [PATCH v4 3/4] drm/rockchip: Add support for Rockchip Soc RGB output interface Sandy Huang @ 2017-11-01 7:55 ` Sandy Huang 3 siblings, 0 replies; 6+ messages in thread From: Sandy Huang @ 2017-11-01 7:55 UTC (permalink / raw) To: Mark Yao, David Airlie, Heiko Stuebner Cc: Sandy Huang, dri-devel, linux-arm-kernel, linux-rockchip, linux-kernel This patch add serial RGB output interface for rockchip vop, the more info about serial RGB output interface described at the following file: Documentation/devicetree/bindings/display/panel/panel-rgb.txt Signed-off-by: Sandy Huang <hjc@rock-chips.com> Reviewed-by: Sean Paul <seanpaul@chromium.org> --- Changes in v4: None Changes in v3: None Changes in v2: None drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h index 56bbd2e..59a01c3 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h @@ -209,6 +209,8 @@ struct vop_data { #define ROCKCHIP_OUT_MODE_P888 0 #define ROCKCHIP_OUT_MODE_P666 1 #define ROCKCHIP_OUT_MODE_P565 2 +#define ROCKCHIP_OUT_MODE_S888 8 +#define ROCKCHIP_OUT_MODE_S888_DUMMY 12 /* for use special outface */ #define ROCKCHIP_OUT_MODE_AAAA 15 -- 2.7.4 ^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-11-02 0:22 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2017-11-01 7:52 [PATCH v4 0/4] Add support rockchip RGB output interface Sandy Huang 2017-11-01 7:52 ` [PATCH v4 1/4] devicetree/bindings: display: Add doucument for RGB panels Sandy Huang 2017-11-02 0:22 ` Rob Herring 2017-11-01 7:52 ` [PATCH v4 2/4] devicetree/bindings: display: Add document for rockchip RGB output Sandy Huang 2017-11-01 7:54 ` [PATCH v4 3/4] drm/rockchip: Add support for Rockchip Soc RGB output interface Sandy Huang 2017-11-01 7:55 ` [PATCH v4 4/4] drm/rockchip: vop: Add more RGB output interface type Sandy Huang
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).