[PATCH 1/3] staging: drm/imx: parallel-display: Add 24-bit BGR support

[PATCH 1/3] staging: drm/imx: parallel-display: Add 24-bit BGR support

[Markus Pargmann]

From: Philipp Zabel <p.zabel@pengutronix.de>

Add support for the BGR24 format to the IPUv3 parallel display.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
---
 Documentation/devicetree/bindings/staging/imx-drm/fsl-imx-drm.txt | 4 ++--
 drivers/staging/imx-drm/parallel-display.c                        | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Documentation/devicetree/bindings/staging/imx-drm/fsl-imx-drm.txt b/Documentation/devicetree/bindings/staging/imx-drm/fsl-imx-drm.txt
index e75f0e549fff..f3497037679e 100644
--- a/Documentation/devicetree/bindings/staging/imx-drm/fsl-imx-drm.txt
+++ b/Documentation/devicetree/bindings/staging/imx-drm/fsl-imx-drm.txt
@@ -60,8 +60,8 @@ Required properties:
 - compatible: Should be "fsl,imx-parallel-display"
 Optional properties:
 - interface_pix_fmt: How this display is connected to the
-  display interface. Currently supported types: "rgb24", "rgb565", "bgr666"
-  and "lvds666".
+  display interface. Currently supported types: "rgb24", "bgr24", "rgb565",
+  "bgr666", and "lvds666".
 - edid: verbatim EDID data block describing attached display.
 - ddc: phandle describing the i2c bus handling the display data
   channel
diff --git a/drivers/staging/imx-drm/parallel-display.c b/drivers/staging/imx-drm/parallel-display.c
index 4ca61afdf622..df0c3e759616 100644
--- a/drivers/staging/imx-drm/parallel-display.c
+++ b/drivers/staging/imx-drm/parallel-display.c
@@ -227,6 +227,8 @@ static int imx_pd_bind(struct device *dev, struct device *master, void *data)
 			imxpd->interface_pix_fmt = V4L2_PIX_FMT_BGR666;
 		else if (!strcmp(fmt, "lvds666"))
 			imxpd->interface_pix_fmt = v4l2_fourcc('L', 'V', 'D', '6');
+		else if (!strcmp(fmt, "bgr24"))
+			imxpd->interface_pix_fmt = V4L2_PIX_FMT_BGR24;
 	}
 
 	panel_node = of_parse_phandle(np, "fsl,panel", 0);
-- 
2.1.0

[PATCH 2/3] imx-drm: parallel-display: Fix drm_panel support

[Markus Pargmann]

From: Philipp Zabel <philipp.zabel@gmail.com>

Call drm_panel_enable/disable in reaction to encoder_commit
and encoder_disable callbacks.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
---
 drivers/staging/imx-drm/parallel-display.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/drivers/staging/imx-drm/parallel-display.c b/drivers/staging/imx-drm/parallel-display.c
index df0c3e759616..2a8e84122e48 100644
--- a/drivers/staging/imx-drm/parallel-display.c
+++ b/drivers/staging/imx-drm/parallel-display.c
@@ -126,6 +126,10 @@ static void imx_pd_encoder_prepare(struct drm_encoder *encoder)
 
 static void imx_pd_encoder_commit(struct drm_encoder *encoder)
 {
+	struct imx_parallel_display *imxpd = enc_to_imxpd(encoder);
+
+	drm_panel_prepare(imxpd->panel);
+	drm_panel_enable(imxpd->panel);
 }
 
 static void imx_pd_encoder_mode_set(struct drm_encoder *encoder,
@@ -136,6 +140,10 @@ static void imx_pd_encoder_mode_set(struct drm_encoder *encoder,
 
 static void imx_pd_encoder_disable(struct drm_encoder *encoder)
 {
+	struct imx_parallel_display *imxpd = enc_to_imxpd(encoder);
+
+	drm_panel_disable(imxpd->panel);
+	drm_panel_unprepare(imxpd->panel);
 }
 
 static struct drm_connector_funcs imx_pd_connector_funcs = {
-- 
2.1.0

[PATCH 3/3] imx-drm: parallel-display: Fix dpms mode handling

[Markus Pargmann]

We have to call drm_panel_prepare() and drm_panel_unprepare() when
switching on or off. This patch also replaces the if statement with an
switch statement to only catch ON and OFF modes.

Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
---
 drivers/staging/imx-drm/parallel-display.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/imx-drm/parallel-display.c b/drivers/staging/imx-drm/parallel-display.c
index 2a8e84122e48..cbee12c4f5ec 100644
--- a/drivers/staging/imx-drm/parallel-display.c
+++ b/drivers/staging/imx-drm/parallel-display.c
@@ -104,10 +104,18 @@ static void imx_pd_encoder_dpms(struct drm_encoder *encoder, int mode)
 {
 	struct imx_parallel_display *imxpd = enc_to_imxpd(encoder);
 
-	if (mode != DRM_MODE_DPMS_ON)
-		drm_panel_disable(imxpd->panel);
-	else
+	switch (mode) {
+	case DRM_MODE_DPMS_ON:
+		drm_panel_prepare(imxpd->panel);
 		drm_panel_enable(imxpd->panel);
+		break;
+	case DRM_MODE_DPMS_OFF:
+		drm_panel_disable(imxpd->panel);
+		drm_panel_unprepare(imxpd->panel);
+		break;
+	default:
+		break;
+	}
 }
 
 static bool imx_pd_encoder_mode_fixup(struct drm_encoder *encoder,
-- 
2.1.0

[PATCH 1/3] staging: drm/imx: parallel-display: Add 24-bit BGR support

[Greg Kroah-Hartman]

On Mon, Oct 06, 2014 at 09:50:38PM +0200, Markus Pargmann wrote:
> From: Philipp Zabel <p.zabel@pengutronix.de>
> 
> Add support for the BGR24 format to the IPUv3 parallel display.
> 
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
> ---
>  Documentation/devicetree/bindings/staging/imx-drm/fsl-imx-drm.txt | 4 ++--
>  drivers/staging/imx-drm/parallel-display.c                        | 2 ++
>  2 files changed, 4 insertions(+), 2 deletions(-)

This doesn't apply against 3.18-rc1 :(