From patchwork Tue Apr 1 16:37:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ville Syrjala X-Patchwork-Id: 14035160 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 E13D1C36018 for ; Tue, 1 Apr 2025 16:37:59 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 75B8810E622; Tue, 1 Apr 2025 16:37:59 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="YKMOWzZ9"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) by gabe.freedesktop.org (Postfix) with ESMTPS id 40A8910E621 for ; Tue, 1 Apr 2025 16:37:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1743525478; x=1775061478; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=NmMpN0YUd/FwUsx5irtIWksDRxI/xPQ7RAUJeCvz5BA=; b=YKMOWzZ90c/XuVXu5TDkauM2Ipyd/fV7LwTAbutCOQ4mkuY75EYIGeYw 6WwiKtT73Vu12nZ2eOgO1YCSXRkN8Nl3XNim+JmUcmGPsIo6mTJunGCuO ikpY6knydPHwkU40ZephTaQrmTZkMGr1XD/MCKhV2wy5VDLqyvw/cNG9D 1Al2xQGcB356lZPddW/Ug9YraKad0pAH17L3WTbMpSgCwUmv6M/5KN2ge wsSghrIvryB5OKC1ZsplyhpdIh4SFuKw5vMIrV1NibGwZuOgde5tkLKrR b3Q4Hypnc74izsIaU+ndTMcHsU+hKTrSySkUdyqzJy5K1lFm0hLDbdffD Q==; X-CSE-ConnectionGUID: 4d0WNTkVSDmPNZpoe54GEw== X-CSE-MsgGUID: hnqkIGtlQGmOV1uSK7v6tg== X-IronPort-AV: E=McAfee;i="6700,10204,11391"; a="55520037" X-IronPort-AV: E=Sophos;i="6.14,293,1736841600"; d="scan'208";a="55520037" Received: from orviesa005.jf.intel.com ([10.64.159.145]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Apr 2025 09:37:58 -0700 X-CSE-ConnectionGUID: 3yVLeWTNRTuoniLiPHS2tQ== X-CSE-MsgGUID: KG8mpVMaRpmq6I3KQmqaow== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,293,1736841600"; d="scan'208";a="131638548" Received: from stinkpipe.fi.intel.com (HELO stinkbox) ([10.237.72.74]) by orviesa005.jf.intel.com with SMTP; 01 Apr 2025 09:37:57 -0700 Received: by stinkbox (sSMTP sendmail emulation); Tue, 01 Apr 2025 19:37:55 +0300 From: Ville Syrjala To: intel-gfx@lists.freedesktop.org Subject: [PATCH 1/4] drm/i915: Apply the combo PLL frac w/a on DG1 Date: Tue, 1 Apr 2025 19:37:49 +0300 Message-ID: <20250401163752.6412-2-ville.syrjala@linux.intel.com> X-Mailer: git-send-email 2.45.3 In-Reply-To: <20250401163752.6412-1-ville.syrjala@linux.intel.com> References: <20250401163752.6412-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ä DG1 apparently needs the combo PLL fractional divider w/a with 38.4 MHz refclk as well. This isn't listed in bspec, but looking at the hsd it looks like it was possibly just missed due to no one having a DG1 around at the time. This gives us slightly more accurate clocks on DG1. Signed-off-by: Ville Syrjälä Reviewed-by: Imre Deak --- drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c index ec7feef1ef59..76ab55ee4b80 100644 --- a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c +++ b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c @@ -2604,6 +2604,7 @@ ehl_combo_pll_div_frac_wa_needed(struct intel_display *display) { return ((display->platform.elkhartlake && IS_DISPLAY_STEP(display, STEP_B0, STEP_FOREVER)) || + display->platform.dg1 || display->platform.tigerlake || display->platform.alderlake_s || display->platform.alderlake_p) && From patchwork Tue Apr 1 16:37:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ville Syrjala X-Patchwork-Id: 14035161 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 DF2E4C36018 for ; Tue, 1 Apr 2025 16:38:02 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 764FF10E621; Tue, 1 Apr 2025 16:38:02 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="KWYoBlta"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2732210E621 for ; Tue, 1 Apr 2025 16:38:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1743525481; x=1775061481; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=qVDqWFJ/OtREZINtUyl8MuuBuJAJ42OMru0gTxwsA6M=; b=KWYoBltaNVYeqxgf0b0ozLDh5Kmf03p77YoWK2ccVYL4KP4T0Qx6RFJJ BcWGK0gtJ4EZlPOwXSaMaiaCTOHUMnSXcm1rmKDduDOVYd8gCmXVCRDOh 7a0cxqkutg+RqAwfquWOlTPj3TuFwJYlrX2u8K+yYyUggTMZ+WqogdS9+ iV8he+dTUzR9QMHFPP73Ak91XvK5pa2QMaQJvuJcznL8LwbBtuxV52ilY s89GEbJm3IHBK3xnUr4kmu7fNKB7KhEzN7gh+4Ow1dYdo2m5BXxeefC9a GlayXq51WOIXZoc9PS2adP47mbljbCnPY0AjtCMXSadw8a+agaM3nVK3Q w==; X-CSE-ConnectionGUID: sCEVKAdUT1SrTjGpfEFJvQ== X-CSE-MsgGUID: 8bCuQWK4RvmB9flfazvoEA== X-IronPort-AV: E=McAfee;i="6700,10204,11391"; a="55520038" X-IronPort-AV: E=Sophos;i="6.14,293,1736841600"; d="scan'208";a="55520038" Received: from orviesa005.jf.intel.com ([10.64.159.145]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Apr 2025 09:38:01 -0700 X-CSE-ConnectionGUID: qOGGmzhmSGq5OxaWcAQRjQ== X-CSE-MsgGUID: PjN1I00QTZqcxBvrS7Xg5Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,293,1736841600"; d="scan'208";a="131638568" Received: from stinkpipe.fi.intel.com (HELO stinkbox) ([10.237.72.74]) by orviesa005.jf.intel.com with SMTP; 01 Apr 2025 09:37:59 -0700 Received: by stinkbox (sSMTP sendmail emulation); Tue, 01 Apr 2025 19:37:58 +0300 From: Ville Syrjala To: intel-gfx@lists.freedesktop.org Subject: [PATCH 2/4] drm/i915: Simplify combo PLL frac w/a Date: Tue, 1 Apr 2025 19:37:50 +0300 Message-ID: <20250401163752.6412-3-ville.syrjala@linux.intel.com> X-Mailer: git-send-email 2.45.3 In-Reply-To: <20250401163752.6412-1-ville.syrjala@linux.intel.com> References: <20250401163752.6412-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ä We are applying the combo PLL frac w/a to all TGL+ platforms, except RKL. I *think* all RKL machines use a 24 MHz refclk (certainly all machines in our CI do) and so technically never need the adjustment. But let's assume the hardware is exactly the same anyway and simplify the code by applying the w/a to all TGL+ platforms. Signed-off-by: Ville Syrjälä --- drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c index 76ab55ee4b80..81ad6cbae6bb 100644 --- a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c +++ b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c @@ -2604,11 +2604,7 @@ ehl_combo_pll_div_frac_wa_needed(struct intel_display *display) { return ((display->platform.elkhartlake && IS_DISPLAY_STEP(display, STEP_B0, STEP_FOREVER)) || - display->platform.dg1 || - display->platform.tigerlake || - display->platform.alderlake_s || - display->platform.alderlake_p) && - display->dpll.ref_clks.nssc == 38400; + DISPLAY_VER(display) >= 12); } struct icl_combo_pll_params { From patchwork Tue Apr 1 16:37:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ville Syrjala X-Patchwork-Id: 14035162 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 58ED4C36018 for ; Tue, 1 Apr 2025 16:38:07 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EAD4510E624; Tue, 1 Apr 2025 16:38:06 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="FPuxMCK/"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) by gabe.freedesktop.org (Postfix) with ESMTPS id E764710E626 for ; Tue, 1 Apr 2025 16:38:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1743525485; x=1775061485; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=SZf271VfOjlaxtvm/iinogqmiUjjofRuKWh7OgdDSZs=; b=FPuxMCK/8s5Nwtv7rb5j7rzILG/8yoDy8Vm2+c97j4dfwN+pk5YrdcZX fjxpDjtD7ts3viDyaq/O5x0WpyKhm1/aAvdy/c2vG3j0vGfEekVV1w+SH 0jMBZJW1w0advgINnAO2+RYh5WSNFmznUnenEfuO2jmcUYdCmHKlVS0qn DEu1IX4bfcrqOwlhPbBy88u85ECuMJKyh+rM3wLOVwX6FJWxYmI2HddQP HZwBlOljk633UJm0FgjncI8KclnsSNOayFZZ9ydFnovwHoPIJz8KnDS6w kRwTRI7CvPrrCnMYKUrUzxlB/LneaqFRJsBpJ7UW0458+YPmAa95VK9lP A==; X-CSE-ConnectionGUID: jUS4padyQjGSrw4/tZd61A== X-CSE-MsgGUID: O8o1fLGSQRCE9MSDJO8GmA== X-IronPort-AV: E=McAfee;i="6700,10204,11391"; a="55520047" X-IronPort-AV: E=Sophos;i="6.14,293,1736841600"; d="scan'208";a="55520047" Received: from orviesa005.jf.intel.com ([10.64.159.145]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Apr 2025 09:38:04 -0700 X-CSE-ConnectionGUID: Du1X8kyJTICkCAciKvlq4w== X-CSE-MsgGUID: GWp3WaDGTeqQz+56dEPI/A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,293,1736841600"; d="scan'208";a="131638607" Received: from stinkpipe.fi.intel.com (HELO stinkbox) ([10.237.72.74]) by orviesa005.jf.intel.com with SMTP; 01 Apr 2025 09:38:02 -0700 Received: by stinkbox (sSMTP sendmail emulation); Tue, 01 Apr 2025 19:38:01 +0300 From: Ville Syrjala To: intel-gfx@lists.freedesktop.org Cc: stable@vger.kernel.org, Matthew Auld , =?utf-8?q?Thomas_Hellstr=C3=B6m?= Subject: [PATCH 3/4] drm/i915/gem: Allow EXEC_CAPTURE on recoverable contexts on DG1 Date: Tue, 1 Apr 2025 19:37:51 +0300 Message-ID: <20250401163752.6412-4-ville.syrjala@linux.intel.com> X-Mailer: git-send-email 2.45.3 In-Reply-To: <20250401163752.6412-1-ville.syrjala@linux.intel.com> References: <20250401163752.6412-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 Fixes: 71b1669ea9bd ("drm/i915/uapi: tweak error capture on recoverable contexts") Signed-off-by: Ville Syrjälä Reviewed-by: Andi Shyti --- 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 Tue Apr 1 16:37:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ville Syrjala X-Patchwork-Id: 14035163 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 98C19C3601A for ; Tue, 1 Apr 2025 16:38:08 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 31E9310E625; Tue, 1 Apr 2025 16:38:08 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="LnyeopXc"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) by gabe.freedesktop.org (Postfix) with ESMTPS id B309210E625 for ; Tue, 1 Apr 2025 16:38:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1743525487; x=1775061487; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=dMxyxxnKKN/vBiaxtqlVLyRADMYAM7HzRfK+EXj8A5Q=; b=LnyeopXcAW9jJNrsKFaI3gI6oBia+wD6VmHf913RDAyM6azmSvAQSHd3 uATX5DYmmj7n+ZeqCdkGDrrY4rkrMaoc4BzUnD9xk5uW52GNWUAnXu61g 1E+1vFDhzhkMhtz4tp6oKC/v85GrHMCA3t8tzNDrekf4/c/5D71xcVRG4 Ln6HTFlJ/iE80g+jKTT1mHpdarz0aYN3hsS5o7hw/ZlBJxwVnXkr5V1pi kFiujW636qWdQMCKi4sbf7S8d7i1+Qhhowq28UAIt4aI6G4FbFQ1lKAgm tg/HGmFM/QzSiiymr4k8o/5r3WZhRqfPtYu1tmuLvwYTutr5EAamuKpFY w==; X-CSE-ConnectionGUID: 5eolmekiTv2075WycyYyYw== X-CSE-MsgGUID: +kow3nyZRYurUpNFNRr6PA== X-IronPort-AV: E=McAfee;i="6700,10204,11391"; a="55520052" X-IronPort-AV: E=Sophos;i="6.14,293,1736841600"; d="scan'208";a="55520052" Received: from orviesa005.jf.intel.com ([10.64.159.145]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Apr 2025 09:38:07 -0700 X-CSE-ConnectionGUID: MDtPvVbwTZmptofy3bGjnA== X-CSE-MsgGUID: 72J0RaNhQ2eS88/hQkqzPg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,293,1736841600"; d="scan'208";a="131638613" Received: from stinkpipe.fi.intel.com (HELO stinkbox) ([10.237.72.74]) by orviesa005.jf.intel.com with SMTP; 01 Apr 2025 09:38:06 -0700 Received: by stinkbox (sSMTP sendmail emulation); Tue, 01 Apr 2025 19:38:05 +0300 From: Ville Syrjala To: intel-gfx@lists.freedesktop.org Subject: [PATCH 4/4] drm/i915/pci: Remove force_probe requirement for DG1 Date: Tue, 1 Apr 2025 19:37:52 +0300 Message-ID: <20250401163752.6412-5-ville.syrjala@linux.intel.com> X-Mailer: git-send-email 2.45.3 In-Reply-To: <20250401163752.6412-1-ville.syrjala@linux.intel.com> References: <20250401163752.6412-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. Signed-off-by: Ville Syrjälä Reviewed-by: Andi Shyti --- 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),