diff options
| author | Erik Gilling <konkers@android.com> | 2011-07-18 16:09:15 -0700 |
|---|---|---|
| committer | Erik Gilling <konkers@android.com> | 2011-07-18 16:09:20 -0700 |
| commit | d3272f961ef52e7d8f3a1a1155895f03a7cb4c50 (patch) | |
| tree | aeedffb676464743020c927b92c5097b9febfb0b /include/video | |
| parent | 7f698b2b83662283a86ee3478622fa6ef11eb156 (diff) | |
| parent | 8d588784cf6fbec3b516eabfab9b9f87e12f9a6a (diff) | |
| download | kernel_samsung_tuna-d3272f961ef52e7d8f3a1a1155895f03a7cb4c50.zip kernel_samsung_tuna-d3272f961ef52e7d8f3a1a1155895f03a7cb4c50.tar.gz kernel_samsung_tuna-d3272f961ef52e7d8f3a1a1155895f03a7cb4c50.tar.bz2 | |
Merge branch 'linux-omap-dss-3.0' into linux-omap-3.0
Change-Id: I9123d2c339b3118ff0b8158ae5d2bb706147e3ea
Diffstat (limited to 'include/video')
| -rw-r--r-- | include/video/omapdss.h | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/include/video/omapdss.h b/include/video/omapdss.h index 565a49b..fc626d2 100644 --- a/include/video/omapdss.h +++ b/include/video/omapdss.h @@ -337,6 +337,19 @@ struct omapdss_ovl_cb { void *data; }; +struct omap_dss_cpr_coefs { + s16 rr, rg, rb; + s16 gr, gg, gb; + s16 br, bg, bb; +}; + +struct omap_dss_cconv_coefs { + s16 ry, rcr, rcb; + s16 gy, gcr, gcb; + s16 by, bcr, bcb; + u16 full_range; +} __attribute__ ((aligned(4))); + struct omap_overlay_info { bool enabled; @@ -359,6 +372,7 @@ struct omap_overlay_info { u8 pre_mult_alpha; enum omap_overlay_zorder zorder; u16 min_x_decim, max_x_decim, min_y_decim, max_y_decim; + struct omap_dss_cconv_coefs cconv; struct omapdss_ovl_cb cb; }; @@ -402,6 +416,9 @@ struct omap_overlay_manager_info { bool alpha_enabled; struct omapdss_ovl_cb cb; + + bool cpr_enable; + struct omap_dss_cpr_coefs cpr_coefs; }; struct omap_overlay_manager { |