Received: by 2002:ac0:bc90:0:0:0:0:0 with SMTP id a16csp779624img; Thu, 21 Mar 2019 08:45:55 -0700 (PDT) X-Google-Smtp-Source: APXvYqzEEQ/zx5P1sYQGAnmvJYgvByFAHp6/s/P828a+zg3WebsNmAzEMGN4BxbnhaXofvucXruV X-Received: by 2002:a63:1f61:: with SMTP id q33mr3942008pgm.325.1553183155244; Thu, 21 Mar 2019 08:45:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553183155; cv=none; d=google.com; s=arc-20160816; b=Lrvs7ijbm+nX11rVZiplS2AFxz2vOey1wpNDQRBbYVIzHwlJo+x6yfpKFbfZeV0xGR yydCB3rGl9qNd58N36PxeQMOF3vNa9O5YO3UqhzCCi6L5z/5QZP+DtdP640WkX0PHbHM pmdFpLfgm/duzHdzW3aSvxJPfJVjcdDJEt6uWoUIBpUYz3ulewK/5Lo+jnfJivrP1n32 WhORfuGzM/BQxtXonLoLlpeo7mWhWCGqdBZbG46SjvnwuEwrnySjUQxGGtA5oKr0mf9x Efwcn8MphOQUzsEMkbaBAVnlYhX2qo4xg37t3koZeLiiI08dHkCwu1gjvDs51cdZLNvd QyGA== 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=yl3xMbKUaH67jUbdS5Snuhrml10lt+B356TrUzsaiZI=; b=PKdd3cNzr8bfT8WHRaoAbBcWvHMOYxSVKzCY5ZegKEeUUVw1VlDCEbofDY9VR2jTLA rw4mI/8UIraRsagh54UFiclKWkItT9LaUv5NgmoY70tL9oL5HkiuMjhw8qw7SYnEeaaF AciEJpmdDLv5Fzds6d4BrUNx4E1T5wqodaux13C6+GFzwZbLe4pPUoOXYqpuiHTlrMQB h05/GdTnTj5G8YhPvHaOU0QMu+DI8YQmnib9e+bHtNzT8Sk9nr7uEkp55wLbRWzKJYF0 27KoFxTmp8oqP4v71BpzoeRrByNuGK+boQIG6ZvxLCbfJ2OyyDVYZRGR1ggoDkmlbMWM +KJg== 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 f127si4306287pgc.505.2019.03.21.08.45.39; Thu, 21 Mar 2019 08:45:55 -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 S1728429AbfCUPo5 (ORCPT + 99 others); Thu, 21 Mar 2019 11:44:57 -0400 Received: from relay7-d.mail.gandi.net ([217.70.183.200]:37249 "EHLO relay7-d.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727823AbfCUPo5 (ORCPT ); Thu, 21 Mar 2019 11:44:57 -0400 X-Originating-IP: 185.94.189.187 Received: from localhost (unknown [185.94.189.187]) (Authenticated sender: maxime.ripard@bootlin.com) by relay7-d.mail.gandi.net (Postfix) with ESMTPSA id 7CF4F2000B; Thu, 21 Mar 2019 15:44:53 +0000 (UTC) Date: Thu, 21 Mar 2019 16:44:52 +0100 From: Maxime Ripard To: =?utf-8?B?TcOlbnMgUnVsbGfDpXJk?= Cc: David Airlie , Chen-Yu Tsai , dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] drm/sun4i: hdmi: add support for ddc-i2c-bus property Message-ID: <20190321154452.noq3l44x3mshljvy@flea> References: <20190311134713.25876-1-mans@mansr.com> <20190311154702.eslw5ccol44vxcmy@flea> <20190314154105.o6r7hzeuiyajxh7v@flea> <20190318155013.lge2x2cp5hvyz52f@flea> <20190319123445.w6q7vzr3qtgkejwj@flea> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="d7t26a5uorjmt2ya" 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 --d7t26a5uorjmt2ya Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Mar 19, 2019 at 12:48:19PM +0000, M=E5ns Rullg=E5rd wrote: > Maxime Ripard writes: > > > On Mon, Mar 18, 2019 at 04:23:56PM +0000, M=E5ns Rullg=E5rd wrote: > >> Maxime Ripard writes: > >> > >> > On Thu, Mar 14, 2019 at 04:09:13PM +0000, M=E5ns Rullg=E5rd wrote: > >> >> Maxime Ripard writes: > >> >> > >> >> > On Mon, Mar 11, 2019 at 04:11:06PM +0000, M=E5ns Rullg=E5rd wrote: > >> >> >> Maxime Ripard writes: > >> >> >> > >> >> >> > Hi! > >> >> >> > > >> >> >> > On Mon, Mar 11, 2019 at 01:47:13PM +0000, Mans Rullgard wrote: > >> >> >> >> Sometimes it is desirabled to use a separate i2c controller f= or ddc > >> >> >> >> access. This adds support for the ddc-i2c-bus property of the > >> >> >> >> hdmi-connector node, using the specified controller if provid= ed. > >> >> >> >> > >> >> >> >> Signed-off-by: Mans Rullgard > >> >> >> >> --- > >> >> >> >> drivers/gpu/drm/sun4i/sun4i_hdmi.h | 1 + > >> >> >> >> drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 37 ++++++++++++++++= +++++++--- > >> >> >> >> 2 files changed, 35 insertions(+), 3 deletions(-) > >> >> >> >> > >> >> >> >> diff --git a/drivers/gpu/drm/sun4i/sun4i_hdmi.h b/drivers/gpu= /drm/sun4i/sun4i_hdmi.h > >> >> >> >> index b685ee11623d..b08c4453d47c 100644 > >> >> >> >> --- a/drivers/gpu/drm/sun4i/sun4i_hdmi.h > >> >> >> >> +++ b/drivers/gpu/drm/sun4i/sun4i_hdmi.h > >> >> >> >> @@ -269,6 +269,7 @@ struct sun4i_hdmi { > >> >> >> >> struct clk *tmds_clk; > >> >> >> >> > >> >> >> >> struct i2c_adapter *i2c; > >> >> >> >> + struct i2c_adapter *ddc_i2c; > >> >> >> >> > >> >> >> >> /* Regmap fields for I2C adapter */ > >> >> >> >> struct regmap_field *field_ddc_en; > >> >> >> >> diff --git a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c b/drivers= /gpu/drm/sun4i/sun4i_hdmi_enc.c > >> >> >> >> index 061d2e0d9011..5b2fac79f5d6 100644 > >> >> >> >> --- a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c > >> >> >> >> +++ b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c > >> >> >> >> @@ -212,7 +212,7 @@ static int sun4i_hdmi_get_modes(struct dr= m_connector *connector) > >> >> >> >> struct edid *edid; > >> >> >> >> int ret; > >> >> >> >> > >> >> >> >> - edid =3D drm_get_edid(connector, hdmi->i2c); > >> >> >> >> + edid =3D drm_get_edid(connector, hdmi->ddc_i2c ?: hdmi->i2c= ); > >> >> >> > > >> >> >> > You can't test whether ddc_i2c is NULL or not... > >> >> >> > > >> >> >> >> if (!edid) > >> >> >> >> return 0; > >> >> >> >> > >> >> >> >> @@ -228,6 +228,28 @@ static int sun4i_hdmi_get_modes(struct d= rm_connector *connector) > >> >> >> >> return ret; > >> >> >> >> } > >> >> >> >> > >> >> >> >> +static struct i2c_adapter *sun4i_hdmi_get_ddc(struct device = *dev) > >> >> >> >> +{ > >> >> >> >> + struct device_node *phandle, *remote; > >> >> >> >> + struct i2c_adapter *ddc; > >> >> >> >> + > >> >> >> >> + remote =3D of_graph_get_remote_node(dev->of_node, 1, -1); > >> >> >> >> + if (!remote) > >> >> >> >> + return ERR_PTR(-EINVAL); > >> >> >> >> + > >> >> >> >> + phandle =3D of_parse_phandle(remote, "ddc-i2c-bus", 0); > >> >> >> >> + of_node_put(remote); > >> >> >> >> + if (!phandle) > >> >> >> >> + return NULL; > >> >> >> >> + > >> >> >> >> + ddc =3D of_get_i2c_adapter_by_node(phandle); > >> >> >> >> + of_node_put(phandle); > >> >> >> >> + if (!ddc) > >> >> >> >> + return ERR_PTR(-EPROBE_DEFER); > >> >> >> >> + > >> >> >> >> + return ddc; > >> >> >> > > >> >> >> > ... Since even in (most) error cases you're returning a !NULL = pointer. > >> >> >> > > >> >> >> >> +} > >> >> >> >> + > >> >> >> >> static const struct drm_connector_helper_funcs sun4i_hdmi_co= nnector_helper_funcs =3D { > >> >> >> >> .get_modes =3D sun4i_hdmi_get_modes, > >> >> >> >> }; > >> >> >> >> @@ -575,6 +597,12 @@ static int sun4i_hdmi_bind(struct device= *dev, struct device *master, > >> >> >> >> goto err_disable_mod_clk; > >> >> >> >> } > >> >> >> >> > >> >> >> >> + hdmi->ddc_i2c =3D sun4i_hdmi_get_ddc(dev); > >> >> >> >> + if (IS_ERR(hdmi->ddc_i2c)) { > >> >> >> > >> >> >> ... which is checked here. > >> >> >> > >> >> >> The property is optional, so the idea was to return null in that= case > >> >> >> and use the built-in controller. If the property exists but som= e error > >> >> >> occurs, we want to abort rather than proceed with the fallback w= hich > >> >> >> almost certainly won't work. > >> >> >> > >> >> >> Maybe I got something wrong in that logic. > >> >> > > >> >> > Indeed, I just got confused. I guess returning ENODEV in such a c= ase, > >> >> > and testing for that, would make things more obvious. > >> >> > >> >> There's also a case I hadn't thought of: property exists but isn't a > >> >> valid phandle. What do you think is the correct action in that cas= e? > >> > > >> > I think we would have that one covered. of_parse_phandle will return > >> > !NULL, but then of_get_i2c_adapter_by_node will return NULL since we > >> > wouldn't have an associated i2c adapter to the bogus phandle, and you > >> > are checking for that already. > >> > >> of_parse_phandle() doesn't differentiate between a missing property and > >> an existing non-phandle value. The following cases are possible with > >> this patch: > >> > >> - ddc-i2c-bus points to valid i2c controller node: use this for ddc > >> - no ddc-i2c-bus property: return NULL, use internal i2c > >> - ddc-i2c-bus exists but isn't a phandle: likewise > >> - ddc-i2c-bus points to a non-i2c-controller node: EPROBE_DEFER > >> > >> The last two cases obviously mean the devicetree is invalid, so perhaps > >> it doesn't matter much what happens then. I don't think it's possible > >> to distinguish between a well-formed phandle pointing to some bogus no= de > >> and a good one where the i2c driver hasn't been probed yet. > > > > Ah, I see what you mean now. Yeah, there's not much we can do against > > a wrong / corrupted DT. The DT validation would help prevent the third > > case, and possibly the fourth, but that's basically the only thing we > > can do. > > We need to return -EPROBE_DEFER in the case that everything is fine but > the i2c driver hasn't been probed yet. From here, that is > indistinguishable from of_parse_phandle() returning a completely bogus > node. That's unfortunate, but if we start to not trust the DT content, we have far worse to deal with. > If the ddc-i2c-bus property doesn't contain a phandle at all, we could > either return an error or fall back to the internal i2c. The patch does > the latter because that's less code. I don't think that's any worse > than aborting entirely in terms of user experience. I'm totally fine with the latter behaviour as well. And like I said, the DT validation can help us prevent that case from happening entirely at compilation time. Maxime -- Maxime Ripard, Bootlin Embedded Linux and Kernel engineering https://bootlin.com --d7t26a5uorjmt2ya Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEABYIAB0WIQRcEzekXsqa64kGDp7j7w1vZxhRxQUCXJOxdAAKCRDj7w1vZxhR xS+zAQDxq4cfhKfuYhOOZhCrJ4Cl+VnyDRy4NYKaZDx5O8IbeQEAlow7BVxj+qw1 xcb65MrjOp2xDUpBNZAG3yxcFeW6BwE= =P+oR -----END PGP SIGNATURE----- --d7t26a5uorjmt2ya--