From mboxrd@z Thu Jan 1 00:00:00 1970 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=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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 98A10C07E9B for ; Wed, 7 Jul 2021 19:39:36 +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 5FF7B61C77 for ; Wed, 7 Jul 2021 19:39:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5FF7B61C77 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5FECE6E1C0; Wed, 7 Jul 2021 19:39:34 +0000 (UTC) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3B4F66E1BC; Wed, 7 Jul 2021 19:39:33 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10037"; a="207549364" X-IronPort-AV: E=Sophos;i="5.84,221,1620716400"; d="scan'208";a="207549364" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Jul 2021 12:39:30 -0700 X-IronPort-AV: E=Sophos;i="5.84,221,1620716400"; d="scan'208";a="428054293" Received: from mdroper-desk1.fm.intel.com (HELO mdroper-desk1.amr.corp.intel.com) ([10.1.27.134]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Jul 2021 12:39:29 -0700 Date: Wed, 7 Jul 2021 12:39:28 -0700 From: Matt Roper To: Lucas De Marchi Subject: Re: [PATCH 2/3] drm/i915: finish INTEL_GEN and friends conversion Message-ID: <20210707193928.GQ951094@mdroper-desk1.amr.corp.intel.com> References: <20210707181325.2130821-1-lucas.demarchi@intel.com> <20210707181325.2130821-3-lucas.demarchi@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210707181325.2130821-3-lucas.demarchi@intel.com> X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Wed, Jul 07, 2021 at 11:13:24AM -0700, Lucas De Marchi wrote: > Commit 161058fb899e ("drm/i915: Add remaining conversions to GRAPHICS_VER") > did the last conversions to the new macros for version checks, but some > some changes sneaked in to use INTEL_GEN. Remove the last users so > we can remove the macros. > > Signed-off-by: Lucas De Marchi Reviewed-by: Matt Roper I think the third change here is just one we somehow missed during the previous conversion rather than a new use, right? > --- > drivers/gpu/drm/i915/display/intel_display_debugfs.c | 3 ++- > drivers/gpu/drm/i915/i915_debugfs.c | 2 +- > drivers/gpu/drm/i915/intel_uncore.c | 2 +- > 3 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c > index af9e58619667..d5af5708c9da 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c > +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c > @@ -544,7 +544,8 @@ static int i915_dmc_info(struct seq_file *m, void *unused) > > seq_printf(m, "fw loaded: %s\n", yesno(intel_dmc_has_payload(dev_priv))); > seq_printf(m, "path: %s\n", dmc->fw_path); > - seq_printf(m, "Pipe A fw support: %s\n", yesno(INTEL_GEN(dev_priv) >= 12)); > + seq_printf(m, "Pipe A fw support: %s\n", > + yesno(GRAPHICS_VER(dev_priv) >= 12)); > seq_printf(m, "Pipe A fw loaded: %s\n", yesno(dmc->dmc_info[DMC_FW_PIPEA].payload)); > seq_printf(m, "Pipe B fw support: %s\n", yesno(IS_ALDERLAKE_P(dev_priv))); > seq_printf(m, "Pipe B fw loaded: %s\n", yesno(dmc->dmc_info[DMC_FW_PIPEB].payload)); > diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c > index cc745751ac53..0529576f069c 100644 > --- a/drivers/gpu/drm/i915/i915_debugfs.c > +++ b/drivers/gpu/drm/i915/i915_debugfs.c > @@ -636,7 +636,7 @@ static int i915_swizzle_info(struct seq_file *m, void *data) > intel_uncore_read16(uncore, C0DRB3_BW)); > seq_printf(m, "C1DRB3 = 0x%04x\n", > intel_uncore_read16(uncore, C1DRB3_BW)); > - } else if (INTEL_GEN(dev_priv) >= 6) { > + } else if (GRAPHICS_VER(dev_priv) >= 6) { > seq_printf(m, "MAD_DIMM_C0 = 0x%08x\n", > intel_uncore_read(uncore, MAD_DIMM_C0)); > seq_printf(m, "MAD_DIMM_C1 = 0x%08x\n", > diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c > index d067524f9162..ee1c6fbc3d97 100644 > --- a/drivers/gpu/drm/i915/intel_uncore.c > +++ b/drivers/gpu/drm/i915/intel_uncore.c > @@ -1929,7 +1929,7 @@ int intel_uncore_init_mmio(struct intel_uncore *uncore) > return -ENODEV; > } > > - if (INTEL_GEN(i915) > 5 && !intel_vgpu_active(i915)) > + if (GRAPHICS_VER(i915) > 5 && !intel_vgpu_active(i915)) > uncore->flags |= UNCORE_HAS_FORCEWAKE; > > if (!intel_uncore_has_forcewake(uncore)) { > -- > 2.31.1 > -- Matt Roper Graphics Software Engineer VTT-OSGC Platform Enablement Intel Corporation (916) 356-2795 From mboxrd@z Thu Jan 1 00:00:00 1970 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=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 DB0C9C07E95 for ; Wed, 7 Jul 2021 19:39:35 +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 A816C61C84 for ; Wed, 7 Jul 2021 19:39:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A816C61C84 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 3A0136E1BC; Wed, 7 Jul 2021 19:39:34 +0000 (UTC) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3B4F66E1BC; Wed, 7 Jul 2021 19:39:33 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10037"; a="207549364" X-IronPort-AV: E=Sophos;i="5.84,221,1620716400"; d="scan'208";a="207549364" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Jul 2021 12:39:30 -0700 X-IronPort-AV: E=Sophos;i="5.84,221,1620716400"; d="scan'208";a="428054293" Received: from mdroper-desk1.fm.intel.com (HELO mdroper-desk1.amr.corp.intel.com) ([10.1.27.134]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Jul 2021 12:39:29 -0700 Date: Wed, 7 Jul 2021 12:39:28 -0700 From: Matt Roper To: Lucas De Marchi Message-ID: <20210707193928.GQ951094@mdroper-desk1.amr.corp.intel.com> References: <20210707181325.2130821-1-lucas.demarchi@intel.com> <20210707181325.2130821-3-lucas.demarchi@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210707181325.2130821-3-lucas.demarchi@intel.com> Subject: Re: [Intel-gfx] [PATCH 2/3] drm/i915: finish INTEL_GEN and friends conversion 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: Daniel Vetter , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Wed, Jul 07, 2021 at 11:13:24AM -0700, Lucas De Marchi wrote: > Commit 161058fb899e ("drm/i915: Add remaining conversions to GRAPHICS_VER") > did the last conversions to the new macros for version checks, but some > some changes sneaked in to use INTEL_GEN. Remove the last users so > we can remove the macros. > > Signed-off-by: Lucas De Marchi Reviewed-by: Matt Roper I think the third change here is just one we somehow missed during the previous conversion rather than a new use, right? > --- > drivers/gpu/drm/i915/display/intel_display_debugfs.c | 3 ++- > drivers/gpu/drm/i915/i915_debugfs.c | 2 +- > drivers/gpu/drm/i915/intel_uncore.c | 2 +- > 3 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c > index af9e58619667..d5af5708c9da 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c > +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c > @@ -544,7 +544,8 @@ static int i915_dmc_info(struct seq_file *m, void *unused) > > seq_printf(m, "fw loaded: %s\n", yesno(intel_dmc_has_payload(dev_priv))); > seq_printf(m, "path: %s\n", dmc->fw_path); > - seq_printf(m, "Pipe A fw support: %s\n", yesno(INTEL_GEN(dev_priv) >= 12)); > + seq_printf(m, "Pipe A fw support: %s\n", > + yesno(GRAPHICS_VER(dev_priv) >= 12)); > seq_printf(m, "Pipe A fw loaded: %s\n", yesno(dmc->dmc_info[DMC_FW_PIPEA].payload)); > seq_printf(m, "Pipe B fw support: %s\n", yesno(IS_ALDERLAKE_P(dev_priv))); > seq_printf(m, "Pipe B fw loaded: %s\n", yesno(dmc->dmc_info[DMC_FW_PIPEB].payload)); > diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c > index cc745751ac53..0529576f069c 100644 > --- a/drivers/gpu/drm/i915/i915_debugfs.c > +++ b/drivers/gpu/drm/i915/i915_debugfs.c > @@ -636,7 +636,7 @@ static int i915_swizzle_info(struct seq_file *m, void *data) > intel_uncore_read16(uncore, C0DRB3_BW)); > seq_printf(m, "C1DRB3 = 0x%04x\n", > intel_uncore_read16(uncore, C1DRB3_BW)); > - } else if (INTEL_GEN(dev_priv) >= 6) { > + } else if (GRAPHICS_VER(dev_priv) >= 6) { > seq_printf(m, "MAD_DIMM_C0 = 0x%08x\n", > intel_uncore_read(uncore, MAD_DIMM_C0)); > seq_printf(m, "MAD_DIMM_C1 = 0x%08x\n", > diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c > index d067524f9162..ee1c6fbc3d97 100644 > --- a/drivers/gpu/drm/i915/intel_uncore.c > +++ b/drivers/gpu/drm/i915/intel_uncore.c > @@ -1929,7 +1929,7 @@ int intel_uncore_init_mmio(struct intel_uncore *uncore) > return -ENODEV; > } > > - if (INTEL_GEN(i915) > 5 && !intel_vgpu_active(i915)) > + if (GRAPHICS_VER(i915) > 5 && !intel_vgpu_active(i915)) > uncore->flags |= UNCORE_HAS_FORCEWAKE; > > if (!intel_uncore_has_forcewake(uncore)) { > -- > 2.31.1 > -- Matt Roper Graphics Software Engineer VTT-OSGC Platform Enablement Intel Corporation (916) 356-2795 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx