Merge "msm_fb: Don't split solid color rectangles"

patch/ics_strawberry/kernel/0001-msm_fb-Don-t-split-solid-color-rectangles.patch

+From 47d26174f4bdda1279141aced5f9c83f347e716a Mon Sep 17 00:00:00 2001
+From: Diego Wilson <dwilson@codeaurora.org>
+Date: Thu, 7 Nov 2013 10:00:34 -0800
+Subject: [PATCH] msm_fb: Don't split solid color rectangles
+
+Blit rectangles are sometimes split into two or more.
+This messes up solid color blitting. Furthermore,
+we never need to split solid color rectangles anyway.
+
+CRs-Fixed: 570638
+Change-Id: I495074da65ecac54da7134a39eb2ae7e78a856ab
+Signed-off-by: Diego Wilson <dwilson@codeaurora.org>
+---
+ drivers/video/msm/msm_fb.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/video/msm/msm_fb.c b/drivers/video/msm/msm_fb.c
+index 2b626a0..64f3fcf 100644
+--- a/drivers/video/msm/msm_fb.c
++++ b/drivers/video/msm/msm_fb.c
+@@ -2331,17 +2331,17 @@ int mdp_blit(struct fb_info *info, struct mdp_blit_req *req)
+ 	ret = mdp_get_bytes_per_pixel(req->dst.format,
+ 					(struct msm_fb_data_type *)info->par);
+ 	if (ret <= 0) {
+ 		printk(KERN_ERR "mdp_ppp: incorrect bpp!\n");
+ 		return -EINVAL;
+ 	}
+ 	is_bpp_4 = (ret == 4) ? 1 : 0;
+ 
+-	if ((is_bpp_4 && (remainder == 6 || remainder == 14))) {
++	if (is_bpp_4 && (remainder == 6 || remainder == 14) && !(req->flags & CONST_COLOR)) {
+ 
+ 		/* make new request as provide by user */
+ 		splitreq = *req;
+ 
+ 		/* break dest roi at width*/
+ 		d_y_0 = d_y_1 = req->dst_rect.y;
+ 		d_h_0 = d_h_1 = req->dst_rect.h;
+ 		d_x_0 = req->dst_rect.x;
+-- 
+1.8.2.1
+