From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH] drm/i915: Really fix the debug unregister code Date: Mon, 8 Jul 2013 22:07:43 +0200 Message-ID: <20130708200743.GI18285@phenom.ffwll.local> References: <1373220233-20648-1-git-send-email-ben@bwidawsk.net> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-ea0-f179.google.com (mail-ea0-f179.google.com [209.85.215.179]) by gabe.freedesktop.org (Postfix) with ESMTP id 4E96AE5D0D for ; Mon, 8 Jul 2013 13:07:43 -0700 (PDT) Received: by mail-ea0-f179.google.com with SMTP id b15so3185523eae.24 for ; Mon, 08 Jul 2013 13:07:42 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1373220233-20648-1-git-send-email-ben@bwidawsk.net> 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: Ben Widawsky Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Sun, Jul 07, 2013 at 11:03:53AM -0700, Ben Widawsky wrote: > This smells like a missing git add, but unregister was not handled > properly in: > commit c032d5491a4d8d56d8364f4919364815b55d3437 > Author: Daniel Vetter > Date: Thu Jul 4 20:39:49 2013 +0200 > > drm/i915: convert debugfs creation/destruction to table > > fops is already the pointer that we want when incrementally removing. > > One really bad side effect of this failure is all tests in our test > suite will fail after module_reload fails. > > This fix was actually lazily authored by Chris. > > CC: Chris Wilson > Reported-and-tested-by: Ben Widawsky > Signed-off-by: Ben Widawsky Fixed by merging the right version of my patch (the one you've actually looked at ...). My apologies for the mess I've caused here. -Daniel > --- > drivers/gpu/drm/i915/i915_debugfs.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c > index b49d731..d870f27 100644 > --- a/drivers/gpu/drm/i915/i915_debugfs.c > +++ b/drivers/gpu/drm/i915/i915_debugfs.c > @@ -2420,8 +2420,7 @@ void i915_debugfs_cleanup(struct drm_minor *minor) > 1, minor); > for (i = 0; i < ARRAY_SIZE(i915_debugfs_files); i++) { > struct drm_info_list *info_list = > - (struct drm_info_list *) &i915_debugfs_files[i].fops; > - > + (struct drm_info_list *)i915_debugfs_files[i].fops; > drm_debugfs_remove_files(info_list, 1, minor); > } > } > -- > 1.8.3.2 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch