minigbm: remove cirrus driver

Nobody should use this anymore -- virtio_gpu is the future.

BUG=chromium:710629
TEST=Should already be unused, CQ will check

Change-Id: I8e4184875140e0c74d886c20fcf2d1c9664fa44c
Reviewed-on: https://chromium-review.googlesource.com/747983
Commit-Ready: Gurchetan Singh <gurchetansingh@chromium.org>
Tested-by: Gurchetan Singh <gurchetansingh@chromium.org>
Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>

diff --git a/cirrus.c b/cirrus.c
deleted file mode 100644 (file)
index d92bab4..0000000
--- a/cirrus.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2014 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"
-
-const static uint32_t render_target_formats[] = { DRM_FORMAT_ARGB8888, DRM_FORMAT_RGB888,
-                                                 DRM_FORMAT_XRGB8888 };
-
-static int cirrus_init(struct driver *drv)
-{
-       int ret;
-       ret = drv_add_combinations(drv, render_target_formats, ARRAY_SIZE(render_target_formats),
-                                  &LINEAR_METADATA, BO_USE_RENDER_MASK);
-       if (ret)
-               return ret;
-
-       return drv_modify_linear_combinations(drv);
-}
-
-struct backend backend_cirrus = {
-       .name = "cirrus",
-       .init = cirrus_init,
-       .bo_create = drv_dumb_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,
-};

diff --git a/drv.c b/drv.c
index 3ccf16e..683bea7 100644 (file)
--- a/drv.c
+++ b/drv.c
@@ -23,7 +23,6 @@
 #ifdef DRV_AMDGPU
 extern struct backend backend_amdgpu;
 #endif
-extern struct backend backend_cirrus;
 extern struct backend backend_evdi;
 #ifdef DRV_EXYNOS
 extern struct backend backend_exynos;
@@ -69,7 +68,7 @@ static struct backend *drv_get_backend(int fd)
 #ifdef DRV_AMDGPU
                &backend_amdgpu,
 #endif
-               &backend_cirrus,   &backend_evdi,
+               &backend_evdi,
 #ifdef DRV_EXYNOS
                &backend_exynos,
 #endif

diff --git a/i915.c b/i915.c
index e25b068..5869a59 100644 (file)
--- a/i915.c
+++ b/i915.c
@@ -20,10 +20,10 @@
 #define I915_CACHELINE_SIZE 64
 #define I915_CACHELINE_MASK (I915_CACHELINE_SIZE - 1)
 
-static const uint32_t render_target_formats[] = { DRM_FORMAT_ABGR8888, DRM_FORMAT_ARGB1555,
-                                                 DRM_FORMAT_ARGB8888, DRM_FORMAT_RGB565,
+static const uint32_t render_target_formats[] = { DRM_FORMAT_ABGR8888,    DRM_FORMAT_ARGB1555,
+                                                 DRM_FORMAT_ARGB8888,    DRM_FORMAT_RGB565,
                                                  DRM_FORMAT_XBGR2101010, DRM_FORMAT_XBGR8888,
-                                                 DRM_FORMAT_XRGB1555, DRM_FORMAT_XRGB2101010,
+                                                 DRM_FORMAT_XRGB1555,    DRM_FORMAT_XRGB2101010,
                                                  DRM_FORMAT_XRGB8888 };
 
 static const uint32_t tileable_texture_source_formats[] = { DRM_FORMAT_GR88, DRM_FORMAT_NV12,