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 A2C85C47E49 for ; Mon, 22 Jan 2024 21:01:27 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6274510EF5F; Mon, 22 Jan 2024 21:01:27 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) by gabe.freedesktop.org (Postfix) with ESMTPS id DFD8A10EF86 for ; Mon, 22 Jan 2024 21:01:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1705957286; x=1737493286; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=rcnNqtiXB/Tn+RVBk3weKARjUucgYlsALw6TAnXQL/k=; b=hCLJY38WL+JtwhYndr9021To0UEgOKjxL9I5vT6ca9XRFXVjgbqiMYEf mQC12ETQmAqzDUt0FiKMynYp+QNAbIUVNrkAz8W+g75mbSOcGLC/s/nFE cTCqrHDavKlqf0BiH0swHldtMmHBfeSzrN+UMMZYdzwnghG7oa0dBDveX /aJ2ioLNaisY+xPo6yiR4GyzLNYEYJss6HyJ2xwVA6UsX2UIqPZYcJ3zY Vn53+645Qd5T/+ZD1KyeXn+YYy5gfA3rv+12kBYkDjKeeuQb3HTexApUd QWPmDPOYXH0o/Vm5/H8s4LMgRy6tzy7vVy2p43TWYHnN+fzB2Jekb3zZ+ w==; X-IronPort-AV: E=McAfee;i="6600,9927,10961"; a="8000772" X-IronPort-AV: E=Sophos;i="6.05,212,1701158400"; d="scan'208";a="8000772" Received: from fmviesa003.fm.intel.com ([10.60.135.143]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Jan 2024 13:01:25 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.05,212,1701158400"; d="scan'208";a="1338112" Received: from lstrano-desk.jf.intel.com ([10.54.39.91]) by fmviesa003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Jan 2024 13:01:18 -0800 From: Matthew Brost To: Subject: [PATCH v5 2/3] drm/xe: Move TLB invalidation reset before HW reset Date: Mon, 22 Jan 2024 13:01:55 -0800 Message-Id: <20240122210156.1517444-3-matthew.brost@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240122210156.1517444-1-matthew.brost@intel.com> References: <20240122210156.1517444-1-matthew.brost@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" This is a software reset which can be done immediately after stopping the UC. Signed-off-by: Matthew Brost Reviewed-by: Michal Wajdeczko --- drivers/gpu/drm/xe/xe_gt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_gt.c b/drivers/gpu/drm/xe/xe_gt.c index 1fe4d54409d3..6d1ce85fc36d 100644 --- a/drivers/gpu/drm/xe/xe_gt.c +++ b/drivers/gpu/drm/xe/xe_gt.c @@ -632,12 +632,12 @@ static int gt_reset(struct xe_gt *gt) if (err) goto err_out; + xe_gt_tlb_invalidation_reset(gt); + err = do_gt_reset(gt); if (err) goto err_out; - xe_gt_tlb_invalidation_reset(gt); - err = do_gt_restart(gt); if (err) goto err_out; -- 2.34.1