From ed65aeec7810a7d98a19461ba933bd77268cb0f6 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 23 Oct 2018 12:33:09 -0700 Subject: pl111: Rename the pl111 driver to "kmsro". The vc4 driver can do prime sharing to many different KMS-only devices, such as the various tinydrm drivers for SPI-attached displays. Rename the driver away from "pl111" to represent what it will actually support: various sorts of KMS displays with the renderonly layer used to attach a GPU. Reviewed-by: Eric Engestrom Reviewed-by: Christian Gmeiner Acked-by: Emil Velikov --- src/gallium/drivers/kmsro/Android.mk | 39 ++++++++++++++++++++++++++++++ src/gallium/drivers/kmsro/Automake.inc | 9 +++++++ src/gallium/drivers/kmsro/Makefile.am | 8 ++++++ src/gallium/drivers/kmsro/Makefile.sources | 2 ++ src/gallium/drivers/pl111/Android.mk | 39 ------------------------------ src/gallium/drivers/pl111/Automake.inc | 9 ------- src/gallium/drivers/pl111/Makefile.am | 8 ------ src/gallium/drivers/pl111/Makefile.sources | 2 -- 8 files changed, 58 insertions(+), 58 deletions(-) create mode 100644 src/gallium/drivers/kmsro/Android.mk create mode 100644 src/gallium/drivers/kmsro/Automake.inc create mode 100644 src/gallium/drivers/kmsro/Makefile.am create mode 100644 src/gallium/drivers/kmsro/Makefile.sources delete mode 100644 src/gallium/drivers/pl111/Android.mk delete mode 100644 src/gallium/drivers/pl111/Automake.inc delete mode 100644 src/gallium/drivers/pl111/Makefile.am delete mode 100644 src/gallium/drivers/pl111/Makefile.sources (limited to 'src/gallium/drivers') diff --git a/src/gallium/drivers/kmsro/Android.mk b/src/gallium/drivers/kmsro/Android.mk new file mode 100644 index 00000000000..8a851024dc8 --- /dev/null +++ b/src/gallium/drivers/kmsro/Android.mk @@ -0,0 +1,39 @@ +# Copyright (C) 2014 Emil Velikov +# +# 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) + +# get C_SOURCES +include $(LOCAL_PATH)/Makefile.sources + +include $(CLEAR_VARS) + +LOCAL_SRC_FILES := \ + $(C_SOURCES) + +LOCAL_MODULE := libmesa_pipe_kmsro + +include $(GALLIUM_COMMON_MK) +include $(BUILD_STATIC_LIBRARY) + +ifneq ($(HAVE_GALLIUM_KMSRO),) +GALLIUM_TARGET_DRIVERS += pl111 +$(eval GALLIUM_LIBS += $(LOCAL_MODULE) libmesa_winsys_kmsro) +endif diff --git a/src/gallium/drivers/kmsro/Automake.inc b/src/gallium/drivers/kmsro/Automake.inc new file mode 100644 index 00000000000..66d125cb440 --- /dev/null +++ b/src/gallium/drivers/kmsro/Automake.inc @@ -0,0 +1,9 @@ +if HAVE_GALLIUM_KMSRO + +TARGET_DRIVERS += pl111 +TARGET_CPPFLAGS += -DGALLIUM_KMSRO +TARGET_LIB_DEPS += \ + $(top_builddir)/src/gallium/winsys/kmsro/drm/libkmsrodrm.la \ + $(LIBDRM_LIBS) + +endif diff --git a/src/gallium/drivers/kmsro/Makefile.am b/src/gallium/drivers/kmsro/Makefile.am new file mode 100644 index 00000000000..5bfaccaa1e5 --- /dev/null +++ b/src/gallium/drivers/kmsro/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/src/gallium/Automake.inc + +AM_CPPFLAGS = \ + $(GALLIUM_CFLAGS) + +noinst_LTLIBRARIES = libkmsro.la + +libkmsro_la_SOURCES = $(C_SOURCES) diff --git a/src/gallium/drivers/kmsro/Makefile.sources b/src/gallium/drivers/kmsro/Makefile.sources new file mode 100644 index 00000000000..20396753fdb --- /dev/null +++ b/src/gallium/drivers/kmsro/Makefile.sources @@ -0,0 +1,2 @@ +C_SOURCES := + diff --git a/src/gallium/drivers/pl111/Android.mk b/src/gallium/drivers/pl111/Android.mk deleted file mode 100644 index 00a123ed7a5..00000000000 --- a/src/gallium/drivers/pl111/Android.mk +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright (C) 2014 Emil Velikov -# -# 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) - -# get C_SOURCES -include $(LOCAL_PATH)/Makefile.sources - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - $(C_SOURCES) - -LOCAL_MODULE := libmesa_pipe_pl111 - -include $(GALLIUM_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - -ifneq ($(HAVE_GALLIUM_PL111),) -GALLIUM_TARGET_DRIVERS += pl111 -$(eval GALLIUM_LIBS += $(LOCAL_MODULE) libmesa_winsys_pl111) -endif diff --git a/src/gallium/drivers/pl111/Automake.inc b/src/gallium/drivers/pl111/Automake.inc deleted file mode 100644 index 4ecd7dec988..00000000000 --- a/src/gallium/drivers/pl111/Automake.inc +++ /dev/null @@ -1,9 +0,0 @@ -if HAVE_GALLIUM_PL111 - -TARGET_DRIVERS += pl111 -TARGET_CPPFLAGS += -DGALLIUM_PL111 -TARGET_LIB_DEPS += \ - $(top_builddir)/src/gallium/winsys/pl111/drm/libpl111drm.la \ - $(LIBDRM_LIBS) - -endif diff --git a/src/gallium/drivers/pl111/Makefile.am b/src/gallium/drivers/pl111/Makefile.am deleted file mode 100644 index b3e95eeff44..00000000000 --- a/src/gallium/drivers/pl111/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -include $(top_srcdir)/src/gallium/Automake.inc - -AM_CPPFLAGS = \ - $(GALLIUM_CFLAGS) - -noinst_LTLIBRARIES = libpl111.la - -libpl111_la_SOURCES = $(C_SOURCES) diff --git a/src/gallium/drivers/pl111/Makefile.sources b/src/gallium/drivers/pl111/Makefile.sources deleted file mode 100644 index 20396753fdb..00000000000 --- a/src/gallium/drivers/pl111/Makefile.sources +++ /dev/null @@ -1,2 +0,0 @@ -C_SOURCES := - -- cgit v1.2.3