This patches add support Rockchip RK3288 LVDS support, based on patches from
Mark yao[0] and Heiko Stuebner[1].
[0]: https://github.com/RockchipOpensourceCommunity/popmetal-kernel-3.14
[1]: http://lists.infradead.org/pipermail/linux-rockchip/2015-April/002830.html
Changes:
- Update rockchip_lvds_encoder_helper_funcs to atomic API
- Add bridge function for RGB/LVDS convert to other output type
- Fix some unreasonable define
- Adapter to the latest rockchip DRM driver framework
- Add pinctrl for RGB output type
- Reseved some define for rockchip next Soc
Sandy Huang (3):
dt-bindings: display: Add Document for Rockchip Soc LVDS
ARM: dts: Add LVDS info for rk3288
drm/rockchip: Add support for Rockchip Soc LVDS
.../bindings/display/rockchip/rockchip-lvds.txt | 104 +++
arch/arm/boot/dts/rk3288.dtsi | 52 ++
drivers/gpu/drm/rockchip/Kconfig | 9 +
drivers/gpu/drm/rockchip/Makefile | 1 +
drivers/gpu/drm/rockchip/rockchip_lvds.c | 734 +++++++++++++++++++++
drivers/gpu/drm/rockchip/rockchip_lvds.h | 112 ++++
6 files changed, 1012 insertions(+)
create mode 100644 Documentation/devicetree/bindings/display/rockchip/rockchip-lvds.txt
create mode 100644 drivers/gpu/drm/rockchip/rockchip_lvds.c
create mode 100644 drivers/gpu/drm/rockchip/rockchip_lvds.h
--
2.7.4
This patch add Document for Rockchip Soc RK3288 LVDS,
This based on the patches from Mark yao and Heiko Stuebner.
Signed-off-by: Sandy Huang <[email protected]>
Signed-off-by: Mark yao <[email protected]>
Signed-off-by: Heiko Stuebner <[email protected]>
---
.../bindings/display/rockchip/rockchip-lvds.txt | 104 +++++++++++++++++++++
1 file changed, 104 insertions(+)
create mode 100644 Documentation/devicetree/bindings/display/rockchip/rockchip-lvds.txt
diff --git a/Documentation/devicetree/bindings/display/rockchip/rockchip-lvds.txt b/Documentation/devicetree/bindings/display/rockchip/rockchip-lvds.txt
new file mode 100644
index 0000000..bf934ba
--- /dev/null
+++ b/Documentation/devicetree/bindings/display/rockchip/rockchip-lvds.txt
@@ -0,0 +1,104 @@
+Rockchip RK3288 LVDS interface
+================================
+
+Required properties:
+- compatible: matching the soc type, one of
+ - "rockchip,rk3288-lvds";
+
+- reg: physical base address of the controller and length
+ of memory mapped region.
+- clocks: must include clock specifiers corresponding to entries in the
+ clock-names property.
+- clock-names: must contain "pclk_lvds"
+
+- avdd1v0-supply: regulator phandle for 1.0V analog power
+- avdd1v8-supply: regulator phandle for 1.8V analog power
+- avdd3v3-supply: regulator phandle for 3.3V analog power
+
+- rockchip,grf: phandle to the general register files syscon
+
+Optional properties
+- pinctrl-names: must contain a "lcdc" entry.
+- pinctrl-0: pin control group to be used for this controller.
+
+Required nodes:
+
+The lvds has two video ports as 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 inputs
+- video port 1 for either a panel or subsequent encoder
+
+the lvds panel described by
+ Documentation/devicetree/bindings/display/panel/simple-panel.txt
+
+- rockchip,data-mapping: should be "vesa" or "jeida",
+ This describes how the color bits are laid out in the
+ serialized LVDS signal.
+- rockchip,data-width : should be <18> or <24>;
+- rockchip,output: should be "rgb", "lvds" or "duallvds",
+ This describes the output face.
+- ports for remote LVDS output
+
+Example:
+
+lvds_panel: lvds-panel {
+ status = "okay";
+ compatible = "simple-panel";
+ enable-gpios = <&gpio7 21 GPIO_ACTIVE_HIGH>;
+ rockchip,data-mapping = "jeida";
+ rockchip,data-width = <24>;
+ rockchip,output = "rgb";
+
+ ports {
+ panel_in_lvds: endpoint {
+ remote-endpoint = <&lvds_out_panel>;
+ };
+ };
+};
+
+
+For Rockchip RK3288:
+
+ lvds: lvds@ff96c000 {
+ compatible = "rockchip,rk3288-lvds";
+ rockchip,grf = <&grf>;
+ reg = <0xff96c000 0x4000>;
+ clocks = <&cru PCLK_LVDS_PHY>;
+ clock-names = "pclk_lvds";
+ pinctrl-names = "lcdc";
+ pinctrl-0 = <&lcdc_ctl>;
+ avdd1v0-supply = <&vdd10_lcd>;
+ avdd1v8-supply = <&vcc18_lcd>;
+ avdd3v3-supply = <&vcca_33>;
+ rockchip,data-mapping = "jeida";
+ rockchip,data-width = <24>;
+ rockchip,output = "rgb";
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ lvds_in: port@0 {
+ reg = <0>;
+
+ lvds_in_vopb: endpoint@0 {
+ reg = <0>;
+ remote-endpoint = <&vopb_out_lvds>;
+ };
+ lvds_in_vopl: endpoint@1 {
+ reg = <1>;
+ remote-endpoint = <&vopl_out_lvds>;
+ };
+ };
+
+ lvds_out: port@1 {
+ reg = <1>;
+
+ lvds_out_panel: endpoint {
+ remote-endpoint = <&panel_in>;
+ };
+ };
+ };
+ };
--
2.7.4
add LVDS info in rk3288.dtsi for LVDS driver
This based on the patches from Mark yao and Heiko Stuebner.
Signed-off-by: Sandy Huang <[email protected]>
Signed-off-by: Mark yao <[email protected]>
Signed-off-by: Heiko Stuebner <[email protected]>
---
arch/arm/boot/dts/rk3288.dtsi | 52 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 52 insertions(+)
diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
index 2484f11..c2e33b8 100644
--- a/arch/arm/boot/dts/rk3288.dtsi
+++ b/arch/arm/boot/dts/rk3288.dtsi
@@ -983,6 +983,11 @@
reg = <2>;
remote-endpoint = <&mipi_in_vopb>;
};
+
+ vopb_out_lvds: endpoint@3 {
+ reg = <3>;
+ remote-endpoint = <&lvds_in_vopb>;
+ };
};
};
@@ -1026,6 +1031,11 @@
reg = <2>;
remote-endpoint = <&mipi_in_vopl>;
};
+
+ vopl_out_lvds: endpoint@3 {
+ reg = <3>;
+ remote-endpoint = <&lvds_in_vopl>;
+ };
};
};
@@ -1099,6 +1109,39 @@
};
};
+ lvds: lvds@ff96c000 {
+ compatible = "rockchip,rk3288-lvds";
+ reg = <0xff96c000 0x4000>;
+ clocks = <&cru PCLK_LVDS_PHY>;
+ clock-names = "pclk_lvds";
+ pinctrl-names = "lcdc";
+ pinctrl-0 = <&lcdc_ctl>;
+ power-domains = <&power RK3288_PD_VIO>;
+ rockchip,grf = <&grf>;
+ status = "disabled";
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ lvds_in: port@0 {
+ reg = <0>;
+
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ lvds_in_vopb: endpoint@0 {
+ reg = <0>;
+ remote-endpoint = <&vopb_out_lvds>;
+ };
+ lvds_in_vopl: endpoint@1 {
+ reg = <1>;
+ remote-endpoint = <&vopl_out_lvds>;
+ };
+ };
+ };
+ };
+
hdmi: hdmi@ff980000 {
compatible = "rockchip,rk3288-dw-hdmi";
reg = <0xff980000 0x20000>;
@@ -1823,5 +1866,14 @@
rockchip,pins = <RK_GPIO6 11 RK_FUNC_1 &pcfg_pull_none>;
};
};
+
+ lcdc {
+ lcdc_ctl: lcdc-ctl {
+ rockchip,pins = <1 24 RK_FUNC_1 &pcfg_pull_none>,
+ <1 25 RK_FUNC_1 &pcfg_pull_none>,
+ <1 26 RK_FUNC_1 &pcfg_pull_none>,
+ <1 27 RK_FUNC_1 &pcfg_pull_none>;
+ };
+ };
};
};
--
2.7.4
This adds support for Rockchip soc lvds found on rk3288
Based on the patches from Mark yao and Heiko Stuebner
Signed-off-by: Sandy Huang <[email protected]>
Signed-off-by: Mark yao <[email protected]>
Signed-off-by: Heiko Stuebner <[email protected]>
---
drivers/gpu/drm/rockchip/Kconfig | 9 +
drivers/gpu/drm/rockchip/Makefile | 1 +
drivers/gpu/drm/rockchip/rockchip_lvds.c | 734 +++++++++++++++++++++++++++++++
drivers/gpu/drm/rockchip/rockchip_lvds.h | 112 +++++
4 files changed, 856 insertions(+)
create mode 100644 drivers/gpu/drm/rockchip/rockchip_lvds.c
create mode 100644 drivers/gpu/drm/rockchip/rockchip_lvds.h
diff --git a/drivers/gpu/drm/rockchip/Kconfig b/drivers/gpu/drm/rockchip/Kconfig
index 50c41c0..80672f4 100644
--- a/drivers/gpu/drm/rockchip/Kconfig
+++ b/drivers/gpu/drm/rockchip/Kconfig
@@ -59,3 +59,12 @@ config ROCKCHIP_INNO_HDMI
This selects support for Rockchip SoC specific extensions
for the Innosilicon HDMI driver. If you want to enable
HDMI on RK3036 based SoC, you should select this option.
+
+config ROCKCHIP_LVDS
+ bool "Rockchip LVDS support"
+ depends on DRM_ROCKCHIP
+ help
+ Choose this option to enable support for Rockchip LVDS controllers.
+ 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.
diff --git a/drivers/gpu/drm/rockchip/Makefile b/drivers/gpu/drm/rockchip/Makefile
index fa8dc9d..a881d2c 100644
--- a/drivers/gpu/drm/rockchip/Makefile
+++ b/drivers/gpu/drm/rockchip/Makefile
@@ -12,5 +12,6 @@ rockchipdrm-$(CONFIG_ROCKCHIP_CDN_DP) += cdn-dp-core.o cdn-dp-reg.o
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
obj-$(CONFIG_DRM_ROCKCHIP) += rockchipdrm.o
diff --git a/drivers/gpu/drm/rockchip/rockchip_lvds.c b/drivers/gpu/drm/rockchip/rockchip_lvds.c
new file mode 100644
index 0000000..a4ad3f0
--- /dev/null
+++ b/drivers/gpu/drm/rockchip/rockchip_lvds.c
@@ -0,0 +1,734 @@
+/*
+ * Copyright (C) Fuzhou Rockchip Electronics Co.Ltd
+ * Author:
+ * Mark Yao <[email protected]>
+ * Sandy huang <[email protected]>
+ *
+ * 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/clk.h>
+#include <linux/mfd/syscon.h>
+#include <linux/of_graph.h>
+#include <linux/pm_runtime.h>
+#include <linux/regmap.h>
+#include <linux/reset.h>
+
+#include <video/display_timing.h>
+
+#include "rockchip_drm_drv.h"
+#include "rockchip_drm_vop.h"
+#include "rockchip_lvds.h"
+
+#define DISPLAY_OUTPUT_RGB 0
+#define DISPLAY_OUTPUT_LVDS 1
+#define DISPLAY_OUTPUT_DUAL_LVDS 2
+
+#define connector_to_lvds(c) \
+ container_of(c, struct rockchip_lvds, connector)
+
+#define encoder_to_lvds(c) \
+ container_of(c, struct rockchip_lvds, encoder)
+#define LVDS_CHIP(lvds) ((lvds)->soc_data->chip_type)
+
+/*
+ * @grf_offset: offset inside the grf regmap for setting the rockchip lvds
+ */
+struct rockchip_lvds_soc_data {
+ int chip_type;
+ int grf_soc_con6;
+ int grf_soc_con7;
+
+ bool has_vop_sel;
+};
+
+struct rockchip_lvds {
+ void *base;
+ struct device *dev;
+ void __iomem *regs;
+ struct regmap *grf;
+ struct clk *pclk;
+ const struct rockchip_lvds_soc_data *soc_data;
+
+ int output;
+ int format;
+
+ struct drm_device *drm_dev;
+ struct drm_panel *panel;
+ struct drm_bridge *bridge;
+ struct drm_connector connector;
+ struct drm_encoder encoder;
+
+ struct mutex suspend_lock;
+ int suspend;
+ struct dev_pin_info *pins;
+ struct drm_display_mode mode;
+};
+
+static inline void lvds_writel(struct rockchip_lvds *lvds, u32 offset, u32 val)
+{
+ writel_relaxed(val, lvds->regs + offset);
+ if ((lvds->output != DISPLAY_OUTPUT_LVDS) &&
+ (LVDS_CHIP(lvds) == RK3288_LVDS))
+ writel_relaxed(val,
+ lvds->regs + offset + RK3288_LVDS_CH1_OFFSET);
+}
+
+static inline int lvds_name_to_format(const char *s)
+{
+ if (!s)
+ return -EINVAL;
+
+ if (strncmp(s, "jeida", 6) == 0)
+ return LVDS_FORMAT_JEIDA;
+ else if (strncmp(s, "vesa", 5) == 0)
+ return LVDS_FORMAT_VESA;
+
+ return -EINVAL;
+}
+
+static inline int lvds_name_to_output(const char *s)
+{
+ if (!s)
+ return -EINVAL;
+
+ if (strncmp(s, "rgb", 3) == 0)
+ return DISPLAY_OUTPUT_RGB;
+ else if (strncmp(s, "lvds", 4) == 0)
+ return DISPLAY_OUTPUT_LVDS;
+ else if (strncmp(s, "duallvds", 8) == 0)
+ return DISPLAY_OUTPUT_DUAL_LVDS;
+
+ return -EINVAL;
+}
+
+static int rockchip_lvds_poweron(struct rockchip_lvds *lvds)
+{
+ int ret;
+
+ if (lvds->pclk) {
+ ret = clk_enable(lvds->pclk);
+ if (ret < 0) {
+ dev_err(lvds->dev, "failed to enable lvds pclk %d\n", ret);
+ return ret;
+ }
+ }
+ ret = pm_runtime_get_sync(lvds->dev);
+ if (ret < 0) {
+ dev_err(lvds->dev, "failed to get pm runtime: %d\n", ret);
+ return ret;
+ }
+
+ if (lvds->output == DISPLAY_OUTPUT_RGB) {
+ lvds_writel(lvds, RK3288_LVDS_CH0_REG0,
+ RK3288_LVDS_CH0_REG0_TTL_EN |
+ RK3288_LVDS_CH0_REG0_LANECK_EN |
+ RK3288_LVDS_CH0_REG0_LANE4_EN |
+ RK3288_LVDS_CH0_REG0_LANE3_EN |
+ RK3288_LVDS_CH0_REG0_LANE2_EN |
+ RK3288_LVDS_CH0_REG0_LANE1_EN |
+ RK3288_LVDS_CH0_REG0_LANE0_EN);
+ lvds_writel(lvds, RK3288_LVDS_CH0_REG2,
+ RK3288_LVDS_PLL_FBDIV_REG2(0x46));
+
+ lvds_writel(lvds, RK3288_LVDS_CH0_REG3,
+ RK3288_LVDS_PLL_FBDIV_REG3(0x46));
+ lvds_writel(lvds, RK3288_LVDS_CH0_REG4,
+ RK3288_LVDS_CH0_REG4_LANECK_TTL_MODE |
+ RK3288_LVDS_CH0_REG4_LANE4_TTL_MODE |
+ RK3288_LVDS_CH0_REG4_LANE3_TTL_MODE |
+ RK3288_LVDS_CH0_REG4_LANE2_TTL_MODE |
+ RK3288_LVDS_CH0_REG4_LANE1_TTL_MODE |
+ RK3288_LVDS_CH0_REG4_LANE0_TTL_MODE);
+ lvds_writel(lvds, RK3288_LVDS_CH0_REG5,
+ RK3288_LVDS_CH0_REG5_LANECK_TTL_DATA |
+ RK3288_LVDS_CH0_REG5_LANE4_TTL_DATA |
+ RK3288_LVDS_CH0_REG5_LANE3_TTL_DATA |
+ RK3288_LVDS_CH0_REG5_LANE2_TTL_DATA |
+ RK3288_LVDS_CH0_REG5_LANE1_TTL_DATA |
+ RK3288_LVDS_CH0_REG5_LANE0_TTL_DATA);
+ lvds_writel(lvds, RK3288_LVDS_CH0_REGD,
+ RK3288_LVDS_PLL_PREDIV_REGD(0x0a));
+ lvds_writel(lvds, RK3288_LVDS_CH0_REG20,
+ RK3288_LVDS_CH0_REG20_LSB);
+ } else {
+ lvds_writel(lvds, RK3288_LVDS_CH0_REG0,
+ RK3288_LVDS_CH0_REG0_LVDS_EN |
+ RK3288_LVDS_CH0_REG0_LANECK_EN |
+ RK3288_LVDS_CH0_REG0_LANE4_EN |
+ RK3288_LVDS_CH0_REG0_LANE3_EN |
+ RK3288_LVDS_CH0_REG0_LANE2_EN |
+ RK3288_LVDS_CH0_REG0_LANE1_EN |
+ RK3288_LVDS_CH0_REG0_LANE0_EN);
+ lvds_writel(lvds, RK3288_LVDS_CH0_REG1,
+ RK3288_LVDS_CH0_REG1_LANECK_BIAS |
+ RK3288_LVDS_CH0_REG1_LANE4_BIAS |
+ RK3288_LVDS_CH0_REG1_LANE3_BIAS |
+ RK3288_LVDS_CH0_REG1_LANE2_BIAS |
+ RK3288_LVDS_CH0_REG1_LANE1_BIAS |
+ RK3288_LVDS_CH0_REG1_LANE0_BIAS);
+ lvds_writel(lvds, RK3288_LVDS_CH0_REG2,
+ RK3288_LVDS_CH0_REG2_RESERVE_ON |
+ RK3288_LVDS_CH0_REG2_LANECK_LVDS_MODE |
+ RK3288_LVDS_CH0_REG2_LANE4_LVDS_MODE |
+ RK3288_LVDS_CH0_REG2_LANE3_LVDS_MODE |
+ RK3288_LVDS_CH0_REG2_LANE2_LVDS_MODE |
+ RK3288_LVDS_CH0_REG2_LANE1_LVDS_MODE |
+ RK3288_LVDS_CH0_REG2_LANE0_LVDS_MODE |
+ RK3288_LVDS_PLL_FBDIV_REG2(0x46));
+ lvds_writel(lvds, RK3288_LVDS_CH0_REG3,
+ RK3288_LVDS_PLL_FBDIV_REG3(0x46));
+ lvds_writel(lvds, RK3288_LVDS_CH0_REG4, 0x00);
+ lvds_writel(lvds, RK3288_LVDS_CH0_REG5, 0x00);
+ lvds_writel(lvds, RK3288_LVDS_CH0_REGD,
+ RK3288_LVDS_PLL_PREDIV_REGD(0x0a));
+ lvds_writel(lvds, RK3288_LVDS_CH0_REG20,
+ RK3288_LVDS_CH0_REG20_LSB);
+ }
+
+ writel(RK3288_LVDS_CFG_REGC_PLL_ENABLE,
+ lvds->regs + RK3288_LVDS_CFG_REGC);
+ writel(RK3288_LVDS_CFG_REG21_TX_ENABLE,
+ lvds->regs + RK3288_LVDS_CFG_REG21);
+
+ return 0;
+}
+
+static void rockchip_lvds_poweroff(struct rockchip_lvds *lvds)
+{
+ int ret;
+
+ writel(RK3288_LVDS_CFG_REG21_TX_DISABLE,
+ lvds->regs + RK3288_LVDS_CFG_REG21);
+ writel(RK3288_LVDS_CFG_REGC_PLL_DISABLE,
+ lvds->regs + RK3288_LVDS_CFG_REGC);
+ ret = regmap_write(lvds->grf,
+ lvds->soc_data->grf_soc_con7, 0xffff8000);
+ if (ret != 0)
+ dev_err(lvds->dev, "Could not write to GRF: %d\n", ret);
+
+ pm_runtime_put(lvds->dev);
+ if (lvds->pclk)
+ clk_disable(lvds->pclk);
+}
+
+static enum drm_connector_status
+rockchip_lvds_connector_detect(struct drm_connector *connector, bool force)
+{
+ return connector_status_connected;
+}
+
+static void rockchip_lvds_connector_destroy(struct drm_connector *connector)
+{
+ drm_connector_cleanup(connector);
+}
+
+static const struct drm_connector_funcs rockchip_lvds_connector_funcs = {
+ .dpms = drm_atomic_helper_connector_dpms,
+ .detect = rockchip_lvds_connector_detect,
+ .fill_modes = drm_helper_probe_single_connector_modes,
+ .destroy = rockchip_lvds_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 rockchip_lvds_connector_get_modes(struct drm_connector *connector)
+{
+ struct rockchip_lvds *lvds = connector_to_lvds(connector);
+ struct drm_panel *panel = lvds->panel;
+
+ return panel->funcs->get_modes(panel);
+}
+
+static struct drm_encoder *
+rockchip_lvds_connector_best_encoder(struct drm_connector *connector)
+{
+ struct rockchip_lvds *lvds = connector_to_lvds(connector);
+
+ return &lvds->encoder;
+}
+
+static enum drm_mode_status rockchip_lvds_connector_mode_valid(
+ struct drm_connector *connector,
+ struct drm_display_mode *mode)
+{
+ return MODE_OK;
+}
+
+static const
+struct drm_connector_helper_funcs rockchip_lvds_connector_helper_funcs = {
+ .get_modes = rockchip_lvds_connector_get_modes,
+ .mode_valid = rockchip_lvds_connector_mode_valid,
+ .best_encoder = rockchip_lvds_connector_best_encoder,
+};
+
+static void rockchip_lvds_encoder_dpms(struct drm_encoder *encoder, int mode)
+{
+ struct rockchip_lvds *lvds = encoder_to_lvds(encoder);
+ int ret;
+
+ mutex_lock(&lvds->suspend_lock);
+
+ switch (mode) {
+ case DRM_MODE_DPMS_ON:
+ if (!lvds->suspend)
+ goto out;
+
+ drm_panel_prepare(lvds->panel);
+ ret = rockchip_lvds_poweron(lvds);
+ if (ret < 0) {
+ drm_panel_unprepare(lvds->panel);
+ goto out;
+ }
+ drm_panel_enable(lvds->panel);
+
+ lvds->suspend = false;
+ break;
+ case DRM_MODE_DPMS_STANDBY:
+ case DRM_MODE_DPMS_SUSPEND:
+ case DRM_MODE_DPMS_OFF:
+ if (lvds->suspend)
+ goto out;
+
+ drm_panel_disable(lvds->panel);
+ rockchip_lvds_poweroff(lvds);
+ drm_panel_unprepare(lvds->panel);
+
+ lvds->suspend = true;
+ break;
+ default:
+ break;
+ }
+
+out:
+ mutex_unlock(&lvds->suspend_lock);
+}
+
+static bool
+rockchip_lvds_encoder_mode_fixup(struct drm_encoder *encoder,
+ const struct drm_display_mode *mode,
+ struct drm_display_mode *adjusted_mode)
+{
+ return true;
+}
+
+static void rockchip_lvds_encoder_mode_set(struct drm_encoder *encoder,
+ struct drm_display_mode *mode,
+ struct drm_display_mode *adjusted)
+{
+ struct rockchip_lvds *lvds = encoder_to_lvds(encoder);
+
+ drm_mode_copy(&lvds->mode, adjusted);
+}
+
+static void rockchip_lvds_grf_config(struct drm_encoder *encoder,
+ struct drm_display_mode *mode)
+{
+ struct rockchip_lvds *lvds = encoder_to_lvds(encoder);
+ u32 h_bp = mode->htotal - mode->hsync_start;
+ u8 pin_hsync = (mode->flags & DRM_MODE_FLAG_PHSYNC) ? 1 : 0;
+ u8 pin_dclk = (mode->flags & DRM_MODE_FLAG_PCSYNC) ? 1 : 0;
+ u32 val;
+ int ret;
+
+ /* iomux to LCD data/sync mode */
+ if (lvds->output == DISPLAY_OUTPUT_RGB)
+ if (lvds->pins && !IS_ERR(lvds->pins->default_state))
+ pinctrl_select_state(lvds->pins->p,
+ lvds->pins->default_state);
+ val = lvds->format;
+ if (lvds->output == DISPLAY_OUTPUT_DUAL_LVDS)
+ val |= LVDS_DUAL | LVDS_CH0_EN | LVDS_CH1_EN;
+ else if (lvds->output == DISPLAY_OUTPUT_LVDS)
+ val |= LVDS_CH0_EN;
+ else if (lvds->output == DISPLAY_OUTPUT_RGB)
+ val |= LVDS_TTL_EN | LVDS_CH0_EN | LVDS_CH1_EN;
+
+ if (h_bp & 0x01)
+ val |= LVDS_START_PHASE_RST_1;
+
+ val |= (pin_dclk << 8) | (pin_hsync << 9);
+ val |= (0xffff << 16);
+ ret = regmap_write(lvds->grf, lvds->soc_data->grf_soc_con7, val);
+ if (ret != 0) {
+ dev_err(lvds->dev, "Could not write to GRF: %d\n", ret);
+ return;
+ }
+}
+
+static int rockchip_lvds_set_vop_source(struct rockchip_lvds *lvds,
+ struct drm_encoder *encoder)
+{
+ u32 val;
+ int ret;
+
+ if (!lvds->soc_data->has_vop_sel)
+ return 0;
+
+ ret = drm_of_encoder_active_endpoint_id(lvds->dev->of_node, encoder);
+ if (ret < 0)
+ return ret;
+
+ if (ret)
+ val = RK3288_LVDS_SOC_CON6_SEL_VOP_LIT |
+ (RK3288_LVDS_SOC_CON6_SEL_VOP_LIT << 16);
+ else
+ val = RK3288_LVDS_SOC_CON6_SEL_VOP_LIT << 16;
+
+ ret = regmap_write(lvds->grf, lvds->soc_data->grf_soc_con6, val);
+ if (ret < 0)
+ return ret;
+
+ return 0;
+}
+
+static int
+rockchip_lvds_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);
+
+
+ s->output_mode = ROCKCHIP_OUT_MODE_P888;
+ s->output_type = DRM_MODE_CONNECTOR_LVDS;
+
+
+ return 0;
+}
+
+static void rockchip_lvds_encoder_enable(struct drm_encoder *encoder)
+{
+ struct rockchip_lvds *lvds = encoder_to_lvds(encoder);
+
+ rockchip_lvds_encoder_dpms(encoder, DRM_MODE_DPMS_ON);
+ rockchip_lvds_grf_config(encoder, &lvds->mode);
+ rockchip_lvds_set_vop_source(lvds, encoder);
+}
+
+static void rockchip_lvds_encoder_disable(struct drm_encoder *encoder)
+{
+ rockchip_lvds_encoder_dpms(encoder, DRM_MODE_DPMS_OFF);
+}
+
+static const
+struct drm_encoder_helper_funcs rockchip_lvds_encoder_helper_funcs = {
+ .mode_fixup = rockchip_lvds_encoder_mode_fixup,
+ .mode_set = rockchip_lvds_encoder_mode_set,
+ .enable = rockchip_lvds_encoder_enable,
+ .disable = rockchip_lvds_encoder_disable,
+ .atomic_check = rockchip_lvds_encoder_atomic_check,
+};
+
+static void rockchip_lvds_encoder_destroy(struct drm_encoder *encoder)
+{
+ drm_encoder_cleanup(encoder);
+}
+
+static const struct drm_encoder_funcs rockchip_lvds_encoder_funcs = {
+ .destroy = rockchip_lvds_encoder_destroy,
+};
+
+static struct rockchip_lvds_soc_data rk3288_lvds_data = {
+ .chip_type = RK3288_LVDS,
+ .grf_soc_con6 = 0x025c,
+ .grf_soc_con7 = 0x0260,
+ .has_vop_sel = true,
+};
+
+static const struct of_device_id rockchip_lvds_dt_ids[] = {
+ {
+ .compatible = "rockchip,rk3288-lvds",
+ .data = &rk3288_lvds_data
+ },
+ {}
+};
+MODULE_DEVICE_TABLE(of, rockchip_lvds_dt_ids);
+
+static int rockchip_lvds_bind(struct device *dev, struct device *master,
+ void *data)
+{
+ struct rockchip_lvds *lvds = 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;
+ int ret, i;
+ const char *name;
+
+ lvds->drm_dev = drm_dev;
+ port = of_graph_get_port_by_id(dev->of_node, 1);
+ if (!port) {
+ dev_err(dev, "can't found port point, please init lvds panel port!\n");
+ return -EINVAL;
+ }
+
+ for_each_child_of_node(port, endpoint) {
+ remote = of_graph_get_remote_port_parent(endpoint);
+ if (!remote) {
+ dev_err(dev, "can't found panel node, please init!\n");
+ ret = -EINVAL;
+ goto err_put_port;
+ }
+ if (!of_device_is_available(remote)) {
+ of_node_put(remote);
+ remote = NULL;
+ continue;
+ }
+ break;
+ }
+ if (!remote) {
+ dev_err(dev, "can't found remote node, please init!\n");
+ ret = -EINVAL;
+ goto err_put_port;
+ }
+
+ lvds->panel = of_drm_find_panel(remote);
+ if (!lvds->panel)
+ lvds->bridge = of_drm_find_bridge(remote);
+
+ if (!lvds->panel && !lvds->bridge) {
+ DRM_ERROR("failed to find panel and bridge node\n");
+ ret = -EPROBE_DEFER;
+ goto err_put_remote;
+ }
+
+ if (of_property_read_string(remote, "rockchip,output", &name))
+ /* default set it as output rgb */
+ lvds->output = DISPLAY_OUTPUT_RGB;
+ else
+ lvds->output = lvds_name_to_output(name);
+
+ if (lvds->output < 0) {
+ dev_err(dev, "invalid output type [%s]\n", name);
+ ret = lvds->output;
+ goto err_put_remote;
+ }
+
+ if (of_property_read_string(remote, "rockchip,data-mapping",
+ &name))
+ /* default set it as format jeida */
+ lvds->format = LVDS_FORMAT_JEIDA;
+ else
+ lvds->format = lvds_name_to_format(name);
+
+ if (lvds->format < 0) {
+ dev_err(dev, "invalid data-mapping format [%s]\n", name);
+ ret = lvds->format;
+ goto err_put_remote;
+ }
+
+ if (of_property_read_u32(remote, "rockchip,data-width", &i)) {
+ lvds->format |= LVDS_24BIT;
+ } else {
+ if (i == 24) {
+ lvds->format |= LVDS_24BIT;
+ } else if (i == 18) {
+ lvds->format |= LVDS_18BIT;
+ } else {
+ dev_err(dev,
+ "rockchip-lvds unsupport data-width[%d]\n", i);
+ ret = -EINVAL;
+ goto err_put_remote;
+ }
+ }
+
+ encoder = &lvds->encoder;
+ encoder->possible_crtcs = drm_of_find_possible_crtcs(drm_dev,
+ dev->of_node);
+
+ ret = drm_encoder_init(drm_dev, encoder, &rockchip_lvds_encoder_funcs,
+ DRM_MODE_ENCODER_LVDS, NULL);
+ if (ret < 0) {
+ DRM_ERROR("failed to initialize encoder with drm\n");
+ goto err_put_remote;
+ }
+
+ drm_encoder_helper_add(encoder, &rockchip_lvds_encoder_helper_funcs);
+
+ if (lvds->panel) {
+ connector = &lvds->connector;
+ connector->dpms = DRM_MODE_DPMS_OFF;
+ ret = drm_connector_init(drm_dev, connector,
+ &rockchip_lvds_connector_funcs,
+ DRM_MODE_CONNECTOR_LVDS);
+ if (ret < 0) {
+ DRM_ERROR("failed to initialize connector with drm\n");
+ goto err_free_encoder;
+ }
+
+ drm_connector_helper_add(connector,
+ &rockchip_lvds_connector_helper_funcs);
+
+ ret = drm_mode_connector_attach_encoder(connector, encoder);
+ if (ret < 0) {
+ DRM_ERROR("failed to attach connector and encoder\n");
+ goto err_free_connector;
+ }
+
+ ret = drm_panel_attach(lvds->panel, connector);
+ if (ret < 0) {
+ DRM_ERROR("failed to attach connector and encoder\n");
+ goto err_free_connector;
+ }
+ } else {
+ lvds->bridge->encoder = encoder;
+ ret = drm_bridge_attach(encoder, lvds->bridge, NULL);
+ if (ret) {
+ DRM_ERROR("Failed to attach bridge to drm\n");
+ goto err_free_encoder;
+ }
+ encoder->bridge = lvds->bridge;
+ }
+
+ pm_runtime_enable(dev);
+ 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_lvds_unbind(struct device *dev, struct device *master,
+ void *data)
+{
+ struct rockchip_lvds *lvds = dev_get_drvdata(dev);
+
+ rockchip_lvds_encoder_dpms(&lvds->encoder, DRM_MODE_DPMS_OFF);
+
+ drm_panel_detach(lvds->panel);
+
+ drm_connector_cleanup(&lvds->connector);
+ drm_encoder_cleanup(&lvds->encoder);
+
+ pm_runtime_disable(dev);
+}
+
+static const struct component_ops rockchip_lvds_component_ops = {
+ .bind = rockchip_lvds_bind,
+ .unbind = rockchip_lvds_unbind,
+};
+
+static int rockchip_lvds_probe(struct platform_device *pdev)
+{
+ struct device *dev = &pdev->dev;
+ struct rockchip_lvds *lvds;
+ const struct of_device_id *match;
+ struct resource *res;
+ int ret;
+
+ if (!dev->of_node)
+ return -ENODEV;
+
+ lvds = devm_kzalloc(&pdev->dev, sizeof(*lvds), GFP_KERNEL);
+ if (!lvds)
+ return -ENOMEM;
+
+ lvds->dev = dev;
+ lvds->suspend = true;
+ match = of_match_node(rockchip_lvds_dt_ids, dev->of_node);
+ lvds->soc_data = match->data;
+
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ lvds->regs = devm_ioremap_resource(&pdev->dev, res);
+ if (IS_ERR(lvds->regs))
+ return PTR_ERR(lvds->regs);
+
+ lvds->pclk = devm_clk_get(&pdev->dev, "pclk_lvds");
+ if (IS_ERR(lvds->pclk)) {
+ dev_err(dev, "could not get pclk_lvds\n");
+ return PTR_ERR(lvds->pclk);
+ }
+
+ lvds->pins = devm_kzalloc(lvds->dev, sizeof(*lvds->pins),
+ GFP_KERNEL);
+ if (!lvds->pins)
+ return -ENOMEM;
+
+ lvds->pins->p = devm_pinctrl_get(lvds->dev);
+ if (IS_ERR(lvds->pins->p)) {
+ dev_info(lvds->dev, "no pinctrl handle\n");
+ devm_kfree(lvds->dev, lvds->pins);
+ lvds->pins = NULL;
+ } else {
+ lvds->pins->default_state =
+ pinctrl_lookup_state(lvds->pins->p, "lcdc");
+ if (IS_ERR(lvds->pins->default_state)) {
+ dev_info(lvds->dev, "no default pinctrl state\n");
+ devm_kfree(lvds->dev, lvds->pins);
+ lvds->pins = NULL;
+ }
+ }
+
+ lvds->grf = syscon_regmap_lookup_by_phandle(dev->of_node,
+ "rockchip,grf");
+ if (IS_ERR(lvds->grf)) {
+ dev_err(dev, "missing rockchip,grf property\n");
+ return PTR_ERR(lvds->grf);
+ }
+
+ dev_set_drvdata(dev, lvds);
+ mutex_init(&lvds->suspend_lock);
+
+ if (lvds->pclk) {
+ ret = clk_prepare(lvds->pclk);
+ if (ret < 0) {
+ dev_err(dev, "failed to prepare pclk_lvds\n");
+ return ret;
+ }
+ }
+ ret = component_add(&pdev->dev, &rockchip_lvds_component_ops);
+ if (ret < 0) {
+ if (lvds->pclk)
+ clk_unprepare(lvds->pclk);
+ }
+
+ return ret;
+}
+
+static int rockchip_lvds_remove(struct platform_device *pdev)
+{
+ struct rockchip_lvds *lvds = dev_get_drvdata(&pdev->dev);
+
+ component_del(&pdev->dev, &rockchip_lvds_component_ops);
+ if (lvds->pclk)
+ clk_unprepare(lvds->pclk);
+
+ return 0;
+}
+
+struct platform_driver rockchip_lvds_driver = {
+ .probe = rockchip_lvds_probe,
+ .remove = rockchip_lvds_remove,
+ .driver = {
+ .name = "rockchip-lvds",
+ .of_match_table = of_match_ptr(rockchip_lvds_dt_ids),
+ },
+};
diff --git a/drivers/gpu/drm/rockchip/rockchip_lvds.h b/drivers/gpu/drm/rockchip/rockchip_lvds.h
new file mode 100644
index 0000000..49d2422
--- /dev/null
+++ b/drivers/gpu/drm/rockchip/rockchip_lvds.h
@@ -0,0 +1,112 @@
+/*
+ * Copyright (C) Fuzhou Rockchip Electronics Co.Ltd
+ * Author:
+ * hjc <[email protected]>
+ * mark yao <[email protected]>
+ *
+ * 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.
+ */
+
+#ifndef _ROCKCHIP_LVDS_
+#define _ROCKCHIP_LVDS_
+
+#define RK3288_LVDS_CH0_REG0 0x00
+#define RK3288_LVDS_CH0_REG0_LVDS_EN BIT(7)
+#define RK3288_LVDS_CH0_REG0_TTL_EN BIT(6)
+#define RK3288_LVDS_CH0_REG0_LANECK_EN BIT(5)
+#define RK3288_LVDS_CH0_REG0_LANE4_EN BIT(4)
+#define RK3288_LVDS_CH0_REG0_LANE3_EN BIT(3)
+#define RK3288_LVDS_CH0_REG0_LANE2_EN BIT(2)
+#define RK3288_LVDS_CH0_REG0_LANE1_EN BIT(1)
+#define RK3288_LVDS_CH0_REG0_LANE0_EN BIT(0)
+
+#define RK3288_LVDS_CH0_REG1 0x04
+#define RK3288_LVDS_CH0_REG1_LANECK_BIAS BIT(5)
+#define RK3288_LVDS_CH0_REG1_LANE4_BIAS BIT(4)
+#define RK3288_LVDS_CH0_REG1_LANE3_BIAS BIT(3)
+#define RK3288_LVDS_CH0_REG1_LANE2_BIAS BIT(2)
+#define RK3288_LVDS_CH0_REG1_LANE1_BIAS BIT(1)
+#define RK3288_LVDS_CH0_REG1_LANE0_BIAS BIT(0)
+
+#define RK3288_LVDS_CH0_REG2 0x08
+#define RK3288_LVDS_CH0_REG2_RESERVE_ON BIT(7)
+#define RK3288_LVDS_CH0_REG2_LANECK_LVDS_MODE BIT(6)
+#define RK3288_LVDS_CH0_REG2_LANE4_LVDS_MODE BIT(5)
+#define RK3288_LVDS_CH0_REG2_LANE3_LVDS_MODE BIT(4)
+#define RK3288_LVDS_CH0_REG2_LANE2_LVDS_MODE BIT(3)
+#define RK3288_LVDS_CH0_REG2_LANE1_LVDS_MODE BIT(2)
+#define RK3288_LVDS_CH0_REG2_LANE0_LVDS_MODE BIT(1)
+#define RK3288_LVDS_CH0_REG2_PLL_FBDIV8 BIT(0)
+
+#define RK3288_LVDS_CH0_REG3 0x0c
+#define RK3288_LVDS_CH0_REG3_PLL_FBDIV_MASK 0xff
+
+#define RK3288_LVDS_CH0_REG4 0x10
+#define RK3288_LVDS_CH0_REG4_LANECK_TTL_MODE BIT(5)
+#define RK3288_LVDS_CH0_REG4_LANE4_TTL_MODE BIT(4)
+#define RK3288_LVDS_CH0_REG4_LANE3_TTL_MODE BIT(3)
+#define RK3288_LVDS_CH0_REG4_LANE2_TTL_MODE BIT(2)
+#define RK3288_LVDS_CH0_REG4_LANE1_TTL_MODE BIT(1)
+#define RK3288_LVDS_CH0_REG4_LANE0_TTL_MODE BIT(0)
+
+#define RK3288_LVDS_CH0_REG5 0x14
+#define RK3288_LVDS_CH0_REG5_LANECK_TTL_DATA BIT(5)
+#define RK3288_LVDS_CH0_REG5_LANE4_TTL_DATA BIT(4)
+#define RK3288_LVDS_CH0_REG5_LANE3_TTL_DATA BIT(3)
+#define RK3288_LVDS_CH0_REG5_LANE2_TTL_DATA BIT(2)
+#define RK3288_LVDS_CH0_REG5_LANE1_TTL_DATA BIT(1)
+#define RK3288_LVDS_CH0_REG5_LANE0_TTL_DATA BIT(0)
+
+#define RK3288_LVDS_CFG_REGC 0x30
+#define RK3288_LVDS_CFG_REGC_PLL_ENABLE 0x00
+#define RK3288_LVDS_CFG_REGC_PLL_DISABLE 0xff
+
+#define RK3288_LVDS_CH0_REGD 0x34
+#define RK3288_LVDS_CH0_REGD_PLL_PREDIV_MASK 0x1f
+
+#define RK3288_LVDS_CH0_REG20 0x80
+#define RK3288_LVDS_CH0_REG20_MSB 0x45
+#define RK3288_LVDS_CH0_REG20_LSB 0x44
+
+#define RK3288_LVDS_CFG_REG21 0x84
+#define RK3288_LVDS_CFG_REG21_TX_ENABLE 0x92
+#define RK3288_LVDS_CFG_REG21_TX_DISABLE 0x00
+#define RK3288_LVDS_CH1_OFFSET 0x100
+
+/* fbdiv value is split over 2 registers, with bit8 in reg2 */
+#define RK3288_LVDS_PLL_FBDIV_REG2(_fbd) \
+ (_fbd & BIT(8) ? RK3288_LVDS_CH0_REG2_PLL_FBDIV8 : 0)
+#define RK3288_LVDS_PLL_FBDIV_REG3(_fbd) \
+ (_fbd & RK3288_LVDS_CH0_REG3_PLL_FBDIV_MASK)
+#define RK3288_LVDS_PLL_PREDIV_REGD(_pd) \
+ (_pd & RK3288_LVDS_CH0_REGD_PLL_PREDIV_MASK)
+
+#define RK3288_LVDS_SOC_CON6_SEL_VOP_LIT BIT(3)
+
+#define LVDS_FMT_MASK (0x07 << 16)
+#define LVDS_MSB BIT(3)
+#define LVDS_DUAL BIT(4)
+#define LVDS_FMT_1 BIT(5)
+#define LVDS_TTL_EN BIT(6)
+#define LVDS_START_PHASE_RST_1 BIT(7)
+#define LVDS_DCLK_INV BIT(8)
+#define LVDS_CH0_EN BIT(11)
+#define LVDS_CH1_EN BIT(12)
+#define LVDS_PWRDN BIT(15)
+
+#define LVDS_24BIT (0 << 1)
+#define LVDS_18BIT (1 << 1)
+#define LVDS_FORMAT_VESA (0 << 0)
+#define LVDS_FORMAT_JEIDA (1 << 0)
+
+enum rockchip_lvds_sub_devtype {
+ RK3288_LVDS,
+};
+#endif /* _ROCKCHIP_LVDS_ */
--
2.7.4
On Wed, Aug 09, 2017 at 06:00:59PM +0800, Sandy Huang wrote:
> This adds support for Rockchip soc lvds found on rk3288
> Based on the patches from Mark yao and Heiko Stuebner
>
> Signed-off-by: Sandy Huang <[email protected]>
> Signed-off-by: Mark yao <[email protected]>
> Signed-off-by: Heiko Stuebner <[email protected]>
> ---
> drivers/gpu/drm/rockchip/Kconfig | 9 +
> drivers/gpu/drm/rockchip/Makefile | 1 +
> drivers/gpu/drm/rockchip/rockchip_lvds.c | 734 +++++++++++++++++++++++++++++++
> drivers/gpu/drm/rockchip/rockchip_lvds.h | 112 +++++
> 4 files changed, 856 insertions(+)
> create mode 100644 drivers/gpu/drm/rockchip/rockchip_lvds.c
> create mode 100644 drivers/gpu/drm/rockchip/rockchip_lvds.h
>
> diff --git a/drivers/gpu/drm/rockchip/Kconfig b/drivers/gpu/drm/rockchip/Kconfig
> index 50c41c0..80672f4 100644
> --- a/drivers/gpu/drm/rockchip/Kconfig
> +++ b/drivers/gpu/drm/rockchip/Kconfig
> @@ -59,3 +59,12 @@ config ROCKCHIP_INNO_HDMI
> This selects support for Rockchip SoC specific extensions
> for the Innosilicon HDMI driver. If you want to enable
> HDMI on RK3036 based SoC, you should select this option.
> +
> +config ROCKCHIP_LVDS
> + bool "Rockchip LVDS support"
> + depends on DRM_ROCKCHIP
> + help
> + Choose this option to enable support for Rockchip LVDS controllers.
> + 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.
> diff --git a/drivers/gpu/drm/rockchip/Makefile b/drivers/gpu/drm/rockchip/Makefile
> index fa8dc9d..a881d2c 100644
> --- a/drivers/gpu/drm/rockchip/Makefile
> +++ b/drivers/gpu/drm/rockchip/Makefile
> @@ -12,5 +12,6 @@ rockchipdrm-$(CONFIG_ROCKCHIP_CDN_DP) += cdn-dp-core.o cdn-dp-reg.o
> 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
>
> obj-$(CONFIG_DRM_ROCKCHIP) += rockchipdrm.o
> diff --git a/drivers/gpu/drm/rockchip/rockchip_lvds.c b/drivers/gpu/drm/rockchip/rockchip_lvds.c
> new file mode 100644
> index 0000000..a4ad3f0
> --- /dev/null
> +++ b/drivers/gpu/drm/rockchip/rockchip_lvds.c
> @@ -0,0 +1,734 @@
> +/*
> + * Copyright (C) Fuzhou Rockchip Electronics Co.Ltd
> + * Author:
> + * Mark Yao <[email protected]>
> + * Sandy huang <[email protected]>
> + *
> + * 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/clk.h>
> +#include <linux/mfd/syscon.h>
> +#include <linux/of_graph.h>
> +#include <linux/pm_runtime.h>
> +#include <linux/regmap.h>
> +#include <linux/reset.h>
> +
> +#include <video/display_timing.h>
> +
> +#include "rockchip_drm_drv.h"
> +#include "rockchip_drm_vop.h"
> +#include "rockchip_lvds.h"
> +
> +#define DISPLAY_OUTPUT_RGB 0
> +#define DISPLAY_OUTPUT_LVDS 1
> +#define DISPLAY_OUTPUT_DUAL_LVDS 2
> +
> +#define connector_to_lvds(c) \
> + container_of(c, struct rockchip_lvds, connector)
> +
> +#define encoder_to_lvds(c) \
> + container_of(c, struct rockchip_lvds, encoder)
> +#define LVDS_CHIP(lvds) ((lvds)->soc_data->chip_type)
> +
> +/*
> + * @grf_offset: offset inside the grf regmap for setting the rockchip lvds
You only document one member and it doesn't exist :(
> + */
> +struct rockchip_lvds_soc_data {
> + int chip_type;
> + int grf_soc_con6;
> + int grf_soc_con7;
> +
> + bool has_vop_sel;
> +};
> +
> +struct rockchip_lvds {
> + void *base;
> + struct device *dev;
> + void __iomem *regs;
> + struct regmap *grf;
> + struct clk *pclk;
> + const struct rockchip_lvds_soc_data *soc_data;
> +
> + int output;
> + int format;
> +
> + struct drm_device *drm_dev;
> + struct drm_panel *panel;
> + struct drm_bridge *bridge;
> + struct drm_connector connector;
> + struct drm_encoder encoder;
> +
> + struct mutex suspend_lock;
> + int suspend;
> + struct dev_pin_info *pins;
> + struct drm_display_mode mode;
> +};
> +
> +static inline void lvds_writel(struct rockchip_lvds *lvds, u32 offset, u32 val)
> +{
> + writel_relaxed(val, lvds->regs + offset);
> + if ((lvds->output != DISPLAY_OUTPUT_LVDS) &&
> + (LVDS_CHIP(lvds) == RK3288_LVDS))
Given that you only support one chip right now, it seems premature to worry
about chip version. At any rate, it seems like it'd be more useful to store
RK3288_LVDS_CHI_OFFSET in soc_data and do:
if (lvds->output == DISPLAY_OUTPUT_LVDS)
return;
writel_relaxed(val, lvds->regs + lvds->soc_data->ch1_offset + offset);
Then get rid of LVDS_CHIP and chip_type.
> + writel_relaxed(val,
> + lvds->regs + offset + RK3288_LVDS_CH1_OFFSET);
> +}
> +
> +static inline int lvds_name_to_format(const char *s)
> +{
> + if (!s)
I don't think this can ever happen (and if it can, you should be initializing
name to NULL each time before you call of_property_read_string) since
of_property_read_string returns an error if prop->value == NULL.
Same comment for lvds_name_to_output.
> + return -EINVAL;
> +
> + if (strncmp(s, "jeida", 6) == 0)
> + return LVDS_FORMAT_JEIDA;
> + else if (strncmp(s, "vesa", 5) == 0)
> + return LVDS_FORMAT_VESA;
> +
> + return -EINVAL;
> +}
> +
> +static inline int lvds_name_to_output(const char *s)
> +{
> + if (!s)
> + return -EINVAL;
> +
> + if (strncmp(s, "rgb", 3) == 0)
> + return DISPLAY_OUTPUT_RGB;
> + else if (strncmp(s, "lvds", 4) == 0)
> + return DISPLAY_OUTPUT_LVDS;
> + else if (strncmp(s, "duallvds", 8) == 0)
> + return DISPLAY_OUTPUT_DUAL_LVDS;
> +
> + return -EINVAL;
> +}
> +
> +static int rockchip_lvds_poweron(struct rockchip_lvds *lvds)
> +{
> + int ret;
> +
> + if (lvds->pclk) {
The clk_* functions check for NULL so you don't have to. Remove all
if (lvds->pclk) checks.
> + ret = clk_enable(lvds->pclk);
> + if (ret < 0) {
> + dev_err(lvds->dev, "failed to enable lvds pclk %d\n", ret);
Please use DRM_DEV_* error message logging.
> + return ret;
> + }
> + }
> + ret = pm_runtime_get_sync(lvds->dev);
> + if (ret < 0) {
> + dev_err(lvds->dev, "failed to get pm runtime: %d\n", ret);
> + return ret;
> + }
> +
> + if (lvds->output == DISPLAY_OUTPUT_RGB) {
> + lvds_writel(lvds, RK3288_LVDS_CH0_REG0,
> + RK3288_LVDS_CH0_REG0_TTL_EN |
> + RK3288_LVDS_CH0_REG0_LANECK_EN |
> + RK3288_LVDS_CH0_REG0_LANE4_EN |
> + RK3288_LVDS_CH0_REG0_LANE3_EN |
> + RK3288_LVDS_CH0_REG0_LANE2_EN |
> + RK3288_LVDS_CH0_REG0_LANE1_EN |
> + RK3288_LVDS_CH0_REG0_LANE0_EN);
> + lvds_writel(lvds, RK3288_LVDS_CH0_REG2,
> + RK3288_LVDS_PLL_FBDIV_REG2(0x46));
> +
> + lvds_writel(lvds, RK3288_LVDS_CH0_REG3,
> + RK3288_LVDS_PLL_FBDIV_REG3(0x46));
> + lvds_writel(lvds, RK3288_LVDS_CH0_REG4,
> + RK3288_LVDS_CH0_REG4_LANECK_TTL_MODE |
> + RK3288_LVDS_CH0_REG4_LANE4_TTL_MODE |
> + RK3288_LVDS_CH0_REG4_LANE3_TTL_MODE |
> + RK3288_LVDS_CH0_REG4_LANE2_TTL_MODE |
> + RK3288_LVDS_CH0_REG4_LANE1_TTL_MODE |
> + RK3288_LVDS_CH0_REG4_LANE0_TTL_MODE);
> + lvds_writel(lvds, RK3288_LVDS_CH0_REG5,
> + RK3288_LVDS_CH0_REG5_LANECK_TTL_DATA |
> + RK3288_LVDS_CH0_REG5_LANE4_TTL_DATA |
> + RK3288_LVDS_CH0_REG5_LANE3_TTL_DATA |
> + RK3288_LVDS_CH0_REG5_LANE2_TTL_DATA |
> + RK3288_LVDS_CH0_REG5_LANE1_TTL_DATA |
> + RK3288_LVDS_CH0_REG5_LANE0_TTL_DATA);
> + lvds_writel(lvds, RK3288_LVDS_CH0_REGD,
> + RK3288_LVDS_PLL_PREDIV_REGD(0x0a));
> + lvds_writel(lvds, RK3288_LVDS_CH0_REG20,
> + RK3288_LVDS_CH0_REG20_LSB);
> + } else {
> + lvds_writel(lvds, RK3288_LVDS_CH0_REG0,
> + RK3288_LVDS_CH0_REG0_LVDS_EN |
> + RK3288_LVDS_CH0_REG0_LANECK_EN |
> + RK3288_LVDS_CH0_REG0_LANE4_EN |
> + RK3288_LVDS_CH0_REG0_LANE3_EN |
> + RK3288_LVDS_CH0_REG0_LANE2_EN |
> + RK3288_LVDS_CH0_REG0_LANE1_EN |
> + RK3288_LVDS_CH0_REG0_LANE0_EN);
> + lvds_writel(lvds, RK3288_LVDS_CH0_REG1,
> + RK3288_LVDS_CH0_REG1_LANECK_BIAS |
> + RK3288_LVDS_CH0_REG1_LANE4_BIAS |
> + RK3288_LVDS_CH0_REG1_LANE3_BIAS |
> + RK3288_LVDS_CH0_REG1_LANE2_BIAS |
> + RK3288_LVDS_CH0_REG1_LANE1_BIAS |
> + RK3288_LVDS_CH0_REG1_LANE0_BIAS);
> + lvds_writel(lvds, RK3288_LVDS_CH0_REG2,
> + RK3288_LVDS_CH0_REG2_RESERVE_ON |
> + RK3288_LVDS_CH0_REG2_LANECK_LVDS_MODE |
> + RK3288_LVDS_CH0_REG2_LANE4_LVDS_MODE |
> + RK3288_LVDS_CH0_REG2_LANE3_LVDS_MODE |
> + RK3288_LVDS_CH0_REG2_LANE2_LVDS_MODE |
> + RK3288_LVDS_CH0_REG2_LANE1_LVDS_MODE |
> + RK3288_LVDS_CH0_REG2_LANE0_LVDS_MODE |
> + RK3288_LVDS_PLL_FBDIV_REG2(0x46));
> + lvds_writel(lvds, RK3288_LVDS_CH0_REG3,
> + RK3288_LVDS_PLL_FBDIV_REG3(0x46));
> + lvds_writel(lvds, RK3288_LVDS_CH0_REG4, 0x00);
> + lvds_writel(lvds, RK3288_LVDS_CH0_REG5, 0x00);
> + lvds_writel(lvds, RK3288_LVDS_CH0_REGD,
> + RK3288_LVDS_PLL_PREDIV_REGD(0x0a));
> + lvds_writel(lvds, RK3288_LVDS_CH0_REG20,
> + RK3288_LVDS_CH0_REG20_LSB);
The following register writes can be shared by both branches:
RK3288_LVDS_CH0_REG0 (aside from the enable bit, but that's easy)
RK3288_LVDS_CH0_REG3
RK3288_LVDS_CH0_REGD
RK3288_LVDS_CH0_REG20
That should hopefully trim this function down.
> + }
> +
> + writel(RK3288_LVDS_CFG_REGC_PLL_ENABLE,
> + lvds->regs + RK3288_LVDS_CFG_REGC);
> + writel(RK3288_LVDS_CFG_REG21_TX_ENABLE,
> + lvds->regs + RK3288_LVDS_CFG_REG21);
> +
> + return 0;
> +}
> +
> +static void rockchip_lvds_poweroff(struct rockchip_lvds *lvds)
> +{
> + int ret;
> +
> + writel(RK3288_LVDS_CFG_REG21_TX_DISABLE,
> + lvds->regs + RK3288_LVDS_CFG_REG21);
> + writel(RK3288_LVDS_CFG_REGC_PLL_DISABLE,
> + lvds->regs + RK3288_LVDS_CFG_REGC);
> + ret = regmap_write(lvds->grf,
> + lvds->soc_data->grf_soc_con7, 0xffff8000);
Can you expand on this value? It's quite magical right now.
> + if (ret != 0)
> + dev_err(lvds->dev, "Could not write to GRF: %d\n", ret);
> +
> + pm_runtime_put(lvds->dev);
> + if (lvds->pclk)
> + clk_disable(lvds->pclk);
> +}
> +
> +static enum drm_connector_status
> +rockchip_lvds_connector_detect(struct drm_connector *connector, bool force)
> +{
> + return connector_status_connected;
> +}
> +
> +static void rockchip_lvds_connector_destroy(struct drm_connector *connector)
> +{
> + drm_connector_cleanup(connector);
> +}
> +
> +static const struct drm_connector_funcs rockchip_lvds_connector_funcs = {
> + .dpms = drm_atomic_helper_connector_dpms,
> + .detect = rockchip_lvds_connector_detect,
> + .fill_modes = drm_helper_probe_single_connector_modes,
> + .destroy = rockchip_lvds_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 rockchip_lvds_connector_get_modes(struct drm_connector *connector)
> +{
> + struct rockchip_lvds *lvds = connector_to_lvds(connector);
> + struct drm_panel *panel = lvds->panel;
> +
> + return panel->funcs->get_modes(panel);
> +}
> +
> +static struct drm_encoder *
> +rockchip_lvds_connector_best_encoder(struct drm_connector *connector)
> +{
> + struct rockchip_lvds *lvds = connector_to_lvds(connector);
> +
> + return &lvds->encoder;
> +}
> +
> +static enum drm_mode_status rockchip_lvds_connector_mode_valid(
> + struct drm_connector *connector,
> + struct drm_display_mode *mode)
> +{
> + return MODE_OK;
> +}
> +
> +static const
> +struct drm_connector_helper_funcs rockchip_lvds_connector_helper_funcs = {
> + .get_modes = rockchip_lvds_connector_get_modes,
> + .mode_valid = rockchip_lvds_connector_mode_valid,
> + .best_encoder = rockchip_lvds_connector_best_encoder,
> +};
> +
> +static void rockchip_lvds_encoder_dpms(struct drm_encoder *encoder, int mode)
Why are you using dpms mode here? Just implement the functionality directly in
enable() & disable()
> +{
> + struct rockchip_lvds *lvds = encoder_to_lvds(encoder);
> + int ret;
> +
> + mutex_lock(&lvds->suspend_lock);
What is this lock protecting against? rockchip is using the atomic helper for
suspend/resume, so locking should be handled in core.
> +
> + switch (mode) {
> + case DRM_MODE_DPMS_ON:
> + if (!lvds->suspend)
Can we rename this to enabled instead? I assume this is protecting the
pm_runtime reference?
> + goto out;
> +
> + drm_panel_prepare(lvds->panel);
> + ret = rockchip_lvds_poweron(lvds);
> + if (ret < 0) {
> + drm_panel_unprepare(lvds->panel);
> + goto out;
> + }
> + drm_panel_enable(lvds->panel);
> +
> + lvds->suspend = false;
> + break;
> + case DRM_MODE_DPMS_STANDBY:
> + case DRM_MODE_DPMS_SUSPEND:
> + case DRM_MODE_DPMS_OFF:
> + if (lvds->suspend)
> + goto out;
> +
> + drm_panel_disable(lvds->panel);
> + rockchip_lvds_poweroff(lvds);
> + drm_panel_unprepare(lvds->panel);
> +
> + lvds->suspend = true;
> + break;
> + default:
> + break;
> + }
> +
> +out:
> + mutex_unlock(&lvds->suspend_lock);
> +}
> +
> +static bool
> +rockchip_lvds_encoder_mode_fixup(struct drm_encoder *encoder,
> + const struct drm_display_mode *mode,
> + struct drm_display_mode *adjusted_mode)
> +{
> + return true;
> +}
> +
> +static void rockchip_lvds_encoder_mode_set(struct drm_encoder *encoder,
> + struct drm_display_mode *mode,
> + struct drm_display_mode *adjusted)
> +{
> + struct rockchip_lvds *lvds = encoder_to_lvds(encoder);
> +
> + drm_mode_copy(&lvds->mode, adjusted);
> +}
> +
> +static void rockchip_lvds_grf_config(struct drm_encoder *encoder,
> + struct drm_display_mode *mode)
> +{
> + struct rockchip_lvds *lvds = encoder_to_lvds(encoder);
> + u32 h_bp = mode->htotal - mode->hsync_start;
No need for the local var, just do the subtraction in () below
> + u8 pin_hsync = (mode->flags & DRM_MODE_FLAG_PHSYNC) ? 1 : 0;
> + u8 pin_dclk = (mode->flags & DRM_MODE_FLAG_PCSYNC) ? 1 : 0;
> + u32 val;
> + int ret;
> +
> + /* iomux to LCD data/sync mode */
> + if (lvds->output == DISPLAY_OUTPUT_RGB)
> + if (lvds->pins && !IS_ERR(lvds->pins->default_state))
> + pinctrl_select_state(lvds->pins->p,
> + lvds->pins->default_state);
> + val = lvds->format;
val = lvds->format | LVDS_CH0_EN;
then remove LVDS_CH0_EN from below
> + if (lvds->output == DISPLAY_OUTPUT_DUAL_LVDS)
> + val |= LVDS_DUAL | LVDS_CH0_EN | LVDS_CH1_EN;
> + else if (lvds->output == DISPLAY_OUTPUT_LVDS)
> + val |= LVDS_CH0_EN;
> + else if (lvds->output == DISPLAY_OUTPUT_RGB)
> + val |= LVDS_TTL_EN | LVDS_CH0_EN | LVDS_CH1_EN;
> +
> + if (h_bp & 0x01)
> + val |= LVDS_START_PHASE_RST_1;
> +
> + val |= (pin_dclk << 8) | (pin_hsync << 9);
> + val |= (0xffff << 16);
> + ret = regmap_write(lvds->grf, lvds->soc_data->grf_soc_con7, val);
> + if (ret != 0) {
> + dev_err(lvds->dev, "Could not write to GRF: %d\n", ret);
> + return;
> + }
> +}
> +
> +static int rockchip_lvds_set_vop_source(struct rockchip_lvds *lvds,
> + struct drm_encoder *encoder)
> +{
> + u32 val;
> + int ret;
> +
> + if (!lvds->soc_data->has_vop_sel)
> + return 0;
> +
> + ret = drm_of_encoder_active_endpoint_id(lvds->dev->of_node, encoder);
> + if (ret < 0)
> + return ret;
> +
> + if (ret)
> + val = RK3288_LVDS_SOC_CON6_SEL_VOP_LIT |
> + (RK3288_LVDS_SOC_CON6_SEL_VOP_LIT << 16);
> + else
> + val = RK3288_LVDS_SOC_CON6_SEL_VOP_LIT << 16;
val = RK3288_LVDS_SOC_CON6_SEL_VOP_LIT << 16;
if (ret)
val |= RK3288_LVDS_SOC_CON6_SEL_VOP_LIT;
> +
> + ret = regmap_write(lvds->grf, lvds->soc_data->grf_soc_con6, val);
> + if (ret < 0)
> + return ret;
> +
> + return 0;
> +}
> +
> +static int
> +rockchip_lvds_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);
> +
> +
nit: extra line
> + s->output_mode = ROCKCHIP_OUT_MODE_P888;
> + s->output_type = DRM_MODE_CONNECTOR_LVDS;
> +
> +
> + return 0;
> +}
> +
> +static void rockchip_lvds_encoder_enable(struct drm_encoder *encoder)
> +{
> + struct rockchip_lvds *lvds = encoder_to_lvds(encoder);
> +
> + rockchip_lvds_encoder_dpms(encoder, DRM_MODE_DPMS_ON);
> + rockchip_lvds_grf_config(encoder, &lvds->mode);
> + rockchip_lvds_set_vop_source(lvds, encoder);
> +}
> +
> +static void rockchip_lvds_encoder_disable(struct drm_encoder *encoder)
> +{
> + rockchip_lvds_encoder_dpms(encoder, DRM_MODE_DPMS_OFF);
> +}
> +
> +static const
> +struct drm_encoder_helper_funcs rockchip_lvds_encoder_helper_funcs = {
> + .mode_fixup = rockchip_lvds_encoder_mode_fixup,
> + .mode_set = rockchip_lvds_encoder_mode_set,
> + .enable = rockchip_lvds_encoder_enable,
> + .disable = rockchip_lvds_encoder_disable,
> + .atomic_check = rockchip_lvds_encoder_atomic_check,
> +};
> +
> +static void rockchip_lvds_encoder_destroy(struct drm_encoder *encoder)
> +{
> + drm_encoder_cleanup(encoder);
> +}
> +
> +static const struct drm_encoder_funcs rockchip_lvds_encoder_funcs = {
> + .destroy = rockchip_lvds_encoder_destroy,
> +};
> +
> +static struct rockchip_lvds_soc_data rk3288_lvds_data = {
> + .chip_type = RK3288_LVDS,
> + .grf_soc_con6 = 0x025c,
> + .grf_soc_con7 = 0x0260,
> + .has_vop_sel = true,
> +};
> +
> +static const struct of_device_id rockchip_lvds_dt_ids[] = {
> + {
> + .compatible = "rockchip,rk3288-lvds",
> + .data = &rk3288_lvds_data
> + },
> + {}
> +};
> +MODULE_DEVICE_TABLE(of, rockchip_lvds_dt_ids);
> +
> +static int rockchip_lvds_bind(struct device *dev, struct device *master,
> + void *data)
> +{
> + struct rockchip_lvds *lvds = 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;
> + int ret, i;
Looks like i is just used to read data-width from dt, can you please rename to
"width" or similar?
> + const char *name;
> +
> + lvds->drm_dev = drm_dev;
> + port = of_graph_get_port_by_id(dev->of_node, 1);
> + if (!port) {
> + dev_err(dev, "can't found port point, please init lvds panel port!\n");
> + return -EINVAL;
> + }
> +
> + for_each_child_of_node(port, endpoint) {
> + remote = of_graph_get_remote_port_parent(endpoint);
> + if (!remote) {
> + dev_err(dev, "can't found panel node, please init!\n");
> + ret = -EINVAL;
> + goto err_put_port;
> + }
> + if (!of_device_is_available(remote)) {
> + of_node_put(remote);
> + remote = NULL;
> + continue;
> + }
> + break;
> + }
> + if (!remote) {
> + dev_err(dev, "can't found remote node, please init!\n");
> + ret = -EINVAL;
> + goto err_put_port;
> + }
> +
> + lvds->panel = of_drm_find_panel(remote);
> + if (!lvds->panel)
> + lvds->bridge = of_drm_find_bridge(remote);
drm_of_find_panel_or_bridge()
> +
> + if (!lvds->panel && !lvds->bridge) {
> + DRM_ERROR("failed to find panel and bridge node\n");
> + ret = -EPROBE_DEFER;
> + goto err_put_remote;
> + }
> +
> + if (of_property_read_string(remote, "rockchip,output", &name))
> + /* default set it as output rgb */
> + lvds->output = DISPLAY_OUTPUT_RGB;
> + else
> + lvds->output = lvds_name_to_output(name);
> +
> + if (lvds->output < 0) {
> + dev_err(dev, "invalid output type [%s]\n", name);
> + ret = lvds->output;
> + goto err_put_remote;
> + }
> +
> + if (of_property_read_string(remote, "rockchip,data-mapping",
> + &name))
> + /* default set it as format jeida */
> + lvds->format = LVDS_FORMAT_JEIDA;
> + else
> + lvds->format = lvds_name_to_format(name);
> +
> + if (lvds->format < 0) {
> + dev_err(dev, "invalid data-mapping format [%s]\n", name);
> + ret = lvds->format;
> + goto err_put_remote;
> + }
> +
> + if (of_property_read_u32(remote, "rockchip,data-width", &i)) {
> + lvds->format |= LVDS_24BIT;
> + } else {
> + if (i == 24) {
> + lvds->format |= LVDS_24BIT;
> + } else if (i == 18) {
> + lvds->format |= LVDS_18BIT;
> + } else {
> + dev_err(dev,
> + "rockchip-lvds unsupport data-width[%d]\n", i);
> + ret = -EINVAL;
> + goto err_put_remote;
> + }
> + }
> +
> + encoder = &lvds->encoder;
> + encoder->possible_crtcs = drm_of_find_possible_crtcs(drm_dev,
> + dev->of_node);
> +
> + ret = drm_encoder_init(drm_dev, encoder, &rockchip_lvds_encoder_funcs,
> + DRM_MODE_ENCODER_LVDS, NULL);
> + if (ret < 0) {
> + DRM_ERROR("failed to initialize encoder with drm\n");
Here and below you switched to DRM_ERROR (instead of dev_err) and you don't
print the ret values. Can you please change to DRM_DEV_ERROR and print ret when
exiting?
> + goto err_put_remote;
> + }
> +
> + drm_encoder_helper_add(encoder, &rockchip_lvds_encoder_helper_funcs);
> +
> + if (lvds->panel) {
> + connector = &lvds->connector;
> + connector->dpms = DRM_MODE_DPMS_OFF;
> + ret = drm_connector_init(drm_dev, connector,
> + &rockchip_lvds_connector_funcs,
> + DRM_MODE_CONNECTOR_LVDS);
> + if (ret < 0) {
> + DRM_ERROR("failed to initialize connector with drm\n");
> + goto err_free_encoder;
> + }
> +
> + drm_connector_helper_add(connector,
> + &rockchip_lvds_connector_helper_funcs);
> +
> + ret = drm_mode_connector_attach_encoder(connector, encoder);
> + if (ret < 0) {
> + DRM_ERROR("failed to attach connector and encoder\n");
> + goto err_free_connector;
> + }
> +
> + ret = drm_panel_attach(lvds->panel, connector);
> + if (ret < 0) {
> + DRM_ERROR("failed to attach connector and encoder\n");
> + goto err_free_connector;
> + }
> + } else {
> + lvds->bridge->encoder = encoder;
> + ret = drm_bridge_attach(encoder, lvds->bridge, NULL);
> + if (ret) {
> + DRM_ERROR("Failed to attach bridge to drm\n");
> + goto err_free_encoder;
> + }
> + encoder->bridge = lvds->bridge;
> + }
> +
> + pm_runtime_enable(dev);
> + 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_lvds_unbind(struct device *dev, struct device *master,
> + void *data)
> +{
> + struct rockchip_lvds *lvds = dev_get_drvdata(dev);
> +
> + rockchip_lvds_encoder_dpms(&lvds->encoder, DRM_MODE_DPMS_OFF);
> +
> + drm_panel_detach(lvds->panel);
Oops if lvds->panel is NULL, which will happen if you have a bridge. Speaking of
which, you're also not handling bridge detach.
> +
> + drm_connector_cleanup(&lvds->connector);
> + drm_encoder_cleanup(&lvds->encoder);
> +
> + pm_runtime_disable(dev);
This should probably be first if you're rolling back initialization.
> +}
> +
> +static const struct component_ops rockchip_lvds_component_ops = {
> + .bind = rockchip_lvds_bind,
> + .unbind = rockchip_lvds_unbind,
> +};
> +
> +static int rockchip_lvds_probe(struct platform_device *pdev)
> +{
> + struct device *dev = &pdev->dev;
> + struct rockchip_lvds *lvds;
> + const struct of_device_id *match;
> + struct resource *res;
> + int ret;
> +
> + if (!dev->of_node)
> + return -ENODEV;
> +
> + lvds = devm_kzalloc(&pdev->dev, sizeof(*lvds), GFP_KERNEL);
> + if (!lvds)
> + return -ENOMEM;
> +
> + lvds->dev = dev;
> + lvds->suspend = true;
> + match = of_match_node(rockchip_lvds_dt_ids, dev->of_node);
match can be NULL and you dereference it on the next line
> + lvds->soc_data = match->data;
> +
> + res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> + lvds->regs = devm_ioremap_resource(&pdev->dev, res);
> + if (IS_ERR(lvds->regs))
> + return PTR_ERR(lvds->regs);
> +
> + lvds->pclk = devm_clk_get(&pdev->dev, "pclk_lvds");
> + if (IS_ERR(lvds->pclk)) {
> + dev_err(dev, "could not get pclk_lvds\n");
> + return PTR_ERR(lvds->pclk);
> + }
> +
> + lvds->pins = devm_kzalloc(lvds->dev, sizeof(*lvds->pins),
> + GFP_KERNEL);
> + if (!lvds->pins)
> + return -ENOMEM;
> +
> + lvds->pins->p = devm_pinctrl_get(lvds->dev);
> + if (IS_ERR(lvds->pins->p)) {
> + dev_info(lvds->dev, "no pinctrl handle\n");
> + devm_kfree(lvds->dev, lvds->pins);
> + lvds->pins = NULL;
> + } else {
> + lvds->pins->default_state =
> + pinctrl_lookup_state(lvds->pins->p, "lcdc");
> + if (IS_ERR(lvds->pins->default_state)) {
> + dev_info(lvds->dev, "no default pinctrl state\n");
> + devm_kfree(lvds->dev, lvds->pins);
> + lvds->pins = NULL;
> + }
> + }
> +
> + lvds->grf = syscon_regmap_lookup_by_phandle(dev->of_node,
> + "rockchip,grf");
> + if (IS_ERR(lvds->grf)) {
> + dev_err(dev, "missing rockchip,grf property\n");
> + return PTR_ERR(lvds->grf);
> + }
> +
> + dev_set_drvdata(dev, lvds);
> + mutex_init(&lvds->suspend_lock);
> +
> + if (lvds->pclk) {
> + ret = clk_prepare(lvds->pclk);
> + if (ret < 0) {
> + dev_err(dev, "failed to prepare pclk_lvds\n");
> + return ret;
> + }
> + }
> + ret = component_add(&pdev->dev, &rockchip_lvds_component_ops);
> + if (ret < 0) {
> + if (lvds->pclk)
> + clk_unprepare(lvds->pclk);
> + }
> +
> + return ret;
> +}
> +
> +static int rockchip_lvds_remove(struct platform_device *pdev)
> +{
> + struct rockchip_lvds *lvds = dev_get_drvdata(&pdev->dev);
> +
> + component_del(&pdev->dev, &rockchip_lvds_component_ops);
> + if (lvds->pclk)
> + clk_unprepare(lvds->pclk);
> +
> + return 0;
> +}
> +
> +struct platform_driver rockchip_lvds_driver = {
> + .probe = rockchip_lvds_probe,
> + .remove = rockchip_lvds_remove,
> + .driver = {
> + .name = "rockchip-lvds",
> + .of_match_table = of_match_ptr(rockchip_lvds_dt_ids),
> + },
> +};
> diff --git a/drivers/gpu/drm/rockchip/rockchip_lvds.h b/drivers/gpu/drm/rockchip/rockchip_lvds.h
> new file mode 100644
> index 0000000..49d2422
> --- /dev/null
> +++ b/drivers/gpu/drm/rockchip/rockchip_lvds.h
> @@ -0,0 +1,112 @@
> +/*
> + * Copyright (C) Fuzhou Rockchip Electronics Co.Ltd
> + * Author:
> + * hjc <[email protected]>
> + * mark yao <[email protected]>
> + *
> + * 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.
> + */
> +
> +#ifndef _ROCKCHIP_LVDS_
> +#define _ROCKCHIP_LVDS_
> +
> +#define RK3288_LVDS_CH0_REG0 0x00
> +#define RK3288_LVDS_CH0_REG0_LVDS_EN BIT(7)
> +#define RK3288_LVDS_CH0_REG0_TTL_EN BIT(6)
> +#define RK3288_LVDS_CH0_REG0_LANECK_EN BIT(5)
> +#define RK3288_LVDS_CH0_REG0_LANE4_EN BIT(4)
> +#define RK3288_LVDS_CH0_REG0_LANE3_EN BIT(3)
> +#define RK3288_LVDS_CH0_REG0_LANE2_EN BIT(2)
> +#define RK3288_LVDS_CH0_REG0_LANE1_EN BIT(1)
> +#define RK3288_LVDS_CH0_REG0_LANE0_EN BIT(0)
> +
> +#define RK3288_LVDS_CH0_REG1 0x04
> +#define RK3288_LVDS_CH0_REG1_LANECK_BIAS BIT(5)
> +#define RK3288_LVDS_CH0_REG1_LANE4_BIAS BIT(4)
> +#define RK3288_LVDS_CH0_REG1_LANE3_BIAS BIT(3)
> +#define RK3288_LVDS_CH0_REG1_LANE2_BIAS BIT(2)
> +#define RK3288_LVDS_CH0_REG1_LANE1_BIAS BIT(1)
> +#define RK3288_LVDS_CH0_REG1_LANE0_BIAS BIT(0)
> +
> +#define RK3288_LVDS_CH0_REG2 0x08
> +#define RK3288_LVDS_CH0_REG2_RESERVE_ON BIT(7)
> +#define RK3288_LVDS_CH0_REG2_LANECK_LVDS_MODE BIT(6)
> +#define RK3288_LVDS_CH0_REG2_LANE4_LVDS_MODE BIT(5)
> +#define RK3288_LVDS_CH0_REG2_LANE3_LVDS_MODE BIT(4)
> +#define RK3288_LVDS_CH0_REG2_LANE2_LVDS_MODE BIT(3)
> +#define RK3288_LVDS_CH0_REG2_LANE1_LVDS_MODE BIT(2)
> +#define RK3288_LVDS_CH0_REG2_LANE0_LVDS_MODE BIT(1)
> +#define RK3288_LVDS_CH0_REG2_PLL_FBDIV8 BIT(0)
> +
> +#define RK3288_LVDS_CH0_REG3 0x0c
> +#define RK3288_LVDS_CH0_REG3_PLL_FBDIV_MASK 0xff
> +
> +#define RK3288_LVDS_CH0_REG4 0x10
> +#define RK3288_LVDS_CH0_REG4_LANECK_TTL_MODE BIT(5)
> +#define RK3288_LVDS_CH0_REG4_LANE4_TTL_MODE BIT(4)
> +#define RK3288_LVDS_CH0_REG4_LANE3_TTL_MODE BIT(3)
> +#define RK3288_LVDS_CH0_REG4_LANE2_TTL_MODE BIT(2)
> +#define RK3288_LVDS_CH0_REG4_LANE1_TTL_MODE BIT(1)
> +#define RK3288_LVDS_CH0_REG4_LANE0_TTL_MODE BIT(0)
> +
> +#define RK3288_LVDS_CH0_REG5 0x14
> +#define RK3288_LVDS_CH0_REG5_LANECK_TTL_DATA BIT(5)
> +#define RK3288_LVDS_CH0_REG5_LANE4_TTL_DATA BIT(4)
> +#define RK3288_LVDS_CH0_REG5_LANE3_TTL_DATA BIT(3)
> +#define RK3288_LVDS_CH0_REG5_LANE2_TTL_DATA BIT(2)
> +#define RK3288_LVDS_CH0_REG5_LANE1_TTL_DATA BIT(1)
> +#define RK3288_LVDS_CH0_REG5_LANE0_TTL_DATA BIT(0)
> +
> +#define RK3288_LVDS_CFG_REGC 0x30
> +#define RK3288_LVDS_CFG_REGC_PLL_ENABLE 0x00
> +#define RK3288_LVDS_CFG_REGC_PLL_DISABLE 0xff
> +
> +#define RK3288_LVDS_CH0_REGD 0x34
> +#define RK3288_LVDS_CH0_REGD_PLL_PREDIV_MASK 0x1f
> +
> +#define RK3288_LVDS_CH0_REG20 0x80
> +#define RK3288_LVDS_CH0_REG20_MSB 0x45
> +#define RK3288_LVDS_CH0_REG20_LSB 0x44
> +
> +#define RK3288_LVDS_CFG_REG21 0x84
> +#define RK3288_LVDS_CFG_REG21_TX_ENABLE 0x92
> +#define RK3288_LVDS_CFG_REG21_TX_DISABLE 0x00
> +#define RK3288_LVDS_CH1_OFFSET 0x100
> +
> +/* fbdiv value is split over 2 registers, with bit8 in reg2 */
> +#define RK3288_LVDS_PLL_FBDIV_REG2(_fbd) \
> + (_fbd & BIT(8) ? RK3288_LVDS_CH0_REG2_PLL_FBDIV8 : 0)
> +#define RK3288_LVDS_PLL_FBDIV_REG3(_fbd) \
> + (_fbd & RK3288_LVDS_CH0_REG3_PLL_FBDIV_MASK)
> +#define RK3288_LVDS_PLL_PREDIV_REGD(_pd) \
> + (_pd & RK3288_LVDS_CH0_REGD_PLL_PREDIV_MASK)
> +
> +#define RK3288_LVDS_SOC_CON6_SEL_VOP_LIT BIT(3)
> +
> +#define LVDS_FMT_MASK (0x07 << 16)
> +#define LVDS_MSB BIT(3)
> +#define LVDS_DUAL BIT(4)
> +#define LVDS_FMT_1 BIT(5)
> +#define LVDS_TTL_EN BIT(6)
> +#define LVDS_START_PHASE_RST_1 BIT(7)
> +#define LVDS_DCLK_INV BIT(8)
> +#define LVDS_CH0_EN BIT(11)
> +#define LVDS_CH1_EN BIT(12)
> +#define LVDS_PWRDN BIT(15)
> +
> +#define LVDS_24BIT (0 << 1)
> +#define LVDS_18BIT (1 << 1)
> +#define LVDS_FORMAT_VESA (0 << 0)
> +#define LVDS_FORMAT_JEIDA (1 << 0)
> +
> +enum rockchip_lvds_sub_devtype {
> + RK3288_LVDS,
> +};
> +#endif /* _ROCKCHIP_LVDS_ */
> --
> 2.7.4
>
>
> _______________________________________________
> dri-devel mailing list
> [email protected]
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Sean Paul, Software Engineer, Google / Chromium OS
Hi Sean Paul,
Thanks for your review.
?? 2017/8/10 3:58, Sean Paul д??:
> On Wed, Aug 09, 2017 at 06:00:59PM +0800, Sandy Huang wrote:
>> This adds support for Rockchip soc lvds found on rk3288
>> Based on the patches from Mark yao and Heiko Stuebner
>>
>> Signed-off-by: Sandy Huang <[email protected]>
>> Signed-off-by: Mark yao <[email protected]>
>> Signed-off-by: Heiko Stuebner <[email protected]>
>> ---
>> drivers/gpu/drm/rockchip/Kconfig | 9 +
>> drivers/gpu/drm/rockchip/Makefile | 1 +
>> drivers/gpu/drm/rockchip/rockchip_lvds.c | 734 +++++++++++++++++++++++++++++++
>> drivers/gpu/drm/rockchip/rockchip_lvds.h | 112 +++++
>> 4 files changed, 856 insertions(+)
>> create mode 100644 drivers/gpu/drm/rockchip/rockchip_lvds.c
>> create mode 100644 drivers/gpu/drm/rockchip/rockchip_lvds.h
>>
>> diff --git a/drivers/gpu/drm/rockchip/Kconfig b/drivers/gpu/drm/rockchip/Kconfig
>> index 50c41c0..80672f4 100644
>> --- a/drivers/gpu/drm/rockchip/Kconfig
>> +++ b/drivers/gpu/drm/rockchip/Kconfig
>> @@ -59,3 +59,12 @@ config ROCKCHIP_INNO_HDMI
>> This selects support for Rockchip SoC specific extensions
>> for the Innosilicon HDMI driver. If you want to enable
>> HDMI on RK3036 based SoC, you should select this option.
>> +
>> +config ROCKCHIP_LVDS
>> + bool "Rockchip LVDS support"
>> + depends on DRM_ROCKCHIP
>> + help
>> + Choose this option to enable support for Rockchip LVDS controllers.
>> + 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.
>> diff --git a/drivers/gpu/drm/rockchip/Makefile b/drivers/gpu/drm/rockchip/Makefile
>> index fa8dc9d..a881d2c 100644
>> --- a/drivers/gpu/drm/rockchip/Makefile
>> +++ b/drivers/gpu/drm/rockchip/Makefile
>> @@ -12,5 +12,6 @@ rockchipdrm-$(CONFIG_ROCKCHIP_CDN_DP) += cdn-dp-core.o cdn-dp-reg.o
>> 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
>>
>> obj-$(CONFIG_DRM_ROCKCHIP) += rockchipdrm.o
>> diff --git a/drivers/gpu/drm/rockchip/rockchip_lvds.c b/drivers/gpu/drm/rockchip/rockchip_lvds.c
>> new file mode 100644
>> index 0000000..a4ad3f0
>> --- /dev/null
>> +++ b/drivers/gpu/drm/rockchip/rockchip_lvds.c
>> @@ -0,0 +1,734 @@
>> +/*
>> + * Copyright (C) Fuzhou Rockchip Electronics Co.Ltd
>> + * Author:
>> + * Mark Yao <[email protected]>
>> + * Sandy huang <[email protected]>
>> + *
>> + * 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/clk.h>
>> +#include <linux/mfd/syscon.h>
>> +#include <linux/of_graph.h>
>> +#include <linux/pm_runtime.h>
>> +#include <linux/regmap.h>
>> +#include <linux/reset.h>
>> +
>> +#include <video/display_timing.h>
>> +
>> +#include "rockchip_drm_drv.h"
>> +#include "rockchip_drm_vop.h"
>> +#include "rockchip_lvds.h"
>> +
>> +#define DISPLAY_OUTPUT_RGB 0
>> +#define DISPLAY_OUTPUT_LVDS 1
>> +#define DISPLAY_OUTPUT_DUAL_LVDS 2
>> +
>> +#define connector_to_lvds(c) \
>> + container_of(c, struct rockchip_lvds, connector)
>> +
>> +#define encoder_to_lvds(c) \
>> + container_of(c, struct rockchip_lvds, encoder)
>> +#define LVDS_CHIP(lvds) ((lvds)->soc_data->chip_type)
>> +
>> +/*
>> + * @grf_offset: offset inside the grf regmap for setting the rockchip lvds
>
> You only document one member and it doesn't exist :(
I forgot to delete it, i will update at next version.
>
>> + */
>> +struct rockchip_lvds_soc_data {
>> + int chip_type;
>> + int grf_soc_con6;
>> + int grf_soc_con7;
>> +
>> + bool has_vop_sel;
>> +};
>> +
>> +struct rockchip_lvds {
>> + void *base;
>> + struct device *dev;
>> + void __iomem *regs;
>> + struct regmap *grf;
>> + struct clk *pclk;
>> + const struct rockchip_lvds_soc_data *soc_data;
>> +
>> + int output;
>> + int format;
>> +
>> + struct drm_device *drm_dev;
>> + struct drm_panel *panel;
>> + struct drm_bridge *bridge;
>> + struct drm_connector connector;
>> + struct drm_encoder encoder;
>> +
>> + struct mutex suspend_lock;
>> + int suspend;
>> + struct dev_pin_info *pins;
>> + struct drm_display_mode mode;
>> +};
>> +
>> +static inline void lvds_writel(struct rockchip_lvds *lvds, u32 offset, u32 val)
>> +{
>> + writel_relaxed(val, lvds->regs + offset);
>> + if ((lvds->output != DISPLAY_OUTPUT_LVDS) &&
>> + (LVDS_CHIP(lvds) == RK3288_LVDS))
>
> Given that you only support one chip right now, it seems premature to worry
> about chip version. At any rate, it seems like it'd be more useful to store
> RK3288_LVDS_CHI_OFFSET in soc_data and do:
>
> if (lvds->output == DISPLAY_OUTPUT_LVDS)
> return;
>
> writel_relaxed(val, lvds->regs + lvds->soc_data->ch1_offset + offset);
>
> Then get rid of LVDS_CHIP and chip_type.
>
>
I will update at next version.
>> + writel_relaxed(val,
>> + lvds->regs + offset + RK3288_LVDS_CH1_OFFSET);
>> +}
>> +
>> +static inline int lvds_name_to_format(const char *s)
>> +{
>> + if (!s)
>
> I don't think this can ever happen (and if it can, you should be initializing
> name to NULL each time before you call of_property_read_string) since
> of_property_read_string returns an error if prop->value == NULL.
>
> Same comment for lvds_name_to_output.
>
>
I will update at next version.
>> + return -EINVAL;
>> +
>> + if (strncmp(s, "jeida", 6) == 0)
>> + return LVDS_FORMAT_JEIDA;
>> + else if (strncmp(s, "vesa", 5) == 0)
>> + return LVDS_FORMAT_VESA;
>> +
>> + return -EINVAL;
>> +}
>> +
>> +static inline int lvds_name_to_output(const char *s)
>> +{
>> + if (!s)
>> + return -EINVAL;
>> +
>> + if (strncmp(s, "rgb", 3) == 0)
>> + return DISPLAY_OUTPUT_RGB;
>> + else if (strncmp(s, "lvds", 4) == 0)
>> + return DISPLAY_OUTPUT_LVDS;
>> + else if (strncmp(s, "duallvds", 8) == 0)
>> + return DISPLAY_OUTPUT_DUAL_LVDS;
>> +
>> + return -EINVAL;
>> +}
>> +
>> +static int rockchip_lvds_poweron(struct rockchip_lvds *lvds)
>> +{
>> + int ret;
>> +
>> + if (lvds->pclk) {
>
> The clk_* functions check for NULL so you don't have to. Remove all
> if (lvds->pclk) checks.
>
It will be removed at next version.
>> + ret = clk_enable(lvds->pclk);
>> + if (ret < 0) {
>> + dev_err(lvds->dev, "failed to enable lvds pclk %d\n", ret);
>
> Please use DRM_DEV_* error message logging.
>
I will update at next verison.
>> + return ret;
>> + }
>> + }
>> + ret = pm_runtime_get_sync(lvds->dev);
>> + if (ret < 0) {
>> + dev_err(lvds->dev, "failed to get pm runtime: %d\n", ret);
>> + return ret;
>> + }
>> +
>> + if (lvds->output == DISPLAY_OUTPUT_RGB) {
>> + lvds_writel(lvds, RK3288_LVDS_CH0_REG0,
>> + RK3288_LVDS_CH0_REG0_TTL_EN |
>> + RK3288_LVDS_CH0_REG0_LANECK_EN |
>> + RK3288_LVDS_CH0_REG0_LANE4_EN |
>> + RK3288_LVDS_CH0_REG0_LANE3_EN |
>> + RK3288_LVDS_CH0_REG0_LANE2_EN |
>> + RK3288_LVDS_CH0_REG0_LANE1_EN |
>> + RK3288_LVDS_CH0_REG0_LANE0_EN);
>> + lvds_writel(lvds, RK3288_LVDS_CH0_REG2,
>> + RK3288_LVDS_PLL_FBDIV_REG2(0x46));
>> +
>> + lvds_writel(lvds, RK3288_LVDS_CH0_REG3,
>> + RK3288_LVDS_PLL_FBDIV_REG3(0x46));
>> + lvds_writel(lvds, RK3288_LVDS_CH0_REG4,
>> + RK3288_LVDS_CH0_REG4_LANECK_TTL_MODE |
>> + RK3288_LVDS_CH0_REG4_LANE4_TTL_MODE |
>> + RK3288_LVDS_CH0_REG4_LANE3_TTL_MODE |
>> + RK3288_LVDS_CH0_REG4_LANE2_TTL_MODE |
>> + RK3288_LVDS_CH0_REG4_LANE1_TTL_MODE |
>> + RK3288_LVDS_CH0_REG4_LANE0_TTL_MODE);
>> + lvds_writel(lvds, RK3288_LVDS_CH0_REG5,
>> + RK3288_LVDS_CH0_REG5_LANECK_TTL_DATA |
>> + RK3288_LVDS_CH0_REG5_LANE4_TTL_DATA |
>> + RK3288_LVDS_CH0_REG5_LANE3_TTL_DATA |
>> + RK3288_LVDS_CH0_REG5_LANE2_TTL_DATA |
>> + RK3288_LVDS_CH0_REG5_LANE1_TTL_DATA |
>> + RK3288_LVDS_CH0_REG5_LANE0_TTL_DATA);
>> + lvds_writel(lvds, RK3288_LVDS_CH0_REGD,
>> + RK3288_LVDS_PLL_PREDIV_REGD(0x0a));
>> + lvds_writel(lvds, RK3288_LVDS_CH0_REG20,
>> + RK3288_LVDS_CH0_REG20_LSB);
>> + } else {
>> + lvds_writel(lvds, RK3288_LVDS_CH0_REG0,
>> + RK3288_LVDS_CH0_REG0_LVDS_EN |
>> + RK3288_LVDS_CH0_REG0_LANECK_EN |
>> + RK3288_LVDS_CH0_REG0_LANE4_EN |
>> + RK3288_LVDS_CH0_REG0_LANE3_EN |
>> + RK3288_LVDS_CH0_REG0_LANE2_EN |
>> + RK3288_LVDS_CH0_REG0_LANE1_EN |
>> + RK3288_LVDS_CH0_REG0_LANE0_EN);
>> + lvds_writel(lvds, RK3288_LVDS_CH0_REG1,
>> + RK3288_LVDS_CH0_REG1_LANECK_BIAS |
>> + RK3288_LVDS_CH0_REG1_LANE4_BIAS |
>> + RK3288_LVDS_CH0_REG1_LANE3_BIAS |
>> + RK3288_LVDS_CH0_REG1_LANE2_BIAS |
>> + RK3288_LVDS_CH0_REG1_LANE1_BIAS |
>> + RK3288_LVDS_CH0_REG1_LANE0_BIAS);
>> + lvds_writel(lvds, RK3288_LVDS_CH0_REG2,
>> + RK3288_LVDS_CH0_REG2_RESERVE_ON |
>> + RK3288_LVDS_CH0_REG2_LANECK_LVDS_MODE |
>> + RK3288_LVDS_CH0_REG2_LANE4_LVDS_MODE |
>> + RK3288_LVDS_CH0_REG2_LANE3_LVDS_MODE |
>> + RK3288_LVDS_CH0_REG2_LANE2_LVDS_MODE |
>> + RK3288_LVDS_CH0_REG2_LANE1_LVDS_MODE |
>> + RK3288_LVDS_CH0_REG2_LANE0_LVDS_MODE |
>> + RK3288_LVDS_PLL_FBDIV_REG2(0x46));
>> + lvds_writel(lvds, RK3288_LVDS_CH0_REG3,
>> + RK3288_LVDS_PLL_FBDIV_REG3(0x46));
>> + lvds_writel(lvds, RK3288_LVDS_CH0_REG4, 0x00);
>> + lvds_writel(lvds, RK3288_LVDS_CH0_REG5, 0x00);
>> + lvds_writel(lvds, RK3288_LVDS_CH0_REGD,
>> + RK3288_LVDS_PLL_PREDIV_REGD(0x0a));
>> + lvds_writel(lvds, RK3288_LVDS_CH0_REG20,
>> + RK3288_LVDS_CH0_REG20_LSB);
>
> The following register writes can be shared by both branches:
>
> RK3288_LVDS_CH0_REG0 (aside from the enable bit, but that's easy)
> RK3288_LVDS_CH0_REG3
> RK3288_LVDS_CH0_REGD
> RK3288_LVDS_CH0_REG20
>
> That should hopefully trim this function down.
>
I will update at next version.
>> + }
>> +
>> + writel(RK3288_LVDS_CFG_REGC_PLL_ENABLE,
>> + lvds->regs + RK3288_LVDS_CFG_REGC);
>> + writel(RK3288_LVDS_CFG_REG21_TX_ENABLE,
>> + lvds->regs + RK3288_LVDS_CFG_REG21);
>> +
>> + return 0;
>> +}
>> +
>> +static void rockchip_lvds_poweroff(struct rockchip_lvds *lvds)
>> +{
>> + int ret;
>> +
>> + writel(RK3288_LVDS_CFG_REG21_TX_DISABLE,
>> + lvds->regs + RK3288_LVDS_CFG_REG21);
>> + writel(RK3288_LVDS_CFG_REGC_PLL_DISABLE,
>> + lvds->regs + RK3288_LVDS_CFG_REGC);
>> + ret = regmap_write(lvds->grf,
>> + lvds->soc_data->grf_soc_con7, 0xffff8000);
>
> Can you expand on this value? It's quite magical right now.
>
I add some detail define for this value at next version.
>> + if (ret != 0)
>> + dev_err(lvds->dev, "Could not write to GRF: %d\n", ret);
>> +
>> + pm_runtime_put(lvds->dev);
>> + if (lvds->pclk)
>> + clk_disable(lvds->pclk);
>> +}
>> +
>> +static enum drm_connector_status
>> +rockchip_lvds_connector_detect(struct drm_connector *connector, bool force)
>> +{
>> + return connector_status_connected;
>> +}
>> +
>> +static void rockchip_lvds_connector_destroy(struct drm_connector *connector)
>> +{
>> + drm_connector_cleanup(connector);
>> +}
>> +
>> +static const struct drm_connector_funcs rockchip_lvds_connector_funcs = {
>> + .dpms = drm_atomic_helper_connector_dpms,
>> + .detect = rockchip_lvds_connector_detect,
>> + .fill_modes = drm_helper_probe_single_connector_modes,
>> + .destroy = rockchip_lvds_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 rockchip_lvds_connector_get_modes(struct drm_connector *connector)
>> +{
>> + struct rockchip_lvds *lvds = connector_to_lvds(connector);
>> + struct drm_panel *panel = lvds->panel;
>> +
>> + return panel->funcs->get_modes(panel);
>> +}
>> +
>> +static struct drm_encoder *
>> +rockchip_lvds_connector_best_encoder(struct drm_connector *connector)
>> +{
>> + struct rockchip_lvds *lvds = connector_to_lvds(connector);
>> +
>> + return &lvds->encoder;
>> +}
>> +
>> +static enum drm_mode_status rockchip_lvds_connector_mode_valid(
>> + struct drm_connector *connector,
>> + struct drm_display_mode *mode)
>> +{
>> + return MODE_OK;
>> +}
>> +
>> +static const
>> +struct drm_connector_helper_funcs rockchip_lvds_connector_helper_funcs = {
>> + .get_modes = rockchip_lvds_connector_get_modes,
>> + .mode_valid = rockchip_lvds_connector_mode_valid,
>> + .best_encoder = rockchip_lvds_connector_best_encoder,
>> +};
>> +
>> +static void rockchip_lvds_encoder_dpms(struct drm_encoder *encoder, int mode)
>
> Why are you using dpms mode here? Just implement the functionality directly in
> enable() & disable()
>
It's inherited from the previous code, this will be move to enable() and
disable() at next version.
>> +{
>> + struct rockchip_lvds *lvds = encoder_to_lvds(encoder);
>> + int ret;
>> +
>> + mutex_lock(&lvds->suspend_lock);
>
> What is this lock protecting against? rockchip is using the atomic helper for
> suspend/resume, so locking should be handled in core.
>
this will be deleted and move to enable()/disable() at next version
>> +
>> + switch (mode) {
>> + case DRM_MODE_DPMS_ON:
>> + if (!lvds->suspend)
>
> Can we rename this to enabled instead? I assume this is protecting the
> pm_runtime reference?
>
this will be deleted and move to enable()/disable() at next version
>> + goto out;
>> +
>> + drm_panel_prepare(lvds->panel);
>> + ret = rockchip_lvds_poweron(lvds);
>> + if (ret < 0) {
>> + drm_panel_unprepare(lvds->panel);
>> + goto out;
>> + }
>> + drm_panel_enable(lvds->panel);
>> +
>> + lvds->suspend = false;
>> + break;
>> + case DRM_MODE_DPMS_STANDBY:
>> + case DRM_MODE_DPMS_SUSPEND:
>> + case DRM_MODE_DPMS_OFF:
>> + if (lvds->suspend)
>> + goto out;
>> +
>> + drm_panel_disable(lvds->panel);
>> + rockchip_lvds_poweroff(lvds);
>> + drm_panel_unprepare(lvds->panel);
>> +
>> + lvds->suspend = true;
>> + break;
>> + default:
>> + break;
>> + }
>> +
>> +out:
>> + mutex_unlock(&lvds->suspend_lock);
>> +}
>> +
>> +static bool
>> +rockchip_lvds_encoder_mode_fixup(struct drm_encoder *encoder,
>> + const struct drm_display_mode *mode,
>> + struct drm_display_mode *adjusted_mode)
>> +{
>> + return true;
>> +}
>> +
>> +static void rockchip_lvds_encoder_mode_set(struct drm_encoder *encoder,
>> + struct drm_display_mode *mode,
>> + struct drm_display_mode *adjusted)
>> +{
>> + struct rockchip_lvds *lvds = encoder_to_lvds(encoder);
>> +
>> + drm_mode_copy(&lvds->mode, adjusted);
>> +}
>> +
>> +static void rockchip_lvds_grf_config(struct drm_encoder *encoder,
>> + struct drm_display_mode *mode)
>> +{
>> + struct rockchip_lvds *lvds = encoder_to_lvds(encoder);
>> + u32 h_bp = mode->htotal - mode->hsync_start;
>
> No need for the local var, just do the subtraction in () below
>
Update at next version.
>> + u8 pin_hsync = (mode->flags & DRM_MODE_FLAG_PHSYNC) ? 1 : 0;
>> + u8 pin_dclk = (mode->flags & DRM_MODE_FLAG_PCSYNC) ? 1 : 0;
>> + u32 val;
>> + int ret;
>> +
>> + /* iomux to LCD data/sync mode */
>> + if (lvds->output == DISPLAY_OUTPUT_RGB)
>> + if (lvds->pins && !IS_ERR(lvds->pins->default_state))
>> + pinctrl_select_state(lvds->pins->p,
>> + lvds->pins->default_state);
>> + val = lvds->format;
>
> val = lvds->format | LVDS_CH0_EN;
>
> then remove LVDS_CH0_EN from below
>
thanks,I will update at next version.
>> + if (lvds->output == DISPLAY_OUTPUT_DUAL_LVDS)
>> + val |= LVDS_DUAL | LVDS_CH0_EN | LVDS_CH1_EN;
>> + else if (lvds->output == DISPLAY_OUTPUT_LVDS)
>> + val |= LVDS_CH0_EN;
>> + else if (lvds->output == DISPLAY_OUTPUT_RGB)
>> + val |= LVDS_TTL_EN | LVDS_CH0_EN | LVDS_CH1_EN;
>> +
>> + if (h_bp & 0x01)
>> + val |= LVDS_START_PHASE_RST_1;
>> +
>> + val |= (pin_dclk << 8) | (pin_hsync << 9);
>> + val |= (0xffff << 16);
>> + ret = regmap_write(lvds->grf, lvds->soc_data->grf_soc_con7, val);
>> + if (ret != 0) {
>> + dev_err(lvds->dev, "Could not write to GRF: %d\n", ret);
>> + return;
>> + }
>> +}
>> +
>> +static int rockchip_lvds_set_vop_source(struct rockchip_lvds *lvds,
>> + struct drm_encoder *encoder)
>> +{
>> + u32 val;
>> + int ret;
>> +
>> + if (!lvds->soc_data->has_vop_sel)
>> + return 0;
>> +
>> + ret = drm_of_encoder_active_endpoint_id(lvds->dev->of_node, encoder);
>> + if (ret < 0)
>> + return ret;
>> +
>> + if (ret)
>> + val = RK3288_LVDS_SOC_CON6_SEL_VOP_LIT |
>> + (RK3288_LVDS_SOC_CON6_SEL_VOP_LIT << 16);
>> + else
>> + val = RK3288_LVDS_SOC_CON6_SEL_VOP_LIT << 16;
>
>
> val = RK3288_LVDS_SOC_CON6_SEL_VOP_LIT << 16;
> if (ret)
> val |= RK3288_LVDS_SOC_CON6_SEL_VOP_LIT;
>
Update at next version.
>> +
>> + ret = regmap_write(lvds->grf, lvds->soc_data->grf_soc_con6, val);
>> + if (ret < 0)
>> + return ret;
>> +
>> + return 0;
>> +}
>> +
>> +static int
>> +rockchip_lvds_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);
>> +
>> +
>
> nit: extra line
>
Update at next version.
>> + s->output_mode = ROCKCHIP_OUT_MODE_P888;
>> + s->output_type = DRM_MODE_CONNECTOR_LVDS;
>> +
>> +
>> + return 0;
>> +}
>> +
>> +static void rockchip_lvds_encoder_enable(struct drm_encoder *encoder)
>> +{
>> + struct rockchip_lvds *lvds = encoder_to_lvds(encoder);
>> +
>> + rockchip_lvds_encoder_dpms(encoder, DRM_MODE_DPMS_ON);
>> + rockchip_lvds_grf_config(encoder, &lvds->mode);
>> + rockchip_lvds_set_vop_source(lvds, encoder);
>> +}
>> +
>> +static void rockchip_lvds_encoder_disable(struct drm_encoder *encoder)
>> +{
>> + rockchip_lvds_encoder_dpms(encoder, DRM_MODE_DPMS_OFF);
>> +}
>> +
>> +static const
>> +struct drm_encoder_helper_funcs rockchip_lvds_encoder_helper_funcs = {
>> + .mode_fixup = rockchip_lvds_encoder_mode_fixup,
>> + .mode_set = rockchip_lvds_encoder_mode_set,
>> + .enable = rockchip_lvds_encoder_enable,
>> + .disable = rockchip_lvds_encoder_disable,
>> + .atomic_check = rockchip_lvds_encoder_atomic_check,
>> +};
>> +
>> +static void rockchip_lvds_encoder_destroy(struct drm_encoder *encoder)
>> +{
>> + drm_encoder_cleanup(encoder);
>> +}
>> +
>> +static const struct drm_encoder_funcs rockchip_lvds_encoder_funcs = {
>> + .destroy = rockchip_lvds_encoder_destroy,
>> +};
>> +
>> +static struct rockchip_lvds_soc_data rk3288_lvds_data = {
>> + .chip_type = RK3288_LVDS,
>> + .grf_soc_con6 = 0x025c,
>> + .grf_soc_con7 = 0x0260,
>> + .has_vop_sel = true,
>> +};
>> +
>> +static const struct of_device_id rockchip_lvds_dt_ids[] = {
>> + {
>> + .compatible = "rockchip,rk3288-lvds",
>> + .data = &rk3288_lvds_data
>> + },
>> + {}
>> +};
>> +MODULE_DEVICE_TABLE(of, rockchip_lvds_dt_ids);
>> +
>> +static int rockchip_lvds_bind(struct device *dev, struct device *master,
>> + void *data)
>> +{
>> + struct rockchip_lvds *lvds = 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;
>> + int ret, i;
>
> Looks like i is just used to read data-width from dt, can you please rename to
> "width" or similar?
>
Update to width at next version.
>> + const char *name;
>> +
>> + lvds->drm_dev = drm_dev;
>> + port = of_graph_get_port_by_id(dev->of_node, 1);
>> + if (!port) {
>> + dev_err(dev, "can't found port point, please init lvds panel port!\n");
>> + return -EINVAL;
>> + }
>> +
>> + for_each_child_of_node(port, endpoint) {
>> + remote = of_graph_get_remote_port_parent(endpoint);
>> + if (!remote) {
>> + dev_err(dev, "can't found panel node, please init!\n");
>> + ret = -EINVAL;
>> + goto err_put_port;
>> + }
>> + if (!of_device_is_available(remote)) {
>> + of_node_put(remote);
>> + remote = NULL;
>> + continue;
>> + }
>> + break;
>> + }
>> + if (!remote) {
>> + dev_err(dev, "can't found remote node, please init!\n");
>> + ret = -EINVAL;
>> + goto err_put_port;
>> + }
>> +
>> + lvds->panel = of_drm_find_panel(remote);
>> + if (!lvds->panel)
>> + lvds->bridge = of_drm_find_bridge(remote);
>
> drm_of_find_panel_or_bridge()
>
because the lvds ports maybe connect to lvds-panel or connect to
rk1000(which is convert RGB to CVBS output), so i have to get the remote
port parent and check the status, and final get the active remote point.
lvds_panel: lvds-panel {
status = "disabled";
ports {
panel_in_lvds: endpoint {
remote-endpoint = <&lvds_out_panel>;
};
};
};
rk1000: rk1000@0xff000000 {
status = "okay";
ports {
rk1000_in_lvds: endpoint {
remote-endpoint = <&lvds_out_panel>;
};
};
};
&lvds {
status = "okay";
ports {
lvds_out: port@1 {
reg = <1>;
lvds_out_panel: endpoint@0 {
reg = <0>;
remote-endpoint = <&panel_in_lvds>;
};
lvds_out_rk1000: endpoint@1 {
reg = <1>;
remote-endpoint = <&rk1000_in_lvds>;
};
};
};
};
>> +
>> + if (!lvds->panel && !lvds->bridge) {
>> + DRM_ERROR("failed to find panel and bridge node\n");
>> + ret = -EPROBE_DEFER;
>> + goto err_put_remote;
>> + }
>> +
>> + if (of_property_read_string(remote, "rockchip,output", &name))
>> + /* default set it as output rgb */
>> + lvds->output = DISPLAY_OUTPUT_RGB;
>> + else
>> + lvds->output = lvds_name_to_output(name);
>> +
>> + if (lvds->output < 0) {
>> + dev_err(dev, "invalid output type [%s]\n", name);
>> + ret = lvds->output;
>> + goto err_put_remote;
>> + }
>> +
>> + if (of_property_read_string(remote, "rockchip,data-mapping",
>> + &name))
>> + /* default set it as format jeida */
>> + lvds->format = LVDS_FORMAT_JEIDA;
>> + else
>> + lvds->format = lvds_name_to_format(name);
>> +
>> + if (lvds->format < 0) {
>> + dev_err(dev, "invalid data-mapping format [%s]\n", name);
>> + ret = lvds->format;
>> + goto err_put_remote;
>> + }
>> +
>> + if (of_property_read_u32(remote, "rockchip,data-width", &i)) {
>> + lvds->format |= LVDS_24BIT;
>> + } else {
>> + if (i == 24) {
>> + lvds->format |= LVDS_24BIT;
>> + } else if (i == 18) {
>> + lvds->format |= LVDS_18BIT;
>> + } else {
>> + dev_err(dev,
>> + "rockchip-lvds unsupport data-width[%d]\n", i);
>> + ret = -EINVAL;
>> + goto err_put_remote;
>> + }
>> + }
>> +
>> + encoder = &lvds->encoder;
>> + encoder->possible_crtcs = drm_of_find_possible_crtcs(drm_dev,
>> + dev->of_node);
>> +
>> + ret = drm_encoder_init(drm_dev, encoder, &rockchip_lvds_encoder_funcs,
>> + DRM_MODE_ENCODER_LVDS, NULL);
>> + if (ret < 0) {
>> + DRM_ERROR("failed to initialize encoder with drm\n");
>
> Here and below you switched to DRM_ERROR (instead of dev_err) and you don't
> print the ret values. Can you please change to DRM_DEV_ERROR and print ret when
> exiting?
>
update at next version.
>> + goto err_put_remote;
>> + }
>> +
>> + drm_encoder_helper_add(encoder, &rockchip_lvds_encoder_helper_funcs);
>> +
>> + if (lvds->panel) {
>> + connector = &lvds->connector;
>> + connector->dpms = DRM_MODE_DPMS_OFF;
>> + ret = drm_connector_init(drm_dev, connector,
>> + &rockchip_lvds_connector_funcs,
>> + DRM_MODE_CONNECTOR_LVDS);
>> + if (ret < 0) {
>> + DRM_ERROR("failed to initialize connector with drm\n");
>> + goto err_free_encoder;
>> + }
>> +
>> + drm_connector_helper_add(connector,
>> + &rockchip_lvds_connector_helper_funcs);
>> +
>> + ret = drm_mode_connector_attach_encoder(connector, encoder);
>> + if (ret < 0) {
>> + DRM_ERROR("failed to attach connector and encoder\n");
>> + goto err_free_connector;
>> + }
>> +
>> + ret = drm_panel_attach(lvds->panel, connector);
>> + if (ret < 0) {
>> + DRM_ERROR("failed to attach connector and encoder\n");
>> + goto err_free_connector;
>> + }
>> + } else {
>> + lvds->bridge->encoder = encoder;
>> + ret = drm_bridge_attach(encoder, lvds->bridge, NULL);
>> + if (ret) {
>> + DRM_ERROR("Failed to attach bridge to drm\n");
>> + goto err_free_encoder;
>> + }
>> + encoder->bridge = lvds->bridge;
>> + }
>> +
>> + pm_runtime_enable(dev);
>> + 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_lvds_unbind(struct device *dev, struct device *master,
>> + void *data)
>> +{
>> + struct rockchip_lvds *lvds = dev_get_drvdata(dev);
>> +
>> + rockchip_lvds_encoder_dpms(&lvds->encoder, DRM_MODE_DPMS_OFF);
>> +
>> + drm_panel_detach(lvds->panel);
>
> Oops if lvds->panel is NULL, which will happen if you have a bridge. Speaking of
> which, you're also not handling bridge detach.
>
thanks,I will fix at next version.
>> +
>> + drm_connector_cleanup(&lvds->connector);
>> + drm_encoder_cleanup(&lvds->encoder);
>> +
>> + pm_runtime_disable(dev);
>
> This should probably be first if you're rolling back initialization.
>
thanks,I will fix at next version.
>> +}
>> +
>> +static const struct component_ops rockchip_lvds_component_ops = {
>> + .bind = rockchip_lvds_bind,
>> + .unbind = rockchip_lvds_unbind,
>> +};
>> +
>> +static int rockchip_lvds_probe(struct platform_device *pdev)
>> +{
>> + struct device *dev = &pdev->dev;
>> + struct rockchip_lvds *lvds;
>> + const struct of_device_id *match;
>> + struct resource *res;
>> + int ret;
>> +
>> + if (!dev->of_node)
>> + return -ENODEV;
>> +
>> + lvds = devm_kzalloc(&pdev->dev, sizeof(*lvds), GFP_KERNEL);
>> + if (!lvds)
>> + return -ENOMEM;
>> +
>> + lvds->dev = dev;
>> + lvds->suspend = true;
>> + match = of_match_node(rockchip_lvds_dt_ids, dev->of_node);
>
> match can be NULL and you dereference it on the next line
>
thanks,I will fix at next version.
>> + lvds->soc_data = match->data;
>> +
>> + res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
>> + lvds->regs = devm_ioremap_resource(&pdev->dev, res);
>> + if (IS_ERR(lvds->regs))
>> + return PTR_ERR(lvds->regs);
>> +
>> + lvds->pclk = devm_clk_get(&pdev->dev, "pclk_lvds");
>> + if (IS_ERR(lvds->pclk)) {
>> + dev_err(dev, "could not get pclk_lvds\n");
>> + return PTR_ERR(lvds->pclk);
>> + }
>> +
>> + lvds->pins = devm_kzalloc(lvds->dev, sizeof(*lvds->pins),
>> + GFP_KERNEL);
>> + if (!lvds->pins)
>> + return -ENOMEM;
>> +
>> + lvds->pins->p = devm_pinctrl_get(lvds->dev);
>> + if (IS_ERR(lvds->pins->p)) {
>> + dev_info(lvds->dev, "no pinctrl handle\n");
>> + devm_kfree(lvds->dev, lvds->pins);
>> + lvds->pins = NULL;
>> + } else {
>> + lvds->pins->default_state =
>> + pinctrl_lookup_state(lvds->pins->p, "lcdc");
>> + if (IS_ERR(lvds->pins->default_state)) {
>> + dev_info(lvds->dev, "no default pinctrl state\n");
>> + devm_kfree(lvds->dev, lvds->pins);
>> + lvds->pins = NULL;
>> + }
>> + }
>> +
>> + lvds->grf = syscon_regmap_lookup_by_phandle(dev->of_node,
>> + "rockchip,grf");
>> + if (IS_ERR(lvds->grf)) {
>> + dev_err(dev, "missing rockchip,grf property\n");
>> + return PTR_ERR(lvds->grf);
>> + }
>> +
>> + dev_set_drvdata(dev, lvds);
>> + mutex_init(&lvds->suspend_lock);
>> +
>> + if (lvds->pclk) {
>> + ret = clk_prepare(lvds->pclk);
>> + if (ret < 0) {
>> + dev_err(dev, "failed to prepare pclk_lvds\n");
>> + return ret;
>> + }
>> + }
>> + ret = component_add(&pdev->dev, &rockchip_lvds_component_ops);
>> + if (ret < 0) {
>> + if (lvds->pclk)
>> + clk_unprepare(lvds->pclk);
>> + }
>> +
>> + return ret;
>> +}
>> +
>> +static int rockchip_lvds_remove(struct platform_device *pdev)
>> +{
>> + struct rockchip_lvds *lvds = dev_get_drvdata(&pdev->dev);
>> +
>> + component_del(&pdev->dev, &rockchip_lvds_component_ops);
>> + if (lvds->pclk)
>> + clk_unprepare(lvds->pclk);
>> +
>> + return 0;
>> +}
>> +
>> +struct platform_driver rockchip_lvds_driver = {
>> + .probe = rockchip_lvds_probe,
>> + .remove = rockchip_lvds_remove,
>> + .driver = {
>> + .name = "rockchip-lvds",
>> + .of_match_table = of_match_ptr(rockchip_lvds_dt_ids),
>> + },
>> +};
>> diff --git a/drivers/gpu/drm/rockchip/rockchip_lvds.h b/drivers/gpu/drm/rockchip/rockchip_lvds.h
>> new file mode 100644
>> index 0000000..49d2422
>> --- /dev/null
>> +++ b/drivers/gpu/drm/rockchip/rockchip_lvds.h
>> @@ -0,0 +1,112 @@
>> +/*
>> + * Copyright (C) Fuzhou Rockchip Electronics Co.Ltd
>> + * Author:
>> + * hjc <[email protected]>
>> + * mark yao <[email protected]>
>> + *
>> + * 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.
>> + */
>> +
>> +#ifndef _ROCKCHIP_LVDS_
>> +#define _ROCKCHIP_LVDS_
>> +
>> +#define RK3288_LVDS_CH0_REG0 0x00
>> +#define RK3288_LVDS_CH0_REG0_LVDS_EN BIT(7)
>> +#define RK3288_LVDS_CH0_REG0_TTL_EN BIT(6)
>> +#define RK3288_LVDS_CH0_REG0_LANECK_EN BIT(5)
>> +#define RK3288_LVDS_CH0_REG0_LANE4_EN BIT(4)
>> +#define RK3288_LVDS_CH0_REG0_LANE3_EN BIT(3)
>> +#define RK3288_LVDS_CH0_REG0_LANE2_EN BIT(2)
>> +#define RK3288_LVDS_CH0_REG0_LANE1_EN BIT(1)
>> +#define RK3288_LVDS_CH0_REG0_LANE0_EN BIT(0)
>> +
>> +#define RK3288_LVDS_CH0_REG1 0x04
>> +#define RK3288_LVDS_CH0_REG1_LANECK_BIAS BIT(5)
>> +#define RK3288_LVDS_CH0_REG1_LANE4_BIAS BIT(4)
>> +#define RK3288_LVDS_CH0_REG1_LANE3_BIAS BIT(3)
>> +#define RK3288_LVDS_CH0_REG1_LANE2_BIAS BIT(2)
>> +#define RK3288_LVDS_CH0_REG1_LANE1_BIAS BIT(1)
>> +#define RK3288_LVDS_CH0_REG1_LANE0_BIAS BIT(0)
>> +
>> +#define RK3288_LVDS_CH0_REG2 0x08
>> +#define RK3288_LVDS_CH0_REG2_RESERVE_ON BIT(7)
>> +#define RK3288_LVDS_CH0_REG2_LANECK_LVDS_MODE BIT(6)
>> +#define RK3288_LVDS_CH0_REG2_LANE4_LVDS_MODE BIT(5)
>> +#define RK3288_LVDS_CH0_REG2_LANE3_LVDS_MODE BIT(4)
>> +#define RK3288_LVDS_CH0_REG2_LANE2_LVDS_MODE BIT(3)
>> +#define RK3288_LVDS_CH0_REG2_LANE1_LVDS_MODE BIT(2)
>> +#define RK3288_LVDS_CH0_REG2_LANE0_LVDS_MODE BIT(1)
>> +#define RK3288_LVDS_CH0_REG2_PLL_FBDIV8 BIT(0)
>> +
>> +#define RK3288_LVDS_CH0_REG3 0x0c
>> +#define RK3288_LVDS_CH0_REG3_PLL_FBDIV_MASK 0xff
>> +
>> +#define RK3288_LVDS_CH0_REG4 0x10
>> +#define RK3288_LVDS_CH0_REG4_LANECK_TTL_MODE BIT(5)
>> +#define RK3288_LVDS_CH0_REG4_LANE4_TTL_MODE BIT(4)
>> +#define RK3288_LVDS_CH0_REG4_LANE3_TTL_MODE BIT(3)
>> +#define RK3288_LVDS_CH0_REG4_LANE2_TTL_MODE BIT(2)
>> +#define RK3288_LVDS_CH0_REG4_LANE1_TTL_MODE BIT(1)
>> +#define RK3288_LVDS_CH0_REG4_LANE0_TTL_MODE BIT(0)
>> +
>> +#define RK3288_LVDS_CH0_REG5 0x14
>> +#define RK3288_LVDS_CH0_REG5_LANECK_TTL_DATA BIT(5)
>> +#define RK3288_LVDS_CH0_REG5_LANE4_TTL_DATA BIT(4)
>> +#define RK3288_LVDS_CH0_REG5_LANE3_TTL_DATA BIT(3)
>> +#define RK3288_LVDS_CH0_REG5_LANE2_TTL_DATA BIT(2)
>> +#define RK3288_LVDS_CH0_REG5_LANE1_TTL_DATA BIT(1)
>> +#define RK3288_LVDS_CH0_REG5_LANE0_TTL_DATA BIT(0)
>> +
>> +#define RK3288_LVDS_CFG_REGC 0x30
>> +#define RK3288_LVDS_CFG_REGC_PLL_ENABLE 0x00
>> +#define RK3288_LVDS_CFG_REGC_PLL_DISABLE 0xff
>> +
>> +#define RK3288_LVDS_CH0_REGD 0x34
>> +#define RK3288_LVDS_CH0_REGD_PLL_PREDIV_MASK 0x1f
>> +
>> +#define RK3288_LVDS_CH0_REG20 0x80
>> +#define RK3288_LVDS_CH0_REG20_MSB 0x45
>> +#define RK3288_LVDS_CH0_REG20_LSB 0x44
>> +
>> +#define RK3288_LVDS_CFG_REG21 0x84
>> +#define RK3288_LVDS_CFG_REG21_TX_ENABLE 0x92
>> +#define RK3288_LVDS_CFG_REG21_TX_DISABLE 0x00
>> +#define RK3288_LVDS_CH1_OFFSET 0x100
>> +
>> +/* fbdiv value is split over 2 registers, with bit8 in reg2 */
>> +#define RK3288_LVDS_PLL_FBDIV_REG2(_fbd) \
>> + (_fbd & BIT(8) ? RK3288_LVDS_CH0_REG2_PLL_FBDIV8 : 0)
>> +#define RK3288_LVDS_PLL_FBDIV_REG3(_fbd) \
>> + (_fbd & RK3288_LVDS_CH0_REG3_PLL_FBDIV_MASK)
>> +#define RK3288_LVDS_PLL_PREDIV_REGD(_pd) \
>> + (_pd & RK3288_LVDS_CH0_REGD_PLL_PREDIV_MASK)
>> +
>> +#define RK3288_LVDS_SOC_CON6_SEL_VOP_LIT BIT(3)
>> +
>> +#define LVDS_FMT_MASK (0x07 << 16)
>> +#define LVDS_MSB BIT(3)
>> +#define LVDS_DUAL BIT(4)
>> +#define LVDS_FMT_1 BIT(5)
>> +#define LVDS_TTL_EN BIT(6)
>> +#define LVDS_START_PHASE_RST_1 BIT(7)
>> +#define LVDS_DCLK_INV BIT(8)
>> +#define LVDS_CH0_EN BIT(11)
>> +#define LVDS_CH1_EN BIT(12)
>> +#define LVDS_PWRDN BIT(15)
>> +
>> +#define LVDS_24BIT (0 << 1)
>> +#define LVDS_18BIT (1 << 1)
>> +#define LVDS_FORMAT_VESA (0 << 0)
>> +#define LVDS_FORMAT_JEIDA (1 << 0)
>> +
>> +enum rockchip_lvds_sub_devtype {
>> + RK3288_LVDS,
>> +};
>> +#endif /* _ROCKCHIP_LVDS_ */
>> --
>> 2.7.4
>>
>>
>> _______________________________________________
>> dri-devel mailing list
>> [email protected]
>> https://lists.freedesktop.org/mailman/listinfo/dri-devel
>
--
Best Regard
?Ƽ???
Sandy Huang
??????о???ӹɷ?????˾-ͼ??????ʾϵͳ????
Fuzhou Rockchip Electronics Co.Ltd - Graphics & Display Dept.
Addr: ?????й?¥??ͭ??·????????89?Ÿ???????A??21??¥(350003)
No. 21 Building, A District, No.89,software Boulevard
Fuzhou,Fujian,PRC
Tel??+86 0591-87884919 8690
[email protected]
On Thu, Aug 10, 2017 at 05:35:52PM +0800, Sandy Huang wrote:
> Hi Sean Paul,
> Thanks for your review.
>
> 在 2017/8/10 3:58, Sean Paul 写道:
> > On Wed, Aug 09, 2017 at 06:00:59PM +0800, Sandy Huang wrote:
> > > This adds support for Rockchip soc lvds found on rk3288
> > > Based on the patches from Mark yao and Heiko Stuebner
> > >
> > > Signed-off-by: Sandy Huang <[email protected]>
> > > Signed-off-by: Mark yao <[email protected]>
> > > Signed-off-by: Heiko Stuebner <[email protected]>
> > > ---
> > > drivers/gpu/drm/rockchip/Kconfig | 9 +
> > > drivers/gpu/drm/rockchip/Makefile | 1 +
> > > drivers/gpu/drm/rockchip/rockchip_lvds.c | 734 +++++++++++++++++++++++++++++++
> > > drivers/gpu/drm/rockchip/rockchip_lvds.h | 112 +++++
> > > 4 files changed, 856 insertions(+)
> > > create mode 100644 drivers/gpu/drm/rockchip/rockchip_lvds.c
> > > create mode 100644 drivers/gpu/drm/rockchip/rockchip_lvds.h
> > >
<snip />
> > > diff --git a/drivers/gpu/drm/rockchip/rockchip_lvds.c b/drivers/gpu/drm/rockchip/rockchip_lvds.c
> > > new file mode 100644
> > > index 0000000..a4ad3f0
> > > --- /dev/null
> > > +++ b/drivers/gpu/drm/rockchip/rockchip_lvds.c
<snip />
> > > + lvds->drm_dev = drm_dev;
> > > + port = of_graph_get_port_by_id(dev->of_node, 1);
> > > + if (!port) {
> > > + dev_err(dev, "can't found port point, please init lvds panel port!\n");
> > > + return -EINVAL;
> > > + }
> > > +
> > > + for_each_child_of_node(port, endpoint) {
> > > + remote = of_graph_get_remote_port_parent(endpoint);
> > > + if (!remote) {
> > > + dev_err(dev, "can't found panel node, please init!\n");
> > > + ret = -EINVAL;
> > > + goto err_put_port;
> > > + }
> > > + if (!of_device_is_available(remote)) {
> > > + of_node_put(remote);
> > > + remote = NULL;
> > > + continue;
> > > + }
> > > + break;
> > > + }
> > > + if (!remote) {
> > > + dev_err(dev, "can't found remote node, please init!\n");
> > > + ret = -EINVAL;
> > > + goto err_put_port;
> > > + }
> > > +
> > > + lvds->panel = of_drm_find_panel(remote);
> > > + if (!lvds->panel)
> > > + lvds->bridge = of_drm_find_bridge(remote);
> >
> > drm_of_find_panel_or_bridge()
> >
>
> because the lvds ports maybe connect to lvds-panel or connect to
> rk1000(which is convert RGB to CVBS output), so i have to get the remote
> port parent and check the status, and final get the active remote point.
>
> lvds_panel: lvds-panel {
> status = "disabled";
> ports {
> panel_in_lvds: endpoint {
> remote-endpoint = <&lvds_out_panel>;
> };
> };
> };
>
> rk1000: rk1000@0xff000000 {
> status = "okay";
> ports {
> rk1000_in_lvds: endpoint {
> remote-endpoint = <&lvds_out_panel>;
> };
> };
> };
>
> &lvds {
> status = "okay";
> ports {
> lvds_out: port@1 {
> reg = <1>;
> lvds_out_panel: endpoint@0 {
> reg = <0>;
> remote-endpoint = <&panel_in_lvds>;
> };
> lvds_out_rk1000: endpoint@1 {
> reg = <1>;
> remote-endpoint = <&rk1000_in_lvds>;
> };
> };
>
> };
> };
Hi Sandy,
Forgive me, this is probably a stupid question. I don't see how this usecase is
unique from the other users of drm_of_find_panel_or_bridge. Couldn't you change
your devicetree bindings to conform to something drm_of_find_panel_or_bridge()
can work with?
Thank you,
Sean
<snip />
> > > --
> > > 2.7.4
> > >
> > >
> > > _______________________________________________
> > > dri-devel mailing list
> > > [email protected]
> > > https://lists.freedesktop.org/mailman/listinfo/dri-devel
> >
>
> --
> Best Regard
>
> 黄家钗
> Sandy Huang
> 福州瑞芯微电子股份有限公司-图形与显示系统部门
> Fuzhou Rockchip Electronics Co.Ltd - Graphics & Display Dept.
> Addr: 福州市鼓楼区铜盘路软件大道89号福州软件园A区21号楼(350003)
> No. 21 Building, A District, No.89,software Boulevard
> Fuzhou,Fujian,PRC
> Tel：+86 0591-87884919 8690
> E-mail：[email protected]
>
--
Sean Paul, Software Engineer, Google / Chromium OS
在 2017/8/11 2:05, Sean Paul 写道:
> On Thu, Aug 10, 2017 at 05:35:52PM +0800, Sandy Huang wrote:
>> Hi Sean Paul,
>> Thanks for your review.
>>
>> 在 2017/8/10 3:58, Sean Paul 写道:
>>> On Wed, Aug 09, 2017 at 06:00:59PM +0800, Sandy Huang wrote:
>>>> This adds support for Rockchip soc lvds found on rk3288
>>>> Based on the patches from Mark yao and Heiko Stuebner
>>>>
>>>> Signed-off-by: Sandy Huang <[email protected]>
>>>> Signed-off-by: Mark yao <[email protected]>
>>>> Signed-off-by: Heiko Stuebner <[email protected]>
>>>> ---
>>>> drivers/gpu/drm/rockchip/Kconfig | 9 +
>>>> drivers/gpu/drm/rockchip/Makefile | 1 +
>>>> drivers/gpu/drm/rockchip/rockchip_lvds.c | 734 +++++++++++++++++++++++++++++++
>>>> drivers/gpu/drm/rockchip/rockchip_lvds.h | 112 +++++
>>>> 4 files changed, 856 insertions(+)
>>>> create mode 100644 drivers/gpu/drm/rockchip/rockchip_lvds.c
>>>> create mode 100644 drivers/gpu/drm/rockchip/rockchip_lvds.h
>>>>
>
> <snip />
>
>>>> diff --git a/drivers/gpu/drm/rockchip/rockchip_lvds.c b/drivers/gpu/drm/rockchip/rockchip_lvds.c
>>>> new file mode 100644
>>>> index 0000000..a4ad3f0
>>>> --- /dev/null
>>>> +++ b/drivers/gpu/drm/rockchip/rockchip_lvds.c
>
> <snip />
>
>>>> + lvds->drm_dev = drm_dev;
>>>> + port = of_graph_get_port_by_id(dev->of_node, 1);
>>>> + if (!port) {
>>>> + dev_err(dev, "can't found port point, please init lvds panel port!\n");
>>>> + return -EINVAL;
>>>> + }
>>>> +
>>>> + for_each_child_of_node(port, endpoint) {
>>>> + remote = of_graph_get_remote_port_parent(endpoint);
>>>> + if (!remote) {
>>>> + dev_err(dev, "can't found panel node, please init!\n");
>>>> + ret = -EINVAL;
>>>> + goto err_put_port;
>>>> + }
>>>> + if (!of_device_is_available(remote)) {
>>>> + of_node_put(remote);
>>>> + remote = NULL;
>>>> + continue;
>>>> + }
>>>> + break;
>>>> + }
>>>> + if (!remote) {
>>>> + dev_err(dev, "can't found remote node, please init!\n");
>>>> + ret = -EINVAL;
>>>> + goto err_put_port;
>>>> + }
>>>> +
>>>> + lvds->panel = of_drm_find_panel(remote);
>>>> + if (!lvds->panel)
>>>> + lvds->bridge = of_drm_find_bridge(remote);
>>>
>>> drm_of_find_panel_or_bridge()
>>>
>>
>> because the lvds ports maybe connect to lvds-panel or connect to
>> rk1000(which is convert RGB to CVBS output), so i have to get the remote
>> port parent and check the status, and final get the active remote point.
>>
>
>
>
>> lvds_panel: lvds-panel {
>> status = "disabled";
>> ports {
>> panel_in_lvds: endpoint {
>> remote-endpoint = <&lvds_out_panel>;
>> };
>> };
>> };
>>
>> rk1000: rk1000@0xff000000 {
>> status = "okay";
>> ports {
>> rk1000_in_lvds: endpoint {
>> remote-endpoint = <&lvds_out_panel>;
>> };
>> };
>> };
>>
>> &lvds {
>> status = "okay";
>> ports {
>> lvds_out: port@1 {
>> reg = <1>;
>> lvds_out_panel: endpoint@0 {
>> reg = <0>;
>> remote-endpoint = <&panel_in_lvds>;
>> };
>> lvds_out_rk1000: endpoint@1 {
>> reg = <1>;
>> remote-endpoint = <&rk1000_in_lvds>;
>> };
>> };
>>
>> };
>> };
>
> Hi Sandy,
> Forgive me, this is probably a stupid question. I don't see how this usecase is
> unique from the other users of drm_of_find_panel_or_bridge. Couldn't you change
> your devicetree bindings to conform to something drm_of_find_panel_or_bridge()
> can work with?
>
> Thank you,
>
Hi sean,
Maybe i can use the following method to use
drm_of_find_panel_or_bridge() and no need to change my DT, but there is
another question:
The LVDS output format(rockchip,output、rockchip,data-mapping etc.)
depend on different panel, so it should be put under remote panel point.
If use drm_of_find_panel_or_bridge（), this just return panel or bridge,
so i have to back to get remote panel point and get the output format.
ret = drm_of_find_panel_or_bridge(dev->of_node, 1, 0, &lvds->panel,
&lvds->bridge);
if (ret)
ret = drm_of_find_panel_or_bridge(dev->of_node, 1, 1, &lvds->panel,
&lvds->bridge);
if (ret) {
DRM_DEV_ERROR(dev, "failed to find panel and bridge node\n");
ret = -EPROBE_DEFER;
goto err_put_remote;
}
On Fri, Aug 11, 2017 at 10:15:16AM +0800, Sandy Huang wrote:
>
>
> 在 2017/8/11 2:05, Sean Paul 写道:
> > On Thu, Aug 10, 2017 at 05:35:52PM +0800, Sandy Huang wrote:
> > > Hi Sean Paul,
> > > Thanks for your review.
> > >
> > > 在 2017/8/10 3:58, Sean Paul 写道:
> > > > On Wed, Aug 09, 2017 at 06:00:59PM +0800, Sandy Huang wrote:
> > > > > This adds support for Rockchip soc lvds found on rk3288
> > > > > Based on the patches from Mark yao and Heiko Stuebner
> > > > >
> > > > > Signed-off-by: Sandy Huang <[email protected]>
> > > > > Signed-off-by: Mark yao <[email protected]>
> > > > > Signed-off-by: Heiko Stuebner <[email protected]>
> > > > > ---
> > > > > drivers/gpu/drm/rockchip/Kconfig | 9 +
> > > > > drivers/gpu/drm/rockchip/Makefile | 1 +
> > > > > drivers/gpu/drm/rockchip/rockchip_lvds.c | 734 +++++++++++++++++++++++++++++++
> > > > > drivers/gpu/drm/rockchip/rockchip_lvds.h | 112 +++++
> > > > > 4 files changed, 856 insertions(+)
> > > > > create mode 100644 drivers/gpu/drm/rockchip/rockchip_lvds.c
> > > > > create mode 100644 drivers/gpu/drm/rockchip/rockchip_lvds.h
> > > > >
> >
> > <snip />
> >
> > > > > diff --git a/drivers/gpu/drm/rockchip/rockchip_lvds.c b/drivers/gpu/drm/rockchip/rockchip_lvds.c
> > > > > new file mode 100644
> > > > > index 0000000..a4ad3f0
> > > > > --- /dev/null
> > > > > +++ b/drivers/gpu/drm/rockchip/rockchip_lvds.c
> >
> > <snip />
> >
> > > > > + lvds->drm_dev = drm_dev;
> > > > > + port = of_graph_get_port_by_id(dev->of_node, 1);
> > > > > + if (!port) {
> > > > > + dev_err(dev, "can't found port point, please init lvds panel port!\n");
> > > > > + return -EINVAL;
> > > > > + }
> > > > > +
> > > > > + for_each_child_of_node(port, endpoint) {
> > > > > + remote = of_graph_get_remote_port_parent(endpoint);
> > > > > + if (!remote) {
> > > > > + dev_err(dev, "can't found panel node, please init!\n");
> > > > > + ret = -EINVAL;
> > > > > + goto err_put_port;
> > > > > + }
> > > > > + if (!of_device_is_available(remote)) {
> > > > > + of_node_put(remote);
> > > > > + remote = NULL;
> > > > > + continue;
> > > > > + }
> > > > > + break;
> > > > > + }
> > > > > + if (!remote) {
> > > > > + dev_err(dev, "can't found remote node, please init!\n");
> > > > > + ret = -EINVAL;
> > > > > + goto err_put_port;
> > > > > + }
> > > > > +
> > > > > + lvds->panel = of_drm_find_panel(remote);
> > > > > + if (!lvds->panel)
> > > > > + lvds->bridge = of_drm_find_bridge(remote);
> > > >
> > > > drm_of_find_panel_or_bridge()
> > > >
> > >
> > > because the lvds ports maybe connect to lvds-panel or connect to
> > > rk1000(which is convert RGB to CVBS output), so i have to get the remote
> > > port parent and check the status, and final get the active remote point.
> > >
> >
> >
> >
> > > lvds_panel: lvds-panel {
> > > status = "disabled";
> > > ports {
> > > panel_in_lvds: endpoint {
> > > remote-endpoint = <&lvds_out_panel>;
> > > };
> > > };
> > > };
> > >
> > > rk1000: rk1000@0xff000000 {
> > > status = "okay";
> > > ports {
> > > rk1000_in_lvds: endpoint {
> > > remote-endpoint = <&lvds_out_panel>;
> > > };
> > > };
> > > };
> > >
> > > &lvds {
> > > status = "okay";
> > > ports {
> > > lvds_out: port@1 {
> > > reg = <1>;
> > > lvds_out_panel: endpoint@0 {
> > > reg = <0>;
> > > remote-endpoint = <&panel_in_lvds>;
> > > };
> > > lvds_out_rk1000: endpoint@1 {
> > > reg = <1>;
> > > remote-endpoint = <&rk1000_in_lvds>;
> > > };
> > > };
> > >
> > > };
> > > };
> >
> > Hi Sandy,
> > Forgive me, this is probably a stupid question. I don't see how this usecase is
> > unique from the other users of drm_of_find_panel_or_bridge. Couldn't you change
> > your devicetree bindings to conform to something drm_of_find_panel_or_bridge()
> > can work with?
> >
> > Thank you,
> >
> Hi sean,
> Maybe i can use the following method to use
> drm_of_find_panel_or_bridge() and no need to change my DT, but there is
> another question:
> The LVDS output format(rockchip,output、rockchip,data-mapping etc.)
> depend on different panel, so it should be put under remote panel point.
> If use drm_of_find_panel_or_bridge（), this just return panel or bridge, so
> i have to back to get remote panel point and get the output format.
This should be easy since you can grab dev->of_node from panel or bridge once
it's found.
>
> ret = drm_of_find_panel_or_bridge(dev->of_node, 1, 0, &lvds->panel,
> &lvds->bridge);
> if (ret)
> ret = drm_of_find_panel_or_bridge(dev->of_node, 1, 1, &lvds->panel,
> &lvds->bridge);
Would be easier to read in a for loop.
Sean
> if (ret) {
> DRM_DEV_ERROR(dev, "failed to find panel and bridge node\n");
> ret = -EPROBE_DEFER;
> goto err_put_remote;
> }
>
>
--
Sean Paul, Software Engineer, Google / Chromium OS
On Wed, 2017-08-09 at 18:00 +0800, Sandy Huang wrote:
> This patch add Document for Rockchip Soc RK3288 LVDS,
> This based on the patches from Mark yao and Heiko Stuebner.
>
> > Signed-off-by: Sandy Huang <[email protected]>
> > Signed-off-by: Mark yao <[email protected]>
> > Signed-off-by: Heiko Stuebner <[email protected]>
> ---
> .../bindings/display/rockchip/rockchip-lvds.txt | 104 +++++++++++++++++++++
> 1 file changed, 104 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/display/rockchip/rockchip-lvds.txt
>
> diff --git a/Documentation/devicetree/bindings/display/rockchip/rockchip-lvds.txt b/Documentation/devicetree/bindings/display/rockchip/rockchip-lvds.txt
> new file mode 100644
> index 0000000..bf934ba
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/display/rockchip/rockchip-lvds.txt
> @@ -0,0 +1,104 @@
> +Rockchip RK3288 LVDS interface
> +================================
> +
> +Required properties:
> +- compatible: matching the soc type, one of
> > + - "rockchip,rk3288-lvds";
> +
> +- reg: physical base address of the controller and length
> > + of memory mapped region.
> +- clocks: must include clock specifiers corresponding to entries in the
> > + clock-names property.
> +- clock-names: must contain "pclk_lvds"
> +
> +- avdd1v0-supply: regulator phandle for 1.0V analog power
> +- avdd1v8-supply: regulator phandle for 1.8V analog power
> +- avdd3v3-supply: regulator phandle for 3.3V analog power
> +
> +- rockchip,grf: phandle to the general register files syscon
> +
> +Optional properties
> +- pinctrl-names: must contain a "lcdc" entry.
> +- pinctrl-0: pin control group to be used for this controller.
> +
> +Required nodes:
> +
> +The lvds has two video ports as 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 inputs
> +- video port 1 for either a panel or subsequent encoder
> +
> +the lvds panel described by
> > + Documentation/devicetree/bindings/display/panel/simple-panel.txt
> +
> +- rockchip,data-mapping: should be "vesa" or "jeida",
> > + This describes how the color bits are laid out in the
> > + serialized LVDS signal.
> +- rockchip,data-width : should be <18> or <24>;
This can already be described by the panel itself, via the bus_format
property in the panel_desc for panel-simple, or via the existing panel
device tree property "data-mapping" in panel-lvds, which can be set to
"jeida-18", "jeida-24", or "vesa-24".
The LVDS driver can then read the panel bus information from the
panel's connector->display_info.bus_formats.
So if these properties are necessary at all, they at least should be
optional (overrides).
regards
Philipp
在 2017/8/11 22:44, Sean Paul 写道:
> On Fri, Aug 11, 2017 at 10:15:16AM +0800, Sandy Huang wrote:
>>
>>
>> 在 2017/8/11 2:05, Sean Paul 写道:
>>> On Thu, Aug 10, 2017 at 05:35:52PM +0800, Sandy Huang wrote:
>>>> Hi Sean Paul,
>>>> Thanks for your review.
>>>>
>>>> 在 2017/8/10 3:58, Sean Paul 写道:
>>>>> On Wed, Aug 09, 2017 at 06:00:59PM +0800, Sandy Huang wrote:
>>>>>> This adds support for Rockchip soc lvds found on rk3288
>>>>>> Based on the patches from Mark yao and Heiko Stuebner
>>>>>>
>>>>>> Signed-off-by: Sandy Huang <[email protected]>
>>>>>> Signed-off-by: Mark yao <[email protected]>
>>>>>> Signed-off-by: Heiko Stuebner <[email protected]>
>>>>>> ---
>>>>>> drivers/gpu/drm/rockchip/Kconfig | 9 +
>>>>>> drivers/gpu/drm/rockchip/Makefile | 1 +
>>>>>> drivers/gpu/drm/rockchip/rockchip_lvds.c | 734 +++++++++++++++++++++++++++++++
>>>>>> drivers/gpu/drm/rockchip/rockchip_lvds.h | 112 +++++
>>>>>> 4 files changed, 856 insertions(+)
>>>>>> create mode 100644 drivers/gpu/drm/rockchip/rockchip_lvds.c
>>>>>> create mode 100644 drivers/gpu/drm/rockchip/rockchip_lvds.h
>>>>>>
>>>
>>> <snip />
>>>
>>>>>> diff --git a/drivers/gpu/drm/rockchip/rockchip_lvds.c b/drivers/gpu/drm/rockchip/rockchip_lvds.c
>>>>>> new file mode 100644
>>>>>> index 0000000..a4ad3f0
>>>>>> --- /dev/null
>>>>>> +++ b/drivers/gpu/drm/rockchip/rockchip_lvds.c
>>>
>>> <snip />
>>>
>>>>>> + lvds->drm_dev = drm_dev;
>>>>>> + port = of_graph_get_port_by_id(dev->of_node, 1);
>>>>>> + if (!port) {
>>>>>> + dev_err(dev, "can't found port point, please init lvds panel port!\n");
>>>>>> + return -EINVAL;
>>>>>> + }
>>>>>> +
>>>>>> + for_each_child_of_node(port, endpoint) {
>>>>>> + remote = of_graph_get_remote_port_parent(endpoint);
>>>>>> + if (!remote) {
>>>>>> + dev_err(dev, "can't found panel node, please init!\n");
>>>>>> + ret = -EINVAL;
>>>>>> + goto err_put_port;
>>>>>> + }
>>>>>> + if (!of_device_is_available(remote)) {
>>>>>> + of_node_put(remote);
>>>>>> + remote = NULL;
>>>>>> + continue;
>>>>>> + }
>>>>>> + break;
>>>>>> + }
>>>>>> + if (!remote) {
>>>>>> + dev_err(dev, "can't found remote node, please init!\n");
>>>>>> + ret = -EINVAL;
>>>>>> + goto err_put_port;
>>>>>> + }
>>>>>> +
>>>>>> + lvds->panel = of_drm_find_panel(remote);
>>>>>> + if (!lvds->panel)
>>>>>> + lvds->bridge = of_drm_find_bridge(remote);
>>>>>
>>>>> drm_of_find_panel_or_bridge()
>>>>>
>>>>
>>>> because the lvds ports maybe connect to lvds-panel or connect to
>>>> rk1000(which is convert RGB to CVBS output), so i have to get the remote
>>>> port parent and check the status, and final get the active remote point.
>>>>
>>>
>>>
>>>
>>>> lvds_panel: lvds-panel {
>>>> status = "disabled";
>>>> ports {
>>>> panel_in_lvds: endpoint {
>>>> remote-endpoint = <&lvds_out_panel>;
>>>> };
>>>> };
>>>> };
>>>>
>>>> rk1000: rk1000@0xff000000 {
>>>> status = "okay";
>>>> ports {
>>>> rk1000_in_lvds: endpoint {
>>>> remote-endpoint = <&lvds_out_panel>;
>>>> };
>>>> };
>>>> };
>>>>
>>>> &lvds {
>>>> status = "okay";
>>>> ports {
>>>> lvds_out: port@1 {
>>>> reg = <1>;
>>>> lvds_out_panel: endpoint@0 {
>>>> reg = <0>;
>>>> remote-endpoint = <&panel_in_lvds>;
>>>> };
>>>> lvds_out_rk1000: endpoint@1 {
>>>> reg = <1>;
>>>> remote-endpoint = <&rk1000_in_lvds>;
>>>> };
>>>> };
>>>>
>>>> };
>>>> };
>>>
>>> Hi Sandy,
>>> Forgive me, this is probably a stupid question. I don't see how this usecase is
>>> unique from the other users of drm_of_find_panel_or_bridge. Couldn't you change
>>> your devicetree bindings to conform to something drm_of_find_panel_or_bridge()
>>> can work with?
>>>
>>> Thank you,
>>>
>> Hi sean,
>> Maybe i can use the following method to use
>> drm_of_find_panel_or_bridge() and no need to change my DT, but there is
>> another question:
>> The LVDS output format(rockchip,output、rockchip,data-mapping etc.)
>> depend on different panel, so it should be put under remote panel point.
>> If use drm_of_find_panel_or_bridge（), this just return panel or bridge, so
>> i have to back to get remote panel point and get the output format.
>
> This should be easy since you can grab dev->of_node from panel or bridge once
> it's found.
>
ok, thanks.
>>
>> ret = drm_of_find_panel_or_bridge(dev->of_node, 1, 0, &lvds->panel,
>> &lvds->bridge);
>> if (ret)
>> ret = drm_of_find_panel_or_bridge(dev->of_node, 1, 1, &lvds->panel,
>> &lvds->bridge);
>
> Would be easier to read in a for loop.
>
> Sean
>
ok, thanks.
>> if (ret) {
>> DRM_DEV_ERROR(dev, "failed to find panel and bridge node\n");
>> ret = -EPROBE_DEFER;
>> goto err_put_remote;
>> }
>>
>>
>
在 2017/8/11 23:38, Philipp Zabel 写道:
> On Wed, 2017-08-09 at 18:00 +0800, Sandy Huang wrote:
>> This patch add Document for Rockchip Soc RK3288 LVDS,
>> This based on the patches from Mark yao and Heiko Stuebner.
>>
>>> Signed-off-by: Sandy Huang <[email protected]>
>>> Signed-off-by: Mark yao <[email protected]>
>>> Signed-off-by: Heiko Stuebner <[email protected]>
>> ---
>> .../bindings/display/rockchip/rockchip-lvds.txt | 104 +++++++++++++++++++++
>> 1 file changed, 104 insertions(+)
>> create mode 100644 Documentation/devicetree/bindings/display/rockchip/rockchip-lvds.txt
>>
>> diff --git a/Documentation/devicetree/bindings/display/rockchip/rockchip-lvds.txt b/Documentation/devicetree/bindings/display/rockchip/rockchip-lvds.txt
>> new file mode 100644
>> index 0000000..bf934ba
>> --- /dev/null
>> +++ b/Documentation/devicetree/bindings/display/rockchip/rockchip-lvds.txt
>> @@ -0,0 +1,104 @@
>> +Rockchip RK3288 LVDS interface
>> +================================
>> +
>> +Required properties:
>> +- compatible: matching the soc type, one of
>>> + - "rockchip,rk3288-lvds";
>> +
>> +- reg: physical base address of the controller and length
>>> + of memory mapped region.
>> +- clocks: must include clock specifiers corresponding to entries in the
>>> + clock-names property.
>> +- clock-names: must contain "pclk_lvds"
>> +
>> +- avdd1v0-supply: regulator phandle for 1.0V analog power
>> +- avdd1v8-supply: regulator phandle for 1.8V analog power
>> +- avdd3v3-supply: regulator phandle for 3.3V analog power
>> +
>> +- rockchip,grf: phandle to the general register files syscon
>> +
>> +Optional properties
>> +- pinctrl-names: must contain a "lcdc" entry.
>> +- pinctrl-0: pin control group to be used for this controller.
>> +
>> +Required nodes:
>> +
>> +The lvds has two video ports as 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 inputs
>> +- video port 1 for either a panel or subsequent encoder
>> +
>> +the lvds panel described by
>>> + Documentation/devicetree/bindings/display/panel/simple-panel.txt
>> +
>> +- rockchip,data-mapping: should be "vesa" or "jeida",
>>> + This describes how the color bits are laid out in the
>>> + serialized LVDS signal.
>> +- rockchip,data-width : should be <18> or <24>;
>
> This can already be described by the panel itself, via the bus_format
> property in the panel_desc for panel-simple, or via the existing panel
> device tree property "data-mapping" in panel-lvds, which can be set to
> "jeida-18", "jeida-24", or "vesa-24".
>
> The LVDS driver can then read the panel bus information from the
> panel's connector->display_info.bus_formats.
>
Because the lvds maybe connected to panel or some cover chip just like
rgb2cvbs etc. , in this case, we no need to enable panel, so we have to
get this proterty at here.
> So if these properties are necessary at all, they at least should be
> optional (overrides).
>
ok, i will set data-mapping to option.
> regards
> Philipp
>
> _______________________________________________
> Linux-rockchip mailing list
> [email protected]
> http://lists.infradead.org/mailman/listinfo/linux-rockchip
>