57 lines
1.8 KiB
Diff
57 lines
1.8 KiB
Diff
From 9e8877f0e5b17d3ddd101d6a63aa86fdb14d35d5 Mon Sep 17 00:00:00 2001
|
|
From: Hardik Shah <hardik.shah@ti.com>
|
|
Date: Fri, 17 Apr 2009 09:51:25 +0530
|
|
Subject: [PATCH] DSS2:OMAPFB: Some color keying pointerd renamed in DSS2. Replicated in FB
|
|
|
|
Signed-off-by: Hardik Shah <hardik.shah@ti.com>
|
|
---
|
|
drivers/video/omap2/omapfb/omapfb-ioctl.c | 11 +++++++----
|
|
1 files changed, 7 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/drivers/video/omap2/omapfb/omapfb-ioctl.c b/drivers/video/omap2/omapfb/omapfb-ioctl.c
|
|
index 7f18d2a..79d8916 100644
|
|
--- a/drivers/video/omap2/omapfb/omapfb-ioctl.c
|
|
+++ b/drivers/video/omap2/omapfb/omapfb-ioctl.c
|
|
@@ -288,7 +288,8 @@ static int _omapfb_set_color_key(struct omap_overlay_manager *mgr,
|
|
{
|
|
enum omap_dss_color_key_type kt;
|
|
|
|
- if(!mgr->set_default_color || !mgr->set_trans_key ||
|
|
+ if (!mgr->set_default_color ||
|
|
+ !mgr->set_trans_key_type_and_value ||
|
|
!mgr->enable_trans_key)
|
|
return 0;
|
|
|
|
@@ -310,7 +311,7 @@ static int _omapfb_set_color_key(struct omap_overlay_manager *mgr,
|
|
}
|
|
|
|
mgr->set_default_color(mgr, ck->background);
|
|
- mgr->set_trans_key(mgr, kt, ck->trans_key);
|
|
+ mgr->set_trans_key_type_and_value(mgr, kt, ck->trans_key);
|
|
mgr->enable_trans_key(mgr, 1);
|
|
|
|
omapfb_color_keys[mgr->id] = *ck;
|
|
@@ -341,7 +342,8 @@ static int omapfb_set_color_key(struct fb_info *fbi,
|
|
goto err;
|
|
}
|
|
|
|
- if(!mgr->set_default_color || !mgr->set_trans_key ||
|
|
+ if (!mgr->set_default_color ||
|
|
+ !mgr->set_trans_key_type_and_value ||
|
|
!mgr->enable_trans_key) {
|
|
r = -ENODEV;
|
|
goto err;
|
|
@@ -377,7 +379,8 @@ static int omapfb_get_color_key(struct fb_info *fbi,
|
|
goto err;
|
|
}
|
|
|
|
- if(!mgr->set_default_color || !mgr->set_trans_key ||
|
|
+ if (!mgr->set_default_color ||
|
|
+ !mgr->set_trans_key_type_and_value ||
|
|
!mgr->enable_trans_key) {
|
|
r = -ENODEV;
|
|
goto err;
|
|
--
|
|
1.5.6.5
|
|
|