From patchwork Fri Nov 3 20:18:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 161425 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:8f47:0:b0:403:3b70:6f57 with SMTP id j7csp1291768vqu; Fri, 3 Nov 2023 13:18:53 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGd5DcuAdEdmG94c5YBAP2AKWCNYCve5lUGMHcULzd30Jbw/ngMw3Vjy9ihl4yssoOSsRnr X-Received: by 2002:a17:902:ce81:b0:1cc:6a09:a489 with SMTP id f1-20020a170902ce8100b001cc6a09a489mr12246403plg.33.1699042733497; Fri, 03 Nov 2023 13:18:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1699042733; cv=none; d=google.com; s=arc-20160816; b=yXaswaTHBUyzgLwSq5CnH+nYGDD0Svw1v7TYiIs7yTSyzvVpqpCuWak8szkpHJ7LFO nhknUL0A/LNRR57U4PJR1ie70rBUdc0mGvg4jTD10hHbVz7nPD5U4Od/0WI5UhwJvl3z QKS0XsXNN9Q0/ltDwGFq9Q7/izxKnDThV7/ezRTXtHBfTaWmO8Dn12qn/1XTHUJ5tU2t 0pTW2hUDSSM8KtZSsqaSe4wVi/jmdXt4yH9dEE1o6Pq6MGi90qSEfwpzQzqaL3KOcRLp smRllgiZUdwItIp1TCI6X3t2ITiHLbasaEzgPKz75NFUgIfMbnhLzfILjWzmIRT2BL2r ukiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=v6FnCc7RWWk/c6sJPNsQiV4cTbu/31bzjd9uebkf+IE=; fh=W9Apx1mxfI4Sn4Tfu/ApINr5FKslMaF8Hy7vCgvNWsQ=; b=gD+pidmzpzTJ/L8ETvbyLjHxnReL0HSDmx8Z8s71YNC/gzXRftEijmGXYXBtzrDqfP CB5QZPHo6Y9A9b4pKDNR0jATcTlJDOTdH5QDkmFcyE9kMn85a1/iUQIHppJc1TwVJwAb V2j6Ahz6I4SE97gZw1+B/P87ff47cFEn9UicE3b+cfGg2tUJ7qQ6QRgljh7vDpsH38/M ztx+JhTHE6W4tLrVAsZ26xqqWOK9srIO7KsopJKzuk/oKYKHq1NGmlHIXIYPzijdTkKe nYFH1TU6YxP6KMSd2qBo2IzsMhELhSoBYOZTi9Vv2Za01E8LmfFYM+dJXbJvr8PbDwrr iipA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="av1ig0i/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id q22-20020a170902b11600b001c9fb2acff5si2135482plr.526.2023.11.03.13.18.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Nov 2023 13:18:53 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="av1ig0i/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 6C85F83DBECD; Fri, 3 Nov 2023 13:18:52 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378194AbjKCUSq (ORCPT + 35 others); Fri, 3 Nov 2023 16:18:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53738 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234614AbjKCUSn (ORCPT ); Fri, 3 Nov 2023 16:18:43 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 58879D53 for ; Fri, 3 Nov 2023 13:18:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1699042720; x=1730578720; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=zPRCzYNN16HwjO3RHBcn1H7M4PO+1uvgVko+eIKdfwQ=; b=av1ig0i/rIAFEXjEDvovP3EV3L7sb5FEjjH+uo8WoZFkqa8JNFW+inVn ptOvIqwpEXED8BVVxS7bkx7EWv0DBHVo/h1pFCAbMIrUAASS21wI5dO7i tjw5iBjc8Ksn2svoAgY5hvX/+veBoqq9VTaOnTggHTnsPZiSb3wUaxkwR plK7Jlmf+T9NJIYMjdQyChzjXTV8L10GmeaVYWsZeoQMk6V92D5gsTFDg Vh21sU380LTODSWD77wBkGiNmwBNUVrVmp6h56Jf7U0fh49IkmypF0Npf HdLxmLYdPPLWkHzg/FIJN/NOALfJwIBSh/+u59aD0MqBlBMLlo/JENk1P A==; X-IronPort-AV: E=McAfee;i="6600,9927,10883"; a="387904499" X-IronPort-AV: E=Sophos;i="6.03,275,1694761200"; d="scan'208";a="387904499" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Nov 2023 13:18:40 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10883"; a="885303644" X-IronPort-AV: E=Sophos;i="6.03,275,1694761200"; d="scan'208";a="885303644" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga004.jf.intel.com with ESMTP; 03 Nov 2023 13:18:34 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 9BEB42A6; Fri, 3 Nov 2023 22:18:33 +0200 (EET) From: Andy Shevchenko To: Jani Nikula , Andy Shevchenko , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , David Airlie , Daniel Vetter , Hans de Goede Subject: [PATCH v4 01/16] drm/i915/dsi: assume BXT gpio works for non-native GPIO Date: Fri, 3 Nov 2023 22:18:16 +0200 Message-Id: <20231103201831.1037416-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20231103201831.1037416-1-andriy.shevchenko@linux.intel.com> References: <20231103201831.1037416-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Fri, 03 Nov 2023 13:18:52 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781575432981725352 X-GMAIL-MSGID: 1781575432981725352 From: Jani Nikula Purely a guess. Drop the nop function. Cc: Andy Shevchenko Cc: Hans de Goede Signed-off-by: Jani Nikula Signed-off-by: Andy Shevchenko --- drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c index 24b2cbcfc1ef..b2c0cc11f8c1 100644 --- a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c +++ b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c @@ -372,14 +372,6 @@ static void bxt_exec_gpio(struct intel_connector *connector, gpiod_set_value(gpio_desc, value); } -static void icl_exec_gpio(struct intel_connector *connector, - u8 gpio_source, u8 gpio_index, bool value) -{ - struct drm_i915_private *dev_priv = to_i915(connector->base.dev); - - drm_dbg_kms(&dev_priv->drm, "Skipping ICL GPIO element execution\n"); -} - enum { MIPI_RESET_1 = 0, MIPI_AVDD_EN_1, @@ -491,7 +483,7 @@ static const u8 *mipi_exec_gpio(struct intel_dsi *intel_dsi, const u8 *data) if (native) icl_native_gpio_set_value(dev_priv, gpio_number, value); else if (DISPLAY_VER(dev_priv) >= 11) - icl_exec_gpio(connector, gpio_source, gpio_index, value); + bxt_exec_gpio(connector, gpio_source, gpio_index, value); else if (IS_VALLEYVIEW(dev_priv)) vlv_exec_gpio(connector, gpio_source, gpio_number, value); else if (IS_CHERRYVIEW(dev_priv)) From patchwork Fri Nov 3 20:18:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 161427 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:8f47:0:b0:403:3b70:6f57 with SMTP id j7csp1291884vqu; Fri, 3 Nov 2023 13:19:06 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFvA18pKzk9RlTc8v+ack1PaPU/5GWLXQvoCnPRySOvCswjaeDRlryLajTqaxBEr/Lwxsxg X-Received: by 2002:a05:6871:50f:b0:1ea:aa9:9b00 with SMTP id s15-20020a056871050f00b001ea0aa99b00mr26233984oal.57.1699042746034; Fri, 03 Nov 2023 13:19:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1699042746; cv=none; d=google.com; s=arc-20160816; b=ldGLqW1Il1MKW/Sdgs0WjhBak5HXZ/3zR7S4LxRRvay8HpgBQ8ZyjO0DqQI6nPcThJ zx3+ryzbMo4lwHamrZyKuhLYV6usQgvaYVNCLOnkT0V1gvhEhEa2AW9IRq89nBnGdgzZ OTITNvLtOP+kt9ei6uTdgcFiw0PwBNL0TDMrql5vHlcm4zoL48eIfPnV8Mch4sd7RtM1 +hT9QCHPohOmp5uV0szG4XnRocNP6r5Dq/Ggdj7CH5o1E0D0thEWuHLLSbGyz8XiKqUb giPslBc7jJywWiBGLbcm/GxVP/3O10isNSDKD9TthT4yowMfgRh0WjqU2qL4WdY1phtV /jiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=BECp/Ub4oG3Foh3UIH5jESvTImu4sIFYYcqZiHauYuM=; fh=W9Apx1mxfI4Sn4Tfu/ApINr5FKslMaF8Hy7vCgvNWsQ=; b=lmROXqoTyezjjKx1+hyOBa4oUBsaIYL6yPqggerDClEwtp1jMQjhlnoYun9hcOVf9x L7DgKSHUewfO2dSvGtgPv/51JSQg2utr6tuKPaplRrannEwhMUSKYW/TnSjttNr1GPu7 dtXXFtQl48PhvT+Nn8Ef9K1FdZ5Jc6zUTsg05rxyb3CGX1zuqj2l/rl2++TEyXqK5GIl EUn4NxGDrCdE+/hn1R/P12Y04V1H5e4PgLj1qp/8S5BExeKWJoex9WTUMqL1mcoG+i2n tZ8ziOaZ54bU8ZTkgDoZWXh6eujsPW8OEh/Iu5U+8DUYCP1row9T89aYsiEjx2aq2Z3B O6AQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=NgS+kBV2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id bw5-20020a056a02048500b005bd3a0e2ec5si2370292pgb.472.2023.11.03.13.19.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Nov 2023 13:19:05 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=NgS+kBV2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 697E382385FC; Fri, 3 Nov 2023 13:19:02 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378167AbjKCUSo (ORCPT + 35 others); Fri, 3 Nov 2023 16:18:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53730 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229605AbjKCUSn (ORCPT ); Fri, 3 Nov 2023 16:18:43 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 470A518B for ; Fri, 3 Nov 2023 13:18:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1699042718; x=1730578718; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=aU19ThGhUQIWXfbukrzCcpY3j2hr2UFUIRy/UhZ9hVU=; b=NgS+kBV27uWlNCtIWfZo/CVflYKE5UNQikqeEyzn4X17a8MH678Gonf/ wFse4tX/XCYVlvUTdb+c9GCqjzehPoIwGUTj4tzDGBNRAXZ4roorOu0Ne dTk5T0eFriztrl1X6pRKZHYVqmaecQ3UEdrUGGLfhOIwRu1iuvfKce7mc cX9gkseoYX0iAE1F9aoZclE0YisYpaKWbtQX4YIsgrY/bv4pxJy28CuXf /reOkdVoj7IT0RdtbG+TM3xrnWZP794t3JA8oZ0u1NXv1uzoJYCBAQX7D NqyX7IKLxNvBu/7w5UwaJIYJAr17sN9MlSVWYcTofmGGhViMYYHdFSdPC g==; X-IronPort-AV: E=McAfee;i="6600,9927,10883"; a="1896041" X-IronPort-AV: E=Sophos;i="6.03,275,1694761200"; d="scan'208";a="1896041" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Nov 2023 13:18:38 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10883"; a="832131115" X-IronPort-AV: E=Sophos;i="6.03,275,1694761200"; d="scan'208";a="832131115" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga004.fm.intel.com with ESMTP; 03 Nov 2023 13:18:34 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id A84A25E8; Fri, 3 Nov 2023 22:18:33 +0200 (EET) From: Andy Shevchenko To: Jani Nikula , Andy Shevchenko , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , David Airlie , Daniel Vetter , Hans de Goede Subject: [PATCH v4 02/16] drm/i915/dsi: switch mipi_exec_gpio() from dev_priv to i915 Date: Fri, 3 Nov 2023 22:18:17 +0200 Message-Id: <20231103201831.1037416-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20231103201831.1037416-1-andriy.shevchenko@linux.intel.com> References: <20231103201831.1037416-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Fri, 03 Nov 2023 13:19:02 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781575446803707074 X-GMAIL-MSGID: 1781575446803707074 From: Jani Nikula Follow the contemporary conventions. Cc: Andy Shevchenko Cc: Hans de Goede Signed-off-by: Jani Nikula Signed-off-by: Andy Shevchenko --- drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c index b2c0cc11f8c1..8b962f2ac475 100644 --- a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c +++ b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c @@ -454,11 +454,11 @@ static void icl_native_gpio_set_value(struct drm_i915_private *dev_priv, static const u8 *mipi_exec_gpio(struct intel_dsi *intel_dsi, const u8 *data) { struct drm_device *dev = intel_dsi->base.base.dev; - struct drm_i915_private *dev_priv = to_i915(dev); + struct drm_i915_private *i915 = to_i915(dev); struct intel_connector *connector = intel_dsi->attached_connector; u8 gpio_source, gpio_index = 0, gpio_number; bool value; - bool native = DISPLAY_VER(dev_priv) >= 11; + bool native = DISPLAY_VER(i915) >= 11; if (connector->panel.vbt.dsi.seq_version >= 3) gpio_index = *data++; @@ -477,16 +477,16 @@ static const u8 *mipi_exec_gpio(struct intel_dsi *intel_dsi, const u8 *data) /* pull up/down */ value = *data++ & 1; - drm_dbg_kms(&dev_priv->drm, "GPIO index %u, number %u, source %u, native %s, set to %s\n", + drm_dbg_kms(&i915->drm, "GPIO index %u, number %u, source %u, native %s, set to %s\n", gpio_index, gpio_number, gpio_source, str_yes_no(native), str_on_off(value)); if (native) - icl_native_gpio_set_value(dev_priv, gpio_number, value); - else if (DISPLAY_VER(dev_priv) >= 11) + icl_native_gpio_set_value(i915, gpio_number, value); + else if (DISPLAY_VER(i915) >= 11) bxt_exec_gpio(connector, gpio_source, gpio_index, value); - else if (IS_VALLEYVIEW(dev_priv)) + else if (IS_VALLEYVIEW(i915)) vlv_exec_gpio(connector, gpio_source, gpio_number, value); - else if (IS_CHERRYVIEW(dev_priv)) + else if (IS_CHERRYVIEW(i915)) chv_exec_gpio(connector, gpio_source, gpio_number, value); else bxt_exec_gpio(connector, gpio_source, gpio_index, value); From patchwork Fri Nov 3 20:18:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 161426 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:8f47:0:b0:403:3b70:6f57 with SMTP id j7csp1291778vqu; Fri, 3 Nov 2023 13:18:54 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHuZtZlFiL6xVhmJgRGUWnDUoOeGAk4fE9Wwfq3QDAb2rrRN+0b2zEr9ABwcRtjsTVoDGJc X-Received: by 2002:a05:6a00:1593:b0:6be:2901:2cd with SMTP id u19-20020a056a00159300b006be290102cdmr23180308pfk.10.1699042734609; Fri, 03 Nov 2023 13:18:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1699042734; cv=none; d=google.com; s=arc-20160816; b=BBdoth99CpGvu4ao1Jyud8qo5uiRVejNN8JQ4dLnPL9aB0v5qzn3MmVh5/OKhdWPME dLTn9N2FBiX9cHySmwr7+lT/51F8nGJ7N5tXKNhvZ3PHn2qnX4XwYxawCi6mSP89xIiO 1j7nppefH358D0wkU8WOHbABGHupT2rH7YjXqMMjTRPY3p8G55zK0Vu+0mLpub7sz7x3 k+zBgrs9u0txFdESYRXW/wZICCVFrdf5kJNUxPdS6O7mm7eFxKkqvRheo9hUEoxUoVF8 yBcAfNncB8w3jKFsqM95kBdZA1WQJTC/Wc08+Goagn1/g6p0RSmT6ACM3t4gfq9lxRrj b2sA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=h4Csbutx0aazxD5EJt5mCEFQLwtYV55pU/6Nv+70I8o=; fh=W9Apx1mxfI4Sn4Tfu/ApINr5FKslMaF8Hy7vCgvNWsQ=; b=SYVkZ44UaQ7drCixwaYuifDobCHyPa+Gq/Eb0xZq19oEv9y+GC9tcHA/bF+dtTGwLI I4noOx2ngOQg9qaOMQcIs0g/veJRVfctt8rz3QfjFlA3oiPHjfidU4bW+GD0UTwv7EgJ YSP32L5ixV7UzicdgjFqh8QcdOWnX/37r2hVjQAlns4CleBEJF7c96ptZ7u0UtTv5BUd yXsPnzjYIqEemCkYzbz8DDu4UmjbpjsZmnNPnbfQYm1C7bERSCWfPq1fmzvzTf+IFnlk ge4jT44citQTlg8Vx3nV0eC5SCsmHq8nIVD+LqfvN2rNLYp6RLN5zmTpTq7zQiTg7Z73 U0IQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=IkpdHUWJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id s36-20020a635264000000b00578af609d05si2138134pgl.244.2023.11.03.13.18.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Nov 2023 13:18:54 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=IkpdHUWJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id B54CD802C580; Fri, 3 Nov 2023 13:18:53 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378202AbjKCUSt (ORCPT + 35 others); Fri, 3 Nov 2023 16:18:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53754 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378157AbjKCUSo (ORCPT ); Fri, 3 Nov 2023 16:18:44 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D541AB8 for ; Fri, 3 Nov 2023 13:18:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1699042722; x=1730578722; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=sOlXPhm2EWggWgC9auNPoDBOg8jjBU+Gm+8lS7rVTqE=; b=IkpdHUWJcGPhV1GsaDpr1vNs6H0XE7sjGWzktP5Peitnxz4BqgERDAlq EdSaZkGdCb0xuhrN6FqnZqWKcEcq4nD5zerU9WC4MCSAQTpcPa2juAODG a5GEK7FkdiLJIkzRfaQznkXrjBkR8LGgbt4e4X3FRUOlv/9s0zkEUBPB9 hICbL1mOLZTJvaM+Vwd1wYjcdkmbQBFL7upMKJVyvPe2ZdaJzacpWsiPg 7IjFw3RqXd1q6Oj1DLOnTpzempw42/cJpIz9WQROxYdQxEnGyGBHH7ORh Tt6uaR3qI54CVKJmwZcb+bwFSnaSGd+zYo4QZaW2aWRTwhwJT03DDMk6a g==; X-IronPort-AV: E=McAfee;i="6600,9927,10883"; a="1896050" X-IronPort-AV: E=Sophos;i="6.03,275,1694761200"; d="scan'208";a="1896050" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Nov 2023 13:18:38 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10883"; a="832131118" X-IronPort-AV: E=Sophos;i="6.03,275,1694761200"; d="scan'208";a="832131118" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga004.fm.intel.com with ESMTP; 03 Nov 2023 13:18:34 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id B80685F9; Fri, 3 Nov 2023 22:18:33 +0200 (EET) From: Andy Shevchenko To: Jani Nikula , Andy Shevchenko , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , David Airlie , Daniel Vetter , Hans de Goede Subject: [PATCH v4 03/16] drm/i915/dsi: clarify GPIO exec sequence Date: Fri, 3 Nov 2023 22:18:18 +0200 Message-Id: <20231103201831.1037416-4-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20231103201831.1037416-1-andriy.shevchenko@linux.intel.com> References: <20231103201831.1037416-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Fri, 03 Nov 2023 13:18:53 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781575434187963913 X-GMAIL-MSGID: 1781575434187963913 From: Jani Nikula With the various sequence versions and pointer increments interleaved, it's a bit hard to decipher what's going on. Add separate paths for different sequence versions. Cc: Andy Shevchenko Cc: Hans de Goede Signed-off-by: Jani Nikula Signed-off-by: Andy Shevchenko --- drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 31 +++++++++++--------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c index 8b962f2ac475..11073efe26c0 100644 --- a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c +++ b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c @@ -456,26 +456,29 @@ static const u8 *mipi_exec_gpio(struct intel_dsi *intel_dsi, const u8 *data) struct drm_device *dev = intel_dsi->base.base.dev; struct drm_i915_private *i915 = to_i915(dev); struct intel_connector *connector = intel_dsi->attached_connector; - u8 gpio_source, gpio_index = 0, gpio_number; + u8 gpio_source = 0, gpio_index = 0, gpio_number; bool value; + int size; bool native = DISPLAY_VER(i915) >= 11; - if (connector->panel.vbt.dsi.seq_version >= 3) - gpio_index = *data++; + if (connector->panel.vbt.dsi.seq_version >= 3) { + size = 3; - gpio_number = *data++; + gpio_index = data[0]; + gpio_number = data[1]; + value = data[2] & BIT(0); - /* gpio source in sequence v2 only */ - if (connector->panel.vbt.dsi.seq_version == 2) - gpio_source = (*data >> 1) & 3; - else - gpio_source = 0; + if (connector->panel.vbt.dsi.seq_version >= 4 && data[2] & BIT(1)) + native = false; + } else { + size = 2; - if (connector->panel.vbt.dsi.seq_version >= 4 && *data & BIT(1)) - native = false; + gpio_number = data[0]; + value = data[1] & BIT(0); - /* pull up/down */ - value = *data++ & 1; + if (connector->panel.vbt.dsi.seq_version == 2) + gpio_source = (data[1] >> 1) & 3; + } drm_dbg_kms(&i915->drm, "GPIO index %u, number %u, source %u, native %s, set to %s\n", gpio_index, gpio_number, gpio_source, str_yes_no(native), str_on_off(value)); @@ -491,7 +494,7 @@ static const u8 *mipi_exec_gpio(struct intel_dsi *intel_dsi, const u8 *data) else bxt_exec_gpio(connector, gpio_source, gpio_index, value); - return data; + return data + size; } #ifdef CONFIG_ACPI From patchwork Fri Nov 3 20:18:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 161428 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:8f47:0:b0:403:3b70:6f57 with SMTP id j7csp1291883vqu; Fri, 3 Nov 2023 13:19:06 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHnrBx42Rg3YruC+NgKTz4NY95uPP7iIKGme9hA+Xqywxm4450yiqyWL5qNQzlLDfz35LYQ X-Received: by 2002:a05:6a00:2919:b0:6c2:cb4a:73c3 with SMTP id cg25-20020a056a00291900b006c2cb4a73c3mr11314763pfb.11.1699042745844; Fri, 03 Nov 2023 13:19:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1699042745; cv=none; d=google.com; s=arc-20160816; b=uUTq/gsKdS5jLJiN6jseGBnyB5pSaFPK5+9XHT5YcjvNJ/Mf6rhaaA49w0pOvIvVvo zJBDMfEN+goZfPkjMBGGEGKcoNdNZ4Kr/2XiGqqSEkF9O6Y9G7eN7XzwtVfAOPl61wDv fP8y3ZbZh4GyMYlIXJp615lFaivT45xfDayzuXj55AhCf9jGPFwGJw8BKGj6yfqFk7dq E/aojOg5jm+5t1nixBeKwVE8zBsPGc1AwOeGkXiQHLZYjlWJxdcHzB3m/AyQw9Ulz4rg 1aSXACR8OGuQt0yB9RbWLMS2Kdx66HnT7B3X9l0TjOglRBfxUOSqYrRSzINm/qrgqd2+ 7ZHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=waqxZLUT7qcUZ9sUk4WxxYNw+t5JCB3hSP4+67Vzsiw=; fh=W9Apx1mxfI4Sn4Tfu/ApINr5FKslMaF8Hy7vCgvNWsQ=; b=xL0JgEf4NAII8PCLY0j4I/o7eDYuJwtCDJ6DyaRU6zeOQHqSS7+f9TZ7E5a1hZXOOZ DA8v85SPjjyKN25oGOHP5nZAmbAmZkD59wZ4scc/lCjxs7nBU/U5E8q6tV+bp8U78lPU K6AFUagOUkeOGVHyFmxpgjkgqPlTVWtwvjBx4SDNavLMhEIRdiIGP5GFbpVDHuo6PMJP mJ+9AOR7F7YQ4Yo/1cUm2fZtZXZdKJsoGCgDDjWLb9CRMSRlgznnaHqoBaXMl7U7iUFT 0vmk/A0X3EuehYkth7bxHnHpYD84PSa7UWBvYNBQLwx4WbZrl5qQP/Q9MU311C7s32d4 uZVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=YjwJPAkz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id f9-20020a056a00238900b0068fce4338bdsi2243014pfc.62.2023.11.03.13.19.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Nov 2023 13:19:05 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=YjwJPAkz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id A92C8802C580; Fri, 3 Nov 2023 13:19:04 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378015AbjKCUSx (ORCPT + 35 others); Fri, 3 Nov 2023 16:18:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53768 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378170AbjKCUSo (ORCPT ); Fri, 3 Nov 2023 16:18:44 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D74BB112 for ; Fri, 3 Nov 2023 13:18:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1699042722; x=1730578722; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=+d2Ama+P0okGNCcoxtJKk+xZsdc9UC+/3+lzRqHrSJs=; b=YjwJPAkzF+Ik+iLcV5r33eCsR/ewq1GrpqlnI3imMbcxrNqxbJLYSwNI WpphHGPJxvCJ2jIfmaQswEDWBUUnG4RQcrUxFj8WHPicox8uQewqt7XaC 8hkhAaO4jxbuByC9muXg33N5jt7IYBdcX0VFXK7v195LTR1vSCWnMA7fN KZgXQHMkqOqjLVZYCtv6jCvWmJpMzOuyvcdxIdNVlGl+p4GOhe1+BfF7y ORS3mphhpNJn/K1t2H7psXEimGt49Rfa1leeMj6IEGpJdI0r7rnLKG7RF PINkn4JS9/OyI2fI5vxBfnyj4u7NdwzW6KSLyQ7WA8W7+WPANxV2a7YT3 Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10883"; a="1896045" X-IronPort-AV: E=Sophos;i="6.03,275,1694761200"; d="scan'208";a="1896045" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Nov 2023 13:18:38 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10883"; a="832131116" X-IronPort-AV: E=Sophos;i="6.03,275,1694761200"; d="scan'208";a="832131116" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga004.fm.intel.com with ESMTP; 03 Nov 2023 13:18:34 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id C7D28618; Fri, 3 Nov 2023 22:18:33 +0200 (EET) From: Andy Shevchenko To: Jani Nikula , Andy Shevchenko , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , David Airlie , Daniel Vetter , Hans de Goede Subject: [PATCH v4 04/16] drm/i915/dsi: rename platform specific *_exec_gpio() to *_gpio_set_value() Date: Fri, 3 Nov 2023 22:18:19 +0200 Message-Id: <20231103201831.1037416-5-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20231103201831.1037416-1-andriy.shevchenko@linux.intel.com> References: <20231103201831.1037416-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Fri, 03 Nov 2023 13:19:05 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781575446109038090 X-GMAIL-MSGID: 1781575446109038090 From: Jani Nikula The lowest level functions are about setting GPIO values, not about executing any sequences anymore. Cc: Andy Shevchenko Cc: Hans de Goede Signed-off-by: Jani Nikula Signed-off-by: Andy Shevchenko --- drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c index 11073efe26c0..f977d63a0ad4 100644 --- a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c +++ b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c @@ -243,8 +243,8 @@ static const u8 *mipi_exec_delay(struct intel_dsi *intel_dsi, const u8 *data) return data; } -static void vlv_exec_gpio(struct intel_connector *connector, - u8 gpio_source, u8 gpio_index, bool value) +static void vlv_gpio_set_value(struct intel_connector *connector, + u8 gpio_source, u8 gpio_index, bool value) { struct drm_i915_private *dev_priv = to_i915(connector->base.dev); struct gpio_map *map; @@ -291,8 +291,8 @@ static void vlv_exec_gpio(struct intel_connector *connector, vlv_iosf_sb_put(dev_priv, BIT(VLV_IOSF_SB_GPIO)); } -static void chv_exec_gpio(struct intel_connector *connector, - u8 gpio_source, u8 gpio_index, bool value) +static void chv_gpio_set_value(struct intel_connector *connector, + u8 gpio_source, u8 gpio_index, bool value) { struct drm_i915_private *dev_priv = to_i915(connector->base.dev); u16 cfg0, cfg1; @@ -345,8 +345,8 @@ static void chv_exec_gpio(struct intel_connector *connector, vlv_iosf_sb_put(dev_priv, BIT(VLV_IOSF_SB_GPIO)); } -static void bxt_exec_gpio(struct intel_connector *connector, - u8 gpio_source, u8 gpio_index, bool value) +static void bxt_gpio_set_value(struct intel_connector *connector, + u8 gpio_source, u8 gpio_index, bool value) { struct drm_i915_private *dev_priv = to_i915(connector->base.dev); /* XXX: this table is a quick ugly hack. */ @@ -486,13 +486,13 @@ static const u8 *mipi_exec_gpio(struct intel_dsi *intel_dsi, const u8 *data) if (native) icl_native_gpio_set_value(i915, gpio_number, value); else if (DISPLAY_VER(i915) >= 11) - bxt_exec_gpio(connector, gpio_source, gpio_index, value); + bxt_gpio_set_value(connector, gpio_source, gpio_index, value); else if (IS_VALLEYVIEW(i915)) - vlv_exec_gpio(connector, gpio_source, gpio_number, value); + vlv_gpio_set_value(connector, gpio_source, gpio_number, value); else if (IS_CHERRYVIEW(i915)) - chv_exec_gpio(connector, gpio_source, gpio_number, value); + chv_gpio_set_value(connector, gpio_source, gpio_number, value); else - bxt_exec_gpio(connector, gpio_source, gpio_index, value); + bxt_gpio_set_value(connector, gpio_source, gpio_index, value); return data + size; } From patchwork Fri Nov 3 20:18:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 161441 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:8f47:0:b0:403:3b70:6f57 with SMTP id j7csp1292146vqu; Fri, 3 Nov 2023 13:19:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF8sfi+PFmU1rwIdJBoAtemwLxItFPzAAuWp/F+gJrIfT9ZtHjGdJEKndpLBYJ3o/+ZWAFm X-Received: by 2002:a05:6870:d88f:b0:1e9:bda0:771 with SMTP id oe15-20020a056870d88f00b001e9bda00771mr27265538oac.4.1699042777623; Fri, 03 Nov 2023 13:19:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1699042777; cv=none; d=google.com; s=arc-20160816; b=01EL9gvFUFAZs7GJbnoFzt4GKh8tNT6+gUKvGfLGf90y9BiAn2KpMeG95/R7Xwk5TB rqhzdFFWbH0gHQcwbnEVozZxz8UzFV/HjOaCw28AlZg0Zkx/NMw/y63oI64tu8ihL33Y djRa9yHIuoaZI9Xm019i1JzqMmzDqOaLiHZ/v8KyVZlkSrJn1oPxLhP7gRF7Y4r4U8sZ tbefwwU35xEVhp4FlIcuu7lRLTRBkkgSCEsHw+6LNzMQYN2z/mkN3/OTT8SNWhSQMrUG zfy4eX+NWXaemZYh27z1MpjN1Qc4ykPO0Ds0g5bwPkyUink1evCD7XCNa9cECMtd5O9N FiNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=2h5mYzkiKOShs14983E4OXvBx34bV+QxCJxiDl7eUb0=; fh=W9Apx1mxfI4Sn4Tfu/ApINr5FKslMaF8Hy7vCgvNWsQ=; b=kc5LG/AqUESNvq70snOWDfIlgRMVF4l2//Je1rZbucakKVqgjhHXf+ZiVuCBv0INqs lINtGSMszBUTg9AuEeGrBIMGkjF7iQzYq5AxrXB1CMdgFmiC5Mq2b+wGlxTew3ZffdVF vpiXRnt3RdS9VgkuVoK0BXVetfYKrnDDf44vP6z7iqOhf5azSjIaz/wy6uLzSxPoLzQN l11UmyH68dyFRCQ0jewynJCo0lv5C3WBLB2y99efm5eG//cxtJ4vnyJIlQbnPpDoT2+Q ZZYafkRAh9KKT9CXmIuNFiKjR4UpM1Mtoe6gi/GqGqNEMJu5lb5iO1TcKhWwxPibzjFl Y9Sg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=GOUCGsBD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id bn6-20020a056a02030600b00570979732e4si2184244pgb.392.2023.11.03.13.19.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Nov 2023 13:19:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=GOUCGsBD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id A685E8335B38; Fri, 3 Nov 2023 13:19:32 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378233AbjKCUS5 (ORCPT + 35 others); Fri, 3 Nov 2023 16:18:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53812 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378185AbjKCUSp (ORCPT ); Fri, 3 Nov 2023 16:18:45 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 58782D63 for ; Fri, 3 Nov 2023 13:18:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1699042723; x=1730578723; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=wc6Dw16jrK2JuaQigVkusqKe77bPKOF3ZrL7ybVE950=; b=GOUCGsBDPAeaSEeyPQhrc42zmBEu9zJVgtNe/gn2xfrtDroLo/WwXcJT V018eOpdMY6PecZk+14e2jLkkYp1gqKFc1uHzOWXTjpEJ4h2Iz1uPvDdw nMv7Qk90uhZPY1qLJTru46MPNSNJQ7f7B/G6+AIeLDmPe+cAVWMeBZo4h x+5np31xH0kshihOOr6JfFmvNrF7DhuQzu/alDiW3CBHtLTV3iX4HfBwZ UsDdrnVxZgpbi3SR7L2HUNSmC7/iANJpcrt/PQ7s7OOW4Ww0IteUQfGcd bKqeJ4GAS1yn6wZFbfQkDOTo12QrAS9sV3fJdEs3zrwKGVtCklQ28mghf Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10883"; a="1896071" X-IronPort-AV: E=Sophos;i="6.03,275,1694761200"; d="scan'208";a="1896071" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Nov 2023 13:18:42 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10883"; a="832131146" X-IronPort-AV: E=Sophos;i="6.03,275,1694761200"; d="scan'208";a="832131146" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga004.fm.intel.com with ESMTP; 03 Nov 2023 13:18:38 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id D39D4644; Fri, 3 Nov 2023 22:18:33 +0200 (EET) From: Andy Shevchenko To: Jani Nikula , Andy Shevchenko , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , David Airlie , Daniel Vetter , Hans de Goede Subject: [PATCH v4 05/16] drm/i915/dsi: bxt/icl GPIO set value do not need gpio source Date: Fri, 3 Nov 2023 22:18:20 +0200 Message-Id: <20231103201831.1037416-6-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20231103201831.1037416-1-andriy.shevchenko@linux.intel.com> References: <20231103201831.1037416-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Fri, 03 Nov 2023 13:19:32 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781575479373385218 X-GMAIL-MSGID: 1781575479373385218 From: Jani Nikula Drop the unused parameter. Cc: Andy Shevchenko Cc: Hans de Goede Signed-off-by: Jani Nikula Signed-off-by: Andy Shevchenko --- drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c index f977d63a0ad4..4af43cf3cee0 100644 --- a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c +++ b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c @@ -346,7 +346,7 @@ static void chv_gpio_set_value(struct intel_connector *connector, } static void bxt_gpio_set_value(struct intel_connector *connector, - u8 gpio_source, u8 gpio_index, bool value) + u8 gpio_index, bool value) { struct drm_i915_private *dev_priv = to_i915(connector->base.dev); /* XXX: this table is a quick ugly hack. */ @@ -486,13 +486,13 @@ static const u8 *mipi_exec_gpio(struct intel_dsi *intel_dsi, const u8 *data) if (native) icl_native_gpio_set_value(i915, gpio_number, value); else if (DISPLAY_VER(i915) >= 11) - bxt_gpio_set_value(connector, gpio_source, gpio_index, value); + bxt_gpio_set_value(connector, gpio_index, value); else if (IS_VALLEYVIEW(i915)) vlv_gpio_set_value(connector, gpio_source, gpio_number, value); else if (IS_CHERRYVIEW(i915)) chv_gpio_set_value(connector, gpio_source, gpio_number, value); else - bxt_gpio_set_value(connector, gpio_source, gpio_index, value); + bxt_gpio_set_value(connector, gpio_index, value); return data + size; } From patchwork Fri Nov 3 20:18:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 161429 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:8f47:0:b0:403:3b70:6f57 with SMTP id j7csp1291909vqu; Fri, 3 Nov 2023 13:19:08 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGPlYkeoZKxnIB9oIvhIzesuGpbV8mqIqkb4jbYNSHhzeYbwmhTrOrHJQK/0gs/BSQynetv X-Received: by 2002:a05:6a20:d90b:b0:180:f8c2:633c with SMTP id jd11-20020a056a20d90b00b00180f8c2633cmr13677608pzb.53.1699042748656; Fri, 03 Nov 2023 13:19:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1699042748; cv=none; d=google.com; s=arc-20160816; b=hCrT70J1OAcewnbnfzD+BeovuEdoKEwUn8lVZGMjJHY5MvqLiNvp8vHGWiC2fIZQ4m wqa/ZCMx75XuSiJHMbjTQynIJLvkAocE41DqepptjhaEWMSIiIxHov86Mfj2ZkjpZft9 RLHyXfYyozCq/sFJ/GbUAh11DbxdOqu2Z7zg3FxfRU50coC8pgalqgpciR/wVRkZRVmC wLBqhX1XwuctC9XVk4BLvINSK5MHJ0QHEX1xjjN+F7qJ32EALsbU9I5v1U8AbHYhmLgG kOI0V/Cwu33CR6mcVDh44nQztrhcGPTfktwSkdAYZ6Ez1LKEKxOAo4c9KGPaVr5iXcE/ L5pQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=xqUpxvN5A4rwkRTQJaQcbs/HNTif5smsJZF4U0j2uCs=; fh=V5ywgBf85rQkHF36Ko7g9kTUFkdCX9ky0xG0tyEYPww=; b=KLpmLx1ZAURD1H2DEdw21Q/DcjgOCKGcMf46KzxZo5QuNZPXAdWRK0OYjCp7orXJ05 qa3zad3H65iq4qBTv+/h1b+ozcFZAToMJrZLb27bprXyuDd98M/ReQaqw8dMgguYlcqZ 24V8L/+85JPZPOZw3FB/WJ6ILtvOM1Y5ffOMzsNvk2z+OkdL9OvysAR4YO+mx6Q8PxI7 ZqBHEOQdNkdiErKjmsuBtz5BBqYSc/Q/CXLzJ8GN/cLWk3kf3IC/IRRllGdf729Ba6Tu O7dTBGXrzkw7MPRxCOtRTMXTdVK7mIIvGKyyS71+LkYLoYc/dBzCFN0pfaqjMxypfg/J UYkw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=TdBXR+sP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id ix19-20020a170902f81300b001c9bdaa81e3si2096360plb.633.2023.11.03.13.19.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Nov 2023 13:19:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=TdBXR+sP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id A21D7802C5A1; Fri, 3 Nov 2023 13:19:07 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378250AbjKCUTD (ORCPT + 35 others); Fri, 3 Nov 2023 16:19:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53828 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378187AbjKCUSp (ORCPT ); Fri, 3 Nov 2023 16:18:45 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 63517D64 for ; Fri, 3 Nov 2023 13:18:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1699042723; x=1730578723; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=fTxFU5Jq+F2HECS3gMhdwvDnSHvLw8vHCQZKqBJV8HQ=; b=TdBXR+sPdXzSbMIMOaGcv8wKQjrBnBSKC0V7Ig+KT16QUfQODVs4v32k fwV17fb+HG2NzHLA6OuAbbInyva8HBEUzubr++PJaKOhniRSwsvveGQ4A exWUfeicK1Rl8BUNNVizpIOzuxZUxnJFGNLzECBMhSAYaVftt+3HrTNRv pBAf6yv/j9g/tEUnUp1Pti5VtKiSMPphNIABIXDbwIOiB6T+AKs5LhfgU UHFKlO3wafKuivu4g3LouztPs3+abf8eL3Ve7Osrw6quIXtcXShTgjgUC oJhoghZG37X11Wjn+xdJab7h6xRGOKU4v5o2HgNvL4BeHPJxVTG9Ee4Y3 w==; X-IronPort-AV: E=McAfee;i="6600,9927,10883"; a="1896078" X-IronPort-AV: E=Sophos;i="6.03,275,1694761200"; d="scan'208";a="1896078" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Nov 2023 13:18:43 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10883"; a="832131163" X-IronPort-AV: E=Sophos;i="6.03,275,1694761200"; d="scan'208";a="832131163" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga004.fm.intel.com with ESMTP; 03 Nov 2023 13:18:38 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id DEFCC65B; Fri, 3 Nov 2023 22:18:33 +0200 (EET) From: Andy Shevchenko To: Jani Nikula , Andy Shevchenko , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , David Airlie , Daniel Vetter , Hans de Goede , Andi Shyti Subject: [PATCH v4 06/16] drm/i915/dsi: Replace while(1) with one with clear exit condition Date: Fri, 3 Nov 2023 22:18:21 +0200 Message-Id: <20231103201831.1037416-7-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20231103201831.1037416-1-andriy.shevchenko@linux.intel.com> References: <20231103201831.1037416-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Fri, 03 Nov 2023 13:19:07 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781575449170192430 X-GMAIL-MSGID: 1781575449170192430 Move existing condition to while(), so it will be clear on what circumstances the loop is successfully finishing. Reviewed-by: Andi Shyti Signed-off-by: Andy Shevchenko Acked-by: Jani Nikula --- drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c index 4af43cf3cee0..290a112f1b63 100644 --- a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c +++ b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c @@ -702,13 +702,10 @@ static void intel_dsi_vbt_exec(struct intel_dsi *intel_dsi, if (connector->panel.vbt.dsi.seq_version >= 3) data += 4; - while (1) { + while (*data != MIPI_SEQ_ELEM_END) { u8 operation_byte = *data++; u8 operation_size = 0; - if (operation_byte == MIPI_SEQ_ELEM_END) - break; - if (operation_byte < ARRAY_SIZE(exec_elem)) mipi_elem_exec = exec_elem[operation_byte]; else From patchwork Fri Nov 3 20:18:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 161431 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:8f47:0:b0:403:3b70:6f57 with SMTP id j7csp1291956vqu; Fri, 3 Nov 2023 13:19:14 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFzYrdjMT7PQ9ox9iQjCkiSMnjEQXgXYO2G8CdybL6q/rgqbbrU69m1jknmnPiD2zp+msIt X-Received: by 2002:a05:6a20:cea3:b0:179:f858:784d with SMTP id if35-20020a056a20cea300b00179f858784dmr17442403pzb.21.1699042754544; Fri, 03 Nov 2023 13:19:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1699042754; cv=none; d=google.com; s=arc-20160816; b=bOGHieC1osEkO5smXpF8FAgWvzp480usBGJkzbPr7yHl2eKoE34vOfBt4FaC3oVwIG vx7F45sqpBwyMzb6z6KKWYkKsT0gNApHenvQJc/lmyFgZL1YmcY16BcyiXPVX55Hkmxj w6XihZbxt5S+GmXAHA7xJ+AKcdrVB3sDyqV+cvIsraUDridbafxJEZ4c6spciPNtx3aF k6r3VZGsp+pOQcDV3h0zc9PeFKOTgB+2OA8Vs65VMFcH+9jO0GTrGdHhnF7hXW4tdWpl xZ1+w1G7hWLouMWjIFExp6/gV0ukRQVM6c3ThFa3gYcvMdipqRx0EuAYCPJe4YqWhKWu D9mA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Hezj8yyU7RawbMoewunsgfnXNr/xH6cfpdJMU8vSi9w=; fh=V5ywgBf85rQkHF36Ko7g9kTUFkdCX9ky0xG0tyEYPww=; b=twFDa7FYvZ7InfkR1a027ICzrjK0atirZ9lZY943mZ8btClcuQUNAjsNIezaZzhS38 vAn/Zz7mP9HtIRb9IIy+8hDzAntPdCOFOJtHqpHTX8ZW1Uwxwu1tYK6Sh6vSQYJF3Hm7 BC1f7ScJJx+uwI+QiqHys6IVS97+MHWRssqMAsBGEnvyHh1Ihx4IK3Lg2JHnA5DsiY7x yPvV97KxTQR/OWxHLqL/L0kbVVz16buf5pPJmXhSGUxNGfGikkTb/bndnX1eP6qKWZTV axsEI9g1QO98KUF41z7uT9u2W3LdXTdK46xQJb40FFm/OSQzO8rlTOK4Zb9jyQ20wz44 U8iQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=bZmkK4PY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id bt26-20020a63291a000000b00578bea3c10esi2054397pgb.756.2023.11.03.13.19.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Nov 2023 13:19:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=bZmkK4PY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 775AB802C5A8; Fri, 3 Nov 2023 13:19:12 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378268AbjKCUTH (ORCPT + 35 others); Fri, 3 Nov 2023 16:19:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53834 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229605AbjKCUSq (ORCPT ); Fri, 3 Nov 2023 16:18:46 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8F637D65 for ; Fri, 3 Nov 2023 13:18:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1699042723; x=1730578723; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=hYPgn7IwxVJgv7DR1WyFHhOoe5hhOJM/MdnJ94wskeM=; b=bZmkK4PYwtZ0utxuR3pnxJe96ucxXhnpZj4r09J4uOPa99cK0EKUgeKW UOyV+jo7XkOrfZqxEoA1vzNQOWmBxpJRpJQbXq2InqHtxth3XcsPoEKOY o7XjUPRFcpon/6xQfN6MxDBsAIFHNpwgqm8kAOtsJGGUU3VXMnCNoowHn 81E7pksTBJFLmlRgeHwk3tVLrt3s7iIF8tiCTF6gcaS6ZGlmmsGRvzI4g 7A04mqC1vER4nTX6oH0jdqLxBxIy2xCIF9mMHDaR1bP/98/ybAt0Hm766 RYMhC0ytQKUIiGLbyMUsBgGXRYbiR3FlkqTfeCMcNJ71+VKQykZYD7jdj A==; X-IronPort-AV: E=McAfee;i="6600,9927,10883"; a="1896083" X-IronPort-AV: E=Sophos;i="6.03,275,1694761200"; d="scan'208";a="1896083" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Nov 2023 13:18:43 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10883"; a="832131162" X-IronPort-AV: E=Sophos;i="6.03,275,1694761200"; d="scan'208";a="832131162" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga004.fm.intel.com with ESMTP; 03 Nov 2023 13:18:38 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id EA76E690; Fri, 3 Nov 2023 22:18:33 +0200 (EET) From: Andy Shevchenko To: Jani Nikula , Andy Shevchenko , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , David Airlie , Daniel Vetter , Hans de Goede , Andi Shyti Subject: [PATCH v4 07/16] drm/i915/dsi: Get rid of redundant 'else' Date: Fri, 3 Nov 2023 22:18:22 +0200 Message-Id: <20231103201831.1037416-8-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20231103201831.1037416-1-andriy.shevchenko@linux.intel.com> References: <20231103201831.1037416-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Fri, 03 Nov 2023 13:19:12 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781575455319510644 X-GMAIL-MSGID: 1781575455319510644 In the snippets like the following if (...) return / goto / break / continue ...; else ... the 'else' is redundant. Get rid of it. Reviewed-by: Andi Shyti Signed-off-by: Andy Shevchenko Acked-by: Jani Nikula --- drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 58 ++++++++++---------- 1 file changed, 28 insertions(+), 30 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c index 290a112f1b63..4ed5ede9ec5b 100644 --- a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c +++ b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c @@ -142,7 +142,7 @@ static enum port intel_dsi_seq_port_to_port(struct intel_dsi *intel_dsi, if (seq_port) { if (intel_dsi->ports & BIT(PORT_B)) return PORT_B; - else if (intel_dsi->ports & BIT(PORT_C)) + if (intel_dsi->ports & BIT(PORT_C)) return PORT_C; } @@ -670,8 +670,8 @@ static const char *sequence_name(enum mipi_seq seq_id) { if (seq_id < ARRAY_SIZE(seq_name) && seq_name[seq_id]) return seq_name[seq_id]; - else - return "(unknown)"; + + return "(unknown)"; } static void intel_dsi_vbt_exec(struct intel_dsi *intel_dsi, @@ -865,36 +865,34 @@ bool intel_dsi_vbt_init(struct intel_dsi *intel_dsi, u16 panel_id) * multiply by 100 to preserve remainder */ if (intel_dsi->video_mode == BURST_MODE) { - if (mipi_config->target_burst_mode_freq) { - u32 bitrate = intel_dsi_bitrate(intel_dsi); + u32 bitrate; - /* - * Sometimes the VBT contains a slightly lower clock, - * then the bitrate we have calculated, in this case - * just replace it with the calculated bitrate. - */ - if (mipi_config->target_burst_mode_freq < bitrate && - intel_fuzzy_clock_check( - mipi_config->target_burst_mode_freq, - bitrate)) - mipi_config->target_burst_mode_freq = bitrate; - - if (mipi_config->target_burst_mode_freq < bitrate) { - drm_err(&dev_priv->drm, - "Burst mode freq is less than computed\n"); - return false; - } - - burst_mode_ratio = DIV_ROUND_UP( - mipi_config->target_burst_mode_freq * 100, - bitrate); - - intel_dsi->pclk = DIV_ROUND_UP(intel_dsi->pclk * burst_mode_ratio, 100); - } else { - drm_err(&dev_priv->drm, - "Burst mode target is not set\n"); + if (mipi_config->target_burst_mode_freq == 0) { + drm_err(&dev_priv->drm, "Burst mode target is not set\n"); return false; } + + bitrate = intel_dsi_bitrate(intel_dsi); + + /* + * Sometimes the VBT contains a slightly lower clock, then + * the bitrate we have calculated, in this case just replace it + * with the calculated bitrate. + */ + if (mipi_config->target_burst_mode_freq < bitrate && + intel_fuzzy_clock_check(mipi_config->target_burst_mode_freq, + bitrate)) + mipi_config->target_burst_mode_freq = bitrate; + + if (mipi_config->target_burst_mode_freq < bitrate) { + drm_err(&dev_priv->drm, "Burst mode freq is less than computed\n"); + return false; + } + + burst_mode_ratio = + DIV_ROUND_UP(mipi_config->target_burst_mode_freq * 100, bitrate); + + intel_dsi->pclk = DIV_ROUND_UP(intel_dsi->pclk * burst_mode_ratio, 100); } else burst_mode_ratio = 100; From patchwork Fri Nov 3 20:18:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 161430 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:8f47:0:b0:403:3b70:6f57 with SMTP id j7csp1291928vqu; Fri, 3 Nov 2023 13:19:11 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFD5EW8pKdjAKzbm7X05Ah450dlvVCc/E87TczuzF8jeF/tPsaiCbvkxohKrAz+bBu/6vUQ X-Received: by 2002:a54:4690:0:b0:3a8:432a:ea13 with SMTP id k16-20020a544690000000b003a8432aea13mr24853890oic.46.1699042751426; Fri, 03 Nov 2023 13:19:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1699042751; cv=none; d=google.com; s=arc-20160816; b=Uoz2p2kwvzotlT/1yWIffW3AuYQc1VAlvDLSZVkX20HUOVxVKJ86cWtEMSU3Z+3o7t CuaY4iegJSZVqbfZzSBoQRnm+AbU7+abe706M7g1CmeS6k1fbCv5HUJumbAbD21zMyAo 3lZ5xACVSbQJzyF0TgInXYO2fmQFs1SmB00QGM5UhL7dehJ2E+EnA33d+OXvDeQe8kTO gt1+++TEnZdushC/9UG5WIaFRF5jU32JpVhfQ1K6yENvGxjI6RM4MpAp3k+Rb7pIeiqX IonORpriqZL5FwIVHinehoqXyRe0PV0AF0NJQZRY2UtAKKept55UdywhkJG0Ezz0O9GA Y3UQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=JehdPAMrx4D+S7qPL+h+CQVoXbVaGORcH8VynT/8Ycs=; fh=V5ywgBf85rQkHF36Ko7g9kTUFkdCX9ky0xG0tyEYPww=; b=sutnUtTLvHMyCWmhePCkOcVyTn5GwYYSYx7cZ+Qoa2mJgEIO2LserltXzxVkPtdFS6 JEWEVuF9zozjEQrKEuuR83FjhVbvpOGjI7fb/NdOj5FiExGtJ3cg9s3NL/ESR82SNjM1 dyYDN98nMMvBNf/s2j6JN3IRpGnDq/TN9UjTGuQi6ZJXocBoNCuNQ1GXqv+3bZNVoUtu WT5Ljt8RZUINOJ8AvRK9PwU4ls1phPp2A6UFQXLCvIZzDxvRtSNiR+4BOQxugIMkfBjw hGHKvD8Ujswm3jULTG+w3ER272fakT/qe0H9KxH69jQJ2fEcdGQUiIdsDJrwFbnb+w5v eMGQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Fku0v1hB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id m12-20020a656a0c000000b00577960a815csi2311072pgu.188.2023.11.03.13.19.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Nov 2023 13:19:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Fku0v1hB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 5DD5B802C5AB; Fri, 3 Nov 2023 13:19:10 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378215AbjKCUTE (ORCPT + 35 others); Fri, 3 Nov 2023 16:19:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53798 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378181AbjKCUSp (ORCPT ); Fri, 3 Nov 2023 16:18:45 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 266BEB8 for ; Fri, 3 Nov 2023 13:18:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1699042723; x=1730578723; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=grTcdks/Ll70fGBWNiqdqzL8NMj1dVygNqVaInrANw8=; b=Fku0v1hB0Hlf7YCcHkiuwwMpLFkp6h5L1wt7H07mBJFsJt1VlreuhCpp 7zCMRRwYkfmp9HPoo+jniGX2/j392migelgsTCG1lABe1BAq5T/Wo7s7g LQbtEka5oMsysbNxYggPTpKIlpP0mRobJqMMbKNOw3tl0gWjZjuIKl5Ba cWGGmoHX4BwYNvHpVjyMP/ENri6qG2379SF4+b/5aB93w3oA5i+Q+eziY 3SUstFmHWI17ykTtSbHVy/uI+o7zgGsbqg0+xy0mQR41m5Xo/hC5wWH9S lBCyUMJ5upssLjKhGSZfiPgXrNpBH10EESkk9l7azi3j9081fnXFCIiAb w==; X-IronPort-AV: E=McAfee;i="6600,9927,10883"; a="387904511" X-IronPort-AV: E=Sophos;i="6.03,275,1694761200"; d="scan'208";a="387904511" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Nov 2023 13:18:42 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10883"; a="885303671" X-IronPort-AV: E=Sophos;i="6.03,275,1694761200"; d="scan'208";a="885303671" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga004.jf.intel.com with ESMTP; 03 Nov 2023 13:18:39 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 018C06B4; Fri, 3 Nov 2023 22:18:33 +0200 (EET) From: Andy Shevchenko To: Jani Nikula , Andy Shevchenko , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , David Airlie , Daniel Vetter , Hans de Goede , Andi Shyti Subject: [PATCH v4 08/16] drm/i915/dsi: Replace check with a (missing) MIPI sequence name Date: Fri, 3 Nov 2023 22:18:23 +0200 Message-Id: <20231103201831.1037416-9-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20231103201831.1037416-1-andriy.shevchenko@linux.intel.com> References: <20231103201831.1037416-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Fri, 03 Nov 2023 13:19:10 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781575451846127186 X-GMAIL-MSGID: 1781575451846127186 Names of the MIPI sequence steps are sequential and defined, no need to check for the gaps. However in seq_name the MIPI_SEQ_END is missing. Add it there, and drop unneeded NULL check in sequence_name(). Reviewed-by: Andi Shyti Signed-off-by: Andy Shevchenko Acked-by: Jani Nikula --- drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c index 4ed5ede9ec5b..d270437217b3 100644 --- a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c +++ b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c @@ -653,6 +653,7 @@ static const fn_mipi_elem_exec exec_elem[] = { */ static const char * const seq_name[] = { + [MIPI_SEQ_END] = "MIPI_SEQ_END", [MIPI_SEQ_DEASSERT_RESET] = "MIPI_SEQ_DEASSERT_RESET", [MIPI_SEQ_INIT_OTP] = "MIPI_SEQ_INIT_OTP", [MIPI_SEQ_DISPLAY_ON] = "MIPI_SEQ_DISPLAY_ON", @@ -668,7 +669,7 @@ static const char * const seq_name[] = { static const char *sequence_name(enum mipi_seq seq_id) { - if (seq_id < ARRAY_SIZE(seq_name) && seq_name[seq_id]) + if (seq_id < ARRAY_SIZE(seq_name)) return seq_name[seq_id]; return "(unknown)"; From patchwork Fri Nov 3 20:18:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 161438 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:8f47:0:b0:403:3b70:6f57 with SMTP id j7csp1292082vqu; Fri, 3 Nov 2023 13:19:28 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGJMIBjQfmvPTDFfRqXzstFhAJOCP8EUZoBkmDhKv0lKHhOQ+vhFJPn7qQKjipmTGm7l4we X-Received: by 2002:a17:902:6acb:b0:1c6:a0b:7b9a with SMTP id i11-20020a1709026acb00b001c60a0b7b9amr21690841plt.3.1699042768459; Fri, 03 Nov 2023 13:19:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1699042768; cv=none; d=google.com; s=arc-20160816; b=eQ0zuouAV0GMmNTYidv7hkroYCMxGIdv7ATxnPBirvhndd7wEsZ3T5XSH4SpHk0vCN oeJR73pSnmG1yOuOAiQAyPfZHXjt+n9h+GPW3JvAjvHmptwcx0C3GOm7i7ZZz3UmiJEz hGv7K4eTh3J8akTSVowyLf/J68HZi4UOEYXSRx2FxFZLLqmnfpD23jHaNOD6G3add5FR Qw7dDse0Z2c4NFQEyBcrF7NB9voLBOGmYjo38EOdR7yT1Y+Jm5iFEkbb6DIojQ5FVhHX V/cyhG0e4qkqyGnQdmt+vr53BUTu/TXbYLW/+8FaFJ0cEQ8LQFkud6OslgXEvC3ctCAo 3HcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=1Ez8I67fj/OoBY1G3mxSKbhxOeM7kea/G7vHepnUYkM=; fh=W9Apx1mxfI4Sn4Tfu/ApINr5FKslMaF8Hy7vCgvNWsQ=; b=gP42QYipcdIIcYzPdCKQy5nblnSva5sWj23OoYLlFNNr6/Eal2i8d28d6dGQpNpx40 L6NLkwdCKi2wqZEbZntfPSIjrwV627SD6DOnXlFdIByOMVBtjMV7Xgj+ZNIMS0mGQNdW d8qeUK5V5z4dqEodUrbEVkZnHaeq8l3yG4Bp5wyNVi8IZaXC8DAxo/gRwKMBf2onfbmW Z75aZQjGClNG1+2lv0gbH2ij4S9IOVFP4veZD1DZCJgDo+U7GzBefnopDhiGVt0RyZOI RnpV+KvuDGYYx7a3f/zx418y5xpflrOx9hErXK7c57FP4IKvv5Vdlz7U5emrb0XarzbF NEtQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=LjsVJqKG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id e3-20020a17090301c300b001c6189eaadesi2286052plh.132.2023.11.03.13.19.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Nov 2023 13:19:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=LjsVJqKG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 04AC38335B30; Fri, 3 Nov 2023 13:19:24 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378242AbjKCUTL (ORCPT + 35 others); Fri, 3 Nov 2023 16:19:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53850 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378192AbjKCUSq (ORCPT ); Fri, 3 Nov 2023 16:18:46 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3393B112 for ; Fri, 3 Nov 2023 13:18:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1699042724; x=1730578724; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=NkdyHfWpDQgy3Wd95PRsTQ/s063SwDqf3JHbJtEz5v4=; b=LjsVJqKGPCLXYxYizU3L+jfgBGdlgAZwxW/PQm92/UiOX8smH08KN1C8 4YAaW6oSD0WSXssELRQiVHyjaDuvpPWkdnyysyNA7CTdLH2N0U+gQT2K3 ZhFeU60zQh2Em+pFhaAFevaXfVsSCClsXTcQf9QfWBRMG7SyXW8NKMYXW brFkC75QedgAEpGFznPeU0U3i4F/AQQiJr8ITRWopNuQjy6guubNPKg18 DpAQQD8/qdw36dcc2zQfp/kL+Xc5Bzhke3zgooEPt8qJF/d/vLazCwXGH vTqLWtKmNSv0UwJTLbX9XDtrtB4iUwKme03vI4SMv870+10HNqyaQ32De A==; X-IronPort-AV: E=McAfee;i="6600,9927,10883"; a="1896088" X-IronPort-AV: E=Sophos;i="6.03,275,1694761200"; d="scan'208";a="1896088" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Nov 2023 13:18:43 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10883"; a="832131159" X-IronPort-AV: E=Sophos;i="6.03,275,1694761200"; d="scan'208";a="832131159" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga004.fm.intel.com with ESMTP; 03 Nov 2023 13:18:38 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 0DCED6B5; Fri, 3 Nov 2023 22:18:34 +0200 (EET) From: Andy Shevchenko To: Jani Nikula , Andy Shevchenko , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , David Airlie , Daniel Vetter , Hans de Goede Subject: [PATCH v4 09/16] drm/i915/dsi: Remove GPIO lookup table at the end of intel_dsi_vbt_gpio_init() Date: Fri, 3 Nov 2023 22:18:24 +0200 Message-Id: <20231103201831.1037416-10-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20231103201831.1037416-1-andriy.shevchenko@linux.intel.com> References: <20231103201831.1037416-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Fri, 03 Nov 2023 13:19:24 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781575469962784779 X-GMAIL-MSGID: 1781575469962784779 From: Hans de Goede To properly deal with GPIOs used in MIPI panel sequences a temporary GPIO lookup will be used. Since there can only be 1 GPIO lookup table for the "0000:00:02.0" device this will not work if the GPIO lookup table used by intel_dsi_vbt_gpio_init() is still registered. After getting the "backlight" and "panel" GPIOs the lookup table registered by intel_dsi_vbt_gpio_init() is no longer necessary, remove it so that another temporary lookup-table for the "0000:00:02.0" device can be added. Signed-off-by: Hans de Goede Signed-off-by: Andy Shevchenko Acked-by: Jani Nikula --- drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 25 +++++++------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c index d270437217b3..8e6beef90e5e 100644 --- a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c +++ b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c @@ -955,6 +955,7 @@ void intel_dsi_vbt_gpio_init(struct intel_dsi *intel_dsi, bool panel_is_on) struct intel_connector *connector = intel_dsi->attached_connector; struct mipi_config *mipi_config = connector->panel.vbt.dsi.config; enum gpiod_flags flags = panel_is_on ? GPIOD_OUT_HIGH : GPIOD_OUT_LOW; + struct gpiod_lookup_table *gpiod_lookup_table = NULL; bool want_backlight_gpio = false; bool want_panel_gpio = false; struct pinctrl *pinctrl; @@ -962,12 +963,12 @@ 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); + 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; @@ -984,6 +985,9 @@ 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_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)) { @@ -1002,15 +1006,13 @@ void intel_dsi_vbt_gpio_init(struct intel_dsi *intel_dsi, bool panel_is_on) intel_dsi->gpio_backlight = NULL; } } + + if (gpiod_lookup_table) + gpiod_remove_lookup_table(gpiod_lookup_table); } 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; @@ -1020,13 +1022,4 @@ void intel_dsi_vbt_gpio_cleanup(struct intel_dsi *intel_dsi) gpiod_put(intel_dsi->gpio_backlight); 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); - } } From patchwork Fri Nov 3 20:18:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 161436 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:8f47:0:b0:403:3b70:6f57 with SMTP id j7csp1292075vqu; Fri, 3 Nov 2023 13:19:27 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEpgTt1xDqtA+ZIIhz94E+a0WKi+kZKEtFToq/7AxDLomX25yFqDKb2Av9BrjFpeg3Upa5n X-Received: by 2002:a05:6a20:4412:b0:154:3f13:1bb7 with SMTP id ce18-20020a056a20441200b001543f131bb7mr30986492pzb.49.1699042767659; Fri, 03 Nov 2023 13:19:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1699042767; cv=none; d=google.com; s=arc-20160816; b=thGZx7F4OoVw204GiyYRRREkYP0bJKBCN6yDX3EylN4HNwabMPO2IqkC8XodstW0Nz kvRDrnqC8O+e4KE3Gp5bwDsBNvRqkur+vpQepvUFRzgy0Emmqiwcj3a7pXsWC8S/RHiq MkNn8+PCOvb0e831dq57qc7DQAA5eLs4/iwVp0wTdmPGKtsTBk4lrs0ivVOuvPUKPerT 34wMpmHeRTOc9QZimtUKJZvmFvqtO5ICNf91V7bfoUPV/W7lxc3anrOY0492VTFhl7Fj IDtG+mZQ9ANz9Oamq12ZXtOdS7dmXclb3/N2Tijx6ODuTjTs0JggwEMer5kqP+SeaT2i xqsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=gUMXAkgIKiuxc5Y8LPNZ2SvZdmq4OfmNmnQZOFxOxys=; fh=W9Apx1mxfI4Sn4Tfu/ApINr5FKslMaF8Hy7vCgvNWsQ=; b=bGq8jFBdYkfpN92datd5BXTRxs9NhVkxkz6c71Rig63cl2gN394br+hTeEodMAibZH XP5T/wbyenT+WagoXjp5XHj8+nf/GkIAQDBnuRtlaIwuTzBxZ7Kb17zH/Tp0fKFltM6x amoONB4csQMQn4Ux+lPsHVL/a9xRKoHnXo95Y3bMb6VIDW1DQFbWTiZI5skSRO47bDDa J/Q/th/0XegY1hz0G49gCBWFtXbHG4xEwuAfow6PYSpkjg4dFUlK17mifMmtEX9g4V1s YHCLXXRPB/fVMZDIMyPYq0OQH/4z1e4T6Y/l8i0IUoxmhPqKRa6/k8ukKJIKU4vwmlio VfAw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=ItfcpGmY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id t15-20020a170902e84f00b001cc0fdbea2asi2293295plg.142.2023.11.03.13.19.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Nov 2023 13:19:27 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=ItfcpGmY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 4EB84839A932; Fri, 3 Nov 2023 13:19:22 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378226AbjKCUSz (ORCPT + 35 others); Fri, 3 Nov 2023 16:18:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53784 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378176AbjKCUSp (ORCPT ); Fri, 3 Nov 2023 16:18:45 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CE00618B for ; Fri, 3 Nov 2023 13:18:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1699042722; x=1730578722; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Zmln3yyzcVM/LYPj/mpbDMzt1pG2aWEjj+ZbDI0Y7xM=; b=ItfcpGmYuxouur9ZkZa6moLqz4l34EDIK2OwfZsEVj8xq97j3ZP1rGqy ZJtJuGxkHm3XSoBkXUluszmbqFSqnjn6x17ROH6gyo8MY3hD2ULeVZdTv 0VK4WLjDK6NCNaNeMuLLO51VHK/LVP6z7sdTV5H2H7FuqGG6S98+Jk8PS W7j1Vqx3OwDsg88WqHGswujaMOSDFAOU+lWJBiPNWlSCXXvBKtIHJoqzc 9FltL9IdbSXwFTVfmKwM0eCxIy91JNUAOD4icCdD5n+cEygjirvkGcwaO 1V0HV/4XQh6+j6W2TBtWybO+L75le+8yR0PlCuyCgFn3W6yAR/L1xio0N w==; X-IronPort-AV: E=McAfee;i="6600,9927,10883"; a="1896065" X-IronPort-AV: E=Sophos;i="6.03,275,1694761200"; d="scan'208";a="1896065" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Nov 2023 13:18:42 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10883"; a="832131147" X-IronPort-AV: E=Sophos;i="6.03,275,1694761200"; d="scan'208";a="832131147" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga004.fm.intel.com with ESMTP; 03 Nov 2023 13:18:38 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 194B0706; Fri, 3 Nov 2023 22:18:34 +0200 (EET) From: Andy Shevchenko To: Jani Nikula , Andy Shevchenko , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , David Airlie , Daniel Vetter , Hans de Goede Subject: [PATCH v4 10/16] drm/i915/dsi: Fix wrong initial value for GPIOs in bxt_gpio_set_value() Date: Fri, 3 Nov 2023 22:18:25 +0200 Message-Id: <20231103201831.1037416-11-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20231103201831.1037416-1-andriy.shevchenko@linux.intel.com> References: <20231103201831.1037416-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Fri, 03 Nov 2023 13:19:22 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781575469352162963 X-GMAIL-MSGID: 1781575469352162963 From: Hans de Goede Fix wrong initial value for GPIOs in bxt_gpio_set_value(). Signed-off-by: Hans de Goede Signed-off-by: Andy Shevchenko Acked-by: Jani Nikula --- drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c index 8e6beef90e5e..0f9da0168a7b 100644 --- a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c +++ b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c @@ -356,9 +356,7 @@ static void bxt_gpio_set_value(struct intel_connector *connector, if (!gpio_desc) { gpio_desc = devm_gpiod_get_index(dev_priv->drm.dev, NULL, gpio_index, - value ? GPIOD_OUT_LOW : - GPIOD_OUT_HIGH); - + value ? GPIOD_OUT_HIGH : GPIOD_OUT_LOW); if (IS_ERR_OR_NULL(gpio_desc)) { drm_err(&dev_priv->drm, "GPIO index %u request failed (%ld)\n", From patchwork Fri Nov 3 20:18:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 161435 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:8f47:0:b0:403:3b70:6f57 with SMTP id j7csp1292062vqu; Fri, 3 Nov 2023 13:19:25 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFXquT4r1PsNZLjy+9Xt/LM5J1DT9764NIsaRdPyTirbOoSLS12csK+gM7Lqa9fPNuaRehJ X-Received: by 2002:a05:6a20:3d26:b0:135:4df7:f165 with SMTP id y38-20020a056a203d2600b001354df7f165mr22079001pzi.21.1699042765673; Fri, 03 Nov 2023 13:19:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1699042765; cv=none; d=google.com; s=arc-20160816; b=uAALL3EgaQGjZntLOh31bO66yunr+6sTtEyYUjwmOuP9RuLLdUnRx262XrlHRj3g1C C8BpBB46WnVFsbPgiXPeNUv37unxTutQk7ZppK0S4fDjE+cGyNTN1nxiTNAAHsXJNT8K yCga9ttLE+VOUV+1axb0SWsja+SzwEL3684erA+mHzbQeri4mIkyQeYrAwtzUhp5QJ24 0GAwqbatSdIBLtIcQSR4rN/WMoS9gC4e6SZB59qQ8LiAvl+HTtmAzZDpS+vPAJJKfaDy 2ut1eVXlbXGkNO0hvySFhQJlYa0ohS/8uLpSVh7vBLFYqXmzxKp7oqjaaqboUxJb9mFT bvUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=oG1GLZKGqHbKrGgNaSx8Js2ZYQNb54MzQDrRk5MFRoM=; fh=W9Apx1mxfI4Sn4Tfu/ApINr5FKslMaF8Hy7vCgvNWsQ=; b=RtNkjmruv8kAbzOgw1W9mqO1lclEyX3MMihAfPT3N56cah3fCh1gZJ4dzyU0DI+Wzp wQKavS741t5gTqYGYungIbk7n84fSZ9cs0Ca4BLjgi4CiOkB+akIR1HtIeoj7rIa1akS woheE67JW9C5gNf0rhgjIT8CvUQxXBqMhyTHpFWtU/zZKnUErcaaocj9JXkKO1GSq7Kr EZ9ZWgwKgqoeUw3+1JA32UYY8d5ypjGpElhDLhrFjyzwEz5qqMUe19VrbJ40one7zQ/4 plsetvVCJlFEQxyb7gMW8pWIwFxT5WiZU8055NM6/kityf7orVLCkI1W2b8xE0iqMIwo Ojcg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=KQC7RifZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id j3-20020a056a00130300b006c349641c3csi2210114pfu.143.2023.11.03.13.19.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Nov 2023 13:19:25 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=KQC7RifZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 445308335B26; Fri, 3 Nov 2023 13:19:21 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378277AbjKCUTI (ORCPT + 35 others); Fri, 3 Nov 2023 16:19:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53854 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378193AbjKCUSq (ORCPT ); Fri, 3 Nov 2023 16:18:46 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7AEC4B8 for ; Fri, 3 Nov 2023 13:18:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1699042724; x=1730578724; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=mxriWgsT/BR/PEWccYibzv6yVC4qNoxmHPUVcpwzS68=; b=KQC7RifZoU8pR7OPzZc6K7Ui8hF82dENPwLh5RkaOCan20zIiMOLviky 19v/F9XTRZE3qWh2wZTF6VO8Xy/LTdIxe4cwjjuvZNVB+szq/yzKvmQ/G XGbxzZmaGynAgu8tAZCmXMCE+0XbSjfl7hh+O1fV772z/0r1rcUhUGphs AwwKDwT68b+A67JlRIreBsrDtnPns/g7Wja+HEDLNXCNuH6BSgRH6QGHC i6XoYyXmz3khIMM1FXrWpxMNbdQkzROWDx4050OKiTomCH/lNDyM2rLfN 8PYMRQWZ2NVP9yMx/mgwq+c7LfbTV8AAD1CHcgSoS4XEGuv5h7Rey+x2M A==; X-IronPort-AV: E=McAfee;i="6600,9927,10883"; a="387904522" X-IronPort-AV: E=Sophos;i="6.03,275,1694761200"; d="scan'208";a="387904522" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Nov 2023 13:18:44 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10883"; a="885303685" X-IronPort-AV: E=Sophos;i="6.03,275,1694761200"; d="scan'208";a="885303685" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga004.jf.intel.com with ESMTP; 03 Nov 2023 13:18:40 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 2454E72F; Fri, 3 Nov 2023 22:18:34 +0200 (EET) From: Andy Shevchenko To: Jani Nikula , Andy Shevchenko , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , David Airlie , Daniel Vetter , Hans de Goede Subject: [PATCH v4 11/16] drm/i915/dsi: Extract common soc_gpio_set_value() helper Date: Fri, 3 Nov 2023 22:18:26 +0200 Message-Id: <20231103201831.1037416-12-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20231103201831.1037416-1-andriy.shevchenko@linux.intel.com> References: <20231103201831.1037416-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Fri, 03 Nov 2023 13:19:21 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781575467181983699 X-GMAIL-MSGID: 1781575467181983699 Extract a common soc_gpio_set_value() helper that may be used by a few SoCs. Signed-off-by: Andy Shevchenko Acked-by: Jani Nikula --- drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 46 +++++++++++--------- 1 file changed, 26 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 0f9da0168a7b..9847a92fdfc3 100644 --- a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c +++ b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c @@ -243,6 +243,31 @@ static const u8 *mipi_exec_delay(struct intel_dsi *intel_dsi, const u8 *data) return data; } +static void soc_gpio_set_value(struct intel_connector *connector, const char *con_id, + u8 gpio_index, bool value) +{ + struct drm_i915_private *dev_priv = to_i915(connector->base.dev); + /* XXX: this table is a quick ugly hack. */ + static struct gpio_desc *soc_gpio_table[U8_MAX + 1]; + struct gpio_desc *gpio_desc = soc_gpio_table[gpio_index]; + + if (gpio_desc) { + gpiod_set_value(gpio_desc, value); + } else { + gpio_desc = devm_gpiod_get_index(dev_priv->drm.dev, + con_id, gpio_index, + value ? GPIOD_OUT_HIGH : GPIOD_OUT_LOW); + if (IS_ERR(gpio_desc)) { + drm_err(&dev_priv->drm, + "GPIO index %u request failed (%pe)\n", + gpio_index, gpio_desc); + return; + } + + soc_gpio_table[gpio_index] = gpio_desc; + } +} + static void vlv_gpio_set_value(struct intel_connector *connector, u8 gpio_source, u8 gpio_index, bool value) { @@ -348,26 +373,7 @@ static void chv_gpio_set_value(struct intel_connector *connector, static void bxt_gpio_set_value(struct intel_connector *connector, u8 gpio_index, bool value) { - struct drm_i915_private *dev_priv = to_i915(connector->base.dev); - /* XXX: this table is a quick ugly hack. */ - static struct gpio_desc *bxt_gpio_table[U8_MAX + 1]; - struct gpio_desc *gpio_desc = bxt_gpio_table[gpio_index]; - - if (!gpio_desc) { - gpio_desc = devm_gpiod_get_index(dev_priv->drm.dev, - NULL, gpio_index, - value ? GPIOD_OUT_HIGH : GPIOD_OUT_LOW); - if (IS_ERR_OR_NULL(gpio_desc)) { - drm_err(&dev_priv->drm, - "GPIO index %u request failed (%ld)\n", - gpio_index, PTR_ERR(gpio_desc)); - return; - } - - bxt_gpio_table[gpio_index] = gpio_desc; - } - - gpiod_set_value(gpio_desc, value); + soc_gpio_set_value(connector, NULL, gpio_index, value); } enum { From patchwork Fri Nov 3 20:18:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 161434 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:8f47:0:b0:403:3b70:6f57 with SMTP id j7csp1292045vqu; Fri, 3 Nov 2023 13:19:23 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFogIv7WjGO/DntD81Zw854K1R8woJM65LGnQ3PCLhc8DFRmAMEChdB+zlABIOFGYCMNfY2 X-Received: by 2002:a17:90b:947:b0:27e:3ae3:eae0 with SMTP id dw7-20020a17090b094700b0027e3ae3eae0mr19273195pjb.16.1699042762951; Fri, 03 Nov 2023 13:19:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1699042762; cv=none; d=google.com; s=arc-20160816; b=LfUFkTk+8knBPaCxulFM95nSkKplUuHvIBqn5XXtLuh+888n42thn9sbBlUSKSiNwO r117szam/O5hQPgJVB4LpYaOzdpsVt2pAJfFM1E3XDCPfp3eOxHD9aMyC8vQdmjLtodW K1Ba6HPAtXIuersWegSYUPuRS71J1+AOoIVfRCK4fo3/JpX1AlOdRg00qVZ5iaTHwLOr k4Gmbb0+8ezi7H3SStYeX7GX9HhA1kWI+vBMjZ0yoCKmOG/BkN9qEexiU5kJQ67zgVCu B7pH04ljJ9Zz3Bw5k4sbRXbCCUnHaJhHHd/KiPVyXzzLk22P/bkZ5/cYZdsuqvTozaDS W0ug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=9vH4qZ5K+OKso4nMNOtSDTN32UMQPLQ8QmtF2VtfaZo=; fh=W9Apx1mxfI4Sn4Tfu/ApINr5FKslMaF8Hy7vCgvNWsQ=; b=0976HDFN8/Mkj0UT5g8cgkZzNhBt74n0lYkMJzhZgftlsAtk9SoMlq75Nle8HojjeU MQORBqtUSAYgD+34l7uKPki+DSVcbYSbPg08aby+5boAh1IooYUoKIHe+swUP/gOa0sC ns/lk/mH/Zao1cLC2lUIQ+EvjO/Zay8dDo4nmdeUe1KIx5rQY8w7CyzqKw9VikpNwxQe 4/3ilE53EzQ1bnUoGJ7K52ztlzr180x3Uuh1/v4LMkA5aVLACcU00u8Vvf2UcFLThIlL O2+aOy1cyAGRckrPe2Bs6ie18O1wiax1mgrsnh2CJuKxK5IIIEOH4tjljJYduxm5Jadb RPBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=ABOzRS0k; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id ob16-20020a17090b391000b00276bdabe471si2392299pjb.163.2023.11.03.13.19.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Nov 2023 13:19:22 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=ABOzRS0k; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id DC651812F454; Fri, 3 Nov 2023 13:19:21 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378281AbjKCUTS (ORCPT + 35 others); Fri, 3 Nov 2023 16:19:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36242 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378198AbjKCUSr (ORCPT ); Fri, 3 Nov 2023 16:18:47 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EB744D63 for ; Fri, 3 Nov 2023 13:18:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1699042725; x=1730578725; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=dJYH4bpZB4D6gpUDi338sRrXHssESnJCrAN+Nzo1Zug=; b=ABOzRS0k7Nlc0QOIvnwgCy7VbUlEY+DLOtUI4edBBXVFkviaJHW1mtRx wjxNaNLw5uXCv6s2M/KZPR94Q1/m4t1C0UvuUeFv475xB+2uUCUsq9ToE +/AEmXmGum9Z2a7Coq9Msg/2y87O/bvJbBaF0RXFgKOb6n2vvOvQtfwmX +P/Jn0EgS3UZJaRXiE1dds5Hk5Ahc3urJ2BUPAQkSomCXct4EQchEExGe PjTjzxKztVWft8AL6lbKoUW/CoBoE9HBLbe9KEVlH+goV95wlUCQ+muIG iGbkVf59S2CN51NCRA+YZmHE5inCzikFv/7w5Ykxk3W9NozBYKxVd1hnW Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10883"; a="1896102" X-IronPort-AV: E=Sophos;i="6.03,275,1694761200"; d="scan'208";a="1896102" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Nov 2023 13:18:44 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10883"; a="832131191" X-IronPort-AV: E=Sophos;i="6.03,275,1694761200"; d="scan'208";a="832131191" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga004.fm.intel.com with ESMTP; 03 Nov 2023 13:18:40 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 3442F76D; Fri, 3 Nov 2023 22:18:34 +0200 (EET) From: Andy Shevchenko To: Jani Nikula , Andy Shevchenko , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , David Airlie , Daniel Vetter , Hans de Goede Subject: [PATCH v4 12/16] drm/i915/dsi: Replace poking of VLV GPIOs behind the driver's back Date: Fri, 3 Nov 2023 22:18:27 +0200 Message-Id: <20231103201831.1037416-13-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20231103201831.1037416-1-andriy.shevchenko@linux.intel.com> References: <20231103201831.1037416-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Fri, 03 Nov 2023 13:19:21 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781575464455891247 X-GMAIL-MSGID: 1781575464455891247 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 40ecab551232 ("pinctrl: baytrail: Really serialize all register accesses") for the details. Taking all this into consideration replace the hack with proper GPIO APIs being used. Signed-off-by: Andy Shevchenko Acked-by: Jani Nikula --- drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 98 ++++++-------------- 1 file changed, 28 insertions(+), 70 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c index 9847a92fdfc3..552bc6564d79 100644 --- a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c +++ b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c @@ -55,43 +55,6 @@ #define MIPI_VIRTUAL_CHANNEL_SHIFT 1 #define MIPI_PORT_SHIFT 3 -/* base offsets for gpio pads */ -#define VLV_GPIO_NC_0_HV_DDI0_HPD 0x4130 -#define VLV_GPIO_NC_1_HV_DDI0_DDC_SDA 0x4120 -#define VLV_GPIO_NC_2_HV_DDI0_DDC_SCL 0x4110 -#define VLV_GPIO_NC_3_PANEL0_VDDEN 0x4140 -#define VLV_GPIO_NC_4_PANEL0_BKLTEN 0x4150 -#define VLV_GPIO_NC_5_PANEL0_BKLTCTL 0x4160 -#define VLV_GPIO_NC_6_HV_DDI1_HPD 0x4180 -#define VLV_GPIO_NC_7_HV_DDI1_DDC_SDA 0x4190 -#define VLV_GPIO_NC_8_HV_DDI1_DDC_SCL 0x4170 -#define VLV_GPIO_NC_9_PANEL1_VDDEN 0x4100 -#define VLV_GPIO_NC_10_PANEL1_BKLTEN 0x40E0 -#define VLV_GPIO_NC_11_PANEL1_BKLTCTL 0x40F0 - -#define VLV_GPIO_PCONF0(base_offset) (base_offset) -#define VLV_GPIO_PAD_VAL(base_offset) ((base_offset) + 8) - -struct gpio_map { - u16 base_offset; - bool init; -}; - -static struct gpio_map vlv_gpio_table[] = { - { VLV_GPIO_NC_0_HV_DDI0_HPD }, - { VLV_GPIO_NC_1_HV_DDI0_DDC_SDA }, - { VLV_GPIO_NC_2_HV_DDI0_DDC_SCL }, - { VLV_GPIO_NC_3_PANEL0_VDDEN }, - { VLV_GPIO_NC_4_PANEL0_BKLTEN }, - { VLV_GPIO_NC_5_PANEL0_BKLTCTL }, - { VLV_GPIO_NC_6_HV_DDI1_HPD }, - { VLV_GPIO_NC_7_HV_DDI1_DDC_SDA }, - { VLV_GPIO_NC_8_HV_DDI1_DDC_SCL }, - { VLV_GPIO_NC_9_PANEL1_VDDEN }, - { VLV_GPIO_NC_10_PANEL1_BKLTEN }, - { VLV_GPIO_NC_11_PANEL1_BKLTCTL }, -}; - struct i2c_adapter_lookup { u16 slave_addr; struct intel_dsi *intel_dsi; @@ -268,52 +231,47 @@ static void soc_gpio_set_value(struct intel_connector *connector, const char *co } } +static void soc_opaque_gpio_set_value(struct intel_connector *connector, + const char *chip, const char *con_id, + u8 gpio_index, bool value) +{ + struct gpiod_lookup_table *lookup; + + lookup = kzalloc(struct_size(lookup, table, 2), GFP_KERNEL); + if (!lookup) + return; + + lookup->dev_id = "0000:00:02.0"; + lookup->table[0] = + GPIO_LOOKUP_IDX(chip, gpio_index, con_id, gpio_index, GPIO_ACTIVE_HIGH); + + gpiod_add_lookup_table(lookup); + + soc_gpio_set_value(connector, con_id, gpio_index, value); + + gpiod_remove_lookup_table(lookup); + kfree(lookup); +} + static void vlv_gpio_set_value(struct intel_connector *connector, u8 gpio_source, u8 gpio_index, bool value) { struct drm_i915_private *dev_priv = to_i915(connector->base.dev); - struct gpio_map *map; - u16 pconf0, padval; - u32 tmp; - u8 port; - if (gpio_index >= ARRAY_SIZE(vlv_gpio_table)) { - drm_dbg_kms(&dev_priv->drm, "unknown gpio index %u\n", - gpio_index); - return; - } - - map = &vlv_gpio_table[gpio_index]; - - if (connector->panel.vbt.dsi.seq_version >= 3) { - /* XXX: this assumes vlv_gpio_table only has NC GPIOs. */ - port = IOSF_PORT_GPIO_NC; - } else { - if (gpio_source == 0) { - port = IOSF_PORT_GPIO_NC; - } else if (gpio_source == 1) { + /* XXX: this assumes vlv_gpio_table only has NC GPIOs. */ + if (connector->panel.vbt.dsi.seq_version < 3) { + if (gpio_source == 1) { drm_dbg_kms(&dev_priv->drm, "SC gpio not supported\n"); return; - } else { + } + if (gpio_source > 1) { drm_dbg_kms(&dev_priv->drm, "unknown gpio source %u\n", gpio_source); return; } } - pconf0 = VLV_GPIO_PCONF0(map->base_offset); - padval = VLV_GPIO_PAD_VAL(map->base_offset); - - vlv_iosf_sb_get(dev_priv, BIT(VLV_IOSF_SB_GPIO)); - if (!map->init) { - /* FIXME: remove constant below */ - vlv_iosf_sb_write(dev_priv, port, pconf0, 0x2000CC00); - map->init = true; - } - - tmp = 0x4 | value; - vlv_iosf_sb_write(dev_priv, port, padval, tmp); - vlv_iosf_sb_put(dev_priv, BIT(VLV_IOSF_SB_GPIO)); + soc_opaque_gpio_set_value(connector, "INT33FC:01", "Panel N", gpio_index, value); } static void chv_gpio_set_value(struct intel_connector *connector, From patchwork Fri Nov 3 20:18:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 161440 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:8f47:0:b0:403:3b70:6f57 with SMTP id j7csp1292109vqu; Fri, 3 Nov 2023 13:19:31 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFjrmX/9dZtmTX32qopFFStCxhY88KGH9QZPaBXESm26l6vQRmMx+hZhM0x/aiPgmReYHJJ X-Received: by 2002:a17:90a:dc81:b0:27d:b3d:5c33 with SMTP id j1-20020a17090adc8100b0027d0b3d5c33mr23340241pjv.28.1699042770834; Fri, 03 Nov 2023 13:19:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1699042770; cv=none; d=google.com; s=arc-20160816; b=n7SZOZPTatJmzPUsEzlJAVuYUM4SPfro5oEwWCi3mUSEVC9xbUaZAa0zHJwZ8Z/vmo z9+MiBeDTBdI4ZOJjzKgGma9EkEELobh6V4c2ycAaAvmb/Mpc/mqJP31mP8JnNccv+Ll HLmNqb0A8yiYHAqtvtvwrAAnybSwzPbUUMCV/9KqD+Im+SUnefAY7069aNramwB3XKcs +4GnE8mcFmeJv0HJAqN6dbP+FmRTzhFdzOia09jZhuJ9evrB3G1QBpBHIinQQy7gGC16 nt+83Hrkl42+pH4IJ0/4iedDesm7OUvc6gyi47lHfo13EWteh0TqqVXcrHnKebrJViUF cosw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=cvax+EJI+In5/ljQ2CMbHNUNfid0sT3sQN5kGgfAe6E=; fh=W9Apx1mxfI4Sn4Tfu/ApINr5FKslMaF8Hy7vCgvNWsQ=; b=jMsHw9jbSuZSsU5uwYJpRkp3iMl2TM99KUs1itgA0qfL+BcMtM0oGYHPRF1KOPUy8r P4uMX+oP5u/k+oTWwRq2SCA6Fng5ZMnb8lyhANNTtmPGjGQ2a0yBdSKPD6g+LtDNRrO8 mrPU0SP48SgORnJwKJv2z7T3RYhGAJgAcsCwMbTkmBQacvqEu4Dyefm8waHNeTK1/iSv oFE/C8GssICDcppUCVfKTBul9Uum+O2WvOsF2vmVMHvxFFRZog0EiumRDbd6LFnaL9fg SpUDGR8F4h8NUMbnhmRo/0Y0M39bAtWCH3tlE3jQKgmfqATXxZkCpQb3YfOUiDxh/Nb/ OTkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=fbLyXMXM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id kk14-20020a17090b4a0e00b00278eb61c0ebsi2466570pjb.118.2023.11.03.13.19.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Nov 2023 13:19:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=fbLyXMXM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 3C25D83650A2; Fri, 3 Nov 2023 13:19:28 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378293AbjKCUTV (ORCPT + 35 others); Fri, 3 Nov 2023 16:19:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36230 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378197AbjKCUSr (ORCPT ); Fri, 3 Nov 2023 16:18:47 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BA6A418B for ; Fri, 3 Nov 2023 13:18:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1699042724; x=1730578724; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=9fjZkSqZ2/vke86mtzG4YvB7Q8n7TXNivYgzodiXkaY=; b=fbLyXMXMx/nZePIhwjZv1Iw3kQeqtuPvgF5tS48d+BfCfE/bssyb0727 EiHNPdZjpmohbHQqHlBxiH1voMzMWAXfEshKcEIE7IYFukwcOf1W7JxZe 457RtcsWmPNfCrpoJaeQZHDv+w7Q2nvONiSfSsPYlq9X1jOo/Tn8g0spW /mYhq1pyNPFyy8K/ogZt/L5eHr/91JkmvyABfY4GrBYvdeTKQgdmF1Zz2 K/iaOSpuFoDZmboxLasOtCjirzURtmZKc8JtV7vBMTGVX+xvg4r9Xse6/ kQ1tf/IOkNAimbXETtshex5bbkZsTeBcKzI9o9By1Uz2MsUPs+xGnDbOU w==; X-IronPort-AV: E=McAfee;i="6600,9927,10883"; a="387904531" X-IronPort-AV: E=Sophos;i="6.03,275,1694761200"; d="scan'208";a="387904531" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Nov 2023 13:18:44 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10883"; a="885303688" X-IronPort-AV: E=Sophos;i="6.03,275,1694761200"; d="scan'208";a="885303688" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga004.jf.intel.com with ESMTP; 03 Nov 2023 13:18:41 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 3F1BF76F; Fri, 3 Nov 2023 22:18:34 +0200 (EET) From: Andy Shevchenko To: Jani Nikula , Andy Shevchenko , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , David Airlie , Daniel Vetter , Hans de Goede Subject: [PATCH v4 13/16] drm/i915/dsi: Prepare soc_gpio_set_value() to distinguish GPIO communities Date: Fri, 3 Nov 2023 22:18:28 +0200 Message-Id: <20231103201831.1037416-14-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20231103201831.1037416-1-andriy.shevchenko@linux.intel.com> References: <20231103201831.1037416-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Fri, 03 Nov 2023 13:19:28 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781575472423465649 X-GMAIL-MSGID: 1781575472423465649 Currently soc_gpio_set_value() supports only a single indexing for GPIO pin. For CHV case, for example, we will need to distinguish community based index from the one that VBT is using. Introduce an additional parameter to soc_gpio_set_value() and its callers. Signed-off-by: Andy Shevchenko Acked-by: Jani Nikula --- drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c index 552bc6564d79..b1736c1301ea 100644 --- a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c +++ b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c @@ -206,8 +206,8 @@ static const u8 *mipi_exec_delay(struct intel_dsi *intel_dsi, const u8 *data) return data; } -static void soc_gpio_set_value(struct intel_connector *connector, const char *con_id, - u8 gpio_index, bool value) +static void soc_gpio_set_value(struct intel_connector *connector, u8 gpio_index, + const char *con_id, u8 idx, bool value) { struct drm_i915_private *dev_priv = to_i915(connector->base.dev); /* XXX: this table is a quick ugly hack. */ @@ -217,8 +217,7 @@ static void soc_gpio_set_value(struct intel_connector *connector, const char *co if (gpio_desc) { gpiod_set_value(gpio_desc, value); } else { - gpio_desc = devm_gpiod_get_index(dev_priv->drm.dev, - con_id, gpio_index, + gpio_desc = devm_gpiod_get_index(dev_priv->drm.dev, con_id, idx, value ? GPIOD_OUT_HIGH : GPIOD_OUT_LOW); if (IS_ERR(gpio_desc)) { drm_err(&dev_priv->drm, @@ -232,8 +231,8 @@ static void soc_gpio_set_value(struct intel_connector *connector, const char *co } static void soc_opaque_gpio_set_value(struct intel_connector *connector, - const char *chip, const char *con_id, - u8 gpio_index, bool value) + u8 gpio_index, const char *chip, + const char *con_id, u8 idx, bool value) { struct gpiod_lookup_table *lookup; @@ -243,11 +242,11 @@ static void soc_opaque_gpio_set_value(struct intel_connector *connector, lookup->dev_id = "0000:00:02.0"; lookup->table[0] = - GPIO_LOOKUP_IDX(chip, gpio_index, con_id, gpio_index, GPIO_ACTIVE_HIGH); + GPIO_LOOKUP_IDX(chip, idx, con_id, idx, GPIO_ACTIVE_HIGH); gpiod_add_lookup_table(lookup); - soc_gpio_set_value(connector, con_id, gpio_index, value); + soc_gpio_set_value(connector, gpio_index, con_id, idx, value); gpiod_remove_lookup_table(lookup); kfree(lookup); @@ -271,7 +270,8 @@ static void vlv_gpio_set_value(struct intel_connector *connector, } } - soc_opaque_gpio_set_value(connector, "INT33FC:01", "Panel N", gpio_index, value); + soc_opaque_gpio_set_value(connector, gpio_index, + "INT33FC:01", "Panel N", gpio_index, value); } static void chv_gpio_set_value(struct intel_connector *connector, @@ -331,7 +331,7 @@ static void chv_gpio_set_value(struct intel_connector *connector, static void bxt_gpio_set_value(struct intel_connector *connector, u8 gpio_index, bool value) { - soc_gpio_set_value(connector, NULL, gpio_index, value); + soc_gpio_set_value(connector, gpio_index, NULL, gpio_index, value); } enum { From patchwork Fri Nov 3 20:18:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 161433 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:8f47:0:b0:403:3b70:6f57 with SMTP id j7csp1292000vqu; Fri, 3 Nov 2023 13:19:18 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHBca8CrjPG4EFdbhRCldzeaGygmh5iBlktwwc2qb9JMpYOXq6JnsOpzIFsj8/R79xcSzM8 X-Received: by 2002:a05:6358:3403:b0:16b:2f05:7fb8 with SMTP id h3-20020a056358340300b0016b2f057fb8mr5531203rwd.2.1699042758400; Fri, 03 Nov 2023 13:19:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1699042758; cv=none; d=google.com; s=arc-20160816; b=BDFS9zEGFD35i4RBzopCo2D8lisNa2ZkinGBj5o9SsgApczUrkO8eGo8q7XCp5xy+8 ArFXgHvfZUrozBPuQP7TBHAFWdNupnHJNsgNFdYyao1ubgBecUY8nFbKR6im4FGv2au3 G4FA1mKKKFDghSFl13JAcEZYLZ3jlDZr4JIjxn7YDMZFCdXhCQrBAXKrh2S7WdVnzYAP 1e0+jp5FoCjkv9U0v4wUV003m3TfapWlxRlFFzZOyoXJZAiaV9+9ATJVEQuipdimfkxA d0fxR3kYrZgo3Kwa+C5ALFmtq8OYRcbgQQyXSdHdS7V+DnsCfoJgePVRgnyRCxDVQQjW 2v8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=bN0J4na9Xjip/Rv4fASN+SkVjD3h94vTBGYsHn2F8r4=; fh=W9Apx1mxfI4Sn4Tfu/ApINr5FKslMaF8Hy7vCgvNWsQ=; b=Dnza8hPllG+aZz3RQjT9a2ca66VeknC+Heh9z3EeMEGdYWm+l7T3My51XQHvPsSf+F hebxbn1T1ZkFsawl07zfKLowrO99HA5QwdkkSf5k9SWLxd2da3o3nBaSa15AaKdjU8SP TU/FykMBuYtC5B64QKxo7f62cQsiz6r2RoRhAXaBgpK+J/Z890Xe0Juy6Br0pLaXVL+u BI1O3TLSiYR0P5NEDhskpGC9UWF3Mfp1Q2pzW1LjI4ANawfgX5PyiJCZ6Yr/6M/8OITU 1wNr790hLDNoOTXZWZq8kfx+T1cuzGrsqhw2iioMSF287pzeVHFYyG7WcnXIh4TongRy ZGmQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=VhNbGhh1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id z75-20020a63334e000000b005b8f21752f6si2143384pgz.769.2023.11.03.13.19.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Nov 2023 13:19:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=VhNbGhh1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 94319802C5B6; Fri, 3 Nov 2023 13:19:17 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378257AbjKCUTO (ORCPT + 35 others); Fri, 3 Nov 2023 16:19:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36256 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378196AbjKCUSr (ORCPT ); Fri, 3 Nov 2023 16:18:47 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 23676D64 for ; Fri, 3 Nov 2023 13:18:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1699042725; x=1730578725; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=wio0Ljz3vnMVkrbBi8hEIJGUjrApv/HrgcBHuJYxdAs=; b=VhNbGhh1y58tzhfwQpt3a57foJ6h+6yGSsSbP37XZs6IBfQRnbOJR2Kk f7IOrhwR9VJb/2MiA9fb2zqNUIH58bVYynhKTJ3ztlZeGpUx4nr1bnHzz hJ67Lc9PiLRtwxlkzcXhIxAgMoTcC91nPLfmr6jAf7y6kjrHMYXOFOdtf z8d2yA7aWVHUWU8b8PXXERY2O5Q82+WQ4xqKKmBUSJ9EOMZD083PXiuAa tBYFbBPjF92ZkSCNgV39vwQAWnsJDtNnW24cA0FWrKjzVlgMOEyNg+22Q o2MzR7jJFBaUC3vs4jH2D0pXXJvQ7fi96EnmKFfMF3EuC+FaIISw5diEO Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10883"; a="1896105" X-IronPort-AV: E=Sophos;i="6.03,275,1694761200"; d="scan'208";a="1896105" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Nov 2023 13:18:44 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10883"; a="832131193" X-IronPort-AV: E=Sophos;i="6.03,275,1694761200"; d="scan'208";a="832131193" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga004.fm.intel.com with ESMTP; 03 Nov 2023 13:18:40 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 49A3C79F; Fri, 3 Nov 2023 22:18:34 +0200 (EET) From: Andy Shevchenko To: Jani Nikula , Andy Shevchenko , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , David Airlie , Daniel Vetter , Hans de Goede Subject: [PATCH v4 14/16] drm/i915/dsi: Replace poking of CHV GPIOs behind the driver's back Date: Fri, 3 Nov 2023 22:18:29 +0200 Message-Id: <20231103201831.1037416-15-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20231103201831.1037416-1-andriy.shevchenko@linux.intel.com> References: <20231103201831.1037416-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Fri, 03 Nov 2023 13:19:17 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781575459285863806 X-GMAIL-MSGID: 1781575459285863806 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. Signed-off-by: Andy Shevchenko Acked-by: Jani Nikula --- drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 47 +++++--------------- 1 file changed, 10 insertions(+), 37 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c index b1736c1301ea..9c6946ccb193 100644 --- a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c +++ b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c @@ -66,19 +66,6 @@ struct i2c_adapter_lookup { #define CHV_GPIO_IDX_START_SW 100 #define CHV_GPIO_IDX_START_SE 198 -#define CHV_VBT_MAX_PINS_PER_FMLY 15 - -#define CHV_GPIO_PAD_CFG0(f, i) (0x4400 + (f) * 0x400 + (i) * 8) -#define CHV_GPIO_GPIOEN (1 << 15) -#define CHV_GPIO_GPIOCFG_GPIO (0 << 8) -#define CHV_GPIO_GPIOCFG_GPO (1 << 8) -#define CHV_GPIO_GPIOCFG_GPI (2 << 8) -#define CHV_GPIO_GPIOCFG_HIZ (3 << 8) -#define CHV_GPIO_GPIOTXSTATE(state) ((!!(state)) << 1) - -#define CHV_GPIO_PAD_CFG1(f, i) (0x4400 + (f) * 0x400 + (i) * 8 + 4) -#define CHV_GPIO_CFGLOCK (1 << 31) - /* ICL DSI Display GPIO Pins */ #define ICL_GPIO_DDSP_HPD_A 0 #define ICL_GPIO_L_VDDEN_1 1 @@ -278,23 +265,21 @@ static void chv_gpio_set_value(struct intel_connector *connector, u8 gpio_source, u8 gpio_index, bool value) { struct drm_i915_private *dev_priv = to_i915(connector->base.dev); - u16 cfg0, cfg1; - u16 family_num; - u8 port; if (connector->panel.vbt.dsi.seq_version >= 3) { if (gpio_index >= CHV_GPIO_IDX_START_SE) { /* XXX: it's unclear whether 255->57 is part of SE. */ - gpio_index -= CHV_GPIO_IDX_START_SE; - port = CHV_IOSF_PORT_GPIO_SE; + soc_opaque_gpio_set_value(connector, gpio_index, "INT33FF:03", "Panel SE", + gpio_index - CHV_GPIO_IDX_START_SE, value); } else if (gpio_index >= CHV_GPIO_IDX_START_SW) { - gpio_index -= CHV_GPIO_IDX_START_SW; - port = CHV_IOSF_PORT_GPIO_SW; + soc_opaque_gpio_set_value(connector, gpio_index, "INT33FF:00", "Panel SW", + gpio_index - CHV_GPIO_IDX_START_SW, value); } else if (gpio_index >= CHV_GPIO_IDX_START_E) { - gpio_index -= CHV_GPIO_IDX_START_E; - port = CHV_IOSF_PORT_GPIO_E; + soc_opaque_gpio_set_value(connector, gpio_index, "INT33FF:02", "Panel E", + gpio_index - CHV_GPIO_IDX_START_E, value); } else { - port = CHV_IOSF_PORT_GPIO_N; + soc_opaque_gpio_set_value(connector, gpio_index, "INT33FF:01", "Panel N", + gpio_index - CHV_GPIO_IDX_START_N, value); } } else { /* XXX: The spec is unclear about CHV GPIO on seq v2 */ @@ -311,21 +296,9 @@ static void chv_gpio_set_value(struct intel_connector *connector, return; } - port = CHV_IOSF_PORT_GPIO_N; + soc_opaque_gpio_set_value(connector, gpio_index, "INT33FF:01", "Panel N", + gpio_index - CHV_GPIO_IDX_START_N, value); } - - family_num = gpio_index / CHV_VBT_MAX_PINS_PER_FMLY; - gpio_index = gpio_index % CHV_VBT_MAX_PINS_PER_FMLY; - - cfg0 = CHV_GPIO_PAD_CFG0(family_num, gpio_index); - cfg1 = CHV_GPIO_PAD_CFG1(family_num, gpio_index); - - vlv_iosf_sb_get(dev_priv, BIT(VLV_IOSF_SB_GPIO)); - vlv_iosf_sb_write(dev_priv, port, cfg1, 0); - vlv_iosf_sb_write(dev_priv, port, cfg0, - CHV_GPIO_GPIOEN | CHV_GPIO_GPIOCFG_GPO | - CHV_GPIO_GPIOTXSTATE(value)); - vlv_iosf_sb_put(dev_priv, BIT(VLV_IOSF_SB_GPIO)); } static void bxt_gpio_set_value(struct intel_connector *connector, From patchwork Fri Nov 3 20:18:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 161437 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:8f47:0:b0:403:3b70:6f57 with SMTP id j7csp1292079vqu; Fri, 3 Nov 2023 13:19:28 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFSiW23hFQtlLvRiNAPGl7cTIaH5wHvavoY+x4ijbheXrCi9k2O3Wq7FUxnmjZWqzSMRuLI X-Received: by 2002:a17:90b:93:b0:280:cd15:9684 with SMTP id bb19-20020a17090b009300b00280cd159684mr8063321pjb.37.1699042767975; Fri, 03 Nov 2023 13:19:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1699042767; cv=none; d=google.com; s=arc-20160816; b=Zr//O8vMHrroT6sJFY1rqxhnJ7HnPwnKKTpVEtnQHHDJaizm7HdWvoJZ4J4TKKZ4Pj 6iflbeiPJWsjL2AGtuTBSh8YoHriCr4XpCUdwNAJfxRF57ct5pqVAIQYRiQdZEvBDgVH Q12uEOIMuD1sWvEa8M4VIeyHTLhnU1aAdExGib6DvRdml62q7CSeNM8+RQ9H/6diSLAC FXE6zuWlaIlaal8nj7qo3CjRwgPd36r9y/+Iqyu4GnKVoeoxhH2OXBCBFCSJvjvAq07g uKdGcR25YVoJJOn3/6Klfunq1RrOETa4Ou6eVsZ4LqnFOCrzOTZ81OqTksC3O4SflyXf 8BNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=CLk39Ki0dtq35R+C3AyAZyf8Sjdak9KW1h3lNJWl8Jg=; fh=gat4PPjsqGDgR7wVbwxJiw6rlFYVQl+YSSCi7wUGvtY=; b=V66RxUCfPGv7xNXgamhZFfY0zC6Tg+2k+PqyL1zCVHXEPzMuBFJzwYQY+SlHSRGmna qHNm862p1+UkzwH74hqCZgJlcHgmtS3OqFZn6uIOgvryMgjhFOvo/xsp6x/CtrYvxAMN cNGktbLh7/G3g9yGXx41NcwXyMCgk+yJOqgqjXp65soZRiZ2pmoNM54D0c+FV987x77S wZj2qJ7POG05J3J6yY+kYIiY1qJSH++G2BlmmV9JSIWLi5/qqq2dwUAw/BMS4UQeRJFp zZY2IY5GW/NOt8PzHUGYPuINNFb5xCu/BQyPvCClWSDKUCrfad5dESQ9m93poW+yUZcy 9XKg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Nw1PKTsU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id s11-20020a17090a948b00b00280a4766ed4si2305391pjo.135.2023.11.03.13.19.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Nov 2023 13:19:27 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Nw1PKTsU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 1D3F3812F46E; Fri, 3 Nov 2023 13:19:27 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378243AbjKCUTY (ORCPT + 35 others); Fri, 3 Nov 2023 16:19:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36306 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378216AbjKCUSw (ORCPT ); Fri, 3 Nov 2023 16:18:52 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 74826D68 for ; Fri, 3 Nov 2023 13:18:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1699042727; x=1730578727; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=4OY3kIG/Mh3qAhC+/tcUQlmLJd+LmlJUxhST6rmeiio=; b=Nw1PKTsUX6jPk3MnYoWEZ0IfYqfqBsPJvgm2tY1Lz0fy7FyVI/5BYn+r apyZ5YV2OBfpwiPAyJMsLDaKqh3xKvMrKIuLSMEwJaWr6hcLlWczBD9e2 lnU0mvpeQLubSig7Qa+sbnnNOSDyApeodaUel55dIkAWQBYbCUdwwzwtQ FxAkdDAQokGNrc1k7ce9gMpVhSJ/u8/+7wLGr6kBXTCtykoorWPVOsevi 34PfQO3SyKXFeH+KVaebYRJiZBnEjh+hVTQJaWl3cTw2TIpR/YfZohlnG MibIIPXsoluTQaQzqEwTKqRPwqAVTmfRleF1F60c3xWlj5yQblnYw/ASJ w==; X-IronPort-AV: E=McAfee;i="6600,9927,10883"; a="1896127" X-IronPort-AV: E=Sophos;i="6.03,275,1694761200"; d="scan'208";a="1896127" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Nov 2023 13:18:46 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10883"; a="832131210" X-IronPort-AV: E=Sophos;i="6.03,275,1694761200"; d="scan'208";a="832131210" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga004.fm.intel.com with ESMTP; 03 Nov 2023 13:18:43 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 51F587C4; Fri, 3 Nov 2023 22:18:34 +0200 (EET) From: Andy Shevchenko To: Jani Nikula , Andy Shevchenko , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , David Airlie , Daniel Vetter , Hans de Goede , =?utf-8?b?VmlsbGUgU3lyasOkbMOk?= Subject: [PATCH v4 15/16] drm/i915/dsi: Combine checks in mipi_exec_gpio() Date: Fri, 3 Nov 2023 22:18:30 +0200 Message-Id: <20231103201831.1037416-16-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20231103201831.1037416-1-andriy.shevchenko@linux.intel.com> References: <20231103201831.1037416-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Fri, 03 Nov 2023 13:19:27 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781575469872223864 X-GMAIL-MSGID: 1781575469872223864 For a couple of cases the branches call the same bxt_gpio_set_value(). As Ville suggested they can be combined by dropping the DISPLAY_VER() check from Gen 11 to Gen 9. Do it that way. Suggested-by: Ville Syrjälä Signed-off-by: Andy Shevchenko --- drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c index 9c6946ccb193..275d0218394c 100644 --- a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c +++ b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c @@ -420,14 +420,12 @@ static const u8 *mipi_exec_gpio(struct intel_dsi *intel_dsi, const u8 *data) if (native) icl_native_gpio_set_value(i915, gpio_number, value); - else if (DISPLAY_VER(i915) >= 11) + else if (DISPLAY_VER(i915) >= 9) bxt_gpio_set_value(connector, gpio_index, value); else if (IS_VALLEYVIEW(i915)) vlv_gpio_set_value(connector, gpio_source, gpio_number, value); else if (IS_CHERRYVIEW(i915)) chv_gpio_set_value(connector, gpio_source, gpio_number, value); - else - bxt_gpio_set_value(connector, gpio_index, value); return data + size; } From patchwork Fri Nov 3 20:18:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 161439 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:8f47:0:b0:403:3b70:6f57 with SMTP id j7csp1292090vqu; Fri, 3 Nov 2023 13:19:29 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGdqS3ZzQnmLde6vWOJfukopRiqf5iXKdDqOl3RXJAEzMqoKhQefbjFaBTXE9iXDigX2FYS X-Received: by 2002:a05:6a20:8e12:b0:181:a784:67df with SMTP id y18-20020a056a208e1200b00181a78467dfmr4712572pzj.20.1699042769185; Fri, 03 Nov 2023 13:19:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1699042769; cv=none; d=google.com; s=arc-20160816; b=QPgxsFj6Lo2vutp0zCE0VSRHZHJgjB/T//2/zRAgBb20h09fXkTzquDnE/H2Vdn4JS /2Tn6yiVS4DFCdaWdl/cR9Pu8tWGI3OXSP/DGmd97FQ3Xuo74CIKrxemAwRY9LmDt8Pf RTLzSqoCksNYxbinpOz/JWVPKgzrCYnhAq1G72fcXH3NiV0alLwvt1hxsCcvhx81qp5q uM2ZH8xCGiU3FgbhOCDpohIZMI2trQyB8qXtGCAg5FUDtzCPBjAEfeO1XeC5Tw0SVr/P ItyqIR1UEPLA4unyAPn61kjod1BdURZrP67900OUgJ4WwtaaumVEYSAIJb3tb9gG4pbJ 9nkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=hlVvrQPeU3hMv0ql9f7nZvZqM7vzmtgsrUq7YO+CPTc=; fh=W9Apx1mxfI4Sn4Tfu/ApINr5FKslMaF8Hy7vCgvNWsQ=; b=hBGzqeL4DZVe3b8vbjMhZIt9qGoeuTkxuaAg7syZ4KB/tpbJuHl65aGnKXa1dxFTHp G56HSqROedn6HQzE9g4dPBUdjI5Au3AyJr5KJR8xRJ5iMnMmUwlyS1zfolydHBDxDASG GYkPzY3kzH7aG3JgtfbFDTSsl5LayXk1eeVCfgicM6HzHuD5EoJsGOwg5gd1CtKuRcd0 HnFRiy5JPxDtI/upl9kmqinbiqMKkk5YGvofJ/+wNh9GddQ3iL0bjsrixqA/POAaI8NL tXdJOEBNRhFR1CcMnq7nl9cJM4kmeceCB7GpEHcHEl4/HcgtJDXaJAOL52YDakcG9RIL 75jA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=gBkAMgYv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id z130-20020a633388000000b005898e10f9b9si2115639pgz.213.2023.11.03.13.19.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Nov 2023 13:19:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=gBkAMgYv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 24995812F472; Fri, 3 Nov 2023 13:19:28 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378305AbjKCUT1 (ORCPT + 35 others); Fri, 3 Nov 2023 16:19:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36276 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378213AbjKCUSw (ORCPT ); Fri, 3 Nov 2023 16:18:52 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CD911D66 for ; Fri, 3 Nov 2023 13:18:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1699042726; x=1730578726; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=G27iSclFFumr76St5V1sfxdQObjKJmsJSwaDZg/d3AM=; b=gBkAMgYvbdO6u8qrzGTMhFoqMXlAtTKIRGLARbClRvWBAxln/ReKRZ+K QIQwhDYcfJwh0SUV9Fa0HILWXHz0hpQuaU9uFoxM5rtZve0W0iMadQ/wd 2oTvIhO7Np7HhXqLLbQx5Q1jKoSEbBhMBEjwh6yMRfqbVqI0qp+Rqa5He hB34wnlYgPJSKvJZ0ixsWA0OgG7GG03dpeJ7Uudc+HpM/hDAL6hr8TQC2 n9Ll0d/QSx/bm5wqEHn6H1Gbc6EZYxbj5nWmiSWMg2AZx8hYoIChebrHS poseMqOYdDt/MJOj6rrmniXzp7qXmbjJksiiqKtYaqISN3kLoU8VFxABA Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10883"; a="1896122" X-IronPort-AV: E=Sophos;i="6.03,275,1694761200"; d="scan'208";a="1896122" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Nov 2023 13:18:46 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10883"; a="832131206" X-IronPort-AV: E=Sophos;i="6.03,275,1694761200"; d="scan'208";a="832131206" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga004.fm.intel.com with ESMTP; 03 Nov 2023 13:18:43 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 607D97E7; Fri, 3 Nov 2023 22:18:34 +0200 (EET) From: Andy Shevchenko To: Jani Nikula , Andy Shevchenko , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , David Airlie , Daniel Vetter , Hans de Goede Subject: [PATCH v4 16/16] drm/i915/iosf: Drop unused APIs Date: Fri, 3 Nov 2023 22:18:31 +0200 Message-Id: <20231103201831.1037416-17-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20231103201831.1037416-1-andriy.shevchenko@linux.intel.com> References: <20231103201831.1037416-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Fri, 03 Nov 2023 13:19:28 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781575470617999752 X-GMAIL-MSGID: 1781575470617999752 Drop unused vlv_iosf_sb_read() and vlv_iosf_sb_write(). Signed-off-by: Andy Shevchenko Acked-by: Jani Nikula --- drivers/gpu/drm/i915/vlv_sideband.c | 17 ----------------- drivers/gpu/drm/i915/vlv_sideband.h | 3 --- 2 files changed, 20 deletions(-) diff --git a/drivers/gpu/drm/i915/vlv_sideband.c b/drivers/gpu/drm/i915/vlv_sideband.c index b98dec3ad817..13b644958e38 100644 --- a/drivers/gpu/drm/i915/vlv_sideband.c +++ b/drivers/gpu/drm/i915/vlv_sideband.c @@ -166,23 +166,6 @@ u32 vlv_nc_read(struct drm_i915_private *i915, u8 addr) return val; } -u32 vlv_iosf_sb_read(struct drm_i915_private *i915, u8 port, u32 reg) -{ - u32 val = 0; - - vlv_sideband_rw(i915, PCI_DEVFN(0, 0), port, - SB_CRRDDA_NP, reg, &val); - - return val; -} - -void vlv_iosf_sb_write(struct drm_i915_private *i915, - u8 port, u32 reg, u32 val) -{ - vlv_sideband_rw(i915, PCI_DEVFN(0, 0), port, - SB_CRWRDA_NP, reg, &val); -} - u32 vlv_cck_read(struct drm_i915_private *i915, u32 reg) { u32 val = 0; diff --git a/drivers/gpu/drm/i915/vlv_sideband.h b/drivers/gpu/drm/i915/vlv_sideband.h index 9ce283d96b80..8b4495e14bce 100644 --- a/drivers/gpu/drm/i915/vlv_sideband.h +++ b/drivers/gpu/drm/i915/vlv_sideband.h @@ -26,9 +26,6 @@ enum { }; void vlv_iosf_sb_get(struct drm_i915_private *i915, unsigned long ports); -u32 vlv_iosf_sb_read(struct drm_i915_private *i915, u8 port, u32 reg); -void vlv_iosf_sb_write(struct drm_i915_private *i915, - u8 port, u32 reg, u32 val); void vlv_iosf_sb_put(struct drm_i915_private *i915, unsigned long ports); static inline void vlv_bunit_get(struct drm_i915_private *i915)