| Message ID | 20230823170740.1180212-14-lucas.demarchi@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Enable Lunar Lake display | expand |
On Wed, Aug 23, 2023 at 10:07:11AM -0700, Lucas De Marchi wrote: > Follow the convention of checking the last platform first and reword the > comment to convey there are more platforms than just DG1. > > Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> Reviewed-by: Matt Roper <matthew.d.roper@intel.com> > --- > drivers/gpu/drm/i915/soc/intel_pch.c | 13 ++++++++----- > 1 file changed, 8 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/i915/soc/intel_pch.c b/drivers/gpu/drm/i915/soc/intel_pch.c > index ba9843cb1b13..cf795ecdcc26 100644 > --- a/drivers/gpu/drm/i915/soc/intel_pch.c > +++ b/drivers/gpu/drm/i915/soc/intel_pch.c > @@ -216,13 +216,16 @@ void intel_detect_pch(struct drm_i915_private *dev_priv) > unsigned short id; > enum intel_pch pch_type; > > - /* DG1 has south engine display on the same PCI device */ > - if (IS_DG1(dev_priv)) { > - dev_priv->pch_type = PCH_DG1; > - return; > - } else if (IS_DG2(dev_priv)) { > + /* > + * South display engine on the same PCI device: just assign the fake > + * PCH. > + */ > + if (IS_DG2(dev_priv)) { > dev_priv->pch_type = PCH_DG2; > return; > + } else if (IS_DG1(dev_priv)) { > + dev_priv->pch_type = PCH_DG1; > + return; > } > > /* > -- > 2.40.1 >
diff --git a/drivers/gpu/drm/i915/soc/intel_pch.c b/drivers/gpu/drm/i915/soc/intel_pch.c index ba9843cb1b13..cf795ecdcc26 100644 --- a/drivers/gpu/drm/i915/soc/intel_pch.c +++ b/drivers/gpu/drm/i915/soc/intel_pch.c @@ -216,13 +216,16 @@ void intel_detect_pch(struct drm_i915_private *dev_priv) unsigned short id; enum intel_pch pch_type; - /* DG1 has south engine display on the same PCI device */ - if (IS_DG1(dev_priv)) { - dev_priv->pch_type = PCH_DG1; - return; - } else if (IS_DG2(dev_priv)) { + /* + * South display engine on the same PCI device: just assign the fake + * PCH. + */ + if (IS_DG2(dev_priv)) { dev_priv->pch_type = PCH_DG2; return; + } else if (IS_DG1(dev_priv)) { + dev_priv->pch_type = PCH_DG1; + return; } /*
Follow the convention of checking the last platform first and reword the comment to convey there are more platforms than just DG1. Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> --- drivers/gpu/drm/i915/soc/intel_pch.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)