From patchwork Thu Mar 11 18:17:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jason Ekstrand X-Patchwork-Id: 12132441 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.6 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 068D4C433E0 for ; Thu, 11 Mar 2021 18:17:42 +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 7315464E28 for ; Thu, 11 Mar 2021 18:17:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7315464E28 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 D9993899BE; Thu, 11 Mar 2021 18:17:40 +0000 (UTC) Received: from mail-pg1-x52f.google.com (mail-pg1-x52f.google.com [IPv6:2607:f8b0:4864:20::52f]) by gabe.freedesktop.org (Postfix) with ESMTPS id B3265899BE for ; Thu, 11 Mar 2021 18:17:39 +0000 (UTC) Received: by mail-pg1-x52f.google.com with SMTP id t37so3401882pga.11 for ; Thu, 11 Mar 2021 10:17:39 -0800 (PST) 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=SChis0vGtZm1iq7sn+k+kRfgAmu4A3E0FlpMCLrCELA=; b=uF/HsqWm/VCG0YhPTC3AvCRHLm/30uX/XprXnFSVCHXWkRdlOTvJA/oeKz4JeiE3Yp Bm72TqhgAnfiaRj5oymzV21cyhlD90ydPWCqgUc3KTjAko6PmvNXbvGk8NC6smb3UDFc ahF0TZsy1fn0PZP+2tvDl9nJKRYu/q352xcp53CtKSA9LkQhXsGFmsuTzGfsMTz6fjzR ju4T7sG3/ReDyM6LM44sfSqRVWtbp2Rvj8v2FNc7XVtbsVWlPJJYPlwfPjqy5UF+leSt 4lFLwKThFfZeQhihaiyIlk/zg9v7F7brkDzyy1gTJ/FpxGpTa8LPjH9QWcLkhAE2HdjZ 9LrQ== 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=SChis0vGtZm1iq7sn+k+kRfgAmu4A3E0FlpMCLrCELA=; b=G6v/zNMe5Oywt8/5/vh2+jMmn81bOZAdgN6qCRX4Bgp1KY94PTHULilQXAR7jr4vS1 zU035RqZ5uZaJXfBY8KI4EDK0pQLs/dNfDDm7Vrh6PxnheHJuMqY6FEKlAhcP0Ah3KjK RtH1ajUU2AT47GWdTOpjQOwoxWzvPjL+7uLgsloIT/ix6P6W6Oqd+8ZQC6xWvFEmjiUQ n0lCsDcvUKRuUwxQ/4BhOwPJjwbnMgTr3u2wRNe/beSCCJL1oDGT9b53xbuLeNYEK/82 aNSy1ELjRmKbkDPqi+9hoPDKnSZXXjjDMZFSxWdmOM/7cYWfHgpH3O+uLIsVUnLgoWeW lSUw== X-Gm-Message-State: AOAM531gDWM2dhnOt+GC3xTBJetCcWauUK05242oH1Y/wap7lkWeh9vh dbDDpwlgNNGpdIJ04/xCrsLOo+N/k0cOJQ== X-Google-Smtp-Source: ABdhPJx9YEM7TpqDj1BvpFBtnY+XB/EeHraQceerWnk0Cwc5jRMxi3XdYLIX9UygeKQNyKmrkXivTQ== X-Received: by 2002:a63:224c:: with SMTP id t12mr8164325pgm.289.1615486658827; Thu, 11 Mar 2021 10:17:38 -0800 (PST) Received: from omlet.lan (jfdmzpr05-ext.jf.intel.com. [134.134.139.74]) by smtp.gmail.com with ESMTPSA id v1sm3018536pjt.1.2021.03.11.10.17.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Mar 2021 10:17:38 -0800 (PST) From: Jason Ekstrand To: intel-gfx@lists.freedesktop.org Date: Thu, 11 Mar 2021 12:17:33 -0600 Message-Id: <20210311181733.1048640-1-jason@jlekstrand.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210310215007.782649-1-jason@jlekstrand.net> References: <20210310215007.782649-1-jason@jlekstrand.net> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH] drm/i915/gem: Drop relocation support on all new hardware (v4) 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: Dave Airlie , Daniel Vetter Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" The Vulkan driver in Mesa for Intel hardware never uses relocations if it's running on a version of i915 that supports at least softpin which all versions of i915 supporting Gen12 do. On the OpenGL side, Gen12+ is only supported by iris which never uses relocations. The older i965 driver in Mesa does use relocations but it only supports Intel hardware through Gen11 and has been deprecated for all hardware Gen9+. The compute driver also never uses relocations. This only leaves the media driver which is supposed to be switching to softpin going forward. Making softpin a requirement for all future hardware seems reasonable. There is one piece of hardware enabled by default in i915: RKL which was enabled by e22fa6f0a976 which has not yet landed in drm-next so this almost but not really a userspace API change for RKL. If it becomes a problem, we can always add !IS_ROCKETLAKE(eb->i915) to the condition. Rejecting relocations starting with newer Gen12 platforms has the benefit that we don't have to bother supporting it on platforms with local memory. Given how much CPU touching of memory is required for relocations, not having to do so on platforms where not all memory is directly CPU-accessible carries significant advantages. v2 (Jason Ekstrand): - Allow TGL-LP platforms as they've already shipped v3 (Jason Ekstrand): - WARN_ON platforms with LMEM support in case the check is wrong v4 (Jason Ekstrand): - Call out Rocket Lake in the commit message Signed-off-by: Jason Ekstrand Acked-by: Keith Packard Cc: Dave Airlie Cc: Daniel Vetter Reviewed-by: Zbigniew Kempczyński Reviewed-by: Maarten Lankhorst --- drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c index 99772f37bff60..b02dbd16bfa03 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c @@ -1764,7 +1764,8 @@ eb_relocate_vma_slow(struct i915_execbuffer *eb, struct eb_vma *ev) return err; } -static int check_relocations(const struct drm_i915_gem_exec_object2 *entry) +static int check_relocations(const struct i915_execbuffer *eb, + const struct drm_i915_gem_exec_object2 *entry) { const char __user *addr, *end; unsigned long size; @@ -1774,6 +1775,14 @@ static int check_relocations(const struct drm_i915_gem_exec_object2 *entry) if (size == 0) return 0; + /* Relocations are disallowed for all platforms after TGL-LP */ + if (INTEL_GEN(eb->i915) >= 12 && !IS_TIGERLAKE(eb->i915)) + return -EINVAL; + + /* All discrete memory platforms are Gen12 or above */ + if (WARN_ON(HAS_LMEM(eb->i915))) + return -EINVAL; + if (size > N_RELOC(ULONG_MAX)) return -EINVAL; @@ -1807,7 +1816,7 @@ static int eb_copy_relocations(const struct i915_execbuffer *eb) if (nreloc == 0) continue; - err = check_relocations(&eb->exec[i]); + err = check_relocations(eb, &eb->exec[i]); if (err) goto err; @@ -1880,7 +1889,7 @@ static int eb_prefault_relocations(const struct i915_execbuffer *eb) for (i = 0; i < count; i++) { int err; - err = check_relocations(&eb->exec[i]); + err = check_relocations(eb, &eb->exec[i]); if (err) return err; }