aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/video/omap2/dss/dispc.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c
index ac71fec1dbba..0fa1c94e8c58 100644
--- a/drivers/video/omap2/dss/dispc.c
+++ b/drivers/video/omap2/dss/dispc.c
@@ -1304,9 +1304,6 @@ static void dispc_ovl_set_scaling_uv(enum omap_plane plane,
1304 int scale_x = out_width != orig_width; 1304 int scale_x = out_width != orig_width;
1305 int scale_y = out_height != orig_height; 1305 int scale_y = out_height != orig_height;
1306 1306
1307 dispc_ovl_set_accu_uv(plane, orig_width, orig_height, out_width,
1308 out_height, ilace, color_mode, rotation);
1309
1310 if (!dss_has_feature(FEAT_HANDLE_UV_SEPARATE)) 1307 if (!dss_has_feature(FEAT_HANDLE_UV_SEPARATE))
1311 return; 1308 return;
1312 if ((color_mode != OMAP_DSS_COLOR_YUV2 && 1309 if ((color_mode != OMAP_DSS_COLOR_YUV2 &&
@@ -1316,6 +1313,10 @@ static void dispc_ovl_set_scaling_uv(enum omap_plane plane,
1316 REG_FLD_MOD(DISPC_OVL_ATTRIBUTES2(plane), 0, 8, 8); 1313 REG_FLD_MOD(DISPC_OVL_ATTRIBUTES2(plane), 0, 8, 8);
1317 return; 1314 return;
1318 } 1315 }
1316
1317 dispc_ovl_set_accu_uv(plane, orig_width, orig_height, out_width,
1318 out_height, ilace, color_mode, rotation);
1319
1319 switch (color_mode) { 1320 switch (color_mode) {
1320 case OMAP_DSS_COLOR_NV12: 1321 case OMAP_DSS_COLOR_NV12:
1321 /* UV is subsampled by 2 vertically*/ 1322 /* UV is subsampled by 2 vertically*/