From patchwork Wed Mar 17 14:39:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jason Ekstrand X-Patchwork-Id: 12145911 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,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 E38FFC433E6 for ; Wed, 17 Mar 2021 14:39:44 +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 5DEA764F6A for ; Wed, 17 Mar 2021 14:39:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5DEA764F6A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=jlekstrand.net Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9E6C66E5A3; Wed, 17 Mar 2021 14:39:43 +0000 (UTC) Received: from mail-pj1-x1031.google.com (mail-pj1-x1031.google.com [IPv6:2607:f8b0:4864:20::1031]) by gabe.freedesktop.org (Postfix) with ESMTPS id 289056E59D for ; Wed, 17 Mar 2021 14:39:42 +0000 (UTC) Received: by mail-pj1-x1031.google.com with SMTP id a22-20020a17090aa516b02900c1215e9b33so3353542pjq.5 for ; Wed, 17 Mar 2021 07:39:42 -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=KwHaB2Vk2IogMgE0yx2ZDvsbIco4uAI0/LKAdZRr7m8=; b=c+iKxoVYQ47ih++ylt0hyDgkOBIz9FmY/S3KjzssjWSOxjE7hxBwHRoPZRD1po9ns+ n1ujLuGiq0vztU4jkVkQaqqT+Fce7X8Q8u65RSh8pzH9qdtunULcjnqJ4e8iNgfidR2h 4tcGlrSV+3Ixw7/hGV+eRVPZa/hJzdMbRB1Zjy6wI5zK/fua4O18EC8oVcTKtR2ju+4U YzV+s7qaaR33bB+2cPpQA1icVT8iMBhJUtZqg+1sT/PQfJfqJkb+tjJPsW9fNoK6P78f sVHpJCu7FJwm3fljiGpidY3eG7JdPluZEUk5QsWhJVFWMW6/HbPE+PB73ZOTGKS5SbnQ kiWw== 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=KwHaB2Vk2IogMgE0yx2ZDvsbIco4uAI0/LKAdZRr7m8=; b=i/IOfpUKFiN+rWFR6VMn8lIwZGrHvBgr8S4DsGoVpKTDU5D5k9aFjbZ5JcWEA9T3tK c93FdWdSfVDfw+jwfVvKqWGiTuRPgBfu8MR3M6IF1rN30NuHB3gSP1dOE9h3dMO7othG VpkwlK/mNoxjlx/2HGgeKW1LwWqldcmMJfPK0KLU81ZvVZz8UMi9F1kZLvAwf2fzfY2/ gjP2SDd1vXUasqlG50Nrd0SRL1JYO/ZbhWgK4ea7nrJ709M7Y9/7o365twfRpk9cUbxX VcgdfUEH1U0XCzfa+ftvEG3hBR6kXDppdcLZ2F2eEimLHMjBCSvXABQvtZ/WQvpC7H0k zDJg== X-Gm-Message-State: AOAM531KRDtYL1vSrSP7/vhcH+yQ/xmG2o10Lvu8eZj8M9S7jY8yadlV 3pCVzJnEyRUtA6j/VDWPvN0wKasoVjmubw== X-Google-Smtp-Source: ABdhPJwJu6h/B9LrVeoFsCG+tYza638TDFeLT2HNTca1uTegCsdDlUZpx60ItIDcigmGWnxPmN6v+g== X-Received: by 2002:a17:90a:6be4:: with SMTP id w91mr5363460pjj.68.1615991981215; Wed, 17 Mar 2021 07:39:41 -0700 (PDT) Received: from omlet.lan (jfdmzpr05-ext.jf.intel.com. [134.134.139.74]) by smtp.gmail.com with ESMTPSA id i17sm21779296pfq.135.2021.03.17.07.39.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Mar 2021 07:39:40 -0700 (PDT) From: Jason Ekstrand To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Subject: [PATCH] drm/i915/gem: Drop relocation support on all new hardware (v6) Date: Wed, 17 Mar 2021 09:39:35 -0500 Message-Id: <20210317143935.2094831-1-jason@jlekstrand.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210315143428.1471489-3-jason@jlekstrand.net> References: <20210315143428.1471489-3-jason@jlekstrand.net> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Zbigniew_Kempczy=C5=84ski?= , Jason Ekstrand Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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 v5 (Jason Ekstrand): - Drop the HAS_LMEM check as it's already covered by the version check v6 (Jason Ekstrand): - Move the check to eb_validate_vma() with all the other exec_object validation checks. Signed-off-by: Jason Ekstrand Reviewed-by: Zbigniew Kempczyński Reviewed-by: Maarten Lankhorst --- drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c index 99772f37bff60..c082fb0bef330 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c @@ -483,6 +483,13 @@ eb_validate_vma(struct i915_execbuffer *eb, struct drm_i915_gem_exec_object2 *entry, struct i915_vma *vma) { + /* Relocations are disallowed for all platforms after TGL-LP. This + * also covers all platforms with local memory. + */ + if (entry->relocation_count && + INTEL_GEN(eb->i915) >= 12 && !IS_TIGERLAKE(eb->i915)) + return -EINVAL; + if (unlikely(entry->flags & eb->invalid_flags)) return -EINVAL;