diff options
Diffstat (limited to 'meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0035-DSS2-Added-the-function-pointer-for-getting-default.patch')
-rw-r--r-- | meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0035-DSS2-Added-the-function-pointer-for-getting-default.patch | 66 |
1 files changed, 66 insertions, 0 deletions
diff --git a/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0035-DSS2-Added-the-function-pointer-for-getting-default.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0035-DSS2-Added-the-function-pointer-for-getting-default.patch new file mode 100644 index 0000000000..b7b395458f --- /dev/null +++ b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0035-DSS2-Added-the-function-pointer-for-getting-default.patch | |||
@@ -0,0 +1,66 @@ | |||
1 | From f825cafd5ee5c600218740507f85594c825b0c00 Mon Sep 17 00:00:00 2001 | ||
2 | From: Hardik Shah <hardik.shah@ti.com> | ||
3 | Date: Thu, 16 Apr 2009 18:47:49 +0530 | ||
4 | Subject: [PATCH] DSS2: Added the function pointer for getting default color. | ||
5 | |||
6 | V4L2 Framework has a CID for getting/setting default color. | ||
7 | So added the function pointer for doing same. | ||
8 | SYSFS based getting the default color will remain same | ||
9 | |||
10 | Signed-off-by: Hardik Shah <hardik.shah@ti.com> | ||
11 | --- | ||
12 | arch/arm/plat-omap/include/mach/display.h | 1 + | ||
13 | drivers/video/omap2/dss/manager.c | 11 +++++++---- | ||
14 | 2 files changed, 8 insertions(+), 4 deletions(-) | ||
15 | |||
16 | diff --git a/arch/arm/plat-omap/include/mach/display.h b/arch/arm/plat-omap/include/mach/display.h | ||
17 | index b0a6272..073cdda 100644 | ||
18 | --- a/arch/arm/plat-omap/include/mach/display.h | ||
19 | +++ b/arch/arm/plat-omap/include/mach/display.h | ||
20 | @@ -414,6 +414,7 @@ struct omap_overlay_manager { | ||
21 | int (*apply)(struct omap_overlay_manager *mgr); | ||
22 | |||
23 | void (*set_default_color)(struct omap_overlay_manager *mgr, u32 color); | ||
24 | + u32 (*get_default_color)(struct omap_overlay_manager *mgr); | ||
25 | void (*set_trans_key)(struct omap_overlay_manager *mgr, | ||
26 | enum omap_dss_color_key_type type, | ||
27 | u32 trans_key); | ||
28 | diff --git a/drivers/video/omap2/dss/manager.c b/drivers/video/omap2/dss/manager.c | ||
29 | index 8ca0bbb..12cf7b0 100644 | ||
30 | --- a/drivers/video/omap2/dss/manager.c | ||
31 | +++ b/drivers/video/omap2/dss/manager.c | ||
32 | @@ -98,10 +98,8 @@ static ssize_t manager_display_store(struct omap_overlay_manager *mgr, const cha | ||
33 | static ssize_t manager_default_color_show(struct omap_overlay_manager *mgr, | ||
34 | char *buf) | ||
35 | { | ||
36 | - u32 default_color; | ||
37 | - | ||
38 | - default_color = dispc_get_default_color(mgr->id); | ||
39 | - return snprintf(buf, PAGE_SIZE, "%d", default_color); | ||
40 | + return snprintf(buf, PAGE_SIZE, "%d", | ||
41 | + mgr->get_default_color(mgr)); | ||
42 | } | ||
43 | |||
44 | static ssize_t manager_default_color_store(struct omap_overlay_manager *mgr, | ||
45 | @@ -470,6 +468,10 @@ static void omap_dss_mgr_enable_trans_key(struct omap_overlay_manager *mgr, | ||
46 | { | ||
47 | dispc_enable_trans_key(mgr->id, enable); | ||
48 | } | ||
49 | +static u32 omap_dss_mgr_get_default_color(struct omap_overlay_manager *mgr) | ||
50 | +{ | ||
51 | + return dispc_get_default_color(mgr->id); | ||
52 | +} | ||
53 | |||
54 | static void omap_dss_add_overlay_manager(struct omap_overlay_manager *manager) | ||
55 | { | ||
56 | @@ -512,6 +514,7 @@ int dss_init_overlay_managers(struct platform_device *pdev) | ||
57 | mgr->set_default_color = &omap_dss_mgr_set_def_color, | ||
58 | mgr->set_trans_key = &omap_dss_mgr_set_trans_key, | ||
59 | mgr->enable_trans_key = &omap_dss_mgr_enable_trans_key, | ||
60 | + mgr->get_default_color = &omap_dss_mgr_get_default_color; | ||
61 | mgr->caps = OMAP_DSS_OVL_MGR_CAP_DISPC, | ||
62 | |||
63 | dss_overlay_setup_dispc_manager(mgr); | ||
64 | -- | ||
65 | 1.5.6.5 | ||
66 | |||