Commit: 5ddecb14af4da0dda3f3817be23f1b3c54514aec - external-gbm_gralloc (git)

external/gbm_gralloc

Commit MetaInfo

• Revision: 5ddecb14af4da0dda3f3817be23f1b3c54514aec (tree)
• Time: 2018-11-02 16:56:54
• Author: Chih-Wei Huang <cwhuang@linu...>
• Commiter: Chih-Wei Huang

Log Message

Merge remote-tracking branch 'origin/master' into oreo-x86

Conflicts:
gralloc_drm_handle.h

Change Summary

• modified: Android.mk
• modified: gralloc.cpp
• modified: gralloc_drm.h
• delete: gralloc_drm_handle.h
• modified: gralloc_gbm.cpp
• modified: gralloc_gbm_priv.h

Incremental Difference

--- a/Android.mk
+++ b/Android.mk
@@ -27,6 +27,7 @@ LOCAL_SRC_FILES := \
 	gralloc.cpp
 
 LOCAL_SHARED_LIBRARIES := \
+	libdrm \
 	libgbm \
 	liblog \
 	libcutils

--- a/gralloc.cpp
+++ b/gralloc.cpp
@@ -38,7 +38,6 @@
 
 #include "gralloc_drm.h"
 #include "gralloc_gbm_priv.h"
-#include "gralloc_drm_handle.h"
 
 struct gbm_module_t {
 	gralloc_module_t base;
@@ -47,37 +46,6 @@ struct gbm_module_t {
 	struct gbm_device *gbm;
 };
 
-static inline int gralloc_gbm_get_bpp(int format)
-{
-	int bpp;
-
-	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_YCbCr_422_I:
-		bpp = 2;
-		break;
-	/* planar; only Y is considered */
-	case HAL_PIXEL_FORMAT_YV12:
-	case HAL_PIXEL_FORMAT_YCbCr_422_SP:
-	case HAL_PIXEL_FORMAT_YCrCb_420_SP:
-		bpp = 1;
-		break;
-	default:
-		bpp = 0;
-		break;
-	}
-
-	return bpp;
-}
-
 /*
  * Initialize the DRM device object
  */
@@ -116,12 +84,6 @@ static int gbm_mod_perform(const struct gralloc_module_t *mod, int op, ...)
 			err = 0;
 		}
 		break;
-	/* TODO: This is a stub and should be implemented fully */
-	case GRALLOC_MODULE_PERFORM_GET_USAGE:
-		{
-			err = 0;
-		}
-		break;
 	default:
 		err = -EINVAL;
 		break;
@@ -217,23 +179,15 @@ static int gbm_mod_alloc_gpu0(alloc_device_t *dev,
 		buffer_handle_t *handle, int *stride)
 {
 	struct gbm_module_t *dmod = (struct gbm_module_t *) dev->common.module;
-	struct gralloc_gbm_handle_t *gbm_handle;
 	int err = 0;
 
 	pthread_mutex_lock(&dmod->mutex);
 
-	gbm_handle = gralloc_gbm_bo_create(dmod->gbm, w, h, format, usage);
-	if (!gbm_handle) {
+	*handle = gralloc_gbm_bo_create(dmod->gbm, w, h, format, usage, stride);
+	if (!*handle)
 		err = -errno;
-		goto unlock;
-	}
-
-	*handle = &gbm_handle->base;
-	/* in pixels */
-	*stride = gbm_handle->stride / gralloc_gbm_get_bpp(format);
 
 	ALOGV("buffer %p usage = %08x", *handle, usage);
-unlock:
 	pthread_mutex_unlock(&dmod->mutex);
 	return err;
 }

--- a/gralloc_drm.h
+++ b/gralloc_drm.h
@@ -34,13 +34,6 @@ enum {
 	 *	   int *fd);
 	 */
 	GRALLOC_MODULE_PERFORM_GET_DRM_FD                = 0x40000002,
-
-	/* perform(const struct gralloc_module_t *mod,
-	 *     int op,
-	 *     buffer_handle_t buffer,
-	 *     int *usage);
-	 */
-	GRALLOC_MODULE_PERFORM_GET_USAGE                 = 0xffeeff03,
 };
 
 #ifdef __cplusplus

--- a/gralloc_drm_handle.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (C) 2010-2011 Chia-I Wu <[e-mail]>
- * Copyright (C) 2010-2011 LunarG Inc.
- * Copyright (C) 2016 Linaro, Ltd., Rob Herring <[e-mail]>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef _GRALLOC_DRM_HANDLE_H_
-#define _GRALLOC_DRM_HANDLE_H_
-
-#include <cutils/log.h>
-#include <cutils/native_handle.h>
-#include <system/graphics.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct gralloc_drm_handle_t {
-	native_handle_t base;
-
-	/* file descriptors */
-	int prime_fd;
-
-	/* integers */
-	int magic;
-
-	int width;
-	int height;
-	int format;
-	int usage;
-
-	int name;   /* the name of the bo */
-	int stride; /* the stride in bytes */
-	int data_owner; /* owner of data (for validation) */
-
-	uint64_t modifier __attribute__((aligned(8))); /* buffer modifiers */
-	union {
-		void *data; /* pointer to struct gralloc_gbm_bo_t */
-		uint64_t reserved;
-	} __attribute__((aligned(8)));
-};
-#define GRALLOC_GBM_HANDLE_MAGIC 0x5f47424d
-#define GRALLOC_GBM_HANDLE_NUM_FDS 1
-#define GRALLOC_GBM_HANDLE_NUM_INTS (						\
-	((sizeof(struct gralloc_drm_handle_t) - sizeof(native_handle_t))/sizeof(int))	\
-	 - GRALLOC_GBM_HANDLE_NUM_FDS)
-
-static inline struct gralloc_drm_handle_t *gralloc_drm_handle(buffer_handle_t _handle)
-{
-	struct gralloc_drm_handle_t *handle =
-		(struct gralloc_drm_handle_t *) _handle;
-
-	if (handle && (handle->base.version != sizeof(handle->base) ||
-	               handle->base.numInts != GRALLOC_GBM_HANDLE_NUM_INTS ||
-	               handle->base.numFds != GRALLOC_GBM_HANDLE_NUM_FDS ||
-	               handle->magic != GRALLOC_GBM_HANDLE_MAGIC)) {
-		ALOGE("invalid handle: version=%d, numInts=%d, numFds=%d, magic=%x",
-			handle->base.version, handle->base.numInts,
-			handle->base.numFds, handle->magic);
-		handle = NULL;
-	}
-
-	return handle;
-}
-
-static inline int gralloc_drm_get_prime_fd(buffer_handle_t _handle)
-{
-	struct gralloc_drm_handle_t *handle = gralloc_drm_handle(_handle);
-	return (handle) ? handle->prime_fd : -1;
-}
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* _GRALLOC_DRM_HANDLE_H_ */

--- a/gralloc_gbm.cpp
+++ b/gralloc_gbm.cpp
@@ -41,12 +41,16 @@
 #include <gbm.h>
 
 #include "gralloc_gbm_priv.h"
-#include "gralloc_drm_handle.h"
+#include <android/gralloc_handle.h>
+
+#include <unordered_map>
 
 #define MAX(a, b) (((a) > (b)) ? (a) : (b))
 
 #define unlikely(x) __builtin_expect(!!(x), 0)
 
+static std::unordered_map<buffer_handle_t, struct gbm_bo *> gbm_bo_handle_map;
+
 struct bo_data_t {
 	void *map_data;
 	int lock_count;
@@ -100,6 +104,37 @@ static uint32_t get_gbm_format(int format)
 	return fmt;
 }
 
+static int gralloc_gbm_get_bpp(int format)
+{
+	int bpp;
+
+	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_YCbCr_422_I:
+		bpp = 2;
+		break;
+	/* planar; only Y is considered */
+	case HAL_PIXEL_FORMAT_YV12:
+	case HAL_PIXEL_FORMAT_YCbCr_422_SP:
+	case HAL_PIXEL_FORMAT_YCrCb_420_SP:
+		bpp = 1;
+		break;
+	default:
+		bpp = 0;
+		break;
+	}
+
+	return bpp;
+}
+
 static unsigned int get_pipe_bind(int usage)
 {
 	unsigned int bind = 0;
@@ -112,14 +147,17 @@ static unsigned int get_pipe_bind(int usage)
 		bind |= GBM_BO_USE_RENDERING;
 	if (usage & GRALLOC_USAGE_HW_FB)
 		bind |= GBM_BO_USE_SCANOUT;
+	if (usage & GRALLOC_USAGE_HW_COMPOSER)
+		bind |= GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING;
 
 	return bind;
 }
 
 static struct gbm_bo *gbm_import(struct gbm_device *gbm,
-		struct gralloc_gbm_handle_t *handle)
+		buffer_handle_t _handle)
 {
 	struct gbm_bo *bo;
+	struct gralloc_handle_t *handle = gralloc_handle(_handle);
 	#ifdef GBM_BO_IMPORT_FD_MODIFIER
 	struct gbm_import_fd_modifier_data data;
 	#else
@@ -156,9 +194,10 @@ static struct gbm_bo *gbm_import(struct gbm_device *gbm,
 }
 
 static struct gbm_bo *gbm_alloc(struct gbm_device *gbm,
-		struct gralloc_gbm_handle_t *handle)
+		buffer_handle_t _handle)
 {
 	struct gbm_bo *bo;
+	struct gralloc_handle_t *handle = gralloc_handle(_handle);
 	int format = get_gbm_format(handle->format);
 	int usage = get_pipe_bind(handle->usage);
 	int width, height;
@@ -206,6 +245,7 @@ void gbm_free(buffer_handle_t handle)
 	if (!bo)
 		return;
 
+	gbm_bo_handle_map.erase(handle);
 	gbm_bo_destroy(bo);
 }
 
@@ -214,18 +254,7 @@ void gbm_free(buffer_handle_t handle)
  */
 struct gbm_bo *gralloc_gbm_bo_from_handle(buffer_handle_t handle)
 {
-	int pid = getpid();
-	struct gralloc_gbm_handle_t *gbm_handle = gralloc_gbm_handle(handle);
-
-	if (!gbm_handle)
-		return NULL;
-
-	/* the buffer handle is passed to a new process */
-	ALOGV("data_owner=%d gralloc_pid=%d data=%p\n", gbm_handle->data_owner, pid, gbm_handle->data);
-	if (gbm_handle->data_owner == pid)
-		return (struct gbm_bo *)gbm_handle->data;
-
-	return NULL;
+	return gbm_bo_handle_map[handle];
 }
 
 static int gbm_map(buffer_handle_t handle, int x, int y, int w, int h,
@@ -233,7 +262,7 @@ static int gbm_map(buffer_handle_t handle, int x, int y, int w, int h,
 {
 	int err = 0;
 	int flags = GBM_BO_TRANSFER_READ;
-	struct gralloc_gbm_handle_t *gbm_handle = gralloc_gbm_handle(handle);
+	struct gralloc_gbm_handle_t *gbm_handle = gralloc_handle(handle);
 	struct gbm_bo *bo = gralloc_gbm_bo_from_handle(handle);
 	struct bo_data_t *bo_data = gbm_bo_data(bo);
 	uint32_t stride;
@@ -243,7 +272,7 @@ static int gbm_map(buffer_handle_t handle, int x, int y, int w, int h,
 
 	if (gbm_handle->format == HAL_PIXEL_FORMAT_YV12) {
 		if (x || y)
-			ALOGE("can't map with offset for planar %p - fmt %x", bo, gbm_handle->format);
+			ALOGE("can't map with offset for planar %p", bo);
 		w /= 2;
 		h += h / 2;
 	}
@@ -305,17 +334,18 @@ struct gbm_device *gbm_dev_create(void)
 int gralloc_gbm_handle_register(buffer_handle_t _handle, struct gbm_device *gbm)
 {
 	struct gbm_bo *bo;
-	struct gralloc_gbm_handle_t *handle = gralloc_gbm_handle(_handle);
 
-	if (!handle)
+	if (!_handle)
 		return -EINVAL;
 
-	bo = gbm_import(gbm, handle);
+	if (gbm_bo_handle_map.count(_handle))
+		return -EINVAL;
+
+	bo = gbm_import(gbm, _handle);
 	if (!bo)
 		return -EINVAL;
 
-	handle->data_owner = getpid();
-	handle->data = bo;
+	gbm_bo_handle_map.emplace(_handle, bo);
 
 	return 0;
 }
@@ -325,58 +355,34 @@ int gralloc_gbm_handle_register(buffer_handle_t _handle, struct gbm_device *gbm)
  */
 int gralloc_gbm_handle_unregister(buffer_handle_t handle)
 {
-	struct gralloc_gbm_handle_t *gbm_handle = gralloc_gbm_handle(handle);
-
 	gbm_free(handle);
-	gbm_handle->data_owner = 0;
-	gbm_handle->data = NULL;
 
 	return 0;
 }
 
 /*
- * Create a buffer handle.
- */
-static struct gralloc_gbm_handle_t *create_bo_handle(int width,
-		int height, int format, int usage)
-{
-	struct gralloc_gbm_handle_t *handle;
-
-	handle = (gralloc_gbm_handle_t *)native_handle_create(GRALLOC_GBM_HANDLE_NUM_FDS, GRALLOC_GBM_HANDLE_NUM_INTS);
-	if (!handle)
-		return NULL;
-
-	handle->magic = GRALLOC_GBM_HANDLE_MAGIC;
-	handle->width = width;
-	handle->height = height;
-	handle->format = format;
-	handle->usage = usage;
-	handle->prime_fd = -1;
-
-	return handle;
-}
-
-/*
  * Create a bo.
  */
-struct gralloc_gbm_handle_t *gralloc_gbm_bo_create(struct gbm_device *gbm,
-		int width, int height, int format, int usage)
+buffer_handle_t gralloc_gbm_bo_create(struct gbm_device *gbm,
+		int width, int height, int format, int usage, int *stride)
 {
 	struct gbm_bo *bo;
-	struct gralloc_gbm_handle_t *handle;
+	native_handle_t *handle;
 
-	handle = create_bo_handle(width, height, format, usage);
+	handle = gralloc_handle_create(width, height, format, usage);
 	if (!handle)
 		return NULL;
 
 	bo = gbm_alloc(gbm, handle);
 	if (!bo) {
-		native_handle_delete(&handle->base);
+		native_handle_delete(handle);
 		return NULL;
 	}
 
-	handle->data_owner = getpid();
-	handle->data = bo;
+	gbm_bo_handle_map.emplace(handle, bo);
+
+	/* in pixels */
+	*stride = gralloc_handle(handle)->stride / gralloc_gbm_get_bpp(format);
 
 	return handle;
 }
@@ -388,14 +394,14 @@ int gralloc_gbm_bo_lock(buffer_handle_t handle,
 		int usage, int x, int y, int w, int h,
 		void **addr)
 {
-	struct gralloc_gbm_handle_t *gbm_handle = gralloc_gbm_handle(handle);
+	struct gralloc_handle_t *gbm_handle = gralloc_handle(handle);
 	struct gbm_bo *bo = gralloc_gbm_bo_from_handle(handle);
 	struct bo_data_t *bo_data;
 
 	if (!bo)
 		return -EINVAL;
 
-	if ((gbm_handle->usage & usage) != usage) {
+	if ((gbm_handle->usage & usage) != (uint32_t)usage) {
 		/* make FB special for testing software renderer with */
 
 		if (!(gbm_handle->usage & GRALLOC_USAGE_SW_READ_OFTEN) &&

--- a/gralloc_gbm_priv.h
+++ b/gralloc_gbm_priv.h
@@ -32,14 +32,11 @@ extern "C" {
 struct gbm_device;
 struct gbm_bo;
 
-#define gralloc_gbm_handle_t gralloc_drm_handle_t
-#define gralloc_gbm_handle gralloc_drm_handle
-
 int gralloc_gbm_handle_register(buffer_handle_t handle, struct gbm_device *gbm);
 int gralloc_gbm_handle_unregister(buffer_handle_t handle);
 
-struct gralloc_gbm_handle_t *gralloc_gbm_bo_create(struct gbm_device *gbm,
-		int width, int height, int format, int usage);
+buffer_handle_t gralloc_gbm_bo_create(struct gbm_device *gbm,
+		int width, int height, int format, int usage, int *stride);
 void gbm_free(buffer_handle_t handle);
 
 struct gbm_bo *gralloc_gbm_bo_from_handle(buffer_handle_t handle);