Switch imx to kmsro and remove the imx winsys

The kmsro winsys is equivalent to the imx winsys, so we can switch
to it and remove the imx one.

Signed-off-by: Rob Herring <[email protected]>

16 files changed, 3 insertions, 253 deletions

diff --git a/src/gallium/Android.mk b/src/gallium/Android.mk
index 12e55037fdc..15c720af300 100644
--- a/src/gallium/Android.mk
+++ b/src/gallium/Android.mk
@@ -46,7 +46,6 @@ SUBDIRS += winsys/vc4/drm drivers/vc4
 SUBDIRS += winsys/virgl/drm winsys/virgl/vtest drivers/virgl
 SUBDIRS += winsys/svga/drm drivers/svga
 SUBDIRS += winsys/etnaviv/drm drivers/etnaviv drivers/renderonly
-SUBDIRS += winsys/imx/drm
 SUBDIRS += state_trackers/dri
 
 # sort to eliminate any duplicates
diff --git a/src/gallium/Makefile.am b/src/gallium/Makefile.am
index 8cb391cfd75..ff69796180f 100644
--- a/src/gallium/Makefile.am
+++ b/src/gallium/Makefile.am
@@ -56,10 +56,6 @@ if HAVE_GALLIUM_ETNAVIV
 SUBDIRS += drivers/etnaviv winsys/etnaviv/drm
 endif
 
-if HAVE_GALLIUM_IMX
-SUBDIRS += drivers/imx winsys/imx/drm
-endif
-
 if HAVE_GALLIUM_KMSRO
 SUBDIRS += drivers/kmsro winsys/kmsro/drm
 endif
diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c b/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c
index c1323ac6590..fd901fe64ec 100644
--- a/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c
+++ b/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c
@@ -127,11 +127,6 @@ static const struct drm_driver_descriptor driver_descriptors[] = {
         .configuration = pipe_default_configuration_query,
     },
     {
-        .driver_name = "imx-drm",
-        .create_screen = pipe_imx_drm_create_screen,
-        .configuration = pipe_default_configuration_query,
-    },
-    {
         .driver_name = "tegra",
         .create_screen = pipe_tegra_create_screen,
         .configuration = pipe_default_configuration_query,
diff --git a/src/gallium/auxiliary/target-helpers/drm_helper.h b/src/gallium/auxiliary/target-helpers/drm_helper.h
index 927a0133389..5e43011b266 100644
--- a/src/gallium/auxiliary/target-helpers/drm_helper.h
+++ b/src/gallium/auxiliary/target-helpers/drm_helper.h
@@ -356,29 +356,6 @@ pipe_etna_create_screen(int fd, const struct pipe_screen_config *config)
 
 #endif
 
-#ifdef GALLIUM_IMX
-#include "imx/drm/imx_drm_public.h"
-
-struct pipe_screen *
-pipe_imx_drm_create_screen(int fd, const struct pipe_screen_config *config)
-{
-   struct pipe_screen *screen;
-
-   screen = imx_drm_screen_create(fd);
-   return screen ? debug_screen_wrap(screen) : NULL;
-}
-
-#else
-
-struct pipe_screen *
-pipe_imx_drm_create_screen(int fd, const struct pipe_screen_config *config)
-{
-   fprintf(stderr, "imx-drm: driver missing\n");
-   return NULL;
-}
-
-#endif
-
 #ifdef GALLIUM_TEGRA
 #include "tegra/drm/tegra_drm_public.h"
 
diff --git a/src/gallium/drivers/imx/Automake.inc b/src/gallium/drivers/imx/Automake.inc
deleted file mode 100644
index 92560a2c6b8..00000000000
--- a/src/gallium/drivers/imx/Automake.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-if HAVE_GALLIUM_IMX
-
-TARGET_DRIVERS += imx-drm
-TARGET_CPPFLAGS += -DGALLIUM_IMX
-TARGET_LIB_DEPS += \
-    $(top_builddir)/src/gallium/winsys/imx/drm/libimxdrm.la \
-    $(LIBDRM_LIBS)
-
-endif
diff --git a/src/gallium/drivers/imx/Makefile.am b/src/gallium/drivers/imx/Makefile.am
deleted file mode 100644
index 44f526fadb9..00000000000
--- a/src/gallium/drivers/imx/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-include $(top_srcdir)/src/gallium/Automake.inc
-
-AM_CPPFLAGS = \
-	$(GALLIUM_CFLAGS)
-
-noinst_LTLIBRARIES = libimx.la
-
-libimx_la_SOURCES =
diff --git a/src/gallium/drivers/kmsro/Android.mk b/src/gallium/drivers/kmsro/Android.mk
index f6a444e8865..06062e244aa 100644
--- a/src/gallium/drivers/kmsro/Android.mk
+++ b/src/gallium/drivers/kmsro/Android.mk
@@ -36,5 +36,6 @@ include $(BUILD_STATIC_LIBRARY)
 ifneq ($(HAVE_GALLIUM_KMSRO),)
 GALLIUM_TARGET_DRIVERS += pl111
 GALLIUM_TARGET_DRIVERS += hx8357d
+GALLIUM_TARGET_DRIVERS += imx
 $(eval GALLIUM_LIBS += $(LOCAL_MODULE) libmesa_winsys_kmsro)
 endif
diff --git a/src/gallium/meson.build b/src/gallium/meson.build
index 5b0ce81d1e4..5e311217cfe 100644
--- a/src/gallium/meson.build
+++ b/src/gallium/meson.build
@@ -106,11 +106,6 @@ if with_gallium_v3d
 else
   driver_v3d = declare_dependency()
 endif
-if with_gallium_imx
-  subdir('winsys/imx/drm')
-else
-  driver_imx = declare_dependency()
-endif
 if with_gallium_tegra
   subdir('winsys/tegra/drm')
   subdir('drivers/tegra')
diff --git a/src/gallium/targets/dri/Makefile.am b/src/gallium/targets/dri/Makefile.am
index 42e4a6b4dc7..f53be532bb2 100644
--- a/src/gallium/targets/dri/Makefile.am
+++ b/src/gallium/targets/dri/Makefile.am
@@ -83,7 +83,6 @@ include $(top_srcdir)/src/gallium/drivers/kmsro/Automake.inc
 include $(top_srcdir)/src/gallium/drivers/virgl/Automake.inc
 
 include $(top_srcdir)/src/gallium/drivers/etnaviv/Automake.inc
-include $(top_srcdir)/src/gallium/drivers/imx/Automake.inc
 
 include $(top_srcdir)/src/gallium/drivers/softpipe/Automake.inc
 include $(top_srcdir)/src/gallium/drivers/llvmpipe/Automake.inc
diff --git a/src/gallium/targets/dri/meson.build b/src/gallium/targets/dri/meson.build
index bc63702498b..68d226621b2 100644
--- a/src/gallium/targets/dri/meson.build
+++ b/src/gallium/targets/dri/meson.build
@@ -57,13 +57,14 @@ libgallium_dri = shared_library(
     dep_selinux, dep_expat, dep_libdrm, dep_llvm, dep_thread,
     driver_swrast, driver_r300, driver_r600, driver_radeonsi, driver_nouveau,
     driver_kmsro, driver_v3d, driver_vc4, driver_freedreno, driver_etnaviv,
-    driver_imx, driver_tegra, driver_i915, driver_svga, driver_virgl,
+    driver_tegra, driver_i915, driver_svga, driver_virgl,
     driver_swr,
   ],
 )
 
 foreach d : [[with_gallium_kmsro, 'pl111_dri.so'],
              [with_gallium_kmsro, 'hx8357d_dri.so'],
+             [with_gallium_kmsro, 'imx-drm_dri.so'],
              [with_gallium_radeonsi, 'radeonsi_dri.so'],
              [with_gallium_nouveau, 'nouveau_dri.so'],
              [with_gallium_freedreno, ['msm_dri.so', 'kgsl_dri.so']],
@@ -72,7 +73,6 @@ foreach d : [[with_gallium_kmsro, 'pl111_dri.so'],
              [with_gallium_v3d, 'v3d_dri.so'],
              [with_gallium_vc4, 'vc4_dri.so'],
              [with_gallium_etnaviv, 'etnaviv_dri.so'],
-             [with_gallium_imx, 'imx-drm_dri.so'],
              [with_gallium_tegra, 'tegra_dri.so'],
              [with_gallium_i915, 'i915_dri.so'],
              [with_gallium_r300, 'r300_dri.so'],
diff --git a/src/gallium/winsys/imx/drm/Android.mk b/src/gallium/winsys/imx/drm/Android.mk
deleted file mode 100644
index d001974d5d2..00000000000
--- a/src/gallium/winsys/imx/drm/Android.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright (C) 2016 Linaro, Ltd, Rob Herring <[email protected]>
-#
-# 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.
-
-LOCAL_PATH := $(call my-dir)
-
-include $(LOCAL_PATH)/Makefile.sources
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(C_SOURCES)
-
-LOCAL_SHARED_LIBRARIES := libdrm_etnaviv
-
-LOCAL_MODULE := libmesa_winsys_imx
-
-include $(GALLIUM_COMMON_MK)
-include $(BUILD_STATIC_LIBRARY)
-
-ifneq ($(HAVE_GALLIUM_IMX),)
-GALLIUM_TARGET_DRIVERS += imx-drm
-$(eval GALLIUM_LIBS += $(LOCAL_MODULE) libmesa_winsys_etnaviv)
-$(eval GALLIUM_SHARED_LIBS += $(LOCAL_SHARED_LIBRARIES))
-endif
diff --git a/src/gallium/winsys/imx/drm/Makefile.am b/src/gallium/winsys/imx/drm/Makefile.am
deleted file mode 100644
index f15b531f81f..00000000000
--- a/src/gallium/winsys/imx/drm/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright © 2012 Intel Corporation
-#
-# 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 (including the next
-# paragraph) 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.
-
-include Makefile.sources
-include $(top_srcdir)/src/gallium/Automake.inc
-
-AM_CFLAGS = \
-	-I$(top_srcdir)/src/gallium/drivers \
-	-I$(top_srcdir)/src/gallium/winsys \
-	$(GALLIUM_WINSYS_CFLAGS)
-
-noinst_LTLIBRARIES = libimxdrm.la
-
-libimxdrm_la_SOURCES = $(C_SOURCES)
-
-EXTRA_DIST = meson.build
diff --git a/src/gallium/winsys/imx/drm/Makefile.sources b/src/gallium/winsys/imx/drm/Makefile.sources
deleted file mode 100644
index 677ac79126d..00000000000
--- a/src/gallium/winsys/imx/drm/Makefile.sources
+++ /dev/null
@@ -1,3 +0,0 @@
-C_SOURCES := \
-   imx_drm_public.h \
-   imx_drm_winsys.c
diff --git a/src/gallium/winsys/imx/drm/imx_drm_public.h b/src/gallium/winsys/imx/drm/imx_drm_public.h
deleted file mode 100644
index e213f6c6bc3..00000000000
--- a/src/gallium/winsys/imx/drm/imx_drm_public.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2016 Christian Gmeiner <[email protected]>
- *
- * 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 (including the next
- * paragraph) 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.
- *
- * Authors:
- *    Christian Gmeiner <[email protected]>
- */
-
-#ifndef __IMX_DRM_PUBLIC_H__
-#define __IMX_DRM_PUBLIC_H__
-
-struct pipe_screen;
-
-struct pipe_screen *imx_drm_screen_create(int fd);
-
-#endif /* __IMX_DRM_PUBLIC_H__ */
diff --git a/src/gallium/winsys/imx/drm/imx_drm_winsys.c b/src/gallium/winsys/imx/drm/imx_drm_winsys.c
deleted file mode 100644
index cd72610b955..00000000000
--- a/src/gallium/winsys/imx/drm/imx_drm_winsys.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2016 Christian Gmeiner <[email protected]>
- *
- * 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 (including the next
- * paragraph) 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.
- *
- * Authors:
- *    Christian Gmeiner <[email protected]>
- */
-
-#include "imx_drm_public.h"
-#include "etnaviv/drm/etnaviv_drm_public.h"
-#include "renderonly/renderonly.h"
-
-#include <fcntl.h>
-#include <unistd.h>
-
-struct pipe_screen *imx_drm_screen_create(int fd)
-{
-   struct renderonly ro = {
-      .create_for_resource = renderonly_create_kms_dumb_buffer_for_resource,
-      .kms_fd = fd,
-      .gpu_fd = open("/dev/dri/renderD128", O_RDWR | O_CLOEXEC)
-   };
-
-   if (ro.gpu_fd < 0)
-      return NULL;
-
-   struct pipe_screen *screen = etna_drm_screen_create_renderonly(&ro);
-   if (!screen)
-      close(ro.gpu_fd);
-
-   return screen;
-}
diff --git a/src/gallium/winsys/imx/drm/meson.build b/src/gallium/winsys/imx/drm/meson.build
deleted file mode 100644
index 4efd7bb0660..00000000000
--- a/src/gallium/winsys/imx/drm/meson.build
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright © 2017 Intel Corporation
-
-# 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.
-
-libimxdrm = static_library(
-  'imxdrm',
-  'imx_drm_winsys.c',
-  include_directories : [
-    inc_include, inc_src, inc_gallium, inc_gallium_aux,
-    include_directories('../..'),
-  ],
-)
-
-driver_imx = declare_dependency(
-  compile_args : '-DGALLIUM_IMX',
-  link_with : libimxdrm,
-)