From mboxrd@z Thu Jan 1 00:00:00 1970 From: Joonas Lahtinen Subject: [PATCH v3 1/3] drm/i915: Use i915_vm_to_ppgtt instead of manual container_of Date: Fri, 1 Apr 2016 10:46:41 +0300 Message-ID: <1459496803-18092-1-git-send-email-joonas.lahtinen@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 7E1ED6EC0F for ; Fri, 1 Apr 2016 07:46:10 +0000 (UTC) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Intel graphics driver community testing & development Cc: Daniel Vetter List-Id: intel-gfx@lists.freedesktop.org TG9va3MgbXVjaCBiZXR0ZXIgd2l0aG91dCBjb250YWluZXJfb2YgZXZlcnl3aGVyZS4KCnYyOgot IEluIGk5MTVfZ2VtX3Jlc3RvcmVfZ3R0X21hcHBpbmdzIHRvbyAoQ2hyaXMpCgp2MzoKLSBEbyBu b3QgY2F1c2UgV0FSTiBieSBjYWxsaW5nIG9uIG5vbiBQUEdUVCBvYmplY3QgKENocmlzKQoKQ2M6 IERhbmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0ZXJAZmZ3bGwuY2g+CkNjOiBDaHJpcyBXaWxzb24g PGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KU2lnbmVkLW9mZi1ieTogSm9vbmFzIExhaHRpbmVu IDxqb29uYXMubGFodGluZW5AbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtX2d0dC5jIHwgNDQgKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0t LS0tLQogMSBmaWxlIGNoYW5nZWQsIDE2IGluc2VydGlvbnMoKyksIDI4IGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKaW5kZXggYWU5Y2IyNy4uMWVkYTVmZSAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKQEAgLTcwNiw4ICs3MDYsNyBAQCBzdGF0aWMg dm9pZCBnZW44X3BwZ3R0X2NsZWFyX3B0ZV9yYW5nZShzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNl ICp2bSwKIAkJCQkgICAgICAgdWludDY0X3QgbGVuZ3RoLAogCQkJCSAgICAgICBnZW44X3B0ZV90 IHNjcmF0Y2hfcHRlKQogewotCXN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCA9Ci0JCWNvbnRh aW5lcl9vZih2bSwgc3RydWN0IGk5MTVfaHdfcHBndHQsIGJhc2UpOworCXN0cnVjdCBpOTE1X2h3 X3BwZ3R0ICpwcGd0dCA9IGk5MTVfdm1fdG9fcHBndHQodm0pOwogCWdlbjhfcHRlX3QgKnB0X3Zh ZGRyOwogCXVuc2lnbmVkIHBkcGUgPSBnZW44X3BkcGVfaW5kZXgoc3RhcnQpOwogCXVuc2lnbmVk IHBkZSA9IGdlbjhfcGRlX2luZGV4KHN0YXJ0KTsKQEAgLTc2Miw4ICs3NjEsNyBAQCBzdGF0aWMg dm9pZCBnZW44X3BwZ3R0X2NsZWFyX3JhbmdlKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZt LAogCQkJCSAgIHVpbnQ2NF90IGxlbmd0aCwKIAkJCQkgICBib29sIHVzZV9zY3JhdGNoKQogewot CXN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCA9Ci0JCWNvbnRhaW5lcl9vZih2bSwgc3RydWN0 IGk5MTVfaHdfcHBndHQsIGJhc2UpOworCXN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCA9IGk5 MTVfdm1fdG9fcHBndHQodm0pOwogCWdlbjhfcHRlX3Qgc2NyYXRjaF9wdGUgPSBnZW44X3B0ZV9l bmNvZGUocHhfZG1hKHZtLT5zY3JhdGNoX3BhZ2UpLAogCQkJCQkJIEk5MTVfQ0FDSEVfTExDLCB1 c2Vfc2NyYXRjaCk7CiAKQEAgLTc4OCw4ICs3ODYsNyBAQCBnZW44X3BwZ3R0X2luc2VydF9wdGVf ZW50cmllcyhzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIAkJCSAgICAgIHVpbnQ2NF90 IHN0YXJ0LAogCQkJICAgICAgZW51bSBpOTE1X2NhY2hlX2xldmVsIGNhY2hlX2xldmVsKQogewot CXN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCA9Ci0JCWNvbnRhaW5lcl9vZih2bSwgc3RydWN0 IGk5MTVfaHdfcHBndHQsIGJhc2UpOworCXN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCA9IGk5 MTVfdm1fdG9fcHBndHQodm0pOwogCWdlbjhfcHRlX3QgKnB0X3ZhZGRyOwogCXVuc2lnbmVkIHBk cGUgPSBnZW44X3BkcGVfaW5kZXgoc3RhcnQpOwogCXVuc2lnbmVkIHBkZSA9IGdlbjhfcGRlX2lu ZGV4KHN0YXJ0KTsKQEAgLTgyOSw4ICs4MjYsNyBAQCBzdGF0aWMgdm9pZCBnZW44X3BwZ3R0X2lu c2VydF9lbnRyaWVzKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAogCQkJCSAgICAgIGVu dW0gaTkxNV9jYWNoZV9sZXZlbCBjYWNoZV9sZXZlbCwKIAkJCQkgICAgICB1MzIgdW51c2VkKQog ewotCXN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCA9Ci0JCWNvbnRhaW5lcl9vZih2bSwgc3Ry dWN0IGk5MTVfaHdfcHBndHQsIGJhc2UpOworCXN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCA9 IGk5MTVfdm1fdG9fcHBndHQodm0pOwogCXN0cnVjdCBzZ19wYWdlX2l0ZXIgc2dfaXRlcjsKIAog CV9fc2dfcGFnZV9pdGVyX3N0YXJ0KCZzZ19pdGVyLCBwYWdlcy0+c2dsLCBzZ19uZW50cyhwYWdl cy0+c2dsKSwgMCk7CkBAIC05ODEsOCArOTc3LDcgQEAgc3RhdGljIHZvaWQgZ2VuOF9wcGd0dF9j bGVhbnVwXzRsdmwoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0KQogCiBzdGF0aWMgdm9pZCBn ZW44X3BwZ3R0X2NsZWFudXAoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0pCiB7Ci0Jc3Ry dWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0ID0KLQkJY29udGFpbmVyX29mKHZtLCBzdHJ1Y3QgaTkx NV9od19wcGd0dCwgYmFzZSk7CisJc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0ID0gaTkxNV92 bV90b19wcGd0dCh2bSk7CiAKIAlpZiAoaW50ZWxfdmdwdV9hY3RpdmUodm0tPmRldikpCiAJCWdl bjhfcHBndHRfbm90aWZ5X3ZndChwcGd0dCwgZmFsc2UpOwpAQCAtMTIxNiw4ICsxMjExLDcgQEAg c3RhdGljIGludCBnZW44X2FsbG9jX3ZhX3JhbmdlXzNsdmwoc3RydWN0IGk5MTVfYWRkcmVzc19z cGFjZSAqdm0sCiAJCQkJICAgIHVpbnQ2NF90IHN0YXJ0LAogCQkJCSAgICB1aW50NjRfdCBsZW5n dGgpCiB7Ci0Jc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0ID0KLQkJY29udGFpbmVyX29mKHZt LCBzdHJ1Y3QgaTkxNV9od19wcGd0dCwgYmFzZSk7CisJc3RydWN0IGk5MTVfaHdfcHBndHQgKnBw Z3R0ID0gaTkxNV92bV90b19wcGd0dCh2bSk7CiAJdW5zaWduZWQgbG9uZyAqbmV3X3BhZ2VfZGly cywgKm5ld19wYWdlX3RhYmxlczsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gdm0tPmRldjsK IAlzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeSAqcGQ7CkBAIC0xMzI5LDggKzEzMjMsNyBAQCBz dGF0aWMgaW50IGdlbjhfYWxsb2NfdmFfcmFuZ2VfNGx2bChzdHJ1Y3QgaTkxNV9hZGRyZXNzX3Nw YWNlICp2bSwKIAkJCQkgICAgdWludDY0X3QgbGVuZ3RoKQogewogCURFQ0xBUkVfQklUTUFQKG5l d19wZHBzLCBHRU44X1BNTDRFU19QRVJfUE1MNCk7Ci0Jc3RydWN0IGk5MTVfaHdfcHBndHQgKnBw Z3R0ID0KLQkJCWNvbnRhaW5lcl9vZih2bSwgc3RydWN0IGk5MTVfaHdfcHBndHQsIGJhc2UpOwor CXN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCA9IGk5MTVfdm1fdG9fcHBndHQodm0pOwogCXN0 cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5X3BvaW50ZXIgKnBkcDsKIAl1aW50NjRfdCBwbWw0ZTsK IAlpbnQgcmV0ID0gMDsKQEAgLTEzNzYsOCArMTM2OSw3IEBAIGVycl9vdXQ6CiBzdGF0aWMgaW50 IGdlbjhfYWxsb2NfdmFfcmFuZ2Uoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCiAJCQkg ICAgICAgdWludDY0X3Qgc3RhcnQsIHVpbnQ2NF90IGxlbmd0aCkKIHsKLQlzdHJ1Y3QgaTkxNV9o d19wcGd0dCAqcHBndHQgPQotCQljb250YWluZXJfb2Yodm0sIHN0cnVjdCBpOTE1X2h3X3BwZ3R0 LCBiYXNlKTsKKwlzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQgPSBpOTE1X3ZtX3RvX3BwZ3R0 KHZtKTsKIAogCWlmIChVU0VTX0ZVTExfNDhCSVRfUFBHVFQodm0tPmRldikpCiAJCXJldHVybiBn ZW44X2FsbG9jX3ZhX3JhbmdlXzRsdmwodm0sICZwcGd0dC0+cG1sNCwgc3RhcnQsIGxlbmd0aCk7 CkBAIC0xNzk1LDggKzE3ODcsNyBAQCBzdGF0aWMgdm9pZCBnZW42X3BwZ3R0X2NsZWFyX3Jhbmdl KHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAogCQkJCSAgIHVpbnQ2NF90IGxlbmd0aCwK IAkJCQkgICBib29sIHVzZV9zY3JhdGNoKQogewotCXN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0 dCA9Ci0JCWNvbnRhaW5lcl9vZih2bSwgc3RydWN0IGk5MTVfaHdfcHBndHQsIGJhc2UpOworCXN0 cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCA9IGk5MTVfdm1fdG9fcHBndHQodm0pOwogCWdlbjZf cHRlX3QgKnB0X3ZhZGRyLCBzY3JhdGNoX3B0ZTsKIAl1bnNpZ25lZCBmaXJzdF9lbnRyeSA9IHN0 YXJ0ID4+IFBBR0VfU0hJRlQ7CiAJdW5zaWduZWQgbnVtX2VudHJpZXMgPSBsZW5ndGggPj4gUEFH RV9TSElGVDsKQEAgLTE4MzAsOCArMTgyMSw3IEBAIHN0YXRpYyB2b2lkIGdlbjZfcHBndHRfaW5z ZXJ0X2VudHJpZXMoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCiAJCQkJICAgICAgdWlu dDY0X3Qgc3RhcnQsCiAJCQkJICAgICAgZW51bSBpOTE1X2NhY2hlX2xldmVsIGNhY2hlX2xldmVs LCB1MzIgZmxhZ3MpCiB7Ci0Jc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0ID0KLQkJY29udGFp bmVyX29mKHZtLCBzdHJ1Y3QgaTkxNV9od19wcGd0dCwgYmFzZSk7CisJc3RydWN0IGk5MTVfaHdf cHBndHQgKnBwZ3R0ID0gaTkxNV92bV90b19wcGd0dCh2bSk7CiAJZ2VuNl9wdGVfdCAqcHRfdmFk ZHI7CiAJdW5zaWduZWQgZmlyc3RfZW50cnkgPSBzdGFydCA+PiBQQUdFX1NISUZUOwogCXVuc2ln bmVkIGFjdF9wdCA9IGZpcnN0X2VudHJ5IC8gR0VONl9QVEVTOwpAQCAtMTg2NSw4ICsxODU1LDcg QEAgc3RhdGljIGludCBnZW42X2FsbG9jX3ZhX3JhbmdlKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3Bh Y2UgKnZtLAogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSB2bS0+ZGV2OwogCXN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKIAlzdHJ1Y3QgaTkxNV9nZ3R0 ICpnZ3R0ID0gJmRldl9wcml2LT5nZ3R0OwotCXN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCA9 Ci0JCQkJY29udGFpbmVyX29mKHZtLCBzdHJ1Y3QgaTkxNV9od19wcGd0dCwgYmFzZSk7CisJc3Ry dWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0ID0gaTkxNV92bV90b19wcGd0dCh2bSk7CiAJc3RydWN0 IGk5MTVfcGFnZV90YWJsZSAqcHQ7CiAJdWludDMyX3Qgc3RhcnQsIGxlbmd0aCwgc3RhcnRfc2F2 ZSwgbGVuZ3RoX3NhdmU7CiAJdWludDMyX3QgcGRlLCB0ZW1wOwpAQCAtMTk3OCw4ICsxOTY3LDcg QEAgc3RhdGljIHZvaWQgZ2VuNl9mcmVlX3NjcmF0Y2goc3RydWN0IGk5MTVfYWRkcmVzc19zcGFj ZSAqdm0pCiAKIHN0YXRpYyB2b2lkIGdlbjZfcHBndHRfY2xlYW51cChzdHJ1Y3QgaTkxNV9hZGRy ZXNzX3NwYWNlICp2bSkKIHsKLQlzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQgPQotCQljb250 YWluZXJfb2Yodm0sIHN0cnVjdCBpOTE1X2h3X3BwZ3R0LCBiYXNlKTsKKwlzdHJ1Y3QgaTkxNV9o d19wcGd0dCAqcHBndHQgPSBpOTE1X3ZtX3RvX3BwZ3R0KHZtKTsKIAlzdHJ1Y3QgaTkxNV9wYWdl X3RhYmxlICpwdDsKIAl1aW50MzJfdCBwZGU7CiAKQEAgLTMyOTQsMTIgKzMyODIsMTIgQEAgdm9p ZCBpOTE1X2dlbV9yZXN0b3JlX2d0dF9tYXBwaW5ncyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQog CQlsaXN0X2Zvcl9lYWNoX2VudHJ5KHZtLCAmZGV2X3ByaXYtPnZtX2xpc3QsIGdsb2JhbF9saW5r KSB7CiAJCQkvKiBUT0RPOiBQZXJoYXBzIGl0IHNob3VsZG4ndCBiZSBnZW42IHNwZWNpZmljICov CiAKLQkJCXN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCA9Ci0JCQkJCWNvbnRhaW5lcl9vZih2 bSwgc3RydWN0IGk5MTVfaHdfcHBndHQsCi0JCQkJCQkgICAgIGJhc2UpOworCQkJc3RydWN0IGk5 MTVfaHdfcHBndHQgKnBwZ3R0OwogCi0JCQlpZiAoaTkxNV9pc19nZ3R0KHZtKSkKKwkJCWlmICh2 bS0+aXNfZ2d0dCkKIAkJCQlwcGd0dCA9IGRldl9wcml2LT5tbS5hbGlhc2luZ19wcGd0dDsKKwkJ CWVsc2UKKwkJCQlwcGd0dCA9IGk5MTVfdm1fdG9fcHBndHQodm0pOwogCiAJCQlnZW42X3dyaXRl X3BhZ2VfcmFuZ2UoZGV2X3ByaXYsICZwcGd0dC0+cGQsCiAJCQkJCSAgICAgIDAsIHBwZ3R0LT5i YXNlLnRvdGFsKTsKLS0gCjIuNS41CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVl ZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9pbnRlbC1nZngK