On Tue, Mar 15, 2016 at 09:51:09PM +0200, Jani Nikula wrote: > Same as for_each_dsi_port, but for general use. Leave the > for_each_dsi_port version around as an "alias" for now to not cause too > much churn. No functional changes. > > Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx> Reviewed-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > --- > drivers/gpu/drm/i915/i915_drv.h | 4 ++++ > drivers/gpu/drm/i915/intel_dsi.h | 4 +--- > 2 files changed, 5 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index 80b14f1ba302..8ef3c88d0ed2 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -274,6 +274,10 @@ struct i915_hotplug { > (__s) < INTEL_INFO(__dev_priv)->num_sprites[(__p)]; \ > (__s)++) > > +#define for_each_port_masked(__port, __ports_mask) \ > + for ((__port) = PORT_A; (__port) < I915_MAX_PORTS; (__port)++) \ > + for_each_if ((__ports_mask) & (1 << (__port))) > + > #define for_each_crtc(dev, crtc) \ > list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) > > diff --git a/drivers/gpu/drm/i915/intel_dsi.h b/drivers/gpu/drm/i915/intel_dsi.h > index 92f39227b361..0b5e0b8ac08d 100644 > --- a/drivers/gpu/drm/i915/intel_dsi.h > +++ b/drivers/gpu/drm/i915/intel_dsi.h > @@ -117,9 +117,7 @@ static inline struct intel_dsi_host *to_intel_dsi_host(struct mipi_dsi_host *h) > return container_of(h, struct intel_dsi_host, base); > } > > -#define for_each_dsi_port(__port, __ports_mask) \ > - for ((__port) = PORT_A; (__port) < I915_MAX_PORTS; (__port)++) \ > - for_each_if ((__ports_mask) & (1 << (__port))) > +#define for_each_dsi_port(__port, __ports_mask) for_each_port_masked(__port, __ports_mask) > > static inline struct intel_dsi *enc_to_intel_dsi(struct drm_encoder *encoder) > { > -- > 2.1.4 -- Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx