From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jesse Barnes Subject: [PATCH 5/6] drm/i915/vlv: move DPIO init earlier v2 Date: Thu, 12 Dec 2013 12:41:56 -0800 Message-ID: <1386880917-2951-5-git-send-email-jbarnes@virtuousgeek.org> References: <1386880917-2951-1-git-send-email-jbarnes@virtuousgeek.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from oproxy7-pub.mail.unifiedlayer.com (oproxy7-pub.mail.unifiedlayer.com [67.222.55.9]) by gabe.freedesktop.org (Postfix) with SMTP id A190BFA51E for ; Thu, 12 Dec 2013 12:42:06 -0800 (PST) Received: from [67.161.37.189] (port=48326 helo=localhost.localdomain) by box514.bluehost.com with esmtpsa (UNKNOWN:CAMELLIA256-SHA:256) (Exim 4.80) (envelope-from ) id 1VrD5B-0001dy-MQ for intel-gfx@lists.freedesktop.org; Thu, 12 Dec 2013 13:42:05 -0700 In-Reply-To: <1386880917-2951-1-git-send-email-jbarnes@virtuousgeek.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org It's needed for early mode state readout, which is in turn needed to inherit the BIOS config. So split out the reset, which we need on resume too, from the DPIO reg init, and do the latter earlier. v2: split reset and reg init Signed-off-by: Jesse Barnes --- drivers/gpu/drm/i915/intel_display.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index b868331..f265110 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -1368,6 +1368,15 @@ static void intel_init_dpio(struct drm_device *dev) return; DPIO_PHY_IOSF_PORT(DPIO_PHY0) = IOSF_PORT_DPIO; +} + +static void intel_dpio_reset(struct drm_device *dev) +{ + struct drm_i915_private *dev_priv = dev->dev_private; + + if (!IS_VALLEYVIEW(dev)) + return; + /* * From VLV2A0_DP_eDP_DPIO_driver_vbios_notes_10.docx - * 6. De-assert cmn_reset/side_reset. Same as VLV X0. @@ -10908,7 +10917,7 @@ void intel_modeset_init_hw(struct drm_device *dev) I915_WRITE(DPLL(PIPE_B), I915_READ(DPLL(PIPE_B)) | DPLL_INTEGRATED_CRI_CLK_VLV); - intel_init_dpio(dev); + intel_dpio_reset(dev); mutex_lock(&dev->struct_mutex); intel_enable_gt_powersave(dev); @@ -10971,6 +10980,8 @@ void intel_modeset_init(struct drm_device *dev) } } + intel_init_dpio(dev); + intel_cpu_pll_init(dev); intel_shared_dpll_init(dev); -- 1.8.4.2