| Message ID | 1344589820-9753-1-git-send-email-daniel.vetter@ffwll.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hello, I confirm this patch work apply to kernel 3.6-rc1 Best regards On 10/08/2012 11:10, Daniel Vetter wrote: > This has originally been introduced to not oversubscribe the dp links > in > > commit 885a5fb5b120a5c7e0b3baad7b0feb5a89f76c18 > Author: Zhenyu Wang <zhenyuw@linux.intel.com> > Date: Tue Jan 12 05:38:31 2010 +0800 > > drm/i915: fix pixel color depth setting on eDP > > Since then we've fixed up the dp link bandwidth calculation code for > code and should now automatically fall back to 6bpc dithering. So this > is unnecessary. > > Furthermore it seems to break the new MacbookPro with retina display, > hence let's just rip this out. > > Reported-by: Benoit Gschwind <gschwind@gnu-log.net> > Cc: Benoit Gschwind <gschwind@gnu-log.net> > Cc: Francois Rigaut <frigaut@gmail.com> > Cc: Greg KH <gregkh@linuxfoundation.org> > Cc: stable@vger.kernel.org > Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> > > -- > > Testing feedback highgly welcome, and thanks for Benoit for finding > out that the bpc computations are busted. > -Daniel > --- > drivers/gpu/drm/i915/intel_display.c | 11 ----------- > 1 file changed, 11 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index bddb290..ddd4db3 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -3755,17 +3755,6 @@ static bool intel_choose_pipe_bpp_dither(struct drm_crtc *crtc, > continue; > } > > - if (intel_encoder->type == INTEL_OUTPUT_EDP) { > - /* Use VBT settings if we have an eDP panel */ > - unsigned int edp_bpc = dev_priv->edp.bpp / 3; > - > - if (edp_bpc < display_bpc) { > - DRM_DEBUG_KMS("clamping display bpc (was %d) to eDP (%d)\n", display_bpc, edp_bpc); > - display_bpc = edp_bpc; > - } > - continue; > - } > - > /* Not one of the known troublemakers, check the EDID */ > list_for_each_entry(connector, &dev->mode_config.connector_list, > head) {
Am Freitag, den 10.08.2012, 11:10 +0200 schrieb Daniel Vetter: There is a typo in the commit summary: i*gn*ore. > This has originally been introduced to not oversubscribe the dp links > in > > commit 885a5fb5b120a5c7e0b3baad7b0feb5a89f76c18 > Author: Zhenyu Wang <zhenyuw@linux.intel.com> > Date: Tue Jan 12 05:38:31 2010 +0800 > > drm/i915: fix pixel color depth setting on eDP > > Since then we've fixed up the dp link bandwidth calculation code for > code `for code` should be removed. > and should now automatically fall back to 6bpc dithering. So this > is unnecessary. > > Furthermore it seems to break the new MacbookPro with retina display, > hence let's just rip this out. > > Reported-by: Benoit Gschwind <gschwind@gnu-log.net> > Cc: Benoit Gschwind <gschwind@gnu-log.net> > Cc: Francois Rigaut <frigaut@gmail.com> > Cc: Greg KH <gregkh@linuxfoundation.org> > Cc: stable@vger.kernel.org > Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> > > -- > > Testing feedback highgly welcome, and thanks for Benoit for finding > out that the bpc computations are busted. > -Daniel > --- > drivers/gpu/drm/i915/intel_display.c | 11 ----------- > 1 file changed, 11 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index bddb290..ddd4db3 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -3755,17 +3755,6 @@ static bool intel_choose_pipe_bpp_dither(struct drm_crtc *crtc, > continue; > } > > - if (intel_encoder->type == INTEL_OUTPUT_EDP) { > - /* Use VBT settings if we have an eDP panel */ > - unsigned int edp_bpc = dev_priv->edp.bpp / 3; > - > - if (edp_bpc < display_bpc) { > - DRM_DEBUG_KMS("clamping display bpc (was %d) to eDP (%d)\n", display_bpc, edp_bpc); > - display_bpc = edp_bpc; > - } > - continue; > - } > - > /* Not one of the known troublemakers, check the EDID */ > list_for_each_entry(connector, &dev->mode_config.connector_list, > head) { Acked-by: Paul Menzel <paulepanter@users.sourceforge.net> Thanks, Paul
On Fri, Aug 10, 2012 at 12:24:29PM +0200, Benoit Gschwind wrote: > > Hello, > > I confirm this patch work apply to kernel 3.6-rc1 Ok, I've picked this up for -fixes, with the commit message a bit improved. Let's see whether this blows up anywhere. -Daniel
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index bddb290..ddd4db3 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -3755,17 +3755,6 @@ static bool intel_choose_pipe_bpp_dither(struct drm_crtc *crtc, continue; } - if (intel_encoder->type == INTEL_OUTPUT_EDP) { - /* Use VBT settings if we have an eDP panel */ - unsigned int edp_bpc = dev_priv->edp.bpp / 3; - - if (edp_bpc < display_bpc) { - DRM_DEBUG_KMS("clamping display bpc (was %d) to eDP (%d)\n", display_bpc, edp_bpc); - display_bpc = edp_bpc; - } - continue; - } - /* Not one of the known troublemakers, check the EDID */ list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
This has originally been introduced to not oversubscribe the dp links in commit 885a5fb5b120a5c7e0b3baad7b0feb5a89f76c18 Author: Zhenyu Wang <zhenyuw@linux.intel.com> Date: Tue Jan 12 05:38:31 2010 +0800 drm/i915: fix pixel color depth setting on eDP Since then we've fixed up the dp link bandwidth calculation code for code and should now automatically fall back to 6bpc dithering. So this is unnecessary. Furthermore it seems to break the new MacbookPro with retina display, hence let's just rip this out. Reported-by: Benoit Gschwind <gschwind@gnu-log.net> Cc: Benoit Gschwind <gschwind@gnu-log.net> Cc: Francois Rigaut <frigaut@gmail.com> Cc: Greg KH <gregkh@linuxfoundation.org> Cc: stable@vger.kernel.org Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> -- Testing feedback highgly welcome, and thanks for Benoit for finding out that the bpc computations are busted. -Daniel --- drivers/gpu/drm/i915/intel_display.c | 11 ----------- 1 file changed, 11 deletions(-)