From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH 16/55] drm/i915: Moved the for_each_ring loop outside of i915_gem_context_enable() Date: Fri, 29 May 2015 17:43:37 +0100 Message-ID: <1432917856-12261-17-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 63B926EDE7 for ; Fri, 29 May 2015 09:44:35 -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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KClRoZSBzdGFy dCBvZiBkYXkgY29udGV4dCBpbml0aWFsaXNhdGlvbiBjb2RlIGluIGk5MTVfZ2VtX2NvbnRleHRf ZW5hYmxlKCkgbG9vcHMKb3ZlciBlYWNoIHJpbmcgYW5kIGNhbGxzIHRoZSBsZWdhY3kgc3dpdGNo IGNvbnRleHQgb3IgdGhlIGV4ZWNsaXN0IGluaXQgY29udGV4dApjb2RlIGFzIGFwcHJvcHJpYXRl LgoKVGhpcyBwYXRjaCBtb3ZlcyB0aGUgcmluZyBsb29waW5nIG91dCBvZiB0aGF0IGZ1bmN0aW9u IGluIHRvIHRoZSB0b3AgbGV2ZWwKY2FsbGVyIGk5MTVfZ2VtX2luaXRfaHcoKS4gVGhpcyBtZWFu cyB0aGUgYSBzaW5nbGUgcGFzcyBjYW4gYmUgbWFkZSBvdmVyIGFsbApyaW5ncyBkb2luZyB0aGUg UFBHVFQsIEwzIHJlbWFwIGFuZCBjb250ZXh0IGluaXRpYWxpc2F0aW9uIG9mIGVhY2ggcmluZwph bHRvZ2V0aGVyLgoKRm9yOiBWSVotNTExNQpTaWduZWQtb2ZmLWJ5OiBKb2huIEhhcnJpc29uIDxK b2huLkMuSGFycmlzb25ASW50ZWwuY29tPgpSZXZpZXdlZC1ieTogVG9tYXMgRWxmIDx0b21hcy5l bGZAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggICAgICAg ICB8ICAgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgICAgICAgICB8ICAg MTcgKysrKysrKysrLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4 dC5jIHwgICAzMiArKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tCiAzIGZpbGVzIGNoYW5n ZWQsIDIyIGluc2VydGlvbnMoKyksIDI5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry di5oCmluZGV4IGY1YTczM2IuLjY5YzhmNTYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAt MzAxMiw3ICszMDEyLDcgQEAgaW50IF9fbXVzdF9jaGVjayBpOTE1X2dlbV9jb250ZXh0X2luaXQo c3RydWN0IGRybV9kZXZpY2UgKmRldik7CiB2b2lkIGk5MTVfZ2VtX2NvbnRleHRfZmluaShzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2KTsKIHZvaWQgaTkxNV9nZW1fY29udGV4dF9yZXNldChzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2KTsKIGludCBpOTE1X2dlbV9jb250ZXh0X29wZW4oc3RydWN0IGRybV9k ZXZpY2UgKmRldiwgc3RydWN0IGRybV9maWxlICpmaWxlKTsKLWludCBpOTE1X2dlbV9jb250ZXh0 X2VuYWJsZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOworaW50IGk5MTVfZ2Vt X2NvbnRleHRfZW5hYmxlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpOwogdm9pZCBpOTE1 X2dlbV9jb250ZXh0X2Nsb3NlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBkcm1fZmls ZSAqZmlsZSk7CiBpbnQgaTkxNV9zd2l0Y2hfY29udGV4dChzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz ICpyaW5nLAogCQkJc3RydWN0IGludGVsX2NvbnRleHQgKnRvKTsKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bS5jCmluZGV4IGU2ZWIzMWQuLmEyNzEyYTYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAt NTA1Niw2ICs1MDU2LDggQEAgaTkxNV9nZW1faW5pdF9odyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 KQogCSAqLwogCWluaXRfdW51c2VkX3JpbmdzKGRldik7CiAKKwlCVUdfT04oIWRldl9wcml2LT5y aW5nW1JDU10uZGVmYXVsdF9jb250ZXh0KTsKKwogCXJldCA9IGk5MTVfcHBndHRfaW5pdF9odyhk ZXYpOwogCWlmIChyZXQpIHsKIAkJRFJNX0VSUk9SKCJQUEdUVCBlbmFibGUgSFcgZmFpbGVkICVk XG4iLCByZXQpOwpAQCAtNTA3MSw2ICs1MDczLDggQEAgaTkxNV9nZW1faW5pdF9odyhzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2KQogCiAJLyogTm93IGl0IGlzIHNhZmUgdG8gZ28gYmFjayByb3VuZCBh bmQgZG8gZXZlcnl0aGluZyBlbHNlOiAqLwogCWZvcl9lYWNoX3JpbmcocmluZywgZGV2X3ByaXYs IGkpIHsKKwkJV0FSTl9PTighcmluZy0+ZGVmYXVsdF9jb250ZXh0KTsKKwogCQlpZiAocmluZy0+ aWQgPT0gUkNTKSB7CiAJCQlmb3IgKGkgPSAwOyBpIDwgTlVNX0wzX1NMSUNFUyhkZXYpOyBpKysp CiAJCQkJaTkxNV9nZW1fbDNfcmVtYXAocmluZywgaSk7CkBAIC01MDgyLDE0ICs1MDg2LDEzIEBA IGk5MTVfZ2VtX2luaXRfaHcoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJCWk5MTVfZ2VtX2Ns ZWFudXBfcmluZ2J1ZmZlcihkZXYpOwogCQkJZ290byBvdXQ7CiAJCX0KLQl9CiAKLQlyZXQgPSBp OTE1X2dlbV9jb250ZXh0X2VuYWJsZShkZXZfcHJpdik7Ci0JaWYgKHJldCAmJiByZXQgIT0gLUVJ TykgewotCQlEUk1fRVJST1IoIkNvbnRleHQgZW5hYmxlIGZhaWxlZCAlZFxuIiwgcmV0KTsKLQkJ aTkxNV9nZW1fY2xlYW51cF9yaW5nYnVmZmVyKGRldik7Ci0KLQkJZ290byBvdXQ7CisJCXJldCA9 IGk5MTVfZ2VtX2NvbnRleHRfZW5hYmxlKHJpbmcpOworCQlpZiAocmV0ICYmIHJldCAhPSAtRUlP KSB7CisJCQlEUk1fRVJST1IoIkNvbnRleHQgZW5hYmxlIHJpbmcgIyVkIGZhaWxlZCAlZFxuIiwg aSwgcmV0KTsKKwkJCWk5MTVfZ2VtX2NsZWFudXBfcmluZ2J1ZmZlcihkZXYpOworCQkJZ290byBv dXQ7CisJCX0KIAl9CiAKIG91dDoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtX2NvbnRleHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQu YwppbmRleCA4ODY3ODE4Li4yNTQyYmJjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2dlbV9jb250ZXh0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1f Y29udGV4dC5jCkBAIC00MDksMzIgKzQwOSwyMiBAQCB2b2lkIGk5MTVfZ2VtX2NvbnRleHRfZmlu aShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWk5MTVfZ2VtX2NvbnRleHRfdW5yZWZlcmVuY2Uo ZGN0eCk7CiB9CiAKLWludCBpOTE1X2dlbV9jb250ZXh0X2VuYWJsZShzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYpCitpbnQgaTkxNV9nZW1fY29udGV4dF9lbmFibGUoc3RydWN0IGlu dGVsX2VuZ2luZV9jcyAqcmluZykKIHsKLQlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nOwot CWludCByZXQsIGk7Ci0KLQlCVUdfT04oIWRldl9wcml2LT5yaW5nW1JDU10uZGVmYXVsdF9jb250 ZXh0KTsKKwlpbnQgcmV0OwogCiAJaWYgKGk5MTUuZW5hYmxlX2V4ZWNsaXN0cykgewotCQlmb3Jf ZWFjaF9yaW5nKHJpbmcsIGRldl9wcml2LCBpKSB7Ci0JCQlpZiAocmluZy0+aW5pdF9jb250ZXh0 KSB7Ci0JCQkJcmV0ID0gcmluZy0+aW5pdF9jb250ZXh0KHJpbmcsCi0JCQkJCQlyaW5nLT5kZWZh dWx0X2NvbnRleHQpOwotCQkJCWlmIChyZXQpIHsKLQkJCQkJRFJNX0VSUk9SKCJyaW5nIGluaXQg Y29udGV4dDogJWRcbiIsCi0JCQkJCQkJcmV0KTsKLQkJCQkJcmV0dXJuIHJldDsKLQkJCQl9Ci0J CQl9Ci0JCX0KKwkJaWYgKHJpbmctPmluaXRfY29udGV4dCA9PSBOVUxMKQorCQkJcmV0dXJuIDA7 CiAKKwkJcmV0ID0gcmluZy0+aW5pdF9jb250ZXh0KHJpbmcsIHJpbmctPmRlZmF1bHRfY29udGV4 dCk7CiAJfSBlbHNlCi0JCWZvcl9lYWNoX3JpbmcocmluZywgZGV2X3ByaXYsIGkpIHsKLQkJCXJl dCA9IGk5MTVfc3dpdGNoX2NvbnRleHQocmluZywgcmluZy0+ZGVmYXVsdF9jb250ZXh0KTsKLQkJ CWlmIChyZXQpCi0JCQkJcmV0dXJuIHJldDsKLQkJfQorCQlyZXQgPSBpOTE1X3N3aXRjaF9jb250 ZXh0KHJpbmcsIHJpbmctPmRlZmF1bHRfY29udGV4dCk7CisKKwlpZiAocmV0KSB7CisJCURSTV9F UlJPUigicmluZyBpbml0IGNvbnRleHQ6ICVkXG4iLCByZXQpOworCQlyZXR1cm4gcmV0OworCX0K IAogCXJldHVybiAwOwogfQotLSAKMS43LjkuNQoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9pbnRlbC1nZngK