[Intel-gfx] [PATCH 07/29] drm/i915: calculate same watermarks on Haswell as on Ivy Bridge

[Chris Wilson]

On Fri, 13 Apr 2012 17:08:43 -0300, Eugeni Dodonov <eugeni.dodonov at intel.com> wrote:
> Signed-off-by: Eugeni Dodonov <eugeni.dodonov at intel.com>
> ---
>  drivers/gpu/drm/i915/intel_display.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 36f6b8e..60b1540 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -4921,7 +4921,7 @@ void sandybridge_update_wm(struct drm_device *dev)
>  	}
>  
>  	/* IVB has 3 pipes */
> -	if (IS_IVYBRIDGE(dev) &&
> +	if ((IS_IVYBRIDGE(dev) || IS_HASWELL(dev)) &&

Would checking the number of pipes here bere more informative? Otherwise
the comment is stale.
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre