Received: by 2002:a25:ad19:0:0:0:0:0 with SMTP id y25csp4617715ybi; Tue, 30 Jul 2019 05:16:17 -0700 (PDT) X-Google-Smtp-Source: APXvYqz9vOKzDSfb+BGcvv6a8VXoHLwR7uFxlkeOI2bzictyB2vOiwZGtz27I8xnCWR3WKaErVWR X-Received: by 2002:a62:6083:: with SMTP id u125mr40879674pfb.208.1564488977848; Tue, 30 Jul 2019 05:16:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564488977; cv=none; d=google.com; s=arc-20160816; b=enLYEm6F9vHj2u/sxAvYGXd3MeMZ7pcmAjbdzl7hts7WvWuC51F9X37wCiAJytVICk zbRa2BD1kZqcrFYQpai8EVg+1XrF2j4stUkrUQIOYr4ehYbni0U07Vh4zhBNs+rLmCef ++tCHlAwhAD0fok2aiEC1dz4GY//2OAk65xvm8MVmpH3nc0jr6KnxELLe2Ebyv+AoZrh WkjeJzW+IXufkcP/Og5HhbnAc6Szbssfc7+LhJ5jB50Gr418112G23QFGEMSmlj8SBvd OwnE2DRhHQ3JdBGPvxsY9W6EXtVS7IGEOCmrXHD9xY3aWMfxSwzQGpNN78Tszn30cEfi 5cqA== 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=f9JYAyu50ulSXGbTNlDQNKV3hdZ9tiP8VrFwjT51DNo=; b=IDDTS4P0nFaHn5AHFSpOXowqX1NXsXNwM79M23dx8lXzSet6x9x2PqzaXC//Jo85v9 tHkCJ0B+8/t2hh94fakXrnP1potjOUjsZ4pjAft389NK1f8vXyJyyySQLfRIH5KpAz19 HxucktBvU8J54A3LjrJd5UjePr+xJdVAXFdByMoav/xcy234Q6+fIKWv+ju2r5EreWJd I+EMRLNSilKOxZOWhQzpgan1jIbz+T4HJUQFICGinlNnAgr03CTngA7WpxALrFT6AYzf d42okzVL6PNQjU7DNHGqtOJUl35q2xdqP4HvkvAWUFQs/NQXz1qLFqKPkh+1v7qOMOAJ V4Zg== 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 e4si15742654pgh.434.2019.07.30.05.16.03; Tue, 30 Jul 2019 05:16:17 -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 S1730739AbfG3Lhy (ORCPT + 99 others); Tue, 30 Jul 2019 07:37:54 -0400 Received: from atrey.karlin.mff.cuni.cz ([195.113.26.193]:60277 "EHLO atrey.karlin.mff.cuni.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730614AbfG3Lhy (ORCPT ); Tue, 30 Jul 2019 07:37:54 -0400 Received: by atrey.karlin.mff.cuni.cz (Postfix, from userid 512) id 39FA3802B5; Tue, 30 Jul 2019 13:37:40 +0200 (CEST) Date: Tue, 30 Jul 2019 13:37:51 +0200 From: Pavel Machek To: Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org, Tony Lindgren , Sebastian Reichel , Tomi Valkeinen , Sasha Levin Subject: Re: [PATCH 5.2 048/215] drm/omap: dont check dispc timings for DSI Message-ID: <20190730113751.GB21815@amd> References: <20190729190739.971253303@linuxfoundation.org> <20190729190748.832081009@linuxfoundation.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="1LKvkjL3sHcu1TtY" Content-Disposition: inline In-Reply-To: <20190729190748.832081009@linuxfoundation.org> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --1LKvkjL3sHcu1TtY Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon 2019-07-29 21:20:44, Greg Kroah-Hartman wrote: > [ Upstream commit ad9df7d91b4a6e8f4b20c2bf539ac09b3b2ad6eb ] >=20 > While most display types only forward their VM to the DISPC, this > is not true for DSI. DSI calculates the VM for DISPC based on its > own, but it's not identical. Actually the DSI VM is not even a valid > DISPC VM making this check fail. Let's restore the old behaviour > and avoid checking the DISPC VM for DSI here. >=20 > Fixes: 7c27fa57ef31 ("drm/omap: Call dispc timings check operation direct= ly") > Acked-by: Pavel Machek > Tested-by: Tony Lindgren > Tested-by: Pavel Machek > Signed-off-by: Sebastian Reichel > Signed-off-by: Tomi Valkeinen > Signed-off-by: Sasha Levin Not sure if this is good idea for stable. IIRC there's series of patches to enable display on droid4 (etc), which is useful, but this patch is not going to do any good on its own. Pavel > drivers/gpu/drm/omapdrm/omap_crtc.c | 18 ++++++++++++++---- > 1 file changed, 14 insertions(+), 4 deletions(-) >=20 > diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdr= m/omap_crtc.c > index 8712af79a49c..4c43dd282acc 100644 > --- a/drivers/gpu/drm/omapdrm/omap_crtc.c > +++ b/drivers/gpu/drm/omapdrm/omap_crtc.c > @@ -384,10 +384,20 @@ static enum drm_mode_status omap_crtc_mode_valid(st= ruct drm_crtc *crtc, > int r; > =20 > drm_display_mode_to_videomode(mode, &vm); > - r =3D priv->dispc_ops->mgr_check_timings(priv->dispc, omap_crtc->channe= l, > - &vm); > - if (r) > - return r; > + > + /* > + * DSI might not call this, since the supplied mode is not a > + * valid DISPC mode. DSI will calculate and configure the > + * proper DISPC mode later. > + */ > + if (omap_crtc->pipe->output->next =3D=3D NULL || > + omap_crtc->pipe->output->next->type !=3D OMAP_DISPLAY_TYPE_DSI) { > + r =3D priv->dispc_ops->mgr_check_timings(priv->dispc, > + omap_crtc->channel, > + &vm); > + if (r) > + return r; > + } > =20 > /* Check for bandwidth limit */ > if (priv->max_bandwidth) { --=20 (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blo= g.html --1LKvkjL3sHcu1TtY Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iEYEARECAAYFAl1ALA8ACgkQMOfwapXb+vLivwCfSxC4OWQN/14fhb5nIvRRnOS+ JMwAnix68z/VpEm39HRi2R0vnq3K7lOU =mnTv -----END PGP SIGNATURE----- --1LKvkjL3sHcu1TtY--