From patchwork Fri Mar 26 13:21:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 12166631 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0CE27C433C1 for ; Fri, 26 Mar 2021 13:22:29 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id B7BAD61A26 for ; Fri, 26 Mar 2021 13:22:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B7BAD61A26 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4E8836F3C2; Fri, 26 Mar 2021 13:22:28 +0000 (UTC) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 671A76F3C2 for ; Fri, 26 Mar 2021 13:22:26 +0000 (UTC) IronPort-SDR: dYrMXGYxGCTM0hK5oS8q0jfbeQdUb9NixPIVvYOogAOAldaYia0N1Fnx8ulnqy/zcK0O/ssGLo VLzpxdveaQZg== X-IronPort-AV: E=McAfee;i="6000,8403,9934"; a="178263376" X-IronPort-AV: E=Sophos;i="5.81,280,1610438400"; d="scan'208";a="178263376" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Mar 2021 06:22:25 -0700 IronPort-SDR: D2QzZhOcFbLLEvd/VLmU8pP1aF4EMBND6USrWemyhD+Fo5FBQFDL7H1vIWh2dA4Oqvks1Fv7NL 16jZKUmImYxQ== X-IronPort-AV: E=Sophos;i="5.81,280,1610438400"; d="scan'208";a="392209642" Received: from mpaulits-mobl1.ger.corp.intel.com (HELO localhost) ([10.252.55.191]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Mar 2021 06:22:20 -0700 From: Jani Nikula To: intel-gfx@lists.freedesktop.org Date: Fri, 26 Mar 2021 15:21:38 +0200 Message-Id: X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH v4 7/7] drm/i915: rename i915_rev_steppings->intel_step_info 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: , Cc: jani.nikula@intel.com Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Matter of taste. Match the prefix for everything else related to steppings. No functional changes. Reviewed-by: José Roberto de Souza Signed-off-by: Jani Nikula --- drivers/gpu/drm/i915/intel_device_info.h | 2 +- drivers/gpu/drm/i915/intel_step.c | 12 ++++++------ drivers/gpu/drm/i915/intel_step.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h index e410635cb4ea..2f442d418a15 100644 --- a/drivers/gpu/drm/i915/intel_device_info.h +++ b/drivers/gpu/drm/i915/intel_device_info.h @@ -230,7 +230,7 @@ struct intel_runtime_info { u32 rawclk_freq; - struct i915_rev_steppings step; + struct intel_step_info step; }; struct intel_driver_caps { diff --git a/drivers/gpu/drm/i915/intel_step.c b/drivers/gpu/drm/i915/intel_step.c index 7ad3acc80564..4d71547a5b83 100644 --- a/drivers/gpu/drm/i915/intel_step.c +++ b/drivers/gpu/drm/i915/intel_step.c @@ -15,7 +15,7 @@ /* FIXME: what about REVID_E0 */ -static const struct i915_rev_steppings kbl_revids[] = { +static const struct intel_step_info kbl_revids[] = { [0] = { .gt_step = STEP_A0, .display_step = STEP_A0 }, [1] = { .gt_step = STEP_B0, .display_step = STEP_B0 }, [2] = { .gt_step = STEP_C0, .display_step = STEP_B0 }, @@ -26,7 +26,7 @@ static const struct i915_rev_steppings kbl_revids[] = { [7] = { .gt_step = STEP_G0, .display_step = STEP_C0 }, }; -static const struct i915_rev_steppings tgl_uy_revid_step_tbl[] = { +static const struct intel_step_info tgl_uy_revid_step_tbl[] = { [0] = { .gt_step = STEP_A0, .display_step = STEP_A0 }, [1] = { .gt_step = STEP_B0, .display_step = STEP_C0 }, [2] = { .gt_step = STEP_B1, .display_step = STEP_C0 }, @@ -34,12 +34,12 @@ static const struct i915_rev_steppings tgl_uy_revid_step_tbl[] = { }; /* Same GT stepping between tgl_uy_revids and tgl_revids don't mean the same HW */ -static const struct i915_rev_steppings tgl_revid_step_tbl[] = { +static const struct intel_step_info tgl_revid_step_tbl[] = { [0] = { .gt_step = STEP_A0, .display_step = STEP_B0 }, [1] = { .gt_step = STEP_B0, .display_step = STEP_D0 }, }; -static const struct i915_rev_steppings adls_revid_step_tbl[] = { +static const struct intel_step_info adls_revid_step_tbl[] = { [0x0] = { .gt_step = STEP_A0, .display_step = STEP_A0 }, [0x1] = { .gt_step = STEP_A0, .display_step = STEP_A2 }, [0x4] = { .gt_step = STEP_B0, .display_step = STEP_B0 }, @@ -49,10 +49,10 @@ static const struct i915_rev_steppings adls_revid_step_tbl[] = { void intel_step_init(struct drm_i915_private *i915) { - const struct i915_rev_steppings *revids = NULL; + const struct intel_step_info *revids = NULL; int size = 0; int revid = INTEL_REVID(i915); - struct i915_rev_steppings step = {}; + struct intel_step_info step = {}; if (IS_ALDERLAKE_S(i915)) { revids = adls_revid_step_tbl; diff --git a/drivers/gpu/drm/i915/intel_step.h b/drivers/gpu/drm/i915/intel_step.h index 102fd6a26893..958a8bb5d677 100644 --- a/drivers/gpu/drm/i915/intel_step.h +++ b/drivers/gpu/drm/i915/intel_step.h @@ -10,7 +10,7 @@ struct drm_i915_private; -struct i915_rev_steppings { +struct intel_step_info { u8 gt_step; u8 display_step; };