From 2872c8072aae65fa55cafea50e73d69d423df168 Mon Sep 17 00:00:00 2001
From: Philipp Zabel
Date: Mon, 2 Feb 2015 17:25:59 +0100
Subject: drm/imx: consolidate bus format variable names
This patch consolidates the different interface_pix_fmt, pixel_fmt, pix_fmt,
and pixfmt variables to a common name "bus_format" wherever they describe the
pixel format on the bus between display controller and encoder hardware.
At the same time, it renames imx_drm_panel_format to imx_drm_set_bus_format.
Signed-off-by: Philipp Zabel
Tested-by: Emil Renner Berthing
---
include/video/imx-ipu-v3.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'include/video')
diff --git a/include/video/imx-ipu-v3.h b/include/video/imx-ipu-v3.h
index 73390c120cad..85dedca3dcfb 100644
--- a/include/video/imx-ipu-v3.h
+++ b/include/video/imx-ipu-v3.h
@@ -39,7 +39,7 @@ struct ipu_di_signal_cfg {
struct videomode mode;
- u32 pixel_fmt;
+ u32 bus_format;
u32 v_to_h_sync;
#define IPU_DI_CLKMODE_SYNC (1 << 0)
--
cgit v1.2.1
From 453b44a3f6f3f43f50387a9af27c5356c273e831 Mon Sep 17 00:00:00 2001
From: Gustavo Padovan
Date: Wed, 1 Apr 2015 13:02:05 -0300
Subject: drm/exynos: fimd: fix alpha setting for XR24 pixel format
XR24 planes were not shown properly, so now set the right registers
to correctly enable displaying these planes.
It also moves the alpha register settings to fimd_win_set_pixfmt()
to keep all pixel format stuff together.
v2: remove leftover var alpha
Signed-off-by: Gustavo Padovan
Signed-off-by: Inki Dae
---
include/video/samsung_fimd.h | 5 +++++
1 file changed, 5 insertions(+)
(limited to 'include/video')
diff --git a/include/video/samsung_fimd.h b/include/video/samsung_fimd.h
index a20e4a3a8b15..513242827b07 100644
--- a/include/video/samsung_fimd.h
+++ b/include/video/samsung_fimd.h
@@ -289,6 +289,11 @@
#define VIDISD14C_ALPHA1_B_LIMIT 0xf
#define VIDISD14C_ALPHA1_B(_x) ((_x) << 0)
+#define VIDW_ALPHA 0x021c
+#define VIDW_ALPHA_R(_x) ((_x) << 16)
+#define VIDW_ALPHA_G(_x) ((_x) << 8)
+#define VIDW_ALPHA_B(_x) ((_x) << 0)
+
/* Video buffer addresses */
#define VIDW_BUF_START(_buff) (0xA0 + ((_buff) * 8))
#define VIDW_BUF_START1(_buff) (0xA4 + ((_buff) * 8))
--
cgit v1.2.1
From 1c363c7cccf64128087002b0779986ad16aff6dc Mon Sep 17 00:00:00 2001
From: Krzysztof Kozlowski
Date: Tue, 7 Apr 2015 22:28:50 +0900
Subject: drm/exynos: Enable DP clock to fix display on Exynos5250 and other
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
After adding display power domain for Exynos5250 in commit
2d2c9a8d0a4f ("ARM: dts: add display power domain for exynos5250") the
display on Chromebook Snow and others stopped working after boot.
The reason for this suggested Andrzej Hajda: the DP clock was disabled.
This clock is required by Display Port and is enabled by bootloader.
However when FIMD driver probing was deferred, the display power domain
was turned off. This effectively reset the value of DP clock enable
register.
When exynos-dp is later probed, the clock is not enabled and display is
not properly configured:
exynos-dp 145b0000.dp-controller: Timeout of video streamclk ok
exynos-dp 145b0000.dp-controller: unable to config video
Fixes: 2d2c9a8d0a4f ("ARM: dts: add display power domain for exynos5250")
Cc:
Signed-off-by: Krzysztof Kozlowski
Reported-by: Javier Martinez Canillas
Tested-by: Javier Martinez Canillas
Tested-by: Andreas Färber
Signed-off-by: Inki Dae
---
include/video/samsung_fimd.h | 6 ++++++
1 file changed, 6 insertions(+)
(limited to 'include/video')
diff --git a/include/video/samsung_fimd.h b/include/video/samsung_fimd.h
index 513242827b07..0530e5a4c6b1 100644
--- a/include/video/samsung_fimd.h
+++ b/include/video/samsung_fimd.h
@@ -441,6 +441,12 @@
#define BLENDCON_NEW_8BIT_ALPHA_VALUE (1 << 0)
#define BLENDCON_NEW_4BIT_ALPHA_VALUE (0 << 0)
+/* Display port clock control */
+#define DP_MIE_CLKCON 0x27c
+#define DP_MIE_CLK_DISABLE 0x0
+#define DP_MIE_CLK_DP_ENABLE 0x2
+#define DP_MIE_CLK_MIE_ENABLE 0x3
+
/* Notes on per-window bpp settings
*
* Value Win0 Win1 Win2 Win3 Win 4
--
cgit v1.2.1