From patchwork Fri Mar 17 09:01:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Michel_D=C3=A4nzer?= X-Patchwork-Id: 9630023 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D4DD960245 for ; Fri, 17 Mar 2017 09:01:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B2ACC28696 for ; Fri, 17 Mar 2017 09:01:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A61C528698; Fri, 17 Mar 2017 09:01:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id AD84528696 for ; Fri, 17 Mar 2017 09:01:48 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2FBBB6E1C3; Fri, 17 Mar 2017 09:01:48 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from netline-mail3.netline.ch (unknown [148.251.143.178]) by gabe.freedesktop.org (Postfix) with ESMTP id E88046E1C3 for ; Fri, 17 Mar 2017 09:01:45 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by netline-mail3.netline.ch (Postfix) with ESMTP id 618832B2006; Fri, 17 Mar 2017 10:01:45 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at netline-mail3.netline.ch Received: from netline-mail3.netline.ch ([127.0.0.1]) by localhost (netline-mail3.netline.ch [127.0.0.1]) (amavisd-new, port 10024) with LMTP id yLLL8pFIXt7z; Fri, 17 Mar 2017 10:01:44 +0100 (CET) Received: from thor (42-144-27-164.rev.home.ne.jp [42.144.27.164]) by netline-mail3.netline.ch (Postfix) with ESMTPSA id 626A52B2005; Fri, 17 Mar 2017 10:01:44 +0100 (CET) Received: from localhost ([::1]) by thor with esmtp (Exim 4.89) (envelope-from ) id 1conlV-0000rG-Ad; Fri, 17 Mar 2017 18:01:41 +0900 From: =?UTF-8?Q?Michel_D=c3=a4nzer?= Subject: Re: [PATCH] drm/fb-helper: Only reject FB changes if FB_MISC_USER_EVENT is set To: =?UTF-8?B?VmlsbGUgU3lyasOkbMOk?= References: <20170316095553.1586-1-michel@daenzer.net> <20170316100900.GC31595@intel.com> Message-ID: <87d59360-8419-b547-7b6b-32afedcf1330@daenzer.net> Date: Fri, 17 Mar 2017 18:01:41 +0900 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 In-Reply-To: <20170316100900.GC31595@intel.com> Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP On 16/03/17 07:09 PM, Ville Syrjälä wrote: > On Thu, Mar 16, 2017 at 06:55:53PM +0900, Michel Dänzer wrote: >> From: Michel Dänzer >> >> Otherwise this can also prevent modesets e.g. for switching VTs. >> >> FB_MISC_USER_EVENT is set when the request originates from userspace, >> which is what we're interested in here according to the DRM_DEBUG >> output. > > So why is the kernel allowed to violate this? > > The checks look somewhat bogus to me anyway. The 'virtual size == fb size' > check makes some kind of sense. Although I don't see why the virtual > resolution couldn't be smaller than the fb size. But requiring that the > visible resolutionn matches the fb size as well definitely seems wrong. Agreed on all counts. So, I think what's needed is almost a revert of 865afb11949e, except for the bits_per_pixel comparison, since we really can't change that. See diff below. Does that make sense? Stefan, would this break any test case you wrote your patch for? >> Bugzilla: https://bugs.freedesktop.org/99841 >> Fixes: 865afb11949e ("drm/fb-helper: reject any changes to the fbdev") >> Signed-off-by: Michel Dänzer >> --- >> >> I'm not entirely sure why the values can not match for a VT switch. If >> anybody thinks this just papers over the real issue, please speak up. >> >> drivers/gpu/drm/drm_fb_helper.c | 7 ++++--- >> 1 file changed, 4 insertions(+), 3 deletions(-) >> >> diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c >> index f6d4d9700734..9663f3b8f287 100644 >> --- a/drivers/gpu/drm/drm_fb_helper.c >> +++ b/drivers/gpu/drm/drm_fb_helper.c >> @@ -1259,9 +1259,10 @@ int drm_fb_helper_check_var(struct fb_var_screeninfo *var, >> * Changes struct fb_var_screeninfo are currently not pushed back >> * to KMS, hence fail if different settings are requested. >> */ >> - if (var->bits_per_pixel != fb->format->cpp[0] * 8 || >> - var->xres != fb->width || var->yres != fb->height || >> - var->xres_virtual != fb->width || var->yres_virtual != fb->height) { >> + if ((info->flags & FBINFO_MISC_USEREVENT) && >> + (var->bits_per_pixel != fb->format->cpp[0] * 8 || >> + var->xres != fb->width || var->yres != fb->height || >> + var->xres_virtual != fb->width || var->yres_virtual != fb->height)) { >> DRM_DEBUG("fb userspace requested width/height/bpp different than current fb " >> "request %dx%d-%d (virtual %dx%d) > %dx%d-%d\n", >> var->xres, var->yres, var->bits_per_pixel, >> -- >> 2.11.0 >> >> _______________________________________________ >> dri-devel mailing list >> dri-devel@lists.freedesktop.org >> https://lists.freedesktop.org/mailman/listinfo/dri-devel > diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index f6d4d9700734..f4f70ce24fcc 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -1260,8 +1260,8 @@ int drm_fb_helper_check_var(struct fb_var_screeninfo *var, * to KMS, hence fail if different settings are requested. */ if (var->bits_per_pixel != fb->format->cpp[0] * 8 || - var->xres != fb->width || var->yres != fb->height || - var->xres_virtual != fb->width || var->yres_virtual != fb->height) { + var->xres > fb->width || var->yres > fb->height || + var->xres_virtual > fb->width || var->yres_virtual > fb->height) { DRM_DEBUG("fb userspace requested width/height/bpp different than current fb " "request %dx%d-%d (virtual %dx%d) > %dx%d-%d\n", var->xres, var->yres, var->bits_per_pixel,