summaryrefslogtreecommitdiff
path: root/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0037-DSS2-Added-support-for-querying-color-keying.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0037-DSS2-Added-support-for-querying-color-keying.patch')
-rw-r--r--meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0037-DSS2-Added-support-for-querying-color-keying.patch150
1 files changed, 0 insertions, 150 deletions
diff --git a/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0037-DSS2-Added-support-for-querying-color-keying.patch b/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0037-DSS2-Added-support-for-querying-color-keying.patch
deleted file mode 100644
index fc62b0951..000000000
--- a/meta/recipes-kernel/linux/linux-omap-2.6.29/dss2/0037-DSS2-Added-support-for-querying-color-keying.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-From 2c9edd6af31a812a9487dd8bc12322e105a29f44 Mon Sep 17 00:00:00 2001
-From: Hardik Shah <hardik.shah@ti.com>
-Date: Fri, 17 Apr 2009 09:42:36 +0530
-Subject: [PATCH] DSS2: Added support for querying color keying.
-
-V4L2 Framework has a ioctl for getting/setting color keying.
-So added the function manager pointers for doing same.
-
-Modifed the color keying sysfs entries to use manager
-function pointer. Earlier they were calling direcly
-dispc function to set/enable color keying.
-
-Some of color-keying function pointers in the overlay_manager
-structure re-named to be more specific.
-
-Signed-off-by: Hardik Shah <hardik.shah@ti.com>
----
- arch/arm/plat-omap/include/mach/display.h | 6 ++++-
- drivers/video/omap2/dss/manager.c | 36 +++++++++++++++++++++--------
- 2 files changed, 31 insertions(+), 11 deletions(-)
-
-diff --git a/arch/arm/plat-omap/include/mach/display.h b/arch/arm/plat-omap/include/mach/display.h
-index e1f615a..d0b4c83 100644
---- a/arch/arm/plat-omap/include/mach/display.h
-+++ b/arch/arm/plat-omap/include/mach/display.h
-@@ -416,7 +416,11 @@ struct omap_overlay_manager {
- void (*set_default_color)(struct omap_overlay_manager *mgr, u32 color);
- u32 (*get_default_color)(struct omap_overlay_manager *mgr);
- bool (*get_alpha_blending_status)(struct omap_overlay_manager *mgr);
-- void (*set_trans_key)(struct omap_overlay_manager *mgr,
-+ bool (*get_trans_key_status)(struct omap_overlay_manager *mgr);
-+ void (*get_trans_key_type_and_value)(struct omap_overlay_manager *mgr,
-+ enum omap_dss_color_key_type *type,
-+ u32 *trans_key);
-+ void (*set_trans_key_type_and_value)(struct omap_overlay_manager *mgr,
- enum omap_dss_color_key_type type,
- u32 trans_key);
- void (*enable_trans_key)(struct omap_overlay_manager *mgr,
-diff --git a/drivers/video/omap2/dss/manager.c b/drivers/video/omap2/dss/manager.c
-index 90acd28..e0501c4 100644
---- a/drivers/video/omap2/dss/manager.c
-+++ b/drivers/video/omap2/dss/manager.c
-@@ -124,7 +124,7 @@ static ssize_t manager_color_key_type_show(struct omap_overlay_manager *mgr,
- {
- enum omap_dss_color_key_type key_type;
-
-- dispc_get_trans_key(mgr->id, &key_type, NULL);
-+ mgr->get_trans_key_type_and_value(mgr, &key_type, NULL);
- BUG_ON(key_type >= ARRAY_SIZE(color_key_type_str));
-
- return snprintf(buf, PAGE_SIZE, "%s\n", color_key_type_str[key_type]);
-@@ -143,8 +143,8 @@ static ssize_t manager_color_key_type_store(struct omap_overlay_manager *mgr,
- }
- if (key_type == ARRAY_SIZE(color_key_type_str))
- return -EINVAL;
-- dispc_get_trans_key(mgr->id, NULL, &key_value);
-- dispc_set_trans_key(mgr->id, key_type, key_value);
-+ mgr->get_trans_key_type_and_value(mgr, NULL, &key_value);
-+ mgr->set_trans_key_type_and_value(mgr, key_type, key_value);
-
- return size;
- }
-@@ -154,7 +154,7 @@ static ssize_t manager_color_key_value_show(struct omap_overlay_manager *mgr,
- {
- u32 key_value;
-
-- dispc_get_trans_key(mgr->id, NULL, &key_value);
-+ mgr->get_trans_key_type_and_value(mgr, NULL, &key_value);
-
- return snprintf(buf, PAGE_SIZE, "%d\n", key_value);
- }
-@@ -167,8 +167,8 @@ static ssize_t manager_color_key_value_store(struct omap_overlay_manager *mgr,
-
- if (sscanf(buf, "%d", &key_value) != 1)
- return -EINVAL;
-- dispc_get_trans_key(mgr->id, &key_type, NULL);
-- dispc_set_trans_key(mgr->id, key_type, key_value);
-+ mgr->get_trans_key_type_and_value(mgr, &key_type, NULL);
-+ mgr->set_trans_key_type_and_value(mgr, key_type, key_value);
-
- return size;
- }
-@@ -177,7 +177,7 @@ static ssize_t manager_color_key_enabled_show(struct omap_overlay_manager *mgr,
- char *buf)
- {
- return snprintf(buf, PAGE_SIZE, "%d\n",
-- dispc_trans_key_enabled(mgr->id));
-+ mgr->get_trans_key_status(mgr));
- }
-
- static ssize_t manager_color_key_enabled_store(struct omap_overlay_manager *mgr,
-@@ -188,7 +188,7 @@ static ssize_t manager_color_key_enabled_store(struct omap_overlay_manager *mgr,
- if (sscanf(buf, "%d", &enable) != 1)
- return -EINVAL;
-
-- dispc_enable_trans_key(mgr->id, enable);
-+ mgr->enable_trans_key(mgr, enable);
-
- return size;
- }
-@@ -456,12 +456,20 @@ static void omap_dss_mgr_set_def_color(struct omap_overlay_manager *mgr,
- dispc_set_default_color(mgr->id, color);
- }
-
--static void omap_dss_mgr_set_trans_key(struct omap_overlay_manager *mgr,
-+static void omap_dss_mgr_set_trans_key_type_and_value(
-+ struct omap_overlay_manager *mgr,
- enum omap_dss_color_key_type type,
- u32 trans_key)
- {
- dispc_set_trans_key(mgr->id, type, trans_key);
- }
-+static void omap_dss_mgr_get_trans_key_type_and_value(
-+ struct omap_overlay_manager *mgr,
-+ enum omap_dss_color_key_type *type,
-+ u32 *trans_key)
-+{
-+ dispc_get_trans_key(mgr->id, type, trans_key);
-+}
-
- static void omap_dss_mgr_enable_trans_key(struct omap_overlay_manager *mgr,
- bool enable)
-@@ -482,6 +490,10 @@ static u32 omap_dss_mgr_get_default_color(struct omap_overlay_manager *mgr)
- {
- return dispc_get_default_color(mgr->id);
- }
-+static bool omap_dss_mgr_get_trans_key_status(struct omap_overlay_manager *mgr)
-+{
-+ return dispc_trans_key_enabled(mgr->id);
-+}
-
- static void omap_dss_add_overlay_manager(struct omap_overlay_manager *manager)
- {
-@@ -522,8 +534,12 @@ int dss_init_overlay_managers(struct platform_device *pdev)
- mgr->unset_display = &omap_dss_unset_display,
- mgr->apply = &omap_dss_mgr_apply,
- mgr->set_default_color = &omap_dss_mgr_set_def_color,
-- mgr->set_trans_key = &omap_dss_mgr_set_trans_key,
-+ mgr->set_trans_key_type_and_value =
-+ &omap_dss_mgr_set_trans_key_type_and_value,
-+ mgr->get_trans_key_type_and_value =
-+ &omap_dss_mgr_get_trans_key_type_and_value,
- mgr->enable_trans_key = &omap_dss_mgr_enable_trans_key,
-+ mgr->get_trans_key_status = &omap_dss_mgr_get_trans_key_status,
- mgr->enable_alpha_blending =
- &omap_dss_mgr_enable_alpha_blending;
- mgr->get_alpha_blending_status =
---
-1.5.6.5
-
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-10 10:47:43 +0000