From 41a0acd6a149ec9f47ea527ad08a2b29bf1ee6b2 Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Thu, 24 Jan 2019 14:03:54 -0600 Subject: 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 --- src/gallium/winsys/imx/drm/Android.mk | 40 ----------------------- src/gallium/winsys/imx/drm/Makefile.am | 35 -------------------- src/gallium/winsys/imx/drm/Makefile.sources | 3 -- src/gallium/winsys/imx/drm/imx_drm_public.h | 34 -------------------- src/gallium/winsys/imx/drm/imx_drm_winsys.c | 50 ----------------------------- src/gallium/winsys/imx/drm/meson.build | 33 ------------------- 6 files changed, 195 deletions(-) delete mode 100644 src/gallium/winsys/imx/drm/Android.mk delete mode 100644 src/gallium/winsys/imx/drm/Makefile.am delete mode 100644 src/gallium/winsys/imx/drm/Makefile.sources delete mode 100644 src/gallium/winsys/imx/drm/imx_drm_public.h delete mode 100644 src/gallium/winsys/imx/drm/imx_drm_winsys.c delete mode 100644 src/gallium/winsys/imx/drm/meson.build (limited to 'src/gallium/winsys') 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 -# -# 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 - * - * 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 - */ - -#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 - * - * 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 - */ - -#include "imx_drm_public.h" -#include "etnaviv/drm/etnaviv_drm_public.h" -#include "renderonly/renderonly.h" - -#include -#include - -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, -) -- cgit v1.2.3