[Intel-gfx] [PATCH 1/2] drm/i915: make CRTC enable/disable asynchronous v2

[Jesse Barnes]

On Fri, 30 May 2014 19:47:56 +0100
Chris Wilson <chris at chris-wilson.co.uk> wrote:

> On Fri, May 30, 2014 at 11:05:21AM -0700, Jesse Barnes wrote:
> > diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> > index e2bfdda..e7fa84f 100644
> > --- a/drivers/gpu/drm/i915/i915_drv.c
> > +++ b/drivers/gpu/drm/i915/i915_drv.c
> > @@ -530,7 +530,7 @@ static int i915_drm_freeze(struct drm_device *dev)
> >  		mutex_lock(&dev->mode_config.mutex);
> >  		for_each_crtc(dev, crtc) {
> >  			mutex_lock(&crtc->mutex);
> > -			dev_priv->display.crtc_disable(crtc);
> > +			dev_priv->display._crtc_disable(crtc);
> 
> Don't you want to cancel the pending work here or it will be run on
> resume - but on resume, we just want to send the hotplug event and let
> userspace set itself up in the new configuration.

No you're right I need to cancel it here and in unload, thanks.

-- 
Jesse Barnes, Intel Open Source Technology Center