diff mbox

[i-g-t] kms_atomic: Skip rather than fail on non-atomic drivers

Message ID 1459804630-7387-1-git-send-email-matthew.d.roper@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Matt Roper April 4, 2016, 9:17 p.m. UTC
i915 does not yet support the atomic modesetting interface by default;
at the moment it must be turned on explicitly via an
'i915.nuclear_pageflip' kernel command line option.  We should skip
(rather than fail) this IGT test when running on kernels that don't
advertise support for atomic modesetting.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93014
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
---
 tests/kms_atomic.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Daniel Stone April 5, 2016, 1:02 p.m. UTC | #1
Hi,

On 4 April 2016 at 22:17, Matt Roper <matthew.d.roper@intel.com> wrote:
> i915 does not yet support the atomic modesetting interface by default;
> at the moment it must be turned on explicitly via an
> 'i915.nuclear_pageflip' kernel command line option.  We should skip
> (rather than fail) this IGT test when running on kernels that don't
> advertise support for atomic modesetting.

That was certainly the intention.

Reviewed-by: Daniel Stone <daniels@collabora.com>

Cheers,
Daniel
Matt Roper April 5, 2016, 2:43 p.m. UTC | #2
On Tue, Apr 05, 2016 at 02:02:38PM +0100, Daniel Stone wrote:
> Hi,
> 
> On 4 April 2016 at 22:17, Matt Roper <matthew.d.roper@intel.com> wrote:
> > i915 does not yet support the atomic modesetting interface by default;
> > at the moment it must be turned on explicitly via an
> > 'i915.nuclear_pageflip' kernel command line option.  We should skip
> > (rather than fail) this IGT test when running on kernels that don't
> > advertise support for atomic modesetting.
> 
> That was certainly the intention.
> 
> Reviewed-by: Daniel Stone <daniels@collabora.com>
> 
> Cheers,
> Daniel

Thanks for the review; pushed.


Matt
diff mbox

Patch

diff --git a/tests/kms_atomic.c b/tests/kms_atomic.c
index 2f3080a..6a6cfa7 100644
--- a/tests/kms_atomic.c
+++ b/tests/kms_atomic.c
@@ -723,7 +723,7 @@  static void atomic_setup(struct kms_atomic_state *state)
 	desc->fd = drm_open_driver_master(DRIVER_INTEL);
 	igt_assert_fd(desc->fd);
 
-	do_or_die(drmSetClientCap(desc->fd, DRM_CLIENT_CAP_ATOMIC, 1));
+	igt_skip_on(drmSetClientCap(desc->fd, DRM_CLIENT_CAP_ATOMIC, 1));
 
 	res = drmModeGetResources(desc->fd);
 	res_plane = drmModeGetPlaneResources(desc->fd);