From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7F01D6E906 for ; Mon, 10 Feb 2020 08:04:08 +0000 (UTC) Received: by mail-wr1-x444.google.com with SMTP id z7so6245628wrl.13 for ; Mon, 10 Feb 2020 00:04:08 -0800 (PST) Date: Mon, 10 Feb 2020 09:04:04 +0100 From: Daniel Vetter Message-ID: <20200210080404.GQ43062@phenom.ffwll.local> References: <20200128112549.172135-1-daniel.vetter@ffwll.ch> <20200128112549.172135-3-daniel.vetter@ffwll.ch> <20200207141919.GA13686@intel.com> <20200207152945.GE43062@phenom.ffwll.local> <20200207153608.GJ13686@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200207153608.GJ13686@intel.com> Subject: Re: [igt-dev] [PATCH i-g-t 3/3] tests/kms_fbcon_fbt: Drop master before restoring fbcon List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" To: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Cc: IGT development , Noralf =?iso-8859-1?Q?Tr=F8nnes?= , Daniel Vetter , Daniel Vetter List-ID: On Fri, Feb 07, 2020 at 05:36:08PM +0200, Ville Syrj=E4l=E4 wrote: > On Fri, Feb 07, 2020 at 04:29:45PM +0100, Daniel Vetter wrote: > > On Fri, Feb 07, 2020 at 04:19:19PM +0200, Ville Syrj=E4l=E4 wrote: > > > On Tue, Jan 28, 2020 at 12:25:49PM +0100, Daniel Vetter wrote: > > > > fbdev helpers refuse to restore the fbdev screen if there's still a > > > > master present. This is to avoid fbcon popping up when a compositor > > > > has intentionally disabled all outputs. > > > > = > > > > Unfortunately the kernel had some bugs in this area, and kms_fbcon_= fbt > > > > relied on those. Result was that fbdev restore was skipped, which > > > > skipped the frontbuffer flushing, which broke the PSR subtest's > > > > expectation that PSR is always disable when fbdev is enabled. FBC d= id > > > > not get broken because FBC was never enabled on linear framebuffers= as > > > > used by fbdev. > > > > = > > > > Fix things up to make sure fbcon gets restored correctly in all cas= es. > > > > = > > > > Cc: Noralf Tr=F8nnes > > > > Signed-off-by: Daniel Vetter > > > > --- > > > > tests/kms_fbcon_fbt.c | 2 ++ > > > > 1 file changed, 2 insertions(+) > > > > = > > > > diff --git a/tests/kms_fbcon_fbt.c b/tests/kms_fbcon_fbt.c > > > > index 236e09ea1ebd..ed4cccbe743e 100644 > > > > --- a/tests/kms_fbcon_fbt.c > > > > +++ b/tests/kms_fbcon_fbt.c > > > > @@ -74,6 +74,8 @@ static void teardown_drm(struct drm_info *drm) > > > > { > > > > int i; > > > > = > > > > + igt_assert_eq(drmDropMaster(drm->fd), 0); > > > > + > > > = > > > Aren't we closing the whole fd soonish? > > = > > Yeah, but after the vt switch, which I think is too late (proof still > > waiting for CI). I guess I could have moved the close up too, but I > > figured trying to implement proper vt switching a bit more closely yiel= ds > > the better test. > > = > > Could also be that I'm totally misinterpreting what's going on here with > > my kernel patch series. > = > I can buy that the close after vt switch somehow doesn't do the > same thing as swapping them around. At least can't see any possible > harm from this (other than not testing close-after-vt-switch), so CI results came back, this indeed fixes the regression that held up Noralf's original idea, so whatever the theory, the practice works out :-) > Reviewed-by: Ville Syrj=E4l=E4 Thanks for taking a look at these, all pushed. -Daniel > = > > -Daniel > > = > > > = > > > > kmstest_restore_vt_mode(); > > > > = > > > > for (i =3D 0; i < drm->res->count_connectors; i++) > > > > -- = > > > > 2.24.1 > > > > = > > > > _______________________________________________ > > > > igt-dev mailing list > > > > igt-dev@lists.freedesktop.org > > > > https://lists.freedesktop.org/mailman/listinfo/igt-dev > > > = > > > -- = > > > Ville Syrj=E4l=E4 > > > Intel > > = > > -- = > > Daniel Vetter > > Software Engineer, Intel Corporation > > http://blog.ffwll.ch > = > -- = > Ville Syrj=E4l=E4 > Intel -- = Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev