From patchwork Thu Nov 2 15:12:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 160925 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:8f47:0:b0:403:3b70:6f57 with SMTP id j7csp423764vqu; Thu, 2 Nov 2023 08:13:25 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHyiYc9qPyNUv3vJ/WAxzTuzJUiUCGTf62/Bs4Qxw9/Y2wpFCXWx5LSmyGW9mpbZFkefmD0 X-Received: by 2002:a17:903:1c5:b0:1cc:66d5:493e with SMTP id e5-20020a17090301c500b001cc66d5493emr10778623plh.8.1698938005270; Thu, 02 Nov 2023 08:13:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698938005; cv=none; d=google.com; s=arc-20160816; b=iUKP+2IGFSUJmhPeFn+E/olZGfRl28CI13+GHAT2NKu58cE4f9fjqoqgjVzC0yw+eU NViNqEKAZLz9GCSY0rxMocm9KnnX6gV43vCraOAsbVi4zq4/Xij3FDIWaRzQYeHyQESW Xhb6R2QKne0lqOS6Nr6GxAKZw5TPBDV3xBySJ7xQ8KM43FKppIcdLdWeM0QdKlMnMYwx itNdgmvd2y9YGnu8dXHjRFQN3NtirMx0m9imWdtwSlwI0/4RHundHzV4HLJ5RdiSHH00 8jixC25xOCQ4mduwPoegQyPTsj2N06HMXEjRuyJ5HEMKLetiLEWSTGr8GKOY8DN4/6os YOjQ== 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=e+Y5Q56POeaZjRwuzVvB/OLzUcblcilMISZHa8XnpsP9AO64tM5WEhH5mkbGoIX4GA R8UxGDmVz4BrCiSzWFSahsfFuZnQ8repccSmlCherlN1IHbICk+QUk5hmlqc3dwWLkqV s0W/5h/piYdzo8SyvXXy9nKZRGwERCSPjiKIQMsaxSO2AOyMrBgjoOmN8DfExVdeax// j3oVN8K+8emhv8WiFuy8STBPNLUw4VHV6zRGFZMVby1sioBy2PyMxoab39ouiNM+Tahg wlfijen0fqRrz5fLAcrLLHRJtkLDuo/C8bq+t1dKgPDm58vNSzp1D+caNYBZXmbSYD8N bYLg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="WyHajwk/"; 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 t10-20020a1709027fca00b001c5c370d4d3si17143plb.534.2023.11.02.08.13.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Nov 2023 08:13:25 -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="WyHajwk/"; 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 EA91C823CEAD; Thu, 2 Nov 2023 08:13: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 S1376746AbjKBPNO (ORCPT + 35 others); Thu, 2 Nov 2023 11:13:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42584 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235617AbjKBPMv (ORCPT ); Thu, 2 Nov 2023 11:12:51 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 982A6D69 for ; Thu, 2 Nov 2023 08:12: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=1698937961; x=1730473961; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=aU19ThGhUQIWXfbukrzCcpY3j2hr2UFUIRy/UhZ9hVU=; b=WyHajwk/BCA2JaP5MPJ3QRYanoTAuvWT9fp0lNQgRrFqkYXkqbJ3nMHV NfKVcPEBFYFkGUDFKh98Oazo11Q1t908vCik2cokw38QrqHvjAXuI26aM BFLyYYzoYqqI1NcNUKSUVdY0zmkYAqa+6XTP3CX9UeuT0b+Pk9Pv/HNpn mbVT4niQB2jM2ITrpWrsUVCN0DRdTXNGiJcsF62u0jAAdvG2epHSdXZ8B NdODVrlBGuHcqriIBxLcrki4nsc022sLXjkqiPdAa8tvzV2v1puWsCwoM jwzNA2pg6/3mU+p7eg/alSoALO8I3ktCXs4ZUmeWMrJTKRi0NgnKzf4VX g==; X-IronPort-AV: E=McAfee;i="6600,9927,10882"; a="373773436" X-IronPort-AV: E=Sophos;i="6.03,271,1694761200"; d="scan'208";a="373773436" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Nov 2023 08:12:35 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10882"; a="711173932" X-IronPort-AV: E=Sophos;i="6.03,271,1694761200"; d="scan'208";a="711173932" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga003.jf.intel.com with ESMTP; 02 Nov 2023 08:12:32 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 9CBCF5E2; Thu, 2 Nov 2023 17:12:30 +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 v3 02/15] drm/i915/dsi: switch mipi_exec_gpio() from dev_priv to i915 Date: Thu, 2 Nov 2023 17:12:15 +0200 Message-Id: <20231102151228.668842-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20231102151228.668842-1-andriy.shevchenko@linux.intel.com> References: <20231102151228.668842-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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]); Thu, 02 Nov 2023 08:13:22 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781465617905084556 X-GMAIL-MSGID: 1781465617905084556 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);