From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8391310E713 for ; Wed, 25 Jan 2023 04:55:28 +0000 (UTC) From: Ville Syrjala To: igt-dev@lists.freedesktop.org Date: Wed, 25 Jan 2023 06:55:14 +0200 Message-Id: <20230125045522.18169-2-ville.syrjala@linux.intel.com> In-Reply-To: <20230125045522.18169-1-ville.syrjala@linux.intel.com> References: <20230125045522.18169-1-ville.syrjala@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [igt-dev] [PATCH i-g-t 02/10] tools/intel_watermark: Don't do intel_register_access_fini() too early on hsw/bdw List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" List-ID: From: Ville Syrjälä The tool will segfault if we try to the WM_DBG read/write after intel_register_access_fini(). So move intel_register_access_fini() to the very end. Signed-off-by: Ville Syrjälä --- tools/intel_watermark.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/intel_watermark.c b/tools/intel_watermark.c index 1818d79d0bee..d61379c6dc7f 100644 --- a/tools/intel_watermark.c +++ b/tools/intel_watermark.c @@ -644,8 +644,6 @@ static void ilk_wm_dump(void) if (IS_BROADWELL(devid) || IS_HASWELL(devid)) wm_misc = read_reg(0x45260); - intel_register_access_fini(&mmio_data); - for (i = 0; i < num_pipes; i++) printf(" WM_PIPE_%c = 0x%08x\n", pipe_name(i), wm_pipe[i]); if (IS_BROADWELL(devid) || IS_HASWELL(devid)) { @@ -765,6 +763,8 @@ static void ilk_wm_dump(void) /* clear the sticky bits */ write_reg(0x45280, wm_dbg); } + + intel_register_access_fini(&mmio_data); } static void vlv_wm_dump(void) -- 2.39.1