diff mbox series

[i-g-t,5/5] tests/kms_selftest: Integrate kernel selftest test-drm_modeset

Message ID 20181016222341.1537-5-drawat@vmware.com (mailing list archive)
State New, archived
Headers show
Series [i-g-t,1/5] lib/igt_fb: Call dumb_destroy ioctl in case of dumb buffers | expand

Commit Message

Deepak Singh Rawat Oct. 16, 2018, 10:23 p.m. UTC 
Call kernel selftest module test-drm_modeset for testing KMS.

v2:
- Add test alphabetically.
- Add test to meson build.

v3: Rename to kms_selftest.

Signed-off-by: Deepak Rawat <drawat@vmware.com>
---
 tests/Makefile.sources    |  1 +
 tests/igt_command_line.sh |  2 +-
 tests/kms_selftest.c      | 10 ++++++++++
 tests/meson.build         |  1 +
 4 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 tests/kms_selftest.c

Comments

Daniel Vetter June 20, 2019, 1:20 p.m. UTC | #1 
On Tue, Oct 16, 2018 at 03:23:41PM -0700, Deepak Rawat wrote:
> Call kernel selftest module test-drm_modeset for testing KMS.
>
> v2:
> - Add test alphabetically.
> - Add test to meson build.
>
> v3: Rename to kms_selftest.
>
> Signed-off-by: Deepak Rawat <drawat@vmware.com>

Just realized that this never landed ... any reasons? Would be nice to get
this handled.

Petri/Arek?

Cheers, Daniel


> ---
>  tests/Makefile.sources    |  1 +
>  tests/igt_command_line.sh |  2 +-
>  tests/kms_selftest.c      | 10 ++++++++++
>  tests/meson.build         |  1 +
>  4 files changed, 13 insertions(+), 1 deletion(-)
>  create mode 100644 tests/kms_selftest.c
>
> diff --git a/tests/Makefile.sources b/tests/Makefile.sources
> index 001f1a2b..cdf5a7e1 100644
> --- a/tests/Makefile.sources
> +++ b/tests/Makefile.sources
> @@ -202,6 +202,7 @@ TESTS_progs = \
>       kms_pwrite_crc \
>       kms_rmfb \
>       kms_rotation_crc \
> +     kms_selftest \
>       kms_setmode \
>       kms_sysfs_edid_timing \
>       kms_tv_load_detect \
> diff --git a/tests/igt_command_line.sh b/tests/igt_command_line.sh
> index 8285ba62..a4ec3f95 100755
> --- a/tests/igt_command_line.sh
> +++ b/tests/igt_command_line.sh
> @@ -90,7 +90,7 @@ check_test ()
>               # Subtest enumeration of kernel selftest launchers depends
>               # on the running kernel. If selftests are not enabled,
>               # they will output nothing and exit with 0.
> -             if [ "$testname" != "drv_selftest" -a "$testname" != "drm_mm" ]; then
> +             if [ "$testname" != "drv_selftest" -a "$testname" != "drm_mm" -a "$testname" != "kms_selftest" ]; then
>                       fail $test
>               fi
>       fi
> diff --git a/tests/kms_selftest.c b/tests/kms_selftest.c
> new file mode 100644
> index 00000000..f61ddd99
> --- /dev/null
> +++ b/tests/kms_selftest.c
> @@ -0,0 +1,10 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
> +#include "igt.h"
> +#include "igt_kmod.h"
> +
> +IGT_TEST_DESCRIPTION("Basic sanity check of KMS selftests.");
> +
> +igt_main
> +{
> +     igt_kselftests("test-drm_modeset", NULL, NULL, NULL);
> +}
> diff --git a/tests/meson.build b/tests/meson.build
> index 697ff515..d74eb109 100644
> --- a/tests/meson.build
> +++ b/tests/meson.build
> @@ -177,6 +177,7 @@ test_progs = [
>       'kms_pwrite_crc',
>       'kms_rmfb',
>       'kms_rotation_crc',
> +     'kms_selftest',
>       'kms_setmode',
>       'kms_sysfs_edid_timing',
>       'kms_tv_load_detect',
> --
> 2.17.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
Arkadiusz Hiler June 25, 2019, 6:01 a.m. UTC | #2 
On Thu, Jun 20, 2019 at 03:20:02PM +0200, Daniel Vetter wrote:
> On Tue, Oct 16, 2018 at 03:23:41PM -0700, Deepak Rawat wrote:
> > Call kernel selftest module test-drm_modeset for testing KMS.
> >
> > v2:
> > - Add test alphabetically.
> > - Add test to meson build.
> >
> > v3: Rename to kms_selftest.
> >
> > Signed-off-by: Deepak Rawat <drawat@vmware.com>
> 
> Just realized that this never landed ... any reasons? Would be nice to get
> this handled.
> 
> Petri/Arek?
> 
> Cheers, Daniel

What do you mean by "this never landed"?

https://gitlab.freedesktop.org/drm/igt-gpu-tools/commit/7766b1e2348b

commit 7766b1e2348b32cc8ed58a972c6fd53b20279549
Author:     Deepak Rawat <drawat@vmware.com>
AuthorDate: Tue Oct 16 15:23:41 2018 -0700
Commit:     Daniel Vetter <daniel.vetter@ffwll.ch>
CommitDate: Wed Oct 17 09:41:07 2018 +0200

tests/kms_selftest: Integrate kernel selftest test-drm_modeset
Daniel Vetter June 25, 2019, 3:37 p.m. UTC | #3 
On Tue, Jun 25, 2019 at 09:01:32AM +0300, Arkadiusz Hiler wrote:
> On Thu, Jun 20, 2019 at 03:20:02PM +0200, Daniel Vetter wrote:
> > On Tue, Oct 16, 2018 at 03:23:41PM -0700, Deepak Rawat wrote:
> > > Call kernel selftest module test-drm_modeset for testing KMS.
> > >
> > > v2:
> > > - Add test alphabetically.
> > > - Add test to meson build.
> > >
> > > v3: Rename to kms_selftest.
> > >
> > > Signed-off-by: Deepak Rawat <drawat@vmware.com>
> > 
> > Just realized that this never landed ... any reasons? Would be nice to get
> > this handled.
> > 
> > Petri/Arek?
> > 
> > Cheers, Daniel
> 
> What do you mean by "this never landed"?
> 
> https://gitlab.freedesktop.org/drm/igt-gpu-tools/commit/7766b1e2348b
> 
> commit 7766b1e2348b32cc8ed58a972c6fd53b20279549
> Author:     Deepak Rawat <drawat@vmware.com>
> AuthorDate: Tue Oct 16 15:23:41 2018 -0700
> Commit:     Daniel Vetter <daniel.vetter@ffwll.ch>
> CommitDate: Wed Oct 17 09:41:07 2018 +0200
> 
> tests/kms_selftest: Integrate kernel selftest test-drm_modeset

Hm not sure what I looked at, but it wasnt there. Sorry for the noise.
-Daniel
Daniel Vetter July 3, 2019, 10:37 a.m. UTC | #4 
On Tue, Jun 25, 2019 at 05:37:01PM +0200, Daniel Vetter wrote:
> On Tue, Jun 25, 2019 at 09:01:32AM +0300, Arkadiusz Hiler wrote:
> > On Thu, Jun 20, 2019 at 03:20:02PM +0200, Daniel Vetter wrote:
> > > On Tue, Oct 16, 2018 at 03:23:41PM -0700, Deepak Rawat wrote:
> > > > Call kernel selftest module test-drm_modeset for testing KMS.
> > > >
> > > > v2:
> > > > - Add test alphabetically.
> > > > - Add test to meson build.
> > > >
> > > > v3: Rename to kms_selftest.
> > > >
> > > > Signed-off-by: Deepak Rawat <drawat@vmware.com>
> > > 
> > > Just realized that this never landed ... any reasons? Would be nice to get
> > > this handled.
> > > 
> > > Petri/Arek?
> > > 
> > > Cheers, Daniel
> > 
> > What do you mean by "this never landed"?
> > 
> > https://gitlab.freedesktop.org/drm/igt-gpu-tools/commit/7766b1e2348b
> > 
> > commit 7766b1e2348b32cc8ed58a972c6fd53b20279549
> > Author:     Deepak Rawat <drawat@vmware.com>
> > AuthorDate: Tue Oct 16 15:23:41 2018 -0700
> > Commit:     Daniel Vetter <daniel.vetter@ffwll.ch>
> > CommitDate: Wed Oct 17 09:41:07 2018 +0200
> > 
> > tests/kms_selftest: Integrate kernel selftest test-drm_modeset
> 
> Hm not sure what I looked at, but it wasnt there. Sorry for the noise.

Ok this one here landed, but the other 4 didn't ... Can we unblock them
somehow? Or any hold-up? Would be nice to have igts for at least the more
recently added uapi, especially when the tests exist ...
-Daniel
Arkadiusz Hiler July 3, 2019, 10:53 a.m. UTC | #5 
On Wed, Jul 03, 2019 at 12:37:46PM +0200, Daniel Vetter wrote:
> On Tue, Jun 25, 2019 at 05:37:01PM +0200, Daniel Vetter wrote:
> > On Tue, Jun 25, 2019 at 09:01:32AM +0300, Arkadiusz Hiler wrote:
> > > On Thu, Jun 20, 2019 at 03:20:02PM +0200, Daniel Vetter wrote:
> > > > On Tue, Oct 16, 2018 at 03:23:41PM -0700, Deepak Rawat wrote:
> > > > > Call kernel selftest module test-drm_modeset for testing KMS.
> > > > >
> > > > > v2:
> > > > > - Add test alphabetically.
> > > > > - Add test to meson build.
> > > > >
> > > > > v3: Rename to kms_selftest.
> > > > >
> > > > > Signed-off-by: Deepak Rawat <drawat@vmware.com>
> > > > 
> > > > Just realized that this never landed ... any reasons? Would be nice to get
> > > > this handled.
> > > > 
> > > > Petri/Arek?
> > > > 
> > > > Cheers, Daniel
> > > 
> > > What do you mean by "this never landed"?
> > > 
> > > https://gitlab.freedesktop.org/drm/igt-gpu-tools/commit/7766b1e2348b
> > > 
> > > commit 7766b1e2348b32cc8ed58a972c6fd53b20279549
> > > Author:     Deepak Rawat <drawat@vmware.com>
> > > AuthorDate: Tue Oct 16 15:23:41 2018 -0700
> > > Commit:     Daniel Vetter <daniel.vetter@ffwll.ch>
> > > CommitDate: Wed Oct 17 09:41:07 2018 +0200
> > > 
> > > tests/kms_selftest: Integrate kernel selftest test-drm_modeset
> > 
> > Hm not sure what I looked at, but it wasnt there. Sorry for the noise.
> 
> Ok this one here landed, but the other 4 didn't ... Can we unblock them
> somehow? Or any hold-up? Would be nice to have igts for at least the more
> recently added uapi, especially when the tests exist ...
> -Daniel

I guess you are talking about https://patchwork.freedesktop.org/series/51087/

Seems like patches 1, 2, 3 and 5 are merged (see below).

The only patch that was not merged is "Some simple test cases to use
FB_DAMAGE_CLIPS plane property.":
https://patchwork.freedesktop.org/patch/257081/?series=51087&rev=1

Sorry but I jut feel lost here. Can you provide more context?
So what exactely haven't landed? What is still missing?


Looking through the archives it's impossible to tell what exactely
happened there. I have no idea why the 4th patch was left out and why
the other patches lack rb or ack and just have a second s-o-b.


commit 7766b1e2348b32cc8ed58a972c6fd53b20279549
Author:     Deepak Rawat <drawat@vmware.com>
AuthorDate: Tue Oct 16 15:23:41 2018 -0700
Commit:     Daniel Vetter <daniel.vetter@ffwll.ch>
CommitDate: Wed Oct 17 09:41:07 2018 +0200

    tests/kms_selftest: Integrate kernel selftest test-drm_modeset

    Call kernel selftest module test-drm_modeset for testing KMS.

    v2:
    - Add test alphabetically.
    - Add test to meson build.

    v3: Rename to kms_selftest.

    Signed-off-by: Deepak Rawat <drawat@vmware.com>
    Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

commit 759af708db65d8f9fc2218e3445cfb903c8be72a
Author:     Deepak Rawat <drawat@vmware.com>
AuthorDate: Tue Oct 16 15:23:39 2018 -0700
Commit:     Daniel Vetter <daniel.vetter@ffwll.ch>
CommitDate: Wed Oct 17 09:41:00 2018 +0200

    lib: Don't call igt_require_fb_modifiers() when no modifier

    vmwgfx and amdgpu doesn't support fb modifiers, yet kms_addfb() requires
    modifier support. Since many tests don't need this to run, the
    requirement can be made less broad.

    Therefore, tighten the requirement to cases where modifiers are actually
    needed.

    v2:
    * In create_fb() calls to kms_addfb(), remove the modifier flag iff the
      driver doesn't support modifiers and the modifer is 0
    * Don't modify the flag in kms_addfb().

    Signed-off-by: Deepak Rawat <drawat@vmware.com>
    Signed-off-by: Leo Li <sunpeng.li@amd.com>
    Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

commit c7034c780629b6f678dfe5021c38bc820a34e19d
Author:     Deepak Rawat <drawat@vmware.com>
AuthorDate: Tue Oct 16 15:23:38 2018 -0700
Commit:     Daniel Vetter <daniel.vetter@ffwll.ch>
CommitDate: Wed Oct 17 09:40:55 2018 +0200

    lib/igt_fb: Check for cairo surface success

    For vmwgfx cairo surface creation fails due to stride mismatch, add a
    igt_require_f() for surface.

    v2: Check for surface creation failure.

    Signed-off-by: Deepak Rawat <drawat@vmware.com>
    Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

commit 4ca3d1de874bd269b37055f1a4cc6de04ea2d050
Author:     Deepak Rawat <drawat@vmware.com>
AuthorDate: Tue Oct 16 15:23:37 2018 -0700
Commit:     Daniel Vetter <daniel.vetter@ffwll.ch>
CommitDate: Wed Oct 17 09:40:51 2018 +0200

    lib/igt_fb: Call dumb_destroy ioctl in case of dumb buffers

    vmwgfx does not support GEM interface so calling gem_close on vmwgfx
    results in error.

    v2: Use drmIoctl with error when ioctl() failed.

    v3: Seperate ioctl wrapper.

    Signed-off-by: Deepak Rawat <drawat@vmware.com>
    Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
diff mbox series

Patch

diff --git a/tests/Makefile.sources b/tests/Makefile.sources
index 001f1a2b..cdf5a7e1 100644
--- a/tests/Makefile.sources
+++ b/tests/Makefile.sources
@@ -202,6 +202,7 @@  TESTS_progs = \
 	kms_pwrite_crc \
 	kms_rmfb \
 	kms_rotation_crc \
+	kms_selftest \
 	kms_setmode \
 	kms_sysfs_edid_timing \
 	kms_tv_load_detect \
diff --git a/tests/igt_command_line.sh b/tests/igt_command_line.sh
index 8285ba62..a4ec3f95 100755
--- a/tests/igt_command_line.sh
+++ b/tests/igt_command_line.sh
@@ -90,7 +90,7 @@  check_test ()
 		# Subtest enumeration of kernel selftest launchers depends
 		# on the running kernel. If selftests are not enabled,
 		# they will output nothing and exit with 0.
-		if [ "$testname" != "drv_selftest" -a "$testname" != "drm_mm" ]; then
+		if [ "$testname" != "drv_selftest" -a "$testname" != "drm_mm" -a "$testname" != "kms_selftest" ]; then
 			fail $test
 		fi
 	fi
diff --git a/tests/kms_selftest.c b/tests/kms_selftest.c
new file mode 100644
index 00000000..f61ddd99
--- /dev/null
+++ b/tests/kms_selftest.c
@@ -0,0 +1,10 @@ 
+/* SPDX-License-Identifier: GPL-2.0 */
+#include "igt.h"
+#include "igt_kmod.h"
+
+IGT_TEST_DESCRIPTION("Basic sanity check of KMS selftests.");
+
+igt_main
+{
+	igt_kselftests("test-drm_modeset", NULL, NULL, NULL);
+}
diff --git a/tests/meson.build b/tests/meson.build
index 697ff515..d74eb109 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -177,6 +177,7 @@  test_progs = [
 	'kms_pwrite_crc',
 	'kms_rmfb',
 	'kms_rotation_crc',
+	'kms_selftest',
 	'kms_setmode',
 	'kms_sysfs_edid_timing',
 	'kms_tv_load_detect',