diff options
| author | Manjunath G Kondaiah <manjugk@ti.com> | 2011-01-19 17:28:24 +0530 |
|---|---|---|
| committer | Manjunath G Kondaiah <manjugk@ti.com> | 2011-01-19 17:28:24 +0530 |
| commit | fb876647988ae5ef13b3df8e4503c7234d5941e9 (patch) | |
| tree | 8300b5913631b9fb89caf64ea7493c955b6c9613 | |
| parent | 7933330af591f95d532e81e9c85947ddd7018f91 (diff) | |
| parent | d9befe585919c76a9df2664b98f71898e97199b7 (diff) | |
Merge branch 'display-next_integ' of git://dev.omapzoom.org/pub/scm/axelcx/kernel-display into L24.11ti-2.6.35-omap4-L24.11-p6
| -rw-r--r-- | drivers/video/omap2/dss/dispc.c | 2 |
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; |