From patchwork Wed Jan 29 13:39:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mika Kuoppala X-Patchwork-Id: 232416 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=-9.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, 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 92240C2D0DB for ; Wed, 29 Jan 2020 13:39:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6E8F820720 for ; Wed, 29 Jan 2020 13:39:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726487AbgA2NjW (ORCPT ); Wed, 29 Jan 2020 08:39:22 -0500 Received: from mga03.intel.com ([134.134.136.65]:12639 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726177AbgA2NjW (ORCPT ); Wed, 29 Jan 2020 08:39:22 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Jan 2020 05:39:22 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,378,1574150400"; d="scan'208";a="314307282" Received: from rosetta.fi.intel.com ([10.237.72.194]) by fmsmga001.fm.intel.com with ESMTP; 29 Jan 2020 05:39:20 -0800 Received: by rosetta.fi.intel.com (Postfix, from userid 1000) id 91E9784411F; Wed, 29 Jan 2020 15:39:16 +0200 (EET) From: Mika Kuoppala To: intel-gfx@lists.freedesktop.org Cc: Mika Kuoppala , Stable , Chris Wilson Subject: [PATCH] drm/i915: Park faster to alleviate kept forcewake Date: Wed, 29 Jan 2020 15:39:12 +0200 Message-Id: <20200129133912.810-1-mika.kuoppala@linux.intel.com> X-Mailer: git-send-email 2.17.1 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org To avoid context corruption on some gens, we need to hold forcewake for long periods of time. This leads to increased energy expenditure for mostly idle workloads. To combat the increased power consumption, park GPU more hastily. As the HW isn't so quick to end up in rc6, this software mechanism supplements it. So we can apply it, across all gens. Suggested-by: Chris Wilson Testcase: igt/i915_pm_rc6_residency/rc6-idle References: "Add RC6 CTX corruption WA" Cc: Stable # v4.19+ Cc: Chris Wilson Signed-off-by: Mika Kuoppala --- drivers/gpu/drm/i915/i915_gem.c | 2 +- drivers/gpu/drm/i915/intel_lrc.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index c7d05ac7af3c..6ddc75098b28 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -197,7 +197,7 @@ void i915_gem_park(struct drm_i915_private *i915) return; /* Defer the actual call to __i915_gem_park() to prevent ping-pongs */ - mod_delayed_work(i915->wq, &i915->gt.idle_work, msecs_to_jiffies(100)); + mod_delayed_work(i915->wq, &i915->gt.idle_work, 1); } void i915_gem_unpark(struct drm_i915_private *i915) diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c index 13e97faabaa7..284ffdfd8840 100644 --- a/drivers/gpu/drm/i915/intel_lrc.c +++ b/drivers/gpu/drm/i915/intel_lrc.c @@ -388,7 +388,12 @@ execlists_user_begin(struct intel_engine_execlists *execlists, inline void execlists_user_end(struct intel_engine_execlists *execlists) { + struct intel_engine_cs *engine = + container_of(execlists, typeof(*engine), execlists); + execlists_clear_active(execlists, EXECLISTS_ACTIVE_USER); + + mod_delayed_work(engine->i915->wq, &engine->i915->gt.retire_work, 0); } static inline void