From ec9bbc28aadee94185feed9c3452e896c17ed929 Mon Sep 17 00:00:00 2001 From: Gurchetan Singh Date: Thu, 19 Dec 2019 10:01:13 -0800 Subject: [PATCH] minigbm: remove vgem from minigbm (take 2) In theory, vgem is only used on Android, and nothing should fail. In theory. Otherwise, we can just revert again. BUG=b:141278896 TEST=compile Change-Id: I998cb83d5342e454b876f4b74274df96b4951882 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/2412903 Tested-by: Gurchetan Singh Reviewed-by: Gurchetan Singh Commit-Queue: Gurchetan Singh --- Android.mk | 1 - drv.c | 3 +-- vgem.c | 63 -------------------------------------------------------------- 3 files changed, 1 insertion(+), 66 deletions(-) delete mode 100644 vgem.c diff --git a/Android.mk b/Android.mk index 3eab7ae..8b110b4 100644 --- a/Android.mk +++ b/Android.mk @@ -27,7 +27,6 @@ MINIGBM_SRC := \ tegra.c \ udl.c \ vc4.c \ - vgem.c \ virtio_gpu.c MINIGBM_CPPFLAGS := -std=c++14 diff --git a/drv.c b/drv.c index 636cd07..2c23814 100644 --- a/drv.c +++ b/drv.c @@ -64,7 +64,6 @@ extern const struct backend backend_udl; #ifdef DRV_VC4 extern const struct backend backend_vc4; #endif -extern const struct backend backend_vgem; extern const struct backend backend_virtio_gpu; static const struct backend *drv_get_backend(int fd) @@ -117,7 +116,7 @@ static const struct backend *drv_get_backend(int fd) #ifdef DRV_VC4 &backend_vc4, #endif - &backend_vgem, &backend_virtio_gpu, + &backend_virtio_gpu, }; for (i = 0; i < ARRAY_SIZE(backend_list); i++) { diff --git a/vgem.c b/vgem.c deleted file mode 100644 index 0d0371c..0000000 --- a/vgem.c +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright 2016 The Chromium OS Authors. All rights reserved. - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -#include "drv_priv.h" -#include "helpers.h" -#include "util.h" - -#define MESA_LLVMPIPE_TILE_ORDER 6 -#define MESA_LLVMPIPE_TILE_SIZE (1 << MESA_LLVMPIPE_TILE_ORDER) - -static const uint32_t render_target_formats[] = { DRM_FORMAT_ABGR8888, DRM_FORMAT_ARGB8888, - DRM_FORMAT_RGB565, DRM_FORMAT_XBGR8888, - DRM_FORMAT_XRGB8888 }; - -static const uint32_t texture_source_formats[] = { DRM_FORMAT_R8, DRM_FORMAT_YVU420, - DRM_FORMAT_YVU420_ANDROID }; - -static int vgem_init(struct driver *drv) -{ - drv_add_combinations(drv, render_target_formats, ARRAY_SIZE(render_target_formats), - &LINEAR_METADATA, BO_USE_RENDER_MASK); - - drv_add_combinations(drv, texture_source_formats, ARRAY_SIZE(texture_source_formats), - &LINEAR_METADATA, BO_USE_TEXTURE_MASK); - - return drv_modify_linear_combinations(drv); -} - -static int vgem_bo_create(struct bo *bo, uint32_t width, uint32_t height, uint32_t format, - uint64_t flags) -{ - width = ALIGN(width, MESA_LLVMPIPE_TILE_SIZE); - height = ALIGN(height, MESA_LLVMPIPE_TILE_SIZE); - - return drv_dumb_bo_create(bo, width, height, format, flags); -} - -static uint32_t vgem_resolve_format(struct driver *drv, uint32_t format, uint64_t flags) -{ - switch (format) { - case DRM_FORMAT_FLEX_IMPLEMENTATION_DEFINED: - /*HACK: See b/28671744 */ - return DRM_FORMAT_XBGR8888; - case DRM_FORMAT_FLEX_YCbCr_420_888: - return DRM_FORMAT_YVU420; - default: - return format; - } -} - -const struct backend backend_vgem = { - .name = "vgem", - .init = vgem_init, - .bo_create = vgem_bo_create, - .bo_destroy = drv_dumb_bo_destroy, - .bo_import = drv_prime_bo_import, - .bo_map = drv_dumb_bo_map, - .bo_unmap = drv_bo_munmap, - .resolve_format = vgem_resolve_format, -}; -- 2.11.0