From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: Re: [PATCH] drm/i915: dont use i915_driver_unload() to cleanup failed vblank init Date: Wed, 17 Nov 2010 11:19:13 +0000 Message-ID: References: <1289975093.142900.349539985875.1.gpush@pororo> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 664C8A0E8A for ; Wed, 17 Nov 2010 03:19:16 -0800 (PST) In-Reply-To: <1289975093.142900.349539985875.1.gpush@pororo> 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: Jeremy Kerr , intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Wed, 17 Nov 2010 14:24:53 +0800, Jeremy Kerr wrote: > Currently, i915_driver_load calls i915_driver_unload if drm_vblank_init > fails. However, we have not yet fully initialised drm_i915_private (eg. > ->hangcheck_timer), so we're calling unload from an inconsistent state. > > This change uses the existing error path to do the cleanup instead, as > is used before and after the drm_vblank_init() call. Already done for -next, thanks anyway. -Chris -- Chris Wilson, Intel Open Source Technology Centre