[Intel-gfx] [PATCH 9/9] drm/i915: Re-enable rc6 on ILK (again^5)

[Daniel Vetter]

On Sun, Jul 14, 2013 at 09:22:53AM -0700, Ben Widawsky wrote:
> With the conversion to use the existing, well tested HW context code for
> the ILK RC6 render context, let's once again try to enable RC6 by
> default on ILK.
> 
> Signed-off-by: Ben Widawsky <ben at bwidawsk.net>

I think this commit should cite the last commit which reverted rc6 on ilk:

commit 6567d748c4e94e3481e523803ec07ebd825c80d6
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sat Nov 10 10:00:06 2012 +0000

    Revert "drm/i915: enable rc6 on ilk again"

I agree that we could try this again (at least since the relocation
regression in 3.7 is fixed), but iirc it was rather unmistakably broken
with vt-d enabled, see:

commit cd7988eea561a70a4f98e431c1395f913672d626
Author: Daniel Vetter <daniel.vetter at ffwll.ch>
Date:   Sun Aug 26 20:33:18 2012 +0200

    drm/i915: disable rc6 on ilk when vt-d is enabled

So I think you need to pimp your commit a bit to essentially revert
6567d748c4e94e3481e523803 and also cite the above two commits.

Cheers, Daniel

> ---
>  drivers/gpu/drm/i915/intel_pm.c | 4 ----
>  1 file changed, 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index 03b90aa..c094aa3 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -3172,10 +3172,6 @@ int intel_enable_rc6(const struct drm_device *dev)
>  	if (i915_enable_rc6 >= 0)
>  		return i915_enable_rc6;
>  
> -	/* Disable RC6 on Ironlake */
> -	if (INTEL_INFO(dev)->gen == 5)
> -		return 0;
> -
>  	if (IS_HASWELL(dev)) {
>  		DRM_DEBUG_DRIVER("Haswell: only RC6 available\n");
>  		return INTEL_RC6_ENABLE;
> -- 
> 1.8.3.2
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

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