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 CCB40282F29; Mon, 17 Aug 2026 15:05:15 +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=1786979116; cv=none; b=pHaqpDRmGp030WUeEkteoip56xbHnUtFvRHzB1aSi6K9p237E83gAwoJXKf//CFj2nQ2Neb07g5LJzdBgl74Nj4xY91STO5/ilGoadWk7v2DmLiQrvnNftPsAQI2nUPFBPSFja3fGLGMfn8+wPvnD6JTfEaixKq0BwQnckKSfKk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786979116; c=relaxed/simple; bh=D80E0upoOYcCLXVt6k+mQJcZSJfLJbuvYCuUsIsKbHc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Vq+/YlI1VcIHzWo7Ay2bqUVkD/jjDgEQkwfhUmTCiB7f4gLo0KZeoC32azygSDFuiEEZjzskJSAcJk1jesvvrGwwfJ71s8fSP1vUB/eFWzA5YedR53neCvXWgv8LiS2wdt004dSINZ05q39r7cmDrQZTBFh4LKq9ng+QkzCvDHo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=F66yS7WM; 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="F66yS7WM" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 33D6C1F00A3A; Mon, 17 Aug 2026 15:05:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1786979115; bh=Koeqtz17AhX/NpDoUV2qjNNR0RGU4CiJH06N3aEZJbc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=F66yS7WMayk+60eXDxp2gVZMMyXbZhTIKmRaOKMrggYScLv3d1bWmAccr6qwJj+Ju /PXkBP4oaFFipirxBs3sjK/McQ3RJktAbB29fAv4mSWbhrhDYJPwVFT43/TA+xFrIF /h5j1D8YwbKb/dlyv/x9SZegTGbAzoAZhfWF4imI= 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.1 065/609] drm/i915/gt: use correct selftest config symbol Date: Mon, 17 Aug 2026 15:26:01 +0200 Message-ID: <20260817132545.657803581@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260817132543.039278408@linuxfoundation.org> References: <20260817132543.039278408@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.1-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 46a174f8aa0076..9a4309c30f0ea8 100644 --- a/drivers/gpu/drm/i915/gt/intel_engine_user.c +++ b/drivers/gpu/drm/i915/gt/intel_engine_user.c @@ -239,7 +239,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