| Message ID | 1351116457-1906-1-git-send-email-rodrigo.vivi@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
please ignore the other one. Stupid me (again) confused emacs with vim and messed title up. also I don't know why git send-email didn't like my in-reply-to On Wed, Oct 24, 2012 at 8:07 PM, Rodrigo Vivi <rodrigo.vivi@gmail.com> wrote: > If Hardware doesn't allow RC6p or RC6pp we shall avoid end users turning them on, falling back to the only RC6 deepness available. > > v2: fixed "if" comparison pointed by Chris Wilson > > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@gmail.com> > --- > drivers/gpu/drm/i915/intel_pm.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c > index 50f5809..b6362d0 100644 > --- a/drivers/gpu/drm/i915/intel_pm.c > +++ b/drivers/gpu/drm/i915/intel_pm.c > @@ -2370,7 +2370,7 @@ static void gen6_disable_rps(struct drm_device *dev) > int intel_enable_rc6(const struct drm_device *dev) > { > /* Respect the kernel parameter if it is set */ > - if (i915_enable_rc6 >= 0) > + if (i915_enable_rc6 == 0) > return i915_enable_rc6; > > if (INTEL_INFO(dev)->gen == 5) { > @@ -2394,6 +2394,9 @@ int intel_enable_rc6(const struct drm_device *dev) > return INTEL_RC6_ENABLE; > } > > + if (i915_enable_rc6 > 0) > + return i915_enable_rc6; > + > DRM_DEBUG_DRIVER("RC6 and deep RC6 enabled\n"); > return (INTEL_RC6_ENABLE | INTEL_RC6p_ENABLE); > } > -- > 1.7.11.7 >
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 50f5809..b6362d0 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -2370,7 +2370,7 @@ static void gen6_disable_rps(struct drm_device *dev) int intel_enable_rc6(const struct drm_device *dev) { /* Respect the kernel parameter if it is set */ - if (i915_enable_rc6 >= 0) + if (i915_enable_rc6 == 0) return i915_enable_rc6; if (INTEL_INFO(dev)->gen == 5) { @@ -2394,6 +2394,9 @@ int intel_enable_rc6(const struct drm_device *dev) return INTEL_RC6_ENABLE; } + if (i915_enable_rc6 > 0) + return i915_enable_rc6; + DRM_DEBUG_DRIVER("RC6 and deep RC6 enabled\n"); return (INTEL_RC6_ENABLE | INTEL_RC6p_ENABLE); }
If Hardware doesn't allow RC6p or RC6pp we shall avoid end users turning them on, falling back to the only RC6 deepness available. v2: fixed "if" comparison pointed by Chris Wilson Signed-off-by: Rodrigo Vivi <rodrigo.vivi@gmail.com> --- drivers/gpu/drm/i915/intel_pm.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)