Revert "libdrm : add nexell api"tizen_8.0_m2_releaseaccepted/tizen/base/riscv/20231123.094520accepted/tizen/base/20230612.003345accepted/tizen/8.0/base/20231005.044832tizen_8.0_baseold/tizen_base_20231204accepted/tizen_8.0_base

This reverts commit bc257662c0a10c7fe671ea67a90a11b8fc537e06.

Not anymore artik board with nexell soc is used, so remove nexell
api from libdrm also.

Change-Id: Ie32d6c81aa8fe6524c95672c29396374668426f3
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>

10 files changed, 0 insertions, 339 deletions

diff --git a/meson.build b/meson.build
index b7eca4a0..b7a18206 100644
--- a/meson.build
+++ b/meson.build
@@ -189,8 +189,6 @@ summary('EXYNOS', with_exynos)
 
 with_vigs = get_option('vigs') == 'true'
 
-with_nexell = get_option('nexell') == 'true'
-
 with_vc4 = false
 _vc4 = get_option('vc4')
 if not _vc4.disabled()
@@ -269,7 +267,6 @@ config.set10('HAVE_VISIBILITY', cc.has_function_attribute('visibility:hidden'))
 foreach t : [
              [with_exynos, 'EXYNOS'],
              [with_vigs, 'VIGS'],
-             [with_nexell, 'NEXELL'],
              [with_freedreno_kgsl, 'FREEDRENO_KGSL'],
              [with_intel, 'INTEL'],
              [with_nouveau, 'NOUVEAU'],
@@ -383,9 +380,6 @@ endif
 if with_vigs
   subdir('vigs')
 endif
-if with_nexell
-  subdir('nexell')
-endif
 if with_freedreno
   subdir('freedreno')
 endif
diff --git a/meson_options.txt b/meson_options.txt
index cb1b124c..19e79777 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -63,13 +63,6 @@ option(
   description : '''Enable support for VIGS's experimental KMS API.''',
 )
 option(
-  'nexell',
-  type : 'combo',
-  value : 'false',
-  choices : ['true', 'false', 'auto'],
-  description : '''Enable support for NEXELL's experimental KMS API.''',
-)
-option(
   'freedreno',
   type : 'feature',
   description : '''Enable support for freedreno's KMS API.''',
diff --git a/nexell/libdrm_nexell.pc.in b/nexell/libdrm_nexell.pc.in
deleted file mode 100644
index 7e638005..00000000
--- a/nexell/libdrm_nexell.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: libdrm_nexell
-Description: Userspace interface to nexell kernel DRM services
-Version: 0.7
-Libs: -L${libdir} -ldrm_nexell
-Cflags: -I${includedir} -I${includedir}/libdrm -I${includedir}/nexell
-Requires.private: libdrm
diff --git a/nexell/meson.build b/nexell/meson.build
deleted file mode 100644
index b2840744..00000000
--- a/nexell/meson.build
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright © 2017-2018 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.
-
-libdrm_nexell = shared_library(
-  'drm_nexell',
-  [files('nexell_drm.c'), config_file],
-  c_args : libdrm_c_args,
-  include_directories : [inc_root, inc_drm],
-  link_with : libdrm,
-  dependencies : [dep_pthread_stubs],
-  version : '1.0.0',
-  install : true,
-)
-
-install_headers('nexell_drmif.h', subdir : 'libdrm')
-install_headers('nexell_drm.h', subdir : 'nexell')
-
-ext_libdrm_nexell = declare_dependency(
-  link_with : [libdrm, libdrm_nexell],
-  include_directories : [inc_drm, include_directories('.')],
-)
-
-pkg.generate(
-  name : 'libdrm_nexell',
-  libraries : libdrm_nexell,
-  subdirs : ['.', 'libdrm', 'nexell'],
-  version : '0.7',
-  requires_private : 'libdrm',
-  description : 'Userspace interface to nexell kernel DRM services',
-)
-
-test(
-  'nexell-symbols-check',
-  symbols_check,
-  args : [
-    '--lib', libdrm_nexell,
-    '--symbols-file', files('nexell-symbols.txt'),
-    '--nm', prog_nm.path(),
-  ],
-)
diff --git a/nexell/nexell-symbols.txt b/nexell/nexell-symbols.txt
deleted file mode 100644
index ad8b4748..00000000
--- a/nexell/nexell-symbols.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-nx_alloc_gem
-nx_gem_to_dmafd
-nx_free_gem
diff --git a/nexell/nexell_drm.c b/nexell/nexell_drm.c
deleted file mode 100644
index 9dac99df..00000000
--- a/nexell/nexell_drm.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (C) 2016  Nexell Co., Ltd.
- * Author: hyejung, kwon <cjscld15@nexell.co.kr>
- *
- * 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, sub license, 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 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 NON-INFRINGEMENT. IN NO EVENT SHALL
- * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS 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.
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- *
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <stdint.h>
-
-#include <xf86drm.h>
-
-#include "libdrm_macros.h"
-#include "nexell_drm.h"
-#include "nexell_drmif.h"
-
-/**
- * return gem_fd
- */
-drm_public int nx_alloc_gem(int drm_fd, int size, int flags)
-{
-	struct nx_drm_gem_create arg = { 0, };
-	int ret;
-
-	arg.size = (uint64_t)(unsigned int)size;
-	arg.flags = flags;
-
-	ret = drmCommandWriteRead(drm_fd, DRM_NX_GEM_CREATE, &arg,
-				     sizeof(arg));
-	if (ret) {
-		perror("drmCommandWriteRead\n");
-		return ret;
-	}
-
-	return arg.handle;
-}
-
-drm_public void nx_free_gem(int drm_fd, int gem)
-{
-	struct drm_gem_close arg = {0, };
-	int ret;
-
-	arg.handle = gem;
-	ret = drmIoctl(drm_fd, DRM_IOCTL_GEM_CLOSE, &arg);
-	if (ret)
-		perror("DRM_IOCTL_GEM_CLOSE failed\n");
-}
-
-/**
- * return dmabuf fd
- */
-drm_public int nx_gem_to_dmafd(int drm_fd, int gem_fd)
-{
-	int ret, fd;
-
-	ret = drmPrimeHandleToFD(drm_fd, gem_fd, 0, &fd);
-	if (ret)
-		return ret;
-
-	return fd;
-}
diff --git a/nexell/nexell_drm.h b/nexell/nexell_drm.h
deleted file mode 100644
index 998f6fef..00000000
--- a/nexell/nexell_drm.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright (C) 2016  Nexell Co., Ltd.
- * Author: hyejung, kwon <cjscld15@nexell.co.kr>
- *
- * 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, sub license, 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 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 NON-INFRINGEMENT. IN NO EVENT SHALL
- * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS 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.
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- *
- */
-
-#ifndef _UAPI_NX_DRM_H_
-#define _UAPI_NX_DRM_H_
-
-#include "drm.h"
-
-/**
- * User-desired buffer creation information structure.
- *
- * @size: user-desired memory allocation size.
- *	- this size value would be page-aligned internally.
- * @flags: user request for setting memory type or cache attributes.
- * @handle: returned a handle to created gem object.
- *	- this handle will be set by gem module of kernel side.
- */
-struct nx_drm_gem_create {
-	uint64_t size;
-	unsigned int flags;
-	unsigned int handle;
-};
-
-/**
- * A structure to gem information.
- *
- * @handle: a handle to gem object created.
- * @flags: flag value including memory type and cache attribute and
- *	this value would be set by driver.
- * @size: size to memory region allocated by gem and this size would
- *	be set by driver.
- */
-struct nx_drm_gem_info {
-	unsigned int handle;
-	unsigned int flags;
-	uint64_t size;
-};
-
-/*
- * nexell gem memory type
- */
-enum nx_gem_type {
-	/*
-	 * DMA continuous memory
-	 * user   : non-cacheable
-	 * kernel : non-cacheable
-	 */
-	NEXELL_BO_DMA,
-
-	/*
-	 * DMA continuous memory, allocate from DMA,
-	 * user   : cacheable
-	 * kernel : non-cacheable
-	 */
-	NEXELL_BO_DMA_CACHEABLE,
-
-	/*
-	 * System continuous memory, allocate from system
-	 * user   : non-cacheable
-	 * kernel : non-cacheable
-	 */
-	NEXELL_BO_SYSTEM,
-
-	/*
-	 * System continuous memory, allocate from system
-	 * user   : cacheable
-	 * kernel : cacheable
-	 */
-	NEXELL_BO_SYSTEM_CACHEABLE,
-
-	/*
-	 * System non-continuous memory, allocate from system
-	 * user   : non-cacheable
-	 * kernel : non-cacheable
-	 */
-	NEXELL_BO_SYSTEM_NONCONTIG,
-
-	/*
-	 * System non-continuous memory, allocate from system
-	 * user   : cacheable
-	 * kernel : cacheable
-	 */
-	NEXELL_BO_SYSTEM_NONCONTIG_CACHEABLE,
-
-	NEXELL_BO_MAX,
-};
-
-#define DRM_NX_GEM_CREATE		0x00
-#define DRM_NX_GEM_GET			0x04
-#define DRM_NX_GEM_SYNC			0x05
-
-#define DRM_IOCTL_NX_GEM_CREATE	DRM_IOWR(DRM_COMMAND_BASE + \
-		DRM_NX_GEM_CREATE, struct nx_drm_gem_create)
-
-#define DRM_IOCTL_NX_GEM_SYNC	DRM_IOWR(DRM_COMMAND_BASE + \
-		DRM_NX_GEM_SYNC, struct nx_drm_gem_create)
-
-#define DRM_IOCTL_NX_GEM_GET	DRM_IOWR(DRM_COMMAND_BASE + \
-		DRM_NX_GEM_GET,	struct nx_drm_gem_info)
-#endif
diff --git a/nexell/nexell_drmif.h b/nexell/nexell_drmif.h
deleted file mode 100644
index 09a6eb0c..00000000
--- a/nexell/nexell_drmif.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2016  Nexell Co., Ltd.
- * Author: hyejung, kwon <cjscld15@nexell.co.kr>
- *
- * 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, sub license, 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 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 NON-INFRINGEMENT. IN NO EVENT SHALL
- * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS 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.
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- *
- */
-
-#ifndef _NEXELL_DRMIF_H
-#define _NEXELL_DRMIF_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-int nx_alloc_gem(int drm_fd, int size, int flags);
-int nx_gem_to_dmafd(int drm_fd, int gem_fd);
-void nx_free_gem(int drm_fd, int gem);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
diff --git a/packaging/libdrm.spec b/packaging/libdrm.spec
index 2a7b79bc..299e1156 100644
--- a/packaging/libdrm.spec
+++ b/packaging/libdrm.spec
@@ -84,7 +84,6 @@ meson setup --prefix /usr --libdir %{_libdir} \
 %endif
        -Dexynos=enabled \
        -Dvigs=true \
-       -Dnexell=true \
        -Dinstall-test-programs=true \
        -Dcairo-tests=disabled \
        -Detnaviv=disabled \
@@ -111,7 +110,6 @@ ninja -C builddir install
 %{_libdir}/libdrm.so.*
 %{_libdir}/libdrm_exynos.so.*
 %{_libdir}/libdrm_vigs.so.*
-%{_libdir}/libdrm_nexell.so.*
 %{_libdir}/libdrm_freedreno.so.*
 
 %files tools
@@ -134,8 +132,6 @@ ninja -C builddir install
 %{_includedir}/libdrm/*.h
 %dir %{_includedir}/exynos
 %{_includedir}/exynos/*.h
-%dir %{_includedir}/nexell
-%{_includedir}/nexell/*.h
 %{_includedir}/*.h
 %{_libdir}/libdrm.so
 %{_libdir}/pkgconfig/libdrm.pc
@@ -148,8 +144,6 @@ ninja -C builddir install
 %endif
 %{_libdir}/libdrm_exynos.so
 %{_libdir}/pkgconfig/libdrm_exynos.pc
-%{_libdir}/libdrm_nexell.so
-%{_libdir}/pkgconfig/libdrm_nexell.pc
 %{_libdir}/libdrm_vigs.so
 %{_libdir}/pkgconfig/libdrm_vigs.pc
 
diff --git a/tests/util/kms.c b/tests/util/kms.c
index f0b4ac8b..95b7a455 100644
--- a/tests/util/kms.c
+++ b/tests/util/kms.c
@@ -125,7 +125,6 @@ static const char * const modules[] = {
 	"mxsfb-drm",
 	"simpledrm",
 	"imx-lcdif",
-	"nexell",
 };
 
 int util_open(const char *device, const char *module)