From patchwork Mon May 18 18:53:51 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lespiau, Damien" X-Patchwork-Id: 6431551 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 782269F402 for ; Mon, 18 May 2015 18:54:17 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6F374205F2 for ; Mon, 18 May 2015 18:54:16 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 6078F205EB for ; Mon, 18 May 2015 18:54:15 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 75D936E56A; Mon, 18 May 2015 11:54:13 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id 903DB6E56D for ; Mon, 18 May 2015 11:54:11 -0700 (PDT) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga103.fm.intel.com with ESMTP; 18 May 2015 11:54:00 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,454,1427785200"; d="scan'208";a="727917598" Received: from achalot-mobl.ger.corp.intel.com (HELO strange.ger.corp.intel.com) ([10.252.15.234]) by fmsmga002.fm.intel.com with ESMTP; 18 May 2015 11:53:59 -0700 From: Damien Lespiau To: intel-gfx@lists.freedesktop.org Date: Mon, 18 May 2015 19:53:51 +0100 Message-Id: <1431975235-1037-5-git-send-email-damien.lespiau@intel.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1431975235-1037-1-git-send-email-damien.lespiau@intel.com> References: <1431975235-1037-1-git-send-email-damien.lespiau@intel.com> Subject: [Intel-gfx] [PATCH 4/8] drm/i915: Extract a common intel_resume_prepare() function 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=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_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 On the suspend path, we shove the common low level code in intel_suspend_complete() that is then called in both the runtime pm path and the full S3/S4 path. Let's do the same for the resume path, extracting an intel_resume_prepare() function. This is especially nice as we forgot on the two paths for BXT, so that should eliminate a source of bugs in the future. Signed-off-by: Damien Lespiau --- drivers/gpu/drm/i915/i915_drv.c | 47 ++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 7eb751b..a29db40 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -592,11 +592,8 @@ static void intel_suspend_encoders(struct drm_i915_private *dev_priv) } static int intel_suspend_complete(struct drm_i915_private *dev_priv); -static int vlv_resume_prepare(struct drm_i915_private *dev_priv, - bool rpm_resume); -static int skl_resume_prepare(struct drm_i915_private *dev_priv); -static int bxt_resume_prepare(struct drm_i915_private *dev_priv); - +static int intel_resume_prepare(struct drm_i915_private *dev_priv, + bool rpm_resume); static int i915_drm_suspend(struct drm_device *dev) { @@ -811,15 +808,7 @@ static int i915_drm_resume_early(struct drm_device *dev) intel_uncore_early_sanitize(dev, true); - if (IS_BROXTON(dev)) - ret = bxt_resume_prepare(dev_priv); - else if (IS_SKYLAKE(dev_priv)) - ret = skl_resume_prepare(dev_priv); - else if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv)) - hsw_disable_pc8(dev_priv); - else if (IS_VALLEYVIEW(dev_priv)) - ret = vlv_resume_prepare(dev_priv, false); - + intel_resume_prepare(dev_priv, false); if (ret) DRM_ERROR("Resume prepare failed: %d,Continuing resume\n", ret); @@ -1556,14 +1545,7 @@ static int intel_runtime_resume(struct device *device) if (IS_GEN6(dev_priv)) intel_init_pch_refclk(dev); - if (IS_BROXTON(dev)) - ret = bxt_resume_prepare(dev_priv); - else if (IS_SKYLAKE(dev)) - ret = skl_resume_prepare(dev_priv); - else if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv)) - hsw_disable_pc8(dev_priv); - else if (IS_VALLEYVIEW(dev_priv)) - ret = vlv_resume_prepare(dev_priv, true); + ret = intel_resume_prepare(dev_priv, true); /* * No point of rolling back things in case of an error, as the best @@ -1584,8 +1566,8 @@ static int intel_runtime_resume(struct device *device) } /* - * This function implements common functionality of runtime and system - * suspend sequence. + * This 2 functions implement common functionality of runtime and system + * suspend/resume sequence. */ static int intel_suspend_complete(struct drm_i915_private *dev_priv) { @@ -1606,6 +1588,23 @@ static int intel_suspend_complete(struct drm_i915_private *dev_priv) return ret; } +static int +intel_resume_prepare(struct drm_i915_private *dev_priv, bool rpm_resume) +{ + int ret = 0; + + if (IS_BROXTON(dev_priv)) + ret = bxt_resume_prepare(dev_priv); + else if (IS_SKYLAKE(dev_priv)) + ret = skl_resume_prepare(dev_priv); + else if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv)) + hsw_disable_pc8(dev_priv); + else if (IS_VALLEYVIEW(dev_priv)) + ret = vlv_resume_prepare(dev_priv, rpm_resume); + + return ret; +} + static const struct dev_pm_ops i915_pm_ops = { /* * S0ix (via system suspend) and S3 event handlers [PMSG_SUSPEND,