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 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8E7B9C4332F for ; Tue, 31 Oct 2023 21:16:07 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 297FD10E5C7; Tue, 31 Oct 2023 21:16:04 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9737510E5C6 for ; Tue, 31 Oct 2023 21:16:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698786960; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7upQ/TCDqPQ7/RZT4zXVHcHAhMn0gkigdjeEzC/JmJ0=; b=CHM1V/sVGNUs/qxB+FwfWBh2mLIYSFuevVfA2PokNmNBe9nYBB60Njk6Wk8zR9dfFv76vJ apEKomC/ed7w3ZqlJvw/ndUOawMdz308vd7+s98ythAe9dHMjgw8spCNQsdUkYbAg2fo68 Y5mFuJDdgpLIR0QZzO9t/Zp2tzLL3fk= Received: from mail-lf1-f71.google.com (mail-lf1-f71.google.com [209.85.167.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-412-_6b5TNz5Oumxs2fsclvtfA-1; Tue, 31 Oct 2023 17:15:57 -0400 X-MC-Unique: _6b5TNz5Oumxs2fsclvtfA-1 Received: by mail-lf1-f71.google.com with SMTP id 2adb3069b0e04-507a3ae32b2so6883604e87.2 for ; Tue, 31 Oct 2023 14:15:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698786955; x=1699391755; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:from:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=7upQ/TCDqPQ7/RZT4zXVHcHAhMn0gkigdjeEzC/JmJ0=; b=xK9w9Dhs3EYc7oaau4oXs0YUfRcEl5J0tA2on0wuecPWBEoxH9Fl8SUrrf/kNIDRnx lzsHpM3A59IFdFNsPLzVgsk3XlNYLQpp1Uv0dLNJ0NM70/nuitL8WBr9vAoVeknh03qK K648mRq8fHloL9AY2/uzlWmt2ffF0zBDiw1SmZoTGbptMq1y0R03Lq9XYov020xyBs+c /q3H0D9QoTmS7rwUhRxrCyK1hxSQ/c/FG5YiQbCFLC31cb39pOTVtPogCG9DMkBuqpiS eYv8+yqo+Ua1Tg+S1tGTgDqkjG1iU6hKazUya4BzeQ1g0PtvHqhzUb7AY4jH5qoZvQe5 h9sg== X-Gm-Message-State: AOJu0YzWsdanK94UJ6dBqZvNf7nowYbfYUaNyTTHiY8I1w1U1Jh4MoeZ vjo6hjXg1krvYc5pF4mwWYVpzwxdtkYjVjgeFOwlwXblN7SkxHp4gPnacAnw9V5Cs1XMgt9ibWq c9EgRXX+Lk1RK1xWrFD54vwfrHFY1 X-Received: by 2002:ac2:55b7:0:b0:4ff:ae42:19e2 with SMTP id y23-20020ac255b7000000b004ffae4219e2mr10113708lfg.58.1698786955311; Tue, 31 Oct 2023 14:15:55 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGRky3KdEseSDE4uqAOpBzi7EnlmKPgY2mct/d4Gy3Y77ZfjIOfTgExy+Ta9yfIaFIeiVbD5g== X-Received: by 2002:ac2:55b7:0:b0:4ff:ae42:19e2 with SMTP id y23-20020ac255b7000000b004ffae4219e2mr10113685lfg.58.1698786954875; Tue, 31 Oct 2023 14:15:54 -0700 (PDT) Received: from ?IPV6:2001:1c00:2a07:3a01:6c4:9fb2:fbc:7029? (2001-1c00-2a07-3a01-06c4-9fb2-0fbc-7029.cable.dynamic.v6.ziggo.nl. [2001:1c00:2a07:3a01:6c4:9fb2:fbc:7029]) by smtp.gmail.com with ESMTPSA id lg17-20020a170906f89100b0098e78ff1a87sm1513087ejb.120.2023.10.31.14.15.53 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 31 Oct 2023 14:15:54 -0700 (PDT) Message-ID: <16e533e2-81bb-47ba-9e23-460a626bcad7@redhat.com> Date: Tue, 31 Oct 2023 22:15:52 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: Hans de Goede To: Andy Shevchenko , Jani Nikula , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org References: <20231024155739.3861342-1-andriy.shevchenko@linux.intel.com> <20231024155739.3861342-7-andriy.shevchenko@linux.intel.com> In-Reply-To: X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Subject: Re: [Intel-gfx] [PATCH v2 6/7] drm/i915/dsi: Replace poking of CHV GPIOs behind the driver's back X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , Rodrigo Vivi , David Airlie Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Hi, On 10/31/23 17:07, Hans de Goede wrote: > Hi Andy, > > On 10/24/23 18:11, Andy Shevchenko wrote: >> On Tue, Oct 24, 2023 at 06:57:38PM +0300, Andy Shevchenko wrote: >>> It's a dirty hack in the driver that pokes GPIO registers behind >>> the driver's back. Moreoever it might be problematic as simultaneous >>> I/O may hang the system, see the commit 0bd50d719b00 ("pinctrl: >>> cherryview: prevent concurrent access to GPIO controllers") for >>> the details. Taking all this into consideration replace the hack >>> with proper GPIO APIs being used. >> >> Ah, just realised that this won't work if it happens to request to GPIOs with >> the same index but different communities. I will fix that in v3, but will wait >> for Hans to test VLV and it might even work in most of the cases on CHV as it >> seems quite unlikely that the above mentioned assertion is going to happen in >> real life. > > I have added patches 1-5 to my personal tree + a small debug patch on top > which logs when soc_exec_opaque_gpio() actually gets called. > > So these patches will now get run every time I run some tests on > one my tablets. > > I'll get back to you with testing results when I've found a device where > the new soc_exec_opaque_gpio() actually gets called. > > As for the CHT support, I have not added that to my tree yet, I would > prefer to directly test the correct/fixed patch. And I hit the "jackpot" on the first device I tried and the code needed some fixing to actually work, so here is something to fold into v3 to fix things: >From 144fae4de91a6b5ed993b1722a07cca679f74cbe Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Tue, 31 Oct 2023 17:04:35 +0100 Subject: [PATCH] drm/i915/dsi: Fix GPIO lookup table used by soc_exec_opaque_gpio() There already is a GPIO lookup table for device "0000:00:02.0" and there can be only one GPIO lookup per device. Instead add an extra empty entry to the GPIO lookup table registered by intel_dsi_vbt_gpio_init() and use that extra entry in soc_exec_opaque_gpio(). Signed-off-by: Hans de Goede --- drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 60 ++++++++++---------- 1 file changed, 31 insertions(+), 29 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c index 8fc82aceae14..70f1d2c411e8 100644 --- a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c +++ b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c @@ -219,8 +219,7 @@ static void soc_exec_gpio(struct intel_connector *connector, const char *con_id, } else { gpio_desc = devm_gpiod_get_index(dev_priv->drm.dev, con_id, gpio_index, - value ? GPIOD_OUT_LOW : - GPIOD_OUT_HIGH); + value ? GPIOD_OUT_HIGH : GPIOD_OUT_LOW); if (IS_ERR(gpio_desc)) { drm_err(&dev_priv->drm, "GPIO index %u request failed (%pe)\n", @@ -232,26 +231,20 @@ static void soc_exec_gpio(struct intel_connector *connector, const char *con_id, } } +static struct gpiod_lookup *soc_exec_opaque_gpiod_lookup; + static void soc_exec_opaque_gpio(struct intel_connector *connector, const char *chip, const char *con_id, u8 gpio_index, bool value) { - struct gpiod_lookup_table *lookup; + struct drm_i915_private *dev_priv = to_i915(connector->base.dev); - lookup = kzalloc(struct_size(lookup, table, 2), GFP_KERNEL); - if (!lookup) - return; - - lookup->dev_id = "0000:00:02.0"; - lookup->table[0] = + *soc_exec_opaque_gpiod_lookup = GPIO_LOOKUP_IDX(chip, gpio_index, con_id, gpio_index, GPIO_ACTIVE_HIGH); - gpiod_add_lookup_table(lookup); - soc_exec_gpio(connector, con_id, gpio_index, value); - gpiod_remove_lookup_table(lookup); - kfree(lookup); + soc_exec_opaque_gpiod_lookup->key = NULL; } static void vlv_exec_gpio(struct intel_connector *connector, @@ -898,6 +891,7 @@ static struct gpiod_lookup_table pmic_panel_gpio_table = { .table = { /* Panel EN/DISABLE */ GPIO_LOOKUP("gpio_crystalcove", 94, "panel", GPIO_ACTIVE_HIGH), + { }, /* Extra lookup entry for soc_exec_opaque_gpiod_lookup */ { } }, }; @@ -907,6 +901,15 @@ static struct gpiod_lookup_table soc_panel_gpio_table = { .table = { GPIO_LOOKUP("INT33FC:01", 10, "backlight", GPIO_ACTIVE_HIGH), GPIO_LOOKUP("INT33FC:01", 11, "panel", GPIO_ACTIVE_HIGH), + { }, /* Extra lookup entry for soc_exec_opaque_gpiod_lookup */ + { } + }, +}; + +static struct gpiod_lookup_table empty_gpio_table = { + .dev_id = "0000:00:02.0", + .table = { + { }, /* Extra lookup entry for soc_exec_opaque_gpiod_lookup */ { } }, }; @@ -916,6 +919,8 @@ static const struct pinctrl_map soc_pwm_pinctrl_map[] = { "pwm0_grp", "pwm"), }; +static struct gpiod_lookup_table *gpiod_lookup_table; + void intel_dsi_vbt_gpio_init(struct intel_dsi *intel_dsi, bool panel_is_on) { struct drm_device *dev = intel_dsi->base.base.dev; @@ -926,16 +931,16 @@ void intel_dsi_vbt_gpio_init(struct intel_dsi *intel_dsi, bool panel_is_on) bool want_backlight_gpio = false; bool want_panel_gpio = false; struct pinctrl *pinctrl; - int ret; + int i, ret; if ((IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) && mipi_config->pwm_blc == PPS_BLC_PMIC) { - gpiod_add_lookup_table(&pmic_panel_gpio_table); + gpiod_lookup_table = &pmic_panel_gpio_table; want_panel_gpio = true; } if (IS_VALLEYVIEW(dev_priv) && mipi_config->pwm_blc == PPS_BLC_SOC) { - gpiod_add_lookup_table(&soc_panel_gpio_table); + gpiod_lookup_table = &soc_panel_gpio_table; want_panel_gpio = true; want_backlight_gpio = true; @@ -952,6 +957,15 @@ void intel_dsi_vbt_gpio_init(struct intel_dsi *intel_dsi, bool panel_is_on) "Failed to set pinmux to PWM\n"); } + if (!gpiod_lookup_table) + gpiod_lookup_table = &empty_gpio_table; + + /* Find first empty entry for soc_exec_opaque_gpiod_lookup */ + for (i = 0; gpiod_lookup_table->table[i].key; i++) { } + soc_exec_opaque_gpiod_lookup = &gpiod_lookup_table->table[i]; + + gpiod_add_lookup_table(gpiod_lookup_table); + if (want_panel_gpio) { intel_dsi->gpio_panel = gpiod_get(dev->dev, "panel", flags); if (IS_ERR(intel_dsi->gpio_panel)) { @@ -974,11 +988,6 @@ void intel_dsi_vbt_gpio_init(struct intel_dsi *intel_dsi, bool panel_is_on) void intel_dsi_vbt_gpio_cleanup(struct intel_dsi *intel_dsi) { - struct drm_device *dev = intel_dsi->base.base.dev; - struct drm_i915_private *dev_priv = to_i915(dev); - struct intel_connector *connector = intel_dsi->attached_connector; - struct mipi_config *mipi_config = connector->panel.vbt.dsi.config; - if (intel_dsi->gpio_panel) { gpiod_put(intel_dsi->gpio_panel); intel_dsi->gpio_panel = NULL; @@ -989,12 +998,5 @@ void intel_dsi_vbt_gpio_cleanup(struct intel_dsi *intel_dsi) intel_dsi->gpio_backlight = NULL; } - if ((IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) && - mipi_config->pwm_blc == PPS_BLC_PMIC) - gpiod_remove_lookup_table(&pmic_panel_gpio_table); - - if (IS_VALLEYVIEW(dev_priv) && mipi_config->pwm_blc == PPS_BLC_SOC) { - pinctrl_unregister_mappings(soc_pwm_pinctrl_map); - gpiod_remove_lookup_table(&soc_panel_gpio_table); - } + gpiod_remove_lookup_table(gpiod_lookup_table); } -- 2.41.0 Regards, Hans