[PATCH 3/3] HACK/drm/i915/guc: Enable GuC for testing

[Sagar Arun Kamble]

On 1/3/2018 11:25 AM, Sagar Arun Kamble wrote:
> Signed-off-by: Sagar Arun Kamble <sagar.a.kamble at intel.com>
> ---
>   drivers/gpu/drm/i915/i915_gem_gtt.c | 4 ++--
>   drivers/gpu/drm/i915/i915_params.c  | 2 +-
>   2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
> index c5f3938..eb2c6af 100644
> --- a/drivers/gpu/drm/i915/i915_gem_gtt.c
> +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
> @@ -3549,7 +3549,7 @@ int i915_ggtt_enable_hw(struct drm_i915_private *dev_priv)
>   
>   void i915_ggtt_enable_guc(struct drm_i915_private *i915)
>   {
> -	GEM_BUG_ON(i915->ggtt.invalidate != gen6_ggtt_invalidate);
> +//	GEM_BUG_ON(i915->ggtt.invalidate != gen6_ggtt_invalidate);
>   
>   	i915->ggtt.invalidate = guc_ggtt_invalidate;
>   
> @@ -3559,7 +3559,7 @@ void i915_ggtt_enable_guc(struct drm_i915_private *i915)
>   void i915_ggtt_disable_guc(struct drm_i915_private *i915)
>   {
>   	/* We should only be called after i915_ggtt_enable_guc() */
> -	GEM_BUG_ON(i915->ggtt.invalidate != guc_ggtt_invalidate);
> +//	GEM_BUG_ON(i915->ggtt.invalidate != guc_ggtt_invalidate);
>   
>   	i915->ggtt.invalidate = gen6_ggtt_invalidate;
>   
> diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c
> index b5f3eb4..a9cc03a 100644
> --- a/drivers/gpu/drm/i915/i915_params.c
> +++ b/drivers/gpu/drm/i915/i915_params.c
> @@ -152,7 +152,7 @@ struct i915_params i915_modparams __read_mostly = {
>   i915_param_named_unsafe(enable_guc, int, 0400,
>   	"Enable GuC load for GuC submission and/or HuC load. "
>   	"Required functionality can be selected using bitmask values. "
> -	"(-1=auto, 0=disable [default], 1=GuC submission, 2=HuC load)");
> +	"(-1=auto [default], 0=disable, 1=GuC submission, 2=HuC load)");
Oops. forgot to actually enable it :)
>   
>   i915_param_named(guc_log_level, int, 0400,
>   	"GuC firmware logging level (-1:disabled (default), 0-3:enabled)");