On Thu, Jul 05, 2018 at 07:43:51PM +0300, Ville Syrjala wrote: > From: Ville Syrjälä <[email protected]> > > Add intel_encoder_is_dig_port() to match intel_encoder_is_dp(). > > Signed-off-by: Ville Syrjälä <[email protected]>
Reviewed-by: Rodrigo Vivi <[email protected]> > --- > drivers/gpu/drm/i915/intel_drv.h | 24 +++++++++++++++--------- > 1 file changed, 15 insertions(+), 9 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_drv.h > b/drivers/gpu/drm/i915/intel_drv.h > index 6fe3adafaf20..077189ed9e46 100644 > --- a/drivers/gpu/drm/i915/intel_drv.h > +++ b/drivers/gpu/drm/i915/intel_drv.h > @@ -1246,23 +1246,29 @@ intel_attached_encoder(struct drm_connector > *connector) > return to_intel_connector(connector)->encoder; > } > > -static inline struct intel_digital_port * > -enc_to_dig_port(struct drm_encoder *encoder) > +static inline bool intel_encoder_is_dig_port(struct intel_encoder *encoder) > { > - struct intel_encoder *intel_encoder = to_intel_encoder(encoder); > - > - switch (intel_encoder->type) { > + switch (encoder->type) { > case INTEL_OUTPUT_DDI: > - WARN_ON(!HAS_DDI(to_i915(encoder->dev))); > - /* fall through */ > case INTEL_OUTPUT_DP: > case INTEL_OUTPUT_EDP: > case INTEL_OUTPUT_HDMI: > + return true; > + default: > + return false; > + } > +} > + > +static inline struct intel_digital_port * > +enc_to_dig_port(struct drm_encoder *encoder) > +{ > + struct intel_encoder *intel_encoder = to_intel_encoder(encoder); > + > + if (intel_encoder_is_dig_port(intel_encoder)) > return container_of(encoder, struct intel_digital_port, > base.base); > - default: > + else > return NULL; > - } > } > > static inline struct intel_dp_mst_encoder * > -- > 2.16.4 > > _______________________________________________ > Intel-gfx mailing list > [email protected] > https://lists.freedesktop.org/mailman/listinfo/intel-gfx _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
