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

Commit 0f10cf14 authored by Leela Krishna Amudala's avatar Leela Krishna Amudala Committed by Inki Dae
Browse files

drm/exynos: fimd: calculate the correct address offset 



Calculate the correct address offset values for alpha and color key
control registers based on exynos4 and exynos5 user manuals.
Also remove VIDOSD_C_SIZE_W0 macro and fix comments about registers for
size and alpha.

Signed-off-by: default avatarLeela Krishna Amudala <l.krishna@samsung.com>
Acked-by: default avatarJoonyoung Shim <jy0922.shim@samsung.com>
Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
parent 9800935a

drivers/gpu/drm/exynos/exynos_drm_fimd.c

+9 −8
Original line number Diff line number Diff line
@@ -38,11 +38,12 @@ 
/* 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 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. */

/*

 * 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. */

#define VIDOSD_D(win)		(VIDOSD_BASE + 0x0C + (win) * 16)



#define VIDWx_BUF_START(win, buf)	(VIDW_BUF_START(buf) + (win) * 8)
@@ -50,9 +51,9 @@ 
#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 * 8))

#define WKEYCON0_BASE(x)		((WKEYCON0 + 0x140) + ((x - 1) * 8))

/* color key value register for hardware window 1 ~ 4. */

#define WKEYCON1_BASE(x)		((WKEYCON1 + 0x140) + (x * 8))

#define WKEYCON1_BASE(x)		((WKEYCON1 + 0x140) + ((x - 1) * 8))



/* FIMD has totally five hardware windows. */

#define WINDOWS_NR	5
@@ -581,7 +582,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_SIZE_W0;

			offset = VIDOSD_C(win);

		val = win_data->ovl_width * win_data->ovl_height;

		writel(val, ctx->regs + offset);