From patchwork Mon Jan 11 10:44:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 8001341 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 D23449F1C0 for ; Mon, 11 Jan 2016 10:47:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 019F12028D for ; Mon, 11 Jan 2016 10:47:30 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 7A2BE20295 for ; Mon, 11 Jan 2016 10:47:28 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1D7276E2CB; Mon, 11 Jan 2016 02:47:27 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 909376E2CE for ; Mon, 11 Jan 2016 02:46:32 -0800 (PST) Received: by mail-wm0-f65.google.com with SMTP id f206so25660244wmf.2 for ; Mon, 11 Jan 2016 02:46:32 -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=vidX36MzDDayE6gA9sIf2c+pM2vJirmjvO5VMRxs9q8=; b=IE6bj3MkVY6H295z3s+hxC0BE1rRbvP/tmHLMTRI5u88UMNIOELXloTX+Yay6VOu7p /UwPsRuiWVlBg8YnfAC6xU5XeRiyJ2rt2/1hs0eng/iTcaE0FuvUI1KKl8xKcvRQSa7v urMVLu8VXCm2wU15trAkxdTQS7rdV2K1bnauBRUcJbk59KTivys4UDT9kjg5FTN9HwWZ 1vf7pMlCos2F1bWY34rO8bn7iYVks5y9hYqpJJniVcfI7JBVEKmxon4AM37GnI2Wzyrd bOr/q+IbBtXK8+lGdz/gzwWWXR695wGYH+mCe8ysyF4mqruUOOvtKTkmG45FBB0+mVV9 dVLw== X-Received: by 10.194.109.2 with SMTP id ho2mr17598304wjb.66.1452509190912; Mon, 11 Jan 2016 02:46:30 -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.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 11 Jan 2016 02:46:29 -0800 (PST) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Mon, 11 Jan 2016 10:44:35 +0000 Message-Id: <1452509174-16671-5-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 091/190] drm/i915: Move context initialisation to first-use 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 Instead of allocating a new request when allocating a context, use the request that initiated the allocation to emit the context initialisation. Signed-off-by: Chris Wilson --- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_lrc.c | 42 ++++++++++++++++------------------------ 2 files changed, 18 insertions(+), 25 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 4e912fd3b8c6..f5f457920944 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -885,6 +885,7 @@ struct intel_context { struct drm_i915_gem_object *state; struct intel_ring *ring; int pin_count; + bool initialised; } engine[I915_NUM_RINGS]; struct list_head link; diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c index 31fbb482d15c..f892e658cd4b 100644 --- a/drivers/gpu/drm/i915/intel_lrc.c +++ b/drivers/gpu/drm/i915/intel_lrc.c @@ -482,14 +482,9 @@ static int execlists_context_queue(struct drm_i915_gem_request *request) int intel_logical_ring_alloc_request_extras(struct drm_i915_gem_request *request) { + struct intel_engine_cs *engine = request->engine; int ret; - request->ring = request->ctx->engine[request->engine->id].ring; - - ret = intel_lr_context_pin(request->ctx, request->engine); - if (ret) - return ret; - if (i915.enable_guc_submission) { /* * Check that the GuC has space for the request before @@ -503,6 +498,21 @@ int intel_logical_ring_alloc_request_extras(struct drm_i915_gem_request *request return ret; } + request->ring = request->ctx->engine[engine->id].ring; + + ret = intel_lr_context_pin(request->ctx, engine); + if (ret) + return ret; + + if (!request->ctx->engine[engine->id].initialised) { + ret = engine->init_context(request); + if (ret) { + intel_lr_context_unpin(request->ctx, engine); + return ret; + } + request->ctx->engine[engine->id].initialised = true; + } + return 0; } @@ -1968,26 +1978,8 @@ int intel_lr_context_deferred_alloc(struct intel_context *ctx, ctx->engine[engine->id].ring = ring; ctx->engine[engine->id].state = ctx_obj; + ctx->engine[engine->id].initialised = engine->init_context == NULL; - if (ctx != engine->default_context && engine->init_context) { - struct drm_i915_gem_request *req; - - req = i915_gem_request_alloc(engine, ctx); - if (IS_ERR(req)) { - DRM_ERROR("ring create req: %d\n", - ret); - goto error_ringbuf; - } - - ret = engine->init_context(req); - if (ret) { - DRM_ERROR("ring init context: %d\n", - ret); - i915_gem_request_cancel(req); - goto error_ringbuf; - } - i915_add_request_no_flush(req); - } return 0; error_ringbuf: