From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: Re: [PATCH 08/11] drm/i915: call assert_device_not_suspended at gen6_force_wake_work Date: Fri, 28 Feb 2014 16:12:24 +0200 Message-ID: <1393596744.3479.54.camel@intelbox> References: <1393001548-2883-1-git-send-email-przanoni@gmail.com> <1393001548-2883-9-git-send-email-przanoni@gmail.com> Reply-To: imre.deak@intel.com Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0915815967==" Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 961F0FB7CE for ; Fri, 28 Feb 2014 06:12:26 -0800 (PST) In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org To: Paulo Zanoni Cc: Intel Graphics Development , Paulo Zanoni List-Id: intel-gfx@lists.freedesktop.org --===============0915815967== Content-Type: multipart/signed; micalg="pgp-sha1"; protocol="application/pgp-signature"; boundary="=-61jz3r8ZDZDiE2kzJIRp" --=-61jz3r8ZDZDiE2kzJIRp Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Fri, 2014-02-21 at 15:05 -0300, Paulo Zanoni wrote: > 2014-02-21 13:52 GMT-03:00 Paulo Zanoni : > > From: Paulo Zanoni > > > > Because we shouldn't be runtime suspended when forcewake is supposed > > to be enabled. > > > > This commit will trigger the WARNs because we currently have a bug > > with this. The next patches should fix the bug. >=20 > Actually I changed the patch order and forgot to remove the sentence > above. Patch 03/11 should fix it. >=20 > > > > Signed-off-by: Paulo Zanoni Patch 3/11 is now part of "Merge PC8 with runtime PM, v2" and this should come after that. With the order fixed: Reviewed-by: Imre Deak > > --- > > drivers/gpu/drm/i915/intel_uncore.c | 15 ++++++++------- > > 1 file changed, 8 insertions(+), 7 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915= /intel_uncore.c > > index 1f7226f..212de36 100644 > > --- a/drivers/gpu/drm/i915/intel_uncore.c > > +++ b/drivers/gpu/drm/i915/intel_uncore.c > > @@ -40,6 +40,12 @@ > > > > #define __raw_posting_read(dev_priv__, reg__) (void)__raw_i915_read32(= dev_priv__, reg__) > > > > +static void > > +assert_device_not_suspended(struct drm_i915_private *dev_priv) > > +{ > > + WARN(HAS_RUNTIME_PM(dev_priv->dev) && dev_priv->pm.suspended, > > + "Device suspended\n"); > > +} > > > > static void __gen6_gt_wait_for_thread_c0(struct drm_i915_private *dev_= priv) > > { > > @@ -295,6 +301,8 @@ static void gen6_force_wake_work(struct work_struct= *work) > > container_of(work, typeof(*dev_priv), uncore.force_wake= _work.work); > > unsigned long irqflags; > > > > + assert_device_not_suspended(dev_priv); > > + > > spin_lock_irqsave(&dev_priv->uncore.lock, irqflags); > > if (--dev_priv->uncore.forcewake_count =3D=3D 0) > > dev_priv->uncore.funcs.force_wake_put(dev_priv, FORCEWA= KE_ALL); > > @@ -451,13 +459,6 @@ hsw_unclaimed_reg_check(struct drm_i915_private *d= ev_priv, u32 reg) > > } > > } > > > > -static void > > -assert_device_not_suspended(struct drm_i915_private *dev_priv) > > -{ > > - WARN(HAS_RUNTIME_PM(dev_priv->dev) && dev_priv->pm.suspended, > > - "Device suspended\n"); > > -} > > - > > #define REG_READ_HEADER(x) \ > > unsigned long irqflags; \ > > u##x val =3D 0; \ > > -- > > 1.8.5.3 > > >=20 >=20 >=20 --=-61jz3r8ZDZDiE2kzJIRp Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.14 (GNU/Linux) iQEcBAABAgAGBQJTEJlIAAoJEORIIAnNuWDFDVoH/RMSfCBeOD7Vn5hc9wiG06tb C41v0MbzkTrL5+VFKkV1hBNiWsmcKKZKl/hQLFWL31ocuDeM4woYe0WQ2qe2FMdm otQUybPnc6MEE3MEEjISjTvPm106+RBX8uMbfNjh3I3EIOXdTLC8ygTFBM1QJG8I wdKjWS8S+xrb6Va6tj0e1z31aj2Z8JFw7FVO16f/M2YQX+Kl0a/QgTg63Gsyu44o ODgowuX/AmSOnxeiDexed9k/Oul5r21+b3wXS1FnJgQQAwQbwMhHGNZINB3A8wYv q1W33BHbdHsukzZVSzEcKp3dMPl8A3avya5HBB+vx+YjkxsFM3QcFWULEy78lHU= =vQGF -----END PGP SIGNATURE----- --=-61jz3r8ZDZDiE2kzJIRp-- --===============0915815967== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx --===============0915815967==--