From 3fc2ca9f38b75a67b1543c84cce91964c268adc7 Mon Sep 17 00:00:00 2001 From: Andrew Dodd Date: Wed, 5 Dec 2012 00:47:48 -0500 Subject: [PATCH] gralloc: Let } rejoin its people This is the story of poor }. It is a painful saga. Samsung left } floating inside the galaxy of framebuffer_alloc, unable to join its brethren on the planet of STANDARD_LINUX_SCREEN when they were shifted out of the #ifdef dimension. codeworkx brutally eliminated poor } from the galaxy, it was nowhere to be seen. codeworkx then took pity on the } and placed it back on the planet of STANDARD_LINUX_SCREEN, but placed it on a continent where it was all alone, unable to ever see its mate { Take pity on poor }, let it rejoin its people on the correct continent of the planet STANDARD_LINUX_SCREEN, so they may all shift out of the #ifdef dimension together. Change-Id: I7a700b73ccd2c91f91d9af3704930759f46978c7 --- exynos4/hal/libgralloc_ump/framebuffer_device.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/exynos4/hal/libgralloc_ump/framebuffer_device.cpp b/exynos4/hal/libgralloc_ump/framebuffer_device.cpp index 9fec7337..cfdedba3 100644 --- a/exynos4/hal/libgralloc_ump/framebuffer_device.cpp +++ b/exynos4/hal/libgralloc_ump/framebuffer_device.cpp @@ -128,6 +128,7 @@ static int fb_post(struct framebuffer_device_t* dev, buffer_handle_t buffer) ALOGE("S3CFB_SET_VSYNC_INT disable failed"); return 0; } + } #else /*Standard Android way*/ #ifdef MALI_VSYNC_EVENT_REPORT_ENABLE @@ -145,9 +146,7 @@ static int fb_post(struct framebuffer_device_t* dev, buffer_handle_t buffer) gralloc_mali_vsync_report(MALI_VSYNC_EVENT_END_WAIT); #endif #endif -#ifdef STANDARD_LINUX_SCREEN - } -#endif + m->currentBuffer = buffer; } else { /*