From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH 19/55] drm/i915: Update ppgtt_init_ring() & context_enable() to take requests Date: Fri, 29 May 2015 17:43:40 +0100 Message-ID: <1432917856-12261-20-git-send-email-John.C.Harrison@Intel.com> References: <1432917856-12261-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 8550F6EDE7 for ; Fri, 29 May 2015 09:44:38 -0700 (PDT) In-Reply-To: <1432917856-12261-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 OiBKb2huIEhhcnJpc29uIDxKb2huLkMuSGFycmlzb25ASW50ZWwuY29tPgpSZXZpZXdlZC1ieTog VG9tYXMgRWxmIDx0b21hcy5lbGZAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZHJ2LmggICAgICAgICB8ICAgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z2VtLmMgICAgICAgICB8ICAgIDQgKystLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1f Y29udGV4dC5jIHwgICAgMyArKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5j ICAgICB8ICAgIDYgKysrLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaCAg ICAgfCAgICAyICstCiA1IGZpbGVzIGNoYW5nZWQsIDkgaW5zZXJ0aW9ucygrKSwgOCBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCAyMTA0NWU3Li42M2Y1ODBjIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTMwMTMsNyArMzAxMyw3IEBAIGludCBfX211c3RfY2hl Y2sgaTkxNV9nZW1fY29udGV4dF9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogdm9pZCBp OTE1X2dlbV9jb250ZXh0X2Zpbmkoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CiB2b2lkIGk5MTVf Z2VtX2NvbnRleHRfcmVzZXQoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CiBpbnQgaTkxNV9nZW1f Y29udGV4dF9vcGVuKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBkcm1fZmlsZSAqZmls ZSk7Ci1pbnQgaTkxNV9nZW1fY29udGV4dF9lbmFibGUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAq cmluZyk7CitpbnQgaTkxNV9nZW1fY29udGV4dF9lbmFibGUoc3RydWN0IGRybV9pOTE1X2dlbV9y ZXF1ZXN0ICpyZXEpOwogdm9pZCBpOTE1X2dlbV9jb250ZXh0X2Nsb3NlKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYsIHN0cnVjdCBkcm1fZmlsZSAqZmlsZSk7CiBpbnQgaTkxNV9zd2l0Y2hfY29udGV4 dChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAogCQkJc3RydWN0IGludGVsX2NvbnRleHQg KnRvKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IDE5NjBlMzAuLjc3YjVlZWYgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtNTA4OCw3ICs1MDg4LDcgQEAgaTkxNV9nZW1faW5pdF9o dyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQkJCWk5MTVfZ2VtX2wzX3JlbWFwKHJpbmcsIGkp OwogCQl9CiAKLQkJcmV0ID0gaTkxNV9wcGd0dF9pbml0X3JpbmcocmluZyk7CisJCXJldCA9IGk5 MTVfcHBndHRfaW5pdF9yaW5nKHJlcSk7CiAJCWlmIChyZXQgJiYgcmV0ICE9IC1FSU8pIHsKIAkJ CURSTV9FUlJPUigiUFBHVFQgZW5hYmxlIHJpbmcgIyVkIGZhaWxlZCAlZFxuIiwgaSwgcmV0KTsK IAkJCWk5MTVfZ2VtX3JlcXVlc3RfY2FuY2VsKHJlcSk7CkBAIC01MDk2LDcgKzUwOTYsNyBAQCBp OTE1X2dlbV9pbml0X2h3KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCQlnb3RvIG91dDsKIAkJ fQogCi0JCXJldCA9IGk5MTVfZ2VtX2NvbnRleHRfZW5hYmxlKHJpbmcpOworCQlyZXQgPSBpOTE1 X2dlbV9jb250ZXh0X2VuYWJsZShyZXEpOwogCQlpZiAocmV0ICYmIHJldCAhPSAtRUlPKSB7CiAJ CQlEUk1fRVJST1IoIkNvbnRleHQgZW5hYmxlIHJpbmcgIyVkIGZhaWxlZCAlZFxuIiwgaSwgcmV0 KTsKIAkJCWk5MTVfZ2VtX3JlcXVlc3RfY2FuY2VsKHJlcSk7CmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbV9jb250ZXh0LmMKaW5kZXggMjU0MmJiYy4uZTkzNGRjNiAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYwpAQCAtNDA5LDggKzQwOSw5IEBAIHZvaWQgaTkxNV9n ZW1fY29udGV4dF9maW5pKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJaTkxNV9nZW1fY29udGV4 dF91bnJlZmVyZW5jZShkY3R4KTsKIH0KIAotaW50IGk5MTVfZ2VtX2NvbnRleHRfZW5hYmxlKHN0 cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCitpbnQgaTkxNV9nZW1fY29udGV4dF9lbmFibGUo c3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpCiB7CisJc3RydWN0IGludGVsX2VuZ2lu ZV9jcyAqcmluZyA9IHJlcS0+cmluZzsKIAlpbnQgcmV0OwogCiAJaWYgKGk5MTUuZW5hYmxlX2V4 ZWNsaXN0cykgewpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0 LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwppbmRleCBiMTRhZTYzLi43 M2Q2ZjllIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwpAQCAtMTU2NCw5ICsxNTY0 LDkgQEAgaW50IGk5MTVfcHBndHRfaW5pdF9odyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCXJl dHVybiAwOwogfQogCi1pbnQgaTkxNV9wcGd0dF9pbml0X3Jpbmcoc3RydWN0IGludGVsX2VuZ2lu ZV9jcyAqcmluZykKK2ludCBpOTE1X3BwZ3R0X2luaXRfcmluZyhzdHJ1Y3QgZHJtX2k5MTVfZ2Vt X3JlcXVlc3QgKnJlcSkKIHsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBy aW5nLT5kZXYtPmRldl9wcml2YXRlOworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diA9IHJlcS0+cmluZy0+ZGV2LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3QgaTkxNV9od19wcGd0dCAq cHBndHQgPSBkZXZfcHJpdi0+bW0uYWxpYXNpbmdfcHBndHQ7CiAKIAlpZiAoaTkxNS5lbmFibGVf ZXhlY2xpc3RzKQpAQCAtMTU3NSw3ICsxNTc1LDcgQEAgaW50IGk5MTVfcHBndHRfaW5pdF9yaW5n KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCiAJaWYgKCFwcGd0dCkKIAkJcmV0dXJuIDA7 CiAKLQlyZXR1cm4gcHBndHQtPnN3aXRjaF9tbShwcGd0dCwgcmluZyk7CisJcmV0dXJuIHBwZ3R0 LT5zd2l0Y2hfbW0ocHBndHQsIHJlcS0+cmluZyk7CiB9CiAKIHN0cnVjdCBpOTE1X2h3X3BwZ3R0 ICoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmgKaW5kZXggMGNhYTllYi4uNzVkZmEwNSAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmgKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmgKQEAgLTQ3NSw3ICs0NzUsNyBAQCB2b2lk IGk5MTVfZ2xvYmFsX2d0dF9jbGVhbnVwKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogCiBpbnQg aTkxNV9wcGd0dF9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBpOTE1X2h3X3Bw Z3R0ICpwcGd0dCk7CiBpbnQgaTkxNV9wcGd0dF9pbml0X2h3KHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYpOwotaW50IGk5MTVfcHBndHRfaW5pdF9yaW5nKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJp bmcpOworaW50IGk5MTVfcHBndHRfaW5pdF9yaW5nKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVz dCAqcmVxKTsKIHZvaWQgaTkxNV9wcGd0dF9yZWxlYXNlKHN0cnVjdCBrcmVmICprcmVmKTsKIHN0 cnVjdCBpOTE1X2h3X3BwZ3R0ICppOTE1X3BwZ3R0X2NyZWF0ZShzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2LAogCQkJCQlzdHJ1Y3QgZHJtX2k5MTVfZmlsZV9wcml2YXRlICpmcHJpdik7Ci0tIAoxLjcu OS41CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRl bC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDov L2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=