From mboxrd@z Thu Jan  1 00:00:00 1970
From: John.C.Harrison@Intel.com
Subject: [PATCH 18/59] drm/i915: Split i915_ppgtt_init_hw() in
	half - generic and per ring
Date: Thu, 19 Mar 2015 12:30:23 +0000
Message-ID: <1426768264-16996-19-git-send-email-John.C.Harrison@Intel.com>
References: <1426768264-16996-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 mga02.intel.com (mga02.intel.com [134.134.136.20])
 by gabe.freedesktop.org (Postfix) with ESMTP id 7139C6EA13
 for <Intel-GFX@lists.freedesktop.org>; Thu, 19 Mar 2015 05:31:27 -0700 (PDT)
In-Reply-To: <1426768264-16996-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
fCAgIDI4ICsrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1
L2k5MTVfZ2VtX2d0dC5oIHwgICAgMSArCiAzIGZpbGVzIGNoYW5nZWQsIDM1IGluc2VydGlvbnMo
KyksIDE5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5
MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IDg2NzcyOTMu
LjY4M2ZjODAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysr
IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtNDg4MywxOSArNDg4MywzMiBA
QCBpOTE1X2dlbV9pbml0X2h3KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJICovCiAJaW5pdF91
bnVzZWRfcmluZ3MoZGV2KTsKIAorCXJldCA9IGk5MTVfcHBndHRfaW5pdF9odyhkZXYpOworCWlm
IChyZXQpIHsKKwkJRFJNX0VSUk9SKCJQUEdUVCBlbmFibGUgSFcgZmFpbGVkICVkXG4iLCByZXQp
OworCQlnb3RvIG91dDsKKwl9CisKKwkvKiBOZWVkIHRvIGRvIGJhc2ljIGluaXRpYWxpc2F0aW9u
IG9mIGFsbCByaW5ncyBmaXJzdDogKi8KIAlmb3JfZWFjaF9yaW5nKHJpbmcsIGRldl9wcml2LCBp
KSB7CiAJCXJldCA9IHJpbmctPmluaXRfaHcocmluZyk7CiAJCWlmIChyZXQpCiAJCQlnb3RvIG91
dDsKIAl9CiAKLQlmb3IgKGkgPSAwOyBpIDwgTlVNX0wzX1NMSUNFUyhkZXYpOyBpKyspCi0JCWk5
MTVfZ2VtX2wzX3JlbWFwKCZkZXZfcHJpdi0+cmluZ1tSQ1NdLCBpKTsKKwkvKiBOb3cgaXQgaXMg
c2FmZSB0byBnbyBiYWNrIHJvdW5kIGFuZCBkbyBldmVyeXRoaW5nIGVsc2U6ICovCisJZm9yX2Vh
Y2hfcmluZyhyaW5nLCBkZXZfcHJpdiwgaSkgeworCQlpZiAocmluZy0+aWQgPT0gUkNTKSB7CisJ
CQlmb3IgKGkgPSAwOyBpIDwgTlVNX0wzX1NMSUNFUyhkZXYpOyBpKyspCisJCQkJaTkxNV9nZW1f
bDNfcmVtYXAocmluZywgaSk7CisJCX0KIAotCXJldCA9IGk5MTVfcHBndHRfaW5pdF9odyhkZXYp
OwotCWlmIChyZXQgJiYgcmV0ICE9IC1FSU8pIHsKLQkJRFJNX0VSUk9SKCJQUEdUVCBlbmFibGUg
ZmFpbGVkICVkXG4iLCByZXQpOwotCQlpOTE1X2dlbV9jbGVhbnVwX3JpbmdidWZmZXIoZGV2KTsK
KwkJcmV0ID0gaTkxNV9wcGd0dF9pbml0X3JpbmcocmluZyk7CisJCWlmIChyZXQgJiYgcmV0ICE9
IC1FSU8pIHsKKwkJCURSTV9FUlJPUigiUFBHVFQgZW5hYmxlIHJpbmcgIyVkIGZhaWxlZCAlZFxu
IiwgaSwgcmV0KTsKKwkJCWk5MTVfZ2VtX2NsZWFudXBfcmluZ2J1ZmZlcihkZXYpOworCQkJZ290
byBvdXQ7CisJCX0KIAl9CiAKIAlyZXQgPSBpOTE1X2dlbV9jb250ZXh0X2VuYWJsZShkZXZfcHJp
dik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyBiL2Ry
aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCmluZGV4IGQ4ZmYxYTguLjgzMDc2ZDcg
MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCisrKyBiL2Ry
aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCkBAIC0xMjgwLDExICsxMjgwLDYgQEAg
aW50IGk5MTVfcHBndHRfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgaTkxNV9o
d19wcGd0dCAqcHBndHQpCiAKIGludCBpOTE1X3BwZ3R0X2luaXRfaHcoc3RydWN0IGRybV9kZXZp
Y2UgKmRldikKIHsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRl
dl9wcml2YXRlOwotCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmc7Ci0Jc3RydWN0IGk5MTVf
aHdfcHBndHQgKnBwZ3R0ID0gZGV2X3ByaXYtPm1tLmFsaWFzaW5nX3BwZ3R0OwotCWludCBpLCBy
ZXQgPSAwOwotCiAJLyogSW4gdGhlIGNhc2Ugb2YgZXhlY2xpc3RzLCBQUEdUVCBpcyBlbmFibGVk
IGJ5IHRoZSBjb250ZXh0IGRlc2NyaXB0b3IKIAkgKiBhbmQgdGhlIFBEUHMgYXJlIGNvbnRhaW5l
ZCB3aXRoaW4gdGhlIGNvbnRleHQgaXRzZWxmLiAgV2UgZG9uJ3QKIAkgKiBuZWVkIHRvIGRvIGFu
eXRoaW5nIGhlcmUuICovCkBAIC0xMzAzLDE2ICsxMjk4LDIzIEBAIGludCBpOTE1X3BwZ3R0X2lu
aXRfaHcoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAllbHNlCiAJCU1JU1NJTkdfQ0FTRShJTlRF
TF9JTkZPKGRldiktPmdlbik7CiAKLQlpZiAocHBndHQpIHsKLQkJZm9yX2VhY2hfcmluZyhyaW5n
LCBkZXZfcHJpdiwgaSkgewotCQkJcmV0ID0gcHBndHQtPnN3aXRjaF9tbShwcGd0dCwgcmluZyk7
Ci0JCQlpZiAocmV0ICE9IDApCi0JCQkJcmV0dXJuIHJldDsKLQkJfQotCX0KKwlyZXR1cm4gMDsK
K30KIAotCXJldHVybiByZXQ7CitpbnQgaTkxNV9wcGd0dF9pbml0X3Jpbmcoc3RydWN0IGludGVs
X2VuZ2luZV9jcyAqcmluZykKK3sKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYg
PSByaW5nLT5kZXYtPmRldl9wcml2YXRlOworCXN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCA9
IGRldl9wcml2LT5tbS5hbGlhc2luZ19wcGd0dDsKKworCWlmIChpOTE1LmVuYWJsZV9leGVjbGlz
dHMpCisJCXJldHVybiAwOworCisJaWYgKCFwcGd0dCkKKwkJcmV0dXJuIDA7CisKKwlyZXR1cm4g
cHBndHQtPnN3aXRjaF9tbShwcGd0dCwgcmluZyk7CiB9CisKIHN0cnVjdCBpOTE1X2h3X3BwZ3R0
ICoKIGk5MTVfcHBndHRfY3JlYXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBkcm1f
aTkxNV9maWxlX3ByaXZhdGUgKmZwcml2KQogewpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt
L2k5MTUvaTkxNV9nZW1fZ3R0LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQu
aAppbmRleCBjOWU5M2Y1Li4yOTQxZmJiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx
NS9pOTE1X2dlbV9ndHQuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQu
aApAQCAtMzExLDYgKzMxMSw3IEBAIHZvaWQgaTkxNV9nbG9iYWxfZ3R0X2NsZWFudXAoc3RydWN0
IGRybV9kZXZpY2UgKmRldik7CiAKIGludCBpOTE1X3BwZ3R0X2luaXQoc3RydWN0IGRybV9kZXZp
Y2UgKmRldiwgc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0KTsKIGludCBpOTE1X3BwZ3R0X2lu
aXRfaHcoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CitpbnQgaTkxNV9wcGd0dF9pbml0X3Jpbmco
c3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyk7CiB2b2lkIGk5MTVfcHBndHRfcmVsZWFzZShz
dHJ1Y3Qga3JlZiAqa3JlZik7CiBzdHJ1Y3QgaTkxNV9od19wcGd0dCAqaTkxNV9wcGd0dF9jcmVh
dGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJCQkJc3RydWN0IGRybV9pOTE1X2ZpbGVfcHJp
dmF0ZSAqZnByaXYpOwotLSAKMS43LjkuNQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMu
ZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0
aW5mby9pbnRlbC1nZngK