From mboxrd@z Thu Jan 1 00:00:00 1970 From: Robert Foss Subject: Re: [PATCH] drm: Wrap direct calls to driver->gem_free_object from CMA Date: Tue, 31 May 2016 17:51:09 -0400 Message-ID: <574E074D.9030503@collabora.com> References: <1464729952-13582-1-git-send-email-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1464729952-13582-1-git-send-email-chris@chris-wilson.co.uk> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Chris Wilson , dri-devel@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org, stable@vger.kernel.org, Daniel Vetter List-Id: dri-devel@lists.freedesktop.org VmVyaWZpZWQgd29ya2luZyBvbiBycGkyLgoKVGVzdGVkLWJ5OiBSb2JlcnQgRm9zcyA8cm9iZXJ0 LmZvc3NAY29sbGFib3JhLmNvbT4KCk9uIDIwMTYtMDUtMzEgMDU6MjUgUE0sIENocmlzIFdpbHNv biB3cm90ZToKPiBTaW5jZSB0aGUgaW50cm9kdWN0aW9uIG9mIChzdHJ1Y3RfbXV0ZXgpIGxvY2ts ZXNzIEdFTSBibyBmcmVlaW5nLCB0aGVyZQo+IGFyZSBhIHBhaXIgb2YgZHJpdmVyIHZmdW5jcyBm b3IgZnJlZWluZyB0aGUgR0VNIGJvLCBvZiB3aGljaCB0aGUgZHJpdmVyCj4gbWF5IGNob29zZSB0 byBvbmx5IGltcGxlbWVudCBkcml2ZXItPmdlbV9vYmplY3RfZnJlZV91bmxvY2tlZCAoYW5kIHNv Cj4gYXZvaWQgdGFraW5nIHRoZSBzdHJ1Y3RfbXV0ZXggYWxvbmcgdGhlIGZyZWUgcGF0aCkuIEhv d2V2ZXIsIHRoZSBDTUEgR0VNCj4gaGVscGVycyB3ZXJlIHN0aWxsIGNhbGxpbmcgZHJpdmVyLT5n ZW1fZnJlZV9vYmplY3QgZGlyZWN0bHksIG5vdyBOVUxMLAo+IGFuZCBwcm9tcHRseSBkeWluZyBv biB0aGUgZmFuY3kgbmV3IGxvY2tsZXNzIGRyaXZlcnMuIE9vcHMuCj4KPiBSb2JlcnQgRm9zcyBi aXNlY3RlZCB0aGlzIHRvIGI4MmNhYWZjZjIzMDMgKGRybS92YzQ6IFVzZSBsb2NrbGVzcyBnZW0g Qk8KPiBmcmVlIGNhbGxiYWNrKSBvbiBoaXMgdmM0IGRldmljZSwgYnV0IHRoYXQganVzdCBzZXJ2 ZXMgYXMgYW4gZW5hYmxlciBmb3IKPiA5ZjBiYTUzOWQxM2FlIChkcm0vZ2VtOiBzdXBwb3J0IEJP IGZyZWVpbmcgd2l0aG91dCBkZXYtPnN0cnVjdF9tdXRleCkuCj4KPiBSZXBvcnRlZC1ieTogUm9i ZXJ0IEZvc3MgPHJvYmVydC5mb3NzQGNvbGxhYm9yYS5jb20+Cj4gRml4ZXM6IDlmMGJhNTM5ZDEz YWUgKGRybS9nZW06IHN1cHBvcnQgQk8gZnJlZWluZyB3aXRob3V0IGRldi0+c3RydWN0X211dGV4 KQo+IFNpZ25lZC1vZmYtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVr Pgo+IENjOiBSb2JlcnQgRm9zcyA8cm9iZXJ0LmZvc3NAY29sbGFib3JhLmNvbT4KPiBDYzogRGFu aWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBpbnRlbC5jb20+Cj4gQ2M6IEVyaWMgQW5ob2x0IDxl cmljQGFuaG9sdC5uZXQ+Cj4gQ2M6IEFsZXggRGV1Y2hlciA8YWxleGRldWNoZXJAZ21haWwuY29t Pgo+IENjOiBMdWNhcyBTdGFjaCA8bC5zdGFjaEBwZW5ndXRyb25peC5kZT4KPiBDYzogc3RhYmxl QHZnZXIua2VybmVsLm9yZwo+IC0tLQo+ICAgZHJpdmVycy9ncHUvZHJtL2RybV9mYl9jbWFfaGVs cGVyLmMgIHwgIDIgKy0KPiAgIGRyaXZlcnMvZ3B1L2RybS9kcm1fZ2VtX2NtYV9oZWxwZXIuYyB8 IDEyICsrKy0tLS0tLS0tLQo+ICAgMiBmaWxlcyBjaGFuZ2VkLCA0IGluc2VydGlvbnMoKyksIDEw IGRlbGV0aW9ucygtKQo+Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fZmJfY21h X2hlbHBlci5jIGIvZHJpdmVycy9ncHUvZHJtL2RybV9mYl9jbWFfaGVscGVyLmMKPiBpbmRleCAx NzJjYWZlMTFjNzEuLjUwNzVmYWUzYzRlMiAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0v ZHJtX2ZiX2NtYV9oZWxwZXIuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fZmJfY21hX2hl bHBlci5jCj4gQEAgLTQ0NSw3ICs0NDUsNyBAQCBlcnJfY21hX2Rlc3Ryb3k6Cj4gICBlcnJfZmJf aW5mb19kZXN0cm95Ogo+ICAgCWRybV9mYl9oZWxwZXJfcmVsZWFzZV9mYmkoaGVscGVyKTsKPiAg IGVycl9nZW1fZnJlZV9vYmplY3Q6Cj4gLQlkZXYtPmRyaXZlci0+Z2VtX2ZyZWVfb2JqZWN0KCZv YmotPmJhc2UpOwo+ICsJZHJtX2dlbV9vYmplY3RfdW5yZWZlcmVuY2VfdW5sb2NrZWQoJm9iai0+ YmFzZSk7Cj4gICAJcmV0dXJuIHJldDsKPiAgIH0KPiAgIEVYUE9SVF9TWU1CT0woZHJtX2ZiZGV2 X2NtYV9jcmVhdGVfd2l0aF9mdW5jcyk7Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9k cm1fZ2VtX2NtYV9oZWxwZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fZ2VtX2NtYV9oZWxwZXIu Ywo+IGluZGV4IGUxYWIwMDhiM2YwOC4uMWQ2YzMzNTU4NGVjIDEwMDY0NAo+IC0tLSBhL2RyaXZl cnMvZ3B1L2RybS9kcm1fZ2VtX2NtYV9oZWxwZXIuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9k cm1fZ2VtX2NtYV9oZWxwZXIuYwo+IEBAIC0xMjEsNyArMTIxLDcgQEAgc3RydWN0IGRybV9nZW1f Y21hX29iamVjdCAqZHJtX2dlbV9jbWFfY3JlYXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkcm0sCj4g ICAJcmV0dXJuIGNtYV9vYmo7Cj4KPiAgIGVycm9yOgo+IC0JZHJtLT5kcml2ZXItPmdlbV9mcmVl X29iamVjdCgmY21hX29iai0+YmFzZSk7Cj4gKwlkcm1fZ2VtX29iamVjdF91bnJlZmVyZW5jZV91 bmxvY2tlZCgmY21hX29iai0+YmFzZSk7Cj4gICAJcmV0dXJuIEVSUl9QVFIocmV0KTsKPiAgIH0K PiAgIEVYUE9SVF9TWU1CT0xfR1BMKGRybV9nZW1fY21hX2NyZWF0ZSk7Cj4gQEAgLTE2MiwxOCAr MTYyLDEyIEBAIGRybV9nZW1fY21hX2NyZWF0ZV93aXRoX2hhbmRsZShzdHJ1Y3QgZHJtX2ZpbGUg KmZpbGVfcHJpdiwKPiAgIAkgKiBhbmQgaGFuZGxlIGhhcyB0aGUgaWQgd2hhdCB1c2VyIGNhbiBz ZWUuCj4gICAJICovCj4gICAJcmV0ID0gZHJtX2dlbV9oYW5kbGVfY3JlYXRlKGZpbGVfcHJpdiwg Z2VtX29iaiwgaGFuZGxlKTsKPiAtCWlmIChyZXQpCj4gLQkJZ290byBlcnJfaGFuZGxlX2NyZWF0 ZTsKPiAtCj4gICAJLyogZHJvcCByZWZlcmVuY2UgZnJvbSBhbGxvY2F0ZSAtIGhhbmRsZSBob2xk cyBpdCBub3cuICovCj4gICAJZHJtX2dlbV9vYmplY3RfdW5yZWZlcmVuY2VfdW5sb2NrZWQoZ2Vt X29iaik7Cj4gKwlpZiAocmV0KQo+ICsJCXJldHVybiBFUlJfUFRSKHJldCk7Cj4KPiAgIAlyZXR1 cm4gY21hX29iajsKPiAtCj4gLWVycl9oYW5kbGVfY3JlYXRlOgo+IC0JZHJtLT5kcml2ZXItPmdl bV9mcmVlX29iamVjdChnZW1fb2JqKTsKPiAtCj4gLQlyZXR1cm4gRVJSX1BUUihyZXQpOwo+ICAg fQo+Cj4gICAvKioKPgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5v cmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2 ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from bhuna.collabora.co.uk ([46.235.227.227]:43909 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750813AbcEaVvV (ORCPT ); Tue, 31 May 2016 17:51:21 -0400 Subject: Re: [PATCH] drm: Wrap direct calls to driver->gem_free_object from CMA To: Chris Wilson , dri-devel@lists.freedesktop.org References: <1464729952-13582-1-git-send-email-chris@chris-wilson.co.uk> Cc: intel-gfx@lists.freedesktop.org, Daniel Vetter , Eric Anholt , Alex Deucher , Lucas Stach , stable@vger.kernel.org From: Robert Foss Message-ID: <574E074D.9030503@collabora.com> Date: Tue, 31 May 2016 17:51:09 -0400 MIME-Version: 1.0 In-Reply-To: <1464729952-13582-1-git-send-email-chris@chris-wilson.co.uk> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Sender: stable-owner@vger.kernel.org List-ID: Verified working on rpi2. Tested-by: Robert Foss On 2016-05-31 05:25 PM, Chris Wilson wrote: > Since the introduction of (struct_mutex) lockless GEM bo freeing, there > are a pair of driver vfuncs for freeing the GEM bo, of which the driver > may choose to only implement driver->gem_object_free_unlocked (and so > avoid taking the struct_mutex along the free path). However, the CMA GEM > helpers were still calling driver->gem_free_object directly, now NULL, > and promptly dying on the fancy new lockless drivers. Oops. > > Robert Foss bisected this to b82caafcf2303 (drm/vc4: Use lockless gem BO > free callback) on his vc4 device, but that just serves as an enabler for > 9f0ba539d13ae (drm/gem: support BO freeing without dev->struct_mutex). > > Reported-by: Robert Foss > Fixes: 9f0ba539d13ae (drm/gem: support BO freeing without dev->struct_mutex) > Signed-off-by: Chris Wilson > Cc: Robert Foss > Cc: Daniel Vetter > Cc: Eric Anholt > Cc: Alex Deucher > Cc: Lucas Stach > Cc: stable@vger.kernel.org > --- > drivers/gpu/drm/drm_fb_cma_helper.c | 2 +- > drivers/gpu/drm/drm_gem_cma_helper.c | 12 +++--------- > 2 files changed, 4 insertions(+), 10 deletions(-) > > diff --git a/drivers/gpu/drm/drm_fb_cma_helper.c b/drivers/gpu/drm/drm_fb_cma_helper.c > index 172cafe11c71..5075fae3c4e2 100644 > --- a/drivers/gpu/drm/drm_fb_cma_helper.c > +++ b/drivers/gpu/drm/drm_fb_cma_helper.c > @@ -445,7 +445,7 @@ err_cma_destroy: > err_fb_info_destroy: > drm_fb_helper_release_fbi(helper); > err_gem_free_object: > - dev->driver->gem_free_object(&obj->base); > + drm_gem_object_unreference_unlocked(&obj->base); > return ret; > } > EXPORT_SYMBOL(drm_fbdev_cma_create_with_funcs); > diff --git a/drivers/gpu/drm/drm_gem_cma_helper.c b/drivers/gpu/drm/drm_gem_cma_helper.c > index e1ab008b3f08..1d6c335584ec 100644 > --- a/drivers/gpu/drm/drm_gem_cma_helper.c > +++ b/drivers/gpu/drm/drm_gem_cma_helper.c > @@ -121,7 +121,7 @@ struct drm_gem_cma_object *drm_gem_cma_create(struct drm_device *drm, > return cma_obj; > > error: > - drm->driver->gem_free_object(&cma_obj->base); > + drm_gem_object_unreference_unlocked(&cma_obj->base); > return ERR_PTR(ret); > } > EXPORT_SYMBOL_GPL(drm_gem_cma_create); > @@ -162,18 +162,12 @@ drm_gem_cma_create_with_handle(struct drm_file *file_priv, > * and handle has the id what user can see. > */ > ret = drm_gem_handle_create(file_priv, gem_obj, handle); > - if (ret) > - goto err_handle_create; > - > /* drop reference from allocate - handle holds it now. */ > drm_gem_object_unreference_unlocked(gem_obj); > + if (ret) > + return ERR_PTR(ret); > > return cma_obj; > - > -err_handle_create: > - drm->driver->gem_free_object(gem_obj); > - > - return ERR_PTR(ret); > } > > /** >