On Thu, Jul 11, 2019 at 10:31:07AM -0700, Lucas De Marchi wrote: > Tiger Lake has up to 3 combo phys and 6 TC phys. Extend the helper > conversion functions from port to phy. > > Signed-off-by: Lucas De Marchi <[email protected]>
Reviewed-by: Matt Roper <[email protected]> > --- > drivers/gpu/drm/i915/display/intel_display.c | 5 ++++- > drivers/gpu/drm/i915/display/intel_display.h | 3 +++ > 2 files changed, 7 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c > b/drivers/gpu/drm/i915/display/intel_display.c > index 1d6dc73dfc81..ba48fedd685b 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -6676,7 +6676,7 @@ bool intel_phy_is_combo(struct drm_i915_private > *dev_priv, enum phy phy) > if (phy == PHY_NONE) > return false; > > - if (IS_ELKHARTLAKE(dev_priv)) > + if (IS_ELKHARTLAKE(dev_priv) || INTEL_GEN(dev_priv) >= 12) > return phy <= PHY_C; > > if (INTEL_GEN(dev_priv) >= 11) > @@ -6687,6 +6687,9 @@ bool intel_phy_is_combo(struct drm_i915_private > *dev_priv, enum phy phy) > > bool intel_phy_is_tc(struct drm_i915_private *dev_priv, enum phy phy) > { > + if (INTEL_GEN(dev_priv) >= 12) > + return phy >= PHY_D && phy <= PHY_I; > + > if (INTEL_GEN(dev_priv) >= 11 && !IS_ELKHARTLAKE(dev_priv)) > return phy >= PHY_C && phy <= PHY_F; > > diff --git a/drivers/gpu/drm/i915/display/intel_display.h > b/drivers/gpu/drm/i915/display/intel_display.h > index 72ce27079a56..92931dc26470 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.h > +++ b/drivers/gpu/drm/i915/display/intel_display.h > @@ -249,6 +249,9 @@ enum phy { > PHY_D, > PHY_E, > PHY_F, > + PHY_G, > + PHY_H, > + PHY_I, > > I915_MAX_PHYS > }; > -- > 2.21.0 > -- Matt Roper Graphics Software Engineer IoTG Platform Enabling & Development Intel Corporation (916) 356-2795 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
