From patchwork Thu Jun 5 15:48:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesse Barnes X-Patchwork-Id: 4306791 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.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 350589F26E for ; Thu, 5 Jun 2014 15:49:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 83FDA202F2 for ; Thu, 5 Jun 2014 15:48:57 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 503D9201C0 for ; Thu, 5 Jun 2014 15:48:56 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C9DEA6E968; Thu, 5 Jun 2014 08:48:55 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from gproxy4-pub.mail.unifiedlayer.com (gproxy4-pub.mail.unifiedlayer.com [69.89.23.142]) by gabe.freedesktop.org (Postfix) with SMTP id 41EB76E968 for ; Thu, 5 Jun 2014 08:48:54 -0700 (PDT) Received: (qmail 16439 invoked by uid 0); 5 Jun 2014 15:48:52 -0000 Received: from unknown (HELO CMOut01) (10.0.90.82) by gproxy4.mail.unifiedlayer.com with SMTP; 5 Jun 2014 15:48:52 -0000 Received: from box514.bluehost.com ([74.220.219.114]) by CMOut01 with id Afoo1o00F2UhLwi01forUx; Thu, 05 Jun 2014 09:48:52 -0600 X-Authority-Analysis: v=2.1 cv=EOmVjTpC c=1 sm=1 tr=0 a=9W6Fsu4pMcyimqnCr1W0/w==:117 a=9W6Fsu4pMcyimqnCr1W0/w==:17 a=cNaOj0WVAAAA:8 a=f5113yIGAAAA:8 a=3ROhxo7VqVMA:10 a=TBVoxVdAAAAA:8 a=GhZ5P8ky69gA:10 a=noBwr2J6l1kA:10 a=O0nhsk-sEDYcGRuXwjgA:9 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=virtuousgeek.org; s=default; h=References:In-Reply-To:Message-Id:Date:Subject:To:From; bh=ZPeAZx6Uf5GDT+RrDbbN7/tsEoSD+bMmnVaf5/7cxsk=; b=HFWgozVhFskSXn9QwfDF2UvKhbDTvoYPRszSMgWG4RO+C2gGrbElt911FQAXhRMZsu4I6R+jAkN4HRcQXU/KI1SsrCQUPSpcpMsn278A4D7+/tQdgeYA2E+iEX5gKtAe; Received: from [67.161.37.189] (port=55107 helo=localhost.localdomain) by box514.bluehost.com with esmtpsa (TLSv1.2:AES128-SHA256:128) (Exim 4.82) (envelope-from ) id 1WsZuJ-0002jU-Dz for intel-gfx@lists.freedesktop.org; Thu, 05 Jun 2014 09:48:47 -0600 From: Jesse Barnes To: intel-gfx@lists.freedesktop.org Date: Thu, 5 Jun 2014 08:48:38 -0700 Message-Id: <1401983318-6347-2-git-send-email-jbarnes@virtuousgeek.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1401983318-6347-1-git-send-email-jbarnes@virtuousgeek.org> References: <1401983318-6347-1-git-send-email-jbarnes@virtuousgeek.org> X-Identified-User: {10642:box514.bluehost.com:virtuous:virtuousgeek.org} {sentby:smtp auth 67.161.37.189 authed with jbarnes@virtuousgeek.org} Subject: [Intel-gfx] [PATCH] resume timings X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.15 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.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham 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 --- drivers/gpu/drm/i915/i915_drv.c | 6 ++++++ drivers/gpu/drm/i915/intel_display.c | 9 +++++++++ 2 files changed, 15 insertions(+) diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 0f9e836..a2036b2 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -625,6 +625,8 @@ static int __i915_drm_thaw(struct drm_device *dev, bool restore_gtt_mappings) { struct drm_i915_private *dev_priv = dev->dev_private; + DRM_ERROR("start thaw\n"); + if (drm_core_check_feature(dev, DRIVER_MODESET) && restore_gtt_mappings) { mutex_lock(&dev->struct_mutex); @@ -652,7 +654,9 @@ static int __i915_drm_thaw(struct drm_device *dev, bool restore_gtt_mappings) intel_modeset_init_hw(dev); + DRM_ERROR("hw state start\n"); schedule_work(&dev_priv->hw_restore_work); + DRM_ERROR("hw state end\n"); /* * ... but also need to make sure that hotplug processing @@ -685,6 +689,8 @@ static int __i915_drm_thaw(struct drm_device *dev, bool restore_gtt_mappings) mutex_unlock(&dev_priv->modeset_restore_lock); intel_runtime_pm_put(dev_priv); + + DRM_ERROR("end thaw\n"); return 0; } diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 6d6b0f2..472b7f0 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -12175,7 +12175,9 @@ void intel_modeset_setup_hw_state(struct drm_device *dev, struct intel_encoder *encoder; int i; + DRM_ERROR("\n"); intel_modeset_readout_hw_state(dev); + DRM_ERROR("readout complete\n"); /* * Now that we have the config, copy it to each CRTC struct @@ -12197,12 +12199,16 @@ void intel_modeset_setup_hw_state(struct drm_device *dev, intel_sanitize_encoder(encoder); } + DRM_ERROR("done with encoder sanitize\n"); + for_each_pipe(pipe) { crtc = to_intel_crtc(dev_priv->pipe_to_crtc_mapping[pipe]); intel_sanitize_crtc(crtc); intel_dump_pipe_config(crtc, &crtc->config, "[setup_hw_state]"); } + DRM_ERROR("done with crtc sanitize\n"); + for (i = 0; i < dev_priv->num_shared_dpll; i++) { struct intel_shared_dpll *pll = &dev_priv->shared_dplls[i]; @@ -12215,6 +12221,8 @@ void intel_modeset_setup_hw_state(struct drm_device *dev, pll->on = false; } + DRM_ERROR("done with pll enable\n"); + if (HAS_PCH_SPLIT(dev)) ilk_wm_get_hw_state(dev); @@ -12231,6 +12239,7 @@ void intel_modeset_setup_hw_state(struct drm_device *dev, __intel_set_mode(crtc, &crtc->mode, crtc->x, crtc->y, crtc->primary->fb); + DRM_ERROR("done with modeset on %d\n", pipe); } } else { intel_modeset_update_staged_output_state(dev);