[Intel-gfx] [PATCH] drm/i915/glk: Disable Guc and HuC on GLK

[Rodrigo Vivi]

On Sat, Dec 23, 2017 at 12:05:14AM +0000, Anusha Srivatsa wrote:
> Since the firmwares are released yet to public repo,
> disable them on Geminilake.
> 
> v2: Remove the firmware versions (Michal)
> 
> Cc: Michal Wajdeczko <michal.wajdeczko at intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi at intel.com>
> Signed-off-by: Anusha Srivatsa <anusha.srivatsa at intel.com>

Fixes: 90f192c8241e ("drm/i915/GuC/GLK: Load GuC on GLK")
Fixes: db5ba0d8931e ("drm/i915/GLK/HuC: Load HuC on GLK")
Cc: <stable at vger.kernel.org> # v4.13+

What about a revert on those 2 patches?

I'm fine with one patch approach, but the fixes tag needs to be here anyways.

> ---
>  drivers/gpu/drm/i915/intel_guc_fw.c | 4 ----
>  drivers/gpu/drm/i915/intel_huc.c    | 4 ----
>  2 files changed, 8 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_guc_fw.c b/drivers/gpu/drm/i915/intel_guc_fw.c
> index cbc51c9..252b475 100644
> --- a/drivers/gpu/drm/i915/intel_guc_fw.c
> +++ b/drivers/gpu/drm/i915/intel_guc_fw.c
> @@ -82,10 +82,6 @@ static void guc_fw_select(struct intel_uc_fw *guc_fw)
>  		guc_fw->path = I915_KBL_GUC_UCODE;
>  		guc_fw->major_ver_wanted = KBL_FW_MAJOR;
>  		guc_fw->minor_ver_wanted = KBL_FW_MINOR;
> -	} else if (IS_GEMINILAKE(dev_priv)) {
> -		guc_fw->path = I915_GLK_GUC_UCODE;
> -		guc_fw->major_ver_wanted = GLK_FW_MAJOR;
> -		guc_fw->minor_ver_wanted = GLK_FW_MINOR;

But also, please it is mandatory to also remove the now unused I915_GLK_GUC_UCODE,
GLK_FW_MAJOR, and GLK_FW_MINOR

>  	} else {
>  		DRM_WARN("%s: No firmware known for this platform!\n",
>  			 intel_uc_fw_type_repr(guc_fw->type));
> diff --git a/drivers/gpu/drm/i915/intel_huc.c b/drivers/gpu/drm/i915/intel_huc.c
> index 974be3d..3f28ae0 100644
> --- a/drivers/gpu/drm/i915/intel_huc.c
> +++ b/drivers/gpu/drm/i915/intel_huc.c
> @@ -103,10 +103,6 @@ static void huc_fw_select(struct intel_uc_fw *huc_fw)
>  		huc_fw->path = I915_KBL_HUC_UCODE;
>  		huc_fw->major_ver_wanted = KBL_HUC_FW_MAJOR;
>  		huc_fw->minor_ver_wanted = KBL_HUC_FW_MINOR;
> -	} else if (IS_GEMINILAKE(dev_priv)) {
> -		huc_fw->path = I915_GLK_HUC_UCODE;
> -		huc_fw->major_ver_wanted = GLK_HUC_FW_MAJOR;
> -		huc_fw->minor_ver_wanted = GLK_HUC_FW_MINOR;

and unused I915_GLK_HUC_UCODE, GLK_HUC_FW_MAJOR, and GLK_HUC_FW_MINOR.

>  	} else {
>  		DRM_WARN("%s: No firmware known for this platform!\n",
>  			 intel_uc_fw_type_repr(huc_fw->type));
> -- 
> 2.7.4
>