From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH 22/59] drm/i915: Update ppgtt_init_ring() & context_enable() to take requests Date: Thu, 19 Mar 2015 12:30:27 +0000 Message-ID: <1426768264-16996-23-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: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 16B1A6EA16 for ; Thu, 19 Mar 2015 05:31:32 -0700 (PDT) In-Reply-To: <1426768264-16996-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 MTUvaTkxNV9nZW1fY29udGV4dC5jIHwgICAgMyArKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtX2d0dC5jICAgICB8ICAgIDYgKysrLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbV9ndHQuaCAgICAgfCAgICAyICstCiA1IGZpbGVzIGNoYW5nZWQsIDkgaW5zZXJ0aW9ucygr KSwgOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCBhYTA2OTViLi5l MTM5ZjBlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTI4OTAsNyArMjg5MCw3IEBAIGlu dCBfX211c3RfY2hlY2sgaTkxNV9nZW1fY29udGV4dF9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYpOwogdm9pZCBpOTE1X2dlbV9jb250ZXh0X2Zpbmkoc3RydWN0IGRybV9kZXZpY2UgKmRldik7 CiB2b2lkIGk5MTVfZ2VtX2NvbnRleHRfcmVzZXQoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CiBp bnQgaTkxNV9nZW1fY29udGV4dF9vcGVuKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBk cm1fZmlsZSAqZmlsZSk7Ci1pbnQgaTkxNV9nZW1fY29udGV4dF9lbmFibGUoc3RydWN0IGludGVs X2VuZ2luZV9jcyAqcmluZyk7CitpbnQgaTkxNV9nZW1fY29udGV4dF9lbmFibGUoc3RydWN0IGRy bV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpOwogdm9pZCBpOTE1X2dlbV9jb250ZXh0X2Nsb3NlKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBkcm1fZmlsZSAqZmlsZSk7CiBpbnQgaTkxNV9z d2l0Y2hfY29udGV4dChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAogCQkJc3RydWN0IGlu dGVsX2NvbnRleHQgKnRvKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IDQ0NTI2MTguLjlk Nzc2YTUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtNDkxNSw3ICs0OTE1LDcgQEAgaTkx NV9nZW1faW5pdF9odyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQkJCWk5MTVfZ2VtX2wzX3Jl bWFwKHJpbmcsIGkpOwogCQl9CiAKLQkJcmV0ID0gaTkxNV9wcGd0dF9pbml0X3JpbmcocmluZyk7 CisJCXJldCA9IGk5MTVfcHBndHRfaW5pdF9yaW5nKHJlcSk7CiAJCWlmIChyZXQgJiYgcmV0ICE9 IC1FSU8pIHsKIAkJCURSTV9FUlJPUigiUFBHVFQgZW5hYmxlIHJpbmcgIyVkIGZhaWxlZCAlZFxu IiwgaSwgcmV0KTsKIAkJCWk5MTVfZ2VtX3JlcXVlc3RfY2FuY2VsKHJlcSk7CkBAIC00OTIzLDcg KzQ5MjMsNyBAQCBpOTE1X2dlbV9pbml0X2h3KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCQln b3RvIG91dDsKIAkJfQogCi0JCXJldCA9IGk5MTVfZ2VtX2NvbnRleHRfZW5hYmxlKHJpbmcpOwor CQlyZXQgPSBpOTE1X2dlbV9jb250ZXh0X2VuYWJsZShyZXEpOwogCQlpZiAocmV0ICYmIHJldCAh PSAtRUlPKSB7CiAJCQlEUk1fRVJST1IoIkNvbnRleHQgZW5hYmxlIHJpbmcgIyVkIGZhaWxlZCAl ZFxuIiwgaSwgcmV0KTsKIAkJCWk5MTVfZ2VtX3JlcXVlc3RfY2FuY2VsKHJlcSk7CmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMKaW5kZXggZjUxZmFhZC4uNjQ3YjQ4ZCAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYwpAQCAtNDA3LDggKzQwNyw5IEBA IHZvaWQgaTkxNV9nZW1fY29udGV4dF9maW5pKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJaTkx NV9nZW1fY29udGV4dF91bnJlZmVyZW5jZShkY3R4KTsKIH0KIAotaW50IGk5MTVfZ2VtX2NvbnRl eHRfZW5hYmxlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCitpbnQgaTkxNV9nZW1fY29u dGV4dF9lbmFibGUoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpCiB7CisJc3RydWN0 IGludGVsX2VuZ2luZV9jcyAqcmluZyA9IHJlcS0+cmluZzsKIAlpbnQgcmV0OwogCiAJaWYgKGk5 MTUuZW5hYmxlX2V4ZWNsaXN0cykgewpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9nZW1fZ3R0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwppbmRl eCA4MzA3NmQ3Li5hYzYzNTcyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbV9ndHQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwpAQCAt MTMwMSw5ICsxMzAxLDkgQEAgaW50IGk5MTVfcHBndHRfaW5pdF9odyhzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2KQogCXJldHVybiAwOwogfQogCi1pbnQgaTkxNV9wcGd0dF9pbml0X3Jpbmcoc3RydWN0 IGludGVsX2VuZ2luZV9jcyAqcmluZykKK2ludCBpOTE1X3BwZ3R0X2luaXRfcmluZyhzdHJ1Y3Qg ZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSkKIHsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYgPSByaW5nLT5kZXYtPmRldl9wcml2YXRlOworCXN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiA9IHJlcS0+cmluZy0+ZGV2LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3QgaTkx NV9od19wcGd0dCAqcHBndHQgPSBkZXZfcHJpdi0+bW0uYWxpYXNpbmdfcHBndHQ7CiAKIAlpZiAo aTkxNS5lbmFibGVfZXhlY2xpc3RzKQpAQCAtMTMxMiw3ICsxMzEyLDcgQEAgaW50IGk5MTVfcHBn dHRfaW5pdF9yaW5nKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCiAJaWYgKCFwcGd0dCkK IAkJcmV0dXJuIDA7CiAKLQlyZXR1cm4gcHBndHQtPnN3aXRjaF9tbShwcGd0dCwgcmluZyk7CisJ cmV0dXJuIHBwZ3R0LT5zd2l0Y2hfbW0ocHBndHQsIHJlcS0+cmluZyk7CiB9CiAKIHN0cnVjdCBp OTE1X2h3X3BwZ3R0ICoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt X2d0dC5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmgKaW5kZXggMjk0MWZi Yi4uZDRjNzE4NCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0 LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmgKQEAgLTMxMSw3ICsz MTEsNyBAQCB2b2lkIGk5MTVfZ2xvYmFsX2d0dF9jbGVhbnVwKHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYpOwogCiBpbnQgaTkxNV9wcGd0dF9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVj dCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCk7CiBpbnQgaTkxNV9wcGd0dF9pbml0X2h3KHN0cnVjdCBk cm1fZGV2aWNlICpkZXYpOwotaW50IGk5MTVfcHBndHRfaW5pdF9yaW5nKHN0cnVjdCBpbnRlbF9l bmdpbmVfY3MgKnJpbmcpOworaW50IGk5MTVfcHBndHRfaW5pdF9yaW5nKHN0cnVjdCBkcm1faTkx NV9nZW1fcmVxdWVzdCAqcmVxKTsKIHZvaWQgaTkxNV9wcGd0dF9yZWxlYXNlKHN0cnVjdCBrcmVm ICprcmVmKTsKIHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICppOTE1X3BwZ3R0X2NyZWF0ZShzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2LAogCQkJCQlzdHJ1Y3QgZHJtX2k5MTVfZmlsZV9wcml2YXRlICpmcHJp dik7Ci0tIAoxLjcuOS41CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVs LWdmeAo=