Re: [Linux-fbdev-devel] [PATCH 1/7] [ARM] s3c-fb: Added colorkey support
flat view
From: Krzysztof Helt <hidden>
Date: 2009-10-03 05:25:08
Also in:
linux-arm-kernel
On Fri, 11 Sep 2009 20:04:48 +0200 Pawel Osciak [off-list ref] wrote:
quoted hunk ↗ jump to hunk
Reviewed-by: Marek Szyprowski <m.szyprowski@samsung.com> Reviewed-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Pawel Osciak <redacted> --- arch/arm/plat-s3c/include/plat/regs-fb.h | 3 + arch/arm/plat-s3c/include/plat/s3c-fb.h | 45 ++++++++ drivers/video/s3c-fb.c | 164 ++++++++++++++++++++++++++++++ 3 files changed, 212 insertions(+), 0 deletions(-) create mode 100644 arch/arm/plat-s3c/include/plat/s3c-fb.hdiff --git a/arch/arm/plat-s3c/include/plat/regs-fb.h b/arch/arm/plat-s3c/include/plat/regs-fb.h index 8048cae..8d3071d 100644 --- a/arch/arm/plat-s3c/include/plat/regs-fb.h +++ b/arch/arm/plat-s3c/include/plat/regs-fb.h@@ -323,6 +323,7 @@ /* Window colour-key control registers */ +#define WxKEYCON0(_x) (0x140 + ((_x-1) * 8)) #define WxKEYCON0_KEYBL_EN (1 << 26) #define WxKEYCON0_KEYEN_F (1 << 25) #define WxKEYCON0_DIRCON (1 << 24)@@ -330,6 +331,8 @@ #define WxKEYCON0_COMPKEY_SHIFT (0) #define WxKEYCON0_COMPKEY_LIMIT (0xffffff) #define WxKEYCON0_COMPKEY(_x) ((_x) << 0) + +#define WxKEYCON1(_x) (0x144 + ((_x-1) * 8)) #define WxKEYCON1_COLVAL_MASK (0xffffff << 0) #define WxKEYCON1_COLVAL_SHIFT (0) #define WxKEYCON1_COLVAL_LIMIT (0xffffff)diff --git a/arch/arm/plat-s3c/include/plat/s3c-fb.h b/arch/arm/plat-s3c/include/plat/s3c-fb.h new file mode 100644 index 0000000..0aebc40 --- /dev/null +++ b/arch/arm/plat-s3c/include/plat/s3c-fb.h@@ -0,0 +1,45 @@ +/* + * include/linux/s3c/s3c-fb.h + * + * Copyright 2009 Samsung Electronics Co., Ltd. + * Author: Pawel Osciak <p.osciak@samsung.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#ifndef __LINUX_S3C_FB_H__ +#define __LINUX_S3C_FB_H__ + +#include <linux/types.h> + +struct s3c_fb_color { + __u32 a : 8; + __u32 r : 8; + __u32 g : 8; + __u32 b : 8; +} __attribute__((__packed__)); + +typedef enum s3c_fb_color_key_mode { + S3CFB_COLORKEY_MODE_BG = 0, + S3CFB_COLORKEY_MODE_FG = 1 +} s3c_fb_color_key_mode_t; +
Typedef here is also not needed (is it used at all?). Regards, Krzysztof ---------------------------------------------------------------------- Nie dla nich ciepla praca za biurkiem. Sprawdz >>> http://link.interia.pl/f2383