| Message ID | 20181113024503.28886-1-lucas.demarchi@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2,1/2] drm/i915/icl: replace check for combo phy | expand |
On Mon, Nov 12, 2018 at 06:45:02PM -0800, Lucas De Marchi wrote: > These are the only places that assume ports A and B are the ones with > combo phy. Let's use intel_port_is_combophy() there to make sure > it checks for combo phy ports the same way everywhere. > > v2: define for_each_combo_port() helper to check the ports > > Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> Reviewed-by: Imre Deak <imre.deak@intel.com> > --- > > v2 of https://patchwork.freedesktop.org/series/52269/ > > drivers/gpu/drm/i915/intel_combo_phy.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_combo_phy.c b/drivers/gpu/drm/i915/intel_combo_phy.c > index f7c16f6724f0..49f3a533860d 100644 > --- a/drivers/gpu/drm/i915/intel_combo_phy.c > +++ b/drivers/gpu/drm/i915/intel_combo_phy.c > @@ -5,6 +5,10 @@ > > #include "intel_drv.h" > > +#define for_each_combo_port(__dev_priv, __port) \ > + for ((__port) = PORT_A; (__port) < I915_MAX_PORTS; (__port)++) \ > + for_each_if(intel_port_is_combophy(__dev_priv, __port)) > + > enum { > PROCMON_0_85V_DOT_0, > PROCMON_0_95V_DOT_0, > @@ -199,7 +203,7 @@ void icl_combo_phys_init(struct drm_i915_private *dev_priv) > { > enum port port; > > - for (port = PORT_A; port <= PORT_B; port++) { > + for_each_combo_port(dev_priv, port) { > u32 val; > > if (icl_combo_phy_verify_state(dev_priv, port)) { > @@ -228,7 +232,7 @@ void icl_combo_phys_uninit(struct drm_i915_private *dev_priv) > { > enum port port; > > - for (port = PORT_A; port <= PORT_B; port++) { > + for_each_combo_port(dev_priv, port) { > u32 val; > > if (!icl_combo_phy_verify_state(dev_priv, port)) > -- > 2.19.1.1.g56c4683e68 >
diff --git a/drivers/gpu/drm/i915/intel_combo_phy.c b/drivers/gpu/drm/i915/intel_combo_phy.c index f7c16f6724f0..49f3a533860d 100644 --- a/drivers/gpu/drm/i915/intel_combo_phy.c +++ b/drivers/gpu/drm/i915/intel_combo_phy.c @@ -5,6 +5,10 @@ #include "intel_drv.h" +#define for_each_combo_port(__dev_priv, __port) \ + for ((__port) = PORT_A; (__port) < I915_MAX_PORTS; (__port)++) \ + for_each_if(intel_port_is_combophy(__dev_priv, __port)) + enum { PROCMON_0_85V_DOT_0, PROCMON_0_95V_DOT_0, @@ -199,7 +203,7 @@ void icl_combo_phys_init(struct drm_i915_private *dev_priv) { enum port port; - for (port = PORT_A; port <= PORT_B; port++) { + for_each_combo_port(dev_priv, port) { u32 val; if (icl_combo_phy_verify_state(dev_priv, port)) { @@ -228,7 +232,7 @@ void icl_combo_phys_uninit(struct drm_i915_private *dev_priv) { enum port port; - for (port = PORT_A; port <= PORT_B; port++) { + for_each_combo_port(dev_priv, port) { u32 val; if (!icl_combo_phy_verify_state(dev_priv, port))
These are the only places that assume ports A and B are the ones with combo phy. Let's use intel_port_is_combophy() there to make sure it checks for combo phy ports the same way everywhere. v2: define for_each_combo_port() helper to check the ports Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> --- v2 of https://patchwork.freedesktop.org/series/52269/ drivers/gpu/drm/i915/intel_combo_phy.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)