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=-6.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,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 5C981C38A24 for ; Thu, 7 May 2020 11:18:27 +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 36AE620870 for ; Thu, 7 May 2020 11:18:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 36AE620870 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 A54D26E974; Thu, 7 May 2020 11:18:26 +0000 (UTC) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 451CF6E974 for ; Thu, 7 May 2020 11:18:25 +0000 (UTC) IronPort-SDR: lVWl/7A9sg+nGkYf3eiuGfU4hP0f8wgreBP72ojhZD2PnSYXOAsVWUPDvXYNeQ9Gj4FJHizHQs kuecMDqLXj/Q== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 May 2020 04:18:24 -0700 IronPort-SDR: K/yFHqTjkp426srhzrc67fG97Of9/UkT+BLf92tD2Yri4crbQkJg74Vig2glpMBdzpiln5FqWs geG2OQbteY0Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,363,1583222400"; d="scan'208";a="249256478" Received: from orsmsx106.amr.corp.intel.com ([10.22.225.133]) by orsmga007.jf.intel.com with ESMTP; 07 May 2020 04:18:24 -0700 Received: from orsmsx156.amr.corp.intel.com (10.22.240.22) by ORSMSX106.amr.corp.intel.com (10.22.225.133) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 7 May 2020 04:18:24 -0700 Received: from orsmsx108.amr.corp.intel.com ([169.254.2.68]) by ORSMSX156.amr.corp.intel.com ([169.254.8.70]) with mapi id 14.03.0439.000; Thu, 7 May 2020 04:18:23 -0700 From: "Srivatsa, Anusha" To: "Roper, Matthew D" , "intel-gfx@lists.freedesktop.org" Thread-Topic: [Intel-gfx] [PATCH v2 01/22] drm/i915/rkl: Add RKL platform info and PCI ids Thread-Index: AQHWIma646BzGUiNfEWX0gtIipK+Z6icfXVA Date: Thu, 7 May 2020 11:18:23 +0000 Message-ID: <83F5C7385F545743AD4FB2A62F75B073482C209A@ORSMSX108.amr.corp.intel.com> References: <20200504225227.464666-1-matthew.d.roper@intel.com> <20200504225227.464666-2-matthew.d.roper@intel.com> In-Reply-To: <20200504225227.464666-2-matthew.d.roper@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.2.0.6 dlp-reaction: no-action x-ctpclassification: CTP_NT x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiNjMyZjAwNmUtOTE0MS00YTljLTgxNTgtMWZiZTg2ODljMGZlIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiMmNsUDdrODU3cERBcUlaYVptbk44blI1ekpLZ1ExcHNpOVVoTEdkbXBhZ2t4eVA2WjRiQVQ2MXFcL0xkVVpIbG0ifQ== x-originating-ip: [10.22.254.138] MIME-Version: 1.0 Subject: Re: [Intel-gfx] [PATCH v2 01/22] drm/i915/rkl: Add RKL platform info and PCI ids 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: "De Marchi, Lucas" Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" > -----Original Message----- > From: Intel-gfx On Behalf Of Matt > Roper > Sent: Tuesday, May 5, 2020 4:22 AM > To: intel-gfx@lists.freedesktop.org > Cc: De Marchi, Lucas > Subject: [Intel-gfx] [PATCH v2 01/22] drm/i915/rkl: Add RKL platform info and > PCI ids > > Introduce the basic platform definition, macros, and PCI IDs. > > Bspec: 44501 > Cc: Lucas De Marchi > Cc: Caz Yokoyama > Cc: Aditya Swarup > Signed-off-by: Matt Roper > Acked-by: Caz Yokoyama Confirmed the info with the BSpec. Reviewed-by: Anusha Srivatsa > --- > drivers/gpu/drm/i915/i915_drv.h | 8 ++++++++ > drivers/gpu/drm/i915/i915_pci.c | 10 ++++++++++ > drivers/gpu/drm/i915/intel_device_info.c | 1 + > drivers/gpu/drm/i915/intel_device_info.h | 1 + > include/drm/i915_pciids.h | 9 +++++++++ > 5 files changed, 29 insertions(+) > > diff --git a/drivers/gpu/drm/i915/i915_drv.h > b/drivers/gpu/drm/i915/i915_drv.h index 6af69555733e..1ba77283123d > 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -1406,6 +1406,7 @@ IS_SUBPLATFORM(const struct drm_i915_private > *i915, > #define IS_ICELAKE(dev_priv) IS_PLATFORM(dev_priv, INTEL_ICELAKE) > #define IS_ELKHARTLAKE(dev_priv) IS_PLATFORM(dev_priv, > INTEL_ELKHARTLAKE) > #define IS_TIGERLAKE(dev_priv) IS_PLATFORM(dev_priv, > INTEL_TIGERLAKE) > +#define IS_ROCKETLAKE(dev_priv) IS_PLATFORM(dev_priv, > INTEL_ROCKETLAKE) > #define IS_HSW_EARLY_SDV(dev_priv) (IS_HASWELL(dev_priv) && \ > (INTEL_DEVID(dev_priv) & 0xFF00) == > 0x0C00) #define IS_BDW_ULT(dev_priv) \ @@ -1514,6 +1515,13 @@ > IS_SUBPLATFORM(const struct drm_i915_private *i915, #define > IS_TGL_REVID(p, since, until) \ > (IS_TIGERLAKE(p) && IS_REVID(p, since, until)) > > +#define RKL_REVID_A0 0x0 > +#define RKL_REVID_B0 0x1 > +#define RKL_REVID_C0 0x4 > + > +#define IS_RKL_REVID(p, since, until) \ > + (IS_ROCKETLAKE(p) && IS_REVID(p, since, until)) > + > #define IS_LP(dev_priv) (INTEL_INFO(dev_priv)->is_lp) > #define IS_GEN9_LP(dev_priv) (IS_GEN(dev_priv, 9) && IS_LP(dev_priv)) > #define IS_GEN9_BC(dev_priv) (IS_GEN(dev_priv, 9) && !IS_LP(dev_priv)) > diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c > index 1faf9d6ec0a4..5a470bab2214 100644 > --- a/drivers/gpu/drm/i915/i915_pci.c > +++ b/drivers/gpu/drm/i915/i915_pci.c > @@ -863,6 +863,15 @@ static const struct intel_device_info tgl_info = { > BIT(RCS0) | BIT(BCS0) | BIT(VECS0) | BIT(VCS0) | BIT(VCS2), }; > > +static const struct intel_device_info rkl_info = { > + GEN12_FEATURES, > + PLATFORM(INTEL_ROCKETLAKE), > + .pipe_mask = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C), > + .require_force_probe = 1, > + .engine_mask = > + BIT(RCS0) | BIT(BCS0) | BIT(VECS0) | BIT(VCS0), }; > + > #define GEN12_DGFX_FEATURES \ > GEN12_FEATURES, \ > .is_dgfx = 1 > @@ -941,6 +950,7 @@ static const struct pci_device_id pciidlist[] = { > INTEL_ICL_11_IDS(&icl_info), > INTEL_EHL_IDS(&ehl_info), > INTEL_TGL_12_IDS(&tgl_info), > + INTEL_RKL_IDS(&rkl_info), > {0, 0, 0} > }; > MODULE_DEVICE_TABLE(pci, pciidlist); > diff --git a/drivers/gpu/drm/i915/intel_device_info.c > b/drivers/gpu/drm/i915/intel_device_info.c > index 91bb7891c70c..9862c1185059 100644 > --- a/drivers/gpu/drm/i915/intel_device_info.c > +++ b/drivers/gpu/drm/i915/intel_device_info.c > @@ -61,6 +61,7 @@ static const char * const platform_names[] = { > PLATFORM_NAME(ICELAKE), > PLATFORM_NAME(ELKHARTLAKE), > PLATFORM_NAME(TIGERLAKE), > + PLATFORM_NAME(ROCKETLAKE), > }; > #undef PLATFORM_NAME > > diff --git a/drivers/gpu/drm/i915/intel_device_info.h > b/drivers/gpu/drm/i915/intel_device_info.h > index 69c9257c6c6a..a126984cef7f 100644 > --- a/drivers/gpu/drm/i915/intel_device_info.h > +++ b/drivers/gpu/drm/i915/intel_device_info.h > @@ -80,6 +80,7 @@ enum intel_platform { > INTEL_ELKHARTLAKE, > /* gen12 */ > INTEL_TIGERLAKE, > + INTEL_ROCKETLAKE, > INTEL_MAX_PLATFORMS > }; > > diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h index > 662d8351c87a..bc989de2aac2 100644 > --- a/include/drm/i915_pciids.h > +++ b/include/drm/i915_pciids.h > @@ -605,4 +605,13 @@ > INTEL_VGA_DEVICE(0x9AD9, info), \ > INTEL_VGA_DEVICE(0x9AF8, info) > > +/* RKL */ > +#define INTEL_RKL_IDS(info) \ > + INTEL_VGA_DEVICE(0x4C80, info), \ > + INTEL_VGA_DEVICE(0x4C8A, info), \ > + INTEL_VGA_DEVICE(0x4C8B, info), \ > + INTEL_VGA_DEVICE(0x4C8C, info), \ > + INTEL_VGA_DEVICE(0x4C90, info), \ > + INTEL_VGA_DEVICE(0x4C9A, info) > + > #endif /* _I915_PCIIDS_H */ > -- > 2.24.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