From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ben Widawsky Subject: Re: [PATCH 02/29] drm/i915: Rework drop caches for checkpatch Date: Sat, 3 Aug 2013 15:10:24 -0700 Message-ID: <20130803221024.GA28218@bwidawsk.net> References: <1375315222-4785-1-git-send-email-ben@bwidawsk.net> <1375315222-4785-3-git-send-email-ben@bwidawsk.net> <20130803113235.GF4878@cantiga.alporthouse.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail.bwidawsk.net (bwidawsk.net [166.78.191.112]) by gabe.freedesktop.org (Postfix) with ESMTP id 3E22AE684D for ; Sat, 3 Aug 2013 15:10:29 -0700 (PDT) Content-Disposition: inline In-Reply-To: <20130803113235.GF4878@cantiga.alporthouse.com> 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: Chris Wilson , Intel GFX List-Id: intel-gfx@lists.freedesktop.org On Sat, Aug 03, 2013 at 12:32:35PM +0100, Chris Wilson wrote: > On Wed, Jul 31, 2013 at 04:59:55PM -0700, Ben Widawsky wrote: > > With an upcoming change to bind, to make checkpatch happy and keep the > > code clean, we need to rework this code a bit. > > > > This should have no functional impact. > > > > Signed-off-by: Ben Widawsky > > --- > > drivers/gpu/drm/i915/i915_debugfs.c | 13 +++++++------ > > 1 file changed, 7 insertions(+), 6 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c > > index be69807..61ffa71 100644 > > --- a/drivers/gpu/drm/i915/i915_debugfs.c > > +++ b/drivers/gpu/drm/i915/i915_debugfs.c > > @@ -1781,12 +1781,13 @@ i915_drop_caches_set(void *data, u64 val) > > > > if (val & DROP_BOUND) { > > list_for_each_entry_safe(obj, next, &vm->inactive_list, > > - mm_list) > > - if (obj->pin_count == 0) { > > - ret = i915_gem_object_unbind(obj); > > - if (ret) > > - goto unlock; > > - } > > + mm_list) { > > + if (obj->pin_count) > > + continue; > > Give me a newline here, and I'm sold. > Got it. As you may have noticed, this was already fixed in patch 20 of the series. > > + ret = i915_gem_object_unbind(obj); > > + if (ret) > > + goto unlock; > > + } > > } > > -- > Chris Wilson, Intel Open Source Technology Centre -- Ben Widawsky, Intel Open Source Technology Center