[i-g-t] Allow a full modeset in kms_properties atomic case

Submitted by Stanislav Lisovskiy on Nov. 28, 2018, 1:03 p.m.

Details

Message ID 20181128130334.6024-1-stanislav.lisovskiy@intel.com
State Accepted
Series "Allow a full modeset in kms_properties atomic case"
Commit 3b52e8a5809a4e860350c59476a456745cd9fee0
Headers show

Commit Message

Stanislav Lisovskiy Nov. 28, 2018, 1:03 p.m.
Otherwise we are getting EINVAL as drm requires it
at some point.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108642
Signed-off-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
---
 tests/kms_properties.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/tests/kms_properties.c b/tests/kms_properties.c
index 82d28e9b..eb9cbdda 100644
--- a/tests/kms_properties.c
+++ b/tests/kms_properties.c
@@ -100,7 +100,7 @@  static void max_bpc_prop_test(int fd, uint32_t id, uint32_t type, drmModePropert
 			ret = drmModeAtomicAddProperty(req, id, prop_id, i);
 			igt_assert(ret >= 0);
 
-			ret = drmModeAtomicCommit(fd, req, DRM_MODE_ATOMIC_TEST_ONLY, NULL);
+			ret = drmModeAtomicCommit(fd, req, DRM_MODE_ATOMIC_TEST_ONLY | DRM_MODE_ATOMIC_ALLOW_MODESET, NULL);
 			igt_assert_eq(ret, 0);
 		}
 	}

Comments

Maarten Lankhorst Nov. 28, 2018, 1:56 p.m.
Op 28-11-18 om 14:03 schreef Stanislav Lisovskiy:
> Otherwise we are getting EINVAL as drm requires it
> at some point.
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108642
> Signed-off-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
> ---
>  tests/kms_properties.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tests/kms_properties.c b/tests/kms_properties.c
> index 82d28e9b..eb9cbdda 100644
> --- a/tests/kms_properties.c
> +++ b/tests/kms_properties.c
> @@ -100,7 +100,7 @@ static void max_bpc_prop_test(int fd, uint32_t id, uint32_t type, drmModePropert
>  			ret = drmModeAtomicAddProperty(req, id, prop_id, i);
>  			igt_assert(ret >= 0);
>  
> -			ret = drmModeAtomicCommit(fd, req, DRM_MODE_ATOMIC_TEST_ONLY, NULL);
> +			ret = drmModeAtomicCommit(fd, req, DRM_MODE_ATOMIC_TEST_ONLY | DRM_MODE_ATOMIC_ALLOW_MODESET, NULL);
>  			igt_assert_eq(ret, 0);
>  		}
>  	}

Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>

Lets wait for CI results before committing it. :)
James Ausmus Dec. 7, 2018, 4:11 p.m.
On Wed, Nov 28, 2018 at 02:56:03PM +0100, Maarten Lankhorst wrote:
> Op 28-11-18 om 14:03 schreef Stanislav Lisovskiy:
> > Otherwise we are getting EINVAL as drm requires it
> > at some point.
> > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108642
> > Signed-off-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
> > ---
> >  tests/kms_properties.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/tests/kms_properties.c b/tests/kms_properties.c
> > index 82d28e9b..eb9cbdda 100644
> > --- a/tests/kms_properties.c
> > +++ b/tests/kms_properties.c
> > @@ -100,7 +100,7 @@ static void max_bpc_prop_test(int fd, uint32_t id, uint32_t type, drmModePropert
> >  			ret = drmModeAtomicAddProperty(req, id, prop_id, i);
> >  			igt_assert(ret >= 0);
> >  
> > -			ret = drmModeAtomicCommit(fd, req, DRM_MODE_ATOMIC_TEST_ONLY, NULL);
> > +			ret = drmModeAtomicCommit(fd, req, DRM_MODE_ATOMIC_TEST_ONLY | DRM_MODE_ATOMIC_ALLOW_MODESET, NULL);
> >  			igt_assert_eq(ret, 0);
> >  		}
> >  	}
> 
> Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> 
> Lets wait for CI results before committing it. :)

Can this get merged now, or is it still waiting for something
additional?

Thanks!

-James

> 
> _______________________________________________
> igt-dev mailing list
> igt-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/igt-dev