From 7986ce08b1f7ed40c815620853fe76ce3deeb7c5 Mon Sep 17 00:00:00 2001 From: Tim Yamin Date: Fri, 12 Mar 2010 13:57:38 +0100 Subject: [PATCH 10/16] DSS2: Fix scaling checks when rotation is 90 or 270 degrees. --- drivers/video/omap2/dss/dispc.c | 25 +++++++++++++++++++------ 1 files changed, 19 insertions(+), 6 deletions(-) diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c index 1b38c49..d648c08 100644 --- a/drivers/video/omap2/dss/dispc.c +++ b/drivers/video/omap2/dss/dispc.c @@ -1563,16 +1563,29 @@ static int _dispc_setup_plane(enum omap_plane plane, } } else { /* video plane */ - + u8 error = 0; unsigned long fclk = 0; - if (out_width < width / maxdownscale || - out_width > width * 8) - return -EINVAL; + if(rotation == 1 || rotation == 3) + { + if (out_width < height / maxdownscale || out_width > height * 8) + error = 1; + + if (out_height < width / maxdownscale || out_height > width * 8) + error = 1; + } else { + if (out_width < width / maxdownscale || out_width > width * 8) + error = 1; - if (out_height < height / maxdownscale || - out_height > height * 8) + if (out_height < height / maxdownscale || out_height > height * 8) + error = 1; + } + + if(error != 0) + { + printk("DSS: Unable to down/up scale video plane\n"); return -EINVAL; + } switch (color_mode) { case OMAP_DSS_COLOR_RGBX32: -- 1.6.6.1