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>

diff --git a/tests/kmstest/main.c b/tests/kmstest/main.c
index 1d4c63e..7d50f5b 100644 (file)
--- 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 425e528..5f46efd 100644 (file)
--- 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 9b2eb3f..b9296bd 100644 (file)
--- 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 02fefbf..4200adb 100644 (file)
--- 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;