On Wed, Oct 16, 2013 at 05:06:17PM +0300, Jani Nikula wrote: > Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx> > > --- > > This is useful with the follow-up patch that frobs > dev_priv->vbt.edp_bpp, and the value no longer comes directly from VBT. Same as for Ben's patch: Such prep-patch justifications should imo be part of the commit message. I've moved it. -Daniel > --- > drivers/gpu/drm/i915/intel_dp.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c > index e4fdedc..f63aa8c 100644 > --- a/drivers/gpu/drm/i915/intel_dp.c > +++ b/drivers/gpu/drm/i915/intel_dp.c > @@ -822,10 +822,11 @@ intel_dp_compute_config(struct intel_encoder *encoder, > /* Walk through all bpp values. Luckily they're all nicely spaced with 2 > * bpc in between. */ > bpp = pipe_config->pipe_bpp; > - if (is_edp(intel_dp) && dev_priv->vbt.edp_bpp) { > + if (is_edp(intel_dp) && dev_priv->vbt.edp_bpp && > + dev_priv->vbt.edp_bpp < bpp) { > DRM_DEBUG_KMS("clamping bpp for eDP panel to BIOS-provided %i\n", > dev_priv->vbt.edp_bpp); > - bpp = min_t(int, bpp, dev_priv->vbt.edp_bpp); > + bpp = dev_priv->vbt.edp_bpp; > } > > for (; bpp >= 6*3; bpp -= 2*3) { > -- > 1.7.9.5 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@xxxxxxxxxxxxxxxxxxxxx > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx