[Intel-gfx] [PATCH v2 22/22] HAX: prevent CI failures on configs with forced GuC submission

[Michal Wajdeczko]

On Fri, 12 Apr 2019 13:30:47 +0200, Martin Peres  
<martin.peres at linux.intel.com> wrote:

> On 11/04/2019 11:44, Michal Wajdeczko wrote:
>> Some CI systems might be configured to run with no longer supported
>> configuration "enable_guc=3" or "enable_guc=1". Hack that ;)
>
> This is not a hack, this is what we need to do: Users put parameters in
> their command line and forget about them, myself included.
>
> GUC Command submission does not work / is not validated on any released
> platform, so force-disable it.

We don't want to silently switch to execlist submission. We stopped doing
that from commit 121981fafe69 ("drm/i915/guc: Combine enable_guc_loading|
submission modparams").

Patch [2/22] will take care to WARN user and stop GPU submission if this
modparam was configured to use GuC submission.

Michal

[2/22] https://patchwork.freedesktop.org/patch/298018/?series=58760&rev=2

> If someone starts working on enabling
> that, then it is easy to make a HAX patch to force-enable it ;)
>
>
> Anyways, thanks a lot, seems like there is good progress!
>
> Martin
>
>>
>> Signed-off-by: Michal Wajdeczko <michal.wajdeczko at intel.com>
>> ---
>>  drivers/gpu/drm/i915/intel_uc.c | 6 ++++++
>>  1 file changed, 6 insertions(+)
>>
>> diff --git a/drivers/gpu/drm/i915/intel_uc.c  
>> b/drivers/gpu/drm/i915/intel_uc.c
>> index a1a068511fd9..c40c8e6e6cd9 100644
>> --- a/drivers/gpu/drm/i915/intel_uc.c
>> +++ b/drivers/gpu/drm/i915/intel_uc.c
>> @@ -105,6 +105,12 @@ static void sanitize_options_early(struct  
>> drm_i915_private *i915)
>>  	struct intel_uc_fw *guc_fw = &i915->guc.fw;
>>  	struct intel_uc_fw *huc_fw = &i915->huc.fw;
>>
>> +	/* HAX: prevent CI failures on configs with forced GuC */
>> +	if (i915_modparams.enable_guc & ENABLE_GUC_SUBMISSION) {
>> +		DRM_DEBUG_DRIVER("turning off ENABLE_GUC_SUBMISSION\n");
>> +		i915_modparams.enable_guc &= ~ENABLE_GUC_SUBMISSION;
>> +	}
>> +
>>  	/* A negative value means "use platform default" */
>>  	if (i915_modparams.enable_guc < 0)
>>  		i915_modparams.enable_guc = __get_platform_enable_guc(i915);