From patchwork Thu Oct 3 11:33:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ville Syrjala X-Patchwork-Id: 13820945 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 70AD4CF34A2 for ; Thu, 3 Oct 2024 11:33:28 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0BB3E10E820; Thu, 3 Oct 2024 11:33:28 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="V4q0ZjYF"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.10]) by gabe.freedesktop.org (Postfix) with ESMTPS id 37AC110E820; Thu, 3 Oct 2024 11:33:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1727955206; x=1759491206; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=VVMqQcBdcou5qUEVhJvQfq/RY710EKN0rEC7SgU3fEs=; b=V4q0ZjYF7Hgd99ZvlpDOH0SjfLTUsnHt2ZcpgZeJZE2+yq8LvjxsGZWo uxY+r243wr76uQTSuKphvefiu6Lhvi1biNaKbc8ftZxZ02Sde0SZwVR+0 giStBi5NqHOfCCUdOKjuhxpTsSfUuDMwRsi3j5BfPYNIBHIjC1dewHnHF AWN1hQnvayfC8yO4pcZaGWfNL41UNqBNqnRJ5KJFnhmre7mNjTUnqabH3 9jpJrwe0gSfaMz0kDnlNkQx0cT+e/1NjNs6FEQINh+hZwTWQUupGQokBw umKIYUdSdVNwuQx/BWnEyfqR46tSpkMbD2SDhD20pGK+jYGPkpNcMseOD A==; X-CSE-ConnectionGUID: sPnx60oaToasSih9Hb84NA== X-CSE-MsgGUID: OxOMEJr1T0Sk1AcWszsmtg== X-IronPort-AV: E=McAfee;i="6700,10204,11214"; a="38503011" X-IronPort-AV: E=Sophos;i="6.11,174,1725346800"; d="scan'208";a="38503011" Received: from fmviesa008.fm.intel.com ([10.60.135.148]) by fmvoesa104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Oct 2024 04:33:26 -0700 X-CSE-ConnectionGUID: QezMuPH3Th2JXqQXnJH8Zw== X-CSE-MsgGUID: HcT+6jStSYy4FwjamWFGPg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.11,174,1725346800"; d="scan'208";a="74426551" Received: from stinkpipe.fi.intel.com (HELO stinkbox) ([10.237.72.74]) by fmviesa008.fm.intel.com with SMTP; 03 Oct 2024 04:33:24 -0700 Received: by stinkbox (sSMTP sendmail emulation); Thu, 03 Oct 2024 14:33:23 +0300 From: Ville Syrjala To: dri-devel@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org Subject: [PATCH 6/8] drm/client: s/new_crtc/crtc/ Date: Thu, 3 Oct 2024 14:33:02 +0300 Message-ID: <20241003113304.11700-7-ville.syrjala@linux.intel.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241003113304.11700-1-ville.syrjala@linux.intel.com> References: <20241003113304.11700-1-ville.syrjala@linux.intel.com> MIME-Version: 1.0 X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" From: Ville Syrjälä Rename the 'new_crtc' variable to just 'crtc' in drm_client_firmware_config(). We don't call any of the other stuff in here new or old so this feels out of place. Signed-off-by: Ville Syrjälä --- drivers/gpu/drm/drm_client_modeset.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/drm_client_modeset.c b/drivers/gpu/drm/drm_client_modeset.c index 3e49448370c4..b82bb3119cb2 100644 --- a/drivers/gpu/drm/drm_client_modeset.c +++ b/drivers/gpu/drm/drm_client_modeset.c @@ -638,7 +638,7 @@ static bool drm_client_firmware_config(struct drm_client_dev *client, for (i = 0; i < count; i++) { struct drm_connector *connector; struct drm_encoder *encoder; - struct drm_crtc *new_crtc; + struct drm_crtc *crtc; const char *mode_type; connector = connectors[i]; @@ -680,7 +680,7 @@ static bool drm_client_firmware_config(struct drm_client_dev *client, num_connectors_enabled++; - new_crtc = connector->state->crtc; + crtc = connector->state->crtc; /* * Make sure we're not trying to drive multiple connectors @@ -688,7 +688,7 @@ static bool drm_client_firmware_config(struct drm_client_dev *client, * match the BIOS. */ for (j = 0; j < count; j++) { - if (crtcs[j] == new_crtc) { + if (crtcs[j] == crtc) { drm_dbg_kms(dev, "[CONNECTOR:%d:%s] fallback: cloned configuration\n", connector->base.id, connector->name); goto bail; @@ -711,7 +711,7 @@ static bool drm_client_firmware_config(struct drm_client_dev *client, /* last resort: use current mode */ if (!mode_valid(&modes[i])) { mode_type = "current"; - drm_mode_copy(&modes[i], &new_crtc->state->mode); + drm_mode_copy(&modes[i], &crtc->state->mode); } /* @@ -723,11 +723,11 @@ static bool drm_client_firmware_config(struct drm_client_dev *client, mode_type = "non tiled"; drm_mode_copy(&modes[i], drm_connector_fallback_non_tiled_mode(connector)); } - crtcs[i] = new_crtc; + crtcs[i] = crtc; drm_dbg_kms(dev, "[CONNECTOR::%d:%s] on [CRTC:%d:%s] using %s mode: %s\n", connector->base.id, connector->name, - new_crtc->base.id, new_crtc->name, + crtc->base.id, crtc->name, mode_type, modes[i].name); fallback = false;