Rename amlogic backend in minigbm into meson

The name of Amlogic DRM driver in kernel is "meson", so rename it in
minigbm to match that.

BUG=internal b/74248568
TEST=run ozone_demo on device

Change-Id: If2ef376715231f0b3c9fe320177d0e82d94214f0
Reviewed-on: https://chromium-review.googlesource.com/951912
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Reviewed-by: Alex Sakhartchouk <alexst@chromium.org>
Tested-by: Sergey Volk <servolk@chromium.org>

diff --git a/Android.mk b/Android.mk
index 3f73fe5..28176d2 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -16,7 +16,6 @@ LOCAL_SHARED_LIBRARIES := \
 
 LOCAL_SRC_FILES := \
        amdgpu.c \
-       amlogic.c \
        cirrus.c \
        drv.c \
        evdi.c \
@@ -25,6 +24,7 @@ LOCAL_SRC_FILES := \
        i915.c \
        marvell.c \
        mediatek.c \
+       meson.c \
        msm.c \
        nouveau.c \
        rockchip.c \

diff --git a/Makefile b/Makefile
index a01433e..358cd7b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -16,15 +16,15 @@ ifdef DRV_AMDGPU
        CFLAGS += $(shell $(PKG_CONFIG) --cflags libdrm_amdgpu)
        LDLIBS += -lamdgpuaddr
 endif
-ifdef DRV_AMLOGIC
-       CFLAGS += $(shell $(PKG_CONFIG) --cflags libdrm_amlogic)
-endif
 ifdef DRV_EXYNOS
        CFLAGS += $(shell $(PKG_CONFIG) --cflags libdrm_exynos)
 endif
 ifdef DRV_I915
        CFLAGS += $(shell $(PKG_CONFIG) --cflags libdrm_intel)
 endif
+ifdef DRV_MESON
+       CFLAGS += $(shell $(PKG_CONFIG) --cflags libdrm_meson)
+endif
 ifdef DRV_RADEON
        CFLAGS += $(shell $(PKG_CONFIG) --cflags libdrm_radeon)
 endif

diff --git a/drv.c b/drv.c
index 6d6e4fc..d548448 100644 (file)
--- a/drv.c
+++ b/drv.c
@@ -23,9 +23,6 @@
 #ifdef DRV_AMDGPU
 extern const struct backend backend_amdgpu;
 #endif
-#ifdef DRV_AMLOGIC
-extern const struct backend backend_amlogic;
-#endif
 extern const struct backend backend_evdi;
 #ifdef DRV_EXYNOS
 extern const struct backend backend_exynos;
@@ -39,6 +36,9 @@ extern const struct backend backend_marvell;
 #ifdef DRV_MEDIATEK
 extern const struct backend backend_mediatek;
 #endif
+#ifdef DRV_MESON
+extern const struct backend backend_meson;
+#endif
 #ifdef DRV_MSM
 extern const struct backend backend_msm;
 #endif
@@ -73,9 +73,6 @@ static const struct backend *drv_get_backend(int fd)
 #ifdef DRV_AMDGPU
                &backend_amdgpu,
 #endif
-#ifdef DRV_AMLOGIC
-               &backend_amlogic,
-#endif
                &backend_evdi,
 #ifdef DRV_EXYNOS
                &backend_exynos,
@@ -89,6 +86,9 @@ static const struct backend *drv_get_backend(int fd)
 #ifdef DRV_MEDIATEK
                &backend_mediatek,
 #endif
+#ifdef DRV_MESON
+               &backend_meson,
+#endif
 #ifdef DRV_MSM
                &backend_msm,
 #endif

diff --git a/amlogic.c b/meson.c
similarity index 82%
rename from amlogic.c
rename to meson.c
index 5609ae8..523bf71 100644 (file)
--- a/amlogic.c
+++ b/meson.c
@@ -4,7 +4,7 @@
  * found in the LICENSE file.
  */
 
-#ifdef DRV_AMLOGIC
+#ifdef DRV_MESON
 
 #include "drv_priv.h"
 #include "helpers.h"
@@ -12,7 +12,7 @@
 
 static const uint32_t render_target_formats[] = { DRM_FORMAT_ARGB8888, DRM_FORMAT_XRGB8888 };
 
-static int amlogic_init(struct driver *drv)
+static int meson_init(struct driver *drv)
 {
        drv_add_combinations(drv, render_target_formats, ARRAY_SIZE(render_target_formats),
                             &LINEAR_METADATA, BO_USE_RENDER_MASK);
@@ -20,9 +20,9 @@ static int amlogic_init(struct driver *drv)
        return drv_modify_linear_combinations(drv);
 }
 
-const struct backend backend_amlogic = {
-       .name = "amlogic",
-       .init = amlogic_init,
+const struct backend backend_meson = {
+       .name = "meson",
+       .init = meson_init,
        .bo_create = drv_dumb_bo_create,
        .bo_destroy = drv_dumb_bo_destroy,
        .bo_import = drv_prime_bo_import,