git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/blob

   1 From 9e8877f0e5b17d3ddd101d6a63aa86fdb14d35d5 Mon Sep 17 00:00:00 2001
   2 From: Hardik Shah <hardik.shah@ti.com>
   3 Date: Fri, 17 Apr 2009 09:51:25 +0530
   4 Subject: [PATCH] DSS2:OMAPFB: Some color keying pointerd renamed in DSS2. Replicated in FB
   5
   6 Signed-off-by: Hardik Shah <hardik.shah@ti.com>
   7 ---
   8  drivers/video/omap2/omapfb/omapfb-ioctl.c |   11 +++++++----
   9  1 files changed, 7 insertions(+), 4 deletions(-)
  10
  11 diff --git a/drivers/video/omap2/omapfb/omapfb-ioctl.c b/drivers/video/omap2/omapfb/omapfb-ioctl.c
  12 index 7f18d2a..79d8916 100644
  13 --- a/drivers/video/omap2/omapfb/omapfb-ioctl.c
  14 +++ b/drivers/video/omap2/omapfb/omapfb-ioctl.c
  15 @@ -288,7 +288,8 @@ static int _omapfb_set_color_key(struct omap_overlay_manager *mgr,
  16  {
  17         enum omap_dss_color_key_type kt;
  18
  19 -       if(!mgr->set_default_color || !mgr->set_trans_key ||
  20 +       if (!mgr->set_default_color ||
  21 +                       !mgr->set_trans_key_type_and_value ||
  22                         !mgr->enable_trans_key)
  23                 return 0;
  24
  25 @@ -310,7 +311,7 @@ static int _omapfb_set_color_key(struct omap_overlay_manager *mgr,
  26         }
  27
  28         mgr->set_default_color(mgr, ck->background);
  29 -       mgr->set_trans_key(mgr, kt, ck->trans_key);
  30 +       mgr->set_trans_key_type_and_value(mgr, kt, ck->trans_key);
  31         mgr->enable_trans_key(mgr, 1);
  32
  33         omapfb_color_keys[mgr->id] = *ck;
  34 @@ -341,7 +342,8 @@ static int omapfb_set_color_key(struct fb_info *fbi,
  35                 goto err;
  36         }
  37
  38 -       if(!mgr->set_default_color || !mgr->set_trans_key ||
  39 +       if (!mgr->set_default_color ||
  40 +                       !mgr->set_trans_key_type_and_value ||
  41                         !mgr->enable_trans_key) {
  42                 r = -ENODEV;
  43                 goto err;
  44 @@ -377,7 +379,8 @@ static int omapfb_get_color_key(struct fb_info *fbi,
  45                 goto err;
  46         }
  47
  48 -       if(!mgr->set_default_color || !mgr->set_trans_key ||
  49 +       if (!mgr->set_default_color ||
  50 +                       !mgr->set_trans_key_type_and_value ||
  51                         !mgr->enable_trans_key) {
  52                 r = -ENODEV;
  53                 goto err;
  54 --
  55 1.5.6.5
  56