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 X-Spam-Level: X-Spam-Status: No, score=-8.4 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 39EC8C2D0CD for ; Mon, 16 Dec 2019 14:16:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 03E84206B7 for ; Mon, 16 Dec 2019 14:16:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="b77nBOnF" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728274AbfLPOQg (ORCPT ); Mon, 16 Dec 2019 09:16:36 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:51361 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728060AbfLPOQf (ORCPT ); Mon, 16 Dec 2019 09:16:35 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576505794; 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=iyyJmBM3fDcRwB4obuoYugCBOkwPjR5ZZAf85xRDFJI=; b=b77nBOnF3JGNrLI03zFyt5Zrx3PubgeGfAOgerEeTqRIVgqiJ7xofeND5s9TfxpXRyNpIy JwerjvXlN1CitJ1lGP6GUfs37I/dSgzzjnXE3yqj5gk0TXBpBhSYy24V0C94gcRQ6PwrjB 3C8CZeMhTxOACpbeJhmnJcxt+goCJkI= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-322-II0vhgpjMHCwv2rREpuEhg-1; Mon, 16 Dec 2019 09:16:32 -0500 X-MC-Unique: II0vhgpjMHCwv2rREpuEhg-1 Received: by mail-wm1-f70.google.com with SMTP id 7so1078214wmf.9 for ; Mon, 16 Dec 2019 06:16:31 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=iyyJmBM3fDcRwB4obuoYugCBOkwPjR5ZZAf85xRDFJI=; b=WeF8qOppMpIe2otJcu2Oagzb3425MbtK2gBCUgMdxLy4d1Vcu5RMIDipaUiXXmukVH 3F5YjQLJEJI8DeajhiXz3Yx1YERySWw7ukvR6kH5D23fucMto7YAMExjjsQdWj79q1pa f2JcBCuPQ55xr3J4pfKuH6y7bvz44cuyCrHHsiNQe1DceywR5u11zezj+TwtIueg1Tad BrS6x0bDrErOM2pUCuD8AyzRs49/n9KYbpsB6eUiauIx5CkCQ1MenvZqzxEAVzmp5iVO KTPo1kN01RaQeeRdxdnqmMtioZ4JhLJ454Zslsx/K1jOHfpEpeqDpt6/z8Lu4jFlxFlh Y5KQ== X-Gm-Message-State: APjAAAWB1YYHNThq75EPrUXF2g9yvNXHIem4BC/20W820EZMXgSX8DU0 R507p595X96z7siPowx5G1oFeadjZA5tPe3tZG1dy9pgdX1oa0rAfZgLSKMEdbNmM1L5BUwiImU CDSO3MQW/RdjOzJZ9FnS2D/5N X-Received: by 2002:adf:a308:: with SMTP id c8mr29838075wrb.240.1576505790871; Mon, 16 Dec 2019 06:16:30 -0800 (PST) X-Google-Smtp-Source: APXvYqycr8vbMR7LAJzKT/83BL3q03HQov83Lat9afG86+vT2vXdgjwSHLffqAKplmr/V+CoUwBxgw== X-Received: by 2002:adf:a308:: with SMTP id c8mr29838050wrb.240.1576505790643; Mon, 16 Dec 2019 06:16:30 -0800 (PST) Received: from shalem.localdomain (2001-1c00-0c0c-fe00-7e79-4dac-39d0-9c14.cable.dynamic.v6.ziggo.nl. [2001:1c00:c0c:fe00:7e79:4dac:39d0:9c14]) by smtp.gmail.com with ESMTPSA id c9sm20297847wmc.47.2019.12.16.06.16.29 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 16 Dec 2019 06:16:30 -0800 (PST) Subject: Re: [PATCH 4/5] drm/i915/dsi: Move Crystal Cove PMIC panel GPIO lookup from mfd to the i915 driver To: =?UTF-8?B?VmlsbGUgU3lyasOkbMOk?= Cc: Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Lee Jones , Linus Walleij , intel-gfx , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org References: <20191215163810.52356-1-hdegoede@redhat.com> <20191215163810.52356-5-hdegoede@redhat.com> <20191216135627.GS1208@intel.com> From: Hans de Goede Message-ID: <25e93a0e-3f48-abd4-d2ba-07a4d03f7f7d@redhat.com> Date: Mon, 16 Dec 2019 15:16:29 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.2.2 MIME-Version: 1.0 In-Reply-To: <20191216135627.GS1208@intel.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, On 16-12-2019 14:56, Ville Syrjälä wrote: > On Sun, Dec 15, 2019 at 05:38:09PM +0100, Hans de Goede wrote: >> Move the Crystal Cove PMIC panel GPIO lookup-table from >> drivers/mfd/intel_soc_pmic_core.c to the i915 driver. >> >> The moved looked-up table is adding a GPIO lookup to the i915 PCI >> device and the GPIO subsys allows only one lookup table per device, >> >> The intel_soc_pmic_core.c code only adds lookup-table entries for the >> PMIC panel GPIO (as it deals only with the PMIC), but we also need to be >> able to access some GPIOs on the SoC itself, which requires entries for >> these GPIOs in the lookup-table. >> >> Since the lookup-table is attached to the i915 PCI device it really >> should be part of the i915 driver, this will also allow us to extend >> it with GPIOs from other sources when necessary. >> >> Signed-off-by: Hans de Goede >> --- >> drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 23 +++++++++++++++++++- >> drivers/mfd/intel_soc_pmic_core.c | 19 ---------------- >> 2 files changed, 22 insertions(+), 20 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c >> index 027970348b22..847f04eec2a1 100644 >> --- a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c >> +++ b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c >> @@ -25,6 +25,7 @@ >> */ >> >> #include >> +#include >> #include >> #include >> >> @@ -686,8 +687,18 @@ bool intel_dsi_vbt_init(struct intel_dsi *intel_dsi, u16 panel_id) >> >> /* >> * On some BYT/CHT devs some sequences are incomplete and we need to manually >> - * control some GPIOs. >> + * control some GPIOs. We need to add a GPIO lookup table before we get these. >> */ >> +static struct gpiod_lookup_table pmic_panel_gpio_table = { >> + /* Intel GFX is consumer */ >> + .dev_id = "0000:00:02.0", >> + .table = { >> + /* Panel EN/DISABLE */ >> + GPIO_LOOKUP("gpio_crystalcove", 94, "panel", GPIO_ACTIVE_HIGH), >> + { }, >> + }, >> +}; > > Feels like a failure in abstraction to have these irrelevant details > exposed on the consumer side. Also slightly concerned that someone > refactoring things in the pmic driver could now break this without > realizing it. But if people want it done this way I can live with it. Note how in the final patch we add another lookup for a GPIO called "panel" but now on another GPIO controller. Since which GPIO controller has the "panel" GPIO is specified by a bit in the VBT doing the lookup-table registering from within the i915 code actually kinda makes sense. > >> + >> void intel_dsi_vbt_gpio_init(struct intel_dsi *intel_dsi, bool panel_is_on) >> { >> struct drm_device *dev = intel_dsi->base.base.dev; >> @@ -697,6 +708,8 @@ void intel_dsi_vbt_gpio_init(struct intel_dsi *intel_dsi, bool panel_is_on) >> >> if ((IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) && >> (mipi_config->pwm_blc == PPS_BLC_PMIC)) { >> + gpiod_add_lookup_table(&pmic_panel_gpio_table); >> + >> intel_dsi->gpio_panel = gpiod_get(dev->dev, "panel", flags); >> if (IS_ERR(intel_dsi->gpio_panel)) { >> DRM_ERROR("Failed to own gpio for panel control\n"); >> @@ -707,8 +720,16 @@ 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 mipi_config *mipi_config = dev_priv->vbt.dsi.config; >> + >> if (intel_dsi->gpio_panel) { >> gpiod_put(intel_dsi->gpio_panel); >> intel_dsi->gpio_panel = NULL; >> } >> + >> + if ((IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) && >> + (mipi_config->pwm_blc == PPS_BLC_PMIC)) > > Needless parens here as well. Will fix for v2 (will also the other case). > Reviewed-by: Ville Syrjälä Thanks. Regards, Hans > >> + gpiod_remove_lookup_table(&pmic_panel_gpio_table); >> } >> diff --git a/drivers/mfd/intel_soc_pmic_core.c b/drivers/mfd/intel_soc_pmic_core.c >> index 47188df3080d..ddd64f9e3341 100644 >> --- a/drivers/mfd/intel_soc_pmic_core.c >> +++ b/drivers/mfd/intel_soc_pmic_core.c >> @@ -9,8 +9,6 @@ >> */ >> >> #include >> -#include >> -#include >> #include >> #include >> #include >> @@ -25,17 +23,6 @@ >> #define BYT_CRC_HRV 2 >> #define CHT_CRC_HRV 3 >> >> -/* Lookup table for the Panel Enable/Disable line as GPIO signals */ >> -static struct gpiod_lookup_table panel_gpio_table = { >> - /* Intel GFX is consumer */ >> - .dev_id = "0000:00:02.0", >> - .table = { >> - /* Panel EN/DISABLE */ >> - GPIO_LOOKUP("gpio_crystalcove", 94, "panel", GPIO_ACTIVE_HIGH), >> - { }, >> - }, >> -}; >> - >> /* PWM consumed by the Intel GFX */ >> static struct pwm_lookup crc_pwm_lookup[] = { >> PWM_LOOKUP("crystal_cove_pwm", 0, "0000:00:02.0", "pwm_pmic_backlight", 0, PWM_POLARITY_NORMAL), >> @@ -96,9 +83,6 @@ static int intel_soc_pmic_i2c_probe(struct i2c_client *i2c, >> if (ret) >> dev_warn(dev, "Can't enable IRQ as wake source: %d\n", ret); >> >> - /* Add lookup table binding for Panel Control to the GPIO Chip */ >> - gpiod_add_lookup_table(&panel_gpio_table); >> - >> /* Add lookup table for crc-pwm */ >> pwm_add_table(crc_pwm_lookup, ARRAY_SIZE(crc_pwm_lookup)); >> >> @@ -121,9 +105,6 @@ static int intel_soc_pmic_i2c_remove(struct i2c_client *i2c) >> >> regmap_del_irq_chip(pmic->irq, pmic->irq_chip_data); >> >> - /* Remove lookup table for Panel Control from the GPIO Chip */ >> - gpiod_remove_lookup_table(&panel_gpio_table); >> - >> /* remove crc-pwm lookup table */ >> pwm_remove_table(crc_pwm_lookup, ARRAY_SIZE(crc_pwm_lookup)); >> >> -- >> 2.23.0 >