From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mika Kuoppala Subject: Re: [PATCH 17/17] drm/i915: Move i915_get_ggtt_vma_pages into ggtt_bind_vma Date: Tue, 21 Apr 2015 16:36:55 +0300 Message-ID: <87zj61zjpk.fsf@gaia.fi.intel.com> References: <1429025727-15380-1-git-send-email-daniel.vetter@ffwll.ch> <1429025727-15380-18-git-send-email-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 9AD046E5BD for ; Tue, 21 Apr 2015 06:37:11 -0700 (PDT) In-Reply-To: <1429025727-15380-18-git-send-email-daniel.vetter@ffwll.ch> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Intel Graphics Development Cc: Daniel Vetter , Daniel Vetter List-Id: intel-gfx@lists.freedesktop.org RGFuaWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBmZndsbC5jaD4gd3JpdGVzOgoKPiBXZSBoYXZl IHRoaXMgbmVhdCBhYnN0cmFjdGlvbiBiZXR3ZWVuIHBwZ3R0IGFuZCBnZ3R0IGZvciAodW4pYmlu ZF92bWEKPiBhbmQgZGlkbid0IGVuZCB1cCB1c2luZyBpdCByZWFsbHkuIFdoYXQgYSBzaGFtZSwg c28gZml4IHRoaXMgYW5kIG1ha2UKPiB0aGUgLT5iaW5kX3ZtYSBob29rIGEgYml0IG1vcmUgdXNl ZnVsLgo+Cj4gU2lnbmVkLW9mZi1ieTogRGFuaWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBpbnRl bC5jb20+CgpUaGlzIG9uZSBJIGhhZCBwcm9ibGVtcyB3aXRoIGFwcGx5aW5nLiBCdXQgaXQgbG9v a3Mgc2ltcGxlIGVub3VnaC4KClBhdGNoZXMgMTMtMTcsClJldmlld2VkLWJ5OiBNaWthIEt1b3Bw YWxhIDxtaWthLmt1b3BwYWxhQGludGVsLmNvbT4KCldpdGggMTIvMTcgSSBkb24ndCB5ZXQgdW5k ZXJzdGFuZCBhbGwgdGhlIGltcGxpY2F0aW9ucyBzbyBJIGxlZnQKdGhhdCBvdXQuCgotTWlrYQoK Cj4gLS0tCj4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jIHwgNDEgKysrKysr KysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLQo+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbV9ndHQuaCB8ICA2ICsrKy0tLQo+ICAyIGZpbGVzIGNoYW5nZWQsIDI3IGluc2VydGlv bnMoKyksIDIwIGRlbGV0aW9ucygtKQo+Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtX2d0dC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMK PiBpbmRleCA0NTg4MTliOTlhMGIuLjc2M2MxN2RkMjExOCAxMDA2NDQKPiAtLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtX2d0dC5jCj4gQEAgLTkyLDYgKzkyLDkgQEAKPiAgICoKPiAgICovCj4gIAo+ICtz dGF0aWMgaW50Cj4gK2k5MTVfZ2V0X2dndHRfdm1hX3BhZ2VzKHN0cnVjdCBpOTE1X3ZtYSAqdm1h KTsKPiArCj4gIGNvbnN0IHN0cnVjdCBpOTE1X2dndHRfdmlldyBpOTE1X2dndHRfdmlld19ub3Jt YWw7Cj4gIGNvbnN0IHN0cnVjdCBpOTE1X2dndHRfdmlldyBpOTE1X2dndHRfdmlld19yb3RhdGVk ID0gewo+ICAgICAgICAgIC50eXBlID0gSTkxNV9HR1RUX1ZJRVdfUk9UQVRFRAo+IEBAIC0xNDMs OSArMTQ2LDkgQEAgc3RhdGljIGludCBzYW5pdGl6ZV9lbmFibGVfcHBndHQoc3RydWN0IGRybV9k ZXZpY2UgKmRldiwgaW50IGVuYWJsZV9wcGd0dCkKPiAgCQlyZXR1cm4gaGFzX2FsaWFzaW5nX3Bw Z3R0ID8gMSA6IDA7Cj4gIH0KPiAgCj4gLXN0YXRpYyB2b2lkIHBwZ3R0X2JpbmRfdm1hKHN0cnVj dCBpOTE1X3ZtYSAqdm1hLAo+IC0JCQkgICBlbnVtIGk5MTVfY2FjaGVfbGV2ZWwgY2FjaGVfbGV2 ZWwsCj4gLQkJCSAgIHUzMiB1bnVzZWQpCj4gK3N0YXRpYyBpbnQgcHBndHRfYmluZF92bWEoc3Ry dWN0IGk5MTVfdm1hICp2bWEsCj4gKwkJCSAgZW51bSBpOTE1X2NhY2hlX2xldmVsIGNhY2hlX2xl dmVsLAo+ICsJCQkgIHUzMiB1bnVzZWQpCj4gIHsKPiAgCXUzMiBwdGVfZmxhZ3MgPSAwOwo+ICAK PiBAQCAtMTU1LDYgKzE1OCw4IEBAIHN0YXRpYyB2b2lkIHBwZ3R0X2JpbmRfdm1hKHN0cnVjdCBp OTE1X3ZtYSAqdm1hLAo+ICAKPiAgCXZtYS0+dm0tPmluc2VydF9lbnRyaWVzKHZtYS0+dm0sIHZt YS0+b2JqLT5wYWdlcywgdm1hLT5ub2RlLnN0YXJ0LAo+ICAJCQkJY2FjaGVfbGV2ZWwsIHB0ZV9m bGFncyk7Cj4gKwo+ICsJcmV0dXJuIDA7Cj4gIH0KPiAgCj4gIHN0YXRpYyB2b2lkIHBwZ3R0X3Vu YmluZF92bWEoc3RydWN0IGk5MTVfdm1hICp2bWEpCj4gQEAgLTE4OTgsMjIgKzE5MDMsMjYgQEAg c3RhdGljIHZvaWQgaTkxNV9nZ3R0X2NsZWFyX3JhbmdlKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3Bh Y2UgKnZtLAo+ICAJaW50ZWxfZ3R0X2NsZWFyX3JhbmdlKGZpcnN0X2VudHJ5LCBudW1fZW50cmll cyk7Cj4gIH0KPiAgCj4gLXN0YXRpYyB2b2lkIGdndHRfYmluZF92bWEoc3RydWN0IGk5MTVfdm1h ICp2bWEsCj4gLQkJCSAgZW51bSBpOTE1X2NhY2hlX2xldmVsIGNhY2hlX2xldmVsLAo+IC0JCQkg IHUzMiBmbGFncykKPiArc3RhdGljIGludCBnZ3R0X2JpbmRfdm1hKHN0cnVjdCBpOTE1X3ZtYSAq dm1hLAo+ICsJCQkgZW51bSBpOTE1X2NhY2hlX2xldmVsIGNhY2hlX2xldmVsLAo+ICsJCQkgdTMy IGZsYWdzKQo+ICB7Cj4gIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gdm1hLT52bS0+ZGV2Owo+ ICAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsK PiAgCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmogPSB2bWEtPm9iajsKPiAgCXN0cnVj dCBzZ190YWJsZSAqcGFnZXMgPSBvYmotPnBhZ2VzOwo+ICAJdTMyIHB0ZV9mbGFncyA9IDA7Cj4g KwlpbnQgcmV0Owo+ICsKPiArCXJldCA9IGk5MTVfZ2V0X2dndHRfdm1hX3BhZ2VzKHZtYSk7Cj4g KwlpZiAocmV0KQo+ICsJCXJldHVybiByZXQ7Cj4gKwlwYWdlcyA9IHZtYS0+Z2d0dF92aWV3LnBh Z2VzOwo+ICAKPiAgCS8qIEN1cnJlbnRseSBhcHBsaWNhYmxlIG9ubHkgdG8gVkxWICovCj4gIAlp ZiAob2JqLT5ndF9ybykKPiAgCQlwdGVfZmxhZ3MgfD0gUFRFX1JFQURfT05MWTsKPiAgCj4gLQlp ZiAoaTkxNV9pc19nZ3R0KHZtYS0+dm0pKQo+IC0JCXBhZ2VzID0gdm1hLT5nZ3R0X3ZpZXcucGFn ZXM7Cj4gIAo+ICAJaWYgKCFkZXZfcHJpdi0+bW0uYWxpYXNpbmdfcHBndHQgfHwgZmxhZ3MgJiBH TE9CQUxfQklORCkgewo+ICAJCXZtYS0+dm0tPmluc2VydF9lbnRyaWVzKHZtYS0+dm0sIHBhZ2Vz LAo+IEBAIC0xOTI5LDYgKzE5MzgsOCBAQCBzdGF0aWMgdm9pZCBnZ3R0X2JpbmRfdm1hKHN0cnVj dCBpOTE1X3ZtYSAqdm1hLAo+ICAJCQkJCSAgICB2bWEtPm5vZGUuc3RhcnQsCj4gIAkJCQkJICAg IGNhY2hlX2xldmVsLCBwdGVfZmxhZ3MpOwo+ICAJfQo+ICsKPiArCXJldHVybiAwOwo+ICB9Cj4g IAo+ICBzdGF0aWMgdm9pZCBnZ3R0X3VuYmluZF92bWEoc3RydWN0IGk5MTVfdm1hICp2bWEpCj4g QEAgLTI3NDksNyArMjc2MCw3IEBAIGVycl9zdF9hbGxvYzoKPiAgCXJldHVybiBFUlJfUFRSKHJl dCk7Cj4gIH0KPiAgCj4gLXN0YXRpYyBpbmxpbmUgaW50Cj4gK3N0YXRpYyBpbnQKPiAgaTkxNV9n ZXRfZ2d0dF92bWFfcGFnZXMoc3RydWN0IGk5MTVfdm1hICp2bWEpCj4gIHsKPiAgCWludCByZXQg PSAwOwo+IEBAIC0yNzkzLDggKzI4MDQsOCBAQCBpOTE1X2dldF9nZ3R0X3ZtYV9wYWdlcyhzdHJ1 Y3QgaTkxNV92bWEgKnZtYSkKPiAgaW50IGk5MTVfdm1hX2JpbmQoc3RydWN0IGk5MTVfdm1hICp2 bWEsIGVudW0gaTkxNV9jYWNoZV9sZXZlbCBjYWNoZV9sZXZlbCwKPiAgCQkgIHUzMiBmbGFncykK PiAgewo+ICsJaW50IHJldCA9IDA7Cj4gIAl1MzIgYmluZF9mbGFncyA9IDA7Cj4gLQlpbnQgcmV0 Owo+ICAKPiAgCWlmICh2bWEtPnZtLT5hbGxvY2F0ZV92YV9yYW5nZSkgewo+ICAJCXRyYWNlX2k5 MTVfdmFfYWxsb2Modm1hLT52bSwgdm1hLT5ub2RlLnN0YXJ0LAo+IEBAIC0yODA4LDEyICsyODE5 LDYgQEAgaW50IGk5MTVfdm1hX2JpbmQoc3RydWN0IGk5MTVfdm1hICp2bWEsIGVudW0gaTkxNV9j YWNoZV9sZXZlbCBjYWNoZV9sZXZlbCwKPiAgCQkJcmV0dXJuIHJldDsKPiAgCX0KPiAgCj4gLQlp ZiAoaTkxNV9pc19nZ3R0KHZtYS0+dm0pKSB7Cj4gLQkJcmV0ID0gaTkxNV9nZXRfZ2d0dF92bWFf cGFnZXModm1hKTsKPiAtCQlpZiAocmV0KQo+IC0JCQlyZXR1cm4gMDsKPiAtCX0KPiAtCj4gIAlp ZiAoZmxhZ3MgJiBQSU5fR0xPQkFMKQo+ICAJCWJpbmRfZmxhZ3MgfD0gR0xPQkFMX0JJTkQ7Cj4g IAlpZiAoZmxhZ3MgJiBQSU5fRVhFQ0JVRikKPiBAQCAtMjgyNSw3ICsyODMwLDkgQEAgaW50IGk5 MTVfdm1hX2JpbmQoc3RydWN0IGk5MTVfdm1hICp2bWEsIGVudW0gaTkxNV9jYWNoZV9sZXZlbCBj YWNoZV9sZXZlbCwKPiAgCQliaW5kX2ZsYWdzICY9IH52bWEtPmJvdW5kOwo+ICAKPiAgCWlmIChi aW5kX2ZsYWdzKQo+IC0JCXZtYS0+dm0tPmJpbmRfdm1hKHZtYSwgY2FjaGVfbGV2ZWwsIGJpbmRf ZmxhZ3MpOwo+ICsJCXJldCA9IHZtYS0+dm0tPmJpbmRfdm1hKHZtYSwgY2FjaGVfbGV2ZWwsIGJp bmRfZmxhZ3MpOwo+ICsJaWYgKHJldCkKPiArCQlyZXR1cm4gcmV0Owo+ICAKPiAgCXZtYS0+Ym91 bmQgfD0gYmluZF9mbGFnczsKPiAgCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtX2d0dC5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmgKPiBp bmRleCBmYjBhMDRhYTUzNjMuLjRlNmNhYzU3NWNkOCAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaAo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtX2d0dC5oCj4gQEAgLTI3OCw5ICsyNzgsOSBAQCBzdHJ1Y3QgaTkxNV9hZGRyZXNzX3Nw YWNlIHsKPiAgCSAqIHNldHRpbmcgdGhlIHZhbGlkIFBURSBlbnRyaWVzIHRvIGEgcmVzZXJ2ZWQg c2NyYXRjaCBwYWdlLiAqLwo+ICAJdm9pZCAoKnVuYmluZF92bWEpKHN0cnVjdCBpOTE1X3ZtYSAq dm1hKTsKPiAgCS8qIE1hcCBhbiBvYmplY3QgaW50byBhbiBhZGRyZXNzIHNwYWNlIHdpdGggdGhl IGdpdmVuIGNhY2hlIGZsYWdzLiAqLwo+IC0Jdm9pZCAoKmJpbmRfdm1hKShzdHJ1Y3QgaTkxNV92 bWEgKnZtYSwKPiAtCQkJIGVudW0gaTkxNV9jYWNoZV9sZXZlbCBjYWNoZV9sZXZlbCwKPiAtCQkJ IHUzMiBmbGFncyk7Cj4gKwlpbnQgKCpiaW5kX3ZtYSkoc3RydWN0IGk5MTVfdm1hICp2bWEsCj4g KwkJCWVudW0gaTkxNV9jYWNoZV9sZXZlbCBjYWNoZV9sZXZlbCwKPiArCQkJdTMyIGZsYWdzKTsK PiAgfTsKPiAgCj4gIC8qIFRoZSBHcmFwaGljcyBUcmFuc2xhdGlvbiBUYWJsZSBpcyB0aGUgd2F5 IGluIHdoaWNoIEdFTiBoYXJkd2FyZSB0cmFuc2xhdGVzIGEKPiAtLSAKPiAyLjEuMAo+Cj4gX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KPiBJbnRlbC1nZngg bWFpbGluZyBsaXN0Cj4gSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwo+IGh0dHA6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcg bGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVz a3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK