From mboxrd@z Thu Jan 1 00:00:00 1970 From: Joonas Lahtinen Subject: [PATCH v2 1/3] drm/i915: Use i915_vm_to_ppgtt instead of manual container_of Date: Fri, 1 Apr 2016 10:05:03 +0300 Message-ID: <1459494305-11384-1-git-send-email-joonas.lahtinen@linux.intel.com> References: <1459442979-22102-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 mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 776186EBA1 for ; Fri, 1 Apr 2016 07:04:24 +0000 (UTC) In-Reply-To: <1459442979-22102-1-git-send-email-joonas.lahtinen@linux.intel.com> 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 IEluIGk5MTVfZ2VtX3Jlc3RvcmVfZ3R0X21hcHBpbmdzIHRvbyAoQ2hyaXMpCgpDYzogRGFuaWVs IFZldHRlciA8ZGFuaWVsLnZldHRlckBmZndsbC5jaD4KQ2M6IENocmlzIFdpbHNvbiA8Y2hyaXNA Y2hyaXMtd2lsc29uLmNvLnVrPgpTaWduZWQtb2ZmLWJ5OiBKb29uYXMgTGFodGluZW4gPGpvb25h cy5sYWh0aW5lbkBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9nZW1fZ3R0LmMgfCA0MCArKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAx IGZpbGUgY2hhbmdlZCwgMTMgaW5zZXJ0aW9ucygrKSwgMjcgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbV9ndHQuYwppbmRleCBhZTljYjI3Li41YzcwZWJlIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbV9ndHQuYwpAQCAtNzA2LDggKzcwNiw3IEBAIHN0YXRpYyB2b2lkIGdl bjhfcHBndHRfY2xlYXJfcHRlX3JhbmdlKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAog CQkJCSAgICAgICB1aW50NjRfdCBsZW5ndGgsCiAJCQkJICAgICAgIGdlbjhfcHRlX3Qgc2NyYXRj aF9wdGUpCiB7Ci0Jc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0ID0KLQkJY29udGFpbmVyX29m KHZtLCBzdHJ1Y3QgaTkxNV9od19wcGd0dCwgYmFzZSk7CisJc3RydWN0IGk5MTVfaHdfcHBndHQg KnBwZ3R0ID0gaTkxNV92bV90b19wcGd0dCh2bSk7CiAJZ2VuOF9wdGVfdCAqcHRfdmFkZHI7CiAJ dW5zaWduZWQgcGRwZSA9IGdlbjhfcGRwZV9pbmRleChzdGFydCk7CiAJdW5zaWduZWQgcGRlID0g Z2VuOF9wZGVfaW5kZXgoc3RhcnQpOwpAQCAtNzYyLDggKzc2MSw3IEBAIHN0YXRpYyB2b2lkIGdl bjhfcHBndHRfY2xlYXJfcmFuZ2Uoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCiAJCQkJ ICAgdWludDY0X3QgbGVuZ3RoLAogCQkJCSAgIGJvb2wgdXNlX3NjcmF0Y2gpCiB7Ci0Jc3RydWN0 IGk5MTVfaHdfcHBndHQgKnBwZ3R0ID0KLQkJY29udGFpbmVyX29mKHZtLCBzdHJ1Y3QgaTkxNV9o d19wcGd0dCwgYmFzZSk7CisJc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0ID0gaTkxNV92bV90 b19wcGd0dCh2bSk7CiAJZ2VuOF9wdGVfdCBzY3JhdGNoX3B0ZSA9IGdlbjhfcHRlX2VuY29kZShw eF9kbWEodm0tPnNjcmF0Y2hfcGFnZSksCiAJCQkJCQkgSTkxNV9DQUNIRV9MTEMsIHVzZV9zY3Jh dGNoKTsKIApAQCAtNzg4LDggKzc4Niw3IEBAIGdlbjhfcHBndHRfaW5zZXJ0X3B0ZV9lbnRyaWVz KHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAogCQkJICAgICAgdWludDY0X3Qgc3RhcnQs CiAJCQkgICAgICBlbnVtIGk5MTVfY2FjaGVfbGV2ZWwgY2FjaGVfbGV2ZWwpCiB7Ci0Jc3RydWN0 IGk5MTVfaHdfcHBndHQgKnBwZ3R0ID0KLQkJY29udGFpbmVyX29mKHZtLCBzdHJ1Y3QgaTkxNV9o d19wcGd0dCwgYmFzZSk7CisJc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0ID0gaTkxNV92bV90 b19wcGd0dCh2bSk7CiAJZ2VuOF9wdGVfdCAqcHRfdmFkZHI7CiAJdW5zaWduZWQgcGRwZSA9IGdl bjhfcGRwZV9pbmRleChzdGFydCk7CiAJdW5zaWduZWQgcGRlID0gZ2VuOF9wZGVfaW5kZXgoc3Rh cnQpOwpAQCAtODI5LDggKzgyNiw3IEBAIHN0YXRpYyB2b2lkIGdlbjhfcHBndHRfaW5zZXJ0X2Vu dHJpZXMoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCiAJCQkJICAgICAgZW51bSBpOTE1 X2NhY2hlX2xldmVsIGNhY2hlX2xldmVsLAogCQkJCSAgICAgIHUzMiB1bnVzZWQpCiB7Ci0Jc3Ry dWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0ID0KLQkJY29udGFpbmVyX29mKHZtLCBzdHJ1Y3QgaTkx NV9od19wcGd0dCwgYmFzZSk7CisJc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0ID0gaTkxNV92 bV90b19wcGd0dCh2bSk7CiAJc3RydWN0IHNnX3BhZ2VfaXRlciBzZ19pdGVyOwogCiAJX19zZ19w YWdlX2l0ZXJfc3RhcnQoJnNnX2l0ZXIsIHBhZ2VzLT5zZ2wsIHNnX25lbnRzKHBhZ2VzLT5zZ2wp LCAwKTsKQEAgLTk4MSw4ICs5NzcsNyBAQCBzdGF0aWMgdm9pZCBnZW44X3BwZ3R0X2NsZWFudXBf NGx2bChzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQpCiAKIHN0YXRpYyB2b2lkIGdlbjhfcHBn dHRfY2xlYW51cChzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSkKIHsKLQlzdHJ1Y3QgaTkx NV9od19wcGd0dCAqcHBndHQgPQotCQljb250YWluZXJfb2Yodm0sIHN0cnVjdCBpOTE1X2h3X3Bw Z3R0LCBiYXNlKTsKKwlzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQgPSBpOTE1X3ZtX3RvX3Bw Z3R0KHZtKTsKIAogCWlmIChpbnRlbF92Z3B1X2FjdGl2ZSh2bS0+ZGV2KSkKIAkJZ2VuOF9wcGd0 dF9ub3RpZnlfdmd0KHBwZ3R0LCBmYWxzZSk7CkBAIC0xMjE2LDggKzEyMTEsNyBAQCBzdGF0aWMg aW50IGdlbjhfYWxsb2NfdmFfcmFuZ2VfM2x2bChzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2 bSwKIAkJCQkgICAgdWludDY0X3Qgc3RhcnQsCiAJCQkJICAgIHVpbnQ2NF90IGxlbmd0aCkKIHsK LQlzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQgPQotCQljb250YWluZXJfb2Yodm0sIHN0cnVj dCBpOTE1X2h3X3BwZ3R0LCBiYXNlKTsKKwlzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQgPSBp OTE1X3ZtX3RvX3BwZ3R0KHZtKTsKIAl1bnNpZ25lZCBsb25nICpuZXdfcGFnZV9kaXJzLCAqbmV3 X3BhZ2VfdGFibGVzOwogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSB2bS0+ZGV2OwogCXN0cnVj dCBpOTE1X3BhZ2VfZGlyZWN0b3J5ICpwZDsKQEAgLTEzMjksOCArMTMyMyw3IEBAIHN0YXRpYyBp bnQgZ2VuOF9hbGxvY192YV9yYW5nZV80bHZsKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZt LAogCQkJCSAgICB1aW50NjRfdCBsZW5ndGgpCiB7CiAJREVDTEFSRV9CSVRNQVAobmV3X3BkcHMs IEdFTjhfUE1MNEVTX1BFUl9QTUw0KTsKLQlzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQgPQot CQkJY29udGFpbmVyX29mKHZtLCBzdHJ1Y3QgaTkxNV9od19wcGd0dCwgYmFzZSk7CisJc3RydWN0 IGk5MTVfaHdfcHBndHQgKnBwZ3R0ID0gaTkxNV92bV90b19wcGd0dCh2bSk7CiAJc3RydWN0IGk5 MTVfcGFnZV9kaXJlY3RvcnlfcG9pbnRlciAqcGRwOwogCXVpbnQ2NF90IHBtbDRlOwogCWludCBy ZXQgPSAwOwpAQCAtMTM3Niw4ICsxMzY5LDcgQEAgZXJyX291dDoKIHN0YXRpYyBpbnQgZ2VuOF9h bGxvY192YV9yYW5nZShzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIAkJCSAgICAgICB1 aW50NjRfdCBzdGFydCwgdWludDY0X3QgbGVuZ3RoKQogewotCXN0cnVjdCBpOTE1X2h3X3BwZ3R0 ICpwcGd0dCA9Ci0JCWNvbnRhaW5lcl9vZih2bSwgc3RydWN0IGk5MTVfaHdfcHBndHQsIGJhc2Up OworCXN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCA9IGk5MTVfdm1fdG9fcHBndHQodm0pOwog CiAJaWYgKFVTRVNfRlVMTF80OEJJVF9QUEdUVCh2bS0+ZGV2KSkKIAkJcmV0dXJuIGdlbjhfYWxs b2NfdmFfcmFuZ2VfNGx2bCh2bSwgJnBwZ3R0LT5wbWw0LCBzdGFydCwgbGVuZ3RoKTsKQEAgLTE3 OTUsOCArMTc4Nyw3IEBAIHN0YXRpYyB2b2lkIGdlbjZfcHBndHRfY2xlYXJfcmFuZ2Uoc3RydWN0 IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCiAJCQkJICAgdWludDY0X3QgbGVuZ3RoLAogCQkJCSAg IGJvb2wgdXNlX3NjcmF0Y2gpCiB7Ci0Jc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0ID0KLQkJ Y29udGFpbmVyX29mKHZtLCBzdHJ1Y3QgaTkxNV9od19wcGd0dCwgYmFzZSk7CisJc3RydWN0IGk5 MTVfaHdfcHBndHQgKnBwZ3R0ID0gaTkxNV92bV90b19wcGd0dCh2bSk7CiAJZ2VuNl9wdGVfdCAq cHRfdmFkZHIsIHNjcmF0Y2hfcHRlOwogCXVuc2lnbmVkIGZpcnN0X2VudHJ5ID0gc3RhcnQgPj4g UEFHRV9TSElGVDsKIAl1bnNpZ25lZCBudW1fZW50cmllcyA9IGxlbmd0aCA+PiBQQUdFX1NISUZU OwpAQCAtMTgzMCw4ICsxODIxLDcgQEAgc3RhdGljIHZvaWQgZ2VuNl9wcGd0dF9pbnNlcnRfZW50 cmllcyhzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIAkJCQkgICAgICB1aW50NjRfdCBz dGFydCwKIAkJCQkgICAgICBlbnVtIGk5MTVfY2FjaGVfbGV2ZWwgY2FjaGVfbGV2ZWwsIHUzMiBm bGFncykKIHsKLQlzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQgPQotCQljb250YWluZXJfb2Yo dm0sIHN0cnVjdCBpOTE1X2h3X3BwZ3R0LCBiYXNlKTsKKwlzdHJ1Y3QgaTkxNV9od19wcGd0dCAq cHBndHQgPSBpOTE1X3ZtX3RvX3BwZ3R0KHZtKTsKIAlnZW42X3B0ZV90ICpwdF92YWRkcjsKIAl1 bnNpZ25lZCBmaXJzdF9lbnRyeSA9IHN0YXJ0ID4+IFBBR0VfU0hJRlQ7CiAJdW5zaWduZWQgYWN0 X3B0ID0gZmlyc3RfZW50cnkgLyBHRU42X1BURVM7CkBAIC0xODY1LDggKzE4NTUsNyBAQCBzdGF0 aWMgaW50IGdlbjZfYWxsb2NfdmFfcmFuZ2Uoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0s CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IHZtLT5kZXY7CiAJc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwogCXN0cnVjdCBpOTE1X2dndHQgKmdndHQg PSAmZGV2X3ByaXYtPmdndHQ7Ci0Jc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0ID0KLQkJCQlj b250YWluZXJfb2Yodm0sIHN0cnVjdCBpOTE1X2h3X3BwZ3R0LCBiYXNlKTsKKwlzdHJ1Y3QgaTkx NV9od19wcGd0dCAqcHBndHQgPSBpOTE1X3ZtX3RvX3BwZ3R0KHZtKTsKIAlzdHJ1Y3QgaTkxNV9w YWdlX3RhYmxlICpwdDsKIAl1aW50MzJfdCBzdGFydCwgbGVuZ3RoLCBzdGFydF9zYXZlLCBsZW5n dGhfc2F2ZTsKIAl1aW50MzJfdCBwZGUsIHRlbXA7CkBAIC0xOTc4LDggKzE5NjcsNyBAQCBzdGF0 aWMgdm9pZCBnZW42X2ZyZWVfc2NyYXRjaChzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSkK IAogc3RhdGljIHZvaWQgZ2VuNl9wcGd0dF9jbGVhbnVwKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3Bh Y2UgKnZtKQogewotCXN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCA9Ci0JCWNvbnRhaW5lcl9v Zih2bSwgc3RydWN0IGk5MTVfaHdfcHBndHQsIGJhc2UpOworCXN0cnVjdCBpOTE1X2h3X3BwZ3R0 ICpwcGd0dCA9IGk5MTVfdm1fdG9fcHBndHQodm0pOwogCXN0cnVjdCBpOTE1X3BhZ2VfdGFibGUg KnB0OwogCXVpbnQzMl90IHBkZTsKIApAQCAtMzI5NCw5ICszMjgyLDcgQEAgdm9pZCBpOTE1X2dl bV9yZXN0b3JlX2d0dF9tYXBwaW5ncyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQlsaXN0X2Zv cl9lYWNoX2VudHJ5KHZtLCAmZGV2X3ByaXYtPnZtX2xpc3QsIGdsb2JhbF9saW5rKSB7CiAJCQkv KiBUT0RPOiBQZXJoYXBzIGl0IHNob3VsZG4ndCBiZSBnZW42IHNwZWNpZmljICovCiAKLQkJCXN0 cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCA9Ci0JCQkJCWNvbnRhaW5lcl9vZih2bSwgc3RydWN0 IGk5MTVfaHdfcHBndHQsCi0JCQkJCQkgICAgIGJhc2UpOworCQkJc3RydWN0IGk5MTVfaHdfcHBn dHQgKnBwZ3R0ID0gaTkxNV92bV90b19wcGd0dCh2bSk7CiAKIAkJCWlmIChpOTE1X2lzX2dndHQo dm0pKQogCQkJCXBwZ3R0ID0gZGV2X3ByaXYtPm1tLmFsaWFzaW5nX3BwZ3R0OwotLSAKMi41LjUK Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdm eCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=