| Message ID | 1348674190-16908-1-git-send-email-jani.nikula@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, 2012-09-26 at 18:43 +0300, Jani Nikula wrote: > The dithering introduced in > > commit 3b5c78a35cf7511c15e09a9b0ffab290a42d9bcf > Author: Adam Jackson <ajax@redhat.com> > Date: Tue Dec 13 15:41:00 2011 -0800 > > drm/i915/dp: Dither down to 6bpc if it makes the mode fit > > stores the INTEL_MODE_DP_FORCE_6BPC flag in the private_flags of the > adjusted mode, while i9xx_crtc_mode_set() and ironlake_crtc_mode_set() use > the original mode, without the flag, so it would never have any > effect. However, the BPC was clamped by VBT settings, making things work by > coincidence, until that part was removed in > > commit 4344b813f105a19f793f1fd93ad775b784648b95 > Author: Daniel Vetter <daniel.vetter@ffwll.ch> > Date: Fri Aug 10 11:10:20 2012 +0200 > > Use adjusted_mode instead of mode when checking for > INTEL_MODE_DP_FORCE_6BPC to make the flag have effect. > > v2: Don't forget to fix this in i9xx_crtc_mode_set() also, pointed out by > Daniel both before and after sending the first patch. Reviewed-by: Adam Jackson <ajax@redhat.com> - ajax
On Wed, Sep 26, 2012 at 11:50:36AM -0400, Adam Jackson wrote: > On Wed, 2012-09-26 at 18:43 +0300, Jani Nikula wrote: > > The dithering introduced in > > > > commit 3b5c78a35cf7511c15e09a9b0ffab290a42d9bcf > > Author: Adam Jackson <ajax@redhat.com> > > Date: Tue Dec 13 15:41:00 2011 -0800 > > > > drm/i915/dp: Dither down to 6bpc if it makes the mode fit > > > > stores the INTEL_MODE_DP_FORCE_6BPC flag in the private_flags of the > > adjusted mode, while i9xx_crtc_mode_set() and ironlake_crtc_mode_set() use > > the original mode, without the flag, so it would never have any > > effect. However, the BPC was clamped by VBT settings, making things work by > > coincidence, until that part was removed in > > > > commit 4344b813f105a19f793f1fd93ad775b784648b95 > > Author: Daniel Vetter <daniel.vetter@ffwll.ch> > > Date: Fri Aug 10 11:10:20 2012 +0200 > > > > Use adjusted_mode instead of mode when checking for > > INTEL_MODE_DP_FORCE_6BPC to make the flag have effect. > > > > v2: Don't forget to fix this in i9xx_crtc_mode_set() also, pointed out by > > Daniel both before and after sending the first patch. > > Reviewed-by: Adam Jackson <ajax@redhat.com> Picked up for -fixes, thanks for the patch. -Daniel
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 08c3f69..16a0895 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -4370,7 +4370,7 @@ static int i9xx_crtc_mode_set(struct drm_crtc *crtc, /* default to 8bpc */ pipeconf &= ~(PIPECONF_BPP_MASK | PIPECONF_DITHER_EN); if (is_dp) { - if (mode->private_flags & INTEL_MODE_DP_FORCE_6BPC) { + if (adjusted_mode->private_flags & INTEL_MODE_DP_FORCE_6BPC) { pipeconf |= PIPECONF_BPP_6 | PIPECONF_DITHER_EN | PIPECONF_DITHER_TYPE_SP; @@ -4936,7 +4936,8 @@ static int ironlake_crtc_mode_set(struct drm_crtc *crtc, intel_crtc_update_cursor(crtc, true); /* determine panel color depth */ - dither = intel_choose_pipe_bpp_dither(crtc, fb, &intel_crtc->bpp, mode); + dither = intel_choose_pipe_bpp_dither(crtc, fb, &intel_crtc->bpp, + adjusted_mode); if (is_lvds && dev_priv->lvds_dither) dither = true;
The dithering introduced in commit 3b5c78a35cf7511c15e09a9b0ffab290a42d9bcf Author: Adam Jackson <ajax@redhat.com> Date: Tue Dec 13 15:41:00 2011 -0800 drm/i915/dp: Dither down to 6bpc if it makes the mode fit stores the INTEL_MODE_DP_FORCE_6BPC flag in the private_flags of the adjusted mode, while i9xx_crtc_mode_set() and ironlake_crtc_mode_set() use the original mode, without the flag, so it would never have any effect. However, the BPC was clamped by VBT settings, making things work by coincidence, until that part was removed in commit 4344b813f105a19f793f1fd93ad775b784648b95 Author: Daniel Vetter <daniel.vetter@ffwll.ch> Date: Fri Aug 10 11:10:20 2012 +0200 Use adjusted_mode instead of mode when checking for INTEL_MODE_DP_FORCE_6BPC to make the flag have effect. v2: Don't forget to fix this in i9xx_crtc_mode_set() also, pointed out by Daniel both before and after sending the first patch. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=47621 CC: Adam Jackson <ajax@redhat.com> CC: stable@vger.kernel.org Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/i915/intel_display.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)