summaryrefslogtreecommitdiffstats
path: root/hwc
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2012-01-08 10:18:45 +0000
committerSteve Block <steveblock@google.com>2012-01-08 11:03:25 +0000
commit46de639b23db99d7b99ff1c676ac98b84b6336c6 (patch)
tree8a13cf643d5f01f35b2e4ef547e1ffad43f4f61f /hwc
parente158d63111a2547aee847e19aaa6fa6fce14ffe2 (diff)
downloadhardware_ti_omap4xxx-46de639b23db99d7b99ff1c676ac98b84b6336c6.zip
hardware_ti_omap4xxx-46de639b23db99d7b99ff1c676ac98b84b6336c6.tar.gz
hardware_ti_omap4xxx-46de639b23db99d7b99ff1c676ac98b84b6336c6.tar.bz2
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/#/c/157220 Bug: 5449033 Change-Id: I7d131473964d92c62a495d082a1207867f435885
Diffstat (limited to 'hwc')
-rw-r--r--hwc/hwc.c52
1 files changed, 26 insertions, 26 deletions
diff --git a/hwc/hwc.c b/hwc/hwc.c
index 146bc5d..ab4ce39 100644
--- a/hwc/hwc.c
+++ b/hwc/hwc.c
@@ -1101,7 +1101,7 @@ static int clone_layer(omap4_hwc_device_t *hwc_dev, int ix) {
struct dss2_ovl_info *o = &dsscomp->ovls[dsscomp->num_ovls];
if (dsscomp->num_ovls >= MAX_HW_OVERLAYS) {
- LOGE("**** cannot clone layer #%d. using all %d overlays.", ix, dsscomp->num_ovls);
+ ALOGE("**** cannot clone layer #%d. using all %d overlays.", ix, dsscomp->num_ovls);
return -EBUSY;
}
@@ -1294,7 +1294,7 @@ static int omap4_hwc_prepare(struct hwc_composer_device *dev, hwc_layer_list_t*
/* assign a z-layer for fb */
if (fb_z < 0) {
if (num.composited_layers)
- LOGE("**** should have assigned z-layer for fb");
+ ALOGE("**** should have assigned z-layer for fb");
fb_z = z++;
}
@@ -1346,16 +1346,16 @@ static int omap4_hwc_prepare(struct hwc_composer_device *dev, hwc_layer_list_t*
ext->last = ext->current;
if (z != dsscomp->num_ovls || dsscomp->num_ovls > MAX_HW_OVERLAYS)
- LOGE("**** used %d z-layers for %d overlays\n", z, dsscomp->num_ovls);
+ ALOGE("**** used %d z-layers for %d overlays\n", z, dsscomp->num_ovls);
/* verify all z-orders and overlay indices are distinct */
for (i = z = ix = 0; i < dsscomp->num_ovls; i++) {
struct dss2_ovl_cfg *c = &dsscomp->ovls[i].cfg;
if (z & (1 << c->zorder))
- LOGE("**** used z-order #%d multiple times", c->zorder);
+ ALOGE("**** used z-order #%d multiple times", c->zorder);
if (ix & (1 << c->ix))
- LOGE("**** used ovl index #%d multiple times", c->ix);
+ ALOGE("**** used ovl index #%d multiple times", c->ix);
z |= 1 << c->zorder;
ix |= 1 << c->ix;
}
@@ -1442,7 +1442,7 @@ static int omap4_hwc_set(struct hwc_composer_device *dev, hwc_display_t dpy,
if (hwc_dev->use_sgx) {
if (!eglSwapBuffers((EGLDisplay)dpy, (EGLSurface)sur)) {
- LOGE("eglSwapBuffers error");
+ ALOGE("eglSwapBuffers error");
err = HWC_EGL_ERROR;
goto err_out;
}
@@ -1464,7 +1464,7 @@ static int omap4_hwc_set(struct hwc_composer_device *dev, hwc_display_t dpy,
__u32 crt = 0;
int err2 = ioctl(hwc_dev->fb_fd, FBIO_WAITFORVSYNC, &crt);
if (err2) {
- LOGE("failed to wait for vsync (%d)", errno);
+ ALOGE("failed to wait for vsync (%d)", errno);
err = err ? : -errno;
}
}
@@ -1472,7 +1472,7 @@ static int omap4_hwc_set(struct hwc_composer_device *dev, hwc_display_t dpy,
hwc_dev->last_ext_ovls = hwc_dev->ext_ovls;
hwc_dev->last_int_ovls = hwc_dev->post2_layers;
if (err)
- LOGE("Post2 error");
+ ALOGE("Post2 error");
err_out:
pthread_mutex_unlock(&hwc_dev->lock);
@@ -1525,7 +1525,7 @@ static int load_png_image(omap4_hwc_device_t *hwc_dev, char *path, struct omap4_
FILE *fd = fopen(path, "rb");
if (!fd) {
- LOGE("failed to open PNG file %s: (%d)", path, errno);
+ ALOGE("failed to open PNG file %s: (%d)", path, errno);
return -EINVAL;
}
@@ -1533,7 +1533,7 @@ static int load_png_image(omap4_hwc_device_t *hwc_dev, char *path, struct omap4_
__u8 header[SIZE_PNG_HEADER];
fread(header, 1, SIZE_PNG_HEADER, fd);
if (png_sig_cmp(header, 0, SIZE_PNG_HEADER)) {
- LOGE("%s is not a PNG file", path);
+ ALOGE("%s is not a PNG file", path);
goto fail;
}
@@ -1581,7 +1581,7 @@ static int load_png_image(omap4_hwc_device_t *hwc_dev, char *path, struct omap4_
png_set_bgr(png_ptr);
break;
default:
- LOGE("unsupported PNG color: %x", color_type);
+ ALOGE("unsupported PNG color: %x", color_type);
goto fail_alloc;
}
@@ -1591,14 +1591,14 @@ static int load_png_image(omap4_hwc_device_t *hwc_dev, char *path, struct omap4_
const int bpp = 4;
img->size = ALIGN(width * height * bpp, 4096);
if (img->size > hwc_dev->img_mem_size) {
- LOGE("image does not fit into framebuffer area (%d > %d)", img->size, hwc_dev->img_mem_size);
+ ALOGE("image does not fit into framebuffer area (%d > %d)", img->size, hwc_dev->img_mem_size);
goto fail_alloc;
}
img->ptr = hwc_dev->img_mem_ptr;
row_pointers = calloc(height, sizeof(*row_pointers));
if (!row_pointers) {
- LOGE("failed to allocate row pointers");
+ ALOGE("failed to allocate row pointers");
goto fail_alloc;
}
__u32 i;
@@ -1621,7 +1621,7 @@ fail_alloc:
free_png_image(hwc_dev, img);
free(row_pointers);
if (!png_ptr || !info_ptr)
- LOGE("failed to allocate PNG structures");
+ ALOGE("failed to allocate PNG structures");
png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
fail:
fclose(fd);
@@ -1670,7 +1670,7 @@ static int omap4_hwc_open_fb_hal(IMG_framebuffer_device_public_t **fb_dev)
return 0;
err_out:
- LOGE("Composer HAL failed to load compatible Graphics HAL");
+ ALOGE("Composer HAL failed to load compatible Graphics HAL");
return err;
}
@@ -1810,7 +1810,7 @@ static void *omap4_hwc_hdmi_thread(void *data)
if (err == -1) {
if (errno != EINTR)
- LOGE("event error: %m");
+ ALOGE("event error: %m");
continue;
}
@@ -1856,7 +1856,7 @@ static int omap4_hwc_device_open(const hw_module_t* module, const char* name,
return err;
if (!hwc_mod->fb_dev) {
- LOGE("Framebuffer HAL not opened before HWC");
+ ALOGE("Framebuffer HAL not opened before HWC");
return -EFAULT;
}
hwc_mod->fb_dev->bBypassPost = 1;
@@ -1881,28 +1881,28 @@ static int omap4_hwc_device_open(const hw_module_t* module, const char* name,
hwc_dev->dsscomp_fd = open("/dev/dsscomp", O_RDWR);
if (hwc_dev->dsscomp_fd < 0) {
- LOGE("failed to open dsscomp (%d)", errno);
+ ALOGE("failed to open dsscomp (%d)", errno);
err = -errno;
goto done;
}
hwc_dev->hdmi_fb_fd = open("/dev/graphics/fb1", O_RDWR);
if (hwc_dev->hdmi_fb_fd < 0) {
- LOGE("failed to open hdmi fb (%d)", errno);
+ ALOGE("failed to open hdmi fb (%d)", errno);
err = -errno;
goto done;
}
hwc_dev->fb_fd = open("/dev/graphics/fb0", O_RDWR);
if (hwc_dev->fb_fd < 0) {
- LOGE("failed to open fb (%d)", errno);
+ ALOGE("failed to open fb (%d)", errno);
err = -errno;
goto done;
}
struct fb_fix_screeninfo fix;
if (ioctl(hwc_dev->fb_fd, FBIOGET_FSCREENINFO, &fix)) {
- LOGE("failed to get fb info (%d)", errno);
+ ALOGE("failed to get fb info (%d)", errno);
err = -errno;
goto done;
}
@@ -1910,7 +1910,7 @@ static int omap4_hwc_device_open(const hw_module_t* module, const char* name,
hwc_dev->img_mem_size = fix.smem_len;
hwc_dev->img_mem_ptr = mmap(NULL, fix.smem_len, PROT_WRITE, MAP_SHARED, hwc_dev->fb_fd, 0);
if (hwc_dev->img_mem_ptr == MAP_FAILED) {
- LOGE("failed to map fb memory");
+ ALOGE("failed to map fb memory");
err = -errno;
goto done;
}
@@ -1923,7 +1923,7 @@ static int omap4_hwc_device_open(const hw_module_t* module, const char* name,
int ret = ioctl(hwc_dev->dsscomp_fd, DSSCIOC_QUERY_DISPLAY, &hwc_dev->fb_dis);
if (ret) {
- LOGE("failed to get display info (%d): %m", errno);
+ ALOGE("failed to get display info (%d): %m", errno);
err = -errno;
goto done;
}
@@ -1931,19 +1931,19 @@ static int omap4_hwc_device_open(const hw_module_t* module, const char* name,
hwc_dev->fb_dis.height_in_mm * hwc_dev->fb_dis.timings.y_res;
if (pipe(hwc_dev->pipe_fds) == -1) {
- LOGE("failed to event pipe (%d): %m", errno);
+ ALOGE("failed to event pipe (%d): %m", errno);
err = -errno;
goto done;
}
if (pthread_mutex_init(&hwc_dev->lock, NULL)) {
- LOGE("failed to create mutex (%d): %m", errno);
+ ALOGE("failed to create mutex (%d): %m", errno);
err = -errno;
goto done;
}
if (pthread_create(&hwc_dev->hdmi_thread, NULL, omap4_hwc_hdmi_thread, hwc_dev))
{
- LOGE("failed to create HDMI listening thread (%d): %m", errno);
+ ALOGE("failed to create HDMI listening thread (%d): %m", errno);
err = -errno;
goto done;
}