Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/rockchip: Add RK3588 DPTX output support

Add driver extension for Synopsys DesignWare DPTX IP used
on Rockchip RK3588 SoC.

Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Acked-by: Dmitry Baryshkov <lumag@kernel.org>
Tested-by: Nicolas Frattaroli <nicolas.frattaroli@collabora.com>
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
Link: https://lore.kernel.org/r/20250822063959.692098-4-andyshrk@163.com
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>

authored by

Andy Yan and committed by
Dmitry Baryshkov
d68ba7ba 86eecc3a

+162
+9
drivers/gpu/drm/rockchip/Kconfig
··· 10 10 select VIDEOMODE_HELPERS 11 11 select DRM_ANALOGIX_DP if ROCKCHIP_ANALOGIX_DP 12 12 select DRM_DISPLAY_DP_AUX_BUS if ROCKCHIP_ANALOGIX_DP 13 + select DRM_DW_DP if ROCKCHIP_DW_DP 13 14 select DRM_DW_HDMI if ROCKCHIP_DW_HDMI 14 15 select DRM_DW_HDMI_QP if ROCKCHIP_DW_HDMI_QP 15 16 select DRM_DW_MIPI_DSI if ROCKCHIP_DW_MIPI_DSI ··· 60 59 for the cdn DP driver. If you want to enable Dp on 61 60 RK3399 based SoC, you should select this 62 61 option. 62 + 63 + config ROCKCHIP_DW_DP 64 + bool "Rockchip specific extensions for Synopsys DW DP" 65 + help 66 + This selects support for Rockchip SoC specific extensions 67 + to enable Synopsys DesignWare Cores based DisplayPort transmit 68 + controller support on Rockchip SoC, If you want to enable DP on 69 + rk3588 based SoC, you should select this option. 63 70 64 71 config ROCKCHIP_DW_HDMI 65 72 bool "Rockchip specific extensions for Synopsys DW HDMI"
+1
drivers/gpu/drm/rockchip/Makefile
··· 14 14 rockchipdrm-$(CONFIG_ROCKCHIP_DW_HDMI_QP) += dw_hdmi_qp-rockchip.o 15 15 rockchipdrm-$(CONFIG_ROCKCHIP_DW_MIPI_DSI) += dw-mipi-dsi-rockchip.o 16 16 rockchipdrm-$(CONFIG_ROCKCHIP_DW_MIPI_DSI2) += dw-mipi-dsi2-rockchip.o 17 + rockchipdrm-$(CONFIG_ROCKCHIP_DW_DP) += dw_dp-rockchip.o 17 18 rockchipdrm-$(CONFIG_ROCKCHIP_INNO_HDMI) += inno_hdmi.o 18 19 rockchipdrm-$(CONFIG_ROCKCHIP_LVDS) += rockchip_lvds.o 19 20 rockchipdrm-$(CONFIG_ROCKCHIP_RGB) += rockchip_rgb.o
+150
drivers/gpu/drm/rockchip/dw_dp-rockchip.c
··· 1 + // SPDX-License-Identifier: GPL-2.0 2 + /* 3 + * Copyright (c) 2020 Rockchip Electronics Co., Ltd. 4 + * 5 + * Author: Zhang Yubing <yubing.zhang@rock-chips.com> 6 + * Author: Andy Yan <andy.yan@rock-chips.com> 7 + */ 8 + 9 + #include <linux/component.h> 10 + #include <linux/of_device.h> 11 + #include <linux/platform_device.h> 12 + #include <drm/bridge/dw_dp.h> 13 + #include <drm/drm_atomic_helper.h> 14 + #include <drm/drm_bridge.h> 15 + #include <drm/drm_bridge_connector.h> 16 + #include <drm/drm_of.h> 17 + #include <drm/drm_print.h> 18 + #include <drm/drm_probe_helper.h> 19 + #include <drm/drm_simple_kms_helper.h> 20 + 21 + #include <linux/media-bus-format.h> 22 + #include <linux/videodev2.h> 23 + 24 + #include "rockchip_drm_drv.h" 25 + #include "rockchip_drm_vop.h" 26 + 27 + struct rockchip_dw_dp { 28 + struct dw_dp *base; 29 + struct device *dev; 30 + struct rockchip_encoder encoder; 31 + }; 32 + 33 + static int dw_dp_encoder_atomic_check(struct drm_encoder *encoder, 34 + struct drm_crtc_state *crtc_state, 35 + struct drm_connector_state *conn_state) 36 + { 37 + struct rockchip_crtc_state *s = to_rockchip_crtc_state(crtc_state); 38 + struct drm_atomic_state *state = conn_state->state; 39 + struct drm_display_info *di = &conn_state->connector->display_info; 40 + struct drm_bridge *bridge = drm_bridge_chain_get_first_bridge(encoder); 41 + struct drm_bridge_state *bridge_state = drm_atomic_get_new_bridge_state(state, bridge); 42 + u32 bus_format = bridge_state->input_bus_cfg.format; 43 + 44 + switch (bus_format) { 45 + case MEDIA_BUS_FMT_UYYVYY10_0_5X30: 46 + case MEDIA_BUS_FMT_UYYVYY8_0_5X24: 47 + s->output_mode = ROCKCHIP_OUT_MODE_YUV420; 48 + break; 49 + case MEDIA_BUS_FMT_YUYV10_1X20: 50 + case MEDIA_BUS_FMT_YUYV8_1X16: 51 + s->output_mode = ROCKCHIP_OUT_MODE_S888_DUMMY; 52 + break; 53 + case MEDIA_BUS_FMT_RGB101010_1X30: 54 + case MEDIA_BUS_FMT_RGB888_1X24: 55 + case MEDIA_BUS_FMT_RGB666_1X24_CPADHI: 56 + case MEDIA_BUS_FMT_YUV10_1X30: 57 + case MEDIA_BUS_FMT_YUV8_1X24: 58 + default: 59 + s->output_mode = ROCKCHIP_OUT_MODE_AAAA; 60 + break; 61 + } 62 + 63 + s->output_type = DRM_MODE_CONNECTOR_DisplayPort; 64 + s->bus_format = bus_format; 65 + s->bus_flags = di->bus_flags; 66 + s->color_space = V4L2_COLORSPACE_DEFAULT; 67 + 68 + return 0; 69 + } 70 + 71 + static const struct drm_encoder_helper_funcs dw_dp_encoder_helper_funcs = { 72 + .atomic_check = dw_dp_encoder_atomic_check, 73 + }; 74 + 75 + static int dw_dp_rockchip_bind(struct device *dev, struct device *master, void *data) 76 + { 77 + struct platform_device *pdev = to_platform_device(dev); 78 + struct dw_dp_plat_data plat_data; 79 + struct drm_device *drm_dev = data; 80 + struct rockchip_dw_dp *dp; 81 + struct drm_encoder *encoder; 82 + struct drm_connector *connector; 83 + int ret; 84 + 85 + dp = devm_kzalloc(dev, sizeof(*dp), GFP_KERNEL); 86 + if (!dp) 87 + return -ENOMEM; 88 + 89 + dp->dev = dev; 90 + platform_set_drvdata(pdev, dp); 91 + 92 + plat_data.max_link_rate = 810000; 93 + encoder = &dp->encoder.encoder; 94 + encoder->possible_crtcs = drm_of_find_possible_crtcs(drm_dev, dev->of_node); 95 + rockchip_drm_encoder_set_crtc_endpoint_id(&dp->encoder, dev->of_node, 0, 0); 96 + 97 + ret = drmm_encoder_init(drm_dev, encoder, NULL, DRM_MODE_ENCODER_TMDS, NULL); 98 + if (ret) 99 + return ret; 100 + drm_encoder_helper_add(encoder, &dw_dp_encoder_helper_funcs); 101 + 102 + dp->base = dw_dp_bind(dev, encoder, &plat_data); 103 + if (IS_ERR(dp->base)) { 104 + ret = PTR_ERR(dp->base); 105 + return ret; 106 + } 107 + 108 + connector = drm_bridge_connector_init(drm_dev, encoder); 109 + if (IS_ERR(connector)) { 110 + ret = PTR_ERR(connector); 111 + return dev_err_probe(dev, ret, "Failed to init bridge connector"); 112 + } 113 + 114 + drm_connector_attach_encoder(connector, encoder); 115 + 116 + return 0; 117 + } 118 + 119 + static const struct component_ops dw_dp_rockchip_component_ops = { 120 + .bind = dw_dp_rockchip_bind, 121 + }; 122 + 123 + static int dw_dp_probe(struct platform_device *pdev) 124 + { 125 + struct device *dev = &pdev->dev; 126 + 127 + return component_add(dev, &dw_dp_rockchip_component_ops); 128 + } 129 + 130 + static void dw_dp_remove(struct platform_device *pdev) 131 + { 132 + struct rockchip_dw_dp *dp = platform_get_drvdata(pdev); 133 + 134 + component_del(dp->dev, &dw_dp_rockchip_component_ops); 135 + } 136 + 137 + static const struct of_device_id dw_dp_of_match[] = { 138 + { .compatible = "rockchip,rk3588-dp", }, 139 + {} 140 + }; 141 + MODULE_DEVICE_TABLE(of, dw_dp_of_match); 142 + 143 + struct platform_driver dw_dp_driver = { 144 + .probe = dw_dp_probe, 145 + .remove = dw_dp_remove, 146 + .driver = { 147 + .name = "dw-dp", 148 + .of_match_table = dw_dp_of_match, 149 + }, 150 + };
+1
drivers/gpu/drm/rockchip/rockchip_drm_drv.c
··· 529 529 ADD_ROCKCHIP_SUB_DRIVER(rockchip_dp_driver, 530 530 CONFIG_ROCKCHIP_ANALOGIX_DP); 531 531 ADD_ROCKCHIP_SUB_DRIVER(cdn_dp_driver, CONFIG_ROCKCHIP_CDN_DP); 532 + ADD_ROCKCHIP_SUB_DRIVER(dw_dp_driver, CONFIG_ROCKCHIP_DW_DP); 532 533 ADD_ROCKCHIP_SUB_DRIVER(dw_hdmi_rockchip_pltfm_driver, 533 534 CONFIG_ROCKCHIP_DW_HDMI); 534 535 ADD_ROCKCHIP_SUB_DRIVER(dw_hdmi_qp_rockchip_pltfm_driver,
+1
drivers/gpu/drm/rockchip/rockchip_drm_drv.h
··· 87 87 struct device_node *np, int port, int reg); 88 88 int rockchip_drm_endpoint_is_subdriver(struct device_node *ep); 89 89 extern struct platform_driver cdn_dp_driver; 90 + extern struct platform_driver dw_dp_driver; 90 91 extern struct platform_driver dw_hdmi_rockchip_pltfm_driver; 91 92 extern struct platform_driver dw_hdmi_qp_rockchip_pltfm_driver; 92 93 extern struct platform_driver dw_mipi_dsi_rockchip_driver;