From patchwork Tue May 24 13:53:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9133701 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 545646075E for ; Tue, 24 May 2016 13:54:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 47915281F9 for ; Tue, 24 May 2016 13:54:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3C5F02824F; Tue, 24 May 2016 13:54:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E155028258 for ; Tue, 24 May 2016 13:54:01 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BC89F6E788; Tue, 24 May 2016 13:54:00 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 49E8D6E790 for ; Tue, 24 May 2016 13:53:58 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id f75so6393864wmf.2 for ; Tue, 24 May 2016 06:53:58 -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=NmA22Q3Dl5ows277IpuXQRkvV/0ExUF+YwaOrQ2T3IM=; b=PKb9u/2CCeQUAjgbnbXyoJMh8dWJu33fY4ufb0sF1u40ff/rPQQI285a1dsw87R3t0 gCiv1XjVDpX0+M8uRp+1/SwwSBoSexR9Mqj+2CO7y8XoEATJMmZlbzOACuGGNcn9laWJ 9OBZvD7XHS8gcBPc4ziq9AFUcuOrwnQcn2wmuP1M+U4ys3Xcihr3CHoC9fVnpPAv9MK2 owtBSZVlvyMIjQonUmP4kCMLsF2KsCL5S2AZRN+1K4zGWBx/8WneQCtZhFGYCCf0hz11 vi8KS8JtZrDHyAKDq22ZmjRMnowfpERcquOEf7fPcRG66vy4kateq6F2s/kwOUpURCOM cM7Q== 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=NmA22Q3Dl5ows277IpuXQRkvV/0ExUF+YwaOrQ2T3IM=; b=Wqh7BviwUWQzkWBK+2pg4qS5iDY1sYacf72FvXAVCbt1IlQv4QFaZMKn/xDeI7tCWs is6j3NM20GOpjEj1ISDAQ6wP6MNsGTRELWu8k5jB/6t4Yv4FIXTbgy06K/TF/QLmg3hK +qT2RP+swS3N3UV2jFipjAmg2I/Ye+oH9Mp5fnAoxiw7V4XBAtnjmEG2W+SX7/26rCRk vaiNvK55LJ/ZgHXseCmhx4pxUsRHNuzWYA8bEuYyr0fwZaNwNGk/lY/dYJSAsAYdYKcQ /vHgPqQh1GYaAxcf0hA+rSmRmqrhGLuLudcQqXYZQ9C0ub0xPoTd7ovSEktYTdTZCepx wYVA== X-Gm-Message-State: ALyK8tKrH6W/aeRiiYefSR784uPVQhNXsZELdTRXQLyepIeAvNHkbVDwnkh8QkfLBsFovg== X-Received: by 10.28.210.75 with SMTP id j72mr4904629wmg.31.1464098036414; Tue, 24 May 2016 06:53:56 -0700 (PDT) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id w10sm3391708wjk.18.2016.05.24.06.53.55 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 May 2016 06:53:55 -0700 (PDT) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Tue, 24 May 2016 14:53:38 +0100 Message-Id: <1464098023-3294-5-git-send-email-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1464098023-3294-1-git-send-email-chris@chris-wilson.co.uk> References: <1464003258-23669-1-git-send-email-chris@chris-wilson.co.uk> <1464098023-3294-1-git-send-email-chris@chris-wilson.co.uk> Subject: [Intel-gfx] [CI 05/10] drm/i915: Move pinning of dev_priv->kernel_context into its creator 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-Virus-Scanned: ClamAV using ClamSMTP Rather than have every context ask "am I owned by the kernel? pin!", move that logic into the creator of the kernel context, in order to improve code comprehension. v2: Throw away the user_handle on failure to allocate the ppgtt. Signed-off-by: Chris Wilson Cc: Tvrtko Ursulin Cc: Joonas Lahtinen Reviewed-by: Tvrtko Ursulin --- drivers/gpu/drm/i915/i915_gem_context.c | 53 +++++++++++++++------------------ 1 file changed, 24 insertions(+), 29 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c index a3f9adb22a73..104d4819aca8 100644 --- a/drivers/gpu/drm/i915/i915_gem_context.c +++ b/drivers/gpu/drm/i915/i915_gem_context.c @@ -303,9 +303,7 @@ static struct i915_gem_context * i915_gem_create_context(struct drm_device *dev, struct drm_i915_file_private *file_priv) { - const bool is_global_default_ctx = file_priv == NULL; struct i915_gem_context *ctx; - int ret = 0; lockdep_assert_held(&dev->struct_mutex); @@ -313,30 +311,15 @@ i915_gem_create_context(struct drm_device *dev, if (IS_ERR(ctx)) return ctx; - if (is_global_default_ctx && ctx->legacy_hw_ctx.rcs_state) { - /* We may need to do things with the shrinker which - * require us to immediately switch back to the default - * context. This can cause a problem as pinning the - * default context also requires GTT space which may not - * be available. To avoid this we always pin the default - * context. - */ - ret = i915_gem_obj_ggtt_pin(ctx->legacy_hw_ctx.rcs_state, - get_context_alignment(to_i915(dev)), 0); - if (ret) { - DRM_DEBUG_DRIVER("Couldn't pin %d\n", ret); - goto err_destroy; - } - } - if (USES_FULL_PPGTT(dev)) { struct i915_hw_ppgtt *ppgtt = i915_ppgtt_create(dev, file_priv); - if (IS_ERR_OR_NULL(ppgtt)) { + if (IS_ERR(ppgtt)) { DRM_DEBUG_DRIVER("PPGTT setup failed (%ld)\n", PTR_ERR(ppgtt)); - ret = PTR_ERR(ppgtt); - goto err_unpin; + idr_remove(&file_priv->context_idr, ctx->user_handle); + i915_gem_context_unreference(ctx); + return ERR_CAST(ppgtt); } ctx->ppgtt = ppgtt; @@ -345,14 +328,6 @@ i915_gem_create_context(struct drm_device *dev, trace_i915_context_create(ctx); return ctx; - -err_unpin: - if (is_global_default_ctx && ctx->legacy_hw_ctx.rcs_state) - i915_gem_object_ggtt_unpin(ctx->legacy_hw_ctx.rcs_state); -err_destroy: - idr_remove(&file_priv->context_idr, ctx->user_handle); - i915_gem_context_unreference(ctx); - return ERR_PTR(ret); } static void i915_gem_context_unpin(struct i915_gem_context *ctx, @@ -426,6 +401,26 @@ int i915_gem_context_init(struct drm_device *dev) return PTR_ERR(ctx); } + if (ctx->legacy_hw_ctx.rcs_state) { + int ret; + + /* We may need to do things with the shrinker which + * require us to immediately switch back to the default + * context. This can cause a problem as pinning the + * default context also requires GTT space which may not + * be available. To avoid this we always pin the default + * context. + */ + ret = i915_gem_obj_ggtt_pin(ctx->legacy_hw_ctx.rcs_state, + get_context_alignment(dev_priv), 0); + if (ret) { + DRM_ERROR("Failed to pinned default global context (error %d)\n", + ret); + i915_gem_context_unreference(ctx); + return ret; + } + } + dev_priv->kernel_context = ctx; DRM_DEBUG_DRIVER("%s context support initialized\n",