From patchwork Thu Jul 8 15:48:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Ekstrand X-Patchwork-Id: 12365573 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D61FEC07E99 for ; Thu, 8 Jul 2021 15:49:45 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A60C861607 for ; Thu, 8 Jul 2021 15:49:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A60C861607 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=jlekstrand.net Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7CA1A6E929; Thu, 8 Jul 2021 15:49:16 +0000 (UTC) Received: from mail-ot1-x32a.google.com (mail-ot1-x32a.google.com [IPv6:2607:f8b0:4864:20::32a]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1EF236E929 for ; Thu, 8 Jul 2021 15:49:14 +0000 (UTC) Received: by mail-ot1-x32a.google.com with SMTP id i5-20020a9d68c50000b02904b41fa91c97so1878459oto.5 for ; Thu, 08 Jul 2021 08:49:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jlekstrand-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6vd4HrjqLsgBU80FzHWd/G9MkReVAnbCbdgJ5zbQrXI=; b=KHMaVHJFsqlerhxGcEOQ260wBc0HW4iyezQtYPbhXDBpPPKEcoCghLIW3JWlqFKeiv 6vzGUoX9UClKIrB8V1nInuL+CG+TdjcmNUCAE70ClCgYflm6aWmWqPSyNQEh5IwrKwKT f4MQDuqscRi7Xn3/FXRQluDW49h9UPcoyoDj4sseYs6vMU2rJIIdXXwfUXihzx3s/QxG B5nbRR+zuiTdD4Gxs9Bbt27MidEctOKtWKUNUe6+JjGD/yJM+G89b0HM6qqTQ4EkzsMV Yk0IS19TRKf7SIHArKJXZnXdzmqxTfVRsyEusKiBaTfOagHl22fNlALl3yDZV1bljEWM Ygtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6vd4HrjqLsgBU80FzHWd/G9MkReVAnbCbdgJ5zbQrXI=; b=CE5CUT4MyMs3BMOLOj1NRmjXyH8a+UI+d43KCtl6dDGHHR6q0JhW4ATYpiSlzMUFnp LFdnpOVQVRBoA560NFEK45rbh7ks6h7XEOcUb50MslJAX7NyV5TtVQlwvjBArHqi5cuJ BZnUMiDB3zA4uQqcdSC2tYlcaZ0uZnMT0Hg/0n8qZLeGj2qJIAHWYRlM7oSbrJbcKz7H NQxwpAB1Jgjkozf3XQVb5ZOtN4IXHcYLDuvCxNAPtKsr2rv3O0Kk0Y5EB8bzh8WN+rSF OFhddVHKIGU/yYQ/3d9O7/pkIrEiZw7MXpgW5Bvjha1e1phArPZWDnxhF0tq2KMMdb3A 7GBA== X-Gm-Message-State: AOAM530V4E+Uel7HMfgTK/gQOOkUmOj94cAFPqVXrLCZrz49+CPA37Bp CJJdpUCrUrkJMJbHbEQq0AyE4UvoEBA2Gw== X-Google-Smtp-Source: ABdhPJy6MvlJ8xnEHPahCSudSnqvhxs9A1wJfg+j/wTJ64Yvtc6FsWA7Og/vE17oHib/mtlW8BSY7w== X-Received: by 2002:a9d:262:: with SMTP id 89mr11805747otb.31.1625759353060; Thu, 08 Jul 2021 08:49:13 -0700 (PDT) Received: from omlet.lan ([68.203.99.148]) by smtp.gmail.com with ESMTPSA id d20sm548356otq.62.2021.07.08.08.49.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jul 2021 08:49:12 -0700 (PDT) From: Jason Ekstrand To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Date: Thu, 8 Jul 2021 10:48:33 -0500 Message-Id: <20210708154835.528166-29-jason@jlekstrand.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210708154835.528166-1-jason@jlekstrand.net> References: <20210708154835.528166-1-jason@jlekstrand.net> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 28/30] i915/gem/selftests: Assign the VM at context creation in igt_shared_ctx_exec X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" We want to delete __assign_ppgtt and, generally, stop setting the VM after context creation. This is the one place I could find in the selftests where we set a VM after the fact. Signed-off-by: Jason Ekstrand Reviewed-by: Daniel Vetter --- drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c index 3e59746afdc82..8eb5050f8cb3e 100644 --- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c +++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c @@ -813,16 +813,12 @@ static int igt_shared_ctx_exec(void *arg) struct i915_gem_context *ctx; struct intel_context *ce; - ctx = kernel_context(i915, NULL); + ctx = kernel_context(i915, ctx_vm(parent)); if (IS_ERR(ctx)) { err = PTR_ERR(ctx); goto out_test; } - mutex_lock(&ctx->mutex); - __assign_ppgtt(ctx, ctx_vm(parent)); - mutex_unlock(&ctx->mutex); - ce = i915_gem_context_get_engine(ctx, engine->legacy_idx); GEM_BUG_ON(IS_ERR(ce));