From mboxrd@z Thu Jan 1 00:00:00 1970 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 7F6E1C5B572 for ; Mon, 17 Aug 2026 11:52:28 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 10EE510E76F; Mon, 17 Aug 2026 11:52:28 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="KSNK8VYE"; dkim-atps=neutral Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0FEAD10E269 for ; Sun, 16 Aug 2026 06:24:02 +0000 (UTC) Received: by mail-pj1-f54.google.com with SMTP id 98e67ed59e1d1-381b831d535so3620761a91.0 for ; Sat, 15 Aug 2026 23:24:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786861441; x=1787466241; darn=lists.freedesktop.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=2+VXnP47ytTguI11i1PKxSzDAJacSIz5jyC8KDUI+I4=; b=KSNK8VYExEi1leXEykG+e54H3uTw9vDn3O6ibsb5glj71JpThhjEa9oj70hBLegnbN ALU9APYIT9PYvbcPUm+8oj5qCs4iEz2YUrdxLL7Tp2M+MiqqXGu6HZ+NlUT4YEjz7glx aU8/cP4WCFjpOrZ948+E4vJdh7nkMEl/1luw41/kwjpz6aHgmsyLOzRX8n5txRIlWc/1 ZXvGhZHzlziAtm7bou8ULhwsiDSxISMT6dZ1IKNsGr0TvLF7kVhbqIivTls4xJxiqUHt wYc5l5/URSPAzw/OaAdABgOTQLhhZUmL+ri9hFieU4kawjcttu05ea3nWDpYThUgaG7X c9pA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786861441; x=1787466241; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=2+VXnP47ytTguI11i1PKxSzDAJacSIz5jyC8KDUI+I4=; b=KDZHpUi/36FwNdCnK425EcQXBz3qBCtdE61RnXX4iiF9ZHmKVyFYs6FS2AO/hlKF20 d0H1cGSORLmwB5SZ8u4f6cH6sBfM/nnouALt7hiQWFF+LwPhKuK25kSVURPYuow5BWuj DTJjU/Tv8EgaZrHH77eIlak2mFTMrAGNnR3mwSy+ZtESVeLE3HFLsHimG4AF6g4fq8Im rdMJCrHlWYpBqb5yDsMlKN+nB36dbFN4C1K7LJlt2e78hoRWPhWa5RF/UJYpE1zMfMpW ogQddwZzpRLKJou6765tVUEJOn6FfiJCTZ9tUodM53i/HLhXfQLrmEFLZ5CjzUNTycY1 d6dQ== X-Gm-Message-State: AOJu0Yw9zL8eFdaOZdeXiNChuUr/Lqzshoab+eTkhR9Ixa3NoTitbGwm LI/gI6Z9BL2MQoI+dnKOCmhZVaWmlZgXwNIpiBsA2+Iz2hriCqAsvw6Mgqqioqr1C+N+C6RY X-Gm-Gg: AR+sD114Brvvvr7mXnjR9EYjK0G2N4VcdxaDbM2YJBrNDafLSHP4+z/bVJzVagiFqBL dYI1VhVKSLnjwCcGm6XbEWdWV2vREWHH3WluYTqk3g+7LuEOTHOojgtwJb21+TwIJv9iBZZgPWb oXBo3fg1dNoX8NFSbz/ZdM3SBOUyXDuBt5UeXtWZxPBWX3orDMM+8lVTuD9B7lAHXPvGpmy+UrV SZBkina8n60j/kqtsKxpPKM0e4c0BFvEioZzsKZtX3S4orvPlO/9g7+HTEsVsQEuHcgwm57/yFQ 1e0Z9ey/7TDVID0tRfTtGA9xHKCOjF9gYGDcddElAuGFnQJTuknQE7Ozmx0V+opQTzCOVkl53Me kA1RmmCunGD7speWmDyc93po34w9OVtE0povKdfe1DXQfbcNlY2Fi6RN9ULS1i9rO9j0q8WwKpF 5Mtlz2ES059OJanD5M2dfDBBT4Jh0ltjfuReAqrv92qjIi0CUw98RriiMlVsRTbBbxg6yM/jkRE 2Mywl6VxR31EVKKzff1BxsYpiAnQUtnKA== X-Received: by 2002:a17:90b:5450:b0:38e:655c:6516 with SMTP id 98e67ed59e1d1-3933b4f3238mr18629232a91.0.1786861441487; Sat, 15 Aug 2026 23:24:01 -0700 (PDT) Received: from allen-xiaomibookpro14.lan ([2600:1900:4030:ad65:0:1::]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-39531e14346sm686330a91.4.2026.08.15.23.23.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Aug 2026 23:24:00 -0700 (PDT) From: =?UTF-8?q?Chang=20Jiong=28=E5=B8=B8=E7=82=AF=29?= To: intel-gfx@lists.freedesktop.org Cc: =?UTF-8?q?Chang=20Jiong=28=E5=B8=B8=E7=82=AF=29?= , stable@vger.kernel.org, Jani Nikula , Rodrigo Vivi , Joonas Lahtinen , Tvrtko Ursulin , David Airlie , Simona Vetter , =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= , =?UTF-8?q?Micha=C5=82=20Grzelak?= , intel-xe@lists.freedesktop.org (open list:INTEL DRM DISPLAY FOR XE AND I915 DRIVERS), dri-devel@lists.freedesktop.org (open list:DRM DRIVERS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v2] drm/i915/cdclk: Don't force cd2x pipe select on Xe3 in bxt_sanitize_cdclk() Date: Sun, 16 Aug 2026 14:23:44 +0800 Message-ID: <20260816062344.796615-1-xspeed1989@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Mailman-Approved-At: Mon, 17 Aug 2026 11:52:27 +0000 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" Since commit 2ee8dbd880b1 ("drm/i915/cdclk: Fix up CDCLK_FREQ_DECIMAL without a full PLL re-enable") bxt_sanitize_cdclk() normalizes the CD2X pipe select field of the CDCLK_CTL readback to PIPE_NONE before comparing against the expected value. However bxt_cdclk_ctl() does not include the CD2X pipe select field at all on DISPLAY_VER() >= 30, so on Xe3 (PTL) the normalized readback (pipe field forced to the PIPE_NONE encoding, 0b111) can never match the expected value (pipe field 0). The comparison now fails on every boot and we always take the full CDCLK PLL disable+re-enable path with the BIOS framebuffer actively scanning out - exactly what this code was trying to avoid. On a Panther Lake laptop (Arc B390, 8086:b080, eDP 3120x2080@120) this causes "CPU pipe A FIFO underrun" during probe and persistent full-screen scanout corruption for the first KMS client (the SDDM greeter); the corruption lasts until the next full modeset. Only normalize the CD2X pipe select field on platforms where bxt_cdclk_ctl() actually programs it, mirroring its DISPLAY_VER() check. Fixes: 2ee8dbd880b1 ("drm/i915/cdclk: Fix up CDCLK_FREQ_DECIMAL without a full PLL re-enable") Cc: stable@vger.kernel.org Signed-off-by: Chang Jiong(常炯) --- v2: No code changes. Resent with From matching Signed-off-by (v1 was sent from 304750714@qq.com, which is not on the Intel CI allowlist). drivers/gpu/drm/i915/display/intel_cdclk.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.c b/drivers/gpu/drm/i915/display/intel_cdclk.c index 7bc9b956554b..0438f5ac78c0 100644 --- a/drivers/gpu/drm/i915/display/intel_cdclk.c +++ b/drivers/gpu/drm/i915/display/intel_cdclk.c @@ -2366,8 +2366,10 @@ static void bxt_sanitize_cdclk(struct intel_display *display) * dividers both syncing to an active pipe, or asynchronously * (PIPE_NONE). */ - cdctl &= ~bxt_cdclk_cd2x_pipe(display, INVALID_PIPE); - cdctl |= bxt_cdclk_cd2x_pipe(display, INVALID_PIPE); + if (DISPLAY_VER(display) < 30) { + cdctl &= ~bxt_cdclk_cd2x_pipe(display, INVALID_PIPE); + cdctl |= bxt_cdclk_cd2x_pipe(display, INVALID_PIPE); + } if (cdctl != expected) { if (DISPLAY_VER(display) < 20) { -- 2.55.0