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 4E7F5C433E2 for ; Mon, 7 Sep 2020 18:20:18 +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 EE2A320732 for ; Mon, 7 Sep 2020 18:20:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="BHhH3zc8"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="hZpY+ABA" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EE2A320732 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch 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=Yp18wj39air/+JpIB0zQy3A05SMZwD1e88lOejsdJlY=; b=BHhH3zc8Ew32KUeP6H2LgNk8s uZOEdo2F1eLp7ArhnGDHIbxUKuwEc8CkDYtMdPGWW+iSeAp4a6YsEERpOFdjvuZm1S63CvWb6DMSi CXeumxEpOBw9zwe/OpwIML2QFDbleX/6W2O0VvYXbg5fOW7RGutH/7f0cjffBCL4+dDiqh1YrZbx+ jQlM+/Sejw/kYMdnU9mjv/aiJjJaMpQsrRz2trWM2mMq52rSQC2lovM8j+cKlt93xxhzGRmFlLkkF Wjx+n/KREFP0OLjvhm0GC55ouaEir1ykuugt0fRw2TwO2JRz/lyczFTfequ/ZUiPqLns5XVspjV8+ TgINER9gA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kFLjJ-0001SH-8d; Mon, 07 Sep 2020 18:19:01 +0000 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kFLjH-0001Rm-0a for linux-arm-kernel@lists.infradead.org; Mon, 07 Sep 2020 18:18:59 +0000 Received: by mail-wm1-x344.google.com with SMTP id v4so14946225wmj.5 for ; Mon, 07 Sep 2020 11:18:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=date:from:to:cc:subject:message-id:mail-followup-to:references :mime-version:content-disposition:in-reply-to; bh=nmGHPNrS/6S0SVPN+UDSLWRiyfZpZ44FO0zwUXQGhPk=; b=hZpY+ABAxUzZiiEnMcGY2zsoByRD7Qyn3GVNt7pMeFqg40sUBrUExQ3IX3NAtZYDed vpuuoHVdh32ifvExwzoruB17FLiBxcLLWvh6JivS+6V7GpKxu17XBwxDmiAFVWBo3oke VeYhIhUZA5q3aMC5BRIP+qKUUioViLMCnNc3U= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id :mail-followup-to:references:mime-version:content-disposition :in-reply-to; bh=nmGHPNrS/6S0SVPN+UDSLWRiyfZpZ44FO0zwUXQGhPk=; b=bILV5Xy3MI86lqftSz9MhX+ROM9OfuQyDiJCWOPNKNMQShyUx7o7xoxVQWNKm82bTk 1EW1ON6jFbxI/q7dOd62gaP8KBGpNdMbyy13opZMcU0PEATkhpmb3+EeDqTkzec5D1It hXH95cDcGFNjRbvzbJfB1j9MhW6b/LVyUkNQGSDKxz+ApKnCLxxhoJI/27EM6gIp8KVe YIDMtnxLS7CugqArjUZPOSd338yciEH1XKm0oiQGohLXI1n6mZk12vefimS1P9YkJkDB U7RgHa9NFS7wFJDNP7/Dz6qz/g635ejTyed80WK3/+DGmdugJnXh2AcC409ghgjIEBNK sXgQ== X-Gm-Message-State: AOAM533zTFgDkY0J26DjpZGFNfcUtY1/6ZqqAF30Wq7RSXSknrDyJk1S 50N2/kgDK0womt+Ipu9luhuQuQ== X-Google-Smtp-Source: ABdhPJx/Jk99iRJFxTsv1nNiWHcEwaGPbYeF2e2q7j3F1PqjKZLVLTc9yfm/TiCX2Ye++izPL+H2oQ== X-Received: by 2002:a1c:6187:: with SMTP id v129mr528032wmb.35.1599502737762; Mon, 07 Sep 2020 11:18:57 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id v6sm29503897wrt.90.2020.09.07.11.18.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Sep 2020 11:18:56 -0700 (PDT) Date: Mon, 7 Sep 2020 20:18:55 +0200 From: Daniel Vetter To: Laurent Pinchart Subject: Re: [PATCH] drm: mxsfb: check framebuffer pitch Message-ID: <20200907181855.GE2352366@phenom.ffwll.local> Mail-Followup-To: Laurent Pinchart , Stefan Agner , marex@denx.de, airlied@linux.ie, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org References: <20200907160343.124405-1-stefan@agner.ch> <20200907161712.GF6047@pendragon.ideasonboard.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200907161712.GF6047@pendragon.ideasonboard.com> X-Operating-System: Linux phenom 5.7.0-1-amd64 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200907_141859_088645_8553C77A X-CRM114-Status: GOOD ( 33.53 ) 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, kernel@pengutronix.de, dri-devel@lists.freedesktop.org, airlied@linux.ie, festevam@gmail.com, s.hauer@pengutronix.de, linux-kernel@vger.kernel.org, Stefan Agner , linux-imx@nxp.com, daniel@ffwll.ch, 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 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 > > > + return -EINVAL; > > + } > > + > > + return 0; > > } > > > > static void mxsfb_plane_primary_atomic_update(struct drm_plane *plane, > > -- > Regards, > > Laurent Pinchart -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel