From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp2.it.da.ut.ee ([193.40.5.67]:56255 "EHLO smtp2.it.da.ut.ee" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752170AbcAGPtg convert rfc822-to-8bit (ORCPT ); Thu, 7 Jan 2016 10:49:36 -0500 Date: Thu, 7 Jan 2016 17:49:10 +0200 (EET) From: Meelis Roos To: Daniel Vetter cc: DRI Development , Intel Graphics Development , =?ISO-8859-15?Q?Ville_Syrj=E4l=E4?= , Patrik Jakobsson , Imre Deak , Jani Nikula , Chris Wilson , stable@vger.kernel.org, Daniel Vetter Subject: Re: [PATCH] drm/i915: Init power domains early in driver load In-Reply-To: <1452174665-13025-1-git-send-email-daniel.vetter@ffwll.ch> Message-ID: References: <1452157856-27360-1-git-send-email-daniel.vetter@ffwll.ch> <1452174665-13025-1-git-send-email-daniel.vetter@ffwll.ch> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8BIT Sender: stable-owner@vger.kernel.org List-ID: > commit ac9b8236551d1177fd07b56aef9b565d1864420d > Author: Ville Syrjälä > Date: Fri Nov 27 18:55:26 2015 +0200 > > drm/i915: Introduce a gmbus power domain > > gmbus also needs the power domain infrastructure right from the start, > since as soon as we register the i2c controllers someone can use them. > > v2: Adjust cleanup paths too (Chris). > > v3: Rebase onto -nightly (totally bogus tree I had lying around) and > also move dpio init head (Ville). > > v4: Ville instead suggested to move gmbus setup later in the sequence, > since it's only needed by the modeset code. > > v5: Move even close to the actual user, right next to the comment that > states where we really need gmbus (and interrupts!). > > Cc: Ville Syrjälä > Cc: Patrik Jakobsson > Cc: Imre Deak > Cc: Jani Nikula > Cc: Meelis Roos > Cc: Chris Wilson > Fixes: ac9b8236551d ("drm/i915: Introduce a gmbus power domain") > Cc: stable@vger.kernel.org > References: http://www.spinics.net/lists/intel-gfx/msg83075.html > Signed-off-by: Daniel Vetter > --- > > Meelis, can you pls retest this one? Tested successfully on SNB computer. > > Thanks, Daniel > --- > drivers/gpu/drm/i915/i915_dma.c | 6 +++--- > drivers/gpu/drm/i915/intel_display.c | 2 ++ > 2 files changed, 5 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c > index 988a3806512a..d70d96fe553b 100644 > --- a/drivers/gpu/drm/i915/i915_dma.c > +++ b/drivers/gpu/drm/i915/i915_dma.c > @@ -406,6 +406,8 @@ static int i915_load_modeset_init(struct drm_device *dev) > if (ret) > goto cleanup_gem_stolen; > > + intel_setup_gmbus(dev); > + > /* Important: The output setup functions called by modeset_init need > * working irqs for e.g. gmbus and dp aux transfers. */ > intel_modeset_init(dev); > @@ -455,6 +457,7 @@ cleanup_gem: > cleanup_irq: > intel_guc_ucode_fini(dev); > drm_irq_uninstall(dev); > + intel_teardown_gmbus(dev); > cleanup_gem_stolen: > i915_gem_cleanup_stolen(dev); > cleanup_vga_switcheroo: > @@ -1028,7 +1031,6 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) > > /* Try to make sure MCHBAR is enabled before poking at it */ > intel_setup_mchbar(dev); > - intel_setup_gmbus(dev); > intel_opregion_setup(dev); > > i915_gem_load(dev); > @@ -1101,7 +1103,6 @@ out_gem_unload: > if (dev->pdev->msi_enabled) > pci_disable_msi(dev->pdev); > > - intel_teardown_gmbus(dev); > intel_teardown_mchbar(dev); > pm_qos_remove_request(&dev_priv->pm_qos); > destroy_workqueue(dev_priv->gpu_error.hangcheck_wq); > @@ -1203,7 +1204,6 @@ int i915_driver_unload(struct drm_device *dev) > > intel_csr_ucode_fini(dev_priv); > > - intel_teardown_gmbus(dev); > intel_teardown_mchbar(dev); > > destroy_workqueue(dev_priv->hotplug.dp_wq); > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index 37945ddb4dad..ac0038bf4fbf 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -15971,6 +15971,8 @@ void intel_modeset_cleanup(struct drm_device *dev) > mutex_lock(&dev->struct_mutex); > intel_cleanup_gt_powersave(dev); > mutex_unlock(&dev->struct_mutex); > + > + intel_teardown_gmbus(dev); > } > > /* > -- Meelis Roos (mroos@ut.ee) http://www.cs.ut.ee/~mroos/