From patchwork Mon Jan 11 10:44:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 8001381 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 46EBC9F8AA for ; Mon, 11 Jan 2016 10:47:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 802EC202D1 for ; Mon, 11 Jan 2016 10:47:36 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id F3DEE2028D for ; Mon, 11 Jan 2016 10:47:34 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D15A56E2DD; Mon, 11 Jan 2016 02:47:31 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8C05D6E2CB for ; Mon, 11 Jan 2016 02:46:46 -0800 (PST) Received: by mail-wm0-f67.google.com with SMTP id f206so25661205wmf.2 for ; Mon, 11 Jan 2016 02:46:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=tQ7e1+otF72fX8aPO2Fu4sUxROM33cC5RLJuq2T2n2w=; b=Wxi87oxP6xSH6WKI0yYLixTrVj0e1prEE5ARJig1Lsk4TS2/96nE9sh1VwM8vTpVWn RbfJA1Ve9sGFtqbGVEQ4+IPNf3d8kJup6ripvpmNFgY+qtkp3VykRHASLdy2WWZWE76l vdfbcYCD2K/gDH45+asMtLFK/zWdEiMg90orDt9nkPRNOjN8xiUJOWfzvkqBd/JxDWL5 gXqjpEDpAbgznhH6kT9KEP6X/3HyT8N/Ps/LJpGAaYrjBJSij9JJEcxy23C3kvJrrwBl UyhIvjUnL5XzoSXWj9VgyvhDWZmZPhBqTVqGPC1+OIIps31od2spvvVz2KdSyNayPLhL P8jQ== X-Received: by 10.28.187.198 with SMTP id l189mr13610793wmf.89.1452509205390; Mon, 11 Jan 2016 02:46:45 -0800 (PST) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id t3sm118879383wjz.11.2016.01.11.02.46.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 11 Jan 2016 02:46:44 -0800 (PST) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Mon, 11 Jan 2016 10:44:48 +0000 Message-Id: <1452509174-16671-18-git-send-email-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.7.0.rc3 In-Reply-To: <1452509174-16671-1-git-send-email-chris@chris-wilson.co.uk> References: <1452503961-14837-1-git-send-email-chris@chris-wilson.co.uk> <1452509174-16671-1-git-send-email-chris@chris-wilson.co.uk> Subject: [Intel-gfx] [PATCH 104/190] drm/i915: Remove i915_gem_execbuffer_retire_commands() X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Move the single line to the callsite as the name is now misleading, and the purpose is solely to add the request to the execution queue. Signed-off-by: Chris Wilson --- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c index 90c5341506be..d88be1d3cb86 100644 --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c @@ -1163,13 +1163,6 @@ i915_gem_execbuffer_move_to_active(struct list_head *vmas, } } -static void -i915_gem_execbuffer_retire_commands(struct i915_execbuffer_params *params) -{ - /* Add a breadcrumb for the completion of the batch buffer */ - __i915_add_request(params->request, params->batch_obj, true); -} - static int i915_reset_gen7_sol_offsets(struct drm_i915_gem_request *req) { @@ -1651,7 +1644,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data, params->ctx = ctx; ret = execbuf_submit(params, args, &eb->vmas); - i915_gem_execbuffer_retire_commands(params); + __i915_add_request(params->request, params->batch_obj, ret == 0); err_batch_unpin: /*