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

[Srivatsa, Anusha]

>-----Original Message-----
>From: Wajdeczko, Michal
>Sent: Thursday, December 14, 2017 2:18 PM
>To: intel-gfx at lists.freedesktop.org; Srivatsa, Anusha
><anusha.srivatsa at intel.com>
>Cc: Vivi, Rodrigo <rodrigo.vivi at intel.com>
>Subject: Re: [Intel-gfx] [PATCH] drm/i915/glk: Disable Guc and HuC on GLK
>
>On Thu, 14 Dec 2017 22:58:37 +0100, Anusha Srivatsa
><anusha.srivatsa at intel.com> wrote:
>
>> Since the firmwares are released yet to public repo, disable them on
>> Geminilake.
>>
>> Cc: Rodrigo Vivi <rodrigo.vivi at intel.com>
>> Signed-off-by: Anusha Srivatsa <anusha.srivatsa at intel.com>
>> ---
>>  drivers/gpu/drm/i915/i915_pci.c | 5 +++++
>>  1 file changed, 5 insertions(+)
>>
>> diff --git a/drivers/gpu/drm/i915/i915_pci.c
>> b/drivers/gpu/drm/i915/i915_pci.c index fa67d3d..ddf7530 100644
>> --- a/drivers/gpu/drm/i915/i915_pci.c
>> +++ b/drivers/gpu/drm/i915/i915_pci.c
>> @@ -521,6 +521,11 @@ static const struct intel_device_info
>> intel_geminilake_info __initconst = {
>>  	GEN9_LP_FEATURES,
>>  	.platform = INTEL_GEMINILAKE,
>>  	.ddb_size = 1024,
>> +	/* FIXME Geminilake supports GuC but currently firmwares
>> +	 * have not made it to public repo. Lets disable the support
>> +	 * as a temporary fix.
>> +	 */
>> +	.has_guc = 0,
>
>Maybe better place to put this fix is __get_platform_enable_guc() like in [1] [1]
>https://patchwork.freedesktop.org/patch/192006/

Michal,
 Hmm the reference patch  is controlling guc/huc through  a module parameter but wont the above approach be neater platform wise? 

Anusha 
>diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c
>index 49bccc9..22b0afe 100644
>--- a/drivers/gpu/drm/i915/intel_uc.c
>+++ b/drivers/gpu/drm/i915/intel_uc.c
>@@ -60,6 +60,8 @@ static int __get_platform_enable_guc(struct
>drm_i915_private *dev_priv)
>  		enable_guc |= ENABLE_GUC_LOAD_HUC;
>
>  	/* Any platform specific fine-tuning can be done here */
>+	if (IS_GEMINILAKE(dev_priv))
>+		enable_guc = 0; /* no firmware on CI machines */
>
>  	return enable_guc;
>  }
>
>
>>  	GLK_COLORS,
>>  };