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 837E71FECBA; Thu, 30 Jul 2026 16:00:12 +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=1785427214; cv=none; b=oO0mFMW4o3ESQTvxyzGgNku7hfRPI0Tr51scuWCi5w6d308OyiUZsECMJ9K/6A/7K5+XdUTDFWnY3PfgqLTugm0aa9Swy1yQG633liBp2vWC3bLwKmSzBhgbK7oE4iCbH1TEHMa+m1VBkBvmFswT4LTjcxkghHH7nBfm0dgCyuA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785427214; c=relaxed/simple; bh=5KMqPJJceNvYKHY25LWIcT7R5gJr5Re/mbPjpA8X29U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uVSkPNiZpHHoFvrF8f7XKhhik099W/dmAWVqin2oK1p7pIoDzAqz76f49gyX/Ow3HeFODi2JoFAeD42DvZgSpDqZBUwVkGHBr6t3yW6TpMsbVD4A8/iQ8hy7yUrCtTztOkJ+tgU4wU8A9wSSXO95p58c7ivk/NgRfWBVeF2kXXc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ORvfYZoE; 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="ORvfYZoE" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D59FA1F000E9; Thu, 30 Jul 2026 16:00:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1785427212; bh=E8UC5KEqcG0PdHXA6qRJBH0voaD33vR13e9kclounFI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ORvfYZoECzEdO0bD51pYdHa6gr9rMLo3TcedL1NdfBNPHhEMmNCFFN5oZj5BNviqF x9HX7eT0Zi6+hu/2TQQv5wpcH3RvYFrYvXvbVdbeBGFpHLrXGZw8AXDEzqwblcPCB6 FnIlqv/vjxkWjI9vGEwiys5n4uDfUxH9Fyepe5xE= 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.6 084/484] drm/i915/gt: use correct selftest config symbol Date: Thu, 30 Jul 2026 16:09:41 +0200 Message-ID: <20260730141425.273222828@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260730141423.392222816@linuxfoundation.org> References: <20260730141423.392222816@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.6-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 d304e0a948f0d1..13b27ee9e7bef2 100644 --- a/drivers/gpu/drm/i915/gt/intel_engine_user.c +++ b/drivers/gpu/drm/i915/gt/intel_engine_user.c @@ -260,7 +260,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