From 86d0ca61294814820f31ca633721a8fc031a5fa9 Mon Sep 17 00:00:00 2001 From: PaulK Date: Sun, 8 Apr 2012 15:38:27 +0200 Subject: Removed libgralloc from device files --- libgralloc/Android.mk | 39 ----- libgralloc/framebuffer.cpp | 367 --------------------------------------------- libgralloc/gr.h | 64 -------- libgralloc/gralloc.cpp | 311 -------------------------------------- libgralloc/gralloc_priv.h | 112 -------------- libgralloc/mapper.cpp | 169 --------------------- 6 files changed, 1062 deletions(-) delete mode 100644 libgralloc/Android.mk delete mode 100644 libgralloc/framebuffer.cpp delete mode 100644 libgralloc/gr.h delete mode 100644 libgralloc/gralloc.cpp delete mode 100644 libgralloc/gralloc_priv.h delete mode 100644 libgralloc/mapper.cpp diff --git a/libgralloc/Android.mk b/libgralloc/Android.mk deleted file mode 100644 index 44c0746..0000000 --- a/libgralloc/Android.mk +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright (C) 2008 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - - -LOCAL_PATH := $(call my-dir) - -# HAL module implemenation, not prelinked and stored in -# hw/..so -include $(CLEAR_VARS) -LOCAL_PRELINK_MODULE := false -LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw -LOCAL_SHARED_LIBRARIES := liblog libcutils - -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/../include - -LOCAL_SRC_FILES := \ - gralloc.cpp \ - framebuffer.cpp \ - mapper.cpp - -LOCAL_MODULE := gralloc.$(TARGET_BOARD_PLATFORM) -LOCAL_CFLAGS:= -DLOG_TAG=\"gralloc\" -ifeq ($(BOARD_NO_PAGE_FLIPPING),true) -LOCAL_CFLAGS += -DNO_PAGE_FLIPPING -endif - -include $(BUILD_SHARED_LIBRARY) diff --git a/libgralloc/framebuffer.cpp b/libgralloc/framebuffer.cpp deleted file mode 100644 index f155b54..0000000 --- a/libgralloc/framebuffer.cpp +++ /dev/null @@ -1,367 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include - -#include - -#include -#include - -#include -#include - -#include -#include -#include -#include -#include - -#include -#include - -#if HAVE_ANDROID_OS -#include -#include -#endif - -#include "gralloc_priv.h" -#include "gr.h" - -/*****************************************************************************/ - -// numbers of buffers for page flipping -#if defined(NO_PAGE_FLIPPING) -// page-flipping is buggy on some devices -#define NUM_BUFFERS 1 -#else -#define NUM_BUFFERS 2 -#endif - - -enum { - PAGE_FLIP = 0x00000001, - LOCKED = 0x00000002 -}; - -struct fb_context_t { - framebuffer_device_t device; -}; - -/*****************************************************************************/ - -static int fb_setSwapInterval(struct framebuffer_device_t* dev, - int interval) -{ - fb_context_t* ctx = (fb_context_t*)dev; - if (interval < dev->minSwapInterval || interval > dev->maxSwapInterval) - return -EINVAL; - // FIXME: implement fb_setSwapInterval - return 0; -} - -static int fb_setUpdateRect(struct framebuffer_device_t* dev, - int l, int t, int w, int h) -{ - if (((w|h) <= 0) || ((l|t)<0)) - return -EINVAL; - - fb_context_t* ctx = (fb_context_t*)dev; - private_module_t* m = reinterpret_cast( - dev->common.module); - m->info.reserved[0] = 0x54445055; // "UPDT"; - m->info.reserved[1] = (uint16_t)l | ((uint32_t)t << 16); - m->info.reserved[2] = (uint16_t)(l+w) | ((uint32_t)(t+h) << 16); - return 0; -} - -static int fb_post(struct framebuffer_device_t* dev, buffer_handle_t buffer) -{ - if (private_handle_t::validate(buffer) < 0) - return -EINVAL; - - fb_context_t* ctx = (fb_context_t*)dev; - - private_handle_t const* hnd = reinterpret_cast(buffer); - private_module_t* m = reinterpret_cast( - dev->common.module); - - if (hnd->flags & private_handle_t::PRIV_FLAGS_FRAMEBUFFER) { - const size_t offset = hnd->base - m->framebuffer->base; - m->info.activate = FB_ACTIVATE_VBL; - m->info.yoffset = offset / m->finfo.line_length; - if (ioctl(m->framebuffer->fd, FBIOPUT_VSCREENINFO, &m->info) == -1) { - LOGE("FBIOPUT_VSCREENINFO failed"); - m->base.unlock(&m->base, buffer); - return -errno; - } - m->currentBuffer = buffer; - - } else { - // If we can't do the page_flip, just copy the buffer to the front - // FIXME: use copybit HAL instead of memcpy - - void* fb_vaddr; - void* buffer_vaddr; - - m->base.lock(&m->base, m->framebuffer, - GRALLOC_USAGE_SW_WRITE_RARELY, - 0, 0, m->info.xres, m->info.yres, - &fb_vaddr); - - m->base.lock(&m->base, buffer, - GRALLOC_USAGE_SW_READ_RARELY, - 0, 0, m->info.xres, m->info.yres, - &buffer_vaddr); - - memcpy(fb_vaddr, buffer_vaddr, m->finfo.line_length * m->info.yres); - - m->base.unlock(&m->base, buffer); - m->base.unlock(&m->base, m->framebuffer); - } - - return 0; -} - -/*****************************************************************************/ - -int mapFrameBufferLocked(struct private_module_t* module) -{ - // already initialized... - if (module->framebuffer) { - return 0; - } - - char const * const device_template[] = { - "/dev/graphics/fb%u", - "/dev/fb%u", - 0 }; - - int fd = -1; - int i=0; - char name[64]; - - while ((fd==-1) && device_template[i]) { - snprintf(name, 64, device_template[i], 0); - fd = open(name, O_RDWR, 0); - i++; - } - if (fd < 0) - return -errno; - - struct fb_fix_screeninfo finfo; - if (ioctl(fd, FBIOGET_FSCREENINFO, &finfo) == -1) - return -errno; - - struct fb_var_screeninfo info; - if (ioctl(fd, FBIOGET_VSCREENINFO, &info) == -1) - return -errno; - - info.reserved[0] = 0; - info.reserved[1] = 0; - info.reserved[2] = 0; - info.xoffset = 0; - info.yoffset = 0; - info.activate = FB_ACTIVATE_NOW; - - /* - * Request NUM_BUFFERS screens (at lest 2 for page flipping) - */ - info.yres_virtual = info.yres * NUM_BUFFERS; - - - uint32_t flags = PAGE_FLIP; - if (ioctl(fd, FBIOPUT_VSCREENINFO, &info) == -1) { - info.yres_virtual = info.yres; - flags &= ~PAGE_FLIP; - LOGW("FBIOPUT_VSCREENINFO failed, page flipping not supported"); - } - - if (info.yres_virtual < info.yres * 2) { - // we need at least 2 for page-flipping - info.yres_virtual = info.yres; - flags &= ~PAGE_FLIP; - LOGW("page flipping not supported (yres_virtual=%d, requested=%d)", - info.yres_virtual, info.yres*2); - } - - if (ioctl(fd, FBIOGET_VSCREENINFO, &info) == -1) - return -errno; - - uint64_t refreshQuotient = - ( - uint64_t( info.upper_margin + info.lower_margin + info.yres ) - * ( info.left_margin + info.right_margin + info.xres ) - * info.pixclock - ); - - /* Beware, info.pixclock might be 0 under emulation, so avoid a - * division-by-0 here (SIGFPE on ARM) */ - int refreshRate = refreshQuotient > 0 ? (int)(1000000000000000LLU / refreshQuotient) : 0; - - if (refreshRate == 0) { - // bleagh, bad info from the driver - refreshRate = 60*1000; // 60 Hz - } - - if (int(info.width) <= 0 || int(info.height) <= 0) { - // the driver doesn't return that information - // default to 160 dpi - info.width = ((info.xres * 25.4f)/160.0f + 0.5f); - info.height = ((info.yres * 25.4f)/160.0f + 0.5f); - } - - float xdpi = (info.xres * 25.4f) / info.width; - float ydpi = (info.yres * 25.4f) / info.height; - float fps = refreshRate / 1000.0f; - - LOGI( "using (fd=%d)\n" - "id = %s\n" - "xres = %d px\n" - "yres = %d px\n" - "xres_virtual = %d px\n" - "yres_virtual = %d px\n" - "bpp = %d\n" - "r = %2u:%u\n" - "g = %2u:%u\n" - "b = %2u:%u\n", - fd, - finfo.id, - info.xres, - info.yres, - info.xres_virtual, - info.yres_virtual, - info.bits_per_pixel, - info.red.offset, info.red.length, - info.green.offset, info.green.length, - info.blue.offset, info.blue.length - ); - - LOGI( "width = %d mm (%f dpi)\n" - "height = %d mm (%f dpi)\n" - "refresh rate = %.2f Hz\n", - info.width, xdpi, - info.height, ydpi, - fps - ); - - - if (ioctl(fd, FBIOGET_FSCREENINFO, &finfo) == -1) - return -errno; - - if (finfo.smem_len <= 0) - return -errno; - - - module->flags = flags; - module->info = info; - module->finfo = finfo; - module->xdpi = xdpi; - module->ydpi = ydpi; - module->fps = fps; - - /* - * map the framebuffer - */ - - int err; - size_t fbSize = roundUpToPageSize(finfo.line_length * info.yres_virtual); - module->framebuffer = new private_handle_t(dup(fd), fbSize, 0); - - module->numBuffers = info.yres_virtual / info.yres; - module->bufferMask = 0; - - void* vaddr = mmap(0, fbSize, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0); - if (vaddr == MAP_FAILED) { - LOGE("Error mapping the framebuffer (%s)", strerror(errno)); - return -errno; - } - module->framebuffer->base = intptr_t(vaddr); - memset(vaddr, 0, fbSize); - - struct s3cfb_user_plane_alpha user_alpha; - - memset(&user_alpha, 0, sizeof(user_alpha)); - if(ioctl(fd, S3CFB_WIN_SET_PLANE_ALPHA, &user_alpha) == -1) - return -errno; - - return 0; -} - -static int mapFrameBuffer(struct private_module_t* module) -{ - pthread_mutex_lock(&module->lock); - int err = mapFrameBufferLocked(module); - pthread_mutex_unlock(&module->lock); - return err; -} - -/*****************************************************************************/ - -static int fb_close(struct hw_device_t *dev) -{ - fb_context_t* ctx = (fb_context_t*)dev; - if (ctx) { - free(ctx); - } - return 0; -} - -int fb_device_open(hw_module_t const* module, const char* name, - hw_device_t** device) -{ - int status = -EINVAL; - if (!strcmp(name, GRALLOC_HARDWARE_FB0)) { - alloc_device_t* gralloc_device; - status = gralloc_open(module, &gralloc_device); - if (status < 0) - return status; - - /* initialize our state here */ - fb_context_t *dev = (fb_context_t*)malloc(sizeof(*dev)); - memset(dev, 0, sizeof(*dev)); - - /* initialize the procs */ - dev->device.common.tag = HARDWARE_DEVICE_TAG; - dev->device.common.version = 0; - dev->device.common.module = const_cast(module); - dev->device.common.close = fb_close; - dev->device.setSwapInterval = fb_setSwapInterval; - dev->device.post = fb_post; - dev->device.setUpdateRect = 0; - - private_module_t* m = (private_module_t*)module; - status = mapFrameBuffer(m); - if (status >= 0) { - int stride = m->finfo.line_length / (m->info.bits_per_pixel >> 3); - int format = (m->info.bits_per_pixel == 32) - ? HAL_PIXEL_FORMAT_BGRA_8888 - : HAL_PIXEL_FORMAT_RGB_565; - const_cast(dev->device.flags) = 0; - const_cast(dev->device.width) = m->info.xres; - const_cast(dev->device.height) = m->info.yres; - const_cast(dev->device.stride) = stride; - const_cast(dev->device.format) = format; - const_cast(dev->device.xdpi) = m->xdpi; - const_cast(dev->device.ydpi) = m->ydpi; - const_cast(dev->device.fps) = m->fps; - const_cast(dev->device.minSwapInterval) = 0; - const_cast(dev->device.maxSwapInterval) = 1; - *device = &dev->device.common; - } - } - return status; -} diff --git a/libgralloc/gr.h b/libgralloc/gr.h deleted file mode 100644 index 3a43aa7..0000000 --- a/libgralloc/gr.h +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef GR_H_ -#define GR_H_ - -#include -#ifdef HAVE_ANDROID_OS // just want PAGE_SIZE define -# include -#else -# include -#endif -#include -#include -#include -#include -#include - -#include - -/*****************************************************************************/ - -struct private_module_t; -struct private_handle_t; - -inline size_t roundUpToPageSize(size_t x) { - return (x + (PAGE_SIZE-1)) & ~(PAGE_SIZE-1); -} - -int mapFrameBufferLocked(struct private_module_t* module); -int terminateBuffer(gralloc_module_t const* module, private_handle_t* hnd); -int mapBuffer(gralloc_module_t const* module, private_handle_t* hnd); - -/*****************************************************************************/ - -class Locker { - pthread_mutex_t mutex; -public: - class Autolock { - Locker& locker; - public: - inline Autolock(Locker& locker) : locker(locker) { locker.lock(); } - inline ~Autolock() { locker.unlock(); } - }; - inline Locker() { pthread_mutex_init(&mutex, 0); } - inline ~Locker() { pthread_mutex_destroy(&mutex); } - inline void lock() { pthread_mutex_lock(&mutex); } - inline void unlock() { pthread_mutex_unlock(&mutex); } -}; - -#endif /* GR_H_ */ diff --git a/libgralloc/gralloc.cpp b/libgralloc/gralloc.cpp deleted file mode 100644 index dcd2e2b..0000000 --- a/libgralloc/gralloc.cpp +++ /dev/null @@ -1,311 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include - -#include -#include -#include - -#include -#include - -#include "gralloc_priv.h" -#include "gr.h" - -/*****************************************************************************/ - -struct gralloc_context_t { - alloc_device_t device; - /* our private data here */ -}; - -static int gralloc_alloc_buffer(alloc_device_t* dev, - size_t size, int usage, buffer_handle_t* pHandle); - -/*****************************************************************************/ - -int fb_device_open(const hw_module_t* module, const char* name, - hw_device_t** device); - -static int gralloc_device_open(const hw_module_t* module, const char* name, - hw_device_t** device); - -extern int gralloc_lock(gralloc_module_t const* module, - buffer_handle_t handle, int usage, - int l, int t, int w, int h, - void** vaddr); - -extern int gralloc_unlock(gralloc_module_t const* module, - buffer_handle_t handle); - -extern int gralloc_register_buffer(gralloc_module_t const* module, - buffer_handle_t handle); - -extern int gralloc_unregister_buffer(gralloc_module_t const* module, - buffer_handle_t handle); - -/*****************************************************************************/ - -static struct hw_module_methods_t gralloc_module_methods = { - open: gralloc_device_open -}; - -struct private_module_t HAL_MODULE_INFO_SYM = { - base: { - common: { - tag: HARDWARE_MODULE_TAG, - version_major: 1, - version_minor: 0, - id: GRALLOC_HARDWARE_MODULE_ID, - name: "Graphics Memory Allocator Module", - author: "The Android Open Source Project", - methods: &gralloc_module_methods - }, - registerBuffer: gralloc_register_buffer, - unregisterBuffer: gralloc_unregister_buffer, - lock: gralloc_lock, - unlock: gralloc_unlock, - }, - framebuffer: 0, - flags: 0, - numBuffers: 0, - bufferMask: 0, - lock: PTHREAD_MUTEX_INITIALIZER, - currentBuffer: 0, -}; - -/*****************************************************************************/ - -static int gralloc_alloc_framebuffer_locked(alloc_device_t* dev, - size_t size, int usage, buffer_handle_t* pHandle) -{ - private_module_t* m = reinterpret_cast( - dev->common.module); - - // allocate the framebuffer - if (m->framebuffer == NULL) { - // initialize the framebuffer, the framebuffer is mapped once - // and forever. - int err = mapFrameBufferLocked(m); - if (err < 0) { - return err; - } - } - - const uint32_t bufferMask = m->bufferMask; - const uint32_t numBuffers = m->numBuffers; - const size_t bufferSize = m->finfo.line_length * m->info.yres; - if (numBuffers == 1) { - // If we have only one buffer, we never use page-flipping. Instead, - // we return a regular buffer which will be memcpy'ed to the main - // screen when post is called. - int newUsage = (usage & ~GRALLOC_USAGE_HW_FB) | GRALLOC_USAGE_HW_2D; - return gralloc_alloc_buffer(dev, bufferSize, newUsage, pHandle); - } - - if (bufferMask >= ((1LU<framebuffer->base); - private_handle_t* hnd = new private_handle_t(dup(m->framebuffer->fd), size, - private_handle_t::PRIV_FLAGS_FRAMEBUFFER); - - // find a free slot - for (uint32_t i=0 ; ibufferMask |= (1LU<base = vaddr; - hnd->offset = vaddr - intptr_t(m->framebuffer->base); - *pHandle = hnd; - - return 0; -} - -static int gralloc_alloc_framebuffer(alloc_device_t* dev, - size_t size, int usage, buffer_handle_t* pHandle) -{ - private_module_t* m = reinterpret_cast( - dev->common.module); - pthread_mutex_lock(&m->lock); - int err = gralloc_alloc_framebuffer_locked(dev, size, usage, pHandle); - pthread_mutex_unlock(&m->lock); - return err; -} - -static int gralloc_alloc_buffer(alloc_device_t* dev, - size_t size, int usage, buffer_handle_t* pHandle) -{ - int err = 0; - int fd = -1; - - size = roundUpToPageSize(size); - - fd = ashmem_create_region("gralloc-buffer", size); - if (fd < 0) { - LOGE("couldn't create ashmem (%s)", strerror(-errno)); - err = -errno; - } - - if (err == 0) { - private_handle_t* hnd = new private_handle_t(fd, size, 0); - gralloc_module_t* module = reinterpret_cast( - dev->common.module); - err = mapBuffer(module, hnd); - if (err == 0) { - *pHandle = hnd; - } - } - - LOGE_IF(err, "gralloc failed err=%s", strerror(-err)); - - return err; -} - -/*****************************************************************************/ - -static int gralloc_alloc(alloc_device_t* dev, - int w, int h, int format, int usage, - buffer_handle_t* pHandle, int* pStride) -{ - if (!pHandle || !pStride) - return -EINVAL; - - size_t size, stride; - - int align = 4; - int bpp = 0; - switch (format) { - case HAL_PIXEL_FORMAT_RGBA_8888: - case HAL_PIXEL_FORMAT_RGBX_8888: - case HAL_PIXEL_FORMAT_BGRA_8888: - bpp = 4; - break; - case HAL_PIXEL_FORMAT_RGB_888: - bpp = 3; - break; - case HAL_PIXEL_FORMAT_RGB_565: - case HAL_PIXEL_FORMAT_RGBA_5551: - case HAL_PIXEL_FORMAT_RGBA_4444: - bpp = 2; - break; - default: - return -EINVAL; - } - size_t bpr = (w*bpp + (align-1)) & ~(align-1); - size = bpr * h; - stride = bpr / bpp; - - int err; - if (usage & GRALLOC_USAGE_HW_FB) { - err = gralloc_alloc_framebuffer(dev, size, usage, pHandle); - } else { - err = gralloc_alloc_buffer(dev, size, usage, pHandle); - } - - if (err < 0) { - return err; - } - - *pStride = stride; - return 0; -} - -static int gralloc_free(alloc_device_t* dev, - buffer_handle_t handle) -{ - if (private_handle_t::validate(handle) < 0) - return -EINVAL; - - private_handle_t const* hnd = reinterpret_cast(handle); - if (hnd->flags & private_handle_t::PRIV_FLAGS_FRAMEBUFFER) { - // free this buffer - private_module_t* m = reinterpret_cast( - dev->common.module); - const size_t bufferSize = m->finfo.line_length * m->info.yres; - int index = (hnd->base - m->framebuffer->base) / bufferSize; - m->bufferMask &= ~(1<( - dev->common.module); - terminateBuffer(module, const_cast(hnd)); - } - - close(hnd->fd); - delete hnd; - return 0; -} - -/*****************************************************************************/ - -static int gralloc_close(struct hw_device_t *dev) -{ - gralloc_context_t* ctx = reinterpret_cast(dev); - if (ctx) { - /* TODO: keep a list of all buffer_handle_t created, and free them - * all here. - */ - free(ctx); - } - return 0; -} - -int gralloc_device_open(const hw_module_t* module, const char* name, - hw_device_t** device) -{ - int status = -EINVAL; - if (!strcmp(name, GRALLOC_HARDWARE_GPU0)) { - gralloc_context_t *dev; - dev = (gralloc_context_t*)malloc(sizeof(*dev)); - - /* initialize our state here */ - memset(dev, 0, sizeof(*dev)); - - /* initialize the procs */ - dev->device.common.tag = HARDWARE_DEVICE_TAG; - dev->device.common.version = 0; - dev->device.common.module = const_cast(module); - dev->device.common.close = gralloc_close; - - dev->device.alloc = gralloc_alloc; - dev->device.free = gralloc_free; - - *device = &dev->device.common; - status = 0; - } else { - status = fb_device_open(module, name, device); - } - return status; -} diff --git a/libgralloc/gralloc_priv.h b/libgralloc/gralloc_priv.h deleted file mode 100644 index 75bcd1d..0000000 --- a/libgralloc/gralloc_priv.h +++ /dev/null @@ -1,112 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef GRALLOC_PRIV_H_ -#define GRALLOC_PRIV_H_ - -#include -#include -#include -#include -#include -#include -#include - -#include - -#include - -/*****************************************************************************/ - -struct private_module_t; -struct private_handle_t; - -struct private_module_t { - gralloc_module_t base; - - private_handle_t* framebuffer; - uint32_t flags; - uint32_t numBuffers; - uint32_t bufferMask; - pthread_mutex_t lock; - buffer_handle_t currentBuffer; - int pmem_master; - void* pmem_master_base; - - struct fb_var_screeninfo info; - struct fb_fix_screeninfo finfo; - float xdpi; - float ydpi; - float fps; -}; - -/*****************************************************************************/ - -#ifdef __cplusplus -struct private_handle_t : public native_handle { -#else -struct private_handle_t { - struct native_handle nativeHandle; -#endif - - enum { - PRIV_FLAGS_FRAMEBUFFER = 0x00000001 - }; - - // file-descriptors - int fd; - // ints - int magic; - int flags; - int size; - int offset; - - // FIXME: the attributes below should be out-of-line - int base; - int pid; - -#ifdef __cplusplus - static const int sNumInts = 6; - static const int sNumFds = 1; - static const int sMagic = 0x3141592; - - private_handle_t(int fd, int size, int flags) : - fd(fd), magic(sMagic), flags(flags), size(size), offset(0), - base(0), pid(getpid()) - { - version = sizeof(native_handle); - numInts = sNumInts; - numFds = sNumFds; - } - ~private_handle_t() { - magic = 0; - } - - static int validate(const native_handle* h) { - const private_handle_t* hnd = (const private_handle_t*)h; - if (!h || h->version != sizeof(native_handle) || - h->numInts != sNumInts || h->numFds != sNumFds || - hnd->magic != sMagic) - { - LOGE("invalid gralloc handle (at %p)", h); - return -EINVAL; - } - return 0; - } -#endif -}; - -#endif /* GRALLOC_PRIV_H_ */ diff --git a/libgralloc/mapper.cpp b/libgralloc/mapper.cpp deleted file mode 100644 index 33d0958..0000000 --- a/libgralloc/mapper.cpp +++ /dev/null @@ -1,169 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include -#include -#include -#include - -#include -#include -#include - -#include -#include - -#include -#include - -#include "gralloc_priv.h" - - -/* desktop Linux needs a little help with gettid() */ -#if defined(ARCH_X86) && !defined(HAVE_ANDROID_OS) -#define __KERNEL__ -# include -pid_t gettid() { return syscall(__NR_gettid);} -#undef __KERNEL__ -#endif - -/*****************************************************************************/ - -static int gralloc_map(gralloc_module_t const* module, - buffer_handle_t handle, - void** vaddr) -{ - private_handle_t* hnd = (private_handle_t*)handle; - if (!(hnd->flags & private_handle_t::PRIV_FLAGS_FRAMEBUFFER)) { - size_t size = hnd->size; - void* mappedAddress = mmap(0, size, - PROT_READ|PROT_WRITE, MAP_SHARED, hnd->fd, 0); - if (mappedAddress == MAP_FAILED) { - LOGE("Could not mmap %s", strerror(errno)); - return -errno; - } - hnd->base = intptr_t(mappedAddress) + hnd->offset; - //LOGD("gralloc_map() succeeded fd=%d, off=%d, size=%d, vaddr=%p", - // hnd->fd, hnd->offset, hnd->size, mappedAddress); - } - *vaddr = (void*)hnd->base; - return 0; -} - -static int gralloc_unmap(gralloc_module_t const* module, - buffer_handle_t handle) -{ - private_handle_t* hnd = (private_handle_t*)handle; - if (!(hnd->flags & private_handle_t::PRIV_FLAGS_FRAMEBUFFER)) { - void* base = (void*)hnd->base; - size_t size = hnd->size; - //LOGD("unmapping from %p, size=%d", base, size); - if (munmap(base, size) < 0) { - LOGE("Could not unmap %s", strerror(errno)); - } - } - hnd->base = 0; - return 0; -} - -/*****************************************************************************/ - -static pthread_mutex_t sMapLock = PTHREAD_MUTEX_INITIALIZER; - -/*****************************************************************************/ - -int gralloc_register_buffer(gralloc_module_t const* module, - buffer_handle_t handle) -{ - if (private_handle_t::validate(handle) < 0) - return -EINVAL; - - // if this handle was created in this process, then we keep it as is. - int err = 0; - private_handle_t* hnd = (private_handle_t*)handle; - if (hnd->pid != getpid()) { - void *vaddr; - err = gralloc_map(module, handle, &vaddr); - } - return err; -} - -int gralloc_unregister_buffer(gralloc_module_t const* module, - buffer_handle_t handle) -{ - if (private_handle_t::validate(handle) < 0) - return -EINVAL; - - // never unmap buffers that were created in this process - private_handle_t* hnd = (private_handle_t*)handle; - if (hnd->pid != getpid()) { - if (hnd->base) { - gralloc_unmap(module, handle); - } - } - return 0; -} - -int mapBuffer(gralloc_module_t const* module, - private_handle_t* hnd) -{ - void* vaddr; - return gralloc_map(module, hnd, &vaddr); -} - -int terminateBuffer(gralloc_module_t const* module, - private_handle_t* hnd) -{ - if (hnd->base) { - // this buffer was mapped, unmap it now - gralloc_unmap(module, hnd); - } - - return 0; -} - -int gralloc_lock(gralloc_module_t const* module, - buffer_handle_t handle, int usage, - int l, int t, int w, int h, - void** vaddr) -{ - // this is called when a buffer is being locked for software - // access. in thin implementation we have nothing to do since - // not synchronization with the h/w is needed. - // typically this is used to wait for the h/w to finish with - // this buffer if relevant. the data cache may need to be - // flushed or invalidated depending on the usage bits and the - // hardware. - - if (private_handle_t::validate(handle) < 0) - return -EINVAL; - - private_handle_t* hnd = (private_handle_t*)handle; - *vaddr = (void*)hnd->base; - return 0; -} - -int gralloc_unlock(gralloc_module_t const* module, - buffer_handle_t handle) -{ - // we're done with a software buffer. nothing to do in this - // implementation. typically this is used to flush the data cache. - - if (private_handle_t::validate(handle) < 0) - return -EINVAL; - return 0; -} -- cgit v1.1