On Fri, Sep 09, 2016 at 06:21:43PM +0530, Sagar Arun Kamble wrote:
> From: Tom O'Rourke <Tom.O'rou...@intel.com>
>
> This patch makes SLPC enabled by default on
> platforms with hardware/firmware support.
>
> v1: Removing warning "enable_slpc < 0" as it is
> set to -1 with this patch now. This was caught by CI BAT.
>
> Signed-off-by: Tom O'Rourke <Tom.O'rou...@intel.com>
> Signed-off-by: Sagar Arun Kamble <sagar.a.kam...@intel.com>
> ---
> drivers/gpu/drm/i915/i915_params.c | 4 ++--
> drivers/gpu/drm/i915/intel_guc.h | 1 -
> 2 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_params.c
> b/drivers/gpu/drm/i915/i915_params.c
> index 72b3097..7b3b3fd 100644
> --- a/drivers/gpu/drm/i915/i915_params.c
> +++ b/drivers/gpu/drm/i915/i915_params.c
> @@ -36,7 +36,7 @@ struct i915_params i915 __read_mostly = {
> .enable_dc = -1,
> .enable_fbc = -1,
> .enable_execlists = -1,
> - .enable_slpc = 0,
> + .enable_slpc = -1,
> .enable_hangcheck = true,
> .enable_ppgtt = -1,
> .enable_psr = -1,
> @@ -135,7 +135,7 @@ MODULE_PARM_DESC(enable_execlists,
> module_param_named_unsafe(enable_slpc, i915.enable_slpc, int, 0400);
> MODULE_PARM_DESC(enable_slpc,
> "Override single-loop-power-controller (slpc) usage. "
> - "(-1=auto, 0=disabled [default], 1=enabled)");
> + "(-1=auto [default], 0=disabled, 1=enabled)");
>
> module_param_named_unsafe(enable_psr, i915.enable_psr, int, 0600);
> MODULE_PARM_DESC(enable_psr, "Enable PSR "
> diff --git a/drivers/gpu/drm/i915/intel_guc.h
> b/drivers/gpu/drm/i915/intel_guc.h
> index 6e24e60..e9e1163 100644
> --- a/drivers/gpu/drm/i915/intel_guc.h
> +++ b/drivers/gpu/drm/i915/intel_guc.h
> @@ -151,7 +151,6 @@ struct intel_guc {
>
> static inline int intel_slpc_enabled(void)
> {
> - WARN_ON(i915.enable_slpc < 0);
Remove this from the original path, and make it return a bool, since
i915.enable_slpc is always sanitized.
The this patch simply becomes flipping the switch.
-Chris
--
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
