merge in jb-release history after reset to master
diff --git a/hwc/hwc.c b/hwc/hwc.c
index a0b34b7..b5b80ec 100644
--- a/hwc/hwc.c
+++ b/hwc/hwc.c
@@ -724,6 +724,10 @@
 
     /* NOTE: no support for checking YUV422 layers that are tricky to scale */
 
+    /* FIXME: limit vertical downscale well below theoretical limit as we saw display artifacts */
+    if (dst_h < src_h / 4)
+        return 0;
+
     /* max downscale */
     if (dst_h < src_h / limits->max_downscale / (is_2d ? limits->max_ydecim_2d : limits->max_ydecim_1d))
         return 0;