[Intel-gfx] [PATCH 21/37] drm/i915: calculate watermarks on Gen7 archs in one place

[Chris Wilson]

On Wed, 21 Mar 2012 22:09:56 -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 c225de4..46633fe 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -4649,7 +4649,7 @@ void sandybridge_update_wm(struct drm_device *dev)
>  	}
>  
>  	/* IVB has 3 pipes */
> -	if (IS_IVYBRIDGE(dev) &&
> +	if (IS_GEN7(dev) &&

I can sense a Jesse rant about needing proper names to distinguish gen7
render engines versus gen7 displays. But maybe another time. ;-)
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre