From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2AEB9C43461 for ; Tue, 8 Sep 2020 12:34:48 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C34F122204 for ; Tue, 8 Sep 2020 12:34:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="UIT4M0Ss"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="o82MyZtt" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C34F122204 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ideasonboard.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=5U0lsbNg4Hp6BmFsCBNZ37zg2X6eX9Q1FUIyIGkZNOI=; b=UIT4M0Ssd1Iu1qwb1e4lBhCja f5z3rSLfRuWWUqBIjLdZeAPo+Io9nxuW/9AE9GXGXRzlePVnDY4Xv8FsGqWz7ctgEQhCkl/iJNG6F kpXXTCM5WcqxiLJGhQNSjcRYo00tIAxViD+UQKrLjXysO0brtF7dwl8Kxu2hgbf2ypObdYO1sFGD+ RvnjNLeAq11Y4MqPbXWj5mg8uknRWltfdOsjUdy8EzSb1luiCHlfJ2Mo9PFehA/qNDRboYZFeQS9m Qhnp1rhR0OyoEK1sZJZCkMx2p5AIKMVHFoa6F+rtn0uNaNiz6esQIe0IPVdPcUY4i+KL/1eEJinSy cW0IvAZxA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kFcoY-0004t1-SS; Tue, 08 Sep 2020 12:33:34 +0000 Received: from perceval.ideasonboard.com ([213.167.242.64]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kFcoV-0004qf-DL for linux-arm-kernel@lists.infradead.org; Tue, 08 Sep 2020 12:33:32 +0000 Received: from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 17F7639; Tue, 8 Sep 2020 14:33:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1599568409; bh=riOmNX5TuJ5eFsdAyj0GKFw6UcgA8btP1qttDiibWJI=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=o82MyZtte8Z7fVpG7956tHW5sKiziDyxBaaOTq0LuZ4+nE+VIhy0A0dfJzRhR5Odw VUGjF4V6J4BCM4dAzTBdlhwTvE9BOOc8MrI+KVliGoIpZ7fbjVw5NDFYk+Ocrq0oc7 q0QmojVl8dFqdvGzaZzHf/ZhTZVy2IkMvtoWrmO0= Date: Tue, 8 Sep 2020 15:33:04 +0300 From: Laurent Pinchart To: Daniel Vetter Subject: Re: [PATCH] drm: mxsfb: check framebuffer pitch Message-ID: <20200908123304.GG6047@pendragon.ideasonboard.com> References: <20200907160343.124405-1-stefan@agner.ch> <20200907161712.GF6047@pendragon.ideasonboard.com> <20200907181855.GE2352366@phenom.ffwll.local> <86615b4b1551d4a6f1cfcc13b38e616c@agner.ch> <20200908084855.GH2352366@phenom.ffwll.local> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200908_083331_588725_118164BF X-CRM114-Status: GOOD ( 37.19 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marek Vasut , dri-devel , Dave Airlie , Fabio Estevam , Sascha Hauer , Linux Kernel Mailing List , Jyri Sarha , Tomi Valkeinen , Stefan Agner , Sascha Hauer , Shawn Guo , Linux ARM , dl-linux-imx Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Tue, Sep 08, 2020 at 02:29:02PM +0200, Daniel Vetter wrote: > On Tue, Sep 8, 2020 at 2:07 PM Stefan Agner wrote: > > On 2020-09-08 10:48, Daniel Vetter wrote: > >> On Tue, Sep 08, 2020 at 11:18:25AM +0300, Tomi Valkeinen wrote: > >>> On 08/09/2020 10:55, Stefan Agner wrote: > >>>> On 2020-09-07 20:18, Daniel Vetter wrote: > >>>>> On Mon, Sep 07, 2020 at 07:17:12PM +0300, Laurent Pinchart wrote: > >>>>>> Hi Stefan, > >>>>>> > >>>>>> Thank you for the patch. > >>>>>> > >>>>>> On Mon, Sep 07, 2020 at 06:03:43PM +0200, Stefan Agner wrote: > >>>>>>> The lcdif IP does not support a framebuffer pitch (stride) other than > >>>>>>> the CRTC width. Check for equality and reject the state otherwise. > >>>>>>> > >>>>>>> This prevents a distorted picture when using 640x800 and running the > >>>>>>> Mesa graphics stack. Mesa tires to use a cache aligned stride, which > >>>>>> > >>>>>> s/tires/tries/ > >>>>>> > >>>>>>> leads at that particular resolution to width != stride. Currently > >>>>>>> Mesa has no fallback behavior, but rejecting this configuration allows > >>>>>>> userspace to handle the issue correctly. > >>>>>> > >>>>>> I'm increasingly impressed by how featureful this IP core is :-) > >>>>>> > >>>>>>> Signed-off-by: Stefan Agner > >>>>>>> --- > >>>>>>> drivers/gpu/drm/mxsfb/mxsfb_kms.c | 22 ++++++++++++++++++---- > >>>>>>> 1 file changed, 18 insertions(+), 4 deletions(-) > >>>>>>> > >>>>>>> diff --git a/drivers/gpu/drm/mxsfb/mxsfb_kms.c b/drivers/gpu/drm/mxsfb/mxsfb_kms.c > >>>>>>> index b721b8b262ce..79aa14027f91 100644 > >>>>>>> --- a/drivers/gpu/drm/mxsfb/mxsfb_kms.c > >>>>>>> +++ b/drivers/gpu/drm/mxsfb/mxsfb_kms.c > >>>>>>> @@ -403,14 +403,28 @@ static int mxsfb_plane_atomic_check(struct drm_plane *plane, > >>>>>>> { > >>>>>>> struct mxsfb_drm_private *mxsfb = to_mxsfb_drm_private(plane->dev); > >>>>>>> struct drm_crtc_state *crtc_state; > >>>>>>> + unsigned int pitch; > >>>>>>> + int ret; > >>>>>>> > >>>>>>> crtc_state = drm_atomic_get_new_crtc_state(plane_state->state, > >>>>>>> &mxsfb->crtc); > >>>>>>> > >>>>>>> - return drm_atomic_helper_check_plane_state(plane_state, crtc_state, > >>>>>>> - DRM_PLANE_HELPER_NO_SCALING, > >>>>>>> - DRM_PLANE_HELPER_NO_SCALING, > >>>>>>> - false, true); > >>>>>>> + ret = drm_atomic_helper_check_plane_state(plane_state, crtc_state, > >>>>>>> + DRM_PLANE_HELPER_NO_SCALING, > >>>>>>> + DRM_PLANE_HELPER_NO_SCALING, > >>>>>>> + false, true); > >>>>>>> + if (ret || !plane_state->visible) > >>>>>> > >>>>>> Would it be more explict to check for !plane_state->fb ? Otherwise I'll > >>>>>> have to verify that !fb always implies !visible :-) > >>>>>> > >>>>>>> + return ret; > >>>>>>> + > >>>>>>> + pitch = crtc_state->mode.hdisplay * > >>>>>>> + plane_state->fb->format->cpp[0]; > >>>>>> > >>>>>> This holds on a single line. > >>>>>> > >>>>>>> + if (plane_state->fb->pitches[0] != pitch) { > >>>>>>> + dev_err(plane->dev->dev, > >>>>>>> + "Invalid pitch: fb and crtc widths must be the same"); > >>>>>> > >>>>>> I'd turn this into a dev_dbg(), printing error messages to the kernel > >>>>>> log in response to user-triggered conditions is a bit too verbose and > >>>>>> could flood the log. > >>>>>> > >>>>>> Wouldn't it be best to catch this issue when creating the framebuffer ? > >>>>> > >>>>> Yeah this should be verified at addfb time. We try to validate as early as > >>>>> possible. > >>>>> -Daniel > >>>>> > >>>> > >>>> Sounds sensible. From what I can tell fb_create is the proper callback > >>>> to implement this at addfb time. Will give this a try. > >>>> > >>>> FWIW, I got the idea from drivers/gpu/drm/tilcdc/tilcdc_plane.c. Maybe > >>>> should be moved to addfb there too? > >>> > >>> But you don't know the crtc width when creating the framebuffer. > >> > >> Hm right this is a different check. What we could check in fb_create for > >> both is that the logical fb size matches exactly the pitch. That's not > >> sufficient criteria, but it will at least catch some of them already. > >> > >> But yeah we'd need both here. > > > > After validating width of framebuffer against pitch, the only thing we > > need to check here is that the width matches. From what I can tell, > > least for mxsfb, this should be covered by > > drm_atomic_helper_check_plane_state's can_position parameter set to > > false. > > This only checks against the src rectangle of the crtc state, there's > nothing forcing that the size of the fb matches the src rectangle > exactly. I guess we could maybe add that as another parameter for hw > like yours or tilcdc. Naming is a bit tricky, maybe > require_matching_fb or src_must_match_fb or something like that. Can we turn those parameters into flags ? false, true, false is hard to read. > > So I think in my case I can get away by only checking the framebuffer. > > You still need both I think. -- Regards, Laurent Pinchart _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel