| Message ID | 20210108231853.2859646-3-aditya.swarup@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Use TGL stepping info and add ADLS platform changes | expand |
On Fri, Jan 08, 2021 at 03:18:53PM -0800, Aditya Swarup wrote: > From: Caz Yokoyama <caz.yokoyama@intel.com> > > - Add the initial platform information for Alderlake-S. > - Specify ppgtt_size value > - Add dma_mask_size > - Add ADLS REVIDs > - HW tracking(Selective Update Tracking Enable) has been > removed from ADLS. Disable PSR2 till we enable software/ > manual tracking. > > v2: > - Add support for different ADLS SOC steppings to select > correct GT/DISP stepping based on Bspec 53655 based on > feedback from Matt Roper.(aswarup) > > v3: > - Make display/gt steppings info generic for reuse with TGL and ADLS. > - Modify the macros to reuse tgl_revids_get() > - Add HTI support to adls device info.(mdroper) > > v4: > - Rebase on TGL patch for applying WAs based on stepping info from > Matt Roper's feedback.(aswarup) > > Bspec: 53597 > Bspec: 53648 > Bspec: 53655 > Bspec: 48028 > Bspec: 53650 > BSpec: 50422 > > Cc: José Roberto de Souza <jose.souza@intel.com> > Cc: Matt Roper <matthew.d.roper@intel.com> > Cc: Lucas De Marchi <lucas.demarchi@intel.com> > Cc: Anusha Srivatsa <anusha.srivatsa@intel.com> > Cc: Jani Nikula <jani.nikula@intel.com> > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> > Cc: Imre Deak <imre.deak@intel.com> > Signed-off-by: Caz Yokoyama <caz.yokoyama@intel.com> > Signed-off-by: Aditya Swarup <aditya.swarup@intel.com> > --- > drivers/gpu/drm/i915/gt/intel_workarounds.c | 8 ++++++ > drivers/gpu/drm/i915/i915_drv.h | 27 ++++++++++++++++++++- > drivers/gpu/drm/i915/i915_pci.c | 13 ++++++++++ > drivers/gpu/drm/i915/intel_device_info.c | 1 + > drivers/gpu/drm/i915/intel_device_info.h | 1 + > include/drm/i915_pciids.h | 11 +++++++++ > 6 files changed, 60 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c > index 111d01e2f81e..c89bd653af17 100644 > --- a/drivers/gpu/drm/i915/gt/intel_workarounds.c > +++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c > @@ -84,6 +84,14 @@ const struct i915_rev_steppings tgl_revid_step_tbl[] = { > [1] = { .gt_stepping = STEP_B0, .disp_stepping = STEP_D0 }, > }; > > +const struct i915_rev_steppings adls_revid_step_tbl[] = { > + [ADLS_REVID_A0] = { .gt_stepping = STEP_A0, .disp_stepping = STEP_A0 }, > + [ADLS_REVID_A2] = { .gt_stepping = STEP_A0, .disp_stepping = STEP_A2 }, > + [ADLS_REVID_B0] = { .gt_stepping = STEP_B0, .disp_stepping = STEP_B0 }, > + [ADLS_REVID_G0] = { .gt_stepping = STEP_C0, .disp_stepping = STEP_B0 }, > + [ADLS_REVID_C0] = { .gt_stepping = STEP_D0, .disp_stepping = STEP_C0 }, > +}; Now that we've disassociated IP steppings from revision ID, I don't think we should use stepping terminology for the constant inputs to the array anymore. The terms you're using seem to roughly correspond to what the bspec refers to as "SOC stepping" but even that's not terribly accurate since, for example, PCI revision ID 0xC is used for SoC steppings C0, C1, D0, and H0. I'd just use the exact numeric PCI ID as documented in the bspec to remove any ambiguity: const struct i915_rev_steppings adls_revid_step_tbl[] = { [0x0] = { .gt_stepping = STEP_A0, .disp_stepping = STEP_A0 }, [0x1] = { .gt_stepping = STEP_A0, .disp_stepping = STEP_A2 }, [0x4] = { .gt_stepping = STEP_B0, .disp_stepping = STEP_B0 }, [0x8] = { .gt_stepping = STEP_C0, .disp_stepping = STEP_B0 }, [0xC] = { .gt_stepping = STEP_D0, .disp_stepping = STEP_C0 }, }; That also matches how we're indexing into the TGL arrays. Matt > + > static void wa_init_start(struct i915_wa_list *wal, const char *name, const char *engine_name) > { > wal->name = name; > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index 11d6e8abde46..8d8a046a7b0c 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -1417,6 +1417,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, > #define IS_TIGERLAKE(dev_priv) IS_PLATFORM(dev_priv, INTEL_TIGERLAKE) > #define IS_ROCKETLAKE(dev_priv) IS_PLATFORM(dev_priv, INTEL_ROCKETLAKE) > #define IS_DG1(dev_priv) IS_PLATFORM(dev_priv, INTEL_DG1) > +#define IS_ALDERLAKE_S(dev_priv) IS_PLATFORM(dev_priv, INTEL_ALDERLAKE_S) > #define IS_HSW_EARLY_SDV(dev_priv) (IS_HASWELL(dev_priv) && \ > (INTEL_DEVID(dev_priv) & 0xFF00) == 0x0C00) > #define IS_BDW_ULT(dev_priv) \ > @@ -1560,6 +1561,7 @@ extern const struct i915_rev_steppings kbl_revids[]; > > enum { > STEP_A0, > + STEP_A2, > STEP_B0, > STEP_B1, > STEP_C0, > @@ -1568,9 +1570,11 @@ enum { > > #define TGL_UY_REVID_STEP_TBL_SIZE 4 > #define TGL_REVID_STEP_TBL_SIZE 2 > +#define ADLS_REVID_STEP_TBL_SIZE 13 > > extern const struct i915_rev_steppings tgl_uy_revid_step_tbl[TGL_UY_REVID_STEP_TBL_SIZE]; > extern const struct i915_rev_steppings tgl_revid_step_tbl[TGL_REVID_STEP_TBL_SIZE]; > +extern const struct i915_rev_steppings adls_revid_step_tbl[ADLS_REVID_STEP_TBL_SIZE]; > > static inline const struct i915_rev_steppings * > tgl_stepping_get(struct drm_i915_private *dev_priv) > @@ -1579,7 +1583,10 @@ tgl_stepping_get(struct drm_i915_private *dev_priv) > u8 size; > const struct i915_rev_steppings *revid_step_tbl; > > - if (IS_TGL_U(dev_priv) || IS_TGL_Y(dev_priv)) { > + if (IS_ALDERLAKE_S(dev_priv)) { > + revid_step_tbl = adls_revid_step_tbl; > + size = ARRAY_SIZE(adls_revid_step_tbl); > + } else if (IS_TGL_U(dev_priv) || IS_TGL_Y(dev_priv)) { > revid_step_tbl = tgl_uy_revid_step_tbl; > size = ARRAY_SIZE(tgl_uy_revid_step_tbl); > } else { > @@ -1621,6 +1628,24 @@ tgl_stepping_get(struct drm_i915_private *dev_priv) > #define IS_DG1_REVID(p, since, until) \ > (IS_DG1(p) && IS_REVID(p, since, until)) > > +#define ADLS_REVID_A0 0x0 > +#define ADLS_REVID_A2 0x1 > +#define ADLS_REVID_B0 0x4 > +#define ADLS_REVID_G0 0x8 > +#define ADLS_REVID_C0 0xC /*Same as H0 ADLS SOC stepping*/ > + > +extern const struct i915_rev_steppings adls_revids[]; > + > +#define IS_ADLS_DISP_STEPPING(p, since, until) \ > + (IS_ALDERLAKE_S(p) && \ > + tgl_stepping_get(p)->disp_stepping >= (since) && \ > + tgl_stepping_get(p)->disp_stepping <= (until)) > + > +#define IS_ADLS_GT_STEPPING(p, since, until) \ > + (IS_ALDERLAKE_S(p) && \ > + tgl_stepping_get(p)->gt_stepping >= (since) && \ > + tgl_stepping_get(p)->gt_stepping <= (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 11fe790b1969..26e4bf8bb4ef 100644 > --- a/drivers/gpu/drm/i915/i915_pci.c > +++ b/drivers/gpu/drm/i915/i915_pci.c > @@ -925,6 +925,18 @@ static const struct intel_device_info dg1_info __maybe_unused = { > .ppgtt_size = 47, > }; > > +static const struct intel_device_info adl_s_info = { > + GEN12_FEATURES, > + PLATFORM(INTEL_ALDERLAKE_S), > + .pipe_mask = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C) | BIT(PIPE_D), > + .require_force_probe = 1, > + .display.has_hti = 1, > + .display.has_psr_hw_tracking = 0, > + .platform_engine_mask = > + BIT(RCS0) | BIT(BCS0) | BIT(VECS0) | BIT(VCS0) | BIT(VCS2), > + .dma_mask_size = 46, > +}; > + > #undef GEN > #undef PLATFORM > > @@ -1001,6 +1013,7 @@ static const struct pci_device_id pciidlist[] = { > INTEL_JSL_IDS(&jsl_info), > INTEL_TGL_12_IDS(&tgl_info), > INTEL_RKL_IDS(&rkl_info), > + INTEL_ADLS_IDS(&adl_s_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 f2d5ae59081e..699412c14c1d 100644 > --- a/drivers/gpu/drm/i915/intel_device_info.c > +++ b/drivers/gpu/drm/i915/intel_device_info.c > @@ -66,6 +66,7 @@ static const char * const platform_names[] = { > PLATFORM_NAME(TIGERLAKE), > PLATFORM_NAME(ROCKETLAKE), > PLATFORM_NAME(DG1), > + PLATFORM_NAME(ALDERLAKE_S), > }; > #undef PLATFORM_NAME > > diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h > index 17d0fdb94d2d..d09857cdc954 100644 > --- a/drivers/gpu/drm/i915/intel_device_info.h > +++ b/drivers/gpu/drm/i915/intel_device_info.h > @@ -84,6 +84,7 @@ enum intel_platform { > INTEL_TIGERLAKE, > INTEL_ROCKETLAKE, > INTEL_DG1, > + INTEL_ALDERLAKE_S, > INTEL_MAX_PLATFORMS > }; > > diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h > index 931e46191047..ebd0dd1c35b3 100644 > --- a/include/drm/i915_pciids.h > +++ b/include/drm/i915_pciids.h > @@ -634,4 +634,15 @@ > INTEL_VGA_DEVICE(0x4907, info), \ > INTEL_VGA_DEVICE(0x4908, info) > > +/* ADL-S */ > +#define INTEL_ADLS_IDS(info) \ > + INTEL_VGA_DEVICE(0x4680, info), \ > + INTEL_VGA_DEVICE(0x4681, info), \ > + INTEL_VGA_DEVICE(0x4682, info), \ > + INTEL_VGA_DEVICE(0x4683, info), \ > + INTEL_VGA_DEVICE(0x4690, info), \ > + INTEL_VGA_DEVICE(0x4691, info), \ > + INTEL_VGA_DEVICE(0x4692, info), \ > + INTEL_VGA_DEVICE(0x4693, info) > + > #endif /* _I915_PCIIDS_H */ > -- > 2.27.0 >
On 1/8/21 4:20 PM, Matt Roper wrote: > On Fri, Jan 08, 2021 at 03:18:53PM -0800, Aditya Swarup wrote: >> From: Caz Yokoyama <caz.yokoyama@intel.com> >> >> - Add the initial platform information for Alderlake-S. >> - Specify ppgtt_size value >> - Add dma_mask_size >> - Add ADLS REVIDs >> - HW tracking(Selective Update Tracking Enable) has been >> removed from ADLS. Disable PSR2 till we enable software/ >> manual tracking. >> >> v2: >> - Add support for different ADLS SOC steppings to select >> correct GT/DISP stepping based on Bspec 53655 based on >> feedback from Matt Roper.(aswarup) >> >> v3: >> - Make display/gt steppings info generic for reuse with TGL and ADLS. >> - Modify the macros to reuse tgl_revids_get() >> - Add HTI support to adls device info.(mdroper) >> >> v4: >> - Rebase on TGL patch for applying WAs based on stepping info from >> Matt Roper's feedback.(aswarup) >> >> Bspec: 53597 >> Bspec: 53648 >> Bspec: 53655 >> Bspec: 48028 >> Bspec: 53650 >> BSpec: 50422 >> >> Cc: José Roberto de Souza <jose.souza@intel.com> >> Cc: Matt Roper <matthew.d.roper@intel.com> >> Cc: Lucas De Marchi <lucas.demarchi@intel.com> >> Cc: Anusha Srivatsa <anusha.srivatsa@intel.com> >> Cc: Jani Nikula <jani.nikula@intel.com> >> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> >> Cc: Imre Deak <imre.deak@intel.com> >> Signed-off-by: Caz Yokoyama <caz.yokoyama@intel.com> >> Signed-off-by: Aditya Swarup <aditya.swarup@intel.com> >> --- >> drivers/gpu/drm/i915/gt/intel_workarounds.c | 8 ++++++ >> drivers/gpu/drm/i915/i915_drv.h | 27 ++++++++++++++++++++- >> drivers/gpu/drm/i915/i915_pci.c | 13 ++++++++++ >> drivers/gpu/drm/i915/intel_device_info.c | 1 + >> drivers/gpu/drm/i915/intel_device_info.h | 1 + >> include/drm/i915_pciids.h | 11 +++++++++ >> 6 files changed, 60 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c >> index 111d01e2f81e..c89bd653af17 100644 >> --- a/drivers/gpu/drm/i915/gt/intel_workarounds.c >> +++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c >> @@ -84,6 +84,14 @@ const struct i915_rev_steppings tgl_revid_step_tbl[] = { >> [1] = { .gt_stepping = STEP_B0, .disp_stepping = STEP_D0 }, >> }; >> >> +const struct i915_rev_steppings adls_revid_step_tbl[] = { >> + [ADLS_REVID_A0] = { .gt_stepping = STEP_A0, .disp_stepping = STEP_A0 }, >> + [ADLS_REVID_A2] = { .gt_stepping = STEP_A0, .disp_stepping = STEP_A2 }, >> + [ADLS_REVID_B0] = { .gt_stepping = STEP_B0, .disp_stepping = STEP_B0 }, >> + [ADLS_REVID_G0] = { .gt_stepping = STEP_C0, .disp_stepping = STEP_B0 }, >> + [ADLS_REVID_C0] = { .gt_stepping = STEP_D0, .disp_stepping = STEP_C0 }, >> +}; > > Now that we've disassociated IP steppings from revision ID, I don't > think we should use stepping terminology for the constant inputs to the > array anymore. The terms you're using seem to roughly correspond to > what the bspec refers to as "SOC stepping" but even that's not terribly > accurate since, for example, PCI revision ID 0xC is used for SoC > steppings C0, C1, D0, and H0. I'd just use the exact numeric PCI ID as > documented in the bspec to remove any ambiguity: > > const struct i915_rev_steppings adls_revid_step_tbl[] = { > [0x0] = { .gt_stepping = STEP_A0, .disp_stepping = STEP_A0 }, > [0x1] = { .gt_stepping = STEP_A0, .disp_stepping = STEP_A2 }, > [0x4] = { .gt_stepping = STEP_B0, .disp_stepping = STEP_B0 }, > [0x8] = { .gt_stepping = STEP_C0, .disp_stepping = STEP_B0 }, > [0xC] = { .gt_stepping = STEP_D0, .disp_stepping = STEP_C0 }, > }; > > That also matches how we're indexing into the TGL arrays. I don't think there is a difference between SOC steppings and PCI ids from display and graphics perspective. As in all the SOC steppings that share the same PCI IDs have the same display and graphics stepping. But I do agree with you that changing the index to numeric PCI IDs perhaps removes ambiguity and makes it consitent with the tables used for earlier platforms. I have sent a v2 addressing this change. aswarup > > > Matt > >> + >> static void wa_init_start(struct i915_wa_list *wal, const char *name, const char *engine_name) >> { >> wal->name = name; >> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h >> index 11d6e8abde46..8d8a046a7b0c 100644 >> --- a/drivers/gpu/drm/i915/i915_drv.h >> +++ b/drivers/gpu/drm/i915/i915_drv.h >> @@ -1417,6 +1417,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, >> #define IS_TIGERLAKE(dev_priv) IS_PLATFORM(dev_priv, INTEL_TIGERLAKE) >> #define IS_ROCKETLAKE(dev_priv) IS_PLATFORM(dev_priv, INTEL_ROCKETLAKE) >> #define IS_DG1(dev_priv) IS_PLATFORM(dev_priv, INTEL_DG1) >> +#define IS_ALDERLAKE_S(dev_priv) IS_PLATFORM(dev_priv, INTEL_ALDERLAKE_S) >> #define IS_HSW_EARLY_SDV(dev_priv) (IS_HASWELL(dev_priv) && \ >> (INTEL_DEVID(dev_priv) & 0xFF00) == 0x0C00) >> #define IS_BDW_ULT(dev_priv) \ >> @@ -1560,6 +1561,7 @@ extern const struct i915_rev_steppings kbl_revids[]; >> >> enum { >> STEP_A0, >> + STEP_A2, >> STEP_B0, >> STEP_B1, >> STEP_C0, >> @@ -1568,9 +1570,11 @@ enum { >> >> #define TGL_UY_REVID_STEP_TBL_SIZE 4 >> #define TGL_REVID_STEP_TBL_SIZE 2 >> +#define ADLS_REVID_STEP_TBL_SIZE 13 >> >> extern const struct i915_rev_steppings tgl_uy_revid_step_tbl[TGL_UY_REVID_STEP_TBL_SIZE]; >> extern const struct i915_rev_steppings tgl_revid_step_tbl[TGL_REVID_STEP_TBL_SIZE]; >> +extern const struct i915_rev_steppings adls_revid_step_tbl[ADLS_REVID_STEP_TBL_SIZE]; >> >> static inline const struct i915_rev_steppings * >> tgl_stepping_get(struct drm_i915_private *dev_priv) >> @@ -1579,7 +1583,10 @@ tgl_stepping_get(struct drm_i915_private *dev_priv) >> u8 size; >> const struct i915_rev_steppings *revid_step_tbl; >> >> - if (IS_TGL_U(dev_priv) || IS_TGL_Y(dev_priv)) { >> + if (IS_ALDERLAKE_S(dev_priv)) { >> + revid_step_tbl = adls_revid_step_tbl; >> + size = ARRAY_SIZE(adls_revid_step_tbl); >> + } else if (IS_TGL_U(dev_priv) || IS_TGL_Y(dev_priv)) { >> revid_step_tbl = tgl_uy_revid_step_tbl; >> size = ARRAY_SIZE(tgl_uy_revid_step_tbl); >> } else { >> @@ -1621,6 +1628,24 @@ tgl_stepping_get(struct drm_i915_private *dev_priv) >> #define IS_DG1_REVID(p, since, until) \ >> (IS_DG1(p) && IS_REVID(p, since, until)) >> >> +#define ADLS_REVID_A0 0x0 >> +#define ADLS_REVID_A2 0x1 >> +#define ADLS_REVID_B0 0x4 >> +#define ADLS_REVID_G0 0x8 >> +#define ADLS_REVID_C0 0xC /*Same as H0 ADLS SOC stepping*/ >> + >> +extern const struct i915_rev_steppings adls_revids[]; >> + >> +#define IS_ADLS_DISP_STEPPING(p, since, until) \ >> + (IS_ALDERLAKE_S(p) && \ >> + tgl_stepping_get(p)->disp_stepping >= (since) && \ >> + tgl_stepping_get(p)->disp_stepping <= (until)) >> + >> +#define IS_ADLS_GT_STEPPING(p, since, until) \ >> + (IS_ALDERLAKE_S(p) && \ >> + tgl_stepping_get(p)->gt_stepping >= (since) && \ >> + tgl_stepping_get(p)->gt_stepping <= (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 11fe790b1969..26e4bf8bb4ef 100644 >> --- a/drivers/gpu/drm/i915/i915_pci.c >> +++ b/drivers/gpu/drm/i915/i915_pci.c >> @@ -925,6 +925,18 @@ static const struct intel_device_info dg1_info __maybe_unused = { >> .ppgtt_size = 47, >> }; >> >> +static const struct intel_device_info adl_s_info = { >> + GEN12_FEATURES, >> + PLATFORM(INTEL_ALDERLAKE_S), >> + .pipe_mask = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C) | BIT(PIPE_D), >> + .require_force_probe = 1, >> + .display.has_hti = 1, >> + .display.has_psr_hw_tracking = 0, >> + .platform_engine_mask = >> + BIT(RCS0) | BIT(BCS0) | BIT(VECS0) | BIT(VCS0) | BIT(VCS2), >> + .dma_mask_size = 46, >> +}; >> + >> #undef GEN >> #undef PLATFORM >> >> @@ -1001,6 +1013,7 @@ static const struct pci_device_id pciidlist[] = { >> INTEL_JSL_IDS(&jsl_info), >> INTEL_TGL_12_IDS(&tgl_info), >> INTEL_RKL_IDS(&rkl_info), >> + INTEL_ADLS_IDS(&adl_s_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 f2d5ae59081e..699412c14c1d 100644 >> --- a/drivers/gpu/drm/i915/intel_device_info.c >> +++ b/drivers/gpu/drm/i915/intel_device_info.c >> @@ -66,6 +66,7 @@ static const char * const platform_names[] = { >> PLATFORM_NAME(TIGERLAKE), >> PLATFORM_NAME(ROCKETLAKE), >> PLATFORM_NAME(DG1), >> + PLATFORM_NAME(ALDERLAKE_S), >> }; >> #undef PLATFORM_NAME >> >> diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h >> index 17d0fdb94d2d..d09857cdc954 100644 >> --- a/drivers/gpu/drm/i915/intel_device_info.h >> +++ b/drivers/gpu/drm/i915/intel_device_info.h >> @@ -84,6 +84,7 @@ enum intel_platform { >> INTEL_TIGERLAKE, >> INTEL_ROCKETLAKE, >> INTEL_DG1, >> + INTEL_ALDERLAKE_S, >> INTEL_MAX_PLATFORMS >> }; >> >> diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h >> index 931e46191047..ebd0dd1c35b3 100644 >> --- a/include/drm/i915_pciids.h >> +++ b/include/drm/i915_pciids.h >> @@ -634,4 +634,15 @@ >> INTEL_VGA_DEVICE(0x4907, info), \ >> INTEL_VGA_DEVICE(0x4908, info) >> >> +/* ADL-S */ >> +#define INTEL_ADLS_IDS(info) \ >> + INTEL_VGA_DEVICE(0x4680, info), \ >> + INTEL_VGA_DEVICE(0x4681, info), \ >> + INTEL_VGA_DEVICE(0x4682, info), \ >> + INTEL_VGA_DEVICE(0x4683, info), \ >> + INTEL_VGA_DEVICE(0x4690, info), \ >> + INTEL_VGA_DEVICE(0x4691, info), \ >> + INTEL_VGA_DEVICE(0x4692, info), \ >> + INTEL_VGA_DEVICE(0x4693, info) >> + >> #endif /* _I915_PCIIDS_H */ >> -- >> 2.27.0 >> >
diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c index 111d01e2f81e..c89bd653af17 100644 --- a/drivers/gpu/drm/i915/gt/intel_workarounds.c +++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c @@ -84,6 +84,14 @@ const struct i915_rev_steppings tgl_revid_step_tbl[] = { [1] = { .gt_stepping = STEP_B0, .disp_stepping = STEP_D0 }, }; +const struct i915_rev_steppings adls_revid_step_tbl[] = { + [ADLS_REVID_A0] = { .gt_stepping = STEP_A0, .disp_stepping = STEP_A0 }, + [ADLS_REVID_A2] = { .gt_stepping = STEP_A0, .disp_stepping = STEP_A2 }, + [ADLS_REVID_B0] = { .gt_stepping = STEP_B0, .disp_stepping = STEP_B0 }, + [ADLS_REVID_G0] = { .gt_stepping = STEP_C0, .disp_stepping = STEP_B0 }, + [ADLS_REVID_C0] = { .gt_stepping = STEP_D0, .disp_stepping = STEP_C0 }, +}; + static void wa_init_start(struct i915_wa_list *wal, const char *name, const char *engine_name) { wal->name = name; diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 11d6e8abde46..8d8a046a7b0c 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -1417,6 +1417,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, #define IS_TIGERLAKE(dev_priv) IS_PLATFORM(dev_priv, INTEL_TIGERLAKE) #define IS_ROCKETLAKE(dev_priv) IS_PLATFORM(dev_priv, INTEL_ROCKETLAKE) #define IS_DG1(dev_priv) IS_PLATFORM(dev_priv, INTEL_DG1) +#define IS_ALDERLAKE_S(dev_priv) IS_PLATFORM(dev_priv, INTEL_ALDERLAKE_S) #define IS_HSW_EARLY_SDV(dev_priv) (IS_HASWELL(dev_priv) && \ (INTEL_DEVID(dev_priv) & 0xFF00) == 0x0C00) #define IS_BDW_ULT(dev_priv) \ @@ -1560,6 +1561,7 @@ extern const struct i915_rev_steppings kbl_revids[]; enum { STEP_A0, + STEP_A2, STEP_B0, STEP_B1, STEP_C0, @@ -1568,9 +1570,11 @@ enum { #define TGL_UY_REVID_STEP_TBL_SIZE 4 #define TGL_REVID_STEP_TBL_SIZE 2 +#define ADLS_REVID_STEP_TBL_SIZE 13 extern const struct i915_rev_steppings tgl_uy_revid_step_tbl[TGL_UY_REVID_STEP_TBL_SIZE]; extern const struct i915_rev_steppings tgl_revid_step_tbl[TGL_REVID_STEP_TBL_SIZE]; +extern const struct i915_rev_steppings adls_revid_step_tbl[ADLS_REVID_STEP_TBL_SIZE]; static inline const struct i915_rev_steppings * tgl_stepping_get(struct drm_i915_private *dev_priv) @@ -1579,7 +1583,10 @@ tgl_stepping_get(struct drm_i915_private *dev_priv) u8 size; const struct i915_rev_steppings *revid_step_tbl; - if (IS_TGL_U(dev_priv) || IS_TGL_Y(dev_priv)) { + if (IS_ALDERLAKE_S(dev_priv)) { + revid_step_tbl = adls_revid_step_tbl; + size = ARRAY_SIZE(adls_revid_step_tbl); + } else if (IS_TGL_U(dev_priv) || IS_TGL_Y(dev_priv)) { revid_step_tbl = tgl_uy_revid_step_tbl; size = ARRAY_SIZE(tgl_uy_revid_step_tbl); } else { @@ -1621,6 +1628,24 @@ tgl_stepping_get(struct drm_i915_private *dev_priv) #define IS_DG1_REVID(p, since, until) \ (IS_DG1(p) && IS_REVID(p, since, until)) +#define ADLS_REVID_A0 0x0 +#define ADLS_REVID_A2 0x1 +#define ADLS_REVID_B0 0x4 +#define ADLS_REVID_G0 0x8 +#define ADLS_REVID_C0 0xC /*Same as H0 ADLS SOC stepping*/ + +extern const struct i915_rev_steppings adls_revids[]; + +#define IS_ADLS_DISP_STEPPING(p, since, until) \ + (IS_ALDERLAKE_S(p) && \ + tgl_stepping_get(p)->disp_stepping >= (since) && \ + tgl_stepping_get(p)->disp_stepping <= (until)) + +#define IS_ADLS_GT_STEPPING(p, since, until) \ + (IS_ALDERLAKE_S(p) && \ + tgl_stepping_get(p)->gt_stepping >= (since) && \ + tgl_stepping_get(p)->gt_stepping <= (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 11fe790b1969..26e4bf8bb4ef 100644 --- a/drivers/gpu/drm/i915/i915_pci.c +++ b/drivers/gpu/drm/i915/i915_pci.c @@ -925,6 +925,18 @@ static const struct intel_device_info dg1_info __maybe_unused = { .ppgtt_size = 47, }; +static const struct intel_device_info adl_s_info = { + GEN12_FEATURES, + PLATFORM(INTEL_ALDERLAKE_S), + .pipe_mask = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C) | BIT(PIPE_D), + .require_force_probe = 1, + .display.has_hti = 1, + .display.has_psr_hw_tracking = 0, + .platform_engine_mask = + BIT(RCS0) | BIT(BCS0) | BIT(VECS0) | BIT(VCS0) | BIT(VCS2), + .dma_mask_size = 46, +}; + #undef GEN #undef PLATFORM @@ -1001,6 +1013,7 @@ static const struct pci_device_id pciidlist[] = { INTEL_JSL_IDS(&jsl_info), INTEL_TGL_12_IDS(&tgl_info), INTEL_RKL_IDS(&rkl_info), + INTEL_ADLS_IDS(&adl_s_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 f2d5ae59081e..699412c14c1d 100644 --- a/drivers/gpu/drm/i915/intel_device_info.c +++ b/drivers/gpu/drm/i915/intel_device_info.c @@ -66,6 +66,7 @@ static const char * const platform_names[] = { PLATFORM_NAME(TIGERLAKE), PLATFORM_NAME(ROCKETLAKE), PLATFORM_NAME(DG1), + PLATFORM_NAME(ALDERLAKE_S), }; #undef PLATFORM_NAME diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h index 17d0fdb94d2d..d09857cdc954 100644 --- a/drivers/gpu/drm/i915/intel_device_info.h +++ b/drivers/gpu/drm/i915/intel_device_info.h @@ -84,6 +84,7 @@ enum intel_platform { INTEL_TIGERLAKE, INTEL_ROCKETLAKE, INTEL_DG1, + INTEL_ALDERLAKE_S, INTEL_MAX_PLATFORMS }; diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h index 931e46191047..ebd0dd1c35b3 100644 --- a/include/drm/i915_pciids.h +++ b/include/drm/i915_pciids.h @@ -634,4 +634,15 @@ INTEL_VGA_DEVICE(0x4907, info), \ INTEL_VGA_DEVICE(0x4908, info) +/* ADL-S */ +#define INTEL_ADLS_IDS(info) \ + INTEL_VGA_DEVICE(0x4680, info), \ + INTEL_VGA_DEVICE(0x4681, info), \ + INTEL_VGA_DEVICE(0x4682, info), \ + INTEL_VGA_DEVICE(0x4683, info), \ + INTEL_VGA_DEVICE(0x4690, info), \ + INTEL_VGA_DEVICE(0x4691, info), \ + INTEL_VGA_DEVICE(0x4692, info), \ + INTEL_VGA_DEVICE(0x4693, info) + #endif /* _I915_PCIIDS_H */