commit b7723c6d52076704ad6eee38cbded1aa51914d56
author Linux Build Service Account <lnxbuild@localhost> Mon Apr 10 15:02:24 2017 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Apr 10 15:02:24 2017 -0700
tree a87d12475155e570776bce7afdcd6a7dd1ed5d2b
parent b02015652c6d816acb6e6afd30dcf811c1e715ca
parent 3a27165b8c1c42292884717e82509c3f99b2640d

Merge "uapi/media: fix for RGB565 compressed format" into msm-4.9

include/uapi/media/msm_media_info.h

diff --git a/include/uapi/media/msm_media_info.h b/include/uapi/media/msm_media_info.h
index 883c9be..be87b1e 100644
--- a/include/uapi/media/msm_media_info.h
+++ b/include/uapi/media/msm_media_info.h
@@ -1075,7 +1075,7 @@
 		alignment = 128;
 		break;
 	case COLOR_FMT_RGB565_UBWC:
-		alignment = 128;
+		alignment = 256;
 		bpp = 2;
 		break;
 	case COLOR_FMT_RGBA8888_UBWC:
@@ -1279,6 +1279,8 @@
 		size =  MSM_MEDIA_ALIGN(size, 4096);
 		break;
 	case COLOR_FMT_RGBA8888_UBWC:
+	case COLOR_FMT_RGBA1010102_UBWC:
+	case COLOR_FMT_RGB565_UBWC:
 		rgb_ubwc_plane = MSM_MEDIA_ALIGN(rgb_stride * rgb_scanlines,
 							4096);
 		rgb_meta_stride = VENUS_RGB_META_STRIDE(color_fmt, width);