From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH 20/53] drm/i915: Update ppgtt_init_ring() & context_enable() to take requests Date: Thu, 19 Feb 2015 17:17:32 +0000 Message-ID: <1424366285-29232-21-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: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id C96CC72092 for ; Thu, 19 Feb 2015 09:18:27 -0800 (PST) In-Reply-To: <1424366285-29232-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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KClRoZSBmaW5h bCBzdGVwIGluIHJlbW92aW5nIHRoZSBPTFIgZnJvbSBpOTE1X2dlbV9pbml0X2h3KCkgaXMgdG8g cGFzcyB0aGUgbmV3bHkKYWxsb2NhdGVkIHJlcXVlc3Qgc3RydWN0dXJlIGluIHRvIGVhY2ggc3Rl cCByYXRoZXIgdGhhbiBwYXNzaW5nIGEgcmluZwpzdHJ1Y3R1cmUuIFRoaXMgcGF0Y2ggdXBkYXRl cyBib3RoIGk5MTVfcHBndHRfaW5pdF9yaW5nKCkgYW5kCmk5MTVfZ2VtX2NvbnRleHRfZW5hYmxl KCkgdG8gdGFrZSByZXF1ZXN0IHBvaW50ZXJzLgoKRm9yOiBWSVotNTExNQpTaWduZWQtb2ZmLWJ5 OiBKb2huIEhhcnJpc29uIDxKb2huLkMuSGFycmlzb25ASW50ZWwuY29tPgotLS0KIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggICAgICAgICB8ICAgIDIgKy0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtLmMgICAgICAgICB8ICAgIDQgKystLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9nZW1fY29udGV4dC5jIHwgICAgNyArKysrLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2dlbV9ndHQuYyAgICAgfCAgICA2ICsrKy0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9nZW1fZ3R0LmggICAgIHwgICAgMiArLQogNSBmaWxlcyBjaGFuZ2VkLCAxMSBpbnNlcnRp b25zKCspLCAxMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCBlYTBk YTZiLi42MThhODQxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5o CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTI5OTAsNyArMjk5MCw3 IEBAIGludCBfX211c3RfY2hlY2sgaTkxNV9nZW1fY29udGV4dF9pbml0KHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYpOwogdm9pZCBpOTE1X2dlbV9jb250ZXh0X2Zpbmkoc3RydWN0IGRybV9kZXZpY2Ug KmRldik7CiB2b2lkIGk5MTVfZ2VtX2NvbnRleHRfcmVzZXQoc3RydWN0IGRybV9kZXZpY2UgKmRl dik7CiBpbnQgaTkxNV9nZW1fY29udGV4dF9vcGVuKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0 cnVjdCBkcm1fZmlsZSAqZmlsZSk7Ci1pbnQgaTkxNV9nZW1fY29udGV4dF9lbmFibGUoc3RydWN0 IGludGVsX2VuZ2luZV9jcyAqcmluZyk7CitpbnQgaTkxNV9nZW1fY29udGV4dF9lbmFibGUoc3Ry dWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpOwogdm9pZCBpOTE1X2dlbV9jb250ZXh0X2Ns b3NlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBkcm1fZmlsZSAqZmlsZSk7CiBpbnQg aTkxNV9zd2l0Y2hfY29udGV4dChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAogCQkJc3Ry dWN0IGludGVsX2NvbnRleHQgKnRvKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IGVmZWQ0 OWEuLjM3OWJmNDQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtNDg3Nyw3ICs0ODc3LDcg QEAgaTkxNV9nZW1faW5pdF9odyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQkJCWk5MTVfZ2Vt X2wzX3JlbWFwKHJpbmcsIGkpOwogCQl9CiAKLQkJcmV0ID0gaTkxNV9wcGd0dF9pbml0X3Jpbmco cmluZyk7CisJCXJldCA9IGk5MTVfcHBndHRfaW5pdF9yaW5nKHJlcSk7CiAJCWlmIChyZXQgJiYg cmV0ICE9IC1FSU8pIHsKIAkJCURSTV9FUlJPUigiUFBHVFQgZW5hYmxlIHJpbmcgIyVkIGZhaWxl ZCAlZFxuIiwgaSwgcmV0KTsKIAkJCWk5MTVfZ2VtX3JlcXVlc3RfdW5yZWZlcmVuY2UocmVxKTsK QEAgLTQ4ODUsNyArNDg4NSw3IEBAIGk5MTVfZ2VtX2luaXRfaHcoc3RydWN0IGRybV9kZXZpY2Ug KmRldikKIAkJCXJldHVybiByZXQ7CiAJCX0KIAotCQlyZXQgPSBpOTE1X2dlbV9jb250ZXh0X2Vu YWJsZShyaW5nKTsKKwkJcmV0ID0gaTkxNV9nZW1fY29udGV4dF9lbmFibGUocmVxKTsKIAkJaWYg KHJldCAmJiByZXQgIT0gLUVJTykgewogCQkJRFJNX0VSUk9SKCJDb250ZXh0IGVuYWJsZSByaW5n ICMlZCBmYWlsZWQgJWRcbiIsIGksIHJldCk7CiAJCQlpOTE1X2dlbV9yZXF1ZXN0X3VucmVmZXJl bmNlKHJlcSk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250 ZXh0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMKaW5kZXggZGQ4 M2Q2MS4uMDRkMmEyMCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1f Y29udGV4dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYwpA QCAtNDAzLDE3ICs0MDMsMTggQEAgdm9pZCBpOTE1X2dlbV9jb250ZXh0X2Zpbmkoc3RydWN0IGRy bV9kZXZpY2UgKmRldikKIAlpOTE1X2dlbV9jb250ZXh0X3VucmVmZXJlbmNlKGRjdHgpOwogfQog Ci1pbnQgaTkxNV9nZW1fY29udGV4dF9lbmFibGUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmlu ZykKK2ludCBpOTE1X2dlbV9jb250ZXh0X2VuYWJsZShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVl c3QgKnJlcSkKIHsKKwlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nID0gcmVxLT5yaW5nOwog CWludCByZXQ7CiAKIAlpZiAoaTkxNS5lbmFibGVfZXhlY2xpc3RzKSB7CiAJCWlmIChyaW5nLT5p bml0X2NvbnRleHQgPT0gTlVMTCkKIAkJCXJldHVybiAwOwogCi0JCXJldCA9IHJpbmctPmluaXRf Y29udGV4dChyaW5nLCByaW5nLT5kZWZhdWx0X2NvbnRleHQpOworCQlyZXQgPSByaW5nLT5pbml0 X2NvbnRleHQocmVxLT5yaW5nLCByaW5nLT5kZWZhdWx0X2NvbnRleHQpOwogCX0gZWxzZQotCQly ZXQgPSBpOTE1X3N3aXRjaF9jb250ZXh0KHJpbmcsIHJpbmctPmRlZmF1bHRfY29udGV4dCk7CisJ CXJldCA9IGk5MTVfc3dpdGNoX2NvbnRleHQocmVxLT5yaW5nLCByaW5nLT5kZWZhdWx0X2NvbnRl eHQpOwogCiAJaWYgKHJldCkgewogCQlEUk1fRVJST1IoInJpbmcgaW5pdCBjb250ZXh0OiAlZFxu IiwgcmV0KTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKaW5kZXggNDI4ZDJmNi4uY2Qw MDA4MCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKQEAgLTEyMjcsMTUgKzEyMjcs MTUgQEAgaW50IGk5MTVfcHBndHRfaW5pdF9odyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCXJl dHVybiAwOwogfQogCi1pbnQgaTkxNV9wcGd0dF9pbml0X3Jpbmcoc3RydWN0IGludGVsX2VuZ2lu ZV9jcyAqcmluZykKK2ludCBpOTE1X3BwZ3R0X2luaXRfcmluZyhzdHJ1Y3QgZHJtX2k5MTVfZ2Vt X3JlcXVlc3QgKnJlcSkKIHsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBy aW5nLT5kZXYtPmRldl9wcml2YXRlOworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diA9IHJlcS0+cmluZy0+ZGV2LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3QgaTkxNV9od19wcGd0dCAq cHBndHQgPSBkZXZfcHJpdi0+bW0uYWxpYXNpbmdfcHBndHQ7CiAKIAlpZiAoIXBwZ3R0KQogCQly ZXR1cm4gMDsKIAotCXJldHVybiBwcGd0dC0+c3dpdGNoX21tKHBwZ3R0LCByaW5nKTsKKwlyZXR1 cm4gcHBndHQtPnN3aXRjaF9tbShwcGd0dCwgcmVxLT5yaW5nKTsKIH0KIAogc3RydWN0IGk5MTVf aHdfcHBndHQgKgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0 LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaAppbmRleCA1YTZjZWY5Li5l N2UyMDJmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaAor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaApAQCAtMzAwLDcgKzMwMCw3 IEBAIHZvaWQgaTkxNV9nbG9iYWxfZ3R0X2NsZWFudXAoc3RydWN0IGRybV9kZXZpY2UgKmRldik7 CiAKIGludCBpOTE1X3BwZ3R0X2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGk5 MTVfaHdfcHBndHQgKnBwZ3R0KTsKIGludCBpOTE1X3BwZ3R0X2luaXRfaHcoc3RydWN0IGRybV9k ZXZpY2UgKmRldik7Ci1pbnQgaTkxNV9wcGd0dF9pbml0X3Jpbmcoc3RydWN0IGludGVsX2VuZ2lu ZV9jcyAqcmluZyk7CitpbnQgaTkxNV9wcGd0dF9pbml0X3Jpbmcoc3RydWN0IGRybV9pOTE1X2dl bV9yZXF1ZXN0ICpyZXEpOwogdm9pZCBpOTE1X3BwZ3R0X3JlbGVhc2Uoc3RydWN0IGtyZWYgKmty ZWYpOwogc3RydWN0IGk5MTVfaHdfcHBndHQgKmk5MTVfcHBndHRfY3JlYXRlKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYsCiAJCQkJCXN0cnVjdCBkcm1faTkxNV9maWxlX3ByaXZhdGUgKmZwcml2KTsK LS0gCjEuNy45LjUKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9y ZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4 Cg==