[GEM] Change the base path of GEM driver

This commit changes the base path of GEM driver
: /dev/dri/cardXX --> /dev/cardXX

Signed-off-by: Dongju Chae <dongju.chae@samsung.com>

diff --git a/meson_options.txt b/meson_options.txt
index 5ada8ec..5ab7fdc 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,5 +1,5 @@
 option('comm_opt', type : 'string', value : 'ip')
 option('resv_mem_size', type : 'string', value : '512M')
 option('working_dir', type : 'string', value : '/tmp/')
-option('log_dir', type : 'string', value : '/tmp')
+option('log_dir', type : 'string', value : '/tmp/')
 option('enable_test_mode', type : 'boolean', value : true)

diff --git a/src/core/gem/GEMdrvAPI.c b/src/core/gem/GEMdrvAPI.c
index 763fcc0..937058e 100644 (file)
--- a/src/core/gem/GEMdrvAPI.c
+++ b/src/core/gem/GEMdrvAPI.c
@@ -35,7 +35,7 @@
 #include <ne-conf.h>
 #include <ne-utils.h>
 
-#define DRM_BASE_PATH "/dev/dri/card"
+#define DRM_BASE_PATH "/dev/card"
 #define GEM_NAME      "cgem"
 #define ALIGN_SIZE    4096
 #define DUMMY_HANDLE  0xdeadbeef

diff --git a/src/test/unittests/ne_core_gem_test.cpp b/src/test/unittests/ne_core_gem_test.cpp
index c52ec61..86cb97f 100644 (file)
--- a/src/test/unittests/ne_core_gem_test.cpp
+++ b/src/test/unittests/ne_core_gem_test.cpp
@@ -205,7 +205,8 @@ TEST (ne_core_gem_test, self_import_dmabuf)
 int
 main (int argc, char **argv)
 {
-  load_conf_default();
+  /** NULL is OK because it will load load_conf_default */
+  load_conf (argv[1]);
 
   testing::InitGoogleTest (&argc, argv);