Merge omapdss scaling fixes

diff --cc drivers/video/fbdev/omap2/dss/dispc.c
index c8e34163211ae3b81af11dfdf19c58e3e324da0c,f8c9115cdb4b9381b36fcb75084050f1c2b24e6e..be716c9ffb88a8bc998cc07ba42de950d55a2ac0
--- 1/drivers/video/fbdev/omap2/dss/dispc.c
--- 2/drivers/video/fbdev/omap2/dss/dispc.c
+++ b/drivers/video/fbdev/omap2/dss/dispc.c
@@@ -3710,9 -3790,10 +3791,10 @@@ static const struct dispc_features omap
        .num_fifos              =       3,
        .no_framedone_tv        =       true,
        .set_max_preload        =       false,
+       .last_pixel_inc_missing =       true,
  };
  
 -static const struct dispc_features omap34xx_rev1_0_dispc_feats __initconst = {
 +static const struct dispc_features omap34xx_rev1_0_dispc_feats = {
        .sw_start               =       5,
        .fp_start               =       15,
        .bp_start               =       27,
@@@ -3730,9 -3811,10 +3812,10 @@@
        .num_fifos              =       3,
        .no_framedone_tv        =       true,
        .set_max_preload        =       false,
+       .last_pixel_inc_missing =       true,
  };
  
 -static const struct dispc_features omap34xx_rev3_0_dispc_feats __initconst = {
 +static const struct dispc_features omap34xx_rev3_0_dispc_feats = {
        .sw_start               =       7,
        .fp_start               =       19,
        .bp_start               =       31,
@@@ -3750,9 -3832,10 +3833,10 @@@
        .num_fifos              =       3,
        .no_framedone_tv        =       true,
        .set_max_preload        =       false,
+       .last_pixel_inc_missing =       true,
  };
  
 -static const struct dispc_features omap44xx_dispc_feats __initconst = {
 +static const struct dispc_features omap44xx_dispc_feats = {
        .sw_start               =       7,
        .fp_start               =       19,
        .bp_start               =       31,

diff --cc drivers/video/fbdev/omap2/dss/hdmi4.c
Simple merge