On 2022.02.22 14:21:33 +0000, Tvrtko Ursulin wrote:
>
> On 22/02/2022 14:14, Jos?? Roberto de Souza wrote:
> > In the past we had a need to differentiate TGL U and TGL Y, there
> > was a different voltage swing table for each subplatform and some PCI
> > ids of this subplatforms are shared but it turned out that it was a
> > specification mistake and the voltage swing table was indeed the same
> > but we went ahead with that patch because we needed to differentiate
> > TGL U and Y from TGL H and by that time TGL H was embargoed so that
> > was the perfect way to land it upstream.
> >
> > Now the embargo for TGL H is long past and now we even have
> > INTEL_TGL_12_GT1_IDS with all TGL H ids, so we can drop this PCI root
> > check and only rely in the PCI ids to differentiate TGL U and Y from
> > TGL H that actually has code differences.
> >
> > Besides the simplification this will fix issues in virtualization
> > environments where the PCI root is virtualized and don't have the same
> > id as actual hardware.
> >
> > v2:
> > - add and set INTEL_SUBPLATFORM_UY
>
> LGTM, thanks for the tweak!
>
> Looks mechanical enough so:
>
> Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@xxxxxxxxx>
>
Add Yu, who has been testing this under GPU passthrough case as well,
which now release our effort for root pci device info passthrough issue.
Thanks!
>
> > Cc: Fred Gao <fred.gao@xxxxxxxxx>
> > Cc: Tvrtko Ursulin <tvrtko.ursulin@xxxxxxxxxxxxxxx>
> > Signed-off-by: Jos?? Roberto de Souza <jose.souza@xxxxxxxxx>
> > ---
> > .../drm/i915/display/intel_ddi_buf_trans.c | 2 +-
> > drivers/gpu/drm/i915/i915_drv.h | 11 +++-----
> > drivers/gpu/drm/i915/i915_reg.h | 6 -----
> > drivers/gpu/drm/i915/intel_device_info.c | 26 +++++--------------
> > drivers/gpu/drm/i915/intel_device_info.h | 3 +++
> > drivers/gpu/drm/i915/intel_step.c | 2 +-
> > 6 files changed, 16 insertions(+), 34 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c
> > index 0c32210bf5031..934a9f9e7dabb 100644
> > --- a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c
> > +++ b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c
> > @@ -1321,7 +1321,7 @@ tgl_get_combo_buf_trans_dp(struct intel_encoder *encoder,
> > struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
> > if (crtc_state->port_clock > 270000) {
> > - if (IS_TGL_U(dev_priv) || IS_TGL_Y(dev_priv)) {
> > + if (IS_TGL_UY(dev_priv)) {
> > return intel_get_buf_trans(&tgl_uy_combo_phy_trans_dp_hbr2,
> > n_entries);
> > } else {
> > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> > index 1c2f4ae4ebf98..51417e9b740f4 100644
> > --- a/drivers/gpu/drm/i915/i915_drv.h
> > +++ b/drivers/gpu/drm/i915/i915_drv.h
> > @@ -1147,11 +1147,8 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,
> > #define IS_ICL_WITH_PORT_F(dev_priv) \
> > IS_SUBPLATFORM(dev_priv, INTEL_ICELAKE, INTEL_SUBPLATFORM_PORTF)
> > -#define IS_TGL_U(dev_priv) \
> > - IS_SUBPLATFORM(dev_priv, INTEL_TIGERLAKE, INTEL_SUBPLATFORM_ULT)
> > -
> > -#define IS_TGL_Y(dev_priv) \
> > - IS_SUBPLATFORM(dev_priv, INTEL_TIGERLAKE, INTEL_SUBPLATFORM_ULX)
> > +#define IS_TGL_UY(dev_priv) \
> > + IS_SUBPLATFORM(dev_priv, INTEL_TIGERLAKE, INTEL_SUBPLATFORM_UY)
> > #define IS_SKL_GRAPHICS_STEP(p, since, until) (IS_SKYLAKE(p) && IS_GRAPHICS_STEP(p, since, until))
> > @@ -1170,11 +1167,11 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,
> > IS_DISPLAY_STEP(__i915, since, until))
> > #define IS_TGL_UY_GRAPHICS_STEP(__i915, since, until) \
> > - ((IS_TGL_U(__i915) || IS_TGL_Y(__i915)) && \
> > + (IS_TGL_UY(__i915) && \
> > IS_GRAPHICS_STEP(__i915, since, until))
> > #define IS_TGL_GRAPHICS_STEP(__i915, since, until) \
> > - (IS_TIGERLAKE(__i915) && !(IS_TGL_U(__i915) || IS_TGL_Y(__i915)) && \
> > + (IS_TIGERLAKE(__i915) && !IS_TGL_UY(__i915)) && \
> > IS_GRAPHICS_STEP(__i915, since, until))
> > #define IS_RKL_DISPLAY_STEP(p, since, until) \
> > diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> > index 2b8a3086ed35a..30aa1d99f2244 100644
> > --- a/drivers/gpu/drm/i915/i915_reg.h
> > +++ b/drivers/gpu/drm/i915/i915_reg.h
> > @@ -8823,12 +8823,6 @@ enum skl_power_gate {
> > #define DSB_ENABLE (1 << 31)
> > #define DSB_STATUS (1 << 0)
> > -#define TGL_ROOT_DEVICE_ID 0x9A00
> > -#define TGL_ROOT_DEVICE_MASK 0xFF00
> > -#define TGL_ROOT_DEVICE_SKU_MASK 0xF
> > -#define TGL_ROOT_DEVICE_SKU_ULX 0x2
> > -#define TGL_ROOT_DEVICE_SKU_ULT 0x4
> > -
> > #define CLKREQ_POLICY _MMIO(0x101038)
> > #define CLKREQ_POLICY_MEM_UP_OVRD REG_BIT(1)
> > diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c
> > index ae13bc3c7970e..d03de76147912 100644
> > --- a/drivers/gpu/drm/i915/intel_device_info.c
> > +++ b/drivers/gpu/drm/i915/intel_device_info.c
> > @@ -170,6 +170,10 @@ static const u16 subplatform_portf_ids[] = {
> > INTEL_ICL_PORT_F_IDS(0),
> > };
> > +static const u16 subplatform_uy_ids[] = {
> > + INTEL_TGL_12_GT2_IDS(0),
> > +};
> > +
> > static const u16 subplatform_n_ids[] = {
> > INTEL_ADLN_IDS(0),
> > };
> > @@ -226,6 +230,9 @@ void intel_device_info_subplatform_init(struct drm_i915_private *i915)
> > } else if (find_devid(devid, subplatform_portf_ids,
> > ARRAY_SIZE(subplatform_portf_ids))) {
> > mask = BIT(INTEL_SUBPLATFORM_PORTF);
> > + } else if (find_devid(devid, subplatform_uy_ids,
> > + ARRAY_SIZE(subplatform_uy_ids))) {
> > + mask = BIT(INTEL_SUBPLATFORM_UY);
> > } else if (find_devid(devid, subplatform_n_ids,
> > ARRAY_SIZE(subplatform_n_ids))) {
> > mask = BIT(INTEL_SUBPLATFORM_N);
> > @@ -243,25 +250,6 @@ void intel_device_info_subplatform_init(struct drm_i915_private *i915)
> > mask = BIT(INTEL_SUBPLATFORM_G12);
> > }
> > - if (IS_TIGERLAKE(i915)) {
> > - struct pci_dev *root, *pdev = to_pci_dev(i915->drm.dev);
> > -
> > - root = list_first_entry(&pdev->bus->devices, typeof(*root), bus_list);
> > -
> > - drm_WARN_ON(&i915->drm, mask);
> > - drm_WARN_ON(&i915->drm, (root->device & TGL_ROOT_DEVICE_MASK) !=
> > - TGL_ROOT_DEVICE_ID);
> > -
> > - switch (root->device & TGL_ROOT_DEVICE_SKU_MASK) {
> > - case TGL_ROOT_DEVICE_SKU_ULX:
> > - mask = BIT(INTEL_SUBPLATFORM_ULX);
> > - break;
> > - case TGL_ROOT_DEVICE_SKU_ULT:
> > - mask = BIT(INTEL_SUBPLATFORM_ULT);
> > - break;
> > - }
> > - }
> > -
> > GEM_BUG_ON(mask & ~INTEL_SUBPLATFORM_MASK);
> > RUNTIME_INFO(i915)->platform_mask[pi] |= mask;
> > diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h
> > index 2508a47fb3f5e..291215d9da282 100644
> > --- a/drivers/gpu/drm/i915/intel_device_info.h
> > +++ b/drivers/gpu/drm/i915/intel_device_info.h
> > @@ -106,6 +106,9 @@ enum intel_platform {
> > /* ICL */
> > #define INTEL_SUBPLATFORM_PORTF (0)
> > +/* TGL */
> > +#define INTEL_SUBPLATFORM_UY (0)
> > +
> > /* DG2 */
> > #define INTEL_SUBPLATFORM_G10 0
> > #define INTEL_SUBPLATFORM_G11 1
> > diff --git a/drivers/gpu/drm/i915/intel_step.c b/drivers/gpu/drm/i915/intel_step.c
> > index ac1a796b28084..4fd69ecd14811 100644
> > --- a/drivers/gpu/drm/i915/intel_step.c
> > +++ b/drivers/gpu/drm/i915/intel_step.c
> > @@ -165,7 +165,7 @@ void intel_step_init(struct drm_i915_private *i915)
> > } else if (IS_ROCKETLAKE(i915)) {
> > revids = rkl_revids;
> > size = ARRAY_SIZE(rkl_revids);
> > - } else if (IS_TGL_U(i915) || IS_TGL_Y(i915)) {
> > + } else if (IS_TGL_UY(i915)) {
> > revids = tgl_uy_revids;
> > size = ARRAY_SIZE(tgl_uy_revids);
> > } else if (IS_TIGERLAKE(i915)) {
Attachment:
signature.asc
Description: PGP signature
