From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michel Thierry Subject: Re: [PATCH 1/4] drm/i915/gtt: Reorder page alloc/free/init functions Date: Tue, 30 Jun 2015 17:58:17 +0100 Message-ID: <5592CAA9.4050504@intel.com> References: <1435677400-7630-1-git-send-email-mika.kuoppala@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id A8E576E4CB for ; Tue, 30 Jun 2015 09:58:19 -0700 (PDT) In-Reply-To: <1435677400-7630-1-git-send-email-mika.kuoppala@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Mika Kuoppala , intel-gfx@lists.freedesktop.org Cc: miku@iki.fi List-Id: intel-gfx@lists.freedesktop.org T24gNi8zMC8yMDE1IDQ6MTYgUE0sIE1pa2EgS3VvcHBhbGEgd3JvdGU6Cj4gTWFpbnRhaW4gYmFz ZSBwYWdlIGhhbmRsaW5nIGZ1bmN0aW9ucyBpbiBvcmRlciBvZgo+IGFsbG9jLCBmcmVlLCBpbml0 LiBObyBmdW5jdGlvbmFsIGNoYW5nZXMuCj4KPiB2Mjogcy9JbnRyb2R1Y2UvTWFpbnRhaW4gKE1p Y2hlbCkKPiB2MzogUmViYXNlCj4KPiBDYzogTWljaGVsIFRoaWVycnkgPG1pY2hlbC50aGllcnJ5 QGludGVsLmNvbT4KPiBTaWduZWQtb2ZmLWJ5OiBNaWthIEt1b3BwYWxhIDxtaWthLmt1b3BwYWxh QGludGVsLmNvbT4KPiBSZXZpZXdlZC1ieTogTWljaGVsIFRoaWVycnkgPG1pY2hlbC50aGllcnJ5 QGludGVsLmNvbT4gKHYyKQp2MyB0b28uCgo+IC0tLQo+ICAgZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9nZW1fZ3R0LmMgfCAxNjYgKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0t Cj4gICAxIGZpbGUgY2hhbmdlZCwgODMgaW5zZXJ0aW9ucygrKSwgODMgZGVsZXRpb25zKC0pCj4K PiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwo+IGluZGV4IDhjZmEzOTAuLjIzZjU4OTYg MTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKPiArKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwo+IEBAIC0zODQsMjQgKzM4NCw2 IEBAIHN0YXRpYyB2b2lkIGZpbGxfcGFnZV9kbWFfMzIoc3RydWN0IGRybV9kZXZpY2UgKmRldiwg c3RydWN0IGk5MTVfcGFnZV9kbWEgKnAsCj4gICAJZmlsbF9wYWdlX2RtYShkZXYsIHAsIHYpOwo+ ICAgfQo+Cj4gLXN0YXRpYyB2b2lkIGZyZWVfcHQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3Ry dWN0IGk5MTVfcGFnZV90YWJsZSAqcHQpCj4gLXsKPiAtCWNsZWFudXBfcHgoZGV2LCBwdCk7Cj4g LQlrZnJlZShwdC0+dXNlZF9wdGVzKTsKPiAtCWtmcmVlKHB0KTsKPiAtfQo+IC0KPiAtc3RhdGlj IHZvaWQgZ2VuOF9pbml0aWFsaXplX3B0KHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAo+ IC0JCQkgICAgICAgc3RydWN0IGk5MTVfcGFnZV90YWJsZSAqcHQpCj4gLXsKPiAtCWdlbjhfcHRl X3Qgc2NyYXRjaF9wdGU7Cj4gLQo+IC0Jc2NyYXRjaF9wdGUgPSBnZW44X3B0ZV9lbmNvZGUocHhf ZG1hKHZtLT5zY3JhdGNoX3BhZ2UpLAo+IC0JCQkJICAgICAgSTkxNV9DQUNIRV9MTEMsIHRydWUp Owo+IC0KPiAtCWZpbGxfcHgodm0tPmRldiwgcHQsIHNjcmF0Y2hfcHRlKTsKPiAtfQo+IC0KPiAg IHN0YXRpYyBzdHJ1Y3QgaTkxNV9wYWdlX3RhYmxlICphbGxvY19wdChzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2KQo+ICAgewo+ICAgCXN0cnVjdCBpOTE1X3BhZ2VfdGFibGUgKnB0Owo+IEBAIC00MzMs MTMgKzQxNSwzNSBAQCBmYWlsX2JpdG1hcDoKPiAgIAlyZXR1cm4gRVJSX1BUUihyZXQpOwo+ICAg fQo+Cj4gLXN0YXRpYyB2b2lkIGZyZWVfcGQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0 IGk5MTVfcGFnZV9kaXJlY3RvcnkgKnBkKQo+ICtzdGF0aWMgdm9pZCBmcmVlX3B0KHN0cnVjdCBk cm1fZGV2aWNlICpkZXYsIHN0cnVjdCBpOTE1X3BhZ2VfdGFibGUgKnB0KQo+ICAgewo+IC0JaWYg KHB4X3BhZ2UocGQpKSB7Cj4gLQkJY2xlYW51cF9weChkZXYsIHBkKTsKPiAtCQlrZnJlZShwZC0+ dXNlZF9wZGVzKTsKPiAtCQlrZnJlZShwZCk7Cj4gLQl9Cj4gKwljbGVhbnVwX3B4KGRldiwgcHQp Owo+ICsJa2ZyZWUocHQtPnVzZWRfcHRlcyk7Cj4gKwlrZnJlZShwdCk7Cj4gK30KPiArCj4gK3N0 YXRpYyB2b2lkIGdlbjhfaW5pdGlhbGl6ZV9wdChzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2 bSwKPiArCQkJICAgICAgIHN0cnVjdCBpOTE1X3BhZ2VfdGFibGUgKnB0KQo+ICt7Cj4gKwlnZW44 X3B0ZV90IHNjcmF0Y2hfcHRlOwo+ICsKPiArCXNjcmF0Y2hfcHRlID0gZ2VuOF9wdGVfZW5jb2Rl KHB4X2RtYSh2bS0+c2NyYXRjaF9wYWdlKSwKPiArCQkJCSAgICAgIEk5MTVfQ0FDSEVfTExDLCB0 cnVlKTsKPiArCj4gKwlmaWxsX3B4KHZtLT5kZXYsIHB0LCBzY3JhdGNoX3B0ZSk7Cj4gK30KPiAr Cj4gK3N0YXRpYyB2b2lkIGdlbjZfaW5pdGlhbGl6ZV9wdChzdHJ1Y3QgaTkxNV9hZGRyZXNzX3Nw YWNlICp2bSwKPiArCQkJICAgICAgIHN0cnVjdCBpOTE1X3BhZ2VfdGFibGUgKnB0KQo+ICt7Cj4g KwlnZW42X3B0ZV90IHNjcmF0Y2hfcHRlOwo+ICsKPiArCVdBUk5fT04ocHhfZG1hKHZtLT5zY3Jh dGNoX3BhZ2UpID09IDApOwo+ICsKPiArCXNjcmF0Y2hfcHRlID0gdm0tPnB0ZV9lbmNvZGUocHhf ZG1hKHZtLT5zY3JhdGNoX3BhZ2UpLAo+ICsJCQkJICAgICBJOTE1X0NBQ0hFX0xMQywgdHJ1ZSwg MCk7Cj4gKwo+ICsJZmlsbDMyX3B4KHZtLT5kZXYsIHB0LCBzY3JhdGNoX3B0ZSk7Cj4gICB9Cj4K PiAgIHN0YXRpYyBzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeSAqYWxsb2NfcGQoc3RydWN0IGRy bV9kZXZpY2UgKmRldikKPiBAQCAtNDcwLDYgKzQ3NCw2MSBAQCBmYWlsX2JpdG1hcDoKPiAgIAly ZXR1cm4gRVJSX1BUUihyZXQpOwo+ICAgfQo+Cj4gK3N0YXRpYyB2b2lkIGZyZWVfcGQoc3RydWN0 IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGk5MTVfcGFnZV9kaXJlY3RvcnkgKnBkKQo+ICt7Cj4g KwlpZiAocHhfcGFnZShwZCkpIHsKPiArCQljbGVhbnVwX3B4KGRldiwgcGQpOwo+ICsJCWtmcmVl KHBkLT51c2VkX3BkZXMpOwo+ICsJCWtmcmVlKHBkKTsKPiArCX0KPiArfQo+ICsKPiArc3RhdGlj IHZvaWQgZ2VuOF9pbml0aWFsaXplX3BkKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAo+ ICsJCQkgICAgICAgc3RydWN0IGk5MTVfcGFnZV9kaXJlY3RvcnkgKnBkKQo+ICt7Cj4gKwlnZW44 X3BkZV90IHNjcmF0Y2hfcGRlOwo+ICsKPiArCXNjcmF0Y2hfcGRlID0gZ2VuOF9wZGVfZW5jb2Rl KHB4X2RtYSh2bS0+c2NyYXRjaF9wdCksIEk5MTVfQ0FDSEVfTExDKTsKPiArCj4gKwlmaWxsX3B4 KHZtLT5kZXYsIHBkLCBzY3JhdGNoX3BkZSk7Cj4gK30KPiArCj4gK3N0YXRpYyBpbnQgYWxsb2Nf c2NyYXRjaF9wYWdlKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtKQo+ICt7Cj4gKwlzdHJ1 Y3QgaTkxNV9wYWdlX3NjcmF0Y2ggKnNwOwo+ICsJaW50IHJldDsKPiArCj4gKwlXQVJOX09OKHZt LT5zY3JhdGNoX3BhZ2UpOwo+ICsKPiArCXNwID0ga3phbGxvYyhzaXplb2YoKnNwKSwgR0ZQX0tF Uk5FTCk7Cj4gKwlpZiAoc3AgPT0gTlVMTCkKPiArCQlyZXR1cm4gLUVOT01FTTsKPiArCj4gKwly ZXQgPSBfX3NldHVwX3BhZ2VfZG1hKHZtLT5kZXYsIHB4X2Jhc2Uoc3ApLCBHRlBfRE1BMzIgfCBf X0dGUF9aRVJPKTsKPiArCWlmIChyZXQpIHsKPiArCQlrZnJlZShzcCk7Cj4gKwkJcmV0dXJuIHJl dDsKPiArCX0KPiArCj4gKwlzZXRfcGFnZXNfdWMocHhfcGFnZShzcCksIDEpOwo+ICsKPiArCXZt LT5zY3JhdGNoX3BhZ2UgPSBzcDsKPiArCj4gKwlyZXR1cm4gMDsKPiArfQo+ICsKPiArc3RhdGlj IHZvaWQgZnJlZV9zY3JhdGNoX3BhZ2Uoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0pCj4g K3sKPiArCXN0cnVjdCBpOTE1X3BhZ2Vfc2NyYXRjaCAqc3AgPSB2bS0+c2NyYXRjaF9wYWdlOwo+ ICsKPiArCXNldF9wYWdlc193YihweF9wYWdlKHNwKSwgMSk7Cj4gKwo+ICsJY2xlYW51cF9weCh2 bS0+ZGV2LCBzcCk7Cj4gKwlrZnJlZShzcCk7Cj4gKwo+ICsJdm0tPnNjcmF0Y2hfcGFnZSA9IE5V TEw7Cj4gK30KPiArCj4gICAvKiBCcm9hZHdlbGwgUGFnZSBEaXJlY3RvcnkgUG9pbnRlciBEZXNj cmlwdG9ycyAqLwo+ICAgc3RhdGljIGludCBnZW44X3dyaXRlX3BkcChzdHJ1Y3QgZHJtX2k5MTVf Z2VtX3JlcXVlc3QgKnJlcSwKPiAgIAkJCSAgdW5zaWduZWQgZW50cnksCj4gQEAgLTYwOSwxNiAr NjY4LDYgQEAgc3RhdGljIHZvaWQgZ2VuOF9wcGd0dF9pbnNlcnRfZW50cmllcyhzdHJ1Y3QgaTkx NV9hZGRyZXNzX3NwYWNlICp2bSwKPiAgIAkJa3VubWFwX3B4KHBwZ3R0LCBwdF92YWRkcik7Cj4g ICB9Cj4KPiAtc3RhdGljIHZvaWQgZ2VuOF9pbml0aWFsaXplX3BkKHN0cnVjdCBpOTE1X2FkZHJl c3Nfc3BhY2UgKnZtLAo+IC0JCQkgICAgICAgc3RydWN0IGk5MTVfcGFnZV9kaXJlY3RvcnkgKnBk KQo+IC17Cj4gLQlnZW44X3BkZV90IHNjcmF0Y2hfcGRlOwo+IC0KPiAtCXNjcmF0Y2hfcGRlID0g Z2VuOF9wZGVfZW5jb2RlKHB4X2RtYSh2bS0+c2NyYXRjaF9wdCksIEk5MTVfQ0FDSEVfTExDKTsK PiAtCj4gLQlmaWxsX3B4KHZtLT5kZXYsIHBkLCBzY3JhdGNoX3BkZSk7Cj4gLX0KPiAtCj4gICBz dGF0aWMgdm9pZCBnZW44X2ZyZWVfcGFnZV90YWJsZXMoc3RydWN0IGRybV9kZXZpY2UgKmRldiwK PiAgIAkJCQkgIHN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5ICpwZCkKPiAgIHsKPiBAQCAtMTI3 NCwxOSArMTMyMyw2IEBAIHN0YXRpYyB2b2lkIGdlbjZfcHBndHRfaW5zZXJ0X2VudHJpZXMoc3Ry dWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCj4gICAJCWt1bm1hcF9weChwcGd0dCwgcHRfdmFk ZHIpOwo+ICAgfQo+Cj4gLXN0YXRpYyB2b2lkIGdlbjZfaW5pdGlhbGl6ZV9wdChzdHJ1Y3QgaTkx NV9hZGRyZXNzX3NwYWNlICp2bSwKPiAtCQkJICAgICAgIHN0cnVjdCBpOTE1X3BhZ2VfdGFibGUg KnB0KQo+IC17Cj4gLQlnZW42X3B0ZV90IHNjcmF0Y2hfcHRlOwo+IC0KPiAtCVdBUk5fT04ocHhf ZG1hKHZtLT5zY3JhdGNoX3BhZ2UpID09IDApOwo+IC0KPiAtCXNjcmF0Y2hfcHRlID0gdm0tPnB0 ZV9lbmNvZGUocHhfZG1hKHZtLT5zY3JhdGNoX3BhZ2UpLAo+IC0JCQkJICAgICBJOTE1X0NBQ0hF X0xMQywgdHJ1ZSwgMCk7Cj4gLQo+IC0JZmlsbDMyX3B4KHZtLT5kZXYsIHB0LCBzY3JhdGNoX3B0 ZSk7Cj4gLX0KPiAtCj4gICBzdGF0aWMgaW50IGdlbjZfYWxsb2NfdmFfcmFuZ2Uoc3RydWN0IGk5 MTVfYWRkcmVzc19zcGFjZSAqdm0sCj4gICAJCQkgICAgICAgdWludDY0X3Qgc3RhcnRfaW4sIHVp bnQ2NF90IGxlbmd0aF9pbikKPiAgIHsKPiBAQCAtMjEyNiw0MiArMjE2Miw2IEBAIHZvaWQgaTkx NV9nbG9iYWxfZ3R0X2NsZWFudXAoc3RydWN0IGRybV9kZXZpY2UgKmRldikKPiAgIAl2bS0+Y2xl YW51cCh2bSk7Cj4gICB9Cj4KPiAtc3RhdGljIGludCBhbGxvY19zY3JhdGNoX3BhZ2Uoc3RydWN0 IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0pCj4gLXsKPiAtCXN0cnVjdCBpOTE1X3BhZ2Vfc2NyYXRj aCAqc3A7Cj4gLQlpbnQgcmV0Owo+IC0KPiAtCVdBUk5fT04odm0tPnNjcmF0Y2hfcGFnZSk7Cj4g LQo+IC0Jc3AgPSBremFsbG9jKHNpemVvZigqc3ApLCBHRlBfS0VSTkVMKTsKPiAtCWlmIChzcCA9 PSBOVUxMKQo+IC0JCXJldHVybiAtRU5PTUVNOwo+IC0KPiAtCXJldCA9IF9fc2V0dXBfcGFnZV9k bWEodm0tPmRldiwgcHhfYmFzZShzcCksIEdGUF9ETUEzMiB8IF9fR0ZQX1pFUk8pOwo+IC0JaWYg KHJldCkgewo+IC0JCWtmcmVlKHNwKTsKPiAtCQlyZXR1cm4gcmV0Owo+IC0JfQo+IC0KPiAtCXNl dF9wYWdlc191YyhweF9wYWdlKHNwKSwgMSk7Cj4gLQo+IC0Jdm0tPnNjcmF0Y2hfcGFnZSA9IHNw Owo+IC0KPiAtCXJldHVybiAwOwo+IC19Cj4gLQo+IC1zdGF0aWMgdm9pZCBmcmVlX3NjcmF0Y2hf cGFnZShzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSkKPiAtewo+IC0Jc3RydWN0IGk5MTVf cGFnZV9zY3JhdGNoICpzcCA9IHZtLT5zY3JhdGNoX3BhZ2U7Cj4gLQo+IC0Jc2V0X3BhZ2VzX3di KHB4X3BhZ2Uoc3ApLCAxKTsKPiAtCj4gLQljbGVhbnVwX3B4KHZtLT5kZXYsIHNwKTsKPiAtCWtm cmVlKHNwKTsKPiAtCj4gLQl2bS0+c2NyYXRjaF9wYWdlID0gTlVMTDsKPiAtfQo+IC0KPiAgIHN0 YXRpYyB1bnNpZ25lZCBpbnQgZ2VuNl9nZXRfdG90YWxfZ3R0X3NpemUodTE2IHNuYl9nbWNoX2N0 bCkKPiAgIHsKPiAgIAlzbmJfZ21jaF9jdGwgPj49IFNOQl9HTUNIX0dHTVNfU0hJRlQ7Cj4KX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1h aWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK