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=-12.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 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 A2AB6C43461 for ; Tue, 8 Sep 2020 08:20:24 +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 57D2D2177B for ; Tue, 8 Sep 2020 08:20:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="YWin8rbJ"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ti.com header.i=@ti.com header.b="MKLCvQoo" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 57D2D2177B Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=ti.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:Date:Message-ID:From: References:To:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=NvlRtK/+Ls6r+n1jDSx0Jdx6rqRrTV+/s7dNOre/CJc=; b=YWin8rbJLnrklnNq0hIvg5YiV sxztJrON1LPg+8ivQ7if/QVGpHGTNHVFuF7qgvaVOr0EdeJpfjKDwqCjO7ikKRw8RzDFGDT4cP1PV ToSg9mEVpDue1VQeUaUVbbrCtqQuRZtmisWKpGtSSMcfjiWASTB0Uq9HtAh887fwLPiFmcre/VZZO ynffvDKapwH6Rcucu8ORnZJbQ+RvQ0C8g3LZ/wLR47kU30A4ATm1QcLZpbFjFoTux/5yk/ACz2136 ey1Mkc1fygxvBcJf4ANNkUDyTMcuIALJaWdUy799lkODYQiBuKwdOHjeNeNewD6UB0nDPpPyzeMs1 A3sz4giHw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kFYq8-0003Zt-Ld; Tue, 08 Sep 2020 08:18:57 +0000 Received: from fllv0016.ext.ti.com ([198.47.19.142]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kFYpy-0003VB-SP for linux-arm-kernel@lists.infradead.org; Tue, 08 Sep 2020 08:18:48 +0000 Received: from lelv0266.itg.ti.com ([10.180.67.225]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id 0888ITMI075895; Tue, 8 Sep 2020 03:18:29 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1599553109; bh=4eo8hs8HzetIEb9ibaaRaZuLk1d4NQhqq0X0s00zao4=; h=Subject:To:CC:References:From:Date:In-Reply-To; b=MKLCvQooUkJ1q9w460K7G/4x+lYIEwCtwqnkxihR5/16AjtXRZkcUYAduUV/FBbsU 2eMDFi3HgH0Dt2wMUQccqQSW7nqAarGYzYRo3KKDRc9aLyoL19zruegCnpm7jsR+/g HCmFxnHuuEyM7H5I42Ah/XZkvJgVOycZyE9/qESE= Received: from DLEE110.ent.ti.com (dlee110.ent.ti.com [157.170.170.21]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 0888ITxQ048580 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 8 Sep 2020 03:18:29 -0500 Received: from DLEE105.ent.ti.com (157.170.170.35) by DLEE110.ent.ti.com (157.170.170.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1979.3; Tue, 8 Sep 2020 03:18:29 -0500 Received: from fllv0039.itg.ti.com (10.64.41.19) by DLEE105.ent.ti.com (157.170.170.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1979.3 via Frontend Transport; Tue, 8 Sep 2020 03:18:29 -0500 Received: from [192.168.2.6] (ileax41-snat.itg.ti.com [10.172.224.153]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id 0888IPRk107862; Tue, 8 Sep 2020 03:18:26 -0500 Subject: Re: [PATCH] drm: mxsfb: check framebuffer pitch To: Stefan Agner , Laurent Pinchart , References: <20200907160343.124405-1-stefan@agner.ch> <20200907161712.GF6047@pendragon.ideasonboard.com> <20200907181855.GE2352366@phenom.ffwll.local> <86615b4b1551d4a6f1cfcc13b38e616c@agner.ch> From: Tomi Valkeinen Message-ID: Date: Tue, 8 Sep 2020 11:18:25 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <86615b4b1551d4a6f1cfcc13b38e616c@agner.ch> Content-Language: en-US X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200908_041847_062396_53FDC09E X-CRM114-Status: GOOD ( 24.85 ) 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: marex@denx.de, daniel@ffwll.ch, airlied@linux.ie, festevam@gmail.com, s.hauer@pengutronix.de, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-imx@nxp.com, kernel@pengutronix.de, shawnguo@kernel.org, linux-arm-kernel@lists.infradead.org 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 Hi, 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. Tomi -- Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel