[PATCH] drm/i915: pass adjusted_mode to intel_choose_pipe_bpp_dither(), again

[PATCH] drm/i915: pass adjusted_mode to intel_choose_pipe_bpp_dither(), again

[Jani Nikula]

Daniel's backmerge

commit c2fb7916927e989ea424e61ce5fe617e54878827
Merge: 29de6ce 6f0c058
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date:   Mon Oct 22 14:34:51 2012 +0200

    Merge tag 'v3.7-rc2' into drm-intel-next-queued

to solve conflicts blew up (either git or Daniel was trying to be too
clever for their own good; it's usually convenient to blame tools ;) and
caused the changes of

commit 0c96c65b48fba3ffe9822a554cbc0cd610765cd5
Author: Jani Nikula <jani.nikula@intel.com>
Date:   Wed Sep 26 18:43:10 2012 +0300

    drm/i915: use adjusted_mode instead of mode for checking the 6bpc force flag

in ironlake_crtc_mode_set() to be dropped.

Fix the call in ironlake_crtc_mode_set() again, and while at it, also fix
the new, copy-pasted haswell_crtc_mode_set() to use adjusted_mode.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/i915/intel_display.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 3c7fa92..4be95e8 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -5471,7 +5471,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;
 
@@ -5673,7 +5674,8 @@ static int haswell_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;
 
-- 
1.7.9.5

Re: [PATCH] drm/i915: pass adjusted_mode to intel_choose_pipe_bpp_dither(), again

[Daniel Vetter]

On Fri, Nov 02, 2012 at 10:19:55AM +0200, Jani Nikula wrote:
> Daniel's backmerge
> 
> commit c2fb7916927e989ea424e61ce5fe617e54878827
> Merge: 29de6ce 6f0c058
> Author: Daniel Vetter <daniel.vetter@ffwll.ch>
> Date:   Mon Oct 22 14:34:51 2012 +0200
> 
>     Merge tag 'v3.7-rc2' into drm-intel-next-queued
> 
> to solve conflicts blew up (either git or Daniel was trying to be too
> clever for their own good; it's usually convenient to blame tools ;) and
> caused the changes of
> 
> commit 0c96c65b48fba3ffe9822a554cbc0cd610765cd5
> Author: Jani Nikula <jani.nikula@intel.com>
> Date:   Wed Sep 26 18:43:10 2012 +0300
> 
>     drm/i915: use adjusted_mode instead of mode for checking the 6bpc force flag
> 
> in ironlake_crtc_mode_set() to be dropped.
> 
> Fix the call in ironlake_crtc_mode_set() again, and while at it, also fix
> the new, copy-pasted haswell_crtc_mode_set() to use adjusted_mode.
> 
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Applied, thanks for the patch.
-Daniel
> ---
>  drivers/gpu/drm/i915/intel_display.c |    6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 3c7fa92..4be95e8 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -5471,7 +5471,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;
>  
> @@ -5673,7 +5674,8 @@ static int haswell_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;
>  
> -- 
> 1.7.9.5
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch