From patchwork Thu Sep 12 16:13:59 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 2879101 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id F2A38BFF05 for ; Thu, 12 Sep 2013 16:25:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3B6B920371 for ; Thu, 12 Sep 2013 16:25:22 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 48A9E2035C for ; Thu, 12 Sep 2013 16:25:20 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 44124E67F6 for ; Thu, 12 Sep 2013 09:25:20 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ea0-f178.google.com (mail-ea0-f178.google.com [209.85.215.178]) by gabe.freedesktop.org (Postfix) with ESMTP id 7364BE79F6 for ; Thu, 12 Sep 2013 09:13:49 -0700 (PDT) Received: by mail-ea0-f178.google.com with SMTP id a15so4400eae.37 for ; Thu, 12 Sep 2013 09:13:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id; bh=aEmvB7WqAIRyG1y1fChEJTKNKACOrCxTe5oqVANWzVo=; b=f5YrYhLzi5YkMrxXEsm1+ax/9KC32nn/+ksyBulweb80LnqMi64m64KbHCGbQE/cRc m+2/zR8B1j5j4c1wWj061uo2FKxEs0yxbATSWqSczf6Cy94q7O9cHZFIgO4ur9BWttdm cgrQpuPeupFBzE/atctqPU07eJfYd5ovcTmQo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=aEmvB7WqAIRyG1y1fChEJTKNKACOrCxTe5oqVANWzVo=; b=ZCdjrqii7nwCOLqv0o1KTznwh389muxDJCQbTazRSDb9KneIcHInvCPcoO8BckgatR yvufO9k1v93W2i4Jwoeq+vwg4AigRJmwBwo6G1RVBRwUUOtQvntj2/YMs7EDjxWTQDoJ KxC2Ij0ys3wgx4Z2r6dQ8gPnfOVm057XJXgiSP9EJY67UmCVqKdiuI+uHHr1SChZgHHe QVEBLnGUzuPSAz0Gxu+O3VfiGvT33bd283HVzL/IreKxqBOnVYGnecf5NMJfXF2E2PLa vQt85r0jqu4Zl6i3yyvkLwfTK6LY6JOX67lPvGk1E077X88UmDX6GENX1AwHFqlPdeZZ eoMg== X-Gm-Message-State: ALoCoQlsp8pB3HtPCREXm5vmQL6tq7lmUPPdVVNNs8q8n8jmuvx1mH4uO6axo+6mstPFRgKkDME1 X-Received: by 10.15.41.200 with SMTP id s48mr1724016eev.94.1379002428590; Thu, 12 Sep 2013 09:13:48 -0700 (PDT) Received: from phenom.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPSA id j7sm7003860eeo.15.1969.12.31.16.00.00 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 12 Sep 2013 09:13:47 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Thu, 12 Sep 2013 18:13:59 +0200 Message-Id: <1379002439-23489-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.8.4.rc3 Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH] drm/i915: move intel_init_pch_refclk into intel_modeset_init_hw X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org X-Spam-Status: No, score=-5.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,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 Sprinkling random special functions all over the place always has the risk that we miss it somewhere. Furthermore in this case the ordering wrt gem_init_hw was actually different between the driver load sequence and the resume sequence. So just call this at the beginning of modeset_init_hw. Cc: Paulo Zanoni Signed-off-by: Daniel Vetter Reviewed-by: Paulo Zanoni --- drivers/gpu/drm/i915/i915_drv.c | 2 -- drivers/gpu/drm/i915/i915_drv.h | 1 - drivers/gpu/drm/i915/intel_display.c | 6 +++--- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index ec690ca..4ed63cc 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -586,8 +586,6 @@ static int __i915_drm_thaw(struct drm_device *dev) /* KMS EnterVT equivalent */ if (drm_core_check_feature(dev, DRIVER_MODESET)) { - intel_init_pch_refclk(dev); - mutex_lock(&dev->struct_mutex); error = i915_gem_init_hw(dev); diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 7caf71d..5208419 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -2247,7 +2247,6 @@ extern void i915_redisable_vga(struct drm_device *dev); extern bool intel_fbc_enabled(struct drm_device *dev); extern void intel_disable_fbc(struct drm_device *dev); extern bool ironlake_set_drps(struct drm_device *dev, u8 val); -extern void intel_init_pch_refclk(struct drm_device *dev); extern void gen6_set_rps(struct drm_device *dev, u8 val); extern void valleyview_set_rps(struct drm_device *dev, u8 val); extern int valleyview_rps_max_freq(struct drm_i915_private *dev_priv); diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 378174f..7959640 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -5376,7 +5376,7 @@ static void lpt_init_pch_refclk(struct drm_device *dev) /* * Initialize reference clocks when the driver loads */ -void intel_init_pch_refclk(struct drm_device *dev) +static void intel_init_pch_refclk(struct drm_device *dev) { if (HAS_PCH_IBX(dev) || HAS_PCH_CPT(dev)) ironlake_init_pch_refclk(dev); @@ -9614,8 +9614,6 @@ static void intel_setup_outputs(struct drm_device *dev) intel_encoder_clones(encoder); } - intel_init_pch_refclk(dev); - drm_helper_move_panel_connectors_to_head(dev); } @@ -10086,6 +10084,8 @@ static void i915_enable_vga(struct drm_device *dev) void intel_modeset_init_hw(struct drm_device *dev) { + intel_init_pch_refclk(dev); + intel_init_power_well(dev); intel_prepare_ddi(dev);