From patchwork Tue Nov 5 13:17:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mika Kahola X-Patchwork-Id: 13862955 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 6387FD2B925 for ; Tue, 5 Nov 2024 13:26:16 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0BFF710E5A1; Tue, 5 Nov 2024 13:26:16 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="GYN49cUx"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.14]) by gabe.freedesktop.org (Postfix) with ESMTPS id AFFB910E5A0 for ; Tue, 5 Nov 2024 13:26:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1730813174; x=1762349174; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=qHZOUrkm/ZaJN+m/34Pm/uch+oOTLFMm4mYs6hXKpLs=; b=GYN49cUxdxqbVFADZFsYwfs5vmf1nuIU9t9f5DPiQLhBJo6y5i0ewXOk iqWry0Zd0AzBwq8qDRzMTxiU+qgQUmcmfNFX2itajtHNsr3+PKi3T6cUc 3M5dlKr1oytsxBM1ojQyamQrMFxBZzSG0199Bkca4zA4NXuQE8mJimuYw 0019h9UOG2AMyRoOLI6bfWCG9VoumL84/+C++hAvMVY3saYx6FM4YHz1J Xr0PRxY63xXEhNN14uo6i+UV1E9J8zqbTJxtGnOCjUFJmR19evODdvOHl mzv9WrhQOXWFQ1g4J80ztwvAnIkEfpGj+nJv83Ri4W6Wlk0XeNn9L42wx A==; X-CSE-ConnectionGUID: Yj4GRLr8Q1ueF/Estyk0Iw== X-CSE-MsgGUID: j5NkUPDZSFaBbqkVhIZ0gg== X-IronPort-AV: E=McAfee;i="6700,10204,11246"; a="30781794" X-IronPort-AV: E=Sophos;i="6.11,260,1725346800"; d="scan'208";a="30781794" Received: from fmviesa001.fm.intel.com ([10.60.135.141]) by fmvoesa108.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Nov 2024 05:26:14 -0800 X-CSE-ConnectionGUID: ufLunmrrTByqWVHW+ApX1g== X-CSE-MsgGUID: 6xNBPA5qSVOWiy4lNASH3g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.11,260,1725346800"; d="scan'208";a="114810968" Received: from sorvi2.fi.intel.com ([10.237.72.194]) by fmviesa001.fm.intel.com with ESMTP; 05 Nov 2024 05:26:12 -0800 From: Mika Kahola To: intel-gfx@lists.freedesktop.org Cc: jani.nikula@linux.intel.com, gustavo.sousa@intel.com, raag.jadav@intel.com, Mika Kahola Subject: [PATCH v5 1/2] drm/i915/xe3lpd: Power request asserting/deasserting Date: Tue, 5 Nov 2024 15:17:31 +0200 Message-ID: <20241105131732.331436-2-mika.kahola@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241105131732.331436-1-mika.kahola@intel.com> References: <20241105131732.331436-1-mika.kahola@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" There is a HW issue that arises when there are race conditions between TCSS entering/exiting TC7 or TC10 states while the driver is asserting/deasserting TCSS power request. As a workaround, Display driver will implement a mailbox sequence to ensure that the TCSS is in TC0 when TCSS power request is asserted/deasserted. The sequence is the following 1. Read mailbox command status and wait until run/busy bit is clear 2. Write mailbox data value '1' for power request asserting and '0' for power request deasserting 3. Write mailbox command run/busy bit and command value with 0x1 4. Read mailbox command and wait until run/busy bit is clear before continuing power request. v2: Rename WA function (Gustavo) Limit WA only for PTL platform with a TODO note (Gustavo) Add TCSS_DISP_MAILBOX_IN_CMD_RUN_BUSY for clarity when writing register data (Gustavo) Move register defs from i915_reg.h to intel_cx0_phy_regs.h (Gustavo) v3: Use "struct intel_display" instead of "struct drm_i915_private" (Jani) Move defs above C10 definitions in the intel_cx0_phy_regs.h file (Gustavo) Move drm_WARN_ON() inside WA function (Gustavo) Rename workaround function as wa_14020908590() (Gustvo) Use boolean enable instead of if-else structure (Raag) v4: Drop drm_WARN_ON() (Raag) Fix function definition to fit into a single line (Raag) Reviewed-by: Raag Jadav Signed-off-by: Mika Kahola --- .../gpu/drm/i915/display/intel_cx0_phy_regs.h | 8 +++++ drivers/gpu/drm/i915/display/intel_tc.c | 31 +++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h b/drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h index f0e5c196eae4..5a0b55cca4a3 100644 --- a/drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h +++ b/drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h @@ -200,6 +200,14 @@ #define XELPDP_SSC_ENABLE_PLLA REG_BIT(1) #define XELPDP_SSC_ENABLE_PLLB REG_BIT(0) +#define TCSS_DISP_MAILBOX_IN_CMD _MMIO(0x161300) +#define TCSS_DISP_MAILBOX_IN_CMD_RUN_BUSY REG_BIT(31) +#define TCSS_DISP_MAILBOX_IN_CMD_CMD_MASK REG_GENMASK(7, 0) +#define TCSS_DISP_MAILBOX_IN_CMD_DATA(val) (TCSS_DISP_MAILBOX_IN_CMD_RUN_BUSY | \ + REG_FIELD_PREP(TCSS_DISP_MAILBOX_IN_CMD_CMD_MASK, val)) + +#define TCSS_DISP_MAILBOX_IN_DATA _MMIO(0x161304) + /* C10 Vendor Registers */ #define PHY_C10_VDR_PLL(idx) (0xC00 + (idx)) #define C10_PLL0_FRACEN REG_BIT8(4) diff --git a/drivers/gpu/drm/i915/display/intel_tc.c b/drivers/gpu/drm/i915/display/intel_tc.c index b16c4d2d4077..e40d55f4c0c4 100644 --- a/drivers/gpu/drm/i915/display/intel_tc.c +++ b/drivers/gpu/drm/i915/display/intel_tc.c @@ -1013,6 +1013,30 @@ xelpdp_tc_phy_wait_for_tcss_power(struct intel_tc_port *tc, bool enabled) return true; } +static void wa_14020908590(struct intel_display *display, bool enable) +{ + /* check if mailbox is running busy */ + if (intel_de_wait_for_clear(display, TCSS_DISP_MAILBOX_IN_CMD, + TCSS_DISP_MAILBOX_IN_CMD_RUN_BUSY, 10)) { + drm_dbg_kms(display->drm, + "Timeout waiting for TCSS mailbox run/busy bit to clear\n"); + return; + } + + intel_de_write(display, TCSS_DISP_MAILBOX_IN_DATA, enable); + intel_de_write(display, TCSS_DISP_MAILBOX_IN_CMD, + TCSS_DISP_MAILBOX_IN_CMD_RUN_BUSY | + TCSS_DISP_MAILBOX_IN_CMD_DATA(0x1)); + + /* wait to clear mailbox running busy bit before continuing */ + if (intel_de_wait_for_clear(display, TCSS_DISP_MAILBOX_IN_CMD, + TCSS_DISP_MAILBOX_IN_CMD_RUN_BUSY, 10)) { + drm_dbg_kms(display->drm, + "Timeout after writing data to mailbox. Mailbox run/busy bit did not clear\n"); + return; + } +} + static void __xelpdp_tc_phy_enable_tcss_power(struct intel_tc_port *tc, bool enable) { struct drm_i915_private *i915 = tc_to_i915(tc); @@ -1022,6 +1046,13 @@ static void __xelpdp_tc_phy_enable_tcss_power(struct intel_tc_port *tc, bool ena assert_tc_cold_blocked(tc); + /* + * Gfx driver WA 14020908590 for PTL tcss_rxdetect_clkswb_req/ack + * handshake violation when pwwreq= 0->1 during TC7/10 entry + */ + if (DISPLAY_VER(i915) == 30) + wa_14020908590(&i915->display, enable); + val = intel_de_read(i915, reg); if (enable) val |= XELPDP_TCSS_POWER_REQUEST; From patchwork Tue Nov 5 13:17:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mika Kahola X-Patchwork-Id: 13862956 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 6BA3BD2B928 for ; Tue, 5 Nov 2024 13:26:18 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1099E10E5A2; Tue, 5 Nov 2024 13:26:18 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="k2+uh3zk"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.14]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5080A10E5A2 for ; Tue, 5 Nov 2024 13:26:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1730813176; x=1762349176; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=5hGTKYedDoB2qeGJM0Qftf2jnQEmJNjNmMDb/Dthhqg=; b=k2+uh3zkffBX47mY7uxsq3NNoPhcO+QsWenzCbvvUqRHLUjhoJrykvZM 4FCPJugDaC+c+2GR+JPCfP1GZgOUcA+Jz6hs+8aXHNq6zev5o7lQvF70e zRSn5Kg3CkCiso6EVMsozLw4jX/VYiPIDtM1j37QwBzFDpX0FEcCNOq5a jKRYP8ZY4t+DsXeSn5KuSgHxTHo/HqwbcTnOLazjgBA3CIvCU/M7npIRE dkCuHL9gTrN3VmypPgfKCmYQ0J3vZkOSoe43A4BJxteRMueIa34xrAHUE H9h5F51/tNBhDII5+DjcdFsSeGut01pVbyZcAPGtqB9PSBXKBXZXJUtpr Q==; X-CSE-ConnectionGUID: IRO4V4vjQl2uN1IIk4l0UQ== X-CSE-MsgGUID: vINRPkwFSMKI7jvlTIdvFA== X-IronPort-AV: E=McAfee;i="6700,10204,11246"; a="30781798" X-IronPort-AV: E=Sophos;i="6.11,260,1725346800"; d="scan'208";a="30781798" Received: from fmviesa001.fm.intel.com ([10.60.135.141]) by fmvoesa108.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Nov 2024 05:26:16 -0800 X-CSE-ConnectionGUID: CztfU1ExRcKLl/o0s0Kpgw== X-CSE-MsgGUID: l50nYiLeRiacQu0sD71YVg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.11,260,1725346800"; d="scan'208";a="114810982" Received: from sorvi2.fi.intel.com ([10.237.72.194]) by fmviesa001.fm.intel.com with ESMTP; 05 Nov 2024 05:26:14 -0800 From: Mika Kahola To: intel-gfx@lists.freedesktop.org Cc: jani.nikula@linux.intel.com, gustavo.sousa@intel.com, raag.jadav@intel.com, Mika Kahola Subject: [PATCH v5 2/2] drm/i915/display: Use struct intel_display instead of struct drm_i915_private Date: Tue, 5 Nov 2024 15:17:32 +0200 Message-ID: <20241105131732.331436-3-mika.kahola@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241105131732.331436-1-mika.kahola@intel.com> References: <20241105131732.331436-1-mika.kahola@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" Let's start using struct intel_display instead of struct drm_i915_private when introducing new code. No functional changes. v2: Drop tc_to_intel_display() helper funtion (Jani) Signed-off-by: Mika Kahola --- drivers/gpu/drm/i915/display/intel_tc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_tc.c b/drivers/gpu/drm/i915/display/intel_tc.c index e40d55f4c0c4..d78f57190f3c 100644 --- a/drivers/gpu/drm/i915/display/intel_tc.c +++ b/drivers/gpu/drm/i915/display/intel_tc.c @@ -1039,9 +1039,9 @@ static void wa_14020908590(struct intel_display *display, bool enable) static void __xelpdp_tc_phy_enable_tcss_power(struct intel_tc_port *tc, bool enable) { - struct drm_i915_private *i915 = tc_to_i915(tc); + struct intel_display *display = to_intel_display(tc->dig_port); enum port port = tc->dig_port->base.port; - i915_reg_t reg = XELPDP_PORT_BUF_CTL1(i915, port); + i915_reg_t reg = XELPDP_PORT_BUF_CTL1(display, port); u32 val; assert_tc_cold_blocked(tc); @@ -1050,15 +1050,15 @@ static void __xelpdp_tc_phy_enable_tcss_power(struct intel_tc_port *tc, bool ena * Gfx driver WA 14020908590 for PTL tcss_rxdetect_clkswb_req/ack * handshake violation when pwwreq= 0->1 during TC7/10 entry */ - if (DISPLAY_VER(i915) == 30) - wa_14020908590(&i915->display, enable); + if (DISPLAY_VER(display) == 30) + wa_14020908590(display, enable); - val = intel_de_read(i915, reg); + val = intel_de_read(display, reg); if (enable) val |= XELPDP_TCSS_POWER_REQUEST; else val &= ~XELPDP_TCSS_POWER_REQUEST; - intel_de_write(i915, reg, val); + intel_de_write(display, reg, val); } static bool xelpdp_tc_phy_enable_tcss_power(struct intel_tc_port *tc, bool enable)