From patchwork Thu Apr 28 08:56:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 8966871 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 3C39DBF4C7 for ; Thu, 28 Apr 2016 08:57:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5D06E202DD for ; Thu, 28 Apr 2016 08:57:34 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 84AFF202AE for ; Thu, 28 Apr 2016 08:57:33 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 23A446EC9A; Thu, 28 Apr 2016 08:57:27 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9C7ED6EC8A for ; Thu, 28 Apr 2016 08:57:24 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id r12so21006275wme.0 for ; Thu, 28 Apr 2016 01:57:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=gMwx8LbAhzAliIf1xVLG+6hKlSC8QrPZK1fkOSW0Bh0=; b=GLrRtaRQYtwqjbRVxri41DBL9HWmFJspT4R8SG99BzlTTEyG3JgaTIGg08HY4Tbq+e 20/fFjabVIjAQEjxzowEIgFd1gguRZQoug7VYh7lyD2ADAAdtpaWU1lXb6mK1GnPXHc+ 0CohfLV7BMD28OQ1RuiiKQh9F9v5MBeouPSN/K4OB8lPtfchecX0wST44URskLHIRA4i XLIuRZRIgKTOM6xAXlZD83VRfwyV6PY18vtzxpxonG7nqaIJKy9shQ89n6kQJoiZ3XgM 8kBnHOj+4fwKLMqCMbYCpDLEp7rt3pJ5C1v8NDdH0mtlxc+guDqfkbzKAjiOe0aiX9/P n5Kg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=gMwx8LbAhzAliIf1xVLG+6hKlSC8QrPZK1fkOSW0Bh0=; b=gQQ97MAkxCETOVyTwCRsRQAInIg6wTiSbIn0iRNMtbowL9TV8A7TRYZV78UV6ZJRoR bAUY4aAVW3+2eo570j/CrJgvXcuoz8pGBI+icG0W0qj5/kIGW2Adkfha0VWndIyUIoV/ /pSTIZ8tLV2tL7z3iWraRXsy+cr2Gpj2jPqQTenhNlQ7CAosgp75nyvPmVS3MLkB++aU eQLnBZeYcZL5pRnjM2Jox5xpg7kfhLSUSBkmMstEbm18J8cqZZFkfxIVvMzA2OUXRobC QI0CGDt4yOSRxirX8npO12csBb5ofx085CD60lmbBTQIjl1vs4+NfBqJEuuCc+FgnE15 vnJw== X-Gm-Message-State: AOPr4FVe7HnMR9IOWnclaJw5WvK0EmMcQRt918tYIy0pw5lCx8fhMetFndcOqmEe/fY3sw== X-Received: by 10.28.167.193 with SMTP id q184mr15389656wme.63.1461833841470; Thu, 28 Apr 2016 01:57:21 -0700 (PDT) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id f11sm28454544wmf.22.2016.04.28.01.57.20 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Apr 2016 01:57:20 -0700 (PDT) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Thu, 28 Apr 2016 09:56:49 +0100 Message-Id: <1461833819-3991-15-git-send-email-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1461833819-3991-1-git-send-email-chris@chris-wilson.co.uk> References: <1461833819-3991-1-git-send-email-chris@chris-wilson.co.uk> Subject: [Intel-gfx] [CI 15/25] drm/i915: Preallocate enough space for the average request 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=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham 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 Rather than being interrupted when we run out of space halfway through the request, and having to restart from the beginning (and returning to userspace), flush a little more free space when we prepare the request. Signed-off-by: Chris Wilson Cc: Tvrtko Ursulin Reviewed-by: Tvrtko Ursulin --- drivers/gpu/drm/i915/intel_lrc.c | 7 +++++++ drivers/gpu/drm/i915/intel_ringbuffer.c | 16 +++++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c index 01517dd7069b..b5c2c1931a5f 100644 --- a/drivers/gpu/drm/i915/intel_lrc.c +++ b/drivers/gpu/drm/i915/intel_lrc.c @@ -700,6 +700,12 @@ int intel_logical_ring_alloc_request_extras(struct drm_i915_gem_request *request { int ret; + /* Flush enough space to reduce the likelihood of waiting after + * we start building the request - in which case we will just + * have to repeat work. + */ + request->reserved_space += MIN_SPACE_FOR_ADD_REQUEST; + request->ringbuf = request->ctx->engine[request->engine->id].ringbuf; if (i915.enable_guc_submission) { @@ -725,6 +731,7 @@ int intel_logical_ring_alloc_request_extras(struct drm_i915_gem_request *request if (ret) goto err_unpin; + request->reserved_space -= MIN_SPACE_FOR_ADD_REQUEST; return 0; err_unpin: diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index 492f9c671c6f..e2166f4f3612 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c @@ -2338,8 +2338,22 @@ int intel_engine_idle(struct intel_engine_cs *engine) int intel_ring_alloc_request_extras(struct drm_i915_gem_request *request) { + int ret; + + /* Flush enough space to reduce the likelihood of waiting after + * we start building the request - in which case we will just + * have to repeat work. + */ + request->reserved_space += MIN_SPACE_FOR_ADD_REQUEST; + request->ringbuf = request->engine->buffer; - return intel_ring_begin(request, 0); + + ret = intel_ring_begin(request, 0); + if (ret) + return ret; + + request->reserved_space -= MIN_SPACE_FOR_ADD_REQUEST; + return 0; } static int wait_for_space(struct drm_i915_gem_request *req, int bytes)