diff options
| author | Dan Murphy <dmurphy@ti.com> | 2011-10-07 07:25:35 -0500 |
|---|---|---|
| committer | Dan Murphy <dmurphy@ti.com> | 2011-10-07 07:25:35 -0500 |
| commit | 14e4907b39ab83876d6f7240014917c8f6aa6aa9 (patch) | |
| tree | c0592cf82594b344e708733bd97362d14bc89c9f /include/video | |
| parent | 015b0f58da4747135da9cce5d9077331a7118eda (diff) | |
| parent | 978c4b3eedb0d668ef6431fc138ae476f9edf9c1 (diff) | |
| download | kernel_samsung_espresso10-14e4907b39ab83876d6f7240014917c8f6aa6aa9.zip kernel_samsung_espresso10-14e4907b39ab83876d6f7240014917c8f6aa6aa9.tar.gz kernel_samsung_espresso10-14e4907b39ab83876d6f7240014917c8f6aa6aa9.tar.bz2 | |
Merge branch 'android-omap-3.0' into p-android-omap-3.0
* android-omap-3.0: (44 commits)
OMAP4: PM: Tesla (DSP) power domain doesn't transition to OFF
OMAP4: PM: dont program to greater LP state on suspend
OMAP4: PM: dont restore to greater LP state on resume
OMAP4: PM: Dont write to readonly/reserved powerdomain register on resume
OMAP4: PM: Skip resume powerdomain programing if state already achieved
OMAP4: PM: Honor powerdomain wakeup ON state in resume reprogramming
OMAP4: PM: Skip programming CPU states again on resume
OMAP4: PM: Print achieved state on failed transition
OMAP4: PM: Refactor resume pd programing
OMAP4: PM: Fold saving power state with programming suspend state
OMAP4: PM: Restore trim configuration before DPLL restore
GPIO: OMAP: set edge trigger for wakeup gpio
GPIO: OMAP: Fix GPIO_IRQWAKEN_0 access
netfilter: xt_qtaguid: Fix the stats info display order
omap: remoteproc: update suspend flag address
omap: rpmsg: remove call to rproc_last_busy from mbox callback
remoteproc: move remoteproc register dump before error notification
remoteproc: make rproc_set_secure a blocking call
omap4: add a new misc driver for setting secure mode
omap: remoteproc: enable setting iommu ttb
...
Change-Id: I05e426b5d2da76f5ba88b6196f268f9744c5f559
Signed-off-by: Dan Murphy <dmurphy@ti.com>
Diffstat (limited to 'include/video')
| -rw-r--r-- | include/video/omapdss.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/video/omapdss.h b/include/video/omapdss.h index 27a1643..70e4872 100644 --- a/include/video/omapdss.h +++ b/include/video/omapdss.h @@ -563,6 +563,9 @@ struct omap_dss_device { enum omap_panel_config config; struct fb_monspecs monspecs; + + u32 width_in_um; + u32 height_in_um; } panel; struct { @@ -700,6 +703,9 @@ void omap_dispc_set_irq_type(int channel, enum omap_dispc_irq_type type); #define to_dss_driver(x) container_of((x), struct omap_dss_driver, driver) #define to_dss_device(x) container_of((x), struct omap_dss_device, dev) +void omapdss_display_get_dimensions(struct omap_dss_device *dssdev, + u32 *width_in_um, u32 *height_in_um); + void omapdss_dsi_vc_enable_hs(struct omap_dss_device *dssdev, int channel, bool enable); int omapdss_dsi_enable_te(struct omap_dss_device *dssdev, bool enable); |