From patchwork Thu Apr 28 01:10:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tom.orourke@intel.com X-Patchwork-Id: 8964831 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 13C07BF29F for ; Thu, 28 Apr 2016 01:12:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 380522027D for ; Thu, 28 Apr 2016 01:12:23 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 6B42C20274 for ; Thu, 28 Apr 2016 01:12:22 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4C1AA6E396; Thu, 28 Apr 2016 01:11:58 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id BB4D66E386 for ; Thu, 28 Apr 2016 01:11:23 +0000 (UTC) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga102.fm.intel.com with ESMTP; 27 Apr 2016 18:11:22 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,544,1455004800"; d="scan'208";a="941742097" Received: from torourke-desk.ra.intel.com (HELO localhost.localdomain) ([10.10.35.157]) by orsmga001.jf.intel.com with ESMTP; 27 Apr 2016 18:11:19 -0700 From: tom.orourke@intel.com To: intel-gfx@lists.freedesktop.org Date: Wed, 27 Apr 2016 18:10:50 -0700 Message-Id: <1461805865-212590-7-git-send-email-tom.orourke@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1461805865-212590-1-git-send-email-tom.orourke@intel.com> References: <1461805865-212590-1-git-send-email-tom.orourke@intel.com> Cc: Tom O'Rourke , radoslaw.szwichtenberg@intel.com, paulo.r.zanoni@intel.com Subject: [Intel-gfx] [PATCH 06/21] drm/i915/slpc: Enable SLPC in guc if supported X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-5.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Tom O'Rourke If slpc enabled, then add enable SLPC flag to guc control parameter during guc load. v2: Use intel_slpc_enabled() (Paulo) Signed-off-by: Tom O'Rourke --- drivers/gpu/drm/i915/intel_guc_loader.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b/drivers/gpu/drm/i915/intel_guc_loader.c index 174cc34..e9181b1 100644 --- a/drivers/gpu/drm/i915/intel_guc_loader.c +++ b/drivers/gpu/drm/i915/intel_guc_loader.c @@ -188,6 +188,9 @@ static void set_guc_init_params(struct drm_i915_private *dev_priv) params[GUC_CTL_FEATURE] |= GUC_CTL_DISABLE_SCHEDULER | GUC_CTL_VCS2_ENABLED; + if (intel_slpc_enabled()) + params[GUC_CTL_FEATURE] |= GUC_CTL_ENABLE_SLPC; + if (i915.guc_log_level >= 0) { params[GUC_CTL_LOG_PARAMS] = guc->log_flags; params[GUC_CTL_DEBUG] =