Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e87599b authored by Rob Clark's avatar Rob Clark
Browse files

drm/msm/mdp4: add LVDS panel support 



LVDS panel support uses the LCDC (parallel) encoder.  Unlike with HDMI,
there is not a separate LVDS block, so no need to split things into a
bridge+connector.  Nor is there is anything re-used with mdp5.

Note that there can be some regulators shared between HDMI and LVDS (in
particular, on apq8064, ext_3v3p), so we should not use the _exclusive()
variants of devm_regulator_get().

The drm_panel framework is used for panel-specific driver.

Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
parent d65bd0e4

drivers/gpu/drm/msm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ config DRM_MSM 
	depends on DRM

	depends on ARCH_QCOM || (ARM && COMPILE_TEST)

	select DRM_KMS_HELPER

	select DRM_PANEL

	select SHMEM

	select TMPFS

	default y

drivers/gpu/drm/msm/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ msm-y := \ 
	mdp/mdp_kms.o \

	mdp/mdp4/mdp4_crtc.o \

	mdp/mdp4/mdp4_dtv_encoder.o \

	mdp/mdp4/mdp4_lcdc_encoder.o \

	mdp/mdp4/mdp4_lvds_connector.o \

	mdp/mdp4/mdp4_irq.o \

	mdp/mdp4/mdp4_kms.o \

	mdp/mdp4/mdp4_plane.o \
@@ -39,5 +41,6 @@ msm-y := \ 
	msm_ringbuffer.o



msm-$(CONFIG_DRM_MSM_FBDEV) += msm_fbdev.o

msm-$(CONFIG_COMMON_CLK) += mdp/mdp4/mdp4_lvds_pll.o



obj-$(CONFIG_DRM_MSM)	+= msm.o

drivers/gpu/drm/msm/hdmi/hdmi.c

+2 −2
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ struct hdmi *hdmi_init(struct drm_device *dev, struct drm_encoder *encoder) 
	for (i = 0; i < config->hpd_reg_cnt; i++) {

		struct regulator *reg;



		reg = devm_regulator_get_exclusive(&pdev->dev,

		reg = devm_regulator_get(&pdev->dev,

				config->hpd_reg_names[i]);

		if (IS_ERR(reg)) {

			ret = PTR_ERR(reg);
@@ -139,7 +139,7 @@ struct hdmi *hdmi_init(struct drm_device *dev, struct drm_encoder *encoder) 
	for (i = 0; i < config->pwr_reg_cnt; i++) {

		struct regulator *reg;



		reg = devm_regulator_get_exclusive(&pdev->dev,

		reg = devm_regulator_get(&pdev->dev,

				config->pwr_reg_names[i]);

		if (IS_ERR(reg)) {

			ret = PTR_ERR(reg);

drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c

+80 −8
Original line number Diff line number Diff line
@@ -197,6 +197,28 @@ int mdp4_enable(struct mdp4_kms *mdp4_kms) 
	return 0;

}



#ifdef CONFIG_OF

static struct drm_panel *detect_panel(struct drm_device *dev, const char *name)

{

	struct device_node *n;

	struct drm_panel *panel = NULL;



	n = of_parse_phandle(dev->dev->of_node, name, 0);

	if (n) {

		panel = of_drm_find_panel(n);

		if (!panel)

			panel = ERR_PTR(-EPROBE_DEFER);

	}



	return panel;

}

#else

static struct drm_panel *detect_panel(struct drm_device *dev, const char *name)

{

	// ??? maybe use a module param to specify which panel is attached?

}

#endif



static int modeset_init(struct mdp4_kms *mdp4_kms)

{

	struct drm_device *dev = mdp4_kms->dev;
@@ -204,14 +226,11 @@ static int modeset_init(struct mdp4_kms *mdp4_kms) 
	struct drm_plane *plane;

	struct drm_crtc *crtc;

	struct drm_encoder *encoder;

	struct drm_connector *connector;

	struct drm_panel *panel;

	struct hdmi *hdmi;

	int ret;



	/*

	 *  NOTE: this is a bit simplistic until we add support

	 * for more than just RGB1->DMA_E->DTV->HDMI

	 */



	/* construct non-private planes: */

	plane = mdp4_plane_init(dev, VG1, false);

	if (IS_ERR(plane)) {
@@ -229,7 +248,57 @@ static int modeset_init(struct mdp4_kms *mdp4_kms) 
	}

	priv->planes[priv->num_planes++] = plane;



	/* the CRTCs get constructed with a private plane: */

	/*

	 * Setup the LCDC/LVDS path: RGB2 -> DMA_P -> LCDC -> LVDS:

	 */



	panel = detect_panel(dev, "qcom,lvds-panel");

	if (IS_ERR(panel)) {

		ret = PTR_ERR(panel);

		dev_err(dev->dev, "failed to detect LVDS panel: %d\n", ret);

		goto fail;

	}



	plane = mdp4_plane_init(dev, RGB2, true);

	if (IS_ERR(plane)) {

		dev_err(dev->dev, "failed to construct plane for RGB2\n");

		ret = PTR_ERR(plane);

		goto fail;

	}



	crtc  = mdp4_crtc_init(dev, plane, priv->num_crtcs, 0, DMA_P);

	if (IS_ERR(crtc)) {

		dev_err(dev->dev, "failed to construct crtc for DMA_P\n");

		ret = PTR_ERR(crtc);

		goto fail;

	}



	encoder = mdp4_lcdc_encoder_init(dev, panel);

	if (IS_ERR(encoder)) {

		dev_err(dev->dev, "failed to construct LCDC encoder\n");

		ret = PTR_ERR(encoder);

		goto fail;

	}



	/* LCDC can be hooked to DMA_P: */

	encoder->possible_crtcs = 1 << priv->num_crtcs;



	priv->crtcs[priv->num_crtcs++] = crtc;

	priv->encoders[priv->num_encoders++] = encoder;



	connector = mdp4_lvds_connector_init(dev, panel, encoder);

	if (IS_ERR(connector)) {

		ret = PTR_ERR(connector);

		dev_err(dev->dev, "failed to initialize LVDS connector: %d\n", ret);

		goto fail;

	}



	priv->connectors[priv->num_connectors++] = connector;



	/*

	 * Setup DTV/HDMI path: RGB1 -> DMA_E -> DTV -> HDMI:

	 */



	plane = mdp4_plane_init(dev, RGB1, true);

	if (IS_ERR(plane)) {

		dev_err(dev->dev, "failed to construct plane for RGB1\n");
@@ -243,7 +312,6 @@ static int modeset_init(struct mdp4_kms *mdp4_kms) 
		ret = PTR_ERR(crtc);

		goto fail;

	}

	priv->crtcs[priv->num_crtcs++] = crtc;



	encoder = mdp4_dtv_encoder_init(dev);

	if (IS_ERR(encoder)) {
@@ -251,7 +319,11 @@ static int modeset_init(struct mdp4_kms *mdp4_kms) 
		ret = PTR_ERR(encoder);

		goto fail;

	}

	encoder->possible_crtcs = 0x1;     /* DTV can be hooked to DMA_E */



	/* DTV can be hooked to DMA_E: */

	encoder->possible_crtcs = 1 << priv->num_crtcs;



	priv->crtcs[priv->num_crtcs++] = crtc;

	priv->encoders[priv->num_encoders++] = encoder;



	hdmi = hdmi_init(dev, encoder);

drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h

+18 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ 
#include "mdp/mdp_kms.h"

#include "mdp4.xml.h"



#include "drm_panel.h"



struct mdp4_kms {

	struct mdp_kms base;
@@ -217,6 +219,22 @@ struct drm_crtc *mdp4_crtc_init(struct drm_device *dev, 
long mdp4_dtv_round_pixclk(struct drm_encoder *encoder, unsigned long rate);

struct drm_encoder *mdp4_dtv_encoder_init(struct drm_device *dev);



long mdp4_lcdc_round_pixclk(struct drm_encoder *encoder, unsigned long rate);

struct drm_encoder *mdp4_lcdc_encoder_init(struct drm_device *dev,

		struct drm_panel *panel);



struct drm_connector *mdp4_lvds_connector_init(struct drm_device *dev,

		struct drm_panel *panel, struct drm_encoder *encoder);



#ifdef CONFIG_COMMON_CLK

struct clk *mpd4_lvds_pll_init(struct drm_device *dev);

#else

static inline struct clk *mpd4_lvds_pll_init(struct drm_device *dev)

{

	return ERR_PTR(-ENODEV);

}

#endif



#ifdef CONFIG_MSM_BUS_SCALING

static inline int match_dev_name(struct device *dev, void *data)

{