From patchwork Tue Jun 13 21:52:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Sripada, Radhakrishna" X-Patchwork-Id: 13279246 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 5DC09EB64DA for ; Tue, 13 Jun 2023 21:54:08 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 99D0810E3E0; Tue, 13 Jun 2023 21:54:07 +0000 (UTC) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by gabe.freedesktop.org (Postfix) with ESMTPS id 25BFF10E3E3 for ; Tue, 13 Jun 2023 21:54:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1686693246; x=1718229246; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=bCJeBiPUPCDAGj2f0mRVqvNnuSv6/FvdvNBTu/ucMXI=; b=HhzcALwKDko6h2g2smoj5G+Y+kAaWTr92DaCuqTjF7EJ4mIuyvMVO9xG zSrZCNMOfodbkkDAT3mxpTfjz1HLe2/vUC33P85tN6YBpSMej5bXmjp1j wSBLSjQ0DDY1KbB+k16tiHWADLl6NS7g39hxys+UhCtaLY8EEMIe8m4GH QMMIgcKFvQehptkxEveG0TuJCGZSepej9uGMKiHEnV+JD9E9lMsgLroxQ zI32xiFeeXCzhEU/3Yh0wNMeHtyBXDbD+wHxmQzTXPprFUPQdlOGlvb/z zrZLNGQ95Ri5OeNCsYzYqKdr9pkAyJ7Q/FP0axL5G2NiDIIml3EmDPBbz A==; X-IronPort-AV: E=McAfee;i="6600,9927,10740"; a="338813914" X-IronPort-AV: E=Sophos;i="6.00,240,1681196400"; d="scan'208";a="338813914" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Jun 2023 14:54:05 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10740"; a="741604229" X-IronPort-AV: E=Sophos;i="6.00,240,1681196400"; d="scan'208";a="741604229" Received: from invictus.jf.intel.com ([10.165.21.201]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Jun 2023 14:54:04 -0700 From: Radhakrishna Sripada To: intel-gfx@lists.freedesktop.org Date: Tue, 13 Jun 2023 14:52:42 -0700 Message-Id: <20230613215245.1551145-2-radhakrishna.sripada@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230613215245.1551145-1-radhakrishna.sripada@intel.com> References: <20230613215245.1551145-1-radhakrishna.sripada@intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 1/4] drm/i915: Add a notrace version of intel_de_read_fw 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" Around the tracing infrastructure, certain registers are being read resulting in nested traces. Introduce the no trace version of intel_de_read_fw to be used in such scenarios. Signed-off-by: Radhakrishna Sripada --- drivers/gpu/drm/i915/display/intel_de.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/gpu/drm/i915/display/intel_de.h b/drivers/gpu/drm/i915/display/intel_de.h index 42552d8c151e..786211121ce2 100644 --- a/drivers/gpu/drm/i915/display/intel_de.h +++ b/drivers/gpu/drm/i915/display/intel_de.h @@ -93,6 +93,16 @@ intel_de_wait_for_clear(struct drm_i915_private *i915, i915_reg_t reg, * therefore generally be serialised, by either the dev_priv->uncore.lock or * a more localised lock guarding all access to that bank of registers. */ +static inline u32 +intel_de_read_fw_notrace(struct drm_i915_private *i915, i915_reg_t reg) +{ + u32 val; + + val = intel_uncore_read_fw(&i915->uncore, reg); + + return val; +} + static inline u32 intel_de_read_fw(struct drm_i915_private *i915, i915_reg_t reg) { From patchwork Tue Jun 13 21:52:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Sripada, Radhakrishna" X-Patchwork-Id: 13279247 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 7AFC4EB64D8 for ; Tue, 13 Jun 2023 21:54:09 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BEE8010E3E3; Tue, 13 Jun 2023 21:54:07 +0000 (UTC) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by gabe.freedesktop.org (Postfix) with ESMTPS id 40D4310E3E4 for ; Tue, 13 Jun 2023 21:54:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1686693246; x=1718229246; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=nBk6tNvz63OMZEngyvZbYxupmYDJxghKa4vAFOIHBmE=; b=fJvubkPcXNDkunQriLvHQpgQPYZoLLbeqz3Sy8na78RxaSR+NFtqA6Dd DCAAjTdEqPKisr9U/PtTqaIOAFR7M8POT/VupotmCiKl6vmsfXDqgNcPp d21+DediHFlbh3vprqi/4G5PMRmeV+GgjQUvgWd7BMJGFe7oHGvqJc5f0 AkaflR5fNfFGo4kTw2nnyAZTQrYQ8xupXVFOkOWj0ctT1oX+AyE4habQR yToCCCbwirSuG+6ETITrt8qMTTxy/efYRRRgIAwe3HZOIHhHqEbGkT8di t5HUMxyx2IBnoa8tQBdSfxMFMa6080MRxURDlgdmjFyY44/f59irA4LHK w==; X-IronPort-AV: E=McAfee;i="6600,9927,10740"; a="338813916" X-IronPort-AV: E=Sophos;i="6.00,240,1681196400"; d="scan'208";a="338813916" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Jun 2023 14:54:05 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10740"; a="741604232" X-IronPort-AV: E=Sophos;i="6.00,240,1681196400"; d="scan'208";a="741604232" Received: from invictus.jf.intel.com ([10.165.21.201]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Jun 2023 14:54:04 -0700 From: Radhakrishna Sripada To: intel-gfx@lists.freedesktop.org Date: Tue, 13 Jun 2023 14:52:43 -0700 Message-Id: <20230613215245.1551145-3-radhakrishna.sripada@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230613215245.1551145-1-radhakrishna.sripada@intel.com> References: <20230613215245.1551145-1-radhakrishna.sripada@intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 2/4] drm/i915: Add a dummy notrace version of intel_de_read64_2x32 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" intel_de_read64_2x32 and hence intel_uncore_read64_2x32 do not use any of the tracing api's. It is however important to distinguish between the tracing and non tracing versions to avoid nesting of tracing events. Signed-off-by: Radhakrishna Sripada --- drivers/gpu/drm/i915/display/intel_de.h | 7 +++++++ drivers/gpu/drm/i915/intel_uncore.h | 2 ++ 2 files changed, 9 insertions(+) diff --git a/drivers/gpu/drm/i915/display/intel_de.h b/drivers/gpu/drm/i915/display/intel_de.h index 786211121ce2..25d6f3317eca 100644 --- a/drivers/gpu/drm/i915/display/intel_de.h +++ b/drivers/gpu/drm/i915/display/intel_de.h @@ -22,6 +22,13 @@ intel_de_read8(struct drm_i915_private *i915, i915_reg_t reg) return intel_uncore_read8(&i915->uncore, reg); } +static inline u64 +intel_de_read64_2x32_notrace(struct drm_i915_private *i915, + i915_reg_t lower_reg, i915_reg_t upper_reg) +{ + return intel_uncore_read64_2x32_notrace(&i915->uncore, lower_reg, upper_reg); +} + static inline u64 intel_de_read64_2x32(struct drm_i915_private *i915, i915_reg_t lower_reg, i915_reg_t upper_reg) diff --git a/drivers/gpu/drm/i915/intel_uncore.h b/drivers/gpu/drm/i915/intel_uncore.h index 9ea1f4864a3a..a189953957ef 100644 --- a/drivers/gpu/drm/i915/intel_uncore.h +++ b/drivers/gpu/drm/i915/intel_uncore.h @@ -484,6 +484,8 @@ intel_uncore_read64_2x32(struct intel_uncore *uncore, return (u64)upper << 32 | lower; } +#define intel_uncore_read64_2x32_notrace(...) intel_uncore_read64_2x32(__VA_ARGS__) + static inline int intel_uncore_write_and_verify(struct intel_uncore *uncore, i915_reg_t reg, u32 val, u32 mask, u32 expected_val) From patchwork Tue Jun 13 21:52:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Sripada, Radhakrishna" X-Patchwork-Id: 13279250 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 5F859EB64D7 for ; Tue, 13 Jun 2023 21:54:15 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E165310E3E6; Tue, 13 Jun 2023 21:54:14 +0000 (UTC) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5A3B010E3E0 for ; Tue, 13 Jun 2023 21:54:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1686693246; x=1718229246; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ok7Kbwm3T/u8J2faXX4MPX88newM+gbAeDMpD6uElBM=; b=DswQL/4qSADwH4oz8f1GQicqdPkpojBrFZVcmM5pcjVax59HDEjNFud+ Lq7ZAjKEwtYGvvSH1fJ5hQfRToi1i/8mmOqTjE6hFBfQht/plWMcd8T/x 6gVUQ2prEApG87CkXs3kZssGjiRqn590Z8ryTaYMy+IlSHD7zcEk0uKty fT/4PDqQUSaaG23brqpt2HcsQ3XKRddfdMgkH3/SWSHtwATacw1WgnCJv cf53FbQbzNuCnN6KBgXNkO3v9DmpbDwB6pgMe0Em8XWYShzQMqrf+FCoC O1nHYw/+emWDEkdPungRIf9fqo3zYDbBzvz8J87L6kdU1GLXXZwWJuC73 g==; X-IronPort-AV: E=McAfee;i="6600,9927,10740"; a="338813918" X-IronPort-AV: E=Sophos;i="6.00,240,1681196400"; d="scan'208";a="338813918" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Jun 2023 14:54:05 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10740"; a="741604234" X-IronPort-AV: E=Sophos;i="6.00,240,1681196400"; d="scan'208";a="741604234" Received: from invictus.jf.intel.com ([10.165.21.201]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Jun 2023 14:54:04 -0700 From: Radhakrishna Sripada To: intel-gfx@lists.freedesktop.org Date: Tue, 13 Jun 2023 14:52:44 -0700 Message-Id: <20230613215245.1551145-4-radhakrishna.sripada@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230613215245.1551145-1-radhakrishna.sripada@intel.com> References: <20230613215245.1551145-1-radhakrishna.sripada@intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 3/4] drm/i915: Make intel_crtc_get_vblank_counter use no trace hw reads 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" intel_crtc_get_vblank_counter is used in many places in the display tracing infrastructure. For a clean execution of the tracing assignment, ensure that any necessary HW reads would not further trigger another trace, to prevent nesting of trace events. Suggested-by: Maarten Lankhorst Signed-off-by: Radhakrishna Sripada --- drivers/gpu/drm/i915/display/intel_vblank.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_vblank.c b/drivers/gpu/drm/i915/display/intel_vblank.c index f5659ebd08eb..55f3389fa220 100644 --- a/drivers/gpu/drm/i915/display/intel_vblank.c +++ b/drivers/gpu/drm/i915/display/intel_vblank.c @@ -103,7 +103,7 @@ u32 i915_get_vblank_counter(struct drm_crtc *crtc) * we get a low value that's stable across two reads of the high * register. */ - frame = intel_de_read64_2x32(dev_priv, PIPEFRAMEPIXEL(pipe), PIPEFRAME(pipe)); + frame = intel_de_read64_2x32_notrace(dev_priv, PIPEFRAMEPIXEL(pipe), PIPEFRAME(pipe)); pixel = frame & PIPE_PIXEL_MASK; frame = (frame >> PIPE_FRAME_LOW_SHIFT) & 0xffffff; @@ -125,7 +125,7 @@ u32 g4x_get_vblank_counter(struct drm_crtc *crtc) if (!vblank->max_vblank_count) return 0; - return intel_de_read(dev_priv, PIPE_FRMCOUNT_G4X(pipe)); + return intel_de_read_notrace(dev_priv, PIPE_FRMCOUNT_G4X(pipe)); } static u32 intel_crtc_scanlines_since_frame_timestamp(struct intel_crtc *crtc) @@ -324,7 +324,8 @@ static bool i915_get_crtc_scanoutpos(struct drm_crtc *_crtc, * We can split this into vertical and horizontal * scanout position. */ - position = (intel_de_read_fw(dev_priv, PIPEFRAMEPIXEL(pipe)) & PIPE_PIXEL_MASK) >> PIPE_PIXEL_SHIFT; + position = (intel_de_read_fw_notrace(dev_priv, PIPEFRAMEPIXEL(pipe)) & + PIPE_PIXEL_MASK) >> PIPE_PIXEL_SHIFT; /* convert to pixel counts */ vbl_start *= htotal; From patchwork Tue Jun 13 21:52:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Sripada, Radhakrishna" X-Patchwork-Id: 13279249 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 EA413EB64DC for ; Tue, 13 Jun 2023 21:54:12 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3D15210E3E5; Tue, 13 Jun 2023 21:54:11 +0000 (UTC) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by gabe.freedesktop.org (Postfix) with ESMTPS id 72DC010E3E3 for ; Tue, 13 Jun 2023 21:54:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1686693246; x=1718229246; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=XpGGF9xNIf9uEQLLYPMEEvTU35BV6sEa39Z+TtgmT4g=; b=OV9ALBrQ2V1a2OG2RfkzENUsW3Xnxfy+sOIZbqtTauAYcl5gSPYrpMZR AOBuMXuW7UDl73FzY9jsRZRPi/MQ6FqjguQinFu/hl+Mu1FXivsCyppzW FvFLmpsYeA/nGEEmqRSgt+LEVMMtXgXfrDenQw0lRaX/t7An8X/DpDZVS F2hJUAQHgCR+pZR7cG97nodQyiuXVneVNB52/O1pg1yVs2NlJNp5/FA5h 2V1SLZaVeQxq10jDOHV9xEr5lnZwvx8p9WuSY+kGLx3dORpRfgI74aOCy NmqZ+Ps2tQqkY6ZNaXiHtG5Y+A/P4ciezTUsi1SU7Hh7kl97gaIGj/MiV w==; X-IronPort-AV: E=McAfee;i="6600,9927,10740"; a="338813919" X-IronPort-AV: E=Sophos;i="6.00,240,1681196400"; d="scan'208";a="338813919" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Jun 2023 14:54:06 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10740"; a="741604237" X-IronPort-AV: E=Sophos;i="6.00,240,1681196400"; d="scan'208";a="741604237" Received: from invictus.jf.intel.com ([10.165.21.201]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Jun 2023 14:54:04 -0700 From: Radhakrishna Sripada To: intel-gfx@lists.freedesktop.org Date: Tue, 13 Jun 2023 14:52:45 -0700 Message-Id: <20230613215245.1551145-5-radhakrishna.sripada@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230613215245.1551145-1-radhakrishna.sripada@intel.com> References: <20230613215245.1551145-1-radhakrishna.sripada@intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 4/4] drm/i915: Make intel_get_crtc_scanline use no trace hw reads 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" intel_get_crtc_scanline is used in the display tracing infrastructure. Use no trace hw reads to avoid nested tracing calls. Signed-off-by: Radhakrishna Sripada --- drivers/gpu/drm/i915/display/intel_vblank.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_vblank.c b/drivers/gpu/drm/i915/display/intel_vblank.c index 55f3389fa220..0b8574b29f1c 100644 --- a/drivers/gpu/drm/i915/display/intel_vblank.c +++ b/drivers/gpu/drm/i915/display/intel_vblank.c @@ -150,17 +150,17 @@ static u32 intel_crtc_scanlines_since_frame_timestamp(struct intel_crtc *crtc) * pipe frame time stamp. The time stamp value * is sampled at every start of vertical blank. */ - scan_prev_time = intel_de_read_fw(dev_priv, - PIPE_FRMTMSTMP(crtc->pipe)); + scan_prev_time = intel_de_read_fw_notrace(dev_priv, + PIPE_FRMTMSTMP(crtc->pipe)); /* * The TIMESTAMP_CTR register has the current * time stamp value. */ - scan_curr_time = intel_de_read_fw(dev_priv, IVB_TIMESTAMP_CTR); + scan_curr_time = intel_de_read_fw_notrace(dev_priv, IVB_TIMESTAMP_CTR); - scan_post_time = intel_de_read_fw(dev_priv, - PIPE_FRMTMSTMP(crtc->pipe)); + scan_post_time = intel_de_read_fw_notrace(dev_priv, + PIPE_FRMTMSTMP(crtc->pipe)); } while (scan_post_time != scan_prev_time); return div_u64(mul_u32_u32(scan_curr_time - scan_prev_time, @@ -217,7 +217,7 @@ static int __intel_get_crtc_scanline(struct intel_crtc *crtc) if (mode->flags & DRM_MODE_FLAG_INTERLACE) vtotal /= 2; - position = intel_de_read_fw(dev_priv, PIPEDSL(pipe)) & PIPEDSL_LINE_MASK; + position = intel_de_read_fw_notrace(dev_priv, PIPEDSL(pipe)) & PIPEDSL_LINE_MASK; /* * On HSW, the DSL reg (0x70000) appears to return 0 if we @@ -236,7 +236,8 @@ static int __intel_get_crtc_scanline(struct intel_crtc *crtc) for (i = 0; i < 100; i++) { udelay(1); - temp = intel_de_read_fw(dev_priv, PIPEDSL(pipe)) & PIPEDSL_LINE_MASK; + temp = intel_de_read_fw_notrace(dev_priv, PIPEDSL(pipe)) & + PIPEDSL_LINE_MASK; if (temp != position) { position = temp; break;