From ec88e89de86e3dd2bf275cf4f66a8fb865e95040 Mon Sep 17 00:00:00 2001 From: =?utf8?q?St=C3=A9phane=20Marchesin?= Date: Tue, 3 Nov 2015 16:14:59 -0800 Subject: [PATCH] Misc style/indent fixes MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This fixes miscellaneous issues with style and indentation. BUG=none TEST=builds Change-Id: I0f41a2d06687a3da5ca4a92dba76675e49d4b4cd Signed-off-by: Stphane Marchesin Reviewed-on: https://chromium-review.googlesource.com/311202 Commit-Ready: Ilja Friedel Tested-by: Stéphane Marchesin Reviewed-by: Ilja Friedel Reviewed-by: Haixia Shi --- exynos.c | 3 ++- gbm.c | 37 ++++++++++++------------------------- helpers.c | 3 ++- helpers.h | 3 ++- i915.c | 15 ++++++++++----- mediatek.c | 3 ++- rockchip.c | 3 ++- tegra.c | 14 ++++++++------ 8 files changed, 40 insertions(+), 41 deletions(-) diff --git a/exynos.c b/exynos.c index c09d52d..b8cda49 100644 --- a/exynos.c +++ b/exynos.c @@ -14,7 +14,8 @@ #include "gbm_priv.h" #include "helpers.h" -int gbm_exynos_bo_create(struct gbm_bo *bo, uint32_t width, uint32_t height, uint32_t format, uint32_t flags) +int gbm_exynos_bo_create(struct gbm_bo *bo, uint32_t width, uint32_t height, + uint32_t format, uint32_t flags) { size_t size = width * height * gbm_bytes_from_format(format); struct drm_exynos_gem_create gem_create; diff --git a/gbm.c b/gbm.c index b96faf0..861c174 100644 --- a/gbm.c +++ b/gbm.c @@ -13,26 +13,6 @@ #include "gbm_priv.h" #include "util.h" -/* -gbm_buffer_base.cc: gbm_bo_get_width(bo), -gbm_buffer_base.cc: gbm_bo_get_height(bo), -gbm_buffer_base.cc: gbm_bo_get_stride(bo), -gbm_buffer_base.cc: gbm_bo_get_handle(bo).u32, -gbm_buffer_base.cc: return gbm_bo_get_handle(bo_).u32; -gbm_buffer_base.cc: return gfx::Size(gbm_bo_get_width(bo_), gbm_bo_get_height(bo_)); -gbm_buffer.cc: gbm_bo_destroy(bo()); -gbm_buffer.cc: gbm_bo* bo = gbm_bo_create(device, -gbm_surface.cc: gbm_bo_set_user_data(bo, this, GbmSurfaceBuffer::Destroy); -gbm_surface.cc: static_cast(gbm_bo_get_user_data(buffer))); -gbm_surface.cc: gbm_surface_release_buffer(native_surface_, current_buffer_); -gbm_surface.cc: gbm_surface_destroy(native_surface_); -gbm_surface.cc: native_surface_ = gbm_surface_create( -gbm_surface.cc: gbm_bo* pending_buffer = gbm_surface_lock_front_buffer(native_surface_); -gbm_surface.cc: gbm_surface_release_buffer(native_surface_, current_buffer_); -ozone_platform_gbm.cc: device_(gbm_create_device(dri_->get_fd())) {} -ozone_platform_gbm.cc: gbm_device_destroy(device_); -*/ - extern struct gbm_driver gbm_driver_cirrus; #ifdef GBM_EXYNOS extern struct gbm_driver gbm_driver_exynos; @@ -108,7 +88,7 @@ gbm_device_get_backend_name(struct gbm_device *gbm) PUBLIC int gbm_device_is_format_supported(struct gbm_device *gbm, - uint32_t format, uint32_t usage) + uint32_t format, uint32_t usage) { unsigned i; @@ -169,9 +149,13 @@ PUBLIC void gbm_device_destroy(struct gbm_device *gbm) free(gbm); } -PUBLIC struct gbm_surface *gbm_surface_create(struct gbm_device *gbm, uint32_t width, uint32_t height, uint32_t format, uint32_t flags) +PUBLIC struct gbm_surface *gbm_surface_create(struct gbm_device *gbm, + uint32_t width, uint32_t height, + uint32_t format, uint32_t flags) { - struct gbm_surface *surface = (struct gbm_surface*) malloc(sizeof(*surface)); + struct gbm_surface *surface = + (struct gbm_surface*) malloc(sizeof(*surface)); + if (!surface) return NULL; @@ -188,11 +172,14 @@ PUBLIC struct gbm_bo *gbm_surface_lock_front_buffer(struct gbm_surface *surface) return NULL; } -PUBLIC void gbm_surface_release_buffer(struct gbm_surface *surface, struct gbm_bo *bo) +PUBLIC void gbm_surface_release_buffer(struct gbm_surface *surface, + struct gbm_bo *bo) { } -PUBLIC struct gbm_bo *gbm_bo_create(struct gbm_device *gbm, uint32_t width, uint32_t height, uint32_t format, uint32_t flags) +PUBLIC struct gbm_bo *gbm_bo_create(struct gbm_device *gbm, uint32_t width, + uint32_t height, uint32_t format, + uint32_t flags) { struct gbm_bo *bo; int ret; diff --git a/helpers.c b/helpers.c index a9673df..605a107 100644 --- a/helpers.c +++ b/helpers.c @@ -88,7 +88,8 @@ int gbm_is_format_supported(struct gbm_bo *bo) return 1; } -int gbm_dumb_bo_create(struct gbm_bo *bo, uint32_t width, uint32_t height, uint32_t format, uint32_t flags) +int gbm_dumb_bo_create(struct gbm_bo *bo, uint32_t width, uint32_t height, + uint32_t format, uint32_t flags) { struct drm_mode_create_dumb create_dumb; int ret; diff --git a/helpers.h b/helpers.h index d4523b0..06b59ba 100644 --- a/helpers.h +++ b/helpers.h @@ -10,7 +10,8 @@ int gbm_bpp_from_format(uint32_t format); int gbm_bytes_from_format(uint32_t format); int gbm_is_format_supported(struct gbm_bo *bo); -int gbm_dumb_bo_create(struct gbm_bo *bo, uint32_t width, uint32_t height, uint32_t format, uint32_t flags); +int gbm_dumb_bo_create(struct gbm_bo *bo, uint32_t width, uint32_t height, + uint32_t format, uint32_t flags); int gbm_dumb_bo_destroy(struct gbm_bo *bo); int gbm_gem_bo_destroy(struct gbm_bo *bo); diff --git a/i915.c b/i915.c index 53f36b7..6e2436b 100644 --- a/i915.c +++ b/i915.c @@ -25,7 +25,8 @@ struct gbm_i915_device static int get_gen(int device_id) { - const uint16_t gen3_ids[] = {0x2582, 0x2592, 0x2772, 0x27A2, 0x27AE, 0x29C2, 0x29B2, 0x29D2, 0xA001, 0xA011}; + const uint16_t gen3_ids[] = {0x2582, 0x2592, 0x2772, 0x27A2, 0x27AE, + 0x29C2, 0x29B2, 0x29D2, 0xA001, 0xA011}; unsigned i; for(i = 0; i < ARRAY_SIZE(gen3_ids); i++) if (gen3_ids[i] == device_id) @@ -68,7 +69,8 @@ void gbm_i915_close(struct gbm_device *gbm) gbm->priv = NULL; } -static void i915_align_dimensions(struct gbm_device *gbm, uint32_t tiling_mode, uint32_t *width, uint32_t *height, int bpp) +static void i915_align_dimensions(struct gbm_device *gbm, uint32_t tiling_mode, + uint32_t *width, uint32_t *height, int bpp) { struct gbm_i915_device *i915_gbm = (struct gbm_i915_device *)gbm->priv; uint32_t width_alignment = 4, height_alignment = 4; @@ -107,7 +109,8 @@ static void i915_align_dimensions(struct gbm_device *gbm, uint32_t tiling_mode, } } -static int i915_verify_dimensions(struct gbm_device *gbm, uint32_t stride, uint32_t height) +static int i915_verify_dimensions(struct gbm_device *gbm, uint32_t stride, + uint32_t height) { struct gbm_i915_device *i915_gbm = (struct gbm_i915_device *)gbm->priv; if (i915_gbm->gen <= 3 && stride > 8192) @@ -116,7 +119,8 @@ static int i915_verify_dimensions(struct gbm_device *gbm, uint32_t stride, uint3 return 1; } -int gbm_i915_bo_create(struct gbm_bo *bo, uint32_t width, uint32_t height, uint32_t format, uint32_t flags) +int gbm_i915_bo_create(struct gbm_bo *bo, uint32_t width, uint32_t height, + uint32_t format, uint32_t flags) { struct gbm_device *gbm = bo->gbm; int bpp = gbm_bytes_from_format(format); @@ -158,7 +162,8 @@ int gbm_i915_bo_create(struct gbm_bo *bo, uint32_t width, uint32_t height, uint3 gem_set_tiling.handle = bo->handle.u32; gem_set_tiling.tiling_mode = tiling_mode; gem_set_tiling.stride = bo->stride; - ret = drmIoctl(gbm->fd, DRM_IOCTL_I915_GEM_SET_TILING, &gem_set_tiling); + ret = drmIoctl(gbm->fd, DRM_IOCTL_I915_GEM_SET_TILING, + &gem_set_tiling); } while (ret == -1 && (errno == EINTR || errno == EAGAIN)); if (ret == -1) { diff --git a/mediatek.c b/mediatek.c index c33dc90..e1d8f29 100644 --- a/mediatek.c +++ b/mediatek.c @@ -14,7 +14,8 @@ #include "gbm_priv.h" #include "helpers.h" -int gbm_mediatek_bo_create(struct gbm_bo *bo, uint32_t width, uint32_t height, uint32_t format, uint32_t flags) +int gbm_mediatek_bo_create(struct gbm_bo *bo, uint32_t width, uint32_t height, + uint32_t format, uint32_t flags) { size_t size = width * height * gbm_bytes_from_format(format); struct drm_mtk_gem_create gem_create; diff --git a/rockchip.c b/rockchip.c index 92c8ca9..db17d7c 100644 --- a/rockchip.c +++ b/rockchip.c @@ -14,7 +14,8 @@ #include "gbm_priv.h" #include "helpers.h" -int gbm_rockchip_bo_create(struct gbm_bo *bo, uint32_t width, uint32_t height, uint32_t format, uint32_t flags) +int gbm_rockchip_bo_create(struct gbm_bo *bo, uint32_t width, uint32_t height, + uint32_t format, uint32_t flags) { size_t size = width * height * gbm_bytes_from_format(format); struct drm_rockchip_gem_create gem_create; diff --git a/tegra.c b/tegra.c index dcd53e9..4ffe037 100644 --- a/tegra.c +++ b/tegra.c @@ -54,7 +54,8 @@ static inline uint32_t align_up(uint32_t value, uint32_t alignment) } static void compute_layout_blocklinear(int width, int height, int format, - enum nv_mem_kind *kind, uint32_t *block_height_log2, + enum nv_mem_kind *kind, + uint32_t *block_height_log2, uint32_t *stride, uint32_t *size) { int pitch = width * gbm_bytes_from_format(format); @@ -65,7 +66,8 @@ static void compute_layout_blocklinear(int width, int height, int format, /* Compute padded height. */ *block_height_log2 = compute_block_height_log2(height); int block_height = 1 << *block_height_log2; - int padded_height = align_up(height, NV_BLOCKLINEAR_GOB_HEIGHT * block_height); + int padded_height = + align_up(height, NV_BLOCKLINEAR_GOB_HEIGHT * block_height); int bytes = pitch * padded_height; @@ -87,8 +89,8 @@ static void compute_layout_linear(int width, int height, int format, *size = *stride * height; } -static int gbm_tegra_bo_create(struct gbm_bo *bo, uint32_t width, uint32_t height, - uint32_t format, uint32_t flags) +static int gbm_tegra_bo_create(struct gbm_bo *bo, uint32_t width, + uint32_t height, uint32_t format, uint32_t flags) { uint32_t size, stride, block_height_log2 = 0; enum nv_mem_kind kind = NV_MEM_KIND_PITCH; @@ -124,8 +126,8 @@ static int gbm_tegra_bo_create(struct gbm_bo *bo, uint32_t width, uint32_t heigh gem_tile.mode = DRM_TEGRA_GEM_TILING_MODE_BLOCK; gem_tile.value = block_height_log2; - ret = drmCommandWriteRead(bo->gbm->fd, DRM_TEGRA_GEM_SET_TILING, &gem_tile, - sizeof(gem_tile)); + ret = drmCommandWriteRead(bo->gbm->fd, DRM_TEGRA_GEM_SET_TILING, + &gem_tile, sizeof(gem_tile)); if (ret < 0) { gbm_gem_bo_destroy(bo); return ret; -- 2.11.0