From patchwork Tue Jan 19 12:18:21 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: 12029731 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.6 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 00B89C433E6 for ; Tue, 19 Jan 2021 12:18: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 A79AE22D2A for ; Tue, 19 Jan 2021 12:18:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A79AE22D2A 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 4AB706E877; Tue, 19 Jan 2021 12:18:32 +0000 (UTC) Received: from mail-ej1-x631.google.com (mail-ej1-x631.google.com [IPv6:2a00:1450:4864:20::631]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6B8486E871 for ; Tue, 19 Jan 2021 12:18:26 +0000 (UTC) Received: by mail-ej1-x631.google.com with SMTP id gx5so8940457ejb.7 for ; Tue, 19 Jan 2021 04:18:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=am4EeStR9m76doJ/yyB5TRIGf4Z+bQhxXz/r5WL0x9I=; b=rVPA4GBNqxCRtRpsGrR1R7ySyUnknsl5l1qxC/YX7PTlb8e+4BikFE6QkOlv65aXM2 /4ml3+Q6lnsAKFuG85iSsZmpcdzQNglw1ewpaBb2RD78tezgzYZB9oV5FW/j7WyDGOxX wM/pQkb55END23NJhxbVz1LO1HxZTHYxmn4fS+vIgNBImrlagW9rhcd3bt5w4Xiyab5I /Al+xZDvkREB68c1VXQ1QRxL1imu2wo382FNMsNNp9HIsgs0IkITHime3tVuZ++QlCrg MxadHokdepaaazjpiAOoCmA2XBsndeKFA/lQKBFfIN8oDo2oc7EoIvKYOkb7R+T1RVe0 3XuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=am4EeStR9m76doJ/yyB5TRIGf4Z+bQhxXz/r5WL0x9I=; b=byYzZoEtJ5Y3XiQb2ymtp+y8sUO/Ay2IasMAH1b3feoVfoq1Spueop6R1BQD0x6wia YEnukWiqLUgRex9wxc6VyNn4fvlcwrt8a5cR2HTVwJI20Oa9yOgD0hjhpdoP2Owd2Vo9 xi7GHAhcfWZm7FllBb/3iiPggP4IBj8tu6V4ihUtLQmraqJVewVOVF14Txpa9V6HXED6 /3tor+El1/5cWIk+Mc2Ei5gORaltlOZ0n8GzXXNDu0kIaFz39YjU6p1H/9IC6bHePhiM EcznXGJ2q4GKvJ3DgPvltjj7Kx61xx5X2BWRvzAD/Tu20K40WD9d0a/b4fbmXlbJz4+o YPhg== X-Gm-Message-State: AOAM531VR4qWandFZQebWHNVARyuH5NwsNqfHcPtFKU9uF//WP/A2bJF EV0Is+7ZLo+Xi4RB29yNQGocvz72j5Q= X-Google-Smtp-Source: ABdhPJxaBNjNTKbxWAlR/Ba82RRIHLWsjD7wQk2lxbRqzmEJ6Tq1k0Jxvt3sac9qKCM5IlWv1EG8Fg== X-Received: by 2002:a17:906:b186:: with SMTP id w6mr2888280ejy.477.1611058705174; Tue, 19 Jan 2021 04:18:25 -0800 (PST) Received: from abel.fritz.box ([2a02:908:1252:fb60:b05c:1403:9024:973b]) by smtp.gmail.com with ESMTPSA id q9sm7090422ejd.113.2021.01.19.04.18.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Jan 2021 04:18:24 -0800 (PST) From: " =?utf-8?q?Christian_K=C3=B6nig?= " X-Google-Original-From: =?utf-8?q?Christian_K=C3=B6nig?= To: ray.huang@amd.com, daniel@ffwll.ch, dri-devel@lists.freedesktop.org Subject: [PATCH 4/4] drm/ttm: optimize ttm pool shrinker a bit Date: Tue, 19 Jan 2021 13:18:21 +0100 Message-Id: <20210119121821.2320-4-christian.koenig@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210119121821.2320-1-christian.koenig@amd.com> References: <20210119121821.2320-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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Only initialize the DMA coherent pools if they are used. Signed-off-by: Christian König Reviewed-by: Daniel Vetter --- drivers/gpu/drm/ttm/ttm_pool.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/ttm/ttm_pool.c b/drivers/gpu/drm/ttm/ttm_pool.c index 98ecb9c9842c..e0617717113f 100644 --- a/drivers/gpu/drm/ttm/ttm_pool.c +++ b/drivers/gpu/drm/ttm/ttm_pool.c @@ -505,10 +505,12 @@ void ttm_pool_init(struct ttm_pool *pool, struct device *dev, pool->use_dma_alloc = use_dma_alloc; pool->use_dma32 = use_dma32; - for (i = 0; i < TTM_NUM_CACHING_TYPES; ++i) - for (j = 0; j < MAX_ORDER; ++j) - ttm_pool_type_init(&pool->caching[i].orders[j], - pool, i, j); + if (use_dma_alloc) { + for (i = 0; i < TTM_NUM_CACHING_TYPES; ++i) + for (j = 0; j < MAX_ORDER; ++j) + ttm_pool_type_init(&pool->caching[i].orders[j], + pool, i, j); + } } EXPORT_SYMBOL(ttm_pool_init); @@ -524,9 +526,11 @@ void ttm_pool_fini(struct ttm_pool *pool) { unsigned int i, j; - for (i = 0; i < TTM_NUM_CACHING_TYPES; ++i) - for (j = 0; j < MAX_ORDER; ++j) - ttm_pool_type_fini(&pool->caching[i].orders[j]); + if (pool->use_dma_alloc) { + for (i = 0; i < TTM_NUM_CACHING_TYPES; ++i) + for (j = 0; j < MAX_ORDER; ++j) + ttm_pool_type_fini(&pool->caching[i].orders[j]); + } } EXPORT_SYMBOL(ttm_pool_fini); @@ -631,6 +635,11 @@ int ttm_pool_debugfs(struct ttm_pool *pool, struct seq_file *m) { unsigned int i; + if (!pool->use_dma_alloc) { + seq_puts(m, "unused\n"); + return 0; + } + ttm_pool_debugfs_header(m); spin_lock(&shrinker_lock);