From patchwork Mon Dec 26 15:50:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ma=C3=ADra_Canal?= X-Patchwork-Id: 36659 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp977212wrt; Mon, 26 Dec 2022 07:54:57 -0800 (PST) X-Google-Smtp-Source: AMrXdXs7I4Po4yWq2Mfm9OCfdf/speLfMWHaDS7OujXivoJZ88GZTPU59fDhcj2vLbaIt+UAT0QP X-Received: by 2002:a05:6402:e09:b0:46c:b919:997f with SMTP id h9-20020a0564020e0900b0046cb919997fmr16423654edh.17.1672070096826; Mon, 26 Dec 2022 07:54:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672070096; cv=none; d=google.com; s=arc-20160816; b=ySGa0AfkYYWzrSdl91lqfd9/9RdkeCfvpbWvdUL4PHII4gRHHpFtXffet+FT3PGxzh zOEz/eNGbv3rEdhoU9clTjt1sV6JcFKvqKjsVpjAy4OGHV5gKldTeJE3Brdl0voZif3D dxJQ7cOuW8kIxc6/lNyqv/YlYxDSwX9ijLkSQ74tH+BUI6tr2vLJzCb9svWatZy0ZW2L MXDftRHKWwgI9elAW1kNpoMeVyzwSCn64lBOKh9H0AJHY5ZhW4X7G4QYEI4TU+p73E9D kEfsWLfsECKQkWPiBd9DY8bJ/jZUMEI20NLVhqGRTzPCJXfPyry+U+5uGpw47CH+FVEv WmTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ovYu3O6J/03o6FRSeZBXYjTQnhI8+HeH3STrFxD4fqo=; b=VxreKJdSjUghz+sw8QEtyNryV166ynczlwRfQ0dVNmigx2R3EOn4da7+Ko8l7kJ8UI xQe4bY9Di9cmtNuWJEloeRK811+a1w3gWP9NTyg0gnGxhSlslQEE1LUp+XEZPs6TITJv 2g4/eWYnYt38vD8GaUr0V77q6d2ay2Ysg4qZ2VORRgh1+DQwyWK+YHyd9rXECHk5y9Dc iJp57jMYBqQcIZmxxfJzwCZIQIcwXygWba4bC8Fu5yEk2Xq9DNactPrTGqDPbrrXiFDx rmK6CeUEsJ/2QbASQ5SlV7ZWWuUfRFYSQL17ksVhqPBFqn8EDt6A/+IJ3irKV/I1DwsE DjDQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@igalia.com header.s=20170329 header.b=q6Y2ynNG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i6-20020a05640242c600b0045ad02bb8fbsi10327695edc.290.2022.12.26.07.54.32; Mon, 26 Dec 2022 07:54:56 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=fail header.i=@igalia.com header.s=20170329 header.b=q6Y2ynNG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232053AbiLZPvt (ORCPT + 99 others); Mon, 26 Dec 2022 10:51:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38626 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232117AbiLZPvp (ORCPT ); Mon, 26 Dec 2022 10:51:45 -0500 Received: from fanzine2.igalia.com (fanzine2.igalia.com [213.97.179.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C737326DD for ; Mon, 26 Dec 2022 07:51:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=ovYu3O6J/03o6FRSeZBXYjTQnhI8+HeH3STrFxD4fqo=; b=q6Y2ynNG9Hqvk3GBR5TbozENdA tokY4kYGNRQTgj3V4qFoAAM0Ppk2hHnlSKALYuQ5z2Iro6G1Duy9yge28CQGvKOvrZeQaZ12v8THZ xgTLVC/7xEzYa1qJezouE+D1i0Z6FDi87WtRTBBf0q+ef7lMMm+VjnJ9vtMitt71c0uGaKo4fbfR9 7Cuuf+4vVqWjG1fcrS5Z0aCkpTyU1tHyeOvcy8kPJv1VPbz/STlgu1hNzAsiEWv+u/ZDxuP3JB9uC O7ZYeg72Q5ERXtbg+++geXfml80M+qLb0Z7O3dy0IqWet2W0WUyJzc7qzuX7zeH21QueeNP+5CmCH scFpab5g==; Received: from [187.36.234.139] (helo=bowie..) by fanzine2.igalia.com with esmtpsa (Cipher TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim) id 1p9plN-00AXBr-Hs; Mon, 26 Dec 2022 16:51:42 +0100 From: =?utf-8?q?Ma=C3=ADra_Canal?= To: David Airlie , Daniel Vetter , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: Melissa Wen , =?utf-8?q?Andr=C3=A9_Almeida?= , Lucas Stach , Russell King , Christian Gmeiner , etnaviv@lists.freedesktop.org, noralf@tronnes.org, Liviu Dudau , Brian Starkey , Emma Anholt , Alexey Brodkin , David Airlie , Gerd Hoffmann , Gurchetan Singh , Chia-I Wu , Tomi Valkeinen , =?utf-8?q?Ma=C3=ADra_Canal?= Subject: [PATCH 1/9] drm/etnaviv: use new debugfs device-centered functions Date: Mon, 26 Dec 2022 12:50:21 -0300 Message-Id: <20221226155029.244355-2-mcanal@igalia.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221226155029.244355-1-mcanal@igalia.com> References: <20221226155029.244355-1-mcanal@igalia.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1753292573722436428?= X-GMAIL-MSGID: =?utf-8?q?1753292573722436428?= Replace the use of drm_debugfs_create_files() with the new drm_debugfs_add_files() function, which center the debugfs files management on the drm_device instead of drm_minor. Moreover, remove the debugfs_init hook and add the debugfs files directly on etnaviv_bind(), before drm_dev_register(). Signed-off-by: Maíra Canal --- drivers/gpu/drm/etnaviv/etnaviv_drv.c | 29 +++++++++++---------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.c b/drivers/gpu/drm/etnaviv/etnaviv_drv.c index 1d2b4fb4bcf8..2b265460672e 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_drv.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.c @@ -191,22 +191,22 @@ static int etnaviv_ring_show(struct etnaviv_gpu *gpu, struct seq_file *m) static int show_unlocked(struct seq_file *m, void *arg) { - struct drm_info_node *node = (struct drm_info_node *) m->private; - struct drm_device *dev = node->minor->dev; + struct drm_debugfs_entry *entry = m->private; + struct drm_device *dev = entry->dev; int (*show)(struct drm_device *dev, struct seq_file *m) = - node->info_ent->data; + entry->file.data; return show(dev, m); } static int show_each_gpu(struct seq_file *m, void *arg) { - struct drm_info_node *node = (struct drm_info_node *) m->private; - struct drm_device *dev = node->minor->dev; + struct drm_debugfs_entry *entry = m->private; + struct drm_device *dev = entry->dev; struct etnaviv_drm_private *priv = dev->dev_private; struct etnaviv_gpu *gpu; int (*show)(struct etnaviv_gpu *gpu, struct seq_file *m) = - node->info_ent->data; + entry->file.data; unsigned int i; int ret = 0; @@ -223,20 +223,13 @@ static int show_each_gpu(struct seq_file *m, void *arg) return ret; } -static struct drm_info_list etnaviv_debugfs_list[] = { +static struct drm_debugfs_info etnaviv_debugfs_list[] = { {"gpu", show_each_gpu, 0, etnaviv_gpu_debugfs}, {"gem", show_unlocked, 0, etnaviv_gem_show}, { "mm", show_unlocked, 0, etnaviv_mm_show }, {"mmu", show_each_gpu, 0, etnaviv_mmu_show}, {"ring", show_each_gpu, 0, etnaviv_ring_show}, }; - -static void etnaviv_debugfs_init(struct drm_minor *minor) -{ - drm_debugfs_create_files(etnaviv_debugfs_list, - ARRAY_SIZE(etnaviv_debugfs_list), - minor->debugfs_root, minor); -} #endif /* @@ -478,9 +471,6 @@ static const struct drm_driver etnaviv_drm_driver = { .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_import_sg_table = etnaviv_gem_prime_import_sg_table, .gem_prime_mmap = drm_gem_prime_mmap, -#ifdef CONFIG_DEBUG_FS - .debugfs_init = etnaviv_debugfs_init, -#endif .ioctls = etnaviv_ioctls, .num_ioctls = DRM_ETNAVIV_NUM_IOCTLS, .fops = &fops, @@ -534,6 +524,11 @@ static int etnaviv_bind(struct device *dev) load_gpu(drm); +#ifdef CONFIG_DEBUG_FS + drm_debugfs_add_files(drm, etnaviv_debugfs_list, + ARRAY_SIZE(etnaviv_debugfs_list)); +#endif + ret = drm_dev_register(drm, 0); if (ret) goto out_unbind;