From patchwork Wed Mar 10 21:26:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Ekstrand X-Patchwork-Id: 12129469 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=unavailable 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 5397BC433E0 for ; Wed, 10 Mar 2021 21:26:19 +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 D2BC064FA9 for ; Wed, 10 Mar 2021 21:26:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D2BC064FA9 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 711AD6EA6A; Wed, 10 Mar 2021 21:26:13 +0000 (UTC) Received: from mail-pl1-x62a.google.com (mail-pl1-x62a.google.com [IPv6:2607:f8b0:4864:20::62a]) by gabe.freedesktop.org (Postfix) with ESMTPS id 81E5E6EA62 for ; Wed, 10 Mar 2021 21:26:12 +0000 (UTC) Received: by mail-pl1-x62a.google.com with SMTP id d8so9124754plg.10 for ; Wed, 10 Mar 2021 13:26:12 -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=1lBkH4s9QIFi/iOfDbo7D41TknrqRaGZVMWrDUMYokQ=; b=HHQeZE4sWnCtGdS6Anh8yKHYAb1wL5ym/xjWD1rb7A07HSChExtdsjq/vSYEJBgYhg amEFkPjgP2abhcZ2npZ7b6UuLafOG2Rq2JnDrEK/Lb5+ct6EISbzTX7bTqjOhPeDXoFk RuK9+NpItzK/feIOBr0JfIDN/koNKRtE0gDCRoEZqdVeFaYckb5YwlB2ezBWe80k6aeh v+tJDUpjJ01Yl5q7UYQEdHEafLtsN850/43EB+Lyq2cvdxlzpPcEfoxfC+KDwIBRCToQ kErBgZLkJzrGEBosjnG1DhV+MyLvlzHPnO1M9rP3F8cyBw6yE2/ahoPQkIkBlhJIohtD aVNA== 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=1lBkH4s9QIFi/iOfDbo7D41TknrqRaGZVMWrDUMYokQ=; b=apDNQ2g3nv9/Ewv8D98c79vAML2RuxTV8wbKD3JP5C1kwIH6Rb7rJpUo8xO13pv8tt Vjdl5rhTw6gbhOEaHmsBN9ETXJ4JWCNgOSmoPQczhrO8pC5g1WHOkcfA6Ww04VNVgJTs ZWdw1hrBlw4n+7ehU6gkgINGzUWUTYS6byY2vPKdEPXaD470dcNjfkVvD7DydLbYIrsz 8tAuGRBGV9jEHbUIRSQMIgTlxGPMkIuNGr64hpgWhPMc65JDEzWIzAEdDKFDgcP7CJ24 Ss7AtSsLMoKUkMDdcfZIWQe4np/mIw1QjqQGjjucOShTTjRcl6UmIpbp31O/2RZrod2F /FtQ== X-Gm-Message-State: AOAM532uPhTYYijobtl76zGTf1c3hR9nlw0JzpflEszCIcJsZswNcbmT 0ztsMPGh5M3iBG4tXDVNqBamB5asUTQtVg== X-Google-Smtp-Source: ABdhPJxefkypTUPBPBlNN3jdgUzaQb0GT689vmn3Ky4H3bMndfkSB6hEpai8+laPqEIaHIBpE+1xlQ== X-Received: by 2002:a17:90a:6c22:: with SMTP id x31mr5597440pjj.213.1615411571594; Wed, 10 Mar 2021 13:26:11 -0800 (PST) Received: from omlet.lan (jfdmzpr06-ext.jf.intel.com. [134.134.137.75]) by smtp.gmail.com with ESMTPSA id h6sm371585pfb.157.2021.03.10.13.26.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Mar 2021 13:26:11 -0800 (PST) From: Jason Ekstrand To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Date: Wed, 10 Mar 2021 15:26:06 -0600 Message-Id: <20210310212606.766121-1-jason@jlekstrand.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20200507153600.314454-1-jason@jlekstrand.net> References: <20200507153600.314454-1-jason@jlekstrand.net> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH] i915: Drop relocation support on all new hardware 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. Rejecting relocations starting with Gen12 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. Signed-off-by: Jason Ekstrand Cc: Dave Airlie Cc: Daniel Vetter --- drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 14 +++++++++++--- 1 file changed, 11 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..de093acb7721c 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,13 @@ 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 */ + BUG_ON(HAS_LMEM(eb->i915)); + if (size > N_RELOC(ULONG_MAX)) return -EINVAL; @@ -1807,7 +1815,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 +1888,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; }