summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Kurtz <djkurtz@chromium.org>2015-03-20 17:16:45 +0000
committerEmil Velikov <emil.l.velikov@gmail.com>2015-03-20 17:18:01 +0000
commit9588e66dbd695dce24e0aba54eaf94f573ab5363 (patch)
treed3e81e918cd5098248b273247976d6d3b224989e
parent292b5100e5719343f4ffdd193ce5c582388ed05e (diff)
tests: add rockchip to modetest, kmstest, vbltest and proptest
There is a rockchip drm kms driver. Add "rockchip" to the static lists of driver names in the the standard set of tests. Signed-off-by: Daniel Kurtz <djkurtz@chromium.org> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> [Emil Velikov: Resolve trivial conflicts.] Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
-rw-r--r--tests/kmstest/main.c1
-rw-r--r--tests/modetest/modetest.c2
-rw-r--r--tests/proptest/proptest.c2
-rw-r--r--tests/vbltest/vbltest.c2
4 files changed, 4 insertions, 3 deletions
diff --git a/tests/kmstest/main.c b/tests/kmstest/main.c
index 1d4c63ef..7d50f5bd 100644
--- a/tests/kmstest/main.c
+++ b/tests/kmstest/main.c
@@ -63,6 +63,7 @@ static const char *drivers[] = {
"vmwgfx",
"exynos",
"imx-drm",
+ "rockchip",
NULL
};
diff --git a/tests/modetest/modetest.c b/tests/modetest/modetest.c
index 425e5287..5f46efd6 100644
--- a/tests/modetest/modetest.c
+++ b/tests/modetest/modetest.c
@@ -1453,7 +1453,7 @@ int main(int argc, char **argv)
int drop_master = 0;
int test_vsync = 0;
int test_cursor = 0;
- const char *modules[] = { "i915", "radeon", "nouveau", "vmwgfx", "omapdrm", "exynos", "tilcdc", "msm", "sti", "tegra", "imx-drm" };
+ const char *modules[] = { "i915", "radeon", "nouveau", "vmwgfx", "omapdrm", "exynos", "tilcdc", "msm", "sti", "tegra", "imx-drm", "rockchip" };
char *device = NULL;
char *module = NULL;
unsigned int i;
diff --git a/tests/proptest/proptest.c b/tests/proptest/proptest.c
index 9b2eb3f5..b9296bdb 100644
--- a/tests/proptest/proptest.c
+++ b/tests/proptest/proptest.c
@@ -303,7 +303,7 @@ static void printUsage(void)
int main(int argc, char *argv[])
{
- const char *modules[] = { "i915", "radeon", "nouveau", "vmwgfx", "omapdrm", "msm" };
+ const char *modules[] = { "i915", "radeon", "nouveau", "vmwgfx", "omapdrm", "msm", "rockchip" };
unsigned int i, ret = 0;
for (i = 0; i < ARRAY_SIZE(modules); i++){
diff --git a/tests/vbltest/vbltest.c b/tests/vbltest/vbltest.c
index 02fefbf1..4200adbe 100644
--- a/tests/vbltest/vbltest.c
+++ b/tests/vbltest/vbltest.c
@@ -106,7 +106,7 @@ int main(int argc, char **argv)
{
unsigned i;
int c, fd, ret;
- const char *modules[] = { "i915", "radeon", "nouveau", "vmwgfx", "exynos", "omapdrm", "tilcdc", "msm", "tegra", "imx-drm" };
+ const char *modules[] = { "i915", "radeon", "nouveau", "vmwgfx", "exynos", "omapdrm", "tilcdc", "msm", "tegra", "imx-drm" , "rockchip" };
drmVBlank vbl;
drmEventContext evctx;
struct vbl_info handler_info;