From patchwork Wed Oct 16 12:28:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tvrtko Ursulin X-Patchwork-Id: 11193255 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 789CB1575 for ; Wed, 16 Oct 2019 12:28:48 +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 60D50218DE for ; Wed, 16 Oct 2019 12:28:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 60D50218DE Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id F0D776E243; Wed, 16 Oct 2019 12:28:47 +0000 (UTC) X-Original-To: Intel-gfx@lists.freedesktop.org Delivered-To: Intel-gfx@lists.freedesktop.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 42CED6E243 for ; Wed, 16 Oct 2019 12:28:47 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 16 Oct 2019 05:28:46 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,303,1566889200"; d="scan'208";a="200044625" Received: from dwiesing-mobl.ger.corp.intel.com (HELO localhost.localdomain) ([10.252.31.172]) by orsmga006.jf.intel.com with ESMTP; 16 Oct 2019 05:28:45 -0700 From: Tvrtko Ursulin To: Intel-gfx@lists.freedesktop.org Date: Wed, 16 Oct 2019 13:28:41 +0100 Message-Id: <20191016122843.9429-1-tvrtko.ursulin@linux.intel.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 1/3] drm/i915: Make i915_gem_load_power_context take struct intel_gt X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 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" From: Tvrtko Ursulin The code underneath works on intel_gt and also rename to i915_gem_load_gt_power_context to signify it is operating on GT. Signed-off-by: Tvrtko Ursulin Cc: Chris Wilson --- drivers/gpu/drm/i915/gem/i915_gem_pm.c | 24 +++++++++++++----------- drivers/gpu/drm/i915/gem/i915_gem_pm.h | 3 ++- drivers/gpu/drm/i915/i915_gem.c | 2 +- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/i915/gem/i915_gem_pm.c b/drivers/gpu/drm/i915/gem/i915_gem_pm.c index 7987b54fb1f5..b2c18674c455 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_pm.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_pm.c @@ -56,9 +56,9 @@ static bool switch_to_kernel_context_sync(struct intel_gt *gt) return result; } -bool i915_gem_load_power_context(struct drm_i915_private *i915) +bool i915_gem_load_gt_power_context(struct intel_gt *gt) { - return switch_to_kernel_context_sync(&i915->gt); + return switch_to_kernel_context_sync(gt); } static void user_forcewake(struct intel_gt *gt, bool suspend) @@ -172,11 +172,13 @@ void i915_gem_suspend_late(struct drm_i915_private *i915) void i915_gem_resume(struct drm_i915_private *i915) { + struct intel_gt *gt = &i915->gt; + GEM_TRACE("\n"); - intel_uncore_forcewake_get(&i915->uncore, FORCEWAKE_ALL); + intel_uncore_forcewake_get(gt->uncore, FORCEWAKE_ALL); - if (intel_gt_init_hw(&i915->gt)) + if (intel_gt_init_hw(gt)) goto err_wedged; /* @@ -184,26 +186,26 @@ void i915_gem_resume(struct drm_i915_private *i915) * guarantee that the context image is complete. So let's just reset * it and start again. */ - if (intel_gt_resume(&i915->gt)) + if (intel_gt_resume(gt)) goto err_wedged; - intel_uc_resume(&i915->gt.uc); + intel_uc_resume(>->uc); /* Always reload a context for powersaving. */ - if (!i915_gem_load_power_context(i915)) + if (!i915_gem_load_gt_power_context(gt)) goto err_wedged; - user_forcewake(&i915->gt, false); + user_forcewake(gt, false); out_unlock: - intel_uncore_forcewake_put(&i915->uncore, FORCEWAKE_ALL); + intel_uncore_forcewake_put(gt->uncore, FORCEWAKE_ALL); return; err_wedged: - if (!intel_gt_is_wedged(&i915->gt)) { + if (!intel_gt_is_wedged(gt)) { dev_err(i915->drm.dev, "Failed to re-initialize GPU, declaring it wedged!\n"); - intel_gt_set_wedged(&i915->gt); + intel_gt_set_wedged(gt); } goto out_unlock; } diff --git a/drivers/gpu/drm/i915/gem/i915_gem_pm.h b/drivers/gpu/drm/i915/gem/i915_gem_pm.h index 6f7d5d11ac3b..38eace4cb6ba 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_pm.h +++ b/drivers/gpu/drm/i915/gem/i915_gem_pm.h @@ -10,11 +10,12 @@ #include struct drm_i915_private; +struct intel_gt; struct work_struct; void i915_gem_init__pm(struct drm_i915_private *i915); -bool i915_gem_load_power_context(struct drm_i915_private *i915); +bool i915_gem_load_gt_power_context(struct intel_gt *gt); void i915_gem_resume(struct drm_i915_private *i915); void i915_gem_idle_work_handler(struct work_struct *work); diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 0ddbd3a5fb8d..c4ebc21c6820 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -1132,7 +1132,7 @@ static int __intel_engines_record_defaults(struct drm_i915_private *i915) } /* Flush the default context image to memory, and enable powersaving. */ - if (!i915_gem_load_power_context(i915)) { + if (!i915_gem_load_gt_power_context(&i915->gt)) { err = -EIO; goto out; }