From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936492AbcKQRMZ (ORCPT ); Thu, 17 Nov 2016 12:12:25 -0500 Received: from foss.arm.com ([217.140.101.70]:56490 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754176AbcKQRMV (ORCPT ); Thu, 17 Nov 2016 12:12:21 -0500 Date: Thu, 17 Nov 2016 12:26:01 +0000 From: Brian Starkey To: Liviu Dudau Cc: Rob Clark , David Airlie , DRI devel , LKML Subject: Re: [PATCH] drm/atomic: cleanup debugfs entries on un-registering the driver. Message-ID: <20161117122600.GD21156@e106950-lin.cambridge.arm.com> References: <20161117114129.2627-1-Liviu.Dudau@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <20161117114129.2627-1-Liviu.Dudau@arm.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Nov 17, 2016 at 11:41:29AM +0000, Liviu Dudau wrote: >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 Works for me, Tested-by: Brian Starkey >--- > 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(+) > >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) \ >-- >2.10.0 > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Brian Starkey Subject: Re: [PATCH] drm/atomic: cleanup debugfs entries on un-registering the driver. Date: Thu, 17 Nov 2016 12:26:01 +0000 Message-ID: <20161117122600.GD21156@e106950-lin.cambridge.arm.com> References: <20161117114129.2627-1-Liviu.Dudau@arm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: Received: from foss.arm.com (foss.arm.com [217.140.101.70]) by gabe.freedesktop.org (Postfix) with ESMTP id DF5156E7D7 for ; Thu, 17 Nov 2016 12:26:03 +0000 (UTC) Content-Disposition: inline In-Reply-To: <20161117114129.2627-1-Liviu.Dudau@arm.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Liviu Dudau Cc: LKML , DRI devel List-Id: dri-devel@lists.freedesktop.org T24gVGh1LCBOb3YgMTcsIDIwMTYgYXQgMTE6NDE6MjlBTSArMDAwMCwgTGl2aXUgRHVkYXUgd3Jv dGU6Cj5DbGVhbnVwIHRoZSBkZWJ1Z2ZzIGVudHJpZXMgY3JlYXRlZCBieSBjb21taXQgNjU1OWM5 MDFjYjQ4IHdoZW4KPnRoZSBkcml2ZXIncyBtaW5vciBnZXRzIHVuLXJlZ2lzdGVyZWQuIFdpdGhv dXQgaXQsIERSTSBkcml2ZXJzCj5jb21waWxlZCBhcyBtb2R1bGVzIGNhbm5vdCBiZSBybW1vZC1l ZCBhbmQgbW9kcHJvYmVkIGFnYWluLgo+Cj5TaWduZWQtb2ZmLWJ5OiBMaXZpdSBEdWRhdSA8TGl2 aXUuRHVkYXVAYXJtLmNvbT4KCldvcmtzIGZvciBtZSwKClRlc3RlZC1ieTogQnJpYW4gU3Rhcmtl eSA8YnJpYW4uc3RhcmtleUBhcm0uY29tPgoKPi0tLQo+IGRyaXZlcnMvZ3B1L2RybS9kcm1fYXRv bWljLmMgIHwgNyArKysrKysrCj4gZHJpdmVycy9ncHUvZHJtL2RybV9kZWJ1Z2ZzLmMgfCA5ICsr KysrKysrKwo+IGluY2x1ZGUvZHJtL2RybV9hdG9taWMuaCAgICAgIHwgMSArCj4gMyBmaWxlcyBj aGFuZ2VkLCAxNyBpbnNlcnRpb25zKCspCj4KPmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v ZHJtX2F0b21pYy5jIGIvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWMuYwo+aW5kZXggNjc3M2Iz NS4uZGRkZjM3YSAxMDA2NDQKPi0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljLmMKPisr KyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljLmMKPkBAIC0xNjgxLDYgKzE2ODEsMTMgQEAg aW50IGRybV9hdG9taWNfZGVidWdmc19pbml0KHN0cnVjdCBkcm1fbWlub3IgKm1pbm9yKQo+IAkJ CUFSUkFZX1NJWkUoZHJtX2F0b21pY19kZWJ1Z2ZzX2xpc3QpLAo+IAkJCW1pbm9yLT5kZWJ1Z2Zz X3Jvb3QsIG1pbm9yKTsKPiB9Cj4rCj4raW50IGRybV9hdG9taWNfZGVidWdmc19jbGVhbnVwKHN0 cnVjdCBkcm1fbWlub3IgKm1pbm9yKQo+K3sKPisJcmV0dXJuIGRybV9kZWJ1Z2ZzX3JlbW92ZV9m aWxlcyhkcm1fYXRvbWljX2RlYnVnZnNfbGlzdCwKPisJCQkJCUFSUkFZX1NJWkUoZHJtX2F0b21p Y19kZWJ1Z2ZzX2xpc3QpLAo+KwkJCQkJbWlub3IpOwo+K30KPiAjZW5kaWYKPgo+IC8qCj5kaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9kZWJ1Z2ZzLmMgYi9kcml2ZXJzL2dwdS9kcm0v ZHJtX2RlYnVnZnMuYwo+aW5kZXggMjA2YTRmZS4uMmUzZTQ2YSAxMDA2NDQKPi0tLSBhL2RyaXZl cnMvZ3B1L2RybS9kcm1fZGVidWdmcy5jCj4rKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2RlYnVn ZnMuYwo+QEAgLTIyOCw2ICsyMjgsNyBAQCBFWFBPUlRfU1lNQk9MKGRybV9kZWJ1Z2ZzX3JlbW92 ZV9maWxlcyk7Cj4gaW50IGRybV9kZWJ1Z2ZzX2NsZWFudXAoc3RydWN0IGRybV9taW5vciAqbWlu b3IpCj4gewo+IAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gbWlub3ItPmRldjsKPisJaW50IHJl dDsKPgo+IAlpZiAoIW1pbm9yLT5kZWJ1Z2ZzX3Jvb3QpCj4gCQlyZXR1cm4gMDsKPkBAIC0yMzUs NiArMjM2LDE0IEBAIGludCBkcm1fZGVidWdmc19jbGVhbnVwKHN0cnVjdCBkcm1fbWlub3IgKm1p bm9yKQo+IAlpZiAoZGV2LT5kcml2ZXItPmRlYnVnZnNfY2xlYW51cCkKPiAJCWRldi0+ZHJpdmVy LT5kZWJ1Z2ZzX2NsZWFudXAobWlub3IpOwo+Cj4rCWlmIChkcm1fY29yZV9jaGVja19mZWF0dXJl KGRldiwgRFJJVkVSX0FUT01JQykpIHsKPisJCXJldCA9IGRybV9hdG9taWNfZGVidWdmc19jbGVh bnVwKG1pbm9yKTsKPisJCWlmIChyZXQpIHsKPisJCQlEUk1fRVJST1IoIkRSTTogRmFpbGVkIHRv IHJlbW92ZSBhdG9taWMgZGVidWdmcyBlbnRyaWVzXG4iKTsKPisJCQlyZXR1cm4gcmV0Owo+KwkJ fQo+Kwl9Cj4rCj4gCWRybV9kZWJ1Z2ZzX3JlbW92ZV9maWxlcyhkcm1fZGVidWdmc19saXN0LCBE Uk1fREVCVUdGU19FTlRSSUVTLCBtaW5vcik7Cj4KPiAJZGVidWdmc19yZW1vdmUobWlub3ItPmRl YnVnZnNfcm9vdCk7Cj5kaWZmIC0tZ2l0IGEvaW5jbHVkZS9kcm0vZHJtX2F0b21pYy5oIGIvaW5j bHVkZS9kcm0vZHJtX2F0b21pYy5oCj5pbmRleCAyNDA5MTQ0Li42NDAwZGYwIDEwMDY0NAo+LS0t IGEvaW5jbHVkZS9kcm0vZHJtX2F0b21pYy5oCj4rKysgYi9pbmNsdWRlL2RybS9kcm1fYXRvbWlj LmgKPkBAIC0zNzQsNiArMzc0LDcgQEAgdm9pZCBkcm1fc3RhdGVfZHVtcChzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2LCBzdHJ1Y3QgZHJtX3ByaW50ZXIgKnApOwo+ICNpZmRlZiBDT05GSUdfREVCVUdf RlMKPiBzdHJ1Y3QgZHJtX21pbm9yOwo+IGludCBkcm1fYXRvbWljX2RlYnVnZnNfaW5pdChzdHJ1 Y3QgZHJtX21pbm9yICptaW5vcik7Cj4raW50IGRybV9hdG9taWNfZGVidWdmc19jbGVhbnVwKHN0 cnVjdCBkcm1fbWlub3IgKm1pbm9yKTsKPiAjZW5kaWYKPgo+ICNkZWZpbmUgZm9yX2VhY2hfY29u bmVjdG9yX2luX3N0YXRlKF9fc3RhdGUsIGNvbm5lY3RvciwgY29ubmVjdG9yX3N0YXRlLCBfX2kp IFwKPi0tIAo+Mi4xMC4wCj4KX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJp LWRldmVsCg==