diff mbox

[libdrm] tests: add rockchip to modetest, kmstest, vbltest and proptest

Message ID 1425631957-15562-1-git-send-email-djkurtz@chromium.org (mailing list archive)
State New, archived
Headers show

Commit Message

Daniel Kurtz March 6, 2015, 8:52 a.m. UTC
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>
---
 tests/kmstest/main.c      | 1 +
 tests/modetest/modetest.c | 2 +-
 tests/proptest/proptest.c | 2 +-
 tests/vbltest/vbltest.c   | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

Comments

Daniel Kurtz March 19, 2015, 5:42 p.m. UTC | #1
On Fri, Mar 6, 2015 at 4:52 PM, Daniel Kurtz <djkurtz@chromium.org> wrote:
> 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>

Ping?

Can somebody please help review & push this patch.

Thanks,
-Dan

> ---
>  tests/kmstest/main.c      | 1 +
>  tests/modetest/modetest.c | 2 +-
>  tests/proptest/proptest.c | 2 +-
>  tests/vbltest/vbltest.c   | 2 +-
>  4 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/tests/kmstest/main.c b/tests/kmstest/main.c
> index 2c87b1c..fb22354 100644
> --- a/tests/kmstest/main.c
> +++ b/tests/kmstest/main.c
> @@ -63,6 +63,7 @@ char *drivers[] = {
>         "vmwgfx",
>         "exynos",
>         "imx-drm",
> +       "rockchip",
>         NULL
>  };
>
> diff --git a/tests/modetest/modetest.c b/tests/modetest/modetest.c
> index 425e528..5f46efd 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 7618f63..a6011bf 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[])
>  {
> -       char *modules[] = { "i915", "radeon", "nouveau", "vmwgfx", "omapdrm", "msm" };
> +       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 916d494..136d8f4 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;
> -       char *modules[] = { "i915", "radeon", "nouveau", "vmwgfx", "exynos", "omapdrm", "tilcdc", "msm", "tegra", "imx-drm" };
> +       char *modules[] = { "i915", "radeon", "nouveau", "vmwgfx", "exynos", "omapdrm", "tilcdc", "msm", "tegra", "imx-drm", "rockchip" };
>         drmVBlank vbl;
>         drmEventContext evctx;
>         struct vbl_info handler_info;
> --
> 2.2.0.rc0.207.ga3a616c
>
Emil Velikov March 19, 2015, 5:50 p.m. UTC | #2
On 19/03/15 17:42, Daniel Kurtz wrote:
> On Fri, Mar 6, 2015 at 4:52 PM, Daniel Kurtz <djkurtz@chromium.org> wrote:
>> 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>
> 
> Ping?
> 
> Can somebody please help review & push this patch.
> 
Might be a silly question:

Do we have a kernel version (or a Linus tree) where the rockchip drm
module landed ? Must admit I didn't pay close attention to it.

If so I'll push both patches later on today. They are quite trivial and
has been around for quite some time.

Thanks
Emil
Daniel Kurtz March 19, 2015, 5:54 p.m. UTC | #3
On Fri, Mar 20, 2015 at 1:50 AM, Emil Velikov <emil.l.velikov@gmail.com> wrote:
> On 19/03/15 17:42, Daniel Kurtz wrote:
>> On Fri, Mar 6, 2015 at 4:52 PM, Daniel Kurtz <djkurtz@chromium.org> wrote:
>>> 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>
>>
>> Ping?
>>
>> Can somebody please help review & push this patch.
>>
> Might be a silly question:
>
> Do we have a kernel version (or a Linus tree) where the rockchip drm
> module landed ? Must admit I didn't pay close attention to it.

Here's the commit that added drm/rockchip to mainline:
http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/drivers/gpu/drm/rockchip?id=2048e3286f347db5667708e47448176b5329e8d8

It was picked up by v3.19-rc1

>
> If so I'll push both patches later on today. They are quite trivial and
> has been around for quite some time.
>
> Thanks
> Emil
>
Emil Velikov March 20, 2015, 5:32 p.m. UTC | #4
On 19/03/15 17:54, Daniel Kurtz wrote:
> On Fri, Mar 20, 2015 at 1:50 AM, Emil Velikov <emil.l.velikov@gmail.com> wrote:
>> On 19/03/15 17:42, Daniel Kurtz wrote:
>>> On Fri, Mar 6, 2015 at 4:52 PM, Daniel Kurtz <djkurtz@chromium.org> wrote:
>>>> 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>
>>>
>>> Ping?
>>>
>>> Can somebody please help review & push this patch.
>>>
>> Might be a silly question:
>>
>> Do we have a kernel version (or a Linus tree) where the rockchip drm
>> module landed ? Must admit I didn't pay close attention to it.
> 
> Here's the commit that added drm/rockchip to mainline:
> http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/drivers/gpu/drm/rockchip?id=2048e3286f347db5667708e47448176b5329e8d8
> 
> It was picked up by v3.19-rc1
> 
Thanks for the confirmation. Seems like I'm a kernel release or two out
of date :-)

I've rebased the latter patch on master and pushed them both.

-Emil
diff mbox

Patch

diff --git a/tests/kmstest/main.c b/tests/kmstest/main.c
index 2c87b1c..fb22354 100644
--- a/tests/kmstest/main.c
+++ b/tests/kmstest/main.c
@@ -63,6 +63,7 @@  char *drivers[] = {
 	"vmwgfx",
 	"exynos",
 	"imx-drm",
+	"rockchip",
 	NULL
 };
 
diff --git a/tests/modetest/modetest.c b/tests/modetest/modetest.c
index 425e528..5f46efd 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 7618f63..a6011bf 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[])
 {
-	char *modules[] = { "i915", "radeon", "nouveau", "vmwgfx", "omapdrm", "msm" };
+	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 916d494..136d8f4 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;
-	char *modules[] = { "i915", "radeon", "nouveau", "vmwgfx", "exynos", "omapdrm", "tilcdc", "msm", "tegra", "imx-drm" };
+	char *modules[] = { "i915", "radeon", "nouveau", "vmwgfx", "exynos", "omapdrm", "tilcdc", "msm", "tegra", "imx-drm", "rockchip" };
 	drmVBlank vbl;
 	drmEventContext evctx;
 	struct vbl_info handler_info;