From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 4/4] drm/prime: cleanup prime/gem locking interaction Date: Thu, 15 Oct 2015 08:41:09 +0200 Message-ID: <20151015064109.GP26718@phenom.ffwll.local> References: <1444873901-32043-1-git-send-email-airlied@gmail.com> <1444873901-32043-5-git-send-email-airlied@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wi0-f182.google.com (mail-wi0-f182.google.com [209.85.212.182]) by gabe.freedesktop.org (Postfix) with ESMTPS id 02B9F6E76F for ; Wed, 14 Oct 2015 23:38:16 -0700 (PDT) Received: by wicgb1 with SMTP id gb1so13576704wic.1 for ; Wed, 14 Oct 2015 23:38:14 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1444873901-32043-5-git-send-email-airlied@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Dave Airlie Cc: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org T24gVGh1LCBPY3QgMTUsIDIwMTUgYXQgMTE6NTE6NDFBTSArMTAwMCwgRGF2ZSBBaXJsaWUgd3Jv dGU6Cj4gRnJvbTogRGF2ZSBBaXJsaWUgPGFpcmxpZWRAcmVkaGF0LmNvbT4KPiAKPiBjYWxsaW5n IGRybV9nZW1faGFuZGxlX2RlbGV0ZSB3b3VsZCBjYXVzZSBhbiBhdHRlbXB0IHRvIHJldGFrZQo+ IHRoZSBwcmltZSBsb2NrLgo+IAo+IG1vdmUgY29kZSBhcm91bmQgc28gd2UgbmV2ZXIgbmVlZCB0 byBkbyB0aGF0LiBUaGlzIHBhdGNoIGFsbG9jYXRlcwo+IHRoZSBtZW1iZXIgc3RydWN0dXJlIGVh cmx5LCBzbyB0aGVyZSBpcyBubyBmYWlsdXJlIHBhdGggdGhhdAo+IHJlcXVpcmVzIGNhbGxpbmcg ZHJtX2dlbV9oYW5kbGVfZGVsZXRlLgo+IAo+IFNpZ25lZC1vZmYtYnk6IERhdmUgQWlybGllIDxh aXJsaWVkQHJlZGhhdC5jb20+Cj4gLS0tCj4gIGRyaXZlcnMvZ3B1L2RybS9kcm1fcHJpbWUuYyB8 IDQ5ICsrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQo+ICAxIGZp bGUgY2hhbmdlZCwgMjQgaW5zZXJ0aW9ucygrKSwgMjUgZGVsZXRpb25zKC0pCj4gCj4gZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fcHJpbWUuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1f cHJpbWUuYwo+IGluZGV4IDg4YzAwNGUuLjY5OTEzOTggMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9n cHUvZHJtL2RybV9wcmltZS5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV9wcmltZS5jCj4g QEAgLTcxLDIwICs3MSwxNCBAQCBzdHJ1Y3QgZHJtX3ByaW1lX2F0dGFjaG1lbnQgewo+ICAJZW51 bSBkbWFfZGF0YV9kaXJlY3Rpb24gZGlyOwo+ICB9Owo+ICAKPiAtc3RhdGljIGludCBkcm1fcHJp bWVfYWRkX2J1Zl9oYW5kbGUoc3RydWN0IGRybV9wcmltZV9maWxlX3ByaXZhdGUgKnByaW1lX2Zw cml2LAo+IC0JCQkJICAgIHN0cnVjdCBkbWFfYnVmICpkbWFfYnVmLCB1aW50MzJfdCBoYW5kbGUp Cj4gK3N0YXRpYyB2b2lkIGRybV9wcmltZV9hZGRfYnVmX2hhbmRsZShzdHJ1Y3QgZHJtX3ByaW1l X2ZpbGVfcHJpdmF0ZSAqcHJpbWVfZnByaXYsCj4gKwkJCQkgICAgIHN0cnVjdCBkcm1fcHJpbWVf bWVtYmVyICptZW1iZXIsCj4gKwkJCQkgICAgIHN0cnVjdCBkbWFfYnVmICpkbWFfYnVmLCB1aW50 MzJfdCBoYW5kbGUpCj4gIHsKPiAtCXN0cnVjdCBkcm1fcHJpbWVfbWVtYmVyICptZW1iZXI7Cj4g LQo+IC0JbWVtYmVyID0ga21hbGxvYyhzaXplb2YoKm1lbWJlciksIEdGUF9LRVJORUwpOwo+IC0J aWYgKCFtZW1iZXIpCj4gLQkJcmV0dXJuIC1FTk9NRU07Cj4gLQo+ICAJZ2V0X2RtYV9idWYoZG1h X2J1Zik7Cj4gIAltZW1iZXItPmRtYV9idWYgPSBkbWFfYnVmOwo+ICAJbWVtYmVyLT5oYW5kbGUg PSBoYW5kbGU7Cj4gIAlsaXN0X2FkZCgmbWVtYmVyLT5lbnRyeSwgJnByaW1lX2Zwcml2LT5oZWFk KTsKPiAtCXJldHVybiAwOwo+ICB9Cj4gIAo+ICBzdGF0aWMgc3RydWN0IGRtYV9idWYgKmRybV9w cmltZV9sb29rdXBfYnVmX2J5X2hhbmRsZShzdHJ1Y3QgZHJtX3ByaW1lX2ZpbGVfcHJpdmF0ZSAq cHJpbWVfZnByaXYsCj4gQEAgLTQwOSw2ICs0MDMsNyBAQCBpbnQgZHJtX2dlbV9wcmltZV9oYW5k bGVfdG9fZmQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKPiAgCXN0cnVjdCBkcm1fZ2VtX29iamVj dCAqb2JqOwo+ICAJaW50IHJldCA9IDA7Cj4gIAlzdHJ1Y3QgZG1hX2J1ZiAqZG1hYnVmOwo+ICsJ c3RydWN0IGRybV9wcmltZV9tZW1iZXIgKm1lbWJlcjsKPiAgCj4gIAltdXRleF9sb2NrKCZmaWxl X3ByaXYtPnByaW1lLmxvY2spOwo+ICAJb2JqID0gZHJtX2dlbV9vYmplY3RfbG9va3VwKGRldiwg ZmlsZV9wcml2LCBoYW5kbGUpOwo+IEBAIC00MTcsNiArNDEyLDEyIEBAIGludCBkcm1fZ2VtX3By aW1lX2hhbmRsZV90b19mZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAo+ICAJCWdvdG8gb3V0X3Vu bG9jazsKPiAgCX0KPiAgCj4gKwltZW1iZXIgPSBrbWFsbG9jKHNpemVvZigqbWVtYmVyKSwgR0ZQ X0tFUk5FTCk7Cj4gKwlpZiAoIW1lbWJlcikgewo+ICsJCXJldCA9IC1FTk9NRU07Cj4gKwkJZ290 byBvdXRfdW5sb2NrOwo+ICsJfQo+ICsKPiAgCWRtYWJ1ZiA9IGRybV9wcmltZV9sb29rdXBfYnVm X2J5X2hhbmRsZSgmZmlsZV9wcml2LT5wcmltZSwgaGFuZGxlKTsKPiAgCWlmIChkbWFidWYpIHsK PiAgCQlnZXRfZG1hX2J1ZihkbWFidWYpOwo+IEBAIC00MzcsNiArNDM4LDcgQEAgaW50IGRybV9n ZW1fcHJpbWVfaGFuZGxlX3RvX2ZkKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCj4gIAkJCQkgKi8K PiAgCQkJCXJldCA9IFBUUl9FUlIoZG1hYnVmKTsKPiAgCQkJCW11dGV4X3VubG9jaygmZGV2LT5v YmplY3RfbmFtZV9sb2NrKTsKPiArCQkJCWtmcmVlKG1lbWJlcik7Cj4gIAkJCQlnb3RvIG91dDsK PiAgCQkJfQo+ICAJCX0KPiBAQCAtNDQ3LDEzICs0NDksOSBAQCBpbnQgZHJtX2dlbV9wcmltZV9o YW5kbGVfdG9fZmQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKPiAgCQkgKiBwcm90ZWN0aW9uIG9m IGRldi0+b2JqZWN0X25hbWVfbG9jayB0byBlbnN1cmUgdGhhdCBhIHJhY2luZyBnZW0gY2xvc2UK PiAgCQkgKiBpb2N0bCBkb2Vzbid0IG1pc3MgdG8gcmVtb3ZlIHRoaXMgYnVmZmVyIGhhbmRsZSBm cm9tIHRoZSBjYWNoZS4KPiAgCQkgKi8KPiAtCQlyZXQgPSBkcm1fcHJpbWVfYWRkX2J1Zl9oYW5k bGUoJmZpbGVfcHJpdi0+cHJpbWUsCj4gLQkJCQkJICAgICAgIGRtYWJ1ZiwgaGFuZGxlKTsKPiAr CQlkcm1fcHJpbWVfYWRkX2J1Zl9oYW5kbGUoJmZpbGVfcHJpdi0+cHJpbWUsCj4gKwkJCQkJIG1l bWJlciwgZG1hYnVmLCBoYW5kbGUpOwo+ICAJCW11dGV4X3VubG9jaygmZGV2LT5vYmplY3RfbmFt ZV9sb2NrKTsKPiAtCQlpZiAocmV0KSB7Cj4gLQkJCWRtYV9idWZfcHV0KGRtYWJ1Zik7Cj4gLQkJ CWdvdG8gb3V0Owo+IC0JCX0KPiAgCX0KPiAgCj4gIAlyZXQgPSBkbWFfYnVmX2ZkKGRtYWJ1Ziwg ZmxhZ3MpOwo+IEBAIC01NjAsNiArNTU4LDcgQEAgaW50IGRybV9nZW1fcHJpbWVfZmRfdG9faGFu ZGxlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCj4gIHsKPiAgCXN0cnVjdCBkbWFfYnVmICpkbWFf YnVmOwo+ICAJc3RydWN0IGRybV9nZW1fb2JqZWN0ICpvYmo7Cj4gKwlzdHJ1Y3QgZHJtX3ByaW1l X21lbWJlciAqbWVtYmVyOwo+ICAJaW50IHJldDsKPiAgCj4gIAlkbWFfYnVmID0gZG1hX2J1Zl9n ZXQocHJpbWVfZmQpOwo+IEBAIC01NzMsNiArNTcyLDExIEBAIGludCBkcm1fZ2VtX3ByaW1lX2Zk X3RvX2hhbmRsZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAo+ICAJaWYgKHJldCA9PSAwKQo+ICAJ CWdvdG8gb3V0X3B1dDsKPiAgCj4gKwltZW1iZXIgPSBrbWFsbG9jKHNpemVvZigqbWVtYmVyKSwg R0ZQX0tFUk5FTCk7Cj4gKwlpZiAoIW1lbWJlcikgewo+ICsJCXJldCA9IC1FTk9NRU07Cj4gKwkJ Z290byBvdXRfcHV0Owo+ICsJfQo+ICAJLyogbmV2ZXIgc2VlbiB0aGlzIG9uZSwgbmVlZCB0byBp bXBvcnQgKi8KPiAgCW11dGV4X2xvY2soJmRldi0+b2JqZWN0X25hbWVfbG9jayk7Cj4gIAlvYmog PSBkZXYtPmRyaXZlci0+Z2VtX3ByaW1lX2ltcG9ydChkZXYsIGRtYV9idWYpOwo+IEBAIC01OTUs MTIgKzU5OSwxMCBAQCBpbnQgZHJtX2dlbV9wcmltZV9mZF90b19oYW5kbGUoc3RydWN0IGRybV9k ZXZpY2UgKmRldiwKPiAgCQkJCQkJICAgb2JqLT5kbWFfYnVmKTsKPiAgCWRybV9nZW1fb2JqZWN0 X3VucmVmZXJlbmNlX3VubG9ja2VkKG9iaik7Cj4gIAlpZiAocmV0KQo+IC0JCWdvdG8gb3V0X3B1 dDsKPiArCQlnb3RvIG91dF9tZW1iZXI7Cj4gIAo+IC0JcmV0ID0gZHJtX3ByaW1lX2FkZF9idWZf aGFuZGxlKCZmaWxlX3ByaXYtPnByaW1lLAo+IC0JCQlkbWFfYnVmLCAqaGFuZGxlKTsKPiAtCWlm IChyZXQpCj4gLQkJZ290byBmYWlsOwo+ICsJZHJtX3ByaW1lX2FkZF9idWZfaGFuZGxlKCZmaWxl X3ByaXYtPnByaW1lLAo+ICsJCQkJIG1lbWJlciwgZG1hX2J1ZiwgKmhhbmRsZSk7CgoJbWVtYmVy ID0gTlVMTDsKPiAgCj4gIAltdXRleF91bmxvY2soJmZpbGVfcHJpdi0+cHJpbWUubG9jayk7Cj4g IAo+IEBAIC02MDgsMTMgKzYxMCwxMCBAQCBpbnQgZHJtX2dlbV9wcmltZV9mZF90b19oYW5kbGUo c3RydWN0IGRybV9kZXZpY2UgKmRldiwKPiAgCj4gIAlyZXR1cm4gMDsKPiAgCj4gLWZhaWw6Cj4g LQkvKiBobW0sIGlmIGRyaXZlciBhdHRhY2hlZCwgd2UgYXJlIHJlbHlpbmcgb24gdGhlIGZyZWUt b2JqZWN0IHBhdGgKPiAtCSAqIHRvIGRldGFjaC4uIHdoaWNoIHNlZW1zIG9rLi4KPiAtCSAqLwo+ IC0JZHJtX2dlbV9oYW5kbGVfZGVsZXRlKGZpbGVfcHJpdiwgKmhhbmRsZSk7Cj4gIG91dF91bmxv Y2s6Cj4gIAltdXRleF91bmxvY2soJmRldi0+b2JqZWN0X25hbWVfbG9jayk7Cj4gK291dF9tZW1i ZXI6Cj4gKwlrZnJlZShtZW1iZXIpOwo+ICBvdXRfcHV0OgoKYW5kIHB1dCB0aGUga2ZyZWUgKHNp bmNlIGl0IGNhbiBkZWFsIHdpdGggTlVMTCkgYmVsb3cgdGhlIG91dF9wdXQgaGVyZSBhcwphIHJh bmRvbSBiaWtlc2hlZC4gQW55d2F5LCBsb29rcyBnb29kIGFzIGlzLgoKUmV2aWV3ZWQtYnk6IERh bmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0ZXJAZmZ3bGwuY2g+Cgo+ICAJZG1hX2J1Zl9wdXQoZG1h X2J1Zik7Cj4gIAltdXRleF91bmxvY2soJmZpbGVfcHJpdi0+cHJpbWUubG9jayk7Cj4gLS0gCj4g Mi41LjAKPiAKPiBfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f Xwo+IGRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKPiBkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCj4gaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1k ZXZlbAoKLS0gCkRhbmllbCBWZXR0ZXIKU29mdHdhcmUgRW5naW5lZXIsIEludGVsIENvcnBvcmF0 aW9uCmh0dHA6Ly9ibG9nLmZmd2xsLmNoCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZy ZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGlu Zm8vZHJpLWRldmVsCg==