Commit 7c4dd0a2 authored by Marek Vasut's avatar Marek Vasut Committed by Sam Ravnborg
Browse files

drm: of: Add drm_of_lvds_get_data_mapping 



Add helper function to convert DT "data-mapping" property string value
into media bus format value, and deduplicate the code in panel-lvds.c
and lvds-codec.c .

Signed-off-by: default avatarMarek Vasut <marex@denx.de>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Sam Ravnborg <sam@ravnborg.org>
To: dri-devel@lists.freedesktop.org
Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20211012224252.29185-1-marex@denx.de
parent 189723fb

drivers/gpu/drm/bridge/lvds-codec.c

+7 −14
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 


#include <drm/drm_atomic_helper.h>

#include <drm/drm_bridge.h>

#include <drm/drm_of.h>

#include <drm/drm_panel.h>



struct lvds_codec {
@@ -118,7 +119,6 @@ static int lvds_codec_probe(struct platform_device *pdev) 
	struct device_node *bus_node;

	struct drm_panel *panel;

	struct lvds_codec *lvds_codec;

	const char *mapping;

	int ret;



	lvds_codec = devm_kzalloc(dev, sizeof(*lvds_codec), GFP_KERNEL);
@@ -174,22 +174,15 @@ static int lvds_codec_probe(struct platform_device *pdev) 
			return -ENXIO;

		}



		ret = of_property_read_string(bus_node, "data-mapping",

					      &mapping);

		ret = drm_of_lvds_get_data_mapping(bus_node);

		of_node_put(bus_node);

		if (ret < 0) {

		if (ret == -ENODEV) {

			dev_warn(dev, "missing 'data-mapping' DT property\n");

		} else {

			if (!strcmp(mapping, "jeida-18")) {

				lvds_codec->bus_format = MEDIA_BUS_FMT_RGB666_1X7X3_SPWG;

			} else if (!strcmp(mapping, "jeida-24")) {

				lvds_codec->bus_format = MEDIA_BUS_FMT_RGB888_1X7X4_JEIDA;

			} else if (!strcmp(mapping, "vesa-24")) {

				lvds_codec->bus_format = MEDIA_BUS_FMT_RGB888_1X7X4_SPWG;

			} else {

		} else if (ret) {

			dev_err(dev, "invalid 'data-mapping' DT property\n");

				return -EINVAL;

			}

			return ret;

		} else {

			lvds_codec->bus_format = ret;

			lvds_codec->bridge.funcs = &funcs_decoder;

		}

	}

drivers/gpu/drm/drm_of.c

+33 −0
Original line number Diff line number Diff line
@@ -402,3 +402,36 @@ int drm_of_lvds_get_dual_link_pixel_order(const struct device_node *port1, 
		DRM_LVDS_DUAL_LINK_ODD_EVEN_PIXELS;

}

EXPORT_SYMBOL_GPL(drm_of_lvds_get_dual_link_pixel_order);



/**

 * drm_of_lvds_get_data_mapping - Get LVDS data mapping

 * @port: DT port node of the LVDS source or sink

 *

 * Convert DT "data-mapping" property string value into media bus format value.

 *

 * Return:

 * * MEDIA_BUS_FMT_RGB666_1X7X3_SPWG - data-mapping is "jeida-18"

 * * MEDIA_BUS_FMT_RGB888_1X7X4_JEIDA - data-mapping is "jeida-24"

 * * MEDIA_BUS_FMT_RGB888_1X7X4_SPWG - data-mapping is "vesa-24"

 * * -EINVAL - the "data-mapping" property is unsupported

 * * -ENODEV - the "data-mapping" property is missing

 */

int drm_of_lvds_get_data_mapping(const struct device_node *port)

{

	const char *mapping;

	int ret;



	ret = of_property_read_string(port, "data-mapping", &mapping);

	if (ret < 0)

		return -ENODEV;



	if (!strcmp(mapping, "jeida-18"))

		return MEDIA_BUS_FMT_RGB666_1X7X3_SPWG;

	if (!strcmp(mapping, "jeida-24"))

		return MEDIA_BUS_FMT_RGB888_1X7X4_JEIDA;

	if (!strcmp(mapping, "vesa-24"))

		return MEDIA_BUS_FMT_RGB888_1X7X4_SPWG;



	return -EINVAL;

}

EXPORT_SYMBOL_GPL(drm_of_lvds_get_data_mapping);

drivers/gpu/drm/panel/panel-lvds.c

+4 −14
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <video/videomode.h>



#include <drm/drm_crtc.h>

#include <drm/drm_of.h>

#include <drm/drm_panel.h>



struct panel_lvds {
@@ -116,7 +117,6 @@ static int panel_lvds_parse_dt(struct panel_lvds *lvds) 
{

	struct device_node *np = lvds->dev->of_node;

	struct display_timing timing;

	const char *mapping;

	int ret;



	ret = of_drm_get_panel_orientation(np, &lvds->orientation);
@@ -149,24 +149,14 @@ static int panel_lvds_parse_dt(struct panel_lvds *lvds) 


	of_property_read_string(np, "label", &lvds->label);



	ret = of_property_read_string(np, "data-mapping", &mapping);

	ret = drm_of_lvds_get_data_mapping(np);

	if (ret < 0) {

		dev_err(lvds->dev, "%pOF: invalid or missing %s DT property\n",

			np, "data-mapping");

		return -ENODEV;

		return ret;

	}



	if (!strcmp(mapping, "jeida-18")) {

		lvds->bus_format = MEDIA_BUS_FMT_RGB666_1X7X3_SPWG;

	} else if (!strcmp(mapping, "jeida-24")) {

		lvds->bus_format = MEDIA_BUS_FMT_RGB888_1X7X4_JEIDA;

	} else if (!strcmp(mapping, "vesa-24")) {

		lvds->bus_format = MEDIA_BUS_FMT_RGB888_1X7X4_SPWG;

	} else {

		dev_err(lvds->dev, "%pOF: invalid or missing %s DT property\n",

			np, "data-mapping");

		return -EINVAL;

	}

	lvds->bus_format = ret;



	lvds->data_mirror = of_property_read_bool(np, "data-mirror");

include/drm/drm_of.h

+7 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ int drm_of_find_panel_or_bridge(const struct device_node *np, 
				struct drm_bridge **bridge);

int drm_of_lvds_get_dual_link_pixel_order(const struct device_node *port1,

					  const struct device_node *port2);

int drm_of_lvds_get_data_mapping(const struct device_node *port);

#else

static inline uint32_t drm_of_crtc_port_mask(struct drm_device *dev,

					  struct device_node *port)
@@ -98,6 +99,12 @@ drm_of_lvds_get_dual_link_pixel_order(const struct device_node *port1, 
{

	return -EINVAL;

}



static inline int

drm_of_lvds_get_data_mapping(const struct device_node *port)

{

	return -EINVAL;

}

#endif



/*