From patchwork Fri Nov 27 12:07:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Auld X-Patchwork-Id: 11936073 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9B94AC2D0E4 for ; Fri, 27 Nov 2020 12:14:44 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 57923208D5 for ; Fri, 27 Nov 2020 12:14:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 57923208D5 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 714BF6ED95; Fri, 27 Nov 2020 12:12:21 +0000 (UTC) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 429F76ED8F; Fri, 27 Nov 2020 12:12:19 +0000 (UTC) IronPort-SDR: PrXVOdrIeWslpEJwFcmA+OlYuTKbVoVq9Y02f8CqHSObZzuPTs7ejvBRICD5Hkoa8tQw9ScCWH vU6wkMpmsBQA== X-IronPort-AV: E=McAfee;i="6000,8403,9817"; a="168883860" X-IronPort-AV: E=Sophos;i="5.78,374,1599548400"; d="scan'208";a="168883860" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Nov 2020 04:12:18 -0800 IronPort-SDR: EUF3dStoizZMYow81o5Kizats7/L77wE6sg18R8+Yiyx2zNW/e/PMY8zXKUutvCe1NIrfYP6LI c3VP24M8EiNw== X-IronPort-AV: E=Sophos;i="5.78,374,1599548400"; d="scan'208";a="548030025" Received: from mjgleeso-mobl.ger.corp.intel.com (HELO mwauld-desk1.ger.corp.intel.com) ([10.251.85.2]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Nov 2020 04:12:17 -0800 From: Matthew Auld To: intel-gfx@lists.freedesktop.org Subject: [RFC PATCH 151/162] drm/i915: move eviction to prepare hook Date: Fri, 27 Nov 2020 12:07:07 +0000 Message-Id: <20201127120718.454037-152-matthew.auld@intel.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201127120718.454037-1-matthew.auld@intel.com> References: <20201127120718.454037-1-matthew.auld@intel.com> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lucas De Marchi , dri-devel@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Lucas De Marchi Signed-off-by: Lucas De Marchi --- drivers/gpu/drm/i915/i915_drv.c | 40 ++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index c8af68227020..b7d40a9c00bf 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -68,6 +68,7 @@ #include "gt/intel_gt.h" #include "gt/intel_gt_pm.h" #include "gt/intel_rc6.h" +#include "gt/intel_gt_requests.h" #include "i915_debugfs.h" #include "i915_drv.h" @@ -1088,10 +1089,36 @@ static bool suspend_to_idle(struct drm_i915_private *dev_priv) return false; } +static int i915_gem_suspend_ppgtt_mappings(struct drm_i915_private *i915); + +static int intel_dmem_evict_buffers(struct drm_device *dev, bool in_suspend, + bool perma_pin); + static int i915_drm_prepare(struct drm_device *dev) { struct drm_i915_private *i915 = to_i915(dev); + if (HAS_LMEM(i915)) { + struct intel_gt *gt= &i915->gt; + long timeout = I915_GEM_IDLE_TIMEOUT; + int ret; + + if (intel_gt_wait_for_idle(gt, timeout) == -ETIME) { + intel_gt_set_wedged(gt); + intel_gt_retire_requests(gt); + } + + ret = intel_dmem_evict_buffers(dev, true, false); + if (ret) + return ret; + + i915_teardown_blt_windows(i915); + + ret = i915_gem_suspend_ppgtt_mappings(i915); + if (ret) + return ret; + } + /* * NB intel_display_suspend() may issue new requests after we've * ostensibly marked the GPU as ready-to-sleep here. We need to @@ -1274,7 +1301,6 @@ static int i915_drm_suspend(struct drm_device *dev) struct drm_i915_private *dev_priv = to_i915(dev); struct pci_dev *pdev = dev_priv->drm.pdev; pci_power_t opregion_target_state; - int ret = 0; disable_rpm_wakeref_asserts(&dev_priv->runtime_pm); @@ -1290,18 +1316,6 @@ static int i915_drm_suspend(struct drm_device *dev) intel_dp_mst_suspend(dev_priv); - if (HAS_LMEM(dev_priv)) { - ret = intel_dmem_evict_buffers(dev, true, false); - if (ret) - return ret; - - i915_teardown_blt_windows(dev_priv); - - ret = i915_gem_suspend_ppgtt_mappings(dev_priv); - if (ret) - return ret; - } - intel_runtime_pm_disable_interrupts(dev_priv); intel_hpd_cancel_work(dev_priv);