[PATCH] drm/i915/gt: use correct selftest config symbol

[PATCH] drm/i915/gt: use correct selftest config symbol

[Pengpeng Hou]

intel_engine_user.c checks CONFIG_DRM_I915_SELFTESTS before running
the engine UABI isolation check. Kconfig defines DRM_I915_SELFTEST,
without the trailing "S", and the rest of i915 uses
CONFIG_DRM_I915_SELFTEST.

Because CONFIG_DRM_I915_SELFTESTS is not backed by any Kconfig symbol,
the IS_ENABLED() test is always false. Use the existing selftest symbol
so the debug/selftest guarded path can be reached when selftests are
enabled.

This is a source-level fix. It does not claim dynamic hardware
reproduction; the evidence is the Kconfig definition and the inconsistent
guard in intel_engine_user.c.

Fixes: 750e76b4f9f6 ("drm/i915/gt: Move the [class][inst] lookup for engines onto the GT")
Signed-off-by: Pengpeng Hou <pengpeng@iscas.ac.cn>
---
 drivers/gpu/drm/i915/gt/intel_engine_user.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/gt/intel_engine_user.c b/drivers/gpu/drm/i915/gt/intel_engine_user.c
index be4bbff1a57c..d5190e11b270 100644
--- a/drivers/gpu/drm/i915/gt/intel_engine_user.c
+++ b/drivers/gpu/drm/i915/gt/intel_engine_user.c
@@ -259,7 +259,7 @@
 		p = &prev->rb_right;
 	}
 
-	if (IS_ENABLED(CONFIG_DRM_I915_SELFTESTS) &&
+	if (IS_ENABLED(CONFIG_DRM_I915_SELFTEST) &&
 	    IS_ENABLED(CONFIG_DRM_I915_DEBUG_GEM)) {
 		struct intel_engine_cs *engine;
 		unsigned int isolation;
-- 
2.39.5

Re: [PATCH] drm/i915/gt: use correct selftest config symbol

[Tvrtko Ursulin]

On 05/07/2026 09:02, Pengpeng Hou wrote:
> intel_engine_user.c checks CONFIG_DRM_I915_SELFTESTS before running
> the engine UABI isolation check. Kconfig defines DRM_I915_SELFTEST,
> without the trailing "S", and the rest of i915 uses
> CONFIG_DRM_I915_SELFTEST.
> 
> Because CONFIG_DRM_I915_SELFTESTS is not backed by any Kconfig symbol,
> the IS_ENABLED() test is always false. Use the existing selftest symbol
> so the debug/selftest guarded path can be reached when selftests are
> enabled.
> 
> This is a source-level fix. It does not claim dynamic hardware
> reproduction; the evidence is the Kconfig definition and the inconsistent
> guard in intel_engine_user.c.
> 
> Fixes: 750e76b4f9f6 ("drm/i915/gt: Move the [class][inst] lookup for engines onto the GT")
> Signed-off-by: Pengpeng Hou <pengpeng@iscas.ac.cn>
> ---
>   drivers/gpu/drm/i915/gt/intel_engine_user.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/gt/intel_engine_user.c b/drivers/gpu/drm/i915/gt/intel_engine_user.c
> index be4bbff1a57c..d5190e11b270 100644
> --- a/drivers/gpu/drm/i915/gt/intel_engine_user.c
> +++ b/drivers/gpu/drm/i915/gt/intel_engine_user.c
> @@ -259,7 +259,7 @@
>   		p = &prev->rb_right;
>   	}
>   
> -	if (IS_ENABLED(CONFIG_DRM_I915_SELFTESTS) &&
> +	if (IS_ENABLED(CONFIG_DRM_I915_SELFTEST) &&
>   	    IS_ENABLED(CONFIG_DRM_I915_DEBUG_GEM)) {
>   		struct intel_engine_cs *engine;
>   		unsigned int isolation;

Looks correct but we need to have a test run done to see that the checks 
this guards actually pass. Please stay tuned for results and please do 
ping us in a week or so if we forget.

Regards,

Tvrtko

Re: [PATCH] drm/i915/gt: use correct selftest config symbol

[Tvrtko Ursulin]

On 08/07/2026 09:41, Tvrtko Ursulin wrote:
> 
> On 05/07/2026 09:02, Pengpeng Hou wrote:
>> intel_engine_user.c checks CONFIG_DRM_I915_SELFTESTS before running
>> the engine UABI isolation check. Kconfig defines DRM_I915_SELFTEST,
>> without the trailing "S", and the rest of i915 uses
>> CONFIG_DRM_I915_SELFTEST.
>>
>> Because CONFIG_DRM_I915_SELFTESTS is not backed by any Kconfig symbol,
>> the IS_ENABLED() test is always false. Use the existing selftest symbol
>> so the debug/selftest guarded path can be reached when selftests are
>> enabled.
>>
>> This is a source-level fix. It does not claim dynamic hardware
>> reproduction; the evidence is the Kconfig definition and the inconsistent
>> guard in intel_engine_user.c.
>>
>> Fixes: 750e76b4f9f6 ("drm/i915/gt: Move the [class][inst] lookup for 
>> engines onto the GT")
>> Signed-off-by: Pengpeng Hou <pengpeng@iscas.ac.cn>
>> ---
>>   drivers/gpu/drm/i915/gt/intel_engine_user.c | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/i915/gt/intel_engine_user.c b/drivers/ 
>> gpu/drm/i915/gt/intel_engine_user.c
>> index be4bbff1a57c..d5190e11b270 100644
>> --- a/drivers/gpu/drm/i915/gt/intel_engine_user.c
>> +++ b/drivers/gpu/drm/i915/gt/intel_engine_user.c
>> @@ -259,7 +259,7 @@
>>           p = &prev->rb_right;
>>       }
>> -    if (IS_ENABLED(CONFIG_DRM_I915_SELFTESTS) &&
>> +    if (IS_ENABLED(CONFIG_DRM_I915_SELFTEST) &&
>>           IS_ENABLED(CONFIG_DRM_I915_DEBUG_GEM)) {
>>           struct intel_engine_cs *engine;
>>           unsigned int isolation;
> 
> Looks correct but we need to have a test run done to see that the checks 
> this guards actually pass. Please stay tuned for results and please do 
> ping us in a week or so if we forget.

CI was all green. Pushed to drm-intel-gt-next.

Thanks,

Tvrtko