summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMayuresh Janorkar <mayur@ti.com>2011-01-19 16:30:28 +0530
committerSamreen <samreen@ti.com>2011-01-19 16:47:34 +0530
commitd9befe585919c76a9df2664b98f71898e97199b7 (patch)
tree8300b5913631b9fb89caf64ea7493c955b6c9613
parent7933330af591f95d532e81e9c85947ddd7018f91 (diff)
OMAP4: DSS: Add check for setting x_inc & y_inc
Default value should be assigned to x_inc & y_inc for bpp < 16, only when GFX plane is used. Signed-off-by: Mayuresh Janorkar <mayur@ti.com>
-rw-r--r--drivers/video/omap2/dss/dispc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c
index 0f3577a90343..85464df96c08 100644
--- a/drivers/video/omap2/dss/dispc.c
+++ b/drivers/video/omap2/dss/dispc.c
@@ -2727,7 +2727,7 @@ int dispc_scaling_decision(u16 width, u16 height,
int x, y; /* decimation search variables */
unsigned long fclk_max = dispc_fclk_rate();
- if (bpp < 16) {
+ if ((bpp < 16) && !can_scale) {
*x_decim = 1;
*y_decim = 1;
*three_tap = 0;