---

yaml
---
r: 361749
b: refs/heads/master
c: bba2181
h: refs/heads/master
i:
  361747: 8f6d695
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ac165b006bd877e240174edecd855d4eb005ffae
+refs/heads/master: bba2181c49f1dddf8b592804a1b53cc1a3cf408a

trunk/drivers/gpu/drm/exynos/exynos_drm_fimd.c

@@ -38,22 +38,21 @@
 /* position control register for hardware window 0, 2 ~ 4.*/
 #define VIDOSD_A(win)		(VIDOSD_BASE + 0x00 + (win) * 16)
 #define VIDOSD_B(win)		(VIDOSD_BASE + 0x04 + (win) * 16)
-/*
- * size control register for hardware windows 0 and alpha control register
- * for hardware windows 1 ~ 4
- */
-#define VIDOSD_C(win)		(VIDOSD_BASE + 0x08 + (win) * 16)
-/* size control register for hardware windows 1 ~ 2. */
+/* size control register for hardware window 0. */
+#define VIDOSD_C_SIZE_W0	(VIDOSD_BASE + 0x08)
+/* alpha control register for hardware window 1 ~ 4. */
+#define VIDOSD_C(win)		(VIDOSD_BASE + 0x18 + (win) * 16)
+/* size control register for hardware window 1 ~ 4. */
 #define VIDOSD_D(win)		(VIDOSD_BASE + 0x0C + (win) * 16)
 
 #define VIDWx_BUF_START(win, buf)	(VIDW_BUF_START(buf) + (win) * 8)
 #define VIDWx_BUF_END(win, buf)		(VIDW_BUF_END(buf) + (win) * 8)
 #define VIDWx_BUF_SIZE(win, buf)	(VIDW_BUF_SIZE(buf) + (win) * 4)
 
 /* color key control register for hardware window 1 ~ 4. */
-#define WKEYCON0_BASE(x)		((WKEYCON0 + 0x140) + ((x - 1) * 8))
+#define WKEYCON0_BASE(x)		((WKEYCON0 + 0x140) + (x * 8))
 /* color key value register for hardware window 1 ~ 4. */
-#define WKEYCON1_BASE(x)		((WKEYCON1 + 0x140) + ((x - 1) * 8))
+#define WKEYCON1_BASE(x)		((WKEYCON1 + 0x140) + (x * 8))
 
 /* FIMD has totally five hardware windows. */
 #define WINDOWS_NR	5
@@ -110,9 +109,9 @@ struct fimd_context {
 
 #ifdef CONFIG_OF
 static const struct of_device_id fimd_driver_dt_match[] = {
-	{ .compatible = "samsung,exynos4210-fimd",
+	{ .compatible = "samsung,exynos4-fimd",
 	  .data = &exynos4_fimd_driver_data },
-	{ .compatible = "samsung,exynos5250-fimd",
+	{ .compatible = "samsung,exynos5-fimd",
 	  .data = &exynos5_fimd_driver_data },
 	{},
 };
@@ -582,7 +581,7 @@ static void fimd_win_commit(struct device *dev, int zpos)
 	if (win != 3 && win != 4) {
 		u32 offset = VIDOSD_D(win);
 		if (win == 0)
-			offset = VIDOSD_C(win);
+			offset = VIDOSD_C_SIZE_W0;
 		val = win_data->ovl_width * win_data->ovl_height;
 		writel(val, ctx->regs + offset);