diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2014-08-04 09:50:07 +0300 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2014-08-04 09:50:07 +0300 |
| commit | be92abea827b82957450dd4ac7f997d5e8173d60 (patch) | |
| tree | fe05bea2ddf737b31ef9dcda81041387b870a65b /include | |
| parent | 3686fe964285a9a0c25265f37ada117d47614f1e (diff) | |
| parent | 4f930c0f273967b41f46ca84927ac0256bab4649 (diff) | |
Merge branch '3.17/hdmi-infoframe' into for-next
Diffstat (limited to 'include')
| -rw-r--r-- | include/video/omapdss.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/video/omapdss.h b/include/video/omapdss.h index fc06c5b5f12a..069dfca9549a 100644 --- 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. |