Message ID | 1436388361-11130-8-git-send-email-ville.syrjala@linux.intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On 07/09/2015 02:15 AM, ville.syrjala@linux.intel.com wrote: > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > Add vlv_dport_to_phy() and fix up the return values of > vlv_dport_to_channel() and vlv_pipe_to_channel() to use > the appropriate enums. > > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > --- > drivers/gpu/drm/i915/intel_drv.h | 18 ++++++++++++++++-- > 1 file changed, 16 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h > index 42fa135..23d5e46 100644 > --- a/drivers/gpu/drm/i915/intel_drv.h > +++ b/drivers/gpu/drm/i915/intel_drv.h > @@ -791,7 +791,7 @@ struct intel_dp_mst_encoder { > void *port; /* store this opaque as its illegal to dereference it */ > }; > > -static inline int > +static inline enum dpio_channel > vlv_dport_to_channel(struct intel_digital_port *dport) > { > switch (dport->port) { > @@ -805,7 +805,21 @@ vlv_dport_to_channel(struct intel_digital_port *dport) > } > } > > -static inline int > +static inline enum dpio_phy > +vlv_dport_to_phy(struct intel_digital_port *dport) > +{ > + switch (dport->port) { > + case PORT_B: > + case PORT_C: > + return DPIO_PHY0; > + case PORT_D: > + return DPIO_PHY1; > + default: > + BUG(); > + } > +} > + Looks fine here is my r-b tag Reviewed-by: Deepak S <deepak.s@linux.intel.com> > +static inline enum dpio_channel > vlv_pipe_to_channel(enum pipe pipe) > { > switch (pipe) {
On Wed, Jul 08, 2015 at 11:45:53PM +0300, ville.syrjala@linux.intel.com wrote: > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > Add vlv_dport_to_phy() and fix up the return values of > vlv_dport_to_channel() and vlv_pipe_to_channel() to use > the appropriate enums. > > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > --- > drivers/gpu/drm/i915/intel_drv.h | 18 ++++++++++++++++-- > 1 file changed, 16 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h > index 42fa135..23d5e46 100644 > --- a/drivers/gpu/drm/i915/intel_drv.h > +++ b/drivers/gpu/drm/i915/intel_drv.h > @@ -791,7 +791,7 @@ struct intel_dp_mst_encoder { > void *port; /* store this opaque as its illegal to dereference it */ > }; > > -static inline int > +static inline enum dpio_channel > vlv_dport_to_channel(struct intel_digital_port *dport) > { > switch (dport->port) { > @@ -805,7 +805,21 @@ vlv_dport_to_channel(struct intel_digital_port *dport) > } > } > > -static inline int > +static inline enum dpio_phy > +vlv_dport_to_phy(struct intel_digital_port *dport) > +{ > + switch (dport->port) { > + case PORT_B: > + case PORT_C: > + return DPIO_PHY0; > + case PORT_D: > + return DPIO_PHY1; > + default: > + BUG(); BUG considered harmful in modeset code. Can you pls replace this with something that kills machines less reliable in a follow-up? -Daniel > + } > +} > + > +static inline enum dpio_channel > vlv_pipe_to_channel(enum pipe pipe) > { > switch (pipe) { > -- > 2.3.6 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 42fa135..23d5e46 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -791,7 +791,7 @@ struct intel_dp_mst_encoder { void *port; /* store this opaque as its illegal to dereference it */ }; -static inline int +static inline enum dpio_channel vlv_dport_to_channel(struct intel_digital_port *dport) { switch (dport->port) { @@ -805,7 +805,21 @@ vlv_dport_to_channel(struct intel_digital_port *dport) } } -static inline int +static inline enum dpio_phy +vlv_dport_to_phy(struct intel_digital_port *dport) +{ + switch (dport->port) { + case PORT_B: + case PORT_C: + return DPIO_PHY0; + case PORT_D: + return DPIO_PHY1; + default: + BUG(); + } +} + +static inline enum dpio_channel vlv_pipe_to_channel(enum pipe pipe) { switch (pipe) {