From patchwork Fri Apr 9 13:01:13 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: 12194139 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 51826C433ED for ; Fri, 9 Apr 2021 13:01:23 +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 0F2C3610E7 for ; Fri, 9 Apr 2021 13:01:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0F2C3610E7 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 876DB6EC18; Fri, 9 Apr 2021 13:01:20 +0000 (UTC) Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1D8DF6E49D for ; Fri, 9 Apr 2021 13:01:17 +0000 (UTC) Received: by mail-ej1-x62a.google.com with SMTP id mh7so8496558ejb.12 for ; Fri, 09 Apr 2021 06:01:17 -0700 (PDT) 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=AjH2D9ygaThMD1dtUFhVHVOUbEbRI4BYB74LUWVz+ik=; b=GmOJPUdUx2JYS8Hyprmwc7ya45CV92zfZyG8PJQ2jeaMBqj+/EPrisq1rVDwVD8i0y azvMYXGPIDzAc2edatj97ynXpr/NDk0Wd+u6eue/fVMKgPi6HFczEY/W3i6U3JbVq/Np lzF+azvznFif4itbSzXYBwyn8k94Q/vM1b1N9TxDY0QWGQV/F1s8YIUAazinWp7RofRB WSwULAyd0QXj83o5RjbfiokOFUsbdcyNsM1GwXG/uXAryxQ7P2r8JxOvq+wfpUUn8poM 3aVVKxXgdi5r3kbVMBcqh0qQ5zsjcgqhDcyHr6mtBmVrzSonKzCZBrgoArPem63ZyKmk vZBw== 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=AjH2D9ygaThMD1dtUFhVHVOUbEbRI4BYB74LUWVz+ik=; b=aDVFJOL/wkrerOPHjVii7e0y8NG+m/U8xR2bJxdSa/9fP4ZUabqE2AB+Ur2OeXsMWe lQgVM+kqzfCPe9rjC6qIGlO0OZuqSFekkervCOFWcu8E0KEP/xAHGQS85To/BvKYNNL4 84NHXW3pfea1YkXBKdbpIW6g/JMyz5Y0PTneYZjKr4R5ftLg6cpm8xEjJSQc2lGOpdLO h4W40vqSuyyoKHGJZJVo20iAk48TqUsMQYTIiFBkzZiLu/WX+HIOKxEePbysCONFLPTz CowLxMrMb07pc7hcX33/p7Wm+yb43lNMfH/qKCFxmMtqzAFePRL+2mx8vrd0n0/sw8Ea 8AKA== X-Gm-Message-State: AOAM530SR5xSXSCm4YFPgfW9OKZza9VG5yMrBblc/u2zojHpOEBqlv9e hs7Oor0hR7JJl3zN6Yp8fFvN5nuAH58= X-Google-Smtp-Source: ABdhPJyjsvdUWnW64LuyOXT9VrGw90yA0NMA1wPUgUHtOOJphQAiPxh2CTlo9Y27WQ8Rj7Es/Kr0RA== X-Received: by 2002:a17:906:7d02:: with SMTP id u2mr559755ejo.249.1617973275770; Fri, 09 Apr 2021 06:01:15 -0700 (PDT) Received: from abel.fritz.box ([2a02:908:1252:fb60:228e:f109:19e6:f9c6]) by smtp.gmail.com with ESMTPSA id r17sm1455072edx.1.2021.04.09.06.01.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Apr 2021 06:01:15 -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 2/2] drm/ttm: re-add debugs tt_shrink file Date: Fri, 9 Apr 2021 15:01:13 +0200 Message-Id: <20210409130113.1459-2-christian.koenig@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210409130113.1459-1-christian.koenig@amd.com> References: <20210409130113.1459-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" That got lost when we moved back to a static limit. Signed-off-by: Christian König Reviewed-by: Matthew Auld --- drivers/gpu/drm/ttm/ttm_tt.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c index 7d479095dcf8..4d8498a3d642 100644 --- a/drivers/gpu/drm/ttm/ttm_tt.c +++ b/drivers/gpu/drm/ttm/ttm_tt.c @@ -389,6 +389,21 @@ void ttm_tt_unpopulate(struct ttm_device *bdev, struct ttm_tt *ttm) ttm->page_flags &= ~TTM_PAGE_FLAG_PRIV_POPULATED; } +#ifdef CONFIG_DEBUG_FS + +/* Test the shrinker functions and dump the result */ +static int ttm_tt_debugfs_shrink_show(struct seq_file *m, void *data) +{ + struct ttm_operation_ctx ctx = { false, false }; + + seq_printf(m, "%d\n", ttm_global_swapout(&ctx, GFP_KERNEL)); + return 0; +} +DEFINE_SHOW_ATTRIBUTE(ttm_tt_debugfs_shrink); + +#endif + + /** * ttm_tt_mgr_init - register with the MM shrinker * @@ -396,6 +411,11 @@ void ttm_tt_unpopulate(struct ttm_device *bdev, struct ttm_tt *ttm) */ void ttm_tt_mgr_init(unsigned long num_pages, unsigned long num_dma32_pages) { +#ifdef CONFIG_DEBUG_FS + debugfs_create_file("tt_shrink", 0400, ttm_debugfs_root, NULL, + &ttm_tt_debugfs_shrink_fops); +#endif + if (!ttm_pages_limit) ttm_pages_limit = num_pages;