From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 1438614D29B; Sun, 7 Sep 2025 20:45:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757277941; cv=none; b=tT0q7uLdsvdr+jtKiovIsarmMv3Te2yfEzmBQDuC9k7Q/wGVtkzD5IDzRKxNk3eGIuFgjDB64YUR7ZpxXSg1/lN5NgyYQGZeoQP6Cpdp4ia5KVTv/PSCruKRnBYcrFywrbLUtaR1JtfdlJpFKlAF0hkuMZEvqUFHxHwNNG2Slcg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757277941; c=relaxed/simple; bh=9k/6+0PMCK1NEs0VMZux+8MMHW2Iew+MavCijYvOA9s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=NhI4s6McP1GugFUAaqIc6jhvbg+ZW4NSEBZA3mc3BN8FSaz9t/Av+CTVDKpPl0oNphN566mwqy5cIOGHL+c6DZ1KQzuRed+Gy5AScExrGF27hN3MD5wZIYp9CMIn4Zj8W6xwAlwJlQScLQq027KR2YdnoXPmlShVYO6L+Ez6RFA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=xBpglu4w; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="xBpglu4w" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5138CC4CEF0; Sun, 7 Sep 2025 20:45:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1757277940; bh=9k/6+0PMCK1NEs0VMZux+8MMHW2Iew+MavCijYvOA9s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xBpglu4wEQDZO9basHT+ocK4R12EYHT36hiElW505DKmOeF4v7O3OssdZvGmXFJOC UY2KfZIMfVOM7w6kDTGj0VFO6qMjhpb/60P5UFNWW7ti3yOqYOpCq8kyWpdtaP9OPg eH2sR8icNTIXBg/LmHmalj0F9Zx+oB6btSJM41Iw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Matthew Auld , =?UTF-8?q?Thomas=20Hellstr=C3=B6m?= , Andi Shyti , =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= , Andi Shyti , Sasha Levin Subject: [PATCH 6.16 172/183] drm/i915/gem: Allow EXEC_CAPTURE on recoverable contexts on DG1 Date: Sun, 7 Sep 2025 21:59:59 +0200 Message-ID: <20250907195619.903088122@linuxfoundation.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250907195615.802693401@linuxfoundation.org> References: <20250907195615.802693401@linuxfoundation.org> User-Agent: quilt/0.68 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-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.16-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ville Syrjälä [ Upstream commit d6e020819612a4a06207af858e0978be4d3e3140 ] The intel-media-driver is currently broken on DG1 because it uses EXEC_CAPTURE with recovarable contexts. Relax the check to allow that. I've also submitted a fix for the intel-media-driver: https://github.com/intel/media-driver/pull/1920 Cc: stable@vger.kernel.org # v6.0+ Cc: Matthew Auld Cc: Thomas Hellström Testcase: igt/gem_exec_capture/capture-invisible Fixes: 71b1669ea9bd ("drm/i915/uapi: tweak error capture on recoverable contexts") Reviewed-by: Andi Shyti Signed-off-by: Ville Syrjälä Signed-off-by: Andi Shyti Link: https://lore.kernel.org/r/20250411144313.11660-2-ville.syrjala@linux.intel.com Signed-off-by: Sasha Levin --- drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c index ca7e9216934a7..ea9d5063ce78c 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c @@ -2013,7 +2013,7 @@ static int eb_capture_stage(struct i915_execbuffer *eb) continue; if (i915_gem_context_is_recoverable(eb->gem_context) && - (IS_DGFX(eb->i915) || GRAPHICS_VER_FULL(eb->i915) > IP_VER(12, 0))) + GRAPHICS_VER_FULL(eb->i915) > IP_VER(12, 10)) return -EINVAL; for_each_batch_create_order(eb, j) { -- 2.51.0