summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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;