From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S941424AbcKQLqD (ORCPT ); Thu, 17 Nov 2016 06:46:03 -0500 Received: from foss.arm.com ([217.140.101.70]:48848 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932271AbcKQLp7 (ORCPT ); Thu, 17 Nov 2016 06:45:59 -0500 Date: Thu, 17 Nov 2016 11:45:52 +0000 From: Liviu Dudau To: Rob Clark Cc: DRI devel , LKML , Sean Paul Subject: Re: [PATCH] drm/atomic: cleanup debugfs entries on un-registering the driver. Message-ID: <20161117114552.GU10219@e106497-lin.cambridge.arm.com> References: <20161117114129.2627-1-Liviu.Dudau@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20161117114129.2627-1-Liviu.Dudau@arm.com> User-Agent: Mutt/1.5.24 (2015-08-30) 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. Bah, naughty of me: should've put the commit message too: commit 6559c901cb48: drm/atomic: add debugfs file to dump out atomic state Also, cc-ing Sean Paul who pulled this first into drm-misc. Best regards, Liviu > > 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(+) > > 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 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- ==================== | I would like to | | fix the world, | | but they're not | | giving me the | \ source code! / --------------- ¯\_(ツ)_/¯ From mboxrd@z Thu Jan 1 00:00:00 1970 From: Liviu Dudau Subject: Re: [PATCH] drm/atomic: cleanup debugfs entries on un-registering the driver. Date: Thu, 17 Nov 2016 11:45:52 +0000 Message-ID: <20161117114552.GU10219@e106497-lin.cambridge.arm.com> References: <20161117114129.2627-1-Liviu.Dudau@arm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 58AEB6E7CE for ; Thu, 17 Nov 2016 11:45:54 +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: Rob Clark Cc: LKML , DRI devel List-Id: dri-devel@lists.freedesktop.org T24gVGh1LCBOb3YgMTcsIDIwMTYgYXQgMTE6NDE6MjlBTSArMDAwMCwgTGl2aXUgRHVkYXUgd3Jv dGU6Cj4gQ2xlYW51cCB0aGUgZGVidWdmcyBlbnRyaWVzIGNyZWF0ZWQgYnkgY29tbWl0IDY1NTlj OTAxY2I0OCB3aGVuCj4gdGhlIGRyaXZlcidzIG1pbm9yIGdldHMgdW4tcmVnaXN0ZXJlZC4gV2l0 aG91dCBpdCwgRFJNIGRyaXZlcnMKPiBjb21waWxlZCBhcyBtb2R1bGVzIGNhbm5vdCBiZSBybW1v ZC1lZCBhbmQgbW9kcHJvYmVkIGFnYWluLgoKQmFoLCBuYXVnaHR5IG9mIG1lOiBzaG91bGQndmUg cHV0IHRoZSBjb21taXQgbWVzc2FnZSB0b286Cgpjb21taXQgNjU1OWM5MDFjYjQ4OiAgZHJtL2F0 b21pYzogYWRkIGRlYnVnZnMgZmlsZSB0byBkdW1wIG91dCBhdG9taWMgc3RhdGUKCkFsc28sIGNj LWluZyBTZWFuIFBhdWwgd2hvIHB1bGxlZCB0aGlzIGZpcnN0IGludG8gZHJtLW1pc2MuCgpCZXN0 IHJlZ2FyZHMsCkxpdml1Cgo+IAo+IFNpZ25lZC1vZmYtYnk6IExpdml1IER1ZGF1IDxMaXZpdS5E dWRhdUBhcm0uY29tPgo+IC0tLQo+ICBkcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pYy5jICB8IDcg KysrKysrKwo+ICBkcml2ZXJzL2dwdS9kcm0vZHJtX2RlYnVnZnMuYyB8IDkgKysrKysrKysrCj4g IGluY2x1ZGUvZHJtL2RybV9hdG9taWMuaCAgICAgIHwgMSArCj4gIDMgZmlsZXMgY2hhbmdlZCwg MTcgaW5zZXJ0aW9ucygrKQo+IAo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0 b21pYy5jIGIvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWMuYwo+IGluZGV4IDY3NzNiMzUuLmRk ZGYzN2EgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWMuYwo+ICsrKyBi L2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljLmMKPiBAQCAtMTY4MSw2ICsxNjgxLDEzIEBAIGlu dCBkcm1fYXRvbWljX2RlYnVnZnNfaW5pdChzdHJ1Y3QgZHJtX21pbm9yICptaW5vcikKPiAgCQkJ QVJSQVlfU0laRShkcm1fYXRvbWljX2RlYnVnZnNfbGlzdCksCj4gIAkJCW1pbm9yLT5kZWJ1Z2Zz X3Jvb3QsIG1pbm9yKTsKPiAgfQo+ICsKPiAraW50IGRybV9hdG9taWNfZGVidWdmc19jbGVhbnVw KHN0cnVjdCBkcm1fbWlub3IgKm1pbm9yKQo+ICt7Cj4gKwlyZXR1cm4gZHJtX2RlYnVnZnNfcmVt b3ZlX2ZpbGVzKGRybV9hdG9taWNfZGVidWdmc19saXN0LAo+ICsJCQkJCUFSUkFZX1NJWkUoZHJt X2F0b21pY19kZWJ1Z2ZzX2xpc3QpLAo+ICsJCQkJCW1pbm9yKTsKPiArfQo+ICAjZW5kaWYKPiAg Cj4gIC8qCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fZGVidWdmcy5jIGIvZHJp dmVycy9ncHUvZHJtL2RybV9kZWJ1Z2ZzLmMKPiBpbmRleCAyMDZhNGZlLi4yZTNlNDZhIDEwMDY0 NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fZGVidWdmcy5jCj4gKysrIGIvZHJpdmVycy9n cHUvZHJtL2RybV9kZWJ1Z2ZzLmMKPiBAQCAtMjI4LDYgKzIyOCw3IEBAIEVYUE9SVF9TWU1CT0wo ZHJtX2RlYnVnZnNfcmVtb3ZlX2ZpbGVzKTsKPiAgaW50IGRybV9kZWJ1Z2ZzX2NsZWFudXAoc3Ry dWN0IGRybV9taW5vciAqbWlub3IpCj4gIHsKPiAgCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBt aW5vci0+ZGV2Owo+ICsJaW50IHJldDsKPiAgCj4gIAlpZiAoIW1pbm9yLT5kZWJ1Z2ZzX3Jvb3Qp Cj4gIAkJcmV0dXJuIDA7Cj4gQEAgLTIzNSw2ICsyMzYsMTQgQEAgaW50IGRybV9kZWJ1Z2ZzX2Ns ZWFudXAoc3RydWN0IGRybV9taW5vciAqbWlub3IpCj4gIAlpZiAoZGV2LT5kcml2ZXItPmRlYnVn ZnNfY2xlYW51cCkKPiAgCQlkZXYtPmRyaXZlci0+ZGVidWdmc19jbGVhbnVwKG1pbm9yKTsKPiAg Cj4gKwlpZiAoZHJtX2NvcmVfY2hlY2tfZmVhdHVyZShkZXYsIERSSVZFUl9BVE9NSUMpKSB7Cj4g KwkJcmV0ID0gZHJtX2F0b21pY19kZWJ1Z2ZzX2NsZWFudXAobWlub3IpOwo+ICsJCWlmIChyZXQp IHsKPiArCQkJRFJNX0VSUk9SKCJEUk06IEZhaWxlZCB0byByZW1vdmUgYXRvbWljIGRlYnVnZnMg ZW50cmllc1xuIik7Cj4gKwkJCXJldHVybiByZXQ7Cj4gKwkJfQo+ICsJfQo+ICsKPiAgCWRybV9k ZWJ1Z2ZzX3JlbW92ZV9maWxlcyhkcm1fZGVidWdmc19saXN0LCBEUk1fREVCVUdGU19FTlRSSUVT LCBtaW5vcik7Cj4gIAo+ICAJZGVidWdmc19yZW1vdmUobWlub3ItPmRlYnVnZnNfcm9vdCk7Cj4g ZGlmZiAtLWdpdCBhL2luY2x1ZGUvZHJtL2RybV9hdG9taWMuaCBiL2luY2x1ZGUvZHJtL2RybV9h dG9taWMuaAo+IGluZGV4IDI0MDkxNDQuLjY0MDBkZjAgMTAwNjQ0Cj4gLS0tIGEvaW5jbHVkZS9k cm0vZHJtX2F0b21pYy5oCj4gKysrIGIvaW5jbHVkZS9kcm0vZHJtX2F0b21pYy5oCj4gQEAgLTM3 NCw2ICszNzQsNyBAQCB2b2lkIGRybV9zdGF0ZV9kdW1wKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYs IHN0cnVjdCBkcm1fcHJpbnRlciAqcCk7Cj4gICNpZmRlZiBDT05GSUdfREVCVUdfRlMKPiAgc3Ry dWN0IGRybV9taW5vcjsKPiAgaW50IGRybV9hdG9taWNfZGVidWdmc19pbml0KHN0cnVjdCBkcm1f bWlub3IgKm1pbm9yKTsKPiAraW50IGRybV9hdG9taWNfZGVidWdmc19jbGVhbnVwKHN0cnVjdCBk cm1fbWlub3IgKm1pbm9yKTsKPiAgI2VuZGlmCj4gIAo+ICAjZGVmaW5lIGZvcl9lYWNoX2Nvbm5l Y3Rvcl9pbl9zdGF0ZShfX3N0YXRlLCBjb25uZWN0b3IsIGNvbm5lY3Rvcl9zdGF0ZSwgX19pKSBc Cj4gLS0gCj4gMi4xMC4wCj4gCj4gX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KPiBkcmktZGV2ZWwgbWFpbGluZyBsaXN0Cj4gZHJpLWRldmVsQGxpc3RzLmZy ZWVkZXNrdG9wLm9yZwo+IGh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz dGluZm8vZHJpLWRldmVsCgotLSAKPT09PT09PT09PT09PT09PT09PT0KfCBJIHdvdWxkIGxpa2Ug dG8gfAp8IGZpeCB0aGUgd29ybGQsICB8CnwgYnV0IHRoZXkncmUgbm90IHwKfCBnaXZpbmcgbWUg dGhlICAgfAogXCBzb3VyY2UgY29kZSEgIC8KICAtLS0tLS0tLS0tLS0tLS0KICAgIMKvXF8o44OE KV8vwq8KX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJp LWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBz Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==