Merge tag 'upstream-3.17-rc1' of git://git.infradead.org/linux-ubifs

[linux-beck.git] / include / video / omapdss.h

diff --git a/include/video/omapdss.h b/include/video/omapdss.h
index fc06c5b5f12a815126bf7ac53b6127934d1beb86..069dfca9549af5808bf39c261fe89701673175f0 100644 (file)
--- a/include/video/omapdss.h
+++ b/include/video/omapdss.h
@@ -61,6 +61,7 @@ struct omap_overlay_manager;
 struct dss_lcd_mgr_config;
 struct snd_aes_iec958;
 struct snd_cea_861_aud_if;
+struct hdmi_avi_infoframe;
 
 enum omap_display_type {
        OMAP_DISPLAY_TYPE_NONE          = 0,
@@ -631,6 +632,10 @@ struct omapdss_hdmi_ops {
        int (*read_edid)(struct omap_dss_device *dssdev, u8 *buf, int len);
        bool (*detect)(struct omap_dss_device *dssdev);
 
+       int (*set_hdmi_mode)(struct omap_dss_device *dssdev, bool hdmi_mode);
+       int (*set_infoframe)(struct omap_dss_device *dssdev,
+               const struct hdmi_avi_infoframe *avi);
+
        /*
         * Note: These functions might sleep. Do not call while
         * holding a spinlock/readlock.
@@ -850,6 +855,10 @@ struct omap_dss_driver {
        int (*read_edid)(struct omap_dss_device *dssdev, u8 *buf, int len);
        bool (*detect)(struct omap_dss_device *dssdev);
 
+       int (*set_hdmi_mode)(struct omap_dss_device *dssdev, bool hdmi_mode);
+       int (*set_hdmi_infoframe)(struct omap_dss_device *dssdev,
+               const struct hdmi_avi_infoframe *avi);
+
        /*
         * For display drivers that support audio. This encompasses
         * HDMI and DisplayPort at the moment.