From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 40A626FCC4 for ; Fri, 7 Feb 2020 14:19:23 +0000 (UTC) Date: Fri, 7 Feb 2020 16:19:19 +0200 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Message-ID: <20200207141919.GA13686@intel.com> References: <20200128112549.172135-1-daniel.vetter@ffwll.ch> <20200128112549.172135-3-daniel.vetter@ffwll.ch> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200128112549.172135-3-daniel.vetter@ffwll.ch> 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: Daniel Vetter Cc: IGT development , Daniel Vetter , Noralf =?iso-8859-1?Q?Tr=F8nnes?= List-ID: 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 did > 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 cases. > = > 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? > 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 _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev