From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH 1/7] drm/i915: Mark context switch likely Date: Fri, 05 Apr 2013 10:09:58 +0300 Message-ID: <87d2u9qwqh.fsf@intel.com> References: <1365118914-15753-1-git-send-email-ben@bwidawsk.net> <1365118914-15753-2-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 mga03.intel.com (mga03.intel.com [143.182.124.21]) by gabe.freedesktop.org (Postfix) with ESMTP id B65BFE5BFD for ; Fri, 5 Apr 2013 00:09:51 -0700 (PDT) In-Reply-To: <1365118914-15753-2-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: intel-gfx@lists.freedesktop.org Cc: Ben Widawsky List-Id: intel-gfx@lists.freedesktop.org On Fri, 05 Apr 2013, Ben Widawsky wrote: > Only the very first switch doesn't take the path. > > Signed-off-by: Ben Widawsky > --- > drivers/gpu/drm/i915/i915_gem_context.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c > index 94d873a..aa080ea 100644 > --- a/drivers/gpu/drm/i915/i915_gem_context.c > +++ b/drivers/gpu/drm/i915/i915_gem_context.c > @@ -390,7 +390,7 @@ static int do_switch(struct i915_hw_context *to) > * is a bit suboptimal because the retiring can occur simply after the > * MI_SET_CONTEXT instead of when the next seqno has completed. > */ > - if (from_obj != NULL) { > + if (likely(from_obj)) { Looking at the function, is this, uh, likely to make a difference? Same goes for the unlikely in patches 4/7. (Yes, patch_es_ 4/7 - there's *two* patches 4/7 in the series! :o) I'm just generally wary of adding (un)likely annotations. I don't think it matters that the annotation itself is obviously correct; IMHO the performance impact should matter. BR, Jani. > from_obj->base.read_domains = I915_GEM_DOMAIN_INSTRUCTION; > i915_gem_object_move_to_active(from_obj, ring); > /* As long as MI_SET_CONTEXT is serializing, ie. it flushes the > -- > 1.8.2 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx