minigbm: Fix switch statements

Our switch statements were inconsistent.  Let's use kernel
style switch statements since we already follow many kernel
coding guidelines in this repo (8-space tabs, mostly 80
line limit).

Change-Id: I2b6ccc2369160bf49bbdf6479aebec7dada2e2fa
Reviewed-on: https://chromium-review.googlesource.com/377883
Commit-Ready: Gurchetan Singh <gurchetansingh@chromium.org>
Tested-by: Gurchetan Singh <gurchetansingh@chromium.org>
Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>

diff --git a/gbm_helpers.c b/gbm_helpers.c
index 40f101d..2f7e034 100644 (file)
--- a/gbm_helpers.c
+++ b/gbm_helpers.c
@@ -14,128 +14,128 @@ drv_format_t gbm_convert_format(uint32_t format)
 {
 
        switch (format) {
-               case GBM_FORMAT_C8:
-                       return DRV_FORMAT_C8;
-               case GBM_FORMAT_R8:
-                       return DRV_FORMAT_R8;
-               case GBM_FORMAT_RG88:
-                       return DRV_FORMAT_RG88;
-               case GBM_FORMAT_GR88:
-                       return DRV_FORMAT_GR88;
-               case GBM_FORMAT_RGB332:
-                       return DRV_FORMAT_RGB332;
-               case GBM_FORMAT_BGR233:
-                       return DRV_FORMAT_BGR233;
-               case GBM_FORMAT_XRGB4444:
-                       return DRV_FORMAT_XRGB4444;
-               case GBM_FORMAT_XBGR4444:
-                       return DRV_FORMAT_XBGR4444;
-               case GBM_FORMAT_RGBX4444:
-                       return DRV_FORMAT_RGBX4444;
-               case GBM_FORMAT_BGRX4444:
-                       return DRV_FORMAT_BGRX4444;
-               case GBM_FORMAT_ARGB4444:
-                       return DRV_FORMAT_ARGB4444;
-               case GBM_FORMAT_ABGR4444:
-                       return DRV_FORMAT_ABGR4444;
-               case GBM_FORMAT_RGBA4444:
-                       return DRV_FORMAT_RGBA4444;
-               case GBM_FORMAT_BGRA4444:
-                       return DRV_FORMAT_BGRA4444;
-               case GBM_FORMAT_XRGB1555:
-                       return DRV_FORMAT_XRGB1555;
-               case GBM_FORMAT_XBGR1555:
-                       return DRV_FORMAT_XBGR1555;
-               case GBM_FORMAT_RGBX5551:
-                       return DRV_FORMAT_RGBX5551;
-               case GBM_FORMAT_BGRX5551:
-                       return DRV_FORMAT_BGRX5551;
-               case GBM_FORMAT_ARGB1555:
-                       return DRV_FORMAT_ARGB1555;
-               case GBM_FORMAT_ABGR1555:
-                       return DRV_FORMAT_ABGR1555;
-               case GBM_FORMAT_RGBA5551:
-                       return DRV_FORMAT_RGBA5551;
-               case GBM_FORMAT_BGRA5551:
-                       return DRV_FORMAT_BGRA5551;
-               case GBM_FORMAT_RGB565:
-                       return DRV_FORMAT_RGB565;
-               case GBM_FORMAT_BGR565:
-                       return DRV_FORMAT_BGR565;
-               case GBM_FORMAT_RGB888:
-                       return DRV_FORMAT_RGB888;
-               case GBM_FORMAT_BGR888:
-                       return DRV_FORMAT_BGR888;
-               case GBM_FORMAT_XRGB8888:
-                       return DRV_FORMAT_XRGB8888;
-               case GBM_FORMAT_XBGR8888:
-                       return DRV_FORMAT_XBGR8888;
-               case GBM_FORMAT_RGBX8888:
-                       return DRV_FORMAT_RGBX8888;
-               case GBM_FORMAT_BGRX8888:
-                       return DRV_FORMAT_BGRX8888;
-               case GBM_FORMAT_ARGB8888:
-                       return DRV_FORMAT_ARGB8888;
-               case GBM_FORMAT_ABGR8888:
-                       return DRV_FORMAT_ABGR8888;
-               case GBM_FORMAT_RGBA8888:
-                       return DRV_FORMAT_RGBA8888;
-               case GBM_FORMAT_BGRA8888:
-                       return DRV_FORMAT_BGRA8888;
-               case GBM_FORMAT_XRGB2101010:
-                       return DRV_FORMAT_XRGB2101010;
-               case GBM_FORMAT_XBGR2101010:
-                       return DRV_FORMAT_XBGR2101010;
-               case GBM_FORMAT_RGBX1010102:
-                       return DRV_FORMAT_RGBX1010102;
-               case GBM_FORMAT_BGRX1010102:
-                       return DRV_FORMAT_BGRX1010102;
-               case GBM_FORMAT_ARGB2101010:
-                       return DRV_FORMAT_ARGB2101010;
-               case GBM_FORMAT_ABGR2101010:
-                       return DRV_FORMAT_ABGR2101010;
-               case GBM_FORMAT_RGBA1010102:
-                       return DRV_FORMAT_RGBA1010102;
-               case GBM_FORMAT_BGRA1010102:
-                       return DRV_FORMAT_BGRA1010102;
-               case GBM_FORMAT_YUYV:
-                       return DRV_FORMAT_YUYV;
-               case GBM_FORMAT_YVYU:
-                       return DRV_FORMAT_YVYU;
-               case GBM_FORMAT_UYVY:
-                       return DRV_FORMAT_UYVY;
-               case GBM_FORMAT_VYUY:
-                       return DRV_FORMAT_VYUY;
-               case GBM_FORMAT_AYUV:
-                       return DRV_FORMAT_AYUV;
-               case GBM_FORMAT_NV12:
-                       return DRV_FORMAT_NV12;
-               case GBM_FORMAT_NV21:
-                       return DRV_FORMAT_NV21;
-               case GBM_FORMAT_NV16:
-                       return DRV_FORMAT_NV16;
-               case GBM_FORMAT_NV61:
-                       return DRV_FORMAT_NV61;
-               case GBM_FORMAT_YUV410:
-                       return DRV_FORMAT_YUV410;
-               case GBM_FORMAT_YVU410:
-                       return DRV_FORMAT_YVU410;
-               case GBM_FORMAT_YUV411:
-                       return DRV_FORMAT_YUV411;
-               case GBM_FORMAT_YVU411:
-                       return DRV_FORMAT_YVU411;
-               case GBM_FORMAT_YUV420:
-                       return DRV_FORMAT_YUV420;
-               case GBM_FORMAT_YVU420:
-                       return DRV_FORMAT_YVU420;
-               case GBM_FORMAT_YUV422:
-                       return DRV_FORMAT_YUV422;
-               case GBM_FORMAT_YVU422:
-                       return DRV_FORMAT_YVU422;
-               case GBM_FORMAT_YUV444:
-                       return DRV_FORMAT_YVU444;
-               case GBM_FORMAT_YVU444:
-                       return DRV_FORMAT_YVU444;
+       case GBM_FORMAT_C8:
+               return DRV_FORMAT_C8;
+       case GBM_FORMAT_R8:
+               return DRV_FORMAT_R8;
+       case GBM_FORMAT_RG88:
+               return DRV_FORMAT_RG88;
+       case GBM_FORMAT_GR88:
+               return DRV_FORMAT_GR88;
+       case GBM_FORMAT_RGB332:
+               return DRV_FORMAT_RGB332;
+       case GBM_FORMAT_BGR233:
+               return DRV_FORMAT_BGR233;
+       case GBM_FORMAT_XRGB4444:
+               return DRV_FORMAT_XRGB4444;
+       case GBM_FORMAT_XBGR4444:
+               return DRV_FORMAT_XBGR4444;
+       case GBM_FORMAT_RGBX4444:
+               return DRV_FORMAT_RGBX4444;
+       case GBM_FORMAT_BGRX4444:
+               return DRV_FORMAT_BGRX4444;
+       case GBM_FORMAT_ARGB4444:
+               return DRV_FORMAT_ARGB4444;
+       case GBM_FORMAT_ABGR4444:
+               return DRV_FORMAT_ABGR4444;
+       case GBM_FORMAT_RGBA4444:
+               return DRV_FORMAT_RGBA4444;
+       case GBM_FORMAT_BGRA4444:
+               return DRV_FORMAT_BGRA4444;
+       case GBM_FORMAT_XRGB1555:
+               return DRV_FORMAT_XRGB1555;
+       case GBM_FORMAT_XBGR1555:
+               return DRV_FORMAT_XBGR1555;
+       case GBM_FORMAT_RGBX5551:
+               return DRV_FORMAT_RGBX5551;
+       case GBM_FORMAT_BGRX5551:
+               return DRV_FORMAT_BGRX5551;
+       case GBM_FORMAT_ARGB1555:
+               return DRV_FORMAT_ARGB1555;
+       case GBM_FORMAT_ABGR1555:
+               return DRV_FORMAT_ABGR1555;
+       case GBM_FORMAT_RGBA5551:
+               return DRV_FORMAT_RGBA5551;
+       case GBM_FORMAT_BGRA5551:
+               return DRV_FORMAT_BGRA5551;
+       case GBM_FORMAT_RGB565:
+               return DRV_FORMAT_RGB565;
+       case GBM_FORMAT_BGR565:
+               return DRV_FORMAT_BGR565;
+       case GBM_FORMAT_RGB888:
+               return DRV_FORMAT_RGB888;
+       case GBM_FORMAT_BGR888:
+               return DRV_FORMAT_BGR888;
+       case GBM_FORMAT_XRGB8888:
+               return DRV_FORMAT_XRGB8888;
+       case GBM_FORMAT_XBGR8888:
+               return DRV_FORMAT_XBGR8888;
+       case GBM_FORMAT_RGBX8888:
+               return DRV_FORMAT_RGBX8888;
+       case GBM_FORMAT_BGRX8888:
+               return DRV_FORMAT_BGRX8888;
+       case GBM_FORMAT_ARGB8888:
+               return DRV_FORMAT_ARGB8888;
+       case GBM_FORMAT_ABGR8888:
+               return DRV_FORMAT_ABGR8888;
+       case GBM_FORMAT_RGBA8888:
+               return DRV_FORMAT_RGBA8888;
+       case GBM_FORMAT_BGRA8888:
+               return DRV_FORMAT_BGRA8888;
+       case GBM_FORMAT_XRGB2101010:
+               return DRV_FORMAT_XRGB2101010;
+       case GBM_FORMAT_XBGR2101010:
+               return DRV_FORMAT_XBGR2101010;
+       case GBM_FORMAT_RGBX1010102:
+               return DRV_FORMAT_RGBX1010102;
+       case GBM_FORMAT_BGRX1010102:
+               return DRV_FORMAT_BGRX1010102;
+       case GBM_FORMAT_ARGB2101010:
+               return DRV_FORMAT_ARGB2101010;
+       case GBM_FORMAT_ABGR2101010:
+               return DRV_FORMAT_ABGR2101010;
+       case GBM_FORMAT_RGBA1010102:
+               return DRV_FORMAT_RGBA1010102;
+       case GBM_FORMAT_BGRA1010102:
+               return DRV_FORMAT_BGRA1010102;
+       case GBM_FORMAT_YUYV:
+               return DRV_FORMAT_YUYV;
+       case GBM_FORMAT_YVYU:
+               return DRV_FORMAT_YVYU;
+       case GBM_FORMAT_UYVY:
+               return DRV_FORMAT_UYVY;
+       case GBM_FORMAT_VYUY:
+               return DRV_FORMAT_VYUY;
+       case GBM_FORMAT_AYUV:
+               return DRV_FORMAT_AYUV;
+       case GBM_FORMAT_NV12:
+               return DRV_FORMAT_NV12;
+       case GBM_FORMAT_NV21:
+               return DRV_FORMAT_NV21;
+       case GBM_FORMAT_NV16:
+               return DRV_FORMAT_NV16;
+       case GBM_FORMAT_NV61:
+               return DRV_FORMAT_NV61;
+       case GBM_FORMAT_YUV410:
+               return DRV_FORMAT_YUV410;
+       case GBM_FORMAT_YVU410:
+               return DRV_FORMAT_YVU410;
+       case GBM_FORMAT_YUV411:
+               return DRV_FORMAT_YUV411;
+       case GBM_FORMAT_YVU411:
+               return DRV_FORMAT_YVU411;
+       case GBM_FORMAT_YUV420:
+               return DRV_FORMAT_YUV420;
+       case GBM_FORMAT_YVU420:
+               return DRV_FORMAT_YVU420;
+       case GBM_FORMAT_YUV422:
+               return DRV_FORMAT_YUV422;
+       case GBM_FORMAT_YVU422:
+               return DRV_FORMAT_YVU422;
+       case GBM_FORMAT_YUV444:
+               return DRV_FORMAT_YVU444;
+       case GBM_FORMAT_YVU444:
+               return DRV_FORMAT_YVU444;
        }
 
        fprintf(stderr, "minigbm: UNKNOWN FORMAT %d\n", format);

diff --git a/helpers.c b/helpers.c
index 9336ced..b5eb732 100644 (file)
--- a/helpers.c
+++ b/helpers.c
@@ -18,60 +18,59 @@
 
 size_t drv_num_planes_from_format(uint32_t format)
 {
-       switch(format)
-       {
-               case DRV_FORMAT_C8:
-               case DRV_FORMAT_R8:
-               case DRV_FORMAT_RG88:
-               case DRV_FORMAT_GR88:
-               case DRV_FORMAT_RGB332:
-               case DRV_FORMAT_BGR233:
-               case DRV_FORMAT_XRGB4444:
-               case DRV_FORMAT_XBGR4444:
-               case DRV_FORMAT_RGBX4444:
-               case DRV_FORMAT_BGRX4444:
-               case DRV_FORMAT_ARGB4444:
-               case DRV_FORMAT_ABGR4444:
-               case DRV_FORMAT_RGBA4444:
-               case DRV_FORMAT_BGRA4444:
-               case DRV_FORMAT_XRGB1555:
-               case DRV_FORMAT_XBGR1555:
-               case DRV_FORMAT_RGBX5551:
-               case DRV_FORMAT_BGRX5551:
-               case DRV_FORMAT_ARGB1555:
-               case DRV_FORMAT_ABGR1555:
-               case DRV_FORMAT_RGBA5551:
-               case DRV_FORMAT_BGRA5551:
-               case DRV_FORMAT_RGB565:
-               case DRV_FORMAT_BGR565:
-               case DRV_FORMAT_YUYV:
-               case DRV_FORMAT_YVYU:
-               case DRV_FORMAT_UYVY:
-               case DRV_FORMAT_VYUY:
-               case DRV_FORMAT_RGB888:
-               case DRV_FORMAT_BGR888:
-               case DRV_FORMAT_XRGB8888:
-               case DRV_FORMAT_XBGR8888:
-               case DRV_FORMAT_RGBX8888:
-               case DRV_FORMAT_BGRX8888:
-               case DRV_FORMAT_ARGB8888:
-               case DRV_FORMAT_ABGR8888:
-               case DRV_FORMAT_RGBA8888:
-               case DRV_FORMAT_BGRA8888:
-               case DRV_FORMAT_XRGB2101010:
-               case DRV_FORMAT_XBGR2101010:
-               case DRV_FORMAT_RGBX1010102:
-               case DRV_FORMAT_BGRX1010102:
-               case DRV_FORMAT_ARGB2101010:
-               case DRV_FORMAT_ABGR2101010:
-               case DRV_FORMAT_RGBA1010102:
-               case DRV_FORMAT_BGRA1010102:
-               case DRV_FORMAT_AYUV:
-                       return 1;
-               case DRV_FORMAT_NV12:
-                       return 2;
-               case DRV_FORMAT_YVU420:
-                       return 3;
+       switch (format) {
+       case DRV_FORMAT_C8:
+       case DRV_FORMAT_R8:
+       case DRV_FORMAT_RG88:
+       case DRV_FORMAT_GR88:
+       case DRV_FORMAT_RGB332:
+       case DRV_FORMAT_BGR233:
+       case DRV_FORMAT_XRGB4444:
+       case DRV_FORMAT_XBGR4444:
+       case DRV_FORMAT_RGBX4444:
+       case DRV_FORMAT_BGRX4444:
+       case DRV_FORMAT_ARGB4444:
+       case DRV_FORMAT_ABGR4444:
+       case DRV_FORMAT_RGBA4444:
+       case DRV_FORMAT_BGRA4444:
+       case DRV_FORMAT_XRGB1555:
+       case DRV_FORMAT_XBGR1555:
+       case DRV_FORMAT_RGBX5551:
+       case DRV_FORMAT_BGRX5551:
+       case DRV_FORMAT_ARGB1555:
+       case DRV_FORMAT_ABGR1555:
+       case DRV_FORMAT_RGBA5551:
+       case DRV_FORMAT_BGRA5551:
+       case DRV_FORMAT_RGB565:
+       case DRV_FORMAT_BGR565:
+       case DRV_FORMAT_YUYV:
+       case DRV_FORMAT_YVYU:
+       case DRV_FORMAT_UYVY:
+       case DRV_FORMAT_VYUY:
+       case DRV_FORMAT_RGB888:
+       case DRV_FORMAT_BGR888:
+       case DRV_FORMAT_XRGB8888:
+       case DRV_FORMAT_XBGR8888:
+       case DRV_FORMAT_RGBX8888:
+       case DRV_FORMAT_BGRX8888:
+       case DRV_FORMAT_ARGB8888:
+       case DRV_FORMAT_ABGR8888:
+       case DRV_FORMAT_RGBA8888:
+       case DRV_FORMAT_BGRA8888:
+       case DRV_FORMAT_XRGB2101010:
+       case DRV_FORMAT_XBGR2101010:
+       case DRV_FORMAT_RGBX1010102:
+       case DRV_FORMAT_BGRX1010102:
+       case DRV_FORMAT_ARGB2101010:
+       case DRV_FORMAT_ABGR2101010:
+       case DRV_FORMAT_RGBA1010102:
+       case DRV_FORMAT_BGRA1010102:
+       case DRV_FORMAT_AYUV:
+               return 1;
+       case DRV_FORMAT_NV12:
+               return 2;
+       case DRV_FORMAT_YVU420:
+               return 3;
        }
 
        fprintf(stderr, "drv: UNKNOWN FORMAT %d\n", format);
@@ -82,67 +81,66 @@ int drv_bpp_from_format(uint32_t format, size_t plane)
 {
        assert(plane < drv_num_planes_from_format(format));
 
-       switch (format)
-       {
-               case DRV_FORMAT_C8:
-               case DRV_FORMAT_R8:
-               case DRV_FORMAT_RGB332:
-               case DRV_FORMAT_BGR233:
-                       return 8;
-
-               case DRV_FORMAT_NV12:
-                       return (plane == 0) ? 8 : 4;
-               case DRV_FORMAT_YVU420:
-                       return (plane == 0) ? 8 : 2;
-
-               case DRV_FORMAT_RG88:
-               case DRV_FORMAT_GR88:
-               case DRV_FORMAT_XRGB4444:
-               case DRV_FORMAT_XBGR4444:
-               case DRV_FORMAT_RGBX4444:
-               case DRV_FORMAT_BGRX4444:
-               case DRV_FORMAT_ARGB4444:
-               case DRV_FORMAT_ABGR4444:
-               case DRV_FORMAT_RGBA4444:
-               case DRV_FORMAT_BGRA4444:
-               case DRV_FORMAT_XRGB1555:
-               case DRV_FORMAT_XBGR1555:
-               case DRV_FORMAT_RGBX5551:
-               case DRV_FORMAT_BGRX5551:
-               case DRV_FORMAT_ARGB1555:
-               case DRV_FORMAT_ABGR1555:
-               case DRV_FORMAT_RGBA5551:
-               case DRV_FORMAT_BGRA5551:
-               case DRV_FORMAT_RGB565:
-               case DRV_FORMAT_BGR565:
-               case DRV_FORMAT_YUYV:
-               case DRV_FORMAT_YVYU:
-               case DRV_FORMAT_UYVY:
-               case DRV_FORMAT_VYUY:
-                       return 16;
-
-               case DRV_FORMAT_RGB888:
-               case DRV_FORMAT_BGR888:
-                       return 24;
-
-               case DRV_FORMAT_XRGB8888:
-               case DRV_FORMAT_XBGR8888:
-               case DRV_FORMAT_RGBX8888:
-               case DRV_FORMAT_BGRX8888:
-               case DRV_FORMAT_ARGB8888:
-               case DRV_FORMAT_ABGR8888:
-               case DRV_FORMAT_RGBA8888:
-               case DRV_FORMAT_BGRA8888:
-               case DRV_FORMAT_XRGB2101010:
-               case DRV_FORMAT_XBGR2101010:
-               case DRV_FORMAT_RGBX1010102:
-               case DRV_FORMAT_BGRX1010102:
-               case DRV_FORMAT_ARGB2101010:
-               case DRV_FORMAT_ABGR2101010:
-               case DRV_FORMAT_RGBA1010102:
-               case DRV_FORMAT_BGRA1010102:
-               case DRV_FORMAT_AYUV:
-                       return 32;
+       switch (format) {
+       case DRV_FORMAT_C8:
+       case DRV_FORMAT_R8:
+       case DRV_FORMAT_RGB332:
+       case DRV_FORMAT_BGR233:
+               return 8;
+
+       case DRV_FORMAT_NV12:
+               return (plane == 0) ? 8 : 4;
+       case DRV_FORMAT_YVU420:
+               return (plane == 0) ? 8 : 2;
+
+       case DRV_FORMAT_RG88:
+       case DRV_FORMAT_GR88:
+       case DRV_FORMAT_XRGB4444:
+       case DRV_FORMAT_XBGR4444:
+       case DRV_FORMAT_RGBX4444:
+       case DRV_FORMAT_BGRX4444:
+       case DRV_FORMAT_ARGB4444:
+       case DRV_FORMAT_ABGR4444:
+       case DRV_FORMAT_RGBA4444:
+       case DRV_FORMAT_BGRA4444:
+       case DRV_FORMAT_XRGB1555:
+       case DRV_FORMAT_XBGR1555:
+       case DRV_FORMAT_RGBX5551:
+       case DRV_FORMAT_BGRX5551:
+       case DRV_FORMAT_ARGB1555:
+       case DRV_FORMAT_ABGR1555:
+       case DRV_FORMAT_RGBA5551:
+       case DRV_FORMAT_BGRA5551:
+       case DRV_FORMAT_RGB565:
+       case DRV_FORMAT_BGR565:
+       case DRV_FORMAT_YUYV:
+       case DRV_FORMAT_YVYU:
+       case DRV_FORMAT_UYVY:
+       case DRV_FORMAT_VYUY:
+               return 16;
+
+       case DRV_FORMAT_RGB888:
+       case DRV_FORMAT_BGR888:
+               return 24;
+
+       case DRV_FORMAT_XRGB8888:
+       case DRV_FORMAT_XBGR8888:
+       case DRV_FORMAT_RGBX8888:
+       case DRV_FORMAT_BGRX8888:
+       case DRV_FORMAT_ARGB8888:
+       case DRV_FORMAT_ABGR8888:
+       case DRV_FORMAT_RGBA8888:
+       case DRV_FORMAT_BGRA8888:
+       case DRV_FORMAT_XRGB2101010:
+       case DRV_FORMAT_XBGR2101010:
+       case DRV_FORMAT_RGBX1010102:
+       case DRV_FORMAT_BGRX1010102:
+       case DRV_FORMAT_ARGB2101010:
+       case DRV_FORMAT_ABGR2101010:
+       case DRV_FORMAT_RGBA1010102:
+       case DRV_FORMAT_BGRA1010102:
+       case DRV_FORMAT_AYUV:
+               return 32;
        }
 
        fprintf(stderr, "drv: UNKNOWN FORMAT %d\n", format);
@@ -164,8 +162,8 @@ int drv_stride_from_format(uint32_t format, uint32_t width, size_t plane)
         */
        if (plane != 0) {
                switch (format) {
-                       case DRV_FORMAT_YVU420:
-                               stride = stride / 2;
+               case DRV_FORMAT_YVU420:
+                       stride = stride / 2;
                }
        }
 

diff --git a/i915.c b/i915.c
index 4942246..e2646ad 100644 (file)
--- a/i915.c
+++ b/i915.c
@@ -75,26 +75,26 @@ static void i915_align_dimensions(struct driver *drv, uint32_t tiling_mode,
        struct i915_device *i915_drv = (struct i915_device *)drv->priv;
        uint32_t width_alignment = 4, height_alignment = 4;
 
-       switch(tiling_mode) {
-               default:
-               case I915_TILING_NONE:
-                       width_alignment = 64 / bpp;
-                       break;
-
-               case I915_TILING_X:
+       switch (tiling_mode) {
+       default:
+       case I915_TILING_NONE:
+               width_alignment = 64 / bpp;
+               break;
+
+       case I915_TILING_X:
+               width_alignment = 512 / bpp;
+               height_alignment = 8;
+               break;
+
+       case I915_TILING_Y:
+               if (i915_drv->gen == 3) {
                        width_alignment = 512 / bpp;
                        height_alignment = 8;
-                       break;
-
-               case I915_TILING_Y:
-                       if (i915_drv->gen == 3) {
-                               width_alignment = 512 / bpp;
-                               height_alignment = 8;
-                       } else  {
-                               width_alignment = 128 / bpp;
-                               height_alignment = 32;
-                       }
-                       break;
+               } else  {
+                       width_alignment = 128 / bpp;
+                       height_alignment = 32;
+               }
+               break;
        }
 
        if (i915_drv->gen > 3) {
@@ -222,13 +222,13 @@ static void *i915_bo_map(struct bo *bo)
 drv_format_t i915_resolve_format(drv_format_t format)
 {
        switch (format) {
-               case DRV_FORMAT_FLEX_IMPLEMENTATION_DEFINED:
-                       /*HACK: See b/28671744 */
-                       return DRV_FORMAT_XBGR8888;
-               case DRV_FORMAT_FLEX_YCbCr_420_888:
-                       return DRV_FORMAT_YVU420;
-               default:
-                       return format;
+       case DRV_FORMAT_FLEX_IMPLEMENTATION_DEFINED:
+               /*HACK: See b/28671744 */
+               return DRV_FORMAT_XBGR8888;
+       case DRV_FORMAT_FLEX_YCbCr_420_888:
+               return DRV_FORMAT_YVU420;
+       default:
+               return format;
        }
 }
 

diff --git a/rockchip.c b/rockchip.c
index bd6cb2d..f5311c6 100644 (file)
--- a/rockchip.c
+++ b/rockchip.c
@@ -97,13 +97,13 @@ static void *rockchip_bo_map(struct bo *bo)
 drv_format_t rockchip_resolve_format(drv_format_t format)
 {
        switch (format) {
-               case DRV_FORMAT_FLEX_IMPLEMENTATION_DEFINED:
-                       /*HACK: See b/28671744 */
-                       return DRV_FORMAT_XBGR8888;
-               case DRV_FORMAT_FLEX_YCbCr_420_888:
-                       return DRV_FORMAT_NV12;
-               default:
-                       return format;
+       case DRV_FORMAT_FLEX_IMPLEMENTATION_DEFINED:
+               /*HACK: See b/28671744 */
+               return DRV_FORMAT_XBGR8888;
+       case DRV_FORMAT_FLEX_YCbCr_420_888:
+               return DRV_FORMAT_NV12;
+       default:
+               return format;
        }
 }