From patchwork Fri Apr 30 09:25:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Christian_K=C3=B6nig?= X-Patchwork-Id: 12232855 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=-13.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 7D5A7C433B4 for ; Fri, 30 Apr 2021 09:25:36 +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 4A79561352 for ; Fri, 30 Apr 2021 09:25:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4A79561352 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com 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 8BE836F50C; Fri, 30 Apr 2021 09:25:35 +0000 (UTC) Received: from mail-ej1-x62d.google.com (mail-ej1-x62d.google.com [IPv6:2a00:1450:4864:20::62d]) by gabe.freedesktop.org (Postfix) with ESMTPS id 62F0D6F508 for ; Fri, 30 Apr 2021 09:25:18 +0000 (UTC) Received: by mail-ej1-x62d.google.com with SMTP id u17so104338721ejk.2 for ; Fri, 30 Apr 2021 02:25:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gUAvKxvD/sLpoSx+hHmo3rbgcgIylVoMEK7bh2Nyg3c=; b=pW3vbojOXp199phYf2HX2507Kc62RBq3wKkFuyf8lfT31Y/R223xgO4QBVtQl1tF85 SRokeWNhKNYmOhB9262rZUVE+r94qARqQnMW4aGne8LJ5PUV46c7qNC5xOxmeCnJuSuI vM3qSfnRLt0ip2DQHtDS1yvq880MXR55Ody3d/SJqDYzO+gyG1WL5keWPyzg8BYB0Zru LJYZI/7uATsvCbH3X7dc/06B/WdW4YYaoDoTfj8bUx+RerUZikpT8DjFMsMdL6Xig1Nv Koe+TAnprgvx3DS3Y2ZlWgfggsxNP5eF37MG1CoCSnmsqsw1Rp7pAq0XoA1pXOGhWxrE 9wwQ== 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=gUAvKxvD/sLpoSx+hHmo3rbgcgIylVoMEK7bh2Nyg3c=; b=d38olixDqkBmerZYqITf4S1am5oQaBG0Kl9Qf0jLd+yVabwLH27ZL5j8/I2C9rx1DU 5cMMcpPlcO9KI3o6Y/HBT7FFrI4DnrSNL1vjs1ZhOQOd0nvvu4M/URAgyTrLjEoCdUgb VzZnKGYMQrdZqNhMZMGk0Frs+o1QHfwEH2Wa6T96N3tXtIoDznmRjlfVRgxA52+I/zFV uI/7EE3M6oPdM5HM6jQiHSdfHFqIETL3O+pZWWhm+JmTPogqsenux0qr/vq0O5EMXW4D msBZYTxtQDY+fk1c7+K88vXPJbyXxXoks3Cy1SoPTwOs3zqQr7s0+byO8AGkS2gWKWQ3 Nigw== X-Gm-Message-State: AOAM530yFm3H5nDBvlmTbFu/SBD2WdkM8QUAnbEavvNHUF/ROHj+ELfX gHusYLKpiO2K7WIQZq7S+Ol5hAcrMIo= X-Google-Smtp-Source: ABdhPJzoZpgwTiZJK/QoJAUvoXPD2fge6WS6FVqJl+HbknM0VqXA11MwcYU90MDJBUqfZKuq8NCcFQ== X-Received: by 2002:a17:906:7206:: with SMTP id m6mr3272835ejk.281.1619774717108; Fri, 30 Apr 2021 02:25:17 -0700 (PDT) Received: from abel.fritz.box ([2a02:908:1252:fb60:d08c:9633:b7a2:37e2]) by smtp.gmail.com with ESMTPSA id h23sm1550959ejx.90.2021.04.30.02.25.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Apr 2021 02:25:16 -0700 (PDT) From: " =?utf-8?q?Christian_K=C3=B6nig?= " X-Google-Original-From: =?utf-8?q?Christian_K=C3=B6nig?= To: dri-devel@lists.freedesktop.org Subject: [PATCH 11/13] drm/nouveau: switch the TTM backends to self alloc Date: Fri, 30 Apr 2021 11:25:06 +0200 Message-Id: <20210430092508.60710-11-christian.koenig@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210430092508.60710-1-christian.koenig@amd.com> References: <20210430092508.60710-1-christian.koenig@amd.com> 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: daniel.vetter@ffwll.ch, matthew.william.auld@gmail.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Similar to the TTM range manager. Signed-off-by: Christian König Reviewed-by: Matthew Auld --- drivers/gpu/drm/nouveau/nouveau_mem.h | 1 + drivers/gpu/drm/nouveau/nouveau_ttm.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/drivers/gpu/drm/nouveau/nouveau_mem.h b/drivers/gpu/drm/nouveau/nouveau_mem.h index 7df3848e85aa..3a6a1be2ed52 100644 --- a/drivers/gpu/drm/nouveau/nouveau_mem.h +++ b/drivers/gpu/drm/nouveau/nouveau_mem.h @@ -13,6 +13,7 @@ nouveau_mem(struct ttm_resource *reg) } struct nouveau_mem { + struct ttm_resource base; struct nouveau_cli *cli; u8 kind; u8 comp; diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c index 15c7627f8f58..5e5ce2ec89f0 100644 --- a/drivers/gpu/drm/nouveau/nouveau_ttm.c +++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c @@ -59,6 +59,8 @@ nouveau_vram_manager_new(struct ttm_resource_manager *man, if (ret) return ret; + ttm_resource_init(bo, place, reg->mm_node); + ret = nouveau_mem_vram(reg, nvbo->contig, nvbo->page); if (ret) { nouveau_mem_del(reg); @@ -87,6 +89,7 @@ nouveau_gart_manager_new(struct ttm_resource_manager *man, if (ret) return ret; + ttm_resource_init(bo, place, reg->mm_node); reg->start = 0; return 0; } @@ -112,6 +115,7 @@ nv04_gart_manager_new(struct ttm_resource_manager *man, if (ret) return ret; + ttm_resource_init(bo, place, reg->mm_node); ret = nvif_vmm_get(&mem->cli->vmm.vmm, PTES, false, 12, 0, (long)reg->num_pages << PAGE_SHIFT, &mem->vma[0]); if (ret) {