Message-ID: <20171017154317.zphpwbzlv2pu7elm@art_vandelay>
Date:   Tue, 17 Oct 2017 11:43:17 -0400
From:   Sean Paul <seanpaul@...omium.org>
To:     Sandy Huang <hjc@...k-chips.com>
Cc:     Mark Yao <mark.yao@...k-chips.com>,
        David Airlie <airlied@...ux.ie>,
        Heiko Stuebner <heiko@...ech.de>,
        linux-arm-kernel@...ts.infradead.org,
        linux-rockchip@...ts.infradead.org,
        dri-devel@...ts.freedesktop.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH v3 3/4] drm/rockchip: Add support for Rockchip Soc RGB
 output interface

On Mon, Oct 09, 2017 at 04:06:53PM +0800, Sandy Huang wrote:
> Some Rockchip CRTCs, like rv1108, can directly output parallel and
> serial RGB data to panel or conversion chip, so we add this driver to
> probe encoder and connector.
> 
> Signed-off-by: Sandy Huang <hjc@...k-chips.com>
> ---
> Changes in v3:
>   update for rgb-mode move to panel node.
> Changes in v2:
>   1. add error log when probe failed;
>   2. update name_to_output_mode() according to sean's suggest;
>   3. Fix uninitialized use of ret.
> 
>  drivers/gpu/drm/rockchip/Kconfig            |   9 +
>  drivers/gpu/drm/rockchip/Makefile           |   1 +
>  drivers/gpu/drm/rockchip/rockchip_drm_drv.c |   2 +
>  drivers/gpu/drm/rockchip/rockchip_drm_drv.h |   1 +
>  drivers/gpu/drm/rockchip/rockchip_rgb.c     | 343 ++++++++++++++++++++++++++++
>  5 files changed, 356 insertions(+)
>  create mode 100644 drivers/gpu/drm/rockchip/rockchip_rgb.c
> 
> diff --git a/drivers/gpu/drm/rockchip/Kconfig b/drivers/gpu/drm/rockchip/Kconfig
> index 0c31f0a..85c7cc5 100644
> --- a/drivers/gpu/drm/rockchip/Kconfig
> +++ b/drivers/gpu/drm/rockchip/Kconfig
> @@ -8,6 +8,7 @@ config DRM_ROCKCHIP
>  	select DRM_ANALOGIX_DP if ROCKCHIP_ANALOGIX_DP
>  	select DRM_DW_HDMI if ROCKCHIP_DW_HDMI
>  	select DRM_MIPI_DSI if ROCKCHIP_DW_MIPI_DSI
> +	select DRM_RGB if ROCKCHIP_RGB
>  	select SND_SOC_HDMI_CODEC if ROCKCHIP_CDN_DP && SND_SOC
>  	help
>  	  Choose this option if you have a Rockchip soc chipset.
> @@ -65,4 +66,12 @@ config ROCKCHIP_LVDS
>  	  Rockchip rk3288 SoC has LVDS TX Controller can be used, and it
>  	  support LVDS, rgb, dual LVDS output mode. say Y to enable its
>  	  driver.
> +
> +config ROCKCHIP_RGB
> +	bool "Rockchip RGB support"
> +	help
> +	  Choose this option to enable support for Rockchip RGB output.
> +	  Some Rockchip CRTCs, like rv1108, can directly output parallel
> +	  and serial RGB format to panel or connect to a conversion chip.
> +	  say Y to enable its driver.
>  endif
> diff --git a/drivers/gpu/drm/rockchip/Makefile b/drivers/gpu/drm/rockchip/Makefile
> index a881d2c..f32a17f 100644
> --- a/drivers/gpu/drm/rockchip/Makefile
> +++ b/drivers/gpu/drm/rockchip/Makefile
> @@ -13,5 +13,6 @@ rockchipdrm-$(CONFIG_ROCKCHIP_DW_HDMI) += dw_hdmi-rockchip.o
>  rockchipdrm-$(CONFIG_ROCKCHIP_DW_MIPI_DSI) += dw-mipi-dsi.o
>  rockchipdrm-$(CONFIG_ROCKCHIP_INNO_HDMI) += inno_hdmi.o
>  rockchipdrm-$(CONFIG_ROCKCHIP_LVDS) += rockchip_lvds.o
> +rockchipdrm-$(CONFIG_ROCKCHIP_RGB) += rockchip_rgb.o
>  
>  obj-$(CONFIG_DRM_ROCKCHIP) += rockchipdrm.o
> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
> index 76d63de..265597c 100644
> --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
> @@ -459,6 +459,8 @@ static int __init rockchip_drm_init(void)
>  				CONFIG_ROCKCHIP_LVDS);
>  	ADD_ROCKCHIP_SUB_DRIVER(rockchip_dp_driver,
>  				CONFIG_ROCKCHIP_ANALOGIX_DP);
> +	ADD_ROCKCHIP_SUB_DRIVER(rockchip_rgb_driver,
> +				CONFIG_ROCKCHIP_RGB);
>  	ADD_ROCKCHIP_SUB_DRIVER(cdn_dp_driver, CONFIG_ROCKCHIP_CDN_DP);
>  	ADD_ROCKCHIP_SUB_DRIVER(dw_hdmi_rockchip_pltfm_driver,
>  				CONFIG_ROCKCHIP_DW_HDMI);
> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h
> index 498dfbc..6b0ec7e 100644
> --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h
> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h
> @@ -70,5 +70,6 @@ extern struct platform_driver dw_mipi_dsi_driver;
>  extern struct platform_driver inno_hdmi_driver;
>  extern struct platform_driver rockchip_dp_driver;
>  extern struct platform_driver rockchip_lvds_driver;
> +extern struct platform_driver rockchip_rgb_driver;
>  extern struct platform_driver vop_platform_driver;
>  #endif /* _ROCKCHIP_DRM_DRV_H_ */
> diff --git a/drivers/gpu/drm/rockchip/rockchip_rgb.c b/drivers/gpu/drm/rockchip/rockchip_rgb.c
> new file mode 100644
> index 0000000..6227ed7
> --- /dev/null
> +++ b/drivers/gpu/drm/rockchip/rockchip_rgb.c
> @@ -0,0 +1,343 @@
> +/*
> + * Copyright (C) Fuzhou Rockchip Electronics Co.Ltd
> + * Author:
> + *      Sandy Huang <hjc@...k-chips.com>
> + *
> + * This software is licensed under the terms of the GNU General Public
> + * License version 2, as published by the Free Software Foundation, and
> + * may be copied, distributed, and modified under those terms.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + * GNU General Public License for more details.
> + */
> +
> +#include <drm/drmP.h>
> +#include <drm/drm_atomic_helper.h>
> +#include <drm/drm_crtc_helper.h>
> +#include <drm/drm_dp_helper.h>
> +#include <drm/drm_panel.h>
> +#include <drm/drm_of.h>
> +
> +#include <linux/component.h>
> +#include <linux/of_graph.h>
> +
> +#include "rockchip_drm_drv.h"
> +#include "rockchip_drm_vop.h"
> +
> +#define connector_to_rgb(c) container_of(c, struct rockchip_rgb, connector)
> +#define encoder_to_rgb(c) container_of(c, struct rockchip_rgb, encoder)
> +
> +struct rockchip_rgb {
> +	struct device *dev;
> +	struct drm_device *drm_dev;
> +	struct drm_panel *panel;
> +	struct drm_bridge *bridge;
> +	struct drm_connector connector;
> +	struct drm_encoder encoder;
> +	struct dev_pin_info *pins;
> +	int output_mode;
> +};
> +
> +static inline int name_to_output_mode(const char *s)
> +{
> +	static const struct {
> +		const char *name;
> +		int format;
> +	} formats[] = {
> +		{ "p888", ROCKCHIP_OUT_MODE_P888 },
> +		{ "p666", ROCKCHIP_OUT_MODE_P666 },
> +		{ "p565", ROCKCHIP_OUT_MODE_P565 },
> +		{ "s888", ROCKCHIP_OUT_MODE_S888 },
> +		{ "s888_dummy", ROCKCHIP_OUT_MODE_S888_DUMMY }
> +	};
> +	int i;
> +
> +	for (i = 0; i < ARRAY_SIZE(formats); i++)
> +		if (!strncmp(s, formats[i].name, strlen(formats[i].name)))
> +			return formats[i].format;
> +
> +	return -EINVAL;
> +}
> +
> +static const struct drm_connector_funcs rockchip_rgb_connector_funcs = {
> +	.fill_modes = drm_helper_probe_single_connector_modes,
> +	.destroy = drm_connector_cleanup,
> +	.reset = drm_atomic_helper_connector_reset,
> +	.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
> +	.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
> +};
> +
> +static int rockchip_rgb_connector_get_modes(struct drm_connector *connector)
> +{
> +	struct rockchip_rgb *rgb = connector_to_rgb(connector);
> +	struct drm_panel *panel = rgb->panel;
> +
> +	return drm_panel_get_modes(panel);
> +}
> +
> +static const
> +struct drm_connector_helper_funcs rockchip_rgb_connector_helper_funcs = {
> +	.get_modes = rockchip_rgb_connector_get_modes,
> +};
> +
> +static void rockchip_rgb_encoder_enable(struct drm_encoder *encoder)
> +{
> +	struct rockchip_rgb *rgb = encoder_to_rgb(encoder);
> +
> +	drm_panel_prepare(rgb->panel);
> +	/* iomux to LCD data/sync mode */
> +	if (rgb->pins && !IS_ERR(rgb->pins->default_state))
> +		pinctrl_select_state(rgb->pins->p, rgb->pins->default_state);
> +
> +	drm_panel_enable(rgb->panel);
> +}
> +
> +static void rockchip_rgb_encoder_disable(struct drm_encoder *encoder)
> +{
> +	struct rockchip_rgb *rgb = encoder_to_rgb(encoder);
> +
> +	drm_panel_disable(rgb->panel);
> +	drm_panel_unprepare(rgb->panel);
> +}
> +
> +static int
> +rockchip_rgb_encoder_atomic_check(struct drm_encoder *encoder,
> +				   struct drm_crtc_state *crtc_state,
> +				   struct drm_connector_state *conn_state)
> +{
> +	struct rockchip_crtc_state *s = to_rockchip_crtc_state(crtc_state);
> +	struct rockchip_rgb *rgb = encoder_to_rgb(encoder);
> +
> +	s->output_mode = rgb->output_mode;
> +	s->output_type = DRM_MODE_CONNECTOR_LVDS;
> +
> +	return 0;
> +}
> +
> +static const
> +struct drm_encoder_helper_funcs rockchip_rgb_encoder_helper_funcs = {
> +	.enable = rockchip_rgb_encoder_enable,
> +	.disable = rockchip_rgb_encoder_disable,
> +	.atomic_check = rockchip_rgb_encoder_atomic_check,
> +};
> +
> +static const struct drm_encoder_funcs rockchip_rgb_encoder_funcs = {
> +	.destroy = drm_encoder_cleanup,
> +};
> +
> +static const struct of_device_id rockchip_rgb_dt_ids[] = {
> +	{
> +		.compatible = "rockchip,rv1108-rgb",
> +	},
> +	{}
> +};
> +
> +MODULE_DEVICE_TABLE(of, rockchip_rgb_dt_ids);
> +
> +static int rockchip_rgb_bind(struct device *dev, struct device *master,
> +			     void *data)
> +{
> +	struct rockchip_rgb *rgb = dev_get_drvdata(dev);
> +	struct drm_device *drm_dev = data;
> +	struct drm_encoder *encoder;
> +	struct drm_connector *connector;
> +	struct device_node *remote = NULL;
> +	struct device_node  *port, *endpoint;
> +	u32 endpoint_id;
> +	const char *name;
> +	int ret = 0, child_count = 0;
> +
> +	rgb->drm_dev = drm_dev;
> +	port = of_graph_get_port_by_id(dev->of_node, 1);
> +	if (!port) {
> +		DRM_DEV_ERROR(dev,
> +			      "can't found port point, please init rgb panel port!\n");
> +		return -EINVAL;
> +	}
> +	for_each_child_of_node(port, endpoint) {
> +		child_count++;
> +		if (of_property_read_u32(endpoint, "reg", &endpoint_id))
> +			endpoint_id = 0;
> +		ret = drm_of_find_panel_or_bridge(dev->of_node, 1, endpoint_id,
> +						  &rgb->panel, &rgb->bridge);
> +		if (!ret)
> +			break;
> +	}
> +	if (!child_count) {
> +		DRM_DEV_ERROR(dev, "rgb port does not have any children\n");
> +		ret = -EINVAL;
> +		goto err_put_port;
> +	} else if (ret) {
> +		DRM_DEV_ERROR(dev, "failed to find panel and bridge node\n");
> +		ret = -EPROBE_DEFER;
> +		goto err_put_port;
> +	}
> +	if (rgb->panel)
> +		remote = rgb->panel->dev->of_node;
> +	else
> +		remote = rgb->bridge->of_node;
> +	if (of_property_read_string(remote, "rgb-mode", &name))
> +		/* default set it as output mode P888 */
> +		rgb->output_mode = ROCKCHIP_OUT_MODE_P888;
> +	else
> +		rgb->output_mode = name_to_output_mode(name);
> +	if (rgb->output_mode < 0) {
> +		DRM_DEV_ERROR(dev, "invalid rockchip,rgb-mode [%s]\n", name);
> +		ret = rgb->output_mode;
> +		goto err_put_remote;
> +	}
> +
> +	encoder = &rgb->encoder;
> +	encoder->possible_crtcs = drm_of_find_possible_crtcs(drm_dev,
> +							     dev->of_node);
> +
> +	ret = drm_encoder_init(drm_dev, encoder, &rockchip_rgb_encoder_funcs,
> +			       DRM_MODE_ENCODER_NONE, NULL);
> +	if (ret < 0) {
> +		DRM_DEV_ERROR(drm_dev->dev,
> +			      "failed to initialize encoder: %d\n", ret);
> +		goto err_put_remote;
> +	}
> +
> +	drm_encoder_helper_add(encoder, &rockchip_rgb_encoder_helper_funcs);
> +
> +	if (rgb->panel) {
> +		connector = &rgb->connector;
> +		connector->dpms = DRM_MODE_DPMS_OFF;
> +		ret = drm_connector_init(drm_dev, connector,
> +					 &rockchip_rgb_connector_funcs,
> +					 DRM_MODE_CONNECTOR_Unknown);
> +		if (ret < 0) {
> +			DRM_DEV_ERROR(drm_dev->dev,
> +				      "failed to initialize connector: %d\n",
> +				      ret);
> +			goto err_free_encoder;
> +		}
> +
> +		drm_connector_helper_add(connector,
> +					 &rockchip_rgb_connector_helper_funcs);
> +
> +		ret = drm_mode_connector_attach_encoder(connector, encoder);
> +		if (ret < 0) {
> +			DRM_DEV_ERROR(drm_dev->dev,
> +				      "failed to attach encoder: %d\n", ret);
> +			goto err_free_connector;
> +		}
> +
> +		ret = drm_panel_attach(rgb->panel, connector);
> +		if (ret < 0) {
> +			DRM_DEV_ERROR(drm_dev->dev,
> +				      "failed to attach panel: %d\n", ret);
> +			goto err_free_connector;
> +		}
> +	} else {
> +		rgb->bridge->encoder = encoder;
> +		ret = drm_bridge_attach(encoder, rgb->bridge, NULL);
> +		if (ret) {
> +			DRM_DEV_ERROR(drm_dev->dev,
> +				      "failed to attach bridge: %d\n", ret);
> +			goto err_free_encoder;
> +		}
> +		encoder->bridge = rgb->bridge;
> +	}
> +
> +	of_node_put(remote);
> +	of_node_put(port);
> +
> +	return 0;
> +
> +err_free_connector:
> +	drm_connector_cleanup(connector);
> +err_free_encoder:
> +	drm_encoder_cleanup(encoder);
> +err_put_remote:
> +	of_node_put(remote);
> +err_put_port:
> +	of_node_put(port);
> +
> +	return ret;
> +}
> +
> +static void rockchip_rgb_unbind(struct device *dev, struct device *master,
> +				void *data)
> +{
> +	struct rockchip_rgb *rgb = dev_get_drvdata(dev);
> +
> +	rockchip_rgb_encoder_disable(&rgb->encoder);
> +	if (rgb->panel)
> +		drm_panel_detach(rgb->panel);
> +	drm_connector_cleanup(&rgb->connector);

Connector cleanup should also be gated on rgb->panel

Once that's fixed:
Reviewed-by: Sean Paul <seanpaul@...omium.org>

Sean

> +	drm_encoder_cleanup(&rgb->encoder);
> +}
> +
> +static const struct component_ops rockchip_rgb_component_ops = {
> +	.bind = rockchip_rgb_bind,
> +	.unbind = rockchip_rgb_unbind,
> +};
> +
> +static int rockchip_rgb_probe(struct platform_device *pdev)
> +{
> +	struct device *dev = &pdev->dev;
> +	struct rockchip_rgb *rgb;
> +	const struct of_device_id *match;
> +	int ret;
> +
> +	if (!dev->of_node) {
> +		DRM_DEV_ERROR(dev, "dev->of_node is null\n");
> +		return -ENODEV;
> +	}
> +
> +	rgb = devm_kzalloc(&pdev->dev, sizeof(*rgb), GFP_KERNEL);
> +	if (!rgb)
> +		return -ENOMEM;
> +
> +	rgb->dev = dev;
> +	match = of_match_node(rockchip_rgb_dt_ids, dev->of_node);
> +	if (!match) {
> +		DRM_DEV_ERROR(dev, "match node failed\n");
> +		return -ENODEV;
> +	}
> +
> +	rgb->pins = devm_kzalloc(rgb->dev, sizeof(*rgb->pins), GFP_KERNEL);
> +	if (!rgb->pins)
> +		return -ENOMEM;
> +	rgb->pins->p = devm_pinctrl_get(rgb->dev);
> +	if (IS_ERR(rgb->pins->p)) {
> +		DRM_DEV_ERROR(dev, "no pinctrl handle\n");
> +		devm_kfree(rgb->dev, rgb->pins);
> +		rgb->pins = NULL;
> +	} else {
> +		rgb->pins->default_state =
> +			pinctrl_lookup_state(rgb->pins->p, "lcdc");
> +		if (IS_ERR(rgb->pins->default_state)) {
> +			DRM_DEV_ERROR(dev, "no default pinctrl state\n");
> +			devm_kfree(rgb->dev, rgb->pins);
> +			rgb->pins = NULL;
> +		}
> +	}
> +
> +	dev_set_drvdata(dev, rgb);
> +	ret = component_add(&pdev->dev, &rockchip_rgb_component_ops);
> +	if (ret < 0)
> +		DRM_DEV_ERROR(dev, "failed to add component\n");
> +
> +	return ret;
> +}
> +
> +static int rockchip_rgb_remove(struct platform_device *pdev)
> +{
> +	component_del(&pdev->dev, &rockchip_rgb_component_ops);
> +
> +	return 0;
> +}
> +
> +struct platform_driver rockchip_rgb_driver = {
> +	.probe = rockchip_rgb_probe,
> +	.remove = rockchip_rgb_remove,
> +	.driver = {
> +		   .name = "rockchip-rgb",
> +		   .of_match_table = of_match_ptr(rockchip_rgb_dt_ids),
> +	},
> +};
> -- 
> 2.7.4
> 
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel@...ts.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

-- 
Sean Paul, Software Engineer, Google / Chromium OS

Powered by blists - more mailing lists