From patchwork Fri Apr 11 14:43:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?VmlsbGUgU3lyasOkbMOk?= X-Patchwork-Id: 14048466 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 25869C36010 for ; Fri, 11 Apr 2025 14:43:27 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AB73D10EBE1; Fri, 11 Apr 2025 14:43:25 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="NMT6Re1h"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.10]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0C1B510EBDE for ; Fri, 11 Apr 2025 14:43:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1744382603; x=1775918603; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=3Z6HT9Tfv0F4a8qgDzqrJy9v3ND72f5yLT6i3F3ZeW0=; b=NMT6Re1hSHyJSM4fFIpOCNUtsWpVDebSH/L6J23F50OCcnscu2mWEl/m f6i9UidfQ7ORZkoEp9pd1x+19/YYi1aqjHHJtRm0EREOyy7wgeCs0pH9S YPm7uh0uhvfKQQVMiHgwvMkogbWnw/VdNQtsFJThCvB4j53GdG4zlCdHB hJ5Ke4/ijR/SK98z1LIy+sUjTObgZ78RxQYsC2jjmyG/eofIHJI6wvfjv 0CKzH58ir8BBBimiZXyRA5ZPJqMEF1rT8eMMIGG2OTTW0q1mpQL45UN2E kFQlajnAhmZcu4lBtVZXPMBs3MQG5Nd1dbnSn4ZEXwvmpYFud9V/MqK5p Q==; X-CSE-ConnectionGUID: 78tnNyCgQByuIogBsg0qDQ== X-CSE-MsgGUID: QXS/SjJFQ1m2mvaaTHB/vQ== X-IronPort-AV: E=McAfee;i="6700,10204,11401"; a="57316231" X-IronPort-AV: E=Sophos;i="6.15,205,1739865600"; d="scan'208";a="57316231" Received: from orviesa005.jf.intel.com ([10.64.159.145]) by fmvoesa104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Apr 2025 07:43:19 -0700 X-CSE-ConnectionGUID: r9FBdMF5SOe0SZIBZ6HAWw== X-CSE-MsgGUID: zdrtha3ISFadceuLL7lzmQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,205,1739865600"; d="scan'208";a="134370135" Received: from stinkpipe.fi.intel.com (HELO stinkbox) ([10.237.72.74]) by orviesa005.jf.intel.com with SMTP; 11 Apr 2025 07:43:17 -0700 Received: by stinkbox (sSMTP sendmail emulation); Fri, 11 Apr 2025 17:43:16 +0300 From: Ville Syrjala To: intel-gfx@lists.freedesktop.org Cc: stable@vger.kernel.org, Matthew Auld , =?utf-8?q?Thomas_Hellstr=C3=B6m?= , Andi Shyti Subject: [PATCH v2 1/2] drm/i915/gem: Allow EXEC_CAPTURE on recoverable contexts on DG1 Date: Fri, 11 Apr 2025 17:43:12 +0300 Message-ID: <20250411144313.11660-2-ville.syrjala@linux.intel.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250411144313.11660-1-ville.syrjala@linux.intel.com> References: <20250411144313.11660-1-ville.syrjala@linux.intel.com> MIME-Version: 1.0 X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" From: Ville Syrjälä 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 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ä --- 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 ca7e9216934a..ea9d5063ce78 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) { From patchwork Fri Apr 11 14:43:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?VmlsbGUgU3lyasOkbMOk?= X-Patchwork-Id: 14048465 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 298AAC369AE for ; Fri, 11 Apr 2025 14:43:26 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A7A8710EBDE; Fri, 11 Apr 2025 14:43:24 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="mgI//BBT"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.10]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0C21310EBE1 for ; Fri, 11 Apr 2025 14:43:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1744382603; x=1775918603; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=xKiIJzgeAM0mnDrKELpUa0Nzp1Z7ANbbmWJpC3eFRl4=; b=mgI//BBTUiy4dBuJC380Nt071+KO9VSkSL7FujJAUw8tdyOUnKJYTcmm /p3mFOvRQV9JlRwdgw7LkDTMRaaNni1AP8bVgmpVkFKV2ieVkYDe9V1R7 EMbVIPuEop6wC+K6NgtZxdidkFUTxyD+dA1qRDGsnKzbX+n+DsvWkKEBu crvxKj4xp9I9Hnen4bbtVtTSXNTYk+5HXXc3LXOWdfzP5ySFxt0BB/96o RSOz5r99Id9xb5Kms6AsmOmbkgL0O4ENYxQpQivq4jJKqj8QP3FEbafrR LfkwG9b3eqrZ8ipv6eqIJm8MuQ12GR+/de8pkntvvcD72mxaZfN+Y1e/l A==; X-CSE-ConnectionGUID: pxpg7813RNuqXmEpi1J3+g== X-CSE-MsgGUID: xh8CkktvT9uwwcA0zTpYxQ== X-IronPort-AV: E=McAfee;i="6700,10204,11401"; a="57316235" X-IronPort-AV: E=Sophos;i="6.15,205,1739865600"; d="scan'208";a="57316235" Received: from orviesa005.jf.intel.com ([10.64.159.145]) by fmvoesa104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Apr 2025 07:43:22 -0700 X-CSE-ConnectionGUID: qjL5s+DySTC2DgIPhbCyoQ== X-CSE-MsgGUID: R9ydCCm5Qh6F6zabOJvmmg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,205,1739865600"; d="scan'208";a="134370137" Received: from stinkpipe.fi.intel.com (HELO stinkbox) ([10.237.72.74]) by orviesa005.jf.intel.com with SMTP; 11 Apr 2025 07:43:21 -0700 Received: by stinkbox (sSMTP sendmail emulation); Fri, 11 Apr 2025 17:43:19 +0300 From: Ville Syrjala To: intel-gfx@lists.freedesktop.org Cc: Andi Shyti Subject: [PATCH v2 2/2] drm/i915/pci: Remove force_probe requirement for DG1 Date: Fri, 11 Apr 2025 17:43:13 +0300 Message-ID: <20250411144313.11660-3-ville.syrjala@linux.intel.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250411144313.11660-1-ville.syrjala@linux.intel.com> References: <20250411144313.11660-1-ville.syrjala@linux.intel.com> MIME-Version: 1.0 X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" From: Ville Syrjälä Dunno why we still have .require_force_probe=1 on DG1 after all this time. I'm not aware of any real problems with DG1, so get rid of the force_probe requirement. Generally the difficulty with DG1 is that it requires a 4GiB BAR for the local memory, and that's not something that works on every system. Reviewed-by: Andi Shyti Signed-off-by: Ville Syrjälä --- drivers/gpu/drm/i915/i915_pci.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c index 21006c7f615c..b2e311f4791a 100644 --- a/drivers/gpu/drm/i915/i915_pci.c +++ b/drivers/gpu/drm/i915/i915_pci.c @@ -663,7 +663,6 @@ static const struct intel_device_info dg1_info = { DGFX_FEATURES, .__runtime.graphics.ip.rel = 10, PLATFORM(INTEL_DG1), - .require_force_probe = 1, .platform_engine_mask = BIT(RCS0) | BIT(BCS0) | BIT(VECS0) | BIT(VCS0) | BIT(VCS2),