Merge branch 'stable-3.2' into pandora-3.2

[pandora-kernel.git] / drivers / video / omap2 / dss / dss.h

diff --git a/drivers/video/omap2/dss/dss.h b/drivers/video/omap2/dss/dss.h
index 6308fc5..c7eaa80 100644 (file)
--- a/drivers/video/omap2/dss/dss.h
+++ b/drivers/video/omap2/dss/dss.h
@@ -389,6 +389,7 @@ void dispc_pck_free_enable(bool enable);
 void dispc_set_digit_size(u16 width, u16 height);
 void dispc_enable_fifomerge(bool enable);
 void dispc_enable_gamma_table(bool enable);
+void dispc_set_gamma_table(void *table, u32 size);
 void dispc_set_loadmode(enum omap_dss_load_mode mode);
 
 bool dispc_lcd_timings_ok(struct omap_video_timings *timings);
@@ -444,6 +445,20 @@ int dispc_mgr_set_clock_div(enum omap_channel channel,
 int dispc_mgr_get_clock_div(enum omap_channel channel,
                struct dispc_clock_info *cinfo);
 
+enum omap_filter {
+       OMAP_DSS_FILTER_UP_H,
+       OMAP_DSS_FILTER_UP_V3,
+       OMAP_DSS_FILTER_UP_V5,
+       OMAP_DSS_FILTER_DOWN_H,
+       OMAP_DSS_FILTER_DOWN_V3,
+       OMAP_DSS_FILTER_DOWN_V5,
+};
+void dispc_get_scale_coef_phase(enum omap_plane plane, enum omap_filter filter,
+               int phase, int *vals);
+void dispc_set_scale_coef_phase(enum omap_plane plane, enum omap_filter filter,
+               int phase, const int *vals);
+
+
 /* VENC */
 #ifdef CONFIG_OMAP2_DSS_VENC
 int venc_init_platform_driver(void);