From patchwork Thu Nov 17 11:41:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liviu Dudau X-Patchwork-Id: 82711 Delivered-To: patch@linaro.org Received: by 10.182.1.168 with SMTP id 8csp831095obn; Thu, 17 Nov 2016 03:41:41 -0800 (PST) X-Received: by 10.98.70.150 with SMTP id o22mr4217141pfi.134.1479382901162; Thu, 17 Nov 2016 03:41:41 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e11si2970699pgp.204.2016.11.17.03.41.40; Thu, 17 Nov 2016 03:41:41 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936373AbcKQLlh (ORCPT + 26 others); Thu, 17 Nov 2016 06:41:37 -0500 Received: from fw-tnat.cambridge.arm.com ([217.140.96.140]:56418 "EHLO cam-smtp0.cambridge.arm.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752037AbcKQLlg (ORCPT ); Thu, 17 Nov 2016 06:41:36 -0500 Received: from e106497-lin.cambridge.arm.com (e106497-lin.cambridge.arm.com [10.2.131.185]) by cam-smtp0.cambridge.arm.com (8.13.8/8.13.8) with ESMTP id uAHBfUQn013845; Thu, 17 Nov 2016 11:41:30 GMT From: Liviu Dudau To: Rob Clark Cc: David Airlie , Brian Starkey , DRI devel , LKML Subject: [PATCH] drm/atomic: cleanup debugfs entries on un-registering the driver. Date: Thu, 17 Nov 2016 11:41:29 +0000 Message-Id: <20161117114129.2627-1-Liviu.Dudau@arm.com> X-Mailer: git-send-email 2.10.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Cleanup the debugfs entries created by commit 6559c901cb48 when the driver's minor gets un-registered. Without it, DRM drivers compiled as modules cannot be rmmod-ed and modprobed again. Signed-off-by: Liviu Dudau --- drivers/gpu/drm/drm_atomic.c | 7 +++++++ drivers/gpu/drm/drm_debugfs.c | 9 +++++++++ include/drm/drm_atomic.h | 1 + 3 files changed, 17 insertions(+) -- 2.10.0 diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index 6773b35..dddf37a 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -1681,6 +1681,13 @@ int drm_atomic_debugfs_init(struct drm_minor *minor) ARRAY_SIZE(drm_atomic_debugfs_list), minor->debugfs_root, minor); } + +int drm_atomic_debugfs_cleanup(struct drm_minor *minor) +{ + return drm_debugfs_remove_files(drm_atomic_debugfs_list, + ARRAY_SIZE(drm_atomic_debugfs_list), + minor); +} #endif /* diff --git a/drivers/gpu/drm/drm_debugfs.c b/drivers/gpu/drm/drm_debugfs.c index 206a4fe..2e3e46a 100644 --- a/drivers/gpu/drm/drm_debugfs.c +++ b/drivers/gpu/drm/drm_debugfs.c @@ -228,6 +228,7 @@ EXPORT_SYMBOL(drm_debugfs_remove_files); int drm_debugfs_cleanup(struct drm_minor *minor) { struct drm_device *dev = minor->dev; + int ret; if (!minor->debugfs_root) return 0; @@ -235,6 +236,14 @@ int drm_debugfs_cleanup(struct drm_minor *minor) if (dev->driver->debugfs_cleanup) dev->driver->debugfs_cleanup(minor); + if (drm_core_check_feature(dev, DRIVER_ATOMIC)) { + ret = drm_atomic_debugfs_cleanup(minor); + if (ret) { + DRM_ERROR("DRM: Failed to remove atomic debugfs entries\n"); + return ret; + } + } + drm_debugfs_remove_files(drm_debugfs_list, DRM_DEBUGFS_ENTRIES, minor); debugfs_remove(minor->debugfs_root); diff --git a/include/drm/drm_atomic.h b/include/drm/drm_atomic.h index 2409144..6400df0 100644 --- a/include/drm/drm_atomic.h +++ b/include/drm/drm_atomic.h @@ -374,6 +374,7 @@ void drm_state_dump(struct drm_device *dev, struct drm_printer *p); #ifdef CONFIG_DEBUG_FS struct drm_minor; int drm_atomic_debugfs_init(struct drm_minor *minor); +int drm_atomic_debugfs_cleanup(struct drm_minor *minor); #endif #define for_each_connector_in_state(__state, connector, connector_state, __i) \