diff options
author | Nicholas Chan <n-chan1@ti.com> | 2016-07-01 13:55:48 -0500 |
---|---|---|
committer | Gowtham Tammana <g-tammana@ti.com> | 2017-02-20 12:03:15 -0500 |
commit | 25a9ef013e37e8ec9f86419008f65d8df40f48d3 (patch) | |
tree | 4fa510de2c129b86abfed7af82d6933be2c34a67 | |
parent | e004cd08fcbfcd8f17354e87d5e9484859c73d5b (diff) | |
download | dra7xx-25a9ef013e37e8ec9f86419008f65d8df40f48d3.tar.gz |
hwc: Fix signed/unsigned warnings
Change-Id: I0c672d50ad056628719b8e7fa614b6f30dd823bd
Signed-off-by: Nicholas Chan <n-chan1@ti.com>
-rw-r--r-- | hwcomposer/display.c | 12 | ||||
-rw-r--r-- | hwcomposer/display.h | 4 | ||||
-rw-r--r-- | hwcomposer/hwc.c | 2 | ||||
-rw-r--r-- | hwcomposer/layer.c | 2 |
4 files changed, 9 insertions, 11 deletions
diff --git a/hwcomposer/display.c b/hwcomposer/display.c index 72fd516..f1b4b33 100644 --- a/hwcomposer/display.c +++ b/hwcomposer/display.c @@ -706,7 +706,7 @@ int init_primary_display(omap_hwc_device_t *hwc_dev) uint32_t connector_type; /* Open DRM device */ - for (i = 0; i < ARRAY_SIZE(modules); i++) { + for (i = 0; i < (int)ARRAY_SIZE(modules); i++) { drm_fd = drmOpen(modules[i], NULL); if (drm_fd >= 0) { ALOGI("Open %s drm device (%d)\n", modules[i], drm_fd); @@ -1098,7 +1098,7 @@ int update_display(omap_hwc_device_t *ctx, int disp, hwc_display_contents_1_t *list) { int ret = 0; - int i = 0; + uint32_t i = 0; int fence_fd = -1; drm_fb_info_t fb_info = { 0 }; display_t *display = ctx->displays[disp]; @@ -1670,7 +1670,7 @@ int apply_display_transform(omap_hwc_device_t *hwc_dev, int disp) composition_t *comp; comp = &display->composition; - uint32_t i; + int i; for (i = 0; i < hwc_dev->num_ovls; i++) { if (comp->planes[i].crtc_id == display->disp_link.crtc_id) @@ -1707,7 +1707,7 @@ int display_assign_pipes_for_composition(display_t *display, int disp) omap_hwc_device_t *hwc_dev = kdisp->ctx; drmModePlaneRes *planes_res; drmModePlanePtr plane; - int i = 0; + uint32_t i = 0; int count = 0; uint32_t display_mask = 1 << disp; @@ -1744,7 +1744,7 @@ int display_assign_pipes_for_composition(display_t *display, int disp) int get_plane_resource(omap_hwc_device_t *hwc_dev, int disp) { int err = 0; - int i = 0; + uint32_t i = 0; int drm_fd = hwc_dev->drm_fd; drmModePlaneRes *planes_res; @@ -1767,5 +1767,3 @@ free_plane: return err; } - - diff --git a/hwcomposer/display.h b/hwcomposer/display.h index 66cfbc3..5ba96c3 100644 --- a/hwcomposer/display.h +++ b/hwcomposer/display.h @@ -173,11 +173,11 @@ typedef struct kms_display { drmModeEncoderPtr enc; drmModeCrtcPtr crtc; int is_crtc_set; - int crtc_id; + uint32_t crtc_id; drmModeModeInfoPtr mode; drmEventContext evctx; drmModeFB fb; - int plane_id; + uint32_t plane_id; drmModeAtomicReqPtr atomic_req; fb_buffers_t fb_bufs[DSS_AVAILABLE_PIPES]; diff --git a/hwcomposer/hwc.c b/hwcomposer/hwc.c index 71084b0..4eb1d63 100644 --- a/hwcomposer/hwc.c +++ b/hwcomposer/hwc.c @@ -127,7 +127,7 @@ static void hwc_check_blitter_composition(omap_hwc_device_t *hwc_dev, int disp) blit_device_t *bdev = hwc_dev->blitter; composition_t *comp = &display->composition; hwc_display_contents_1_t *list = display->contents; - int ret = 0; + uint32_t ret = 0; uint32_t i = 0; if (bdev && disp == 0) { diff --git a/hwcomposer/layer.c b/hwcomposer/layer.c index 4edf81b..5cf6b03 100644 --- a/hwcomposer/layer.c +++ b/hwcomposer/layer.c @@ -159,7 +159,7 @@ bool is_composable_layer(omap_hwc_device_t *hwc_dev, int disp, const hwc_layer_1 if (!is_nv12_layer(layer)) { if (layer->transform) return false; - if (get_required_mem1d_size(layer) > hwc_dev->tiler1d_slot_size) + if ((int)get_required_mem1d_size(layer) > hwc_dev->tiler1d_slot_size) return false; } |