From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A2D383750CF; Thu, 30 Jul 2026 15:00:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785423644; cv=none; b=FXNJ/bxpYo/nBQXqv0zT4da32SC1MfQKeelT+gXt9MnabG3MToq3uSgz8fWOyYkKdSBbFCJZqhK0PVHSx47o/ShjjTdiVx4o4wc/goCt2EJ5stnX/e/DabFxSnRAashdhY7V4uLsDm9E4A4fRTfaM2HMuTMxxaHHPtsyMazSIj0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785423644; c=relaxed/simple; bh=6Znmcxs6NS4UIGwFwjHxufoQYVl42LfCmC8FlagAdlA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LYgMFFuXZ0TEF1UxTiythLl/wDigH4gwdR0eM0FZiGYetKsrYBFZ56tfsRoBeky7IqlODsza2Rgj7D/S/TAxdrmGtgzznVvVSFEUBs931aYGFXhzUzMC0wYbQ3SqPoEVfB6p33yxVFyMKCEK1I8r+qC4qR67eZbDEFixKwcZjdc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=N5LrhgTu; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="N5LrhgTu" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F3BEC1F000E9; Thu, 30 Jul 2026 15:00:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1785423643; bh=byqKuKLtNPhLc5ERKxoQt4/xrVklyUSzHSd4NiLsqtA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=N5LrhgTuJFQGguaozdfAowHSILBdlTcpCxE0kYN2qJts3ZMrMRHJI9E8FJXw1KXjV BpIDoCv06IGSDes+tVdX2dK8FBoo5IoedUFeGeBiKR3WrgApyABN+VdKm1s3XOzcjG clZjJlS1rrcRyJZpwsAK+gx2JgOJShhGm4n5trcg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Pengpeng Hou , Tvrtko Ursulin , Rodrigo Vivi , Sasha Levin Subject: [PATCH 6.18 114/675] drm/i915/gt: use correct selftest config symbol Date: Thu, 30 Jul 2026 16:07:24 +0200 Message-ID: <20260730141447.565804952@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260730141445.110192266@linuxfoundation.org> References: <20260730141445.110192266@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Pengpeng Hou [ Upstream commit a82f1bb8191aec98a971a2196136016ef70c0880 ] 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 Signed-off-by: Tvrtko Ursulin Link: https://lore.kernel.org/r/20260705080225.436-1-pengpeng@iscas.ac.cn (cherry picked from commit 14a2012a490258f3f93857bc4f1b203405964be7) Signed-off-by: Rodrigo Vivi Signed-off-by: Sasha Levin --- 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 833987015b8bbc..ed42b9d05a07d5 100644 --- a/drivers/gpu/drm/i915/gt/intel_engine_user.c +++ b/drivers/gpu/drm/i915/gt/intel_engine_user.c @@ -257,7 +257,7 @@ void intel_engines_driver_register(struct drm_i915_private *i915) 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.53.0