From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Romanick Subject: Re: [PATCH] drm/i915: initialize gen6 rps work queue for Ironlake+ Date: Wed, 18 May 2011 18:37:48 +0200 Message-ID: <4DD3F5DC.904@freedesktop.org> References: <20110518092107.36dfeecd@jbarnes-desktop> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from expn.cat.pdx.edu (expn.cat.pdx.edu [131.252.208.110]) by gabe.freedesktop.org (Postfix) with ESMTP id 3D11C9E85C for ; Wed, 18 May 2011 09:37:58 -0700 (PDT) In-Reply-To: <20110518092107.36dfeecd@jbarnes-desktop> 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: Jesse Barnes Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 05/18/2011 06:21 PM, Jesse Barnes wrote: > Looks like I didn't merge Ben's RPS work queue stuff correctly with the > new IRQ split code (diff was sparse enough that git didn't complain). > This should prevent null derefs on ILK+ due to the missing work queue. Is this actually needed on Ironlake (i.e., gen5)? > Signed-off-by: Jesse Barnes > > diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c > index 349a03e..9112bf5 100644 > --- a/drivers/gpu/drm/i915/i915_irq.c > +++ b/drivers/gpu/drm/i915/i915_irq.c > @@ -1736,6 +1736,7 @@ void ironlake_irq_preinstall(struct drm_device *dev) > > INIT_WORK(&dev_priv->hotplug_work, i915_hotplug_work_func); > INIT_WORK(&dev_priv->error_work, i915_error_work_func); > + INIT_WORK(&dev_priv->rps_work, gen6_pm_rps_work); > > I915_WRITE(HWSTAM, 0xeffe); > > @@ -1887,7 +1888,6 @@ void i915_driver_irq_preinstall(struct drm_device * dev) > > INIT_WORK(&dev_priv->hotplug_work, i915_hotplug_work_func); > INIT_WORK(&dev_priv->error_work, i915_error_work_func); > - INIT_WORK(&dev_priv->rps_work, gen6_pm_rps_work); > > if (I915_HAS_HOTPLUG(dev)) { > I915_WRITE(PORT_HOTPLUG_EN, 0); -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org/ iEYEARECAAYFAk3T9dwACgkQX1gOwKyEAw/wRACeLPeHTmjvu0ObCV3iJsZMXNud gwUAn3vuXo6J59viQrw5aMn6r8of68pL =zjHv -----END PGP SIGNATURE-----