From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH] drm/i915: remove extraneous VGA power domain put calls Date: Fri, 25 Apr 2014 19:14:42 +0300 Message-ID: <20140425161442.GU18465@intel.com> References: <1398436080-20882-1-git-send-email-imre.deak@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id E068B6E1A9 for ; Fri, 25 Apr 2014 09:14:45 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1398436080-20882-1-git-send-email-imre.deak@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Imre Deak Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Fri, Apr 25, 2014 at 05:28:00PM +0300, Imre Deak wrote: > In recent dmesg logs reported for unrelated issues I noticed some power > domain WARNs caused by the following. > = > The workaround > = > commit ce352550327b394f3072a07c9cd9d27af9276f15 > Author: Ville Syrj=E4l=E4 > Date: Fri Sep 20 10:14:23 2013 +0300 > = > drm/i915: Fix unclaimed register access due to delayed VGA memory dis= able > = > and following fixup of it > = > commit a14853206517b0c8102accbc77401805a0dbdb9e > Author: Ville Syrj=E4l=E4 > Date: Mon Sep 16 17:38:34 2013 +0300 > = > drm/i915: Move power well init earlier during driver load > = > was partially reverted by > = > commit 7f16e5c1416070dc590dd333a2d677700046a4ab > Merge: 9d1cb91 5e01dc7 > Author: Daniel Vetter > Date: Mon Nov 4 16:28:47 2013 +0100 > = > Merge tag 'v3.12' into drm-intel-next > = > but kept the power domain put calls on the error path. > = > I think for now we can keep things as-is (not reintroduce the w/a) and ju= st fix > the error path, since > - nobody complained seeing this issue > - according to Ville someone is reworking the VGA arbitration scheme at t= he > moment and when that's ready we have to rethink this part anyway > = > So fix this by just removing the put calls from the error path as well. > = > Signed-off-by: Imre Deak Reviewed-by: Ville Syrj=E4l=E4 > --- > drivers/gpu/drm/i915/i915_dma.c | 9 +++------ > 1 file changed, 3 insertions(+), 6 deletions(-) > = > diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_= dma.c > index 0b38f88..4a13523 100644 > --- a/drivers/gpu/drm/i915/i915_dma.c > +++ b/drivers/gpu/drm/i915/i915_dma.c > @@ -1339,7 +1339,7 @@ static int i915_load_modeset_init(struct drm_device= *dev) > = > ret =3D i915_gem_init(dev); > if (ret) > - goto cleanup_power; > + goto cleanup_irq; > = > INIT_WORK(&dev_priv->console_resume_work, intel_console_resume); > = > @@ -1348,10 +1348,8 @@ static int i915_load_modeset_init(struct drm_devic= e *dev) > /* Always safe in the mode setting case. */ > /* FIXME: do pre/post-mode set stuff in core KMS code */ > dev->vblank_disable_allowed =3D true; > - if (INTEL_INFO(dev)->num_pipes =3D=3D 0) { > - intel_display_power_put(dev_priv, POWER_DOMAIN_VGA); > + if (INTEL_INFO(dev)->num_pipes =3D=3D 0) > return 0; > - } > = > ret =3D intel_fbdev_init(dev); > if (ret) > @@ -1386,8 +1384,7 @@ cleanup_gem: > mutex_unlock(&dev->struct_mutex); > WARN_ON(dev_priv->mm.aliasing_ppgtt); > drm_mm_takedown(&dev_priv->gtt.base.mm); > -cleanup_power: > - intel_display_power_put(dev_priv, POWER_DOMAIN_VGA); > +cleanup_irq: > drm_irq_uninstall(dev); > cleanup_gem_stolen: > i915_gem_cleanup_stolen(dev); > -- = > 1.8.4 > = > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- = Ville Syrj=E4l=E4 Intel OTC