summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbhinav Kumar <abhinavk@codeaurora.org>2020-09-15 12:56:10 -0700
committerPetri Latvala <petri.latvala@intel.com>2020-09-16 11:15:08 +0300
commite1b1f185c9e8b9d41f7dc8fb835de57454894581 (patch)
treec02dd7c2c21d6d82d235179366fe9549765a66c8
parentee01acab0b6cee7be5cc4278e5d7527ec3e358ba (diff)
tools: rename intel_dp_compliance_hotplug to igt_dp_compliance_hotplug
Rename intel_dp_compliance_hotplug to igt_dp_compliance_hotplug so that other modules can use the APIs. changes in v2: none Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org> Reviewed-by: Petri Latvala <petri.latvala@intel.com>
-rw-r--r--tools/Makefile.sources4
-rw-r--r--tools/igt_dp_compliance.h (renamed from tools/intel_dp_compliance.h)5
-rw-r--r--tools/igt_dp_compliance_hotplug.c (renamed from tools/intel_dp_compliance_hotplug.c)9
-rw-r--r--tools/intel_dp_compliance.c7
-rw-r--r--tools/meson.build2
5 files changed, 15 insertions, 12 deletions
diff --git a/tools/Makefile.sources b/tools/Makefile.sources
index b7a43d47..c28bef2f 100644
--- a/tools/Makefile.sources
+++ b/tools/Makefile.sources
@@ -63,8 +63,8 @@ intel_l3_parity_SOURCES = \
intel_dp_compliance_SOURCES = \
intel_dp_compliance.c \
- intel_dp_compliance.h \
- intel_dp_compliance_hotplug.c \
+ igt_dp_compliance.h \
+ igt_dp_compliance_hotplug.c \
$(NULL)
amd_hdmi_compliance_SOURCES = \
diff --git a/tools/intel_dp_compliance.h b/tools/igt_dp_compliance.h
index 50a9662e..bf2b0701 100644
--- a/tools/intel_dp_compliance.h
+++ b/tools/igt_dp_compliance.h
@@ -1,4 +1,5 @@
/*
+ * Copyright (c) 2020, The Linux Foundation. All rights reserved.
* Copyright 2017 Intel Corporation
* Manasi Navare <manasi.d.navare@intel.com>
*
@@ -28,8 +29,8 @@
extern int drm_fd;
-gboolean intel_dp_compliance_setup_hotplug(void);
-void intel_dp_compliance_cleanup_hotplug(void);
+gboolean igt_dp_compliance_setup_hotplug(void);
+void igt_dp_compliance_cleanup_hotplug(void);
/* called by the hotplug code */
int update_display(int mode, bool is_compliance_test);
diff --git a/tools/intel_dp_compliance_hotplug.c b/tools/igt_dp_compliance_hotplug.c
index b57f8a27..d05e45ca 100644
--- a/tools/intel_dp_compliance_hotplug.c
+++ b/tools/igt_dp_compliance_hotplug.c
@@ -1,4 +1,5 @@
/*
+ * Copyright (c) 2020, The Linux Foundation. All rights reserved.
* Copyright 2017 Intel Corporation
* Jesse Barnes <jesse.barnes@intel.com>
* Manasi Navare <manasi.d.navare@intel.com>
@@ -29,7 +30,7 @@
#include <sys/stat.h>
-#include "intel_dp_compliance.h"
+#include "igt_dp_compliance.h"
#include <libudev.h>
static struct udev_monitor *uevent_monitor;
static struct udev *udev;
@@ -62,7 +63,7 @@ out:
}
-gboolean intel_dp_compliance_setup_hotplug(void)
+gboolean igt_dp_compliance_setup_hotplug(void)
{
int ret;
@@ -109,11 +110,11 @@ gboolean intel_dp_compliance_setup_hotplug(void)
return TRUE;
out:
- intel_dp_compliance_cleanup_hotplug();
+ igt_dp_compliance_cleanup_hotplug();
return FALSE;
}
-void intel_dp_compliance_cleanup_hotplug(void)
+void igt_dp_compliance_cleanup_hotplug(void)
{
if (udevchannel)
g_io_channel_shutdown(udevchannel, TRUE, NULL);
diff --git a/tools/intel_dp_compliance.c b/tools/intel_dp_compliance.c
index f26108b5..5c423897 100644
--- a/tools/intel_dp_compliance.c
+++ b/tools/intel_dp_compliance.c
@@ -1,4 +1,5 @@
/*
+ * Copyright (c) 2020, The Linux Foundation. All rights reserved.
* Copyright © 2017 Intel Corporation
*
* Permission is hereby granted, free of charge, to any person obtaining a
@@ -125,7 +126,7 @@
#include <fcntl.h>
#include <time.h>
-#include "intel_dp_compliance.h"
+#include "igt_dp_compliance.h"
#include <stdlib.h>
#include <signal.h>
@@ -1067,7 +1068,7 @@ int main(int argc, char **argv)
goto out_close;
}
- if (!intel_dp_compliance_setup_hotplug()) {
+ if (!igt_dp_compliance_setup_hotplug()) {
igt_warn("Failed to initialize hotplug support\n");
goto out_mainloop;
}
@@ -1108,7 +1109,7 @@ int main(int argc, char **argv)
out_stdio:
g_io_channel_shutdown(stdinchannel, TRUE, NULL);
out_hotplug:
- intel_dp_compliance_cleanup_hotplug();
+ igt_dp_compliance_cleanup_hotplug();
out_mainloop:
g_main_loop_unref(mainloop);
out_close:
diff --git a/tools/meson.build b/tools/meson.build
index 34f95e79..05f2a172 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -60,7 +60,7 @@ endforeach
if libudev.found()
intel_dp_compliance_src = [
'intel_dp_compliance.c',
- 'intel_dp_compliance_hotplug.c'
+ 'igt_dp_compliance_hotplug.c'
]
executable('intel_dp_compliance', sources : intel_dp_compliance_src,
dependencies : [tool_deps, libudev],