From mboxrd@z Thu Jan 1 00:00:00 1970 From: Joonas Lahtinen Subject: [PATCH v2] drm/i915: Rename GGTT init functions Date: Thu, 24 Mar 2016 16:47:46 +0200 Message-ID: <1458830866-12578-1-git-send-email-joonas.lahtinen@linux.intel.com> References: <874mbx42ce.fsf@gaia.fi.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 2CB346E9DB for ; Thu, 24 Mar 2016 14:47:46 +0000 (UTC) In-Reply-To: <874mbx42ce.fsf@gaia.fi.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 List-Id: intel-gfx@lists.freedesktop.org UmVuYW1lIGFuZCBkb2N1bWVudCB0aGUgR0dUVCBpbml0IGZ1bmN0aW9ucyB0byBnaXZlIGEgYmV0 dGVyCmlkZWEgb2YgdGhlIGNvbnRleHQgd2hlcmUgdGhleSBhcmUgY2FsbGVkIGZyb20uCgppOTE1 X2dlbV9ndHRfaW5pdCA9PiBpOTE1X2dndHRfaW5pdF9odwppOTE1X2dlbV9pbml0X2dsb2JhbF9n dHQgPT4gaTkxNV9nZW1faW5pdF9nZ3R0Cmk5MTVfZ2xvYmFsX2d0dF9jbGVhbnVwID0+IGk5MTVf Z2d0dF9jbGVhbnVwX2h3CgpDYzogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVs LmNvbT4KQ2M6IE1pa2EgS3VvcHBhbGEgPG1pa2Eua3VvcHBhbGFAbGludXguaW50ZWwuY29tPgpD YzogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KQWNrZWQt Ynk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpTaWduZWQtb2ZmLWJ5 OiBKb29uYXMgTGFodGluZW4gPGpvb25hcy5sYWh0aW5lbkBsaW51eC5pbnRlbC5jb20+Ci0tLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kbWEuYyAgICAgfCAxNCArKysrKysrLS0tLS0tLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyAgICAgfCAgMiArLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMgfCAxOCArKysrKysrKysrKysrKystLS0KIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oIHwgIDcgKysrLS0tLQogNCBmaWxlcyBjaGFuZ2Vk LCAyNiBpbnNlcnRpb25zKCspLCAxNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2RtYS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kbWEu YwppbmRleCBmYzhhYzk4Li45MGFkZGU0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2RtYS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZG1hLmMKQEAgLTEx ODAsNyArMTE4MCw3IEBAIHN0YXRpYyBpbnQgaTkxNV9kcml2ZXJfaW5pdF9odyhzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAKIAlpbnRlbF9kZXZpY2VfaW5mb19ydW50aW1lX2lu aXQoZGV2KTsKIAotCXJldCA9IGk5MTVfZ2VtX2d0dF9pbml0KGRldik7CisJcmV0ID0gaTkxNV9n Z3R0X2luaXRfaHcoZGV2KTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCkBAIC0xMTg5LDEz ICsxMTg5LDEzIEBAIHN0YXRpYyBpbnQgaTkxNV9kcml2ZXJfaW5pdF9odyhzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJcmV0ID0gaTkxNV9raWNrX291dF9maXJtd2FyZV9mYihk ZXZfcHJpdik7CiAJaWYgKHJldCkgewogCQlEUk1fRVJST1IoImZhaWxlZCB0byByZW1vdmUgY29u ZmxpY3RpbmcgZnJhbWVidWZmZXIgZHJpdmVyc1xuIik7Ci0JCWdvdG8gb3V0X2d0dDsKKwkJZ290 byBvdXRfZ2d0dDsKIAl9CiAKIAlyZXQgPSBpOTE1X2tpY2tfb3V0X3ZnYWNvbihkZXZfcHJpdik7 CiAJaWYgKHJldCkgewogCQlEUk1fRVJST1IoImZhaWxlZCB0byByZW1vdmUgY29uZmxpY3Rpbmcg VkdBIGNvbnNvbGVcbiIpOwotCQlnb3RvIG91dF9ndHQ7CisJCWdvdG8gb3V0X2dndHQ7CiAJfQog CiAJcGNpX3NldF9tYXN0ZXIoZGV2LT5wZGV2KTsKQEAgLTEyMjIsNyArMTIyMiw3IEBAIHN0YXRp YyBpbnQgaTkxNV9kcml2ZXJfaW5pdF9odyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYpCiAJCQkJICAgICBhcGVydHVyZV9zaXplKTsKIAlpZiAoZGV2X3ByaXYtPmdndHQubWFwcGFi bGUgPT0gTlVMTCkgewogCQlyZXQgPSAtRUlPOwotCQlnb3RvIG91dF9ndHQ7CisJCWdvdG8gb3V0 X2dndHQ7CiAJfQogCiAJZGV2X3ByaXYtPmdndHQubXRyciA9IGFyY2hfcGh5c193Y19hZGQoZGV2 X3ByaXYtPmdndHQubWFwcGFibGVfYmFzZSwKQEAgLTEyNTUsOCArMTI1NSw4IEBAIHN0YXRpYyBp bnQgaTkxNV9kcml2ZXJfaW5pdF9odyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYp CiAKIAlyZXR1cm4gMDsKIAotb3V0X2d0dDoKLQlpOTE1X2dsb2JhbF9ndHRfY2xlYW51cChkZXYp Oworb3V0X2dndHQ6CisJaTkxNV9nZ3R0X2NsZWFudXBfaHcoZGV2KTsKIAogCXJldHVybiByZXQ7 CiB9CkBAIC0xMjc1LDcgKzEyNzUsNyBAQCBzdGF0aWMgdm9pZCBpOTE1X2RyaXZlcl9jbGVhbnVw X2h3KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlwbV9xb3NfcmVtb3ZlX3Jl cXVlc3QoJmRldl9wcml2LT5wbV9xb3MpOwogCWFyY2hfcGh5c193Y19kZWwoZGV2X3ByaXYtPmdn dHQubXRycik7CiAJaW9fbWFwcGluZ19mcmVlKGRldl9wcml2LT5nZ3R0Lm1hcHBhYmxlKTsKLQlp OTE1X2dsb2JhbF9ndHRfY2xlYW51cChkZXYpOworCWk5MTVfZ2d0dF9jbGVhbnVwX2h3KGRldik7 CiB9CiAKIC8qKgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKaW5kZXggYzdhOTk3YS4uNGNiZjIyMyAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYworKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCkBAIC00OTY3LDcgKzQ5NjcsNyBAQCBpbnQgaTkxNV9n ZW1faW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWlmIChyZXQpCiAJCWdvdG8gb3V0X3Vu bG9jazsKIAotCWk5MTVfZ2VtX2luaXRfZ2xvYmFsX2d0dChkZXYpOworCWk5MTVfZ2VtX2luaXRf Z2d0dChkZXYpOwogCiAJcmV0ID0gaTkxNV9nZW1fY29udGV4dF9pbml0KGRldik7CiAJaWYgKHJl dCkKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKaW5kZXggN2NmYWZkYy4uMjkyYTRmZCAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKQEAgLTI4MDQsNyArMjgwNCwxMSBAQCBz dGF0aWMgaW50IGk5MTVfZ2VtX3NldHVwX2dsb2JhbF9ndHQoc3RydWN0IGRybV9kZXZpY2UgKmRl diwKIAlyZXR1cm4gMDsKIH0KIAotdm9pZCBpOTE1X2dlbV9pbml0X2dsb2JhbF9ndHQoc3RydWN0 IGRybV9kZXZpY2UgKmRldikKKy8qKgorICogaTkxNV9nZW1faW5pdF9nZ3R0IC0gSW5pdGlhbGl6 ZSBHRU0gZm9yIEdsb2JhbCBHVFQKKyAqIEBkZXY6IERSTSBkZXZpY2UKKyAqLwordm9pZCBpOTE1 X2dlbV9pbml0X2dndHQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIHsKIAlzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCXU2NCBndHRfc2l6ZSwg bWFwcGFibGVfc2l6ZTsKQEAgLTI4MTUsNyArMjgxOSwxMSBAQCB2b2lkIGk5MTVfZ2VtX2luaXRf Z2xvYmFsX2d0dChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWk5MTVfZ2VtX3NldHVwX2dsb2Jh bF9ndHQoZGV2LCAwLCBtYXBwYWJsZV9zaXplLCBndHRfc2l6ZSk7CiB9CiAKLXZvaWQgaTkxNV9n bG9iYWxfZ3R0X2NsZWFudXAoc3RydWN0IGRybV9kZXZpY2UgKmRldikKKy8qKgorICogaTkxNV9n Z3R0X2NsZWFudXBfaHcgLSBDbGVhbiB1cCBHR1RUIGhhcmR3YXJlIGluaXRpYWxpemF0aW9uCisg KiBAZGV2OiBEUk0gZGV2aWNlCisgKi8KK3ZvaWQgaTkxNV9nZ3R0X2NsZWFudXBfaHcoc3RydWN0 IGRybV9kZXZpY2UgKmRldikKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYg PSBkZXYtPmRldl9wcml2YXRlOwogCXN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtID0gJmRl dl9wcml2LT5nZ3R0LmJhc2U7CkBAIC0zMTUzLDcgKzMxNjEsMTEgQEAgc3RhdGljIHZvaWQgaTkx NV9nbWNoX3JlbW92ZShzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSkKIAlpbnRlbF9nbWNo X3JlbW92ZSgpOwogfQogCi1pbnQgaTkxNV9nZW1fZ3R0X2luaXQoc3RydWN0IGRybV9kZXZpY2Ug KmRldikKKy8qKgorICogaTkxNV9nZ3R0X2luaXRfaHcgLSBJbml0aWFsaXplIEdHVFQgaGFyZHdh cmUKKyAqIEBkZXY6IERSTSBkZXZpY2UKKyAqLworaW50IGk5MTVfZ2d0dF9pbml0X2h3KHN0cnVj dCBkcm1fZGV2aWNlICpkZXYpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3QgaTkxNV9nZ3R0ICpnZ3R0ID0gJmRldl9wcml2 LT5nZ3R0OwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0Lmgg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaAppbmRleCBkODA0YmUwLi4yNDJh MTNiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaAorKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaApAQCAtNTEzLDEwICs1MTMsOSBA QCBpOTE1X3BhZ2VfZGlyX2RtYV9hZGRyKGNvbnN0IHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0 dCwgY29uc3QgdW5zaWduZWQgbikKIAkJcHhfZG1hKHBwZ3R0LT5iYXNlLnNjcmF0Y2hfcGQpOwog fQogCi1pbnQgaTkxNV9nZW1fZ3R0X2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldik7Ci12b2lk IGk5MTVfZ2VtX2luaXRfZ2xvYmFsX2d0dChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKLXZvaWQg aTkxNV9nbG9iYWxfZ3R0X2NsZWFudXAoc3RydWN0IGRybV9kZXZpY2UgKmRldik7Ci0KK2ludCBp OTE1X2dndHRfaW5pdF9odyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKK3ZvaWQgaTkxNV9nZW1f aW5pdF9nZ3R0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwordm9pZCBpOTE1X2dndHRfY2xlYW51 cF9odyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKIAogaW50IGk5MTVfcHBndHRfaW5pdChzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQpOwogaW50IGk5 MTVfcHBndHRfaW5pdF9odyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKLS0gCjIuNS41CgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFp bGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK