From 89d009f968b864c4190d673955ff432ea07b2af7 Mon Sep 17 00:00:00 2001 From: lambdadroid Date: Sat, 10 Nov 2018 19:48:11 +0100 Subject: [PATCH] Android-x86: Implement some perform functionality from drm_gralloc (v2) Conflicts: Android.mk (v2) git rm Android.mk due to aosp master branch minigbm implementation --- cros_gralloc/gralloc0/gralloc0.cc | 27 ++++++++++++++++++++++- cros_gralloc/gralloc0/gralloc_drm.h | 44 +++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 cros_gralloc/gralloc0/gralloc_drm.h diff --git a/cros_gralloc/gralloc0/gralloc0.cc b/cros_gralloc/gralloc0/gralloc0.cc index 20d8618..900e376 100644 --- a/cros_gralloc/gralloc0/gralloc0.cc +++ b/cros_gralloc/gralloc0/gralloc0.cc @@ -11,7 +11,9 @@ #include #include #include +#include #include "drm_framebuffer.h" +#include "gralloc_drm.h" struct gralloc0_module { gralloc_module_t base; @@ -330,6 +332,9 @@ static int gralloc0_perform(struct gralloc_module_t const *module, int op, ...) auto mod = (struct gralloc0_module const *)module; switch (op) { + case GRALLOC_MODULE_PERFORM_GET_DRM_FD: + case GRALLOC_MODULE_PERFORM_ENTER_VT: + case GRALLOC_MODULE_PERFORM_LEAVE_VT: case GRALLOC_DRM_GET_STRIDE: case GRALLOC_DRM_GET_FORMAT: case GRALLOC_DRM_GET_DIMENSIONS: @@ -341,8 +346,28 @@ static int gralloc0_perform(struct gralloc_module_t const *module, int op, ...) } va_start(args, op); - ret = 0; + + switch (op) { + case GRALLOC_MODULE_PERFORM_GET_DRM_FD: { + int *fd = va_arg(args, int*); + *fd = mod->driver->get_fd(); + break; + } + case GRALLOC_MODULE_PERFORM_ENTER_VT: + ret = drmSetMaster(mod->driver->get_fd()); + break; + case GRALLOC_MODULE_PERFORM_LEAVE_VT: + ret = drmDropMaster(mod->driver->get_fd()); + break; + default: + goto other; + } + + va_end(args); + return ret; + +other: handle = va_arg(args, buffer_handle_t); auto hnd = cros_gralloc_convert_handle(handle); if (!hnd) { diff --git a/cros_gralloc/gralloc0/gralloc_drm.h b/cros_gralloc/gralloc0/gralloc_drm.h new file mode 100644 index 0000000..b46023f --- /dev/null +++ b/cros_gralloc/gralloc0/gralloc_drm.h @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2010-2011 Chia-I Wu + * Copyright (C) 2010-2011 LunarG Inc. + * + * 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_H_ +#define _GRALLOC_DRM_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +enum { + /* perform(const struct gralloc_module_t *mod, + * int op, + * int *fd); + */ + GRALLOC_MODULE_PERFORM_GET_DRM_FD = 0x40000002, + GRALLOC_MODULE_PERFORM_ENTER_VT = (int) 0x80000005, + GRALLOC_MODULE_PERFORM_LEAVE_VT = (int) 0x80000006, +}; + +#ifdef __cplusplus +} +#endif +#endif /* _GRALLOC_DRM_H_ */ -- 2.11.0