OMAPDSS: DSSCOMP: Remove HDMI_ENABLE flag from dsscomp

Enable HDMI support in DSSCOMP driver. HDMI related
code was put under compile flag during dsscomp porting.
Removing the flag to have HDMI working.

Change-Id: I9c7d860de5e8f8a66307a6aeaed0c97f7cda6048
Signed-off-by: Arthur Philpott <arthur.philpott@ti.com>

diff --git a/drivers/video/omap2/dsscomp/device.c b/drivers/video/omap2/dsscomp/device.c
index 00d680669e4a53e26a788b387bfbfb8def1a403f..18f009372a63f7af81dcc5c1d46bcf7f44eef87d 100755 (executable)
--- a/drivers/video/omap2/dsscomp/device.c
+++ b/drivers/video/omap2/dsscomp/device.c
@@ -47,6 +47,7 @@
 
 #include <linux/debugfs.h>
 
 
 #include <linux/debugfs.h>
 

+

 static DECLARE_WAIT_QUEUE_HEAD(waitq);
 static DEFINE_MUTEX(wait_mtx);
 bool alpha_only = true;
 static DECLARE_WAIT_QUEUE_HEAD(waitq);
 static DEFINE_MUTEX(wait_mtx);
 bool alpha_only = true;


@@ -355,11 +356,9 @@ static long query_display(struct dsscomp_dev *cdev,
        }
        dis->mgr.ix = dis->ix;
 
        }
        dis->mgr.ix = dis->ix;
 

-#ifdef HDMI_ENABLED

        if (dev->driver && dis->modedb_len && dev->driver->get_modedb)
                dis->modedb_len = dev->driver->get_modedb(dev,
                        (struct fb_videomode *)dis->modedb, dis->modedb_len);
        if (dev->driver && dis->modedb_len && dev->driver->get_modedb)
                dis->modedb_len = dev->driver->get_modedb(dev,
                        (struct fb_videomode *)dis->modedb, dis->modedb_len);

-#endif

        return 0;
 }
 
        return 0;
 }
 


@@ -461,12 +460,10 @@ static long setup_display(struct dsscomp_dev *cdev,
        if (!dev)
                return -EINVAL;
 
        if (!dev)
                return -EINVAL;
 

-#ifdef HDMI_ENABLED

        if (dev->driver->set_mode)
                return dev->driver->set_mode(dev,
                                (struct fb_videomode *)&dis->mode);
        else
        if (dev->driver->set_mode)
                return dev->driver->set_mode(dev,
                                (struct fb_videomode *)&dis->mode);
        else

-#endif

                return 0;
 }
 
                return 0;
 }
 

diff --git a/include/video/omapdss.h b/include/video/omapdss.h
index 6c398a47255e5f8634258aeaa744d5cf892defc9..d07e22185aa2eec5eb0a82b08cd935e283fe4c69 100755 (executable)
--- a/include/video/omapdss.h
+++ b/include/video/omapdss.h
@@ -897,6 +897,12 @@ struct omap_dss_driver {
        int (*set_wss)(struct omap_dss_device *dssdev, u32 wss);
        u32 (*get_wss)(struct omap_dss_device *dssdev);
 
        int (*set_wss)(struct omap_dss_device *dssdev, u32 wss);
        u32 (*get_wss)(struct omap_dss_device *dssdev);
 

+       int (*get_modedb)(struct omap_dss_device *dssdev,
+                       struct fb_videomode *modedb,
+                       int modedb_len);
+       int (*set_mode)(struct omap_dss_device *dssdev,
+                       struct fb_videomode *mode);
+

        int (*read_edid)(struct omap_dss_device *dssdev, u8 *buf, int len);
        bool (*detect)(struct omap_dss_device *dssdev);
 
        int (*read_edid)(struct omap_dss_device *dssdev, u8 *buf, int len);
        bool (*detect)(struct omap_dss_device *dssdev);