From mboxrd@z Thu Jan  1 00:00:00 1970
From: John.C.Harrison@Intel.com
Subject: [PATCH 17/53] drm/i915: Split i915_ppgtt_init_hw() in
	half - generic and per ring
Date: Thu, 19 Feb 2015 17:17:29 +0000
Message-ID: <1424366285-29232-18-git-send-email-John.C.Harrison@Intel.com>
References: <1423828140-10653-1-git-send-email-John.C.Harrison@Intel.com>
 <1424366285-29232-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: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga03.intel.com (mga03.intel.com [134.134.136.65])
 by gabe.freedesktop.org (Postfix) with ESMTP id 09B2872089
 for <Intel-GFX@lists.freedesktop.org>; Thu, 19 Feb 2015 09:18:24 -0800 (PST)
In-Reply-To: <1424366285-29232-1-git-send-email-John.C.Harrison@Intel.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
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
fCAgIDI1ICsrKysrKysrKysrKy0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5
MTVfZ2VtX2d0dC5oIHwgICAgMSArCiAzIGZpbGVzIGNoYW5nZWQsIDMyIGluc2VydGlvbnMoKyks
IDE5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf
Z2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IDUxZjcxOWMuLjli
YzYwZDcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIv
ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtNDg0NCwxOSArNDg0NCwzMiBAQCBp
OTE1X2dlbV9pbml0X2h3KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJICovCiAJaW5pdF91bnVz
ZWRfcmluZ3MoZGV2KTsKIAorCXJldCA9IGk5MTVfcHBndHRfaW5pdF9odyhkZXYpOworCWlmIChy
ZXQpIHsKKwkJRFJNX0VSUk9SKCJQUEdUVCBlbmFibGUgSFcgZmFpbGVkICVkXG4iLCByZXQpOwor
CQlyZXR1cm4gcmV0OworCX0KKworCS8qIE5lZWQgdG8gZG8gYmFzaWMgaW5pdGlhbGlzYXRpb24g
b2YgYWxsIHJpbmdzIGZpcnN0OiAqLwogCWZvcl9lYWNoX3JpbmcocmluZywgZGV2X3ByaXYsIGkp
IHsKIAkJcmV0ID0gcmluZy0+aW5pdF9odyhyaW5nKTsKIAkJaWYgKHJldCkKIAkJCXJldHVybiBy
ZXQ7CiAJfQogCi0JZm9yIChpID0gMDsgaSA8IE5VTV9MM19TTElDRVMoZGV2KTsgaSsrKQotCQlp
OTE1X2dlbV9sM19yZW1hcCgmZGV2X3ByaXYtPnJpbmdbUkNTXSwgaSk7CisJLyogTm93IGl0IGlz
IHNhZmUgdG8gZ28gYmFjayByb3VuZCBhbmQgZG8gZXZlcnl0aGluZyBlbHNlOiAqLworCWZvcl9l
YWNoX3JpbmcocmluZywgZGV2X3ByaXYsIGkpIHsKKwkJaWYgKHJpbmctPmlkID09IFJDUykgewor
CQkJZm9yIChpID0gMDsgaSA8IE5VTV9MM19TTElDRVMoZGV2KTsgaSsrKQorCQkJCWk5MTVfZ2Vt
X2wzX3JlbWFwKHJpbmcsIGkpOworCQl9CiAKLQlyZXQgPSBpOTE1X3BwZ3R0X2luaXRfaHcoZGV2
KTsKLQlpZiAocmV0ICYmIHJldCAhPSAtRUlPKSB7Ci0JCURSTV9FUlJPUigiUFBHVFQgZW5hYmxl
IGZhaWxlZCAlZFxuIiwgcmV0KTsKLQkJaTkxNV9nZW1fY2xlYW51cF9yaW5nYnVmZmVyKGRldik7
CisJCXJldCA9IGk5MTVfcHBndHRfaW5pdF9yaW5nKHJpbmcpOworCQlpZiAocmV0ICYmIHJldCAh
PSAtRUlPKSB7CisJCQlEUk1fRVJST1IoIlBQR1RUIGVuYWJsZSByaW5nICMlZCBmYWlsZWQgJWRc
biIsIGksIHJldCk7CisJCQlpOTE1X2dlbV9jbGVhbnVwX3JpbmdidWZmZXIoZGV2KTsKKwkJCXJl
dHVybiByZXQ7CisJCX0KIAl9CiAKIAlyZXQgPSBpOTE1X2dlbV9jb250ZXh0X2VuYWJsZShkZXZf
cHJpdik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyBi
L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCmluZGV4IGU1NGIyYTAuLjQyOGQy
ZjYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCisrKyBi
L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCkBAIC0xMjA2LDExICsxMjA2LDYg
QEAgaW50IGk5MTVfcHBndHRfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgaTkx
NV9od19wcGd0dCAqcHBndHQpCiAKIGludCBpOTE1X3BwZ3R0X2luaXRfaHcoc3RydWN0IGRybV9k
ZXZpY2UgKmRldikKIHsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYt
PmRldl9wcml2YXRlOwotCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmc7Ci0Jc3RydWN0IGk5
MTVfaHdfcHBndHQgKnBwZ3R0ID0gZGV2X3ByaXYtPm1tLmFsaWFzaW5nX3BwZ3R0OwotCWludCBp
LCByZXQgPSAwOwotCiAJLyogSW4gdGhlIGNhc2Ugb2YgZXhlY2xpc3RzLCBQUEdUVCBpcyBlbmFi
bGVkIGJ5IHRoZSBjb250ZXh0IGRlc2NyaXB0b3IKIAkgKiBhbmQgdGhlIFBEUHMgYXJlIGNvbnRh
aW5lZCB3aXRoaW4gdGhlIGNvbnRleHQgaXRzZWxmLiAgV2UgZG9uJ3QKIAkgKiBuZWVkIHRvIGRv
IGFueXRoaW5nIGhlcmUuICovCkBAIC0xMjI5LDE2ICsxMjI0LDIwIEBAIGludCBpOTE1X3BwZ3R0
X2luaXRfaHcoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAllbHNlCiAJCU1JU1NJTkdfQ0FTRShJ
TlRFTF9JTkZPKGRldiktPmdlbik7CiAKLQlpZiAocHBndHQpIHsKLQkJZm9yX2VhY2hfcmluZyhy
aW5nLCBkZXZfcHJpdiwgaSkgewotCQkJcmV0ID0gcHBndHQtPnN3aXRjaF9tbShwcGd0dCwgcmlu
Zyk7Ci0JCQlpZiAocmV0ICE9IDApCi0JCQkJcmV0dXJuIHJldDsKLQkJfQotCX0KKwlyZXR1cm4g
MDsKK30KIAotCXJldHVybiByZXQ7CitpbnQgaTkxNV9wcGd0dF9pbml0X3Jpbmcoc3RydWN0IGlu
dGVsX2VuZ2luZV9jcyAqcmluZykKK3sKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By
aXYgPSByaW5nLT5kZXYtPmRldl9wcml2YXRlOworCXN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0
dCA9IGRldl9wcml2LT5tbS5hbGlhc2luZ19wcGd0dDsKKworCWlmICghcHBndHQpCisJCXJldHVy
biAwOworCisJcmV0dXJuIHBwZ3R0LT5zd2l0Y2hfbW0ocHBndHQsIHJpbmcpOwogfQorCiBzdHJ1
Y3QgaTkxNV9od19wcGd0dCAqCiBpOTE1X3BwZ3R0X2NyZWF0ZShzdHJ1Y3QgZHJtX2RldmljZSAq
ZGV2LCBzdHJ1Y3QgZHJtX2k5MTVfZmlsZV9wcml2YXRlICpmcHJpdikKIHsKZGlmZiAtLWdpdCBh
L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oIGIvZHJpdmVycy9ncHUvZHJtL2k5
MTUvaTkxNV9nZW1fZ3R0LmgKaW5kZXggOGY3Njk5MC4uNWE2Y2VmOSAxMDA2NDQKLS0tIGEvZHJp
dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5
MTUvaTkxNV9nZW1fZ3R0LmgKQEAgLTMwMCw2ICszMDAsNyBAQCB2b2lkIGk5MTVfZ2xvYmFsX2d0
dF9jbGVhbnVwKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogCiBpbnQgaTkxNV9wcGd0dF9pbml0
KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCk7CiBp
bnQgaTkxNV9wcGd0dF9pbml0X2h3KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOworaW50IGk5MTVf
cHBndHRfaW5pdF9yaW5nKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpOwogdm9pZCBpOTE1
X3BwZ3R0X3JlbGVhc2Uoc3RydWN0IGtyZWYgKmtyZWYpOwogc3RydWN0IGk5MTVfaHdfcHBndHQg
Kmk5MTVfcHBndHRfY3JlYXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQkJCXN0cnVjdCBk
cm1faTkxNV9maWxlX3ByaXZhdGUgKmZwcml2KTsKLS0gCjEuNy45LjUKCl9fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QK
SW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Au
b3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==