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);