From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michel Thierry Subject: Re: [PATCH 09/21] drm/i915/gtt: Rename unmap_and_free_px to free_px Date: Mon, 22 Jun 2015 15:09:27 +0100 Message-ID: <55881717.5030706@intel.com> References: <556DAAB0.40108@intel.com> <1434044935-22615-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 mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 8B1B66E7C6 for ; Mon, 22 Jun 2015 07:09:29 -0700 (PDT) In-Reply-To: <1434044935-22615-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 List-Id: intel-gfx@lists.freedesktop.org T24gNi8xMS8yMDE1IDY6NDggUE0sIE1pa2EgS3VvcHBhbGEgd3JvdGU6Cj4gQWxsIHRoZSBwYWdp bmcgc3RydWN0dXJlcyBhcmUgbm93IHNpbWlsYXIgYW5kIG1hcHBlZCBmb3IKPiBkbWEuIFRoZSB1 bm1hcHBpbmcgaXMgdGFrZW4gY2FyZSBvZiBieSBjb21tb24gYWNjZXNzb3JzLCBzbwo+IGRvbid0 IG92ZXJsb2FkIHRoZSByZWFkZXIgd2l0aCBzdWNoIGRldGFpbHMuCj4KPiB2MjogQmUgY29uc2lz dGVudCB3aXRoIGdvdG8gbGFiZWxzIChNaWNoZWwpCgpSZXZpZXdlZC1ieTogTWljaGVsIFRoaWVy cnkgPG1pY2hlbC50aGllcnJ5QGludGVsLmNvbT4KCj4KPiBTaWduZWQtb2ZmLWJ5OiBNaWthIEt1 b3BwYWxhIDxtaWthLmt1b3BwYWxhQGludGVsLmNvbT4KPiAtLS0KPiAgIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtX2d0dC5jIHwgNDAgKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0t LS0tLS0tLQo+ICAgMSBmaWxlIGNoYW5nZWQsIDE5IGluc2VydGlvbnMoKyksIDIxIGRlbGV0aW9u cygtKQo+Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKPiBpbmRleCA2NWVlOTJmLi4w NDhjNzAxIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5j Cj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKPiBAQCAtMzMwLDgg KzMzMCw3IEBAIHN0YXRpYyB2b2lkIGNsZWFudXBfcGFnZV9kbWEoc3RydWN0IGRybV9kZXZpY2Ug KmRldiwgc3RydWN0IGk5MTVfcGFnZV9kbWEgKnApCj4gICAJbWVtc2V0KHAsIDAsIHNpemVvZigq cCkpOwo+ICAgfQo+Cj4gLXN0YXRpYyB2b2lkIHVubWFwX2FuZF9mcmVlX3B0KHN0cnVjdCBpOTE1 X3BhZ2VfdGFibGUgKnB0LAo+IC0JCQkgICAgICAgc3RydWN0IGRybV9kZXZpY2UgKmRldikKPiAr c3RhdGljIHZvaWQgZnJlZV9wdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgaTkxNV9w YWdlX3RhYmxlICpwdCkKPiAgIHsKPiAgIAljbGVhbnVwX3BhZ2VfZG1hKGRldiwgJnB0LT5iYXNl KTsKPiAgIAlrZnJlZShwdC0+dXNlZF9wdGVzKTsKPiBAQCAtMzg3LDggKzM4Niw3IEBAIGZhaWxf Yml0bWFwOgo+ICAgCXJldHVybiBFUlJfUFRSKHJldCk7Cj4gICB9Cj4KPiAtc3RhdGljIHZvaWQg dW5tYXBfYW5kX2ZyZWVfcGQoc3RydWN0IGk5MTVfcGFnZV9kaXJlY3RvcnkgKnBkLAo+IC0JCQkg ICAgICBzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQo+ICtzdGF0aWMgdm9pZCBmcmVlX3BkKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5ICpwZCkKPiAgIHsK PiAgIAlpZiAocGQtPmJhc2UucGFnZSkgewo+ICAgCQljbGVhbnVwX3BhZ2VfZG1hKGRldiwgJnBk LT5iYXNlKTsKPiBAQCAtNDA5LDE3ICs0MDcsMTcgQEAgc3RhdGljIHN0cnVjdCBpOTE1X3BhZ2Vf ZGlyZWN0b3J5ICphbGxvY19wZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQo+ICAgCXBkLT51c2Vk X3BkZXMgPSBrY2FsbG9jKEJJVFNfVE9fTE9OR1MoSTkxNV9QREVTKSwKPiAgIAkJCQlzaXplb2Yo KnBkLT51c2VkX3BkZXMpLCBHRlBfS0VSTkVMKTsKPiAgIAlpZiAoIXBkLT51c2VkX3BkZXMpCj4g LQkJZ290byBmcmVlX3BkOwo+ICsJCWdvdG8gZmFpbF9iaXRtYXA7Cj4KPiAgIAlyZXQgPSBzZXR1 cF9wYWdlX2RtYShkZXYsICZwZC0+YmFzZSk7Cj4gICAJaWYgKHJldCkKPiAtCQlnb3RvIGZyZWVf Yml0bWFwOwo+ICsJCWdvdG8gZmFpbF9wYWdlX207Cj4KPiAgIAlyZXR1cm4gcGQ7Cj4KPiAtZnJl ZV9iaXRtYXA6Cj4gK2ZhaWxfcGFnZV9tOgo+ICAgCWtmcmVlKHBkLT51c2VkX3BkZXMpOwo+IC1m cmVlX3BkOgo+ICtmYWlsX2JpdG1hcDoKPiAgIAlrZnJlZShwZCk7Cj4KPiAgIAlyZXR1cm4gRVJS X1BUUihyZXQpOwo+IEBAIC02MTQsNyArNjEyLDcgQEAgc3RhdGljIHZvaWQgZ2VuOF9mcmVlX3Bh Z2VfdGFibGVzKHN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5ICpwZCwgc3RydWN0IGRybV9kZXYK PiAgIAkJaWYgKFdBUk5fT04oIXBkLT5wYWdlX3RhYmxlW2ldKSkKPiAgIAkJCWNvbnRpbnVlOwo+ Cj4gLQkJdW5tYXBfYW5kX2ZyZWVfcHQocGQtPnBhZ2VfdGFibGVbaV0sIGRldik7Cj4gKwkJZnJl ZV9wdChkZXYsIHBkLT5wYWdlX3RhYmxlW2ldKTsKPiAgIAkJcGQtPnBhZ2VfdGFibGVbaV0gPSBO VUxMOwo+ICAgCX0KPiAgIH0KPiBAQCAtNjMwLDExICs2MjgsMTEgQEAgc3RhdGljIHZvaWQgZ2Vu OF9wcGd0dF9jbGVhbnVwKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtKQo+ICAgCQkJY29u dGludWU7Cj4KPiAgIAkJZ2VuOF9mcmVlX3BhZ2VfdGFibGVzKHBwZ3R0LT5wZHAucGFnZV9kaXJl Y3RvcnlbaV0sIHBwZ3R0LT5iYXNlLmRldik7Cj4gLQkJdW5tYXBfYW5kX2ZyZWVfcGQocHBndHQt PnBkcC5wYWdlX2RpcmVjdG9yeVtpXSwgcHBndHQtPmJhc2UuZGV2KTsKPiArCQlmcmVlX3BkKHBw Z3R0LT5iYXNlLmRldiwgcHBndHQtPnBkcC5wYWdlX2RpcmVjdG9yeVtpXSk7Cj4gICAJfQo+Cj4g LQl1bm1hcF9hbmRfZnJlZV9wZChwcGd0dC0+c2NyYXRjaF9wZCwgcHBndHQtPmJhc2UuZGV2KTsK PiAtCXVubWFwX2FuZF9mcmVlX3B0KHBwZ3R0LT5zY3JhdGNoX3B0LCBwcGd0dC0+YmFzZS5kZXYp Owo+ICsJZnJlZV9wZChwcGd0dC0+YmFzZS5kZXYsIHBwZ3R0LT5zY3JhdGNoX3BkKTsKPiArCWZy ZWVfcHQocHBndHQtPmJhc2UuZGV2LCBwcGd0dC0+c2NyYXRjaF9wdCk7Cj4gICB9Cj4KPiAgIC8q Kgo+IEBAIC02ODcsNyArNjg1LDcgQEAgc3RhdGljIGludCBnZW44X3BwZ3R0X2FsbG9jX3BhZ2V0 YWJzKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwKPgo+ICAgdW53aW5kX291dDoKPiAgIAlm b3JfZWFjaF9zZXRfYml0KHBkZSwgbmV3X3B0cywgSTkxNV9QREVTKQo+IC0JCXVubWFwX2FuZF9m cmVlX3B0KHBkLT5wYWdlX3RhYmxlW3BkZV0sIGRldik7Cj4gKwkJZnJlZV9wdChkZXYsIHBkLT5w YWdlX3RhYmxlW3BkZV0pOwo+Cj4gICAJcmV0dXJuIC1FTk9NRU07Cj4gICB9Cj4gQEAgLTc0NSw3 ICs3NDMsNyBAQCBzdGF0aWMgaW50IGdlbjhfcHBndHRfYWxsb2NfcGFnZV9kaXJlY3Rvcmllcyhz dHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQsCj4KPiAgIHVud2luZF9vdXQ6Cj4gICAJZm9yX2Vh Y2hfc2V0X2JpdChwZHBlLCBuZXdfcGRzLCBHRU44X0xFR0FDWV9QRFBFUykKPiAtCQl1bm1hcF9h bmRfZnJlZV9wZChwZHAtPnBhZ2VfZGlyZWN0b3J5W3BkcGVdLCBkZXYpOwo+ICsJCWZyZWVfcGQo ZGV2LCBwZHAtPnBhZ2VfZGlyZWN0b3J5W3BkcGVdKTsKPgo+ICAgCXJldHVybiAtRU5PTUVNOwo+ ICAgfQo+IEBAIC05MDMsMTEgKzkwMSwxMSBAQCBzdGF0aWMgaW50IGdlbjhfYWxsb2NfdmFfcmFu Z2Uoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCj4gICBlcnJfb3V0Ogo+ICAgCXdoaWxl IChwZHBlLS0pIHsKPiAgIAkJZm9yX2VhY2hfc2V0X2JpdCh0ZW1wLCBuZXdfcGFnZV90YWJsZXNb cGRwZV0sIEk5MTVfUERFUykKPiAtCQkJdW5tYXBfYW5kX2ZyZWVfcHQocHBndHQtPnBkcC5wYWdl X2RpcmVjdG9yeVtwZHBlXS0+cGFnZV90YWJsZVt0ZW1wXSwgdm0tPmRldik7Cj4gKwkJCWZyZWVf cHQodm0tPmRldiwgcHBndHQtPnBkcC5wYWdlX2RpcmVjdG9yeVtwZHBlXS0+cGFnZV90YWJsZVt0 ZW1wXSk7Cj4gICAJfQo+Cj4gICAJZm9yX2VhY2hfc2V0X2JpdChwZHBlLCBuZXdfcGFnZV9kaXJz LCBHRU44X0xFR0FDWV9QRFBFUykKPiAtCQl1bm1hcF9hbmRfZnJlZV9wZChwcGd0dC0+cGRwLnBh Z2VfZGlyZWN0b3J5W3BkcGVdLCB2bS0+ZGV2KTsKPiArCQlmcmVlX3BkKHZtLT5kZXYsIHBwZ3R0 LT5wZHAucGFnZV9kaXJlY3RvcnlbcGRwZV0pOwo+Cj4gICAJZnJlZV9nZW44X3RlbXBfYml0bWFw cyhuZXdfcGFnZV9kaXJzLCBuZXdfcGFnZV90YWJsZXMpOwo+ICAgCW1hcmtfdGxic19kaXJ0eShw cGd0dCk7Cj4gQEAgLTEzNTMsNyArMTM1MSw3IEBAIHVud2luZF9vdXQ6Cj4gICAJCXN0cnVjdCBp OTE1X3BhZ2VfdGFibGUgKnB0ID0gcHBndHQtPnBkLnBhZ2VfdGFibGVbcGRlXTsKPgo+ICAgCQlw cGd0dC0+cGQucGFnZV90YWJsZVtwZGVdID0gcHBndHQtPnNjcmF0Y2hfcHQ7Cj4gLQkJdW5tYXBf YW5kX2ZyZWVfcHQocHQsIHZtLT5kZXYpOwo+ICsJCWZyZWVfcHQodm0tPmRldiwgcHQpOwo+ICAg CX0KPgo+ICAgCW1hcmtfdGxic19kaXJ0eShwcGd0dCk7Cj4gQEAgLTEzNzIsMTEgKzEzNzAsMTEg QEAgc3RhdGljIHZvaWQgZ2VuNl9wcGd0dF9jbGVhbnVwKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3Bh Y2UgKnZtKQo+Cj4gICAJZ2VuNl9mb3JfYWxsX3BkZXMocHQsIHBwZ3R0LCBwZGUpIHsKPiAgIAkJ aWYgKHB0ICE9IHBwZ3R0LT5zY3JhdGNoX3B0KQo+IC0JCQl1bm1hcF9hbmRfZnJlZV9wdChwdCwg cHBndHQtPmJhc2UuZGV2KTsKPiArCQkJZnJlZV9wdChwcGd0dC0+YmFzZS5kZXYsIHB0KTsKPiAg IAl9Cj4KPiAtCXVubWFwX2FuZF9mcmVlX3B0KHBwZ3R0LT5zY3JhdGNoX3B0LCBwcGd0dC0+YmFz ZS5kZXYpOwo+IC0JdW5tYXBfYW5kX2ZyZWVfcGQoJnBwZ3R0LT5wZCwgcHBndHQtPmJhc2UuZGV2 KTsKPiArCWZyZWVfcHQocHBndHQtPmJhc2UuZGV2LCBwcGd0dC0+c2NyYXRjaF9wdCk7Cj4gKwlm cmVlX3BkKHBwZ3R0LT5iYXNlLmRldiwgJnBwZ3R0LT5wZCk7Cj4gICB9Cj4KPiAgIHN0YXRpYyBp bnQgZ2VuNl9wcGd0dF9hbGxvY2F0ZV9wYWdlX2RpcmVjdG9yaWVzKHN0cnVjdCBpOTE1X2h3X3Bw Z3R0ICpwcGd0dCkKPiBAQCAtMTQyNiw3ICsxNDI0LDcgQEAgYWxsb2M6Cj4gICAJcmV0dXJuIDA7 Cj4KPiAgIGVycl9vdXQ6Cj4gLQl1bm1hcF9hbmRfZnJlZV9wdChwcGd0dC0+c2NyYXRjaF9wdCwg cHBndHQtPmJhc2UuZGV2KTsKPiArCWZyZWVfcHQocHBndHQtPmJhc2UuZGV2LCBwcGd0dC0+c2Ny YXRjaF9wdCk7Cj4gICAJcmV0dXJuIHJldDsKPiAgIH0KPgo+Cl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==