On Mon, Jul 29, 2013 at 10:04:29PM +0100, Chris Wilson wrote: > Whoops, we spotted that error and fixed it in the next tree, but forgot > to send a fix for stable as well. > ... > > +} > + > +void intel_pm_init(struct drm_device *dev) > +{ > INIT_DELAYED_WORK(&dev_priv->rps.delayed_resume_work, > intel_gen6_powersave_work); > }
This doesn't compile. LD drivers/gpu/drm/drm_kms_helper.o LD drivers/gpu/drm/drm.o CC drivers/gpu/drm/i915/intel_pm.o drivers/gpu/drm/i915/intel_pm.c: In function ‘intel_pm_init’: drivers/gpu/drm/i915/intel_pm.c:5543:70: error: ‘dev_priv’ undeclared (first use in this function) INIT_DELAYED_WORK(&dev_priv->rps.delayed_resume_work, ^ drivers/gpu/drm/i915/intel_pm.c:5543:70: note: each undeclared identifier is reported only once for each function it appears in make[4]: *** [drivers/gpu/drm/i915/intel_pm.o] Error 1 Needs this on top: diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 1235d71..f895d15 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -5540,6 +5540,8 @@ void intel_gt_init(struct drm_device *dev) void intel_pm_init(struct drm_device *dev) { + struct drm_i915_private *dev_priv = dev->dev_private; + INIT_DELAYED_WORK(&dev_priv->rps.delayed_resume_work, intel_gen6_powersave_work); } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/