From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jesse Barnes Subject: Re: [PATCH 1/2] drm/i915: make CRTC enable/disable asynchronous v2 Date: Fri, 30 May 2014 11:50:22 -0700 Message-ID: <20140530115022.178f5e49@jbarnes-desktop> References: <1401473122-3451-1-git-send-email-jbarnes@virtuousgeek.org> <20140530184756.GC10916@nuc-i3427.alporthouse.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-pb0-f41.google.com (mail-pb0-f41.google.com [209.85.160.41]) by gabe.freedesktop.org (Postfix) with ESMTP id 733FF6EB2D for ; Fri, 30 May 2014 11:50:03 -0700 (PDT) Received: by mail-pb0-f41.google.com with SMTP id uo5so2026759pbc.28 for ; Fri, 30 May 2014 11:50:03 -0700 (PDT) In-Reply-To: <20140530184756.GC10916@nuc-i3427.alporthouse.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Chris Wilson Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Fri, 30 May 2014 19:47:56 +0100 Chris Wilson 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