From: John.C.Harrison@Intel.com Subject: [PATCH 17/51] drm/i915: Split i915_ppgtt_init_hw() in half - generic and per ring Date: Fri, 13 Feb 2015 11:48:26 +0000 Message-ID: <1423828140-10653-18-git-send-email-John.C.Harrison@Intel.com> References: <1423828140-10653-1-git-send-email-John.C.Harrison@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 7558E6E7B0 for ; Fri, 13 Feb 2015 03:49:21 -0800 (PST) In-Reply-To: <1423828140-10653-1-git-send-email-John.C.Harrison@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-GFX@Lists.FreeDesktop.Org List-Id: intel-gfx@lists.freedesktop.org RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KClRoZSBpOTE1 X2dlbV9pbml0X2h3KCkgZnVuY3Rpb24gY2FsbHMgYSBidW5jaCBvZiBzbWFsbGVyIGluaXRpYWxp c2F0aW9uCmZ1bmN0aW9ucy4gTXVsdGlwbGUgb2Ygd2hpY2ggaGF2ZSBnZW5lcmljIHNlY3Rpb25z IGFuZCBwZXIgcmluZyBzZWN0aW9ucy4gVGhpcwptZWFucyBtdWx0aXBsZSBwYXNzZXMgYXJlIGRv bmUgb3ZlciB0aGUgcmluZ3MuIEVhY2ggcGFzcyB3cml0ZXMgZGF0YSB0byB0aGUgcmluZwp3aGlj aCBmbG9hdHMgYXJvdW5kIGluIHRoYXQgcmluZydzIE9MUiB1bnRpbCBzb21lIHJhbmRvbSBwb2lu dCBpbiB0aGUgZnV0dXJlCndoZW4gYW4gYWRkX3JlcXVlc3QoKSBpcyBkb25lIGJ5IHNvbWUgcmFu ZG9tIG90aGVyIHBpZWNlIG9mIGNvZGUuCgpUaGlzIHBhdGNoIGJyZWFrcyBpOTE1X3BwZ3R0X2lu aXRfaHcoKSBpbiB0d28gd2l0aCB0aGUgcGVyIHJpbmcgaW5pdGlhbGlzYXRpb24Kbm93IGJlaW5n IGRvbmUgaW4gaTkxNV9wcGd0dF9pbml0X3JpbmcoKS4gVGhlIHJpbmcgbG9vcGluZyBpcyBub3cg ZG9uZSBhdCB0aGUKdG9wIGxldmVsIGluIGk5MTVfZ2VtX2luaXRfaHcoKS4KCkZvcjogVklaLTUx MTUKU2lnbmVkLW9mZi1ieTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNv bT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jICAgICB8ICAgMjUgKysrKysr KysrKysrKysrKysrKy0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMg fCAgIDI4ICsrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtX2d0dC5oIHwgICAgMSArCiAzIGZpbGVzIGNoYW5nZWQsIDM2IGluc2VydGlvbnMo KyksIDE4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IDg5MjNlY2Qu LmUyOTgxMTkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtNDgzOSwxOSArNDgzOSwzMiBA QCBpOTE1X2dlbV9pbml0X2h3KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJICovCiAJaW5pdF91 bnVzZWRfcmluZ3MoZGV2KTsKIAorCXJldCA9IGk5MTVfcHBndHRfaW5pdF9odyhkZXYpOworCWlm IChyZXQpIHsKKwkJRFJNX0VSUk9SKCJQUEdUVCBlbmFibGUgSFcgZmFpbGVkICVkXG4iLCByZXQp OworCQlyZXR1cm4gcmV0OworCX0KKworCS8qIE5lZWQgdG8gZG8gYmFzaWMgaW5pdGlhbGlzYXRp b24gb2YgYWxsIHJpbmdzIGZpcnN0OiAqLwogCWZvcl9lYWNoX3JpbmcocmluZywgZGV2X3ByaXYs IGkpIHsKIAkJcmV0ID0gcmluZy0+aW5pdF9odyhyaW5nKTsKIAkJaWYgKHJldCkKIAkJCXJldHVy biByZXQ7CiAJfQogCi0JZm9yIChpID0gMDsgaSA8IE5VTV9MM19TTElDRVMoZGV2KTsgaSsrKQot CQlpOTE1X2dlbV9sM19yZW1hcCgmZGV2X3ByaXYtPnJpbmdbUkNTXSwgaSk7CisJLyogTm93IGl0 IGlzIHNhZmUgdG8gZ28gYmFjayByb3VuZCBhbmQgZG8gZXZlcnl0aGluZyBlbHNlOiAqLworCWZv cl9lYWNoX3JpbmcocmluZywgZGV2X3ByaXYsIGkpIHsKKwkJaWYgKHJpbmctPmlkID09IFJDUykg eworCQkJZm9yIChpID0gMDsgaSA8IE5VTV9MM19TTElDRVMoZGV2KTsgaSsrKQorCQkJCWk5MTVf Z2VtX2wzX3JlbWFwKHJpbmcsIGkpOworCQl9CiAKLQlyZXQgPSBpOTE1X3BwZ3R0X2luaXRfaHco ZGV2KTsKLQlpZiAocmV0ICYmIHJldCAhPSAtRUlPKSB7Ci0JCURSTV9FUlJPUigiUFBHVFQgZW5h YmxlIGZhaWxlZCAlZFxuIiwgcmV0KTsKLQkJaTkxNV9nZW1fY2xlYW51cF9yaW5nYnVmZmVyKGRl dik7CisJCXJldCA9IGk5MTVfcHBndHRfaW5pdF9yaW5nKHJpbmcpOworCQlpZiAocmV0ICYmIHJl dCAhPSAtRUlPKSB7CisJCQlEUk1fRVJST1IoIlBQR1RUIGVuYWJsZSByaW5nICMlZCBmYWlsZWQg JWRcbiIsIGksIHJldCk7CisJCQlpOTE1X2dlbV9jbGVhbnVwX3JpbmdidWZmZXIoZGV2KTsKKwkJ CXJldHVybiByZXQ7CisJCX0KIAl9CiAKIAlyZXQgPSBpOTE1X2dlbV9jb250ZXh0X2VuYWJsZShk ZXZfcHJpdik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQu YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCmluZGV4IDc0NmY3N2YuLjE1 MjhlNzcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCkBAIC0xMTg2LDExICsxMTg2 LDYgQEAgaW50IGk5MTVfcHBndHRfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3Qg aTkxNV9od19wcGd0dCAqcHBndHQpCiAKIGludCBpOTE1X3BwZ3R0X2luaXRfaHcoc3RydWN0IGRy bV9kZXZpY2UgKmRldikKIHsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBk ZXYtPmRldl9wcml2YXRlOwotCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmc7Ci0Jc3RydWN0 IGk5MTVfaHdfcHBndHQgKnBwZ3R0ID0gZGV2X3ByaXYtPm1tLmFsaWFzaW5nX3BwZ3R0OwotCWlu dCBpLCByZXQgPSAwOwotCiAJLyogSW4gdGhlIGNhc2Ugb2YgZXhlY2xpc3RzLCBQUEdUVCBpcyBl bmFibGVkIGJ5IHRoZSBjb250ZXh0IGRlc2NyaXB0b3IKIAkgKiBhbmQgdGhlIFBEUHMgYXJlIGNv bnRhaW5lZCB3aXRoaW4gdGhlIGNvbnRleHQgaXRzZWxmLiAgV2UgZG9uJ3QKIAkgKiBuZWVkIHRv IGRvIGFueXRoaW5nIGhlcmUuICovCkBAIC0xMjA5LDE2ICsxMjA0LDI1IEBAIGludCBpOTE1X3Bw Z3R0X2luaXRfaHcoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAllbHNlCiAJCU1JU1NJTkdfQ0FT RShJTlRFTF9JTkZPKGRldiktPmdlbik7CiAKLQlpZiAocHBndHQpIHsKLQkJZm9yX2VhY2hfcmlu ZyhyaW5nLCBkZXZfcHJpdiwgaSkgewotCQkJcmV0ID0gcHBndHQtPnN3aXRjaF9tbShwcGd0dCwg cmluZyk7Ci0JCQlpZiAocmV0ICE9IDApCi0JCQkJcmV0dXJuIHJldDsKLQkJfQotCX0KKwlyZXR1 cm4gMDsKK30KKworaW50IGk5MTVfcHBndHRfaW5pdF9yaW5nKHN0cnVjdCBpbnRlbF9lbmdpbmVf Y3MgKnJpbmcpCit7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gcmluZy0+ ZGV2LT5kZXZfcHJpdmF0ZTsKKwlzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQgPSBkZXZfcHJp di0+bW0uYWxpYXNpbmdfcHBndHQ7CisJaW50IHJldCA9IDA7CisKKwlpZiAoIXBwZ3R0KQorCQly ZXR1cm4gMDsKKworCXJldCA9IHBwZ3R0LT5zd2l0Y2hfbW0ocHBndHQsIHJpbmcpOworCWlmIChy ZXQgIT0gMCkKKwkJcmV0dXJuIHJldDsKIAogCXJldHVybiByZXQ7CiB9CisKIHN0cnVjdCBpOTE1 X2h3X3BwZ3R0ICoKIGk5MTVfcHBndHRfY3JlYXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0 cnVjdCBkcm1faTkxNV9maWxlX3ByaXZhdGUgKmZwcml2KQogewpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbV9ndHQuaAppbmRleCBlMzc3YzdkLi43OGExMDdlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbV9ndHQuaApAQCAtMzAwLDYgKzMwMCw3IEBAIHZvaWQgaTkxNV9nbG9iYWxfZ3R0X2NsZWFu dXAoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CiAKIGludCBpOTE1X3BwZ3R0X2luaXQoc3RydWN0 IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0KTsKIGludCBpOTE1 X3BwZ3R0X2luaXRfaHcoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CitpbnQgaTkxNV9wcGd0dF9p bml0X3Jpbmcoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyk7CiB2b2lkIGk5MTVfcHBndHRf cmVsZWFzZShzdHJ1Y3Qga3JlZiAqa3JlZik7CiBzdHJ1Y3QgaTkxNV9od19wcGd0dCAqaTkxNV9w cGd0dF9jcmVhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJCQkJc3RydWN0IGRybV9pOTE1 X2ZpbGVfcHJpdmF0ZSAqZnByaXYpOwotLSAKMS43LjkuNQoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1n ZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp bG1hbi9saXN0aW5mby9pbnRlbC1nZngK