diff options
| author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-06-24 17:58:53 +0400 |
|---|---|---|
| committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-06-24 17:58:53 +0400 |
| commit | 0f90fa539dff47e65fe859de2a9089e53231e0da (patch) | |
| tree | b2d3504f55e2d6c3974f0afe42740a64e93898b7 /include | |
| parent | 44edebca3964824b9126c49bab1187df7df5bd89 (diff) | |
| parent | c5deac3c9b2284a64326e8799dfe7416bc619c02 (diff) | |
| download | linux-0f90fa539dff47e65fe859de2a9089e53231e0da.tar.xz | |
Merge branch 'planes' of git://linuxtv.org/pinchartl/fbdev into fbdev-next
Diffstat (limited to 'include')
| -rw-r--r-- | include/video/sh_mobile_lcdc.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/video/sh_mobile_lcdc.h b/include/video/sh_mobile_lcdc.h index 7571b27a0ba1..ff43ffc1aab2 100644 --- a/include/video/sh_mobile_lcdc.h +++ b/include/video/sh_mobile_lcdc.h @@ -166,6 +166,12 @@ struct sh_mobile_lcdc_bl_info { int (*get_brightness)(void); }; +struct sh_mobile_lcdc_overlay_cfg { + int fourcc; + unsigned int max_xres; + unsigned int max_yres; +}; + struct sh_mobile_lcdc_chan_cfg { int chan; int fourcc; @@ -186,6 +192,7 @@ struct sh_mobile_lcdc_chan_cfg { struct sh_mobile_lcdc_info { int clock_source; struct sh_mobile_lcdc_chan_cfg ch[2]; + struct sh_mobile_lcdc_overlay_cfg overlays[4]; struct sh_mobile_meram_info *meram_dev; }; |