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.7 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 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 953CCC4338F for ; Mon, 26 Jul 2021 10:21: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 3E433608FB for ; Mon, 26 Jul 2021 10:21:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 3E433608FB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E32A08902A; Mon, 26 Jul 2021 10:21:28 +0000 (UTC) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id BA1928902A; Mon, 26 Jul 2021 10:21:27 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10056"; a="212196115" X-IronPort-AV: E=Sophos;i="5.84,270,1620716400"; d="scan'208";a="212196115" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Jul 2021 03:21:27 -0700 X-IronPort-AV: E=Sophos;i="5.84,270,1620716400"; d="scan'208";a="579321853" Received: from dechasso-mobl3.amr.corp.intel.com (HELO intel.com) ([10.212.115.115]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Jul 2021 03:21:26 -0700 Date: Mon, 26 Jul 2021 06:21:25 -0400 From: Rodrigo Vivi To: Lucas De Marchi Message-ID: References: <20210724001114.249295-1-lucas.demarchi@intel.com> <20210724001114.249295-27-lucas.demarchi@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210724001114.249295-27-lucas.demarchi@intel.com> Subject: Re: [Intel-gfx] [PATCH 26/30] drm/i915: finish removal of CNL 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 Fri, Jul 23, 2021 at 05:11:10PM -0700, Lucas De Marchi wrote: > With all the users removed, finish removing the CNL platform definitions. > We will leave the PCI IDs around as those are exposed to userspace. > Even if mesa doesn't support CNL anymore, let's avoid build breakages > due to changing the headers. > > Signed-off-by: Lucas De Marchi Reviewed-by: Rodrigo Vivi > --- > drivers/gpu/drm/i915/i915_drv.h | 7 +------ > drivers/gpu/drm/i915/i915_pci.c | 23 +++++------------------ > drivers/gpu/drm/i915/i915_perf.c | 1 - > drivers/gpu/drm/i915/intel_device_info.c | 2 -- > drivers/gpu/drm/i915/intel_device_info.h | 2 -- > 5 files changed, 6 insertions(+), 29 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index dd2d196050d4..e3c8283d770c 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -1437,7 +1437,6 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, > #define IS_GEMINILAKE(dev_priv) IS_PLATFORM(dev_priv, INTEL_GEMINILAKE) > #define IS_COFFEELAKE(dev_priv) IS_PLATFORM(dev_priv, INTEL_COFFEELAKE) > #define IS_COMETLAKE(dev_priv) IS_PLATFORM(dev_priv, INTEL_COMETLAKE) > -#define IS_CANNONLAKE(dev_priv) IS_PLATFORM(dev_priv, INTEL_CANNONLAKE) > #define IS_ICELAKE(dev_priv) IS_PLATFORM(dev_priv, INTEL_ICELAKE) > #define IS_JSL_EHL(dev_priv) (IS_PLATFORM(dev_priv, INTEL_JASPERLAKE) || \ > IS_PLATFORM(dev_priv, INTEL_ELKHARTLAKE)) > @@ -1503,8 +1502,6 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, > #define IS_CML_GT2(dev_priv) (IS_COMETLAKE(dev_priv) && \ > INTEL_INFO(dev_priv)->gt == 2) > > -#define IS_CNL_WITH_PORT_F(dev_priv) \ > - IS_SUBPLATFORM(dev_priv, INTEL_CANNONLAKE, INTEL_SUBPLATFORM_PORTF) > #define IS_ICL_WITH_PORT_F(dev_priv) \ > IS_SUBPLATFORM(dev_priv, INTEL_ICELAKE, INTEL_SUBPLATFORM_PORTF) > > @@ -1649,9 +1646,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, > > /* WaRsDisableCoarsePowerGating:skl,cnl */ > #define NEEDS_WaRsDisableCoarsePowerGating(dev_priv) \ > - (IS_CANNONLAKE(dev_priv) || \ > - IS_SKL_GT3(dev_priv) || \ > - IS_SKL_GT4(dev_priv)) > + (IS_SKL_GT3(dev_priv) || IS_SKL_GT4(dev_priv)) > > #define HAS_GMBUS_IRQ(dev_priv) (GRAPHICS_VER(dev_priv) >= 4) > #define HAS_GMBUS_BURST_READ(dev_priv) (GRAPHICS_VER(dev_priv) >= 10 || \ > diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c > index 48ea23dd3b5b..aea2c2d82fbf 100644 > --- a/drivers/gpu/drm/i915/i915_pci.c > +++ b/drivers/gpu/drm/i915/i915_pci.c > @@ -787,27 +787,13 @@ static const struct intel_device_info cml_gt2_info = { > .gt = 2, > }; > > -#define GEN10_FEATURES \ > - GEN9_FEATURES, \ > - GEN(10), \ > - .dbuf.size = 1024 - 4, /* 4 blocks for bypass path allocation */ \ > - .display.has_dsc = 1, \ > - .has_coherent_ggtt = false, \ > - GLK_COLORS > - > -static const struct intel_device_info cnl_info = { > - GEN10_FEATURES, > - PLATFORM(INTEL_CANNONLAKE), > - .gt = 2, > -}; > - > #define GEN11_DEFAULT_PAGE_SIZES \ > .page_sizes = I915_GTT_PAGE_SIZE_4K | \ > I915_GTT_PAGE_SIZE_64K | \ > I915_GTT_PAGE_SIZE_2M > > #define GEN11_FEATURES \ > - GEN10_FEATURES, \ > + GEN9_FEATURES, \ > GEN11_DEFAULT_PAGE_SIZES, \ > .abox_mask = BIT(0), \ > .cpu_transcoder_mask = BIT(TRANSCODER_A) | BIT(TRANSCODER_B) | \ > @@ -830,10 +816,12 @@ static const struct intel_device_info cnl_info = { > [TRANSCODER_DSI_1] = TRANSCODER_DSI1_OFFSET, \ > }, \ > GEN(11), \ > + .color = { .degamma_lut_size = 33, .gamma_lut_size = 262145 }, \ > .dbuf.size = 2048, \ > .dbuf.slice_mask = BIT(DBUF_S1) | BIT(DBUF_S2), \ > - .has_logical_ring_elsq = 1, \ > - .color = { .degamma_lut_size = 33, .gamma_lut_size = 262145 } > + .display.has_dsc = 1, \ > + .has_coherent_ggtt = false, \ > + .has_logical_ring_elsq = 1 > > static const struct intel_device_info icl_info = { > GEN11_FEATURES, > @@ -1123,7 +1111,6 @@ static const struct pci_device_id pciidlist[] = { > INTEL_CML_GT2_IDS(&cml_gt2_info), > INTEL_CML_U_GT1_IDS(&cml_gt1_info), > INTEL_CML_U_GT2_IDS(&cml_gt2_info), > - INTEL_CNL_IDS(&cnl_info), > INTEL_ICL_11_IDS(&icl_info), > INTEL_EHL_IDS(&ehl_info), > INTEL_JSL_IDS(&jsl_info), > diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c > index 838cc14c2f24..108774d651d9 100644 > --- a/drivers/gpu/drm/i915/i915_perf.c > +++ b/drivers/gpu/drm/i915/i915_perf.c > @@ -4319,7 +4319,6 @@ static void oa_init_supported_formats(struct i915_perf *perf) > case INTEL_GEMINILAKE: > case INTEL_COFFEELAKE: > case INTEL_COMETLAKE: > - case INTEL_CANNONLAKE: > case INTEL_ICELAKE: > case INTEL_ELKHARTLAKE: > case INTEL_JASPERLAKE: > diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c > index 99b51c292942..2893a8659a8b 100644 > --- a/drivers/gpu/drm/i915/intel_device_info.c > +++ b/drivers/gpu/drm/i915/intel_device_info.c > @@ -59,7 +59,6 @@ static const char * const platform_names[] = { > PLATFORM_NAME(GEMINILAKE), > PLATFORM_NAME(COFFEELAKE), > PLATFORM_NAME(COMETLAKE), > - PLATFORM_NAME(CANNONLAKE), > PLATFORM_NAME(ICELAKE), > PLATFORM_NAME(ELKHARTLAKE), > PLATFORM_NAME(JASPERLAKE), > @@ -175,7 +174,6 @@ static const u16 subplatform_ulx_ids[] = { > }; > > static const u16 subplatform_portf_ids[] = { > - INTEL_CNL_PORT_F_IDS(0), > INTEL_ICL_PORT_F_IDS(0), > }; > > diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h > index 616ccec41d76..057c9aa6f9c6 100644 > --- a/drivers/gpu/drm/i915/intel_device_info.h > +++ b/drivers/gpu/drm/i915/intel_device_info.h > @@ -76,8 +76,6 @@ enum intel_platform { > INTEL_GEMINILAKE, > INTEL_COFFEELAKE, > INTEL_COMETLAKE, > - /* gen10 */ > - INTEL_CANNONLAKE, > /* gen11 */ > INTEL_ICELAKE, > INTEL_ELKHARTLAKE, > -- > 2.31.1 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx