From mboxrd@z Thu Jan 1 00:00:00 1970 From: Joonas Lahtinen Subject: Re: [PATCH 20/22] drm/i915: Move i915_gem_object_wait_rendering() Date: Thu, 28 Jul 2016 12:37:16 +0300 Message-ID: <1469698636.3897.38.camel@linux.intel.com> References: <1469618100-15298-1-git-send-email-chris@chris-wilson.co.uk> <1469618100-15298-21-git-send-email-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTP id 7A3E46E7B0 for ; Thu, 28 Jul 2016 09:37:19 +0000 (UTC) In-Reply-To: <1469618100-15298-21-git-send-email-chris@chris-wilson.co.uk> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Chris Wilson , intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T24ga2UsIDIwMTYtMDctMjcgYXQgMTI6MTQgKzAxMDAsIENocmlzIFdpbHNvbiB3cm90ZToKPiBK dXN0IG1vdmUgaXQgZWFybGllciBzbyB0aGF0IHdlIGNhbiB1c2UgdGhlIGNvbXBhbmlvbiBub25i bG9ja2luZwo+IHZlcnNpb24gaW4gYSBjb3VwbGUgb2YgbW9yZSBjYWxsc2l0ZXMgd2l0aG91dCBo YXZpbmcgdG8gYWRkIGEgZm9yd2FyZAo+IGRlY2xhcmF0aW9uLgo+IAo+IFNpZ25lZC1vZmYtYnk6 IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgoKClNlcGFyYXRlIGNvZGUg bW90aW9uIHBhdGNoLCB3b3cuCgpSZXZpZXdlZC1ieTogSm9vbmFzIExhaHRpbmVuIDxqb29uYXMu bGFodGluZW5AbGludXguaW50ZWwuY29tPgoKPiAtLS0KPiDCoGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtLmMgfCAyMDIgKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0t LQo+IMKgMSBmaWxlIGNoYW5nZWQsIDEwMSBpbnNlcnRpb25zKCspLCAxMDEgZGVsZXRpb25zKC0p Cj4gCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCj4gaW5kZXggY2E5NzQxNTI1YmY0Li41NGQ4YTM4 NjNkMTEgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwo+ICsr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKPiBAQCAtMzAxLDYgKzMwMSwxMDcg QEAgaTkxNV9nZW1fb2JqZWN0X3VuYmluZChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2Jq KQo+IMKgCXJldHVybiByZXQ7Cj4gwqB9Cj4gwqAKPiArLyoqCj4gKyAqIEVuc3VyZXMgdGhhdCBh bGwgcmVuZGVyaW5nIHRvIHRoZSBvYmplY3QgaGFzIGNvbXBsZXRlZCBhbmQgdGhlIG9iamVjdCBp cwo+ICsgKiBzYWZlIHRvIHVuYmluZCBmcm9tIHRoZSBHVFQgb3IgYWNjZXNzIGZyb20gdGhlIENQ VS4KPiArICovCj4gK2ludAo+ICtpOTE1X2dlbV9vYmplY3Rfd2FpdF9yZW5kZXJpbmcoc3RydWN0 IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwKPiArCQkJwqDCoMKgwqDCoMKgwqBib29sIHJlYWRv bmx5KQo+ICt7Cj4gKwlzdHJ1Y3QgcmVzZXJ2YXRpb25fb2JqZWN0ICpyZXN2Owo+ICsJc3RydWN0 IGk5MTVfZ2VtX2FjdGl2ZSAqYWN0aXZlOwo+ICsJdW5zaWduZWQgbG9uZyBhY3RpdmVfbWFzazsK PiArCWludCBpZHg7Cj4gKwo+ICsJbG9ja2RlcF9hc3NlcnRfaGVsZCgmb2JqLT5iYXNlLmRldi0+ c3RydWN0X211dGV4KTsKPiArCj4gKwlpZiAoIXJlYWRvbmx5KSB7Cj4gKwkJYWN0aXZlID0gb2Jq LT5sYXN0X3JlYWQ7Cj4gKwkJYWN0aXZlX21hc2sgPSBpOTE1X2dlbV9vYmplY3RfaXNfYWN0aXZl KG9iaik7Cj4gKwl9IGVsc2Ugewo+ICsJCWFjdGl2ZV9tYXNrID0gMTsKPiArCQlhY3RpdmUgPSAm b2JqLT5sYXN0X3dyaXRlOwo+ICsJfQo+ICsKPiArCWZvcl9lYWNoX2FjdGl2ZShhY3RpdmVfbWFz aywgaWR4KSB7Cj4gKwkJaW50IHJldDsKPiArCj4gKwkJcmV0ID0gaTkxNV9nZW1fYWN0aXZlX3dh aXQoJmFjdGl2ZVtpZHhdLAo+ICsJCQkJCcKgwqDCoCZvYmotPmJhc2UuZGV2LT5zdHJ1Y3RfbXV0 ZXgpOwo+ICsJCWlmIChyZXQpCj4gKwkJCXJldHVybiByZXQ7Cj4gKwl9Cj4gKwo+ICsJcmVzdiA9 IGk5MTVfZ2VtX29iamVjdF9nZXRfZG1hYnVmX3Jlc3Yob2JqKTsKPiArCWlmIChyZXN2KSB7Cj4g KwkJbG9uZyBlcnI7Cj4gKwo+ICsJCWVyciA9IHJlc2VydmF0aW9uX29iamVjdF93YWl0X3RpbWVv dXRfcmN1KHJlc3YsICFyZWFkb25seSwgdHJ1ZSwKPiArCQkJCQkJCcKgwqBNQVhfU0NIRURVTEVf VElNRU9VVCk7Cj4gKwkJaWYgKGVyciA8IDApCj4gKwkJCXJldHVybiBlcnI7Cj4gKwl9Cj4gKwo+ ICsJcmV0dXJuIDA7Cj4gK30KPiArCj4gKy8qIEEgbm9uYmxvY2tpbmcgdmFyaWFudCBvZiB0aGUg YWJvdmUgd2FpdC4gVGhpcyBpcyBhIGhpZ2hseSBkYW5nZXJvdXMgcm91dGluZQo+ICsgKiBhcyB0 aGUgb2JqZWN0IHN0YXRlIG1heSBjaGFuZ2UgZHVyaW5nIHRoaXMgY2FsbC4KPiArICovCj4gK3N0 YXRpYyBfX211c3RfY2hlY2sgaW50Cj4gK2k5MTVfZ2VtX29iamVjdF93YWl0X3JlbmRlcmluZ19f bm9uYmxvY2tpbmcoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwKPiArCQkJCQnCoMKg wqDCoHN0cnVjdCBpbnRlbF9ycHNfY2xpZW50ICpycHMsCj4gKwkJCQkJwqDCoMKgwqBib29sIHJl YWRvbmx5KQo+ICt7Cj4gKwlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gb2JqLT5iYXNlLmRldjsK PiArCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdHNbSTkxNV9OVU1fRU5HSU5F U107Cj4gKwlzdHJ1Y3QgaTkxNV9nZW1fYWN0aXZlICphY3RpdmU7Cj4gKwl1bnNpZ25lZCBsb25n IGFjdGl2ZV9tYXNrOwo+ICsJaW50IHJldCwgaSwgbiA9IDA7Cj4gKwo+ICsJbG9ja2RlcF9hc3Nl cnRfaGVsZCgmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwo+ICsJR0VNX0JVR19PTighdG9faTkxNShkZXYp LT5tbS5pbnRlcnJ1cHRpYmxlKTsKPiArCj4gKwlhY3RpdmVfbWFzayA9IGk5MTVfZ2VtX29iamVj dF9pc19hY3RpdmUob2JqKTsKPiArCWlmICghYWN0aXZlX21hc2spCj4gKwkJcmV0dXJuIDA7Cj4g Kwo+ICsJaWYgKCFyZWFkb25seSkgewo+ICsJCWFjdGl2ZSA9IG9iai0+bGFzdF9yZWFkOwo+ICsJ fSBlbHNlIHsKPiArCQlhY3RpdmVfbWFzayA9IDE7Cj4gKwkJYWN0aXZlID0gJm9iai0+bGFzdF93 cml0ZTsKPiArCX0KPiArCj4gKwlmb3JfZWFjaF9hY3RpdmUoYWN0aXZlX21hc2ssIGkpIHsKPiAr CQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcTsKPiArCj4gKwkJcmVxID0gaTkxNV9n ZW1fYWN0aXZlX2dldCgmYWN0aXZlW2ldLAo+ICsJCQkJCcKgwqAmb2JqLT5iYXNlLmRldi0+c3Ry dWN0X211dGV4KTsKPiArCQlpZiAocmVxKQo+ICsJCQlyZXF1ZXN0c1tuKytdID0gcmVxOwo+ICsJ fQo+ICsKPiArCW11dGV4X3VubG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwo+ICsJcmV0ID0gMDsK PiArCWZvciAoaSA9IDA7IHJldCA9PSAwICYmIGkgPCBuOyBpKyspCj4gKwkJcmV0ID0gaTkxNV93 YWl0X3JlcXVlc3QocmVxdWVzdHNbaV0sIHRydWUsIE5VTEwsIHJwcyk7Cj4gKwltdXRleF9sb2Nr KCZkZXYtPnN0cnVjdF9tdXRleCk7Cj4gKwo+ICsJZm9yIChpID0gMDsgaSA8IG47IGkrKykKPiAr CQlpOTE1X2dlbV9yZXF1ZXN0X3B1dChyZXF1ZXN0c1tpXSk7Cj4gKwo+ICsJcmV0dXJuIHJldDsK PiArfQo+ICsKPiArc3RhdGljIHN0cnVjdCBpbnRlbF9ycHNfY2xpZW50ICp0b19ycHNfY2xpZW50 KHN0cnVjdCBkcm1fZmlsZSAqZmlsZSkKPiArewo+ICsJc3RydWN0IGRybV9pOTE1X2ZpbGVfcHJp dmF0ZSAqZnByaXYgPSBmaWxlLT5kcml2ZXJfcHJpdjsKPiArCj4gKwlyZXR1cm4gJmZwcml2LT5y cHM7Cj4gK30KPiArCj4gwqBpbnQKPiDCoGk5MTVfZ2VtX29iamVjdF9hdHRhY2hfcGh5cyhzdHJ1 Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAo+IMKgCQkJwqDCoMKgwqBpbnQgYWxpZ24pCj4g QEAgLTEzMzUsMTA3ICsxNDM2LDYgQEAgcHV0X3JwbToKPiDCoAlyZXR1cm4gcmV0Owo+IMKgfQo+ IMKgCj4gLS8qKgo+IC0gKiBFbnN1cmVzIHRoYXQgYWxsIHJlbmRlcmluZyB0byB0aGUgb2JqZWN0 IGhhcyBjb21wbGV0ZWQgYW5kIHRoZSBvYmplY3QgaXMKPiAtICogc2FmZSB0byB1bmJpbmQgZnJv bSB0aGUgR1RUIG9yIGFjY2VzcyBmcm9tIHRoZSBDUFUuCj4gLSAqIEBvYmo6IGk5MTUgZ2VtIG9i amVjdAo+IC0gKiBAcmVhZG9ubHk6IHdhaXRpbmcgZm9yIHJlYWQgYWNjZXNzIG9yIHdyaXRlCj4g LSAqLwo+IC1pbnQKPiAtaTkxNV9nZW1fb2JqZWN0X3dhaXRfcmVuZGVyaW5nKHN0cnVjdCBkcm1f aTkxNV9nZW1fb2JqZWN0ICpvYmosCj4gLQkJCcKgwqDCoMKgwqDCoMKgYm9vbCByZWFkb25seSkK PiAtewo+IC0Jc3RydWN0IHJlc2VydmF0aW9uX29iamVjdCAqcmVzdjsKPiAtCXN0cnVjdCBpOTE1 X2dlbV9hY3RpdmUgKmFjdGl2ZTsKPiAtCXVuc2lnbmVkIGxvbmcgYWN0aXZlX21hc2s7Cj4gLQlp bnQgaWR4LCByZXQ7Cj4gLQo+IC0JbG9ja2RlcF9hc3NlcnRfaGVsZCgmb2JqLT5iYXNlLmRldi0+ c3RydWN0X211dGV4KTsKPiAtCj4gLQlpZiAoIXJlYWRvbmx5KSB7Cj4gLQkJYWN0aXZlID0gb2Jq LT5sYXN0X3JlYWQ7Cj4gLQkJYWN0aXZlX21hc2sgPSBpOTE1X2dlbV9vYmplY3RfaXNfYWN0aXZl KG9iaik7Cj4gLQl9IGVsc2Ugewo+IC0JCWFjdGl2ZV9tYXNrID0gMTsKPiAtCQlhY3RpdmUgPSAm b2JqLT5sYXN0X3dyaXRlOwo+IC0JfQo+IC0KPiAtCWZvcl9lYWNoX2FjdGl2ZShhY3RpdmVfbWFz aywgaWR4KSB7Cj4gLQkJcmV0ID0gaTkxNV9nZW1fYWN0aXZlX3dhaXQoJmFjdGl2ZVtpZHhdLAo+ IC0JCQkJCcKgwqDCoCZvYmotPmJhc2UuZGV2LT5zdHJ1Y3RfbXV0ZXgpOwo+IC0JCWlmIChyZXQp Cj4gLQkJCXJldHVybiByZXQ7Cj4gLQl9Cj4gLQo+IC0JcmVzdiA9IGk5MTVfZ2VtX29iamVjdF9n ZXRfZG1hYnVmX3Jlc3Yob2JqKTsKPiAtCWlmIChyZXN2KSB7Cj4gLQkJbG9uZyBlcnI7Cj4gLQo+ IC0JCWVyciA9IHJlc2VydmF0aW9uX29iamVjdF93YWl0X3RpbWVvdXRfcmN1KHJlc3YsICFyZWFk b25seSwgdHJ1ZSwKPiAtCQkJCQkJCcKgwqBNQVhfU0NIRURVTEVfVElNRU9VVCk7Cj4gLQkJaWYg KGVyciA8IDApCj4gLQkJCXJldHVybiBlcnI7Cj4gLQl9Cj4gLQo+IC0JcmV0dXJuIDA7Cj4gLX0K PiAtCj4gLS8qIEEgbm9uYmxvY2tpbmcgdmFyaWFudCBvZiB0aGUgYWJvdmUgd2FpdC4gVGhpcyBp cyBhIGhpZ2hseSBkYW5nZXJvdXMgcm91dGluZQo+IC0gKiBhcyB0aGUgb2JqZWN0IHN0YXRlIG1h eSBjaGFuZ2UgZHVyaW5nIHRoaXMgY2FsbC4KPiAtICovCj4gLXN0YXRpYyBfX211c3RfY2hlY2sg aW50Cj4gLWk5MTVfZ2VtX29iamVjdF93YWl0X3JlbmRlcmluZ19fbm9uYmxvY2tpbmcoc3RydWN0 IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwKPiAtCQkJCQnCoMKgwqDCoHN0cnVjdCBpbnRlbF9y cHNfY2xpZW50ICpycHMsCj4gLQkJCQkJwqDCoMKgwqBib29sIHJlYWRvbmx5KQo+IC17Cj4gLQlz dHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gb2JqLT5iYXNlLmRldjsKPiAtCXN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKPiAtCXN0cnVjdCBkcm1faTkxNV9n ZW1fcmVxdWVzdCAqcmVxdWVzdHNbSTkxNV9OVU1fRU5HSU5FU107Cj4gLQlzdHJ1Y3QgaTkxNV9n ZW1fYWN0aXZlICphY3RpdmU7Cj4gLQl1bnNpZ25lZCBsb25nIGFjdGl2ZV9tYXNrOwo+IC0JaW50 IHJldCwgaSwgbiA9IDA7Cj4gLQo+IC0JQlVHX09OKCFtdXRleF9pc19sb2NrZWQoJmRldi0+c3Ry dWN0X211dGV4KSk7Cj4gLQlCVUdfT04oIWRldl9wcml2LT5tbS5pbnRlcnJ1cHRpYmxlKTsKPiAt Cj4gLQlhY3RpdmVfbWFzayA9IGk5MTVfZ2VtX29iamVjdF9pc19hY3RpdmUob2JqKTsKPiAtCWlm ICghYWN0aXZlX21hc2spCj4gLQkJcmV0dXJuIDA7Cj4gLQo+IC0JaWYgKCFyZWFkb25seSkgewo+ IC0JCWFjdGl2ZSA9IG9iai0+bGFzdF9yZWFkOwo+IC0JfSBlbHNlIHsKPiAtCQlhY3RpdmVfbWFz ayA9IDE7Cj4gLQkJYWN0aXZlID0gJm9iai0+bGFzdF93cml0ZTsKPiAtCX0KPiAtCj4gLQlmb3Jf ZWFjaF9hY3RpdmUoYWN0aXZlX21hc2ssIGkpIHsKPiAtCQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3Jl cXVlc3QgKnJlcTsKPiAtCj4gLQkJcmVxID0gaTkxNV9nZW1fYWN0aXZlX2dldCgmYWN0aXZlW2ld LAo+IC0JCQkJCcKgwqAmb2JqLT5iYXNlLmRldi0+c3RydWN0X211dGV4KTsKPiAtCQlpZiAocmVx KQo+IC0JCQlyZXF1ZXN0c1tuKytdID0gcmVxOwo+IC0JfQo+IC0KPiAtCW11dGV4X3VubG9jaygm ZGV2LT5zdHJ1Y3RfbXV0ZXgpOwo+IC0JcmV0ID0gMDsKPiAtCWZvciAoaSA9IDA7IHJldCA9PSAw ICYmIGkgPCBuOyBpKyspCj4gLQkJcmV0ID0gaTkxNV93YWl0X3JlcXVlc3QocmVxdWVzdHNbaV0s IHRydWUsIE5VTEwsIHJwcyk7Cj4gLQltdXRleF9sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7Cj4g LQo+IC0JZm9yIChpID0gMDsgaSA8IG47IGkrKykKPiAtCQlpOTE1X2dlbV9yZXF1ZXN0X3B1dChy ZXF1ZXN0c1tpXSk7Cj4gLQo+IC0JcmV0dXJuIHJldDsKPiAtfQo+IC0KPiAtc3RhdGljIHN0cnVj dCBpbnRlbF9ycHNfY2xpZW50ICp0b19ycHNfY2xpZW50KHN0cnVjdCBkcm1fZmlsZSAqZmlsZSkK PiAtewo+IC0Jc3RydWN0IGRybV9pOTE1X2ZpbGVfcHJpdmF0ZSAqZnByaXYgPSBmaWxlLT5kcml2 ZXJfcHJpdjsKPiAtCXJldHVybiAmZnByaXYtPnJwczsKPiAtfQo+IC0KPiDCoHN0YXRpYyBlbnVt IGZiX29wX29yaWdpbgo+IMKgd3JpdGVfb3JpZ2luKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0 ICpvYmosIHVuc2lnbmVkIGRvbWFpbikKPiDCoHsKLS0gCkpvb25hcyBMYWh0aW5lbgpPcGVuIFNv dXJjZSBUZWNobm9sb2d5IENlbnRlcgpJbnRlbCBDb3Jwb3JhdGlvbgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0Cklu dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK