Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp164328pxa; Fri, 21 Aug 2020 04:15:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw+R8VVgJsqfzLR9Z7kvJiEhT09W03KUcBHk6wNy4JBF4K5ZT9rvHY8daWCbg+UwBOwr4vU X-Received: by 2002:a05:6402:1a25:: with SMTP id be5mr2259298edb.62.1598008546640; Fri, 21 Aug 2020 04:15:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1598008546; cv=none; d=google.com; s=arc-20160816; b=CDVQcLz/LxueQgf+j3GQnNpX/ef9L+6jptM/W9Afw1zusiwMYWm4ZYScVsgwRyTsvr sXw1/cYUEgb/mpPK4SdDQCZZRNldMcyvbuq78SOv6JOeN5ObyDRM2bRtMn8E3lVhpaCt KtATg2usloQyADd4W+04GkSeFO6j+bmMiYWbxeDdZvvIfWeCJkg4Jy0G0YJBwKx4GTLx zAW54aoWiOZ1EJ91tDuzVz6JifcpNUe2LE1ykcXOR1nXYBHOMH3Le7CY+a+yWg5YFNcH uTu7+dcLV6jO8cDYwHZmAsLeC3SJwrbR2nIQUCeAB/3u0j+5Y/anzXs7ILCLJowhxmUv FFmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :content-language:in-reply-to:mime-version:user-agent:date :message-id:references:cc:to:from:subject; bh=lgKmxS53NuUcoX4JfEEn4UR3cI960dsC5lp7QlNrsQ4=; b=i/rg1Z9n/is9YRbelkF4Mf8D2tpv2Xu4zXsP27AvfxcRINTpjtZDilubz2oa8p7X7d D31QbD6z/B9tIuEVrTsE7HIc1F1pQUgj386kzi7f2cIXAH15OrFmZFPFq1l8gGk3RS4w DBkDxCX3oVH2mcm9jo7s6bmUn5PwhL3uD8H+RTIRxXhWeCa8ovoe3RqioBxJMb4TwkPx Tw3QKXfueFMLJ9SiAA/Ik3C/ZLCSpO3d48ScnL6QobETB/w6cx4SPXH7MAGbWk9jFHJ2 34gSj7zallq3666AW6gSrCcELxLRh3pQy1j3nULPpd61jkvIyfM+QPGgB3y4zgAgQ6zk VXmQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=collabora.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id m10si985826eda.416.2020.08.21.04.15.23; Fri, 21 Aug 2020 04:15:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727982AbgHULOb (ORCPT + 99 others); Fri, 21 Aug 2020 07:14:31 -0400 Received: from bhuna.collabora.co.uk ([46.235.227.227]:43686 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726907AbgHULOa (ORCPT ); Fri, 21 Aug 2020 07:14:30 -0400 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: eballetbo) with ESMTPSA id CF7E329B008 Subject: Re: [PATCH 3/3] drm/bridge: ps8640: Rework power state handling From: Enric Balletbo i Serra To: Sam Ravnborg Cc: Jernej Skrabec , drinkcat@chromium.org, Neil Armstrong , David Airlie , Jonas Karlman , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Andrzej Hajda , Boris Brezillon , Laurent Pinchart , hsinyi@chromium.org, matthias.bgg@gmail.com, Collabora Kernel ML References: <20200615205320.790334-1-enric.balletbo@collabora.com> <20200615205320.790334-4-enric.balletbo@collabora.com> <20200620214225.GD74146@ravnborg.org> <0220cfe5-2ac9-2d8b-529d-bb1a61478395@collabora.com> <20200624070738.GA1807736@ravnborg.org> <20b2f097-d789-3f5a-cd7e-3701669f43cb@collabora.com> Message-ID: <5af757da-87ec-c0d1-374d-0a69401e09a3@collabora.com> Date: Fri, 21 Aug 2020 13:14:24 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.11.0 MIME-Version: 1.0 In-Reply-To: <20b2f097-d789-3f5a-cd7e-3701669f43cb@collabora.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Dear drm_bridge maintainers, It's been a while since I send these patches, and I'd like to find a proper solution. On 25/6/20 11:21, Enric Balletbo i Serra wrote: > Hi Sam, > > On 24/6/20 9:07, Sam Ravnborg wrote: >> Hi Enric. >> >> On Tue, Jun 23, 2020 at 05:16:43PM +0200, Enric Balletbo i Serra wrote: >>> Hi Sam, >>> >>> Many thanks for your feedback. See my answers below. >>> >>> On 20/6/20 23:42, Sam Ravnborg wrote: >>>> Hi Enric. >>>> >>>> On Mon, Jun 15, 2020 at 10:53:20PM +0200, Enric Balletbo i Serra wrote: >>>>> The get_edid() callback can be triggered anytime by an ioctl, i.e >>>>> >>>>> drm_mode_getconnector (ioctl) >>>>> -> drm_helper_probe_single_connector_modes >>>>> -> drm_bridge_connector_get_modes >>>>> -> ps8640_bridge_get_edid >>>>> >>>>> Actually if the bridge pre_enable() function was not called before >>>>> get_edid(), the driver will not be able to get the EDID properly and >>>>> display will not work until a second get_edid() call is issued and if >>>>> pre_enable() is called before. >>>> Is it correct to fix this in the driver? >>>> Why not just fail and tell user-sapce to try again later? >>>> (Dunno what error-code to use - there must be one). >>>> >>> >>> My undestanding, I might be wrong, is that userspace should don't know which >>> bits, regulators, etc, are needed to get the EDID with an ioctl. Is the kernel >>> that should make sure that all is set properly (the required regulators, etc) >>> when userspace wants to read the EDID. >> >> The idea I suggest is that the kernel side should just error >> out and let user-space retry later. > > I see, I got it. > >> So we avoid all the extra logic in the kernel because userspace wants >> info before the HW is ready. >> And userspace shall anyway deal with the ioctl that fails. >> > > My doubt here is, at which point the kernel driver should leave the hardware in > a state that getting the EDID should work? After the bridge pre_enable() or > enable() calls? After has been proved? AFAIK the bridge pre_enable() and > enable() calls are only about enable the stream out and in most cases you can > get the EDID without having to call pre_enable() and enable() before. > Let me reformulate the question for if it was not clear. What I did is be able to read the EDID every time userspace asks for it (so kernel enables all the required) and Sam is proposing to just fail if all is not setup. I can obviously do this but my question is, at which point I should leave all the logic enabled to be able to read the EDID (after probe?, after pre_enable, after enable?) It is not clear for me from the API. Thanks, Enric > Thanks, > Enric > > >> Sam >> >>> >>>> Then we avoid complicating drivers fro somethign we really should >>>> fix in user-space. >>>> >>>>> The side effect of this, for example, is >>>>> that you see anything when `Frecon` starts, neither the splash screen, >>>> that you do not see ... >>>> >>>> (Otherwise I do not parse the above). >>>> >>>>> until the graphical session manager starts. >>>>> >>>>> To fix this we need to make sure that all we need is enabled before >>>>> reading the EDID. This means the following: >>>>> >>>>> 1. If get_edid() is called before having the device powered we need to >>>>> power on the device. In such case, the driver will power off again the >>>>> device. >>>>> >>>>> 2. If get_edid() is called after having the device powered, all should >>>>> just work. We added a powered flag in order to avoid recurrent calls >>>>> to ps8640_bridge_poweron() and unneeded delays. >>>>> >>>>> 3. This seems to be specific for this device, but we need to make sure >>>>> the panel is powered on before do a power on cycle on this device. >>>>> Otherwise the device fails to retrieve the EDID. >>>> Step 3. looks like an ugly hack too.... >>>> >>> >>> It is, but I don't have enough hardware details to be able to answer why we need >>> to do this. What is well tested is that, if I don't power the panel before >>> powering on the bridge, it doesn't get a proper EDID. Seems that when the bridge >>> goes up, the firmware tries to read the EDID and caches somehow. Well not sure. >>> >>>>> >>>>> Signed-off-by: Enric Balletbo i Serra >>>>> --- >>>>> >>>>> drivers/gpu/drm/bridge/parade-ps8640.c | 79 ++++++++++++++++++++++++-- >>>>> 1 file changed, 73 insertions(+), 6 deletions(-) >>>>> >>>>> diff --git a/drivers/gpu/drm/bridge/parade-ps8640.c b/drivers/gpu/drm/bridge/parade-ps8640.c >>>>> index 9f7b7a9c53c52..ca651480891df 100644 >>>>> --- a/drivers/gpu/drm/bridge/parade-ps8640.c >>>>> +++ b/drivers/gpu/drm/bridge/parade-ps8640.c >>>>> @@ -65,6 +65,7 @@ struct ps8640 { >>>>> struct regulator_bulk_data supplies[2]; >>>>> struct gpio_desc *gpio_reset; >>>>> struct gpio_desc *gpio_powerdown; >>>>> + bool powered; >>>>> }; >>>>> >>>>> static inline struct ps8640 *bridge_to_ps8640(struct drm_bridge *e) >>>>> @@ -91,13 +92,25 @@ static int ps8640_bridge_vdo_control(struct ps8640 *ps_bridge, >>>>> return 0; >>>>> } >>>>> >>>>> -static void ps8640_pre_enable(struct drm_bridge *bridge) >>>>> +static void ps8640_bridge_poweron(struct ps8640 *ps_bridge) >>>>> { >>>>> - struct ps8640 *ps_bridge = bridge_to_ps8640(bridge); >>>>> struct i2c_client *client = ps_bridge->page[PAGE2_TOP_CNTL]; >>>>> + struct drm_bridge *panel; >>>>> unsigned long timeout; >>>>> int ret, status; >>>>> >>>>> + if (ps_bridge->powered) >>>>> + return; >>>>> + >>>>> + /* >>>>> + * That seems to be specific to this chip, and a weird behaviour, but >>>>> + * we need to call drm_panel_prepare before issuing a poweron cycle. If >>>>> + * we don't do this, the chip is not able to read properly the EDID. >>>>> + */ >>>>> + panel = ps_bridge->panel_bridge; >>>>> + if (panel->funcs && panel->funcs->pre_enable) >>>>> + panel->funcs->pre_enable(panel); >>>>> + >>>>> ret = regulator_bulk_enable(ARRAY_SIZE(ps_bridge->supplies), >>>>> ps_bridge->supplies); >>>>> if (ret < 0) { >>>>> @@ -164,6 +177,8 @@ static void ps8640_pre_enable(struct drm_bridge *bridge) >>>>> goto err_regulators_disable; >>>>> } >>>>> >>>>> + ps_bridge->powered = true; >>>>> + >>>>> return; >>>>> >>>>> err_regulators_disable: >>>>> @@ -171,12 +186,13 @@ static void ps8640_pre_enable(struct drm_bridge *bridge) >>>>> ps_bridge->supplies); >>>>> } >>>>> >>>>> -static void ps8640_post_disable(struct drm_bridge *bridge) >>>>> +static void ps8640_bridge_poweroff(struct ps8640 *ps_bridge) >>>>> { >>>>> - struct ps8640 *ps_bridge = bridge_to_ps8640(bridge); >>>>> + struct drm_bridge *panel; >>>>> int ret; >>>>> >>>>> - ps8640_bridge_vdo_control(ps_bridge, DISABLE); >>>>> + if (!ps_bridge->powered) >>>>> + return; >>>>> >>>>> gpiod_set_value(ps_bridge->gpio_reset, 1); >>>>> gpiod_set_value(ps_bridge->gpio_powerdown, 1); >>>>> @@ -184,6 +200,32 @@ static void ps8640_post_disable(struct drm_bridge *bridge) >>>>> ps_bridge->supplies); >>>>> if (ret < 0) >>>>> DRM_ERROR("cannot disable regulators %d\n", ret); >>>>> + >>>>> + panel = ps_bridge->panel_bridge; >>>>> + if (panel->funcs && panel->funcs->post_disable) >>>>> + panel->funcs->post_disable(panel); >>>>> + >>>>> + ps_bridge->powered = false; >>>>> +} >>>>> + >>>>> +static void ps8640_pre_enable(struct drm_bridge *bridge) >>>>> +{ >>>>> + struct ps8640 *ps_bridge = bridge_to_ps8640(bridge); >>>>> + int ret; >>>>> + >>>>> + ps8640_bridge_poweron(ps_bridge); >>>>> + >>>>> + ret = ps8640_bridge_vdo_control(ps_bridge, DISABLE); >>>>> + if (ret < 0) >>>>> + ps8640_bridge_poweroff(ps_bridge); >>>>> +} >>>>> + >>>>> +static void ps8640_post_disable(struct drm_bridge *bridge) >>>>> +{ >>>>> + struct ps8640 *ps_bridge = bridge_to_ps8640(bridge); >>>>> + >>>>> + ps8640_bridge_vdo_control(ps_bridge, DISABLE); >>>>> + ps8640_bridge_poweroff(ps_bridge); >>>>> } >>>>> >>>>> static int ps8640_bridge_attach(struct drm_bridge *bridge, >>>>> @@ -249,9 +291,34 @@ static struct edid *ps8640_bridge_get_edid(struct drm_bridge *bridge, >>>>> struct drm_connector *connector) >>>>> { >>>>> struct ps8640 *ps_bridge = bridge_to_ps8640(bridge); >>>>> + bool poweroff = !ps_bridge->powered; >>>>> + struct edid *edid; >>>>> + >>>>> + /* >>>>> + * When we end calling get_edid() triggered by an ioctl, i.e >>>>> + * >>>>> + * drm_mode_getconnector (ioctl) >>>>> + * -> drm_helper_probe_single_connector_modes >>>>> + * -> drm_bridge_connector_get_modes >>>>> + * -> ps8640_bridge_get_edid >>>>> + * >>>>> + * We need to make sure that what we need is enabled before reading >>>>> + * EDID, for this chip, we need to do a full poweron, otherwise it will >>>>> + * fail. >>>>> + */ >>>>> + ps8640_bridge_poweron(ps_bridge); >>>>> >>>>> - return drm_get_edid(connector, >>>>> + edid = drm_get_edid(connector, >>>>> ps_bridge->page[PAGE0_DP_CNTL]->adapter); >>>>> + >>>>> + /* >>>>> + * If we call the get_edid() function without having enabled the chip >>>>> + * before, return the chip to its original power state. >>>>> + */ >>>>> + if (poweroff) >>>>> + ps8640_bridge_poweroff(ps_bridge); >>>>> + >>>>> + return edid; >>>>> } >>>>> >>>>> static const struct drm_bridge_funcs ps8640_bridge_funcs = { >>>>> -- >>>>> 2.27.0 >>>>> >>>>> _______________________________________________ >>>>> dri-devel mailing list >>>>> dri-devel@lists.freedesktop.org >>>>> https://lists.freedesktop.org/mailman/listinfo/dri-devel >>> _______________________________________________ >>> dri-devel mailing list >>> dri-devel@lists.freedesktop.org >>> https://lists.freedesktop.org/mailman/listinfo/dri-devel >> >