From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH 15/55] drm/i915: Split i915_ppgtt_init_hw() in half - generic and per ring Date: Thu, 18 Jun 2015 13:11:20 +0100 Message-ID: <1434629480-9457-1-git-send-email-John.C.Harrison@Intel.com> References: <1432917856-12261-16-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 mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id E43246E641 for ; Thu, 18 Jun 2015 05:11:21 -0700 (PDT) In-Reply-To: <1432917856-12261-16-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 ZG9uZSBhdCB0aGUKdG9wIGxldmVsIGluIGk5MTVfZ2VtX2luaXRfaHcoKS4KCnYyOiBGaXggZHVt YiBsb29wIHZhcmlhYmxlIHJlLXVzZS4KCkZvcjogVklaLTUxMTUKU2lnbmVkLW9mZi1ieTogSm9o biBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IFRvbWFz IEVsZiA8dG9tYXMuZWxmQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbS5jICAgICB8ICAgMjcgKysrKysrKysrKysrKysrKysrKystLS0tLS0tCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyB8ICAgMjggKysrKysrKysrKysrKysrLS0tLS0tLS0t LS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmggfCAgICAxICsKIDMgZmls ZXMgY2hhbmdlZCwgMzYgaW5zZXJ0aW9ucygrKSwgMjAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtLmMKaW5kZXggYWM4OTNlMy4uZGZmMjFiZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bS5jCkBAIC01MDE2LDcgKzUwMTYsNyBAQCBpOTE1X2dlbV9pbml0X2h3KHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5k ZXZfcHJpdmF0ZTsKIAlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nOwotCWludCByZXQsIGk7 CisJaW50IHJldCwgaSwgajsKIAogCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA8IDYgJiYgIWlu dGVsX2VuYWJsZV9ndHQoKSkKIAkJcmV0dXJuIC1FSU87CkBAIC01MDUzLDE5ICs1MDUzLDMyIEBA IGk5MTVfZ2VtX2luaXRfaHcoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkgKi8KIAlpbml0X3Vu dXNlZF9yaW5ncyhkZXYpOwogCisJcmV0ID0gaTkxNV9wcGd0dF9pbml0X2h3KGRldik7CisJaWYg KHJldCkgeworCQlEUk1fRVJST1IoIlBQR1RUIGVuYWJsZSBIVyBmYWlsZWQgJWRcbiIsIHJldCk7 CisJCWdvdG8gb3V0OworCX0KKworCS8qIE5lZWQgdG8gZG8gYmFzaWMgaW5pdGlhbGlzYXRpb24g b2YgYWxsIHJpbmdzIGZpcnN0OiAqLwogCWZvcl9lYWNoX3JpbmcocmluZywgZGV2X3ByaXYsIGkp IHsKIAkJcmV0ID0gcmluZy0+aW5pdF9odyhyaW5nKTsKIAkJaWYgKHJldCkKIAkJCWdvdG8gb3V0 OwogCX0KIAotCWZvciAoaSA9IDA7IGkgPCBOVU1fTDNfU0xJQ0VTKGRldik7IGkrKykKLQkJaTkx NV9nZW1fbDNfcmVtYXAoJmRldl9wcml2LT5yaW5nW1JDU10sIGkpOworCS8qIE5vdyBpdCBpcyBz YWZlIHRvIGdvIGJhY2sgcm91bmQgYW5kIGRvIGV2ZXJ5dGhpbmcgZWxzZTogKi8KKwlmb3JfZWFj aF9yaW5nKHJpbmcsIGRldl9wcml2LCBpKSB7CisJCWlmIChyaW5nLT5pZCA9PSBSQ1MpIHsKKwkJ CWZvciAoaiA9IDA7IGogPCBOVU1fTDNfU0xJQ0VTKGRldik7IGorKykKKwkJCQlpOTE1X2dlbV9s M19yZW1hcChyaW5nLCBqKTsKKwkJfQogCi0JcmV0ID0gaTkxNV9wcGd0dF9pbml0X2h3KGRldik7 Ci0JaWYgKHJldCAmJiByZXQgIT0gLUVJTykgewotCQlEUk1fRVJST1IoIlBQR1RUIGVuYWJsZSBm YWlsZWQgJWRcbiIsIHJldCk7Ci0JCWk5MTVfZ2VtX2NsZWFudXBfcmluZ2J1ZmZlcihkZXYpOwor CQlyZXQgPSBpOTE1X3BwZ3R0X2luaXRfcmluZyhyaW5nKTsKKwkJaWYgKHJldCAmJiByZXQgIT0g LUVJTykgeworCQkJRFJNX0VSUk9SKCJQUEdUVCBlbmFibGUgcmluZyAjJWQgZmFpbGVkICVkXG4i LCBpLCByZXQpOworCQkJaTkxNV9nZW1fY2xlYW51cF9yaW5nYnVmZmVyKGRldik7CisJCQlnb3Rv IG91dDsKKwkJfQogCX0KIAogCXJldCA9IGk5MTVfZ2VtX2NvbnRleHRfZW5hYmxlKGRldl9wcml2 KTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKaW5kZXggMTdiN2RmMC4uYjE0YWU2MyAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKQEAgLTE1NDMsMTEgKzE1NDMsNiBAQCBp bnQgaTkxNV9wcGd0dF9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBpOTE1X2h3 X3BwZ3R0ICpwcGd0dCkKIAogaW50IGk5MTVfcHBndHRfaW5pdF9odyhzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2KQogewotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2 X3ByaXZhdGU7Ci0Jc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZzsKLQlzdHJ1Y3QgaTkxNV9o d19wcGd0dCAqcHBndHQgPSBkZXZfcHJpdi0+bW0uYWxpYXNpbmdfcHBndHQ7Ci0JaW50IGksIHJl dCA9IDA7Ci0KIAkvKiBJbiB0aGUgY2FzZSBvZiBleGVjbGlzdHMsIFBQR1RUIGlzIGVuYWJsZWQg YnkgdGhlIGNvbnRleHQgZGVzY3JpcHRvcgogCSAqIGFuZCB0aGUgUERQcyBhcmUgY29udGFpbmVk IHdpdGhpbiB0aGUgY29udGV4dCBpdHNlbGYuICBXZSBkb24ndAogCSAqIG5lZWQgdG8gZG8gYW55 dGhpbmcgaGVyZS4gKi8KQEAgLTE1NjYsMTYgKzE1NjEsMjMgQEAgaW50IGk5MTVfcHBndHRfaW5p dF9odyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWVsc2UKIAkJTUlTU0lOR19DQVNFKElOVEVM X0lORk8oZGV2KS0+Z2VuKTsKIAotCWlmIChwcGd0dCkgewotCQlmb3JfZWFjaF9yaW5nKHJpbmcs IGRldl9wcml2LCBpKSB7Ci0JCQlyZXQgPSBwcGd0dC0+c3dpdGNoX21tKHBwZ3R0LCByaW5nKTsK LQkJCWlmIChyZXQgIT0gMCkKLQkJCQlyZXR1cm4gcmV0OwotCQl9Ci0JfQorCXJldHVybiAwOwor fQogCi0JcmV0dXJuIHJldDsKK2ludCBpOTE1X3BwZ3R0X2luaXRfcmluZyhzdHJ1Y3QgaW50ZWxf ZW5naW5lX2NzICpyaW5nKQoreworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9 IHJpbmctPmRldi0+ZGV2X3ByaXZhdGU7CisJc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0ID0g ZGV2X3ByaXYtPm1tLmFsaWFzaW5nX3BwZ3R0OworCisJaWYgKGk5MTUuZW5hYmxlX2V4ZWNsaXN0 cykKKwkJcmV0dXJuIDA7CisKKwlpZiAoIXBwZ3R0KQorCQlyZXR1cm4gMDsKKworCXJldHVybiBw cGd0dC0+c3dpdGNoX21tKHBwZ3R0LCByaW5nKTsKIH0KKwogc3RydWN0IGk5MTVfaHdfcHBndHQg KgogaTkxNV9wcGd0dF9jcmVhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGRybV9p OTE1X2ZpbGVfcHJpdmF0ZSAqZnByaXYpCiB7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbV9ndHQuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5o CmluZGV4IDBkNDZkZDIuLjBjYWE5ZWIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtX2d0dC5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5o CkBAIC00NzUsNiArNDc1LDcgQEAgdm9pZCBpOTE1X2dsb2JhbF9ndHRfY2xlYW51cChzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2KTsKIAogaW50IGk5MTVfcHBndHRfaW5pdChzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2LCBzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQpOwogaW50IGk5MTVfcHBndHRfaW5p dF9odyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKK2ludCBpOTE1X3BwZ3R0X2luaXRfcmluZyhz dHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKTsKIHZvaWQgaTkxNV9wcGd0dF9yZWxlYXNlKHN0 cnVjdCBrcmVmICprcmVmKTsKIHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICppOTE1X3BwZ3R0X2NyZWF0 ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQkJCQlzdHJ1Y3QgZHJtX2k5MTVfZmlsZV9wcml2 YXRlICpmcHJpdik7Ci0tIAoxLjcuOS41CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5m cmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2ludGVsLWdmeAo=