[PATCH] drm/i915: bdw: fix RC6 enabled status reporting and disable runtime PM

[PATCH] drm/i915: bdw: fix RC6 enabled status reporting and disable runtime PM

[Imre Deak]

On BDW we don't enable RC6 at the moment, but this isn't reflected in
the (sanitized) i915.enable_rc6 option. So make enable_rc6 report
correctly that RC6 is disabled, which will also effectively disable RPM
on BDW (since RPM depends on RC6).

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=77565

Signed-off-by: Imre Deak <imre.deak@intel.com>
---
 drivers/gpu/drm/i915/intel_pm.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index d49ec02..19020e5 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -3260,6 +3260,10 @@ static int sanitize_rc6_option(const struct drm_device *dev, int enable_rc6)
 	if (INTEL_INFO(dev)->gen == 5 && !IS_IRONLAKE_M(dev))
 		return 0;
 
+	/* Disable RC6 on Broadwell for now */
+	if (IS_BROADWELL(dev))
+		return 0;
+
 	/* Respect the kernel parameter if it is set */
 	if (enable_rc6 >= 0) {
 		int mask;
-- 
1.8.4

Re: [PATCH] drm/i915: bdw: fix RC6 enabled status reporting and disable runtime PM

[Daniel Vetter]

On Mon, Apr 28, 2014 at 12:03:59PM +0300, Imre Deak wrote:
> On BDW we don't enable RC6 at the moment, but this isn't reflected in
> the (sanitized) i915.enable_rc6 option. So make enable_rc6 report
> correctly that RC6 is disabled, which will also effectively disable RPM
> on BDW (since RPM depends on RC6).
> 
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=77565
> 
> Signed-off-by: Imre Deak <imre.deak@intel.com>

Officially we've merged runtime PM, but if it doesn't work we need to
temporarily disable. Queued for -next, thanks for the patch.
-Daniel

> ---
>  drivers/gpu/drm/i915/intel_pm.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index d49ec02..19020e5 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -3260,6 +3260,10 @@ static int sanitize_rc6_option(const struct drm_device *dev, int enable_rc6)
>  	if (INTEL_INFO(dev)->gen == 5 && !IS_IRONLAKE_M(dev))
>  		return 0;
>  
> +	/* Disable RC6 on Broadwell for now */
> +	if (IS_BROADWELL(dev))
> +		return 0;
> +
>  	/* Respect the kernel parameter if it is set */
>  	if (enable_rc6 >= 0) {
>  		int mask;
> -- 
> 1.8.4
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@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