commit 11b5d27285de719252b9b6b5afbc20d013f0621c
author Saurabh Shah <saurshah@codeaurora.org> Tue Mar 07 17:21:54 2017 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Mar 27 17:52:45 2017 -0700
tree 2dc1a501e0656ff5e0d044d22ce131d70493c159
parent 7943ec969ddd48565f0a6cb47d32da4b2498c93f

sdm/gralloc: Use correct DRM format enums for RGB formats

Android/SDM formats are endian independent whereas DRM formats are
little endian, so convert Android/SDM RGB formats to the correct
DRM format enums and vice versa.

Change-Id: I822d65eee198c8d8e2df0884b7b987ef17c0eb79
CRs-fixed: 1114808

libgralloc/alloc_controller.cpp

diff --git a/libgralloc/alloc_controller.cpp b/libgralloc/alloc_controller.cpp
index 3c347f5..38e2050 100644
--- a/libgralloc/alloc_controller.cpp
+++ b/libgralloc/alloc_controller.cpp
@@ -1241,55 +1241,55 @@
 
     switch (hal_format) {
         case HAL_PIXEL_FORMAT_RGBA_8888:
-            *drm_format = DRM_FORMAT_RGBA8888;
+            *drm_format = DRM_FORMAT_ABGR8888;
             break;
         case HAL_PIXEL_FORMAT_RGBA_5551:
-            *drm_format = DRM_FORMAT_RGBA5551;
+            *drm_format = DRM_FORMAT_ABGR1555;
             break;
         case HAL_PIXEL_FORMAT_RGBA_4444:
-            *drm_format = DRM_FORMAT_RGBA4444;
+            *drm_format = DRM_FORMAT_ABGR4444;
             break;
         case HAL_PIXEL_FORMAT_BGRA_8888:
-            *drm_format = DRM_FORMAT_BGRA8888;
+            *drm_format = DRM_FORMAT_ARGB8888;
             break;
         case HAL_PIXEL_FORMAT_RGBX_8888:
-            *drm_format = DRM_FORMAT_RGBX8888;
+            *drm_format = DRM_FORMAT_XBGR8888;
             break;
         case HAL_PIXEL_FORMAT_BGRX_8888:
-            *drm_format = DRM_FORMAT_BGRX8888;
+            *drm_format = DRM_FORMAT_XRGB8888;
             break;
         case HAL_PIXEL_FORMAT_RGB_888:
-            *drm_format = DRM_FORMAT_RGB888;
+            *drm_format = DRM_FORMAT_BGR888;
             break;
         case HAL_PIXEL_FORMAT_RGB_565:
-            *drm_format = DRM_FORMAT_RGB565;
-            break;
-        case HAL_PIXEL_FORMAT_BGR_565:
             *drm_format = DRM_FORMAT_BGR565;
             break;
+        case HAL_PIXEL_FORMAT_BGR_565:
+            *drm_format = DRM_FORMAT_RGB565;
+            break;
         case HAL_PIXEL_FORMAT_RGBA_1010102:
-            *drm_format = DRM_FORMAT_RGBA1010102;
-            break;
-        case HAL_PIXEL_FORMAT_ARGB_2101010:
-            *drm_format = DRM_FORMAT_ARGB2101010;
-            break;
-        case HAL_PIXEL_FORMAT_RGBX_1010102:
-            *drm_format = DRM_FORMAT_RGBX1010102;
-            break;
-        case HAL_PIXEL_FORMAT_XRGB_2101010:
-            *drm_format = DRM_FORMAT_XRGB2101010;
-            break;
-        case HAL_PIXEL_FORMAT_BGRA_1010102:
-            *drm_format = DRM_FORMAT_BGRA1010102;
-            break;
-        case HAL_PIXEL_FORMAT_ABGR_2101010:
             *drm_format = DRM_FORMAT_ABGR2101010;
             break;
-        case HAL_PIXEL_FORMAT_BGRX_1010102:
+        case HAL_PIXEL_FORMAT_ARGB_2101010:
+            *drm_format = DRM_FORMAT_BGRA1010102;
+            break;
+        case HAL_PIXEL_FORMAT_RGBX_1010102:
+            *drm_format = DRM_FORMAT_XBGR2101010;
+            break;
+        case HAL_PIXEL_FORMAT_XRGB_2101010:
             *drm_format = DRM_FORMAT_BGRX1010102;
             break;
+        case HAL_PIXEL_FORMAT_BGRA_1010102:
+            *drm_format = DRM_FORMAT_ARGB2101010;
+            break;
+        case HAL_PIXEL_FORMAT_ABGR_2101010:
+            *drm_format = DRM_FORMAT_RGBA1010102;
+            break;
+        case HAL_PIXEL_FORMAT_BGRX_1010102:
+            *drm_format = DRM_FORMAT_XRGB2101010;
+            break;
         case HAL_PIXEL_FORMAT_XBGR_2101010:
-            *drm_format = DRM_FORMAT_XBGR2101010;
+            *drm_format = DRM_FORMAT_RGBX1010102;
             break;
         case HAL_PIXEL_FORMAT_YCbCr_420_SP:
             *drm_format = DRM_FORMAT_NV12;