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 C457AC77B73 for ; Wed, 19 Apr 2023 23:01:10 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 97F1B10EB41; Wed, 19 Apr 2023 23:01:10 +0000 (UTC) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3984510EB41 for ; Wed, 19 Apr 2023 23:01:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1681945268; x=1713481268; h=message-id:date:mime-version:subject:from:to:references: in-reply-to:content-transfer-encoding; bh=0Wl0imhjgM2xdjaGdakGEC5p3r8b1Aje5zJd4Wa4X3I=; b=l6oBU07EL+Y73GPph8JGHufkCj0ro9+J5QtT1A9HKtJB5JJ9zxIT9MWi KFbtF7flbkL8mahKJJNg3btyshZHiqWf2l7d3QNt2dHNEo5Sp7FlJ/VJY Rtgvqh2TiQ36BGYd2WEsUp6f9bCu8+nI2LXY0gscVyx/k/nIBdYyh5lS4 amt/iiGa9hDF/901L69uk7FZQYQAy9q+j0EHctPl9FyVSRx+N56xrw3Ox FcEhxbQNJsHireKEpHrGrZ3vs7AHmR5W159BzDZFOjuaBInWP7oPI5zn3 AnRrJuWgLEkvEAKkl/MklEOSG95hvPPwxLw8x7+uBKRga5oMkzYIfO0ek g==; X-IronPort-AV: E=McAfee;i="6600,9927,10685"; a="325193568" X-IronPort-AV: E=Sophos;i="5.99,210,1677571200"; d="scan'208";a="325193568" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Apr 2023 16:01:05 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10685"; a="803098307" X-IronPort-AV: E=Sophos;i="5.99,210,1677571200"; d="scan'208";a="803098307" Received: from nirmoyda-mobl.ger.corp.intel.com (HELO [10.249.34.200]) ([10.249.34.200]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Apr 2023 16:01:04 -0700 Message-ID: <44bbc16c-fe0d-7667-1c87-f00918fc4adc@linux.intel.com> Date: Thu, 20 Apr 2023 01:01:01 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 From: "Das, Nirmoy" To: Matt Roper , intel-xe@lists.freedesktop.org References: <20230419213703.3993439-1-matthew.d.roper@intel.com> <20230419213703.3993439-2-matthew.d.roper@intel.com> Content-Language: en-US In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Subject: Re: [Intel-xe] [PATCH 2/2] drm/xe/adln: Enable ADL-N X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" On 4/20/2023 12:11 AM, Das, Nirmoy wrote: > Hi Matt, > > On 4/19/2023 11:37 PM, Matt Roper wrote: >> ADL-N is pretty much the same as ADL-P (i.e., Xe_LP graphics + Xe_M >> media + Xe_LPD display).  However unlike ADL-P, there's no GuC hwconfig >> support so the "tgl" GuC firmware should be loaded (i.e., the same >> situation as ADL-S). >> >> Signed-off-by: Matt Roper >> --- >>   drivers/gpu/drm/xe/xe_display.c        | 1 + >>   drivers/gpu/drm/xe/xe_mocs.c           | 1 + >>   drivers/gpu/drm/xe/xe_pci.c            | 9 +++++++++ >>   drivers/gpu/drm/xe/xe_platform_types.h | 1 + >>   drivers/gpu/drm/xe/xe_step.c           | 7 +++++++ >>   drivers/gpu/drm/xe/xe_uc_fw.c          | 1 + >>   6 files changed, 20 insertions(+) >> >> diff --git a/drivers/gpu/drm/xe/xe_display.c >> b/drivers/gpu/drm/xe/xe_display.c >> index aae362f27c77..9bd14ffc8f8d 100644 >> --- a/drivers/gpu/drm/xe/xe_display.c >> +++ b/drivers/gpu/drm/xe/xe_display.c >> @@ -509,6 +509,7 @@ void xe_display_info_init(struct xe_device *xe) >>           }; >>           break; >>       case XE_ALDERLAKE_P: >> +    case XE_ALDERLAKE_N: >>           xe->info.display = (struct xe_device_display_info) { >>               XE_LPD, >>               .has_cdclk_crawl = 1, >> diff --git a/drivers/gpu/drm/xe/xe_mocs.c b/drivers/gpu/drm/xe/xe_mocs.c >> index e09c6242aafc..2d2e1c216db9 100644 >> --- a/drivers/gpu/drm/xe/xe_mocs.c >> +++ b/drivers/gpu/drm/xe/xe_mocs.c >> @@ -418,6 +418,7 @@ static unsigned int get_mocs_settings(struct >> xe_device *xe, >>       case XE_ROCKETLAKE: >>       case XE_ALDERLAKE_S: >>       case XE_ALDERLAKE_P: >> +    case XE_ALDERLAKE_N: >>           info->size  = ARRAY_SIZE(gen12_mocs_desc); >>           info->table = gen12_mocs_desc; >>           info->n_entries = GEN9_NUM_MOCS_ENTRIES; >> diff --git a/drivers/gpu/drm/xe/xe_pci.c b/drivers/gpu/drm/xe/xe_pci.c >> index c92faffc838c..e96ea7b98f0b 100644 >> --- a/drivers/gpu/drm/xe/xe_pci.c >> +++ b/drivers/gpu/drm/xe/xe_pci.c >> @@ -210,6 +210,14 @@ static const struct xe_device_desc adl_p_desc = { >>       }, >>   }; >>   +static const struct xe_device_desc adl_n_desc = { >> +    .graphics = &graphics_xelp, >> +    .media = &media_xem, >> +    PLATFORM(XE_ALDERLAKE_N), >> +    .has_llc = 1, > > > Shouldn't this be 0 as this is all atom core platform ? Bspec 68398: It does have l3$ coherency. Wasn't expecting this. Acked-by: Nirmoy Das > > > Regards, > > Nirmoy > >> +    .require_force_probe = true, >> +}; >> + >>   #define DGFX_FEATURES \ >>       .is_dgfx = 1 >>   @@ -315,6 +323,7 @@ static const struct pci_device_id pciidlist[] = { >>       XE_RKL_IDS(INTEL_VGA_DEVICE, &rkl_desc), >>       XE_ADLS_IDS(INTEL_VGA_DEVICE, &adl_s_desc), >>       XE_ADLP_IDS(INTEL_VGA_DEVICE, &adl_p_desc), >> +    XE_ADLN_IDS(INTEL_VGA_DEVICE, &adl_n_desc), >>       XE_DG1_IDS(INTEL_VGA_DEVICE, &dg1_desc), >>       XE_ATS_M_IDS(INTEL_VGA_DEVICE, &ats_m_desc), >>       XE_DG2_IDS(INTEL_VGA_DEVICE, &dg2_desc), >> diff --git a/drivers/gpu/drm/xe/xe_platform_types.h >> b/drivers/gpu/drm/xe/xe_platform_types.h >> index 80c19bffe79c..abbb8a1f29a8 100644 >> --- a/drivers/gpu/drm/xe/xe_platform_types.h >> +++ b/drivers/gpu/drm/xe/xe_platform_types.h >> @@ -16,6 +16,7 @@ enum xe_platform { >>       XE_ROCKETLAKE, >>       XE_ALDERLAKE_S, >>       XE_ALDERLAKE_P, >> +    XE_ALDERLAKE_N, >>       XE_DG1, >>       XE_DG2, >>       XE_PVC, >> diff --git a/drivers/gpu/drm/xe/xe_step.c b/drivers/gpu/drm/xe/xe_step.c >> index bcdb4601c2f6..a443d9bd7bbb 100644 >> --- a/drivers/gpu/drm/xe/xe_step.c >> +++ b/drivers/gpu/drm/xe/xe_step.c >> @@ -71,6 +71,10 @@ static const struct xe_step_info adlp_rpl_revids[] >> = { >>       [0x4] = { COMMON_GT_MEDIA_STEP(C0), .display = STEP_E0 }, >>   }; >>   +static const struct xe_step_info adln_revids[] = { >> +    [0x0] = { COMMON_GT_MEDIA_STEP(A0), .display = STEP_D0 }, >> +}; >> + >>   static const struct xe_step_info dg2_g10_revid_step_tbl[] = { >>       [0x0] = { COMMON_GT_MEDIA_STEP(A0), .display = STEP_A0 }, >>       [0x1] = { COMMON_GT_MEDIA_STEP(A1), .display = STEP_A0 }, >> @@ -129,6 +133,9 @@ struct xe_step_info xe_step_get(struct xe_device >> *xe) >>       } else if (xe->info.subplatform == XE_SUBPLATFORM_DG2_G12) { >>           revids = dg2_g12_revid_step_tbl; >>           size = ARRAY_SIZE(dg2_g12_revid_step_tbl); >> +    } else if (xe->info.platform == XE_ALDERLAKE_N) { >> +        revids = adln_revids; >> +        size = ARRAY_SIZE(adln_revids); >>       } else if (xe->info.subplatform == XE_SUBPLATFORM_ADLP_RPLU) { >>           revids = adlp_rpl_revids; >>           size = ARRAY_SIZE(adlp_rpl_revids); >> diff --git a/drivers/gpu/drm/xe/xe_uc_fw.c >> b/drivers/gpu/drm/xe/xe_uc_fw.c >> index 97328e441f0f..7b8547bbeaba 100644 >> --- a/drivers/gpu/drm/xe/xe_uc_fw.c >> +++ b/drivers/gpu/drm/xe/xe_uc_fw.c >> @@ -104,6 +104,7 @@ struct fw_blobs_by_type { >>       fw_def(PVC,        mmp_ver(  xe,    guc,    pvc,    70, 6, >> 4))    \ >>       fw_def(DG2,        major_ver(i915,    guc,    dg2,    70, >> 5))        \ >>       fw_def(DG1,        major_ver(i915,    guc,    dg1,    70, >> 5))        \ >> +    fw_def(ALDERLAKE_N,    major_ver(i915,    guc,    tgl, 70, >> 5))        \ >>       fw_def(ALDERLAKE_P,    major_ver(i915,    guc,    adlp, 70, >> 5))        \ >>       fw_def(ALDERLAKE_S,    major_ver(i915,    guc,    tgl, 70, >> 5))        \ >>       fw_def(ROCKETLAKE,    major_ver(i915,    guc,    tgl, 70, >> 5))        \