Message ID | 20181002112601.9981-1-chris@chris-wilson.co.uk (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | [i-g-t] igt/kms_busy: Flush request queue when re-enabling hangcheck | expand |
On Tue, Oct 02, 2018 at 12:26:01PM +0100, Chris Wilson wrote: > Enabling hangcheck only takes effect at the start of a new request > queue. Before we re-enable hangcheck after our poking around, we > therefore need to wait until the gpu is idle otherwise the next test > will start without hangcheck and subsequently hang forever. > > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> > Cc: Petri Latvala <petri.latvala@intel.com> Tested-by: Petri Latvala <petri.latvala@intel.com> Reviewed-by: Petri Latvala <petri.latvala@intel.com> > --- > tests/kms_busy.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/tests/kms_busy.c b/tests/kms_busy.c > index d821ec711..ed3caae4c 100644 > --- a/tests/kms_busy.c > +++ b/tests/kms_busy.c > @@ -138,6 +138,7 @@ static void flip_to_fb(igt_display_t *dpy, int pipe, > igt_assert(poll(&pfd, 1, 0) == 0); > > if (modeset) { > + gem_quiescent_gpu(dpy->drm_fd); > igt_set_module_param_int("enable_hangcheck", 1); > > /* Clear old mode blob. */ > -- > 2.19.0 >
diff --git a/tests/kms_busy.c b/tests/kms_busy.c index d821ec711..ed3caae4c 100644 --- a/tests/kms_busy.c +++ b/tests/kms_busy.c @@ -138,6 +138,7 @@ static void flip_to_fb(igt_display_t *dpy, int pipe, igt_assert(poll(&pfd, 1, 0) == 0); if (modeset) { + gem_quiescent_gpu(dpy->drm_fd); igt_set_module_param_int("enable_hangcheck", 1); /* Clear old mode blob. */
Enabling hangcheck only takes effect at the start of a new request queue. Before we re-enable hangcheck after our poking around, we therefore need to wait until the gpu is idle otherwise the next test will start without hangcheck and subsequently hang forever. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Petri Latvala <petri.latvala@intel.com> --- tests/kms_busy.c | 1 + 1 file changed, 1 insertion(+)