Received: by 2002:a25:ad19:0:0:0:0:0 with SMTP id y25csp583154ybi; Fri, 12 Jul 2019 01:11:16 -0700 (PDT) X-Google-Smtp-Source: APXvYqwWcoUvT6wGugROIyeToSRZ8jQKnDnp3nUo/YSyusAVqVMqsdVoo+vd6OHnb52dpN7U1hBg X-Received: by 2002:a17:902:968d:: with SMTP id n13mr9932206plp.257.1562919076839; Fri, 12 Jul 2019 01:11:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562919076; cv=none; d=google.com; s=arc-20160816; b=cNe2emnK7YYr7p+re/7YVnnwmB7oBgMTcQQHbJDtky02krpcQpg31Y04NzmXAacseO VmTEMe9WeK9JaGyTi2/AMvPwHiNmoGLVybP8oQJ6nQI0OeVg9zxgB2m4S+CAlF+PfCH4 g5OZlmc/yWWA9xOlUjEF2ofxW5u0MGrzoHc0vbMx3qAuITL9CveY4uuEK/4xZLmM0kvV ne8+dCsxJ2r8HgdtbnYKi9TzXC3/1dPj0prvTt+R9QOga2mN9cwaMrPfESZ2e2LCuRQ7 FZZEKGOR2xMFK2/C+cCFRMQu/2YbUwWpbXwoZwMTqo6gFekH51lXAVlKl4Ufxe2iViLT vNhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:in-reply-to :content-disposition:mime-version:references:message-id:subject:cc :to:from:date; bh=y03hnr/1XkHlFxsiJztIeh9E16j7X4VjGo/D0ccEdzw=; b=XLOAj4W4CxM5J6DCcK9b5q7eEOoYmzdyCfrvNqhwz4SDhEwKNOX7zF+XKbvhRgc3p8 rIWYUrowjUP8Q2gCTb9xPZQPLMVxrrmFXR3UdqTyDSaLLPIophh8RrrjxfoQbVoqBRRH T2nUo8ZcfJtknNmE4NZyi71dbGtJmtaNgJZINebsS+WJszM6dQ5eqO6gIx5VJFuGeMPH ocBajZTMhLL9phaVef6F1VicDPHWwWtsZCHtgqE2rv3ZWUb8DLb8OP7uvBnHe1/xFu7x WKusLrFb5ohVi1AbHlZW4VBdOiZVqYzYulhTxp45yMgkeTaFglhLlEk8VmyGy/uvDpb1 4TPw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a5si7575979pjv.80.2019.07.12.01.11.01; Fri, 12 Jul 2019 01:11:16 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726230AbfGLIKc (ORCPT + 99 others); Fri, 12 Jul 2019 04:10:32 -0400 Received: from relay6-d.mail.gandi.net ([217.70.183.198]:42563 "EHLO relay6-d.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726057AbfGLIKc (ORCPT ); Fri, 12 Jul 2019 04:10:32 -0400 X-Originating-IP: 86.250.200.211 Received: from localhost (lfbn-1-17395-211.w86-250.abo.wanadoo.fr [86.250.200.211]) (Authenticated sender: maxime.ripard@bootlin.com) by relay6-d.mail.gandi.net (Postfix) with ESMTPSA id D9AF6C000A; Fri, 12 Jul 2019 08:10:27 +0000 (UTC) Date: Fri, 12 Jul 2019 10:10:27 +0200 From: Maxime Ripard To: Dmitry Osipenko Cc: Thierry Reding , Jonathan Hunter , Maarten Lankhorst , Sean Paul , Daniel Vetter , David Airlie , dri-devel@lists.freedesktop.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v1] drm/modes: Skip invalid cmdline mode Message-ID: <20190712081027.arybdoxr6nzrmkxt@flea> References: <4ad69d15-07f8-9753-72d6-a51402c94c20@gmail.com> <20190710125552.qvmnh6qs63ikiu2k@flea> <20190710130615.gvi2jwgr2cds66xr@flea> <75719cad-c65c-7ebc-3ea8-98134f86ddc3@gmail.com> <4a13f12f-05a7-473e-4e4e-7a7e32d09720@gmail.com> <20190710140504.t5lsk36gnn5cdn6b@flea> <20190711090327.keuxt2ztfqecdbef@flea> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="6weybs6gnxo2efbk" Content-Disposition: inline In-Reply-To: User-Agent: NeoMutt/20180716 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --6weybs6gnxo2efbk Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Jul 11, 2019 at 06:55:03PM +0300, Dmitry Osipenko wrote: > 11.07.2019 12:03, Maxime Ripard =D0=BF=D0=B8=D1=88=D0=B5=D1=82: > > On Wed, Jul 10, 2019 at 06:05:18PM +0300, Dmitry Osipenko wrote: > >> 10.07.2019 17:05, Maxime Ripard =D0=BF=D0=B8=D1=88=D0=B5=D1=82: > >>> On Wed, Jul 10, 2019 at 04:29:19PM +0300, Dmitry Osipenko wrote: > >>>> This works: > >>>> > >>>> diff --git a/drivers/gpu/drm/drm_client_modeset.c b/drivers/gpu/drm/= drm_client_modeset.c > >>>> index 56d36779d213..e5a2f9c8f404 100644 > >>>> --- a/drivers/gpu/drm/drm_client_modeset.c > >>>> +++ b/drivers/gpu/drm/drm_client_modeset.c > >>>> @@ -182,6 +182,8 @@ drm_connector_pick_cmdline_mode(struct drm_conne= ctor *connector) > >>>> mode =3D drm_mode_create_from_cmdline_mode(connector->dev, c= mdline_mode); > >>>> if (mode) > >>>> list_add(&mode->head, &connector->modes); > >>>> + else > >>>> + cmdline_mode->specified =3D false; > >>> > >>> Hmmm, it's not clear to me why that wouldn't be the case. > >>> > >>> If we come back to the beginning of that function, we retrieve the > >>> cmdline_mode buffer from the connector pointer, that will probably > >>> have been parsed a first time using drm_mode_create_from_cmdline_mode > >>> in drm_helper_probe_add_cmdline_mode. > >>> > >>> Now, I'm guessing that the issue is that in > >>> drm_mode_parse_command_line_for_connector, if we have a named mode, we > >>> just copy the mode over and set mode->specified. > >>> > >>> And we then move over to do other checks, and that's probably what > >>> fails and returns, but our drm_cmdline_mode will have been modified. > >>> > >>> I'm not entirely sure how to deal with that though. > >>> > >>> I guess we could allocate a drm_cmdline_mode structure on the stack, > >>> fill that, and if successful copy over its content to the one in > >>> drm_connector. That would allow us to only change the content on > >>> success, which is what I would expect from such a function? > >>> > >>> How does that sound? > >> > >> I now see that there is DRM_MODE_TYPE_USERDEF flag that is assigned on= ly > >> for the "cmdline" mode and drm_client_rotation() is the only place in > >> DRM code that cares about whether mode is from cmdline, hence looks li= ke > >> it will be more correct to do the following: > > > > I'm still under the impression that we're dealing with workarounds of > > a more central issue, which is that we shouldn't return a partially > > modified drm_cmdline_mode. > > > > You said it yourself, the breakage is in the commit changing the > > command line parsing logic, while you're fixing here some code that > > was introduced later on. > > The problem stems from assumption that *any* named mode is valid. It > looks to me that the ultimate solution would be to move the mode's name > comparison into the [1], if that's possible. > > [1] drm_mode_parse_command_line_for_connector() Well, one could argue that video=3Dtegrafb is invalid and should be rejected as well, but we haven't cleared that up. > > Can you try the followintg patch? > > http://code.bulix.org/8cwk4c-794565?raw > > This doesn't help because the problem with the rotation_reflection is > that it's 0 if "rotation" not present in the cmdline and then ilog2(0) > returns -1. So the patch "drm/modes: Don't apply cmdline's rotation if > it wasn't specified" should be correct in any case. So we would have the same issue with rotate=3D0 then? Maxime -- Maxime Ripard, Bootlin Embedded Linux and Kernel engineering https://bootlin.com --6weybs6gnxo2efbk Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEABYIAB0WIQRcEzekXsqa64kGDp7j7w1vZxhRxQUCXShAcwAKCRDj7w1vZxhR xTSIAQD/e1DSHvsHrh2flaNGAhwJVB74Bj9ujrC7VCEaL5GlwAD/ZUqWk9LNA1y+ s25PrPo0pdy89EqHc9WFkd6x6juMrg8= =U3z3 -----END PGP SIGNATURE----- --6weybs6gnxo2efbk--