From patchwork Wed Nov 25 12:59:13 2020 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: 11931307 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,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 A7E91C5519F for ; Wed, 25 Nov 2020 12:59:26 +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 242B6206E5 for ; Wed, 25 Nov 2020 12:59:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="WQ5n+tOf" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 242B6206E5 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 5B7AB6E996; Wed, 25 Nov 2020 12:59:23 +0000 (UTC) Received: from mail-ed1-x542.google.com (mail-ed1-x542.google.com [IPv6:2a00:1450:4864:20::542]) by gabe.freedesktop.org (Postfix) with ESMTPS id 343176E997 for ; Wed, 25 Nov 2020 12:59:22 +0000 (UTC) Received: by mail-ed1-x542.google.com with SMTP id q16so2419694edv.10 for ; Wed, 25 Nov 2020 04:59:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=svYx8C2mOw+D0g7Fnl7ET+TO8pEYTFtTIzHQ3zBXsuM=; b=WQ5n+tOfxWOef+FXVwldDgjMiyneOoZgpPAVFMOu2PyaX7eJL/CDBrCPuYQVvO4JH1 XFi1YS8a6zvwNARVjDk9XgNv59IImpTHSQc8q9LW5MiIh6vuL5oUrveer9D0MBrMr4kc Atc0LxN8KOPgzAWuDffJ/0uWNc0Hv6CHAxn7exgbIBWroshxZiwRDF912hyYEwbLKtJf fJei99kDCn/XulbUNTWS6RoDeUiefWR3jcnx/Ms8sIQxdIbZHBW0hWyOUL6uVp+rdZyU fPPT6lqcmSXnPzogxIHzFUm7VUc7XQGJSIwgpmMfmw5B6e18UoZER4iQCrK1s/Xg7xjg TOlQ== 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:mime-version :content-transfer-encoding; bh=svYx8C2mOw+D0g7Fnl7ET+TO8pEYTFtTIzHQ3zBXsuM=; b=ouMcRrPVHGxPIgDg+1LUVT0ZucxJp425KoY/Xrbi4XAgePSHKsiF8z49K7B6fU4wcv P73g7KIv+mmCD92o9MDeyZCjAjfQEGdIwzvBHEy8y1e2gMzpQ2b6wlrDq+IuURm48fkl NlMm7NcDGeIjw4Y3ZmJGnJ2xemDnoO1OXCdwC6GU3SaLKwmnW+yn3yKh0G3m9quz3ngP M8ZG75ubl4nJxEaoEeCPT3PTJQ+HOFJcHHWt/4o+zavTmFr8LNhZao69qCcpnQerlxXz 4d2kDOlZhNSxX+cW9GDGWpZmJZyTxMF7QeeU0OlwVChLMsUt4Jj//YBtxJsYjzRA6EMN rrcA== X-Gm-Message-State: AOAM533M1Z2653gACIfLKQZyDnXlQnY/zlumHRiUkfI3DFAYxLUCfS/3 p9XeQVuO49EfQrYStUmj8SX52TtMwyY= X-Google-Smtp-Source: ABdhPJyaTaCMIGqiSJ9ABVuOyccpTxCmHrJpufg9te5hJRepWc1l+mrrBjjW/jLkcuP/fOSQv6hSKw== X-Received: by 2002:aa7:d5d7:: with SMTP id d23mr3274532eds.203.1606309160688; Wed, 25 Nov 2020 04:59:20 -0800 (PST) Received: from abel.fritz.box ([2a02:908:1252:fb60:87d9:eeff:99f6:84c2]) by smtp.gmail.com with ESMTPSA id z19sm1203188ejj.101.2020.11.25.04.59.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Nov 2020 04:59:20 -0800 (PST) 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 1/7] drm/radeon: stop using pages with drm_prime_sg_to_page_addr_arrays v2 Date: Wed, 25 Nov 2020 13:59:13 +0100 Message-Id: <20201125125919.1372-1-christian.koenig@amd.com> X-Mailer: git-send-email 2.25.1 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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" This is deprecated. v2: also use ttm_sg_tt_init to avoid allocating the page array. Signed-off-by: Christian König Acked-by: Daniel Vetter --- drivers/gpu/drm/radeon/radeon_ttm.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c index 0ca381b95d3d..5d00b3dff388 100644 --- a/drivers/gpu/drm/radeon/radeon_ttm.c +++ b/drivers/gpu/drm/radeon/radeon_ttm.c @@ -401,8 +401,8 @@ static int radeon_ttm_tt_pin_userptr(struct ttm_bo_device *bdev, struct ttm_tt * if (r) goto release_sg; - drm_prime_sg_to_page_addr_arrays(ttm->sg, ttm->pages, - gtt->ttm.dma_address, ttm->num_pages); + drm_prime_sg_to_page_addr_arrays(ttm->sg, NULL, gtt->ttm.dma_address, + ttm->num_pages); return 0; @@ -542,7 +542,7 @@ static struct ttm_tt *radeon_ttm_tt_create(struct ttm_buffer_object *bo, else caching = ttm_cached; - if (ttm_dma_tt_init(>t->ttm, bo, page_flags, caching)) { + if (ttm_sg_tt_init(>t->ttm, bo, page_flags, caching)) { kfree(gtt); return NULL; } @@ -580,8 +580,9 @@ static int radeon_ttm_tt_populate(struct ttm_bo_device *bdev, } if (slave && ttm->sg) { - drm_prime_sg_to_page_addr_arrays(ttm->sg, ttm->pages, - gtt->ttm.dma_address, ttm->num_pages); + drm_prime_sg_to_page_addr_arrays(ttm->sg, NULL, + gtt->ttm.dma_address, + ttm->num_pages); return 0; }