From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH 18/53] drm/i915: Moved the for_each_ring loop outside of i915_gem_context_enable() Date: Thu, 19 Feb 2015 17:17:30 +0000 Message-ID: <1424366285-29232-19-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 4921772087 for ; Thu, 19 Feb 2015 09:18:26 -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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KClRoZSBzdGFy dCBvZiBkYXkgY29udGV4dCBpbml0aWFsaXNhdGlvbiBjb2RlIGluIGk5MTVfZ2VtX2NvbnRleHRf ZW5hYmxlKCkgbG9vcHMKb3ZlciBlYWNoIHJpbmcgYW5kIGNhbGxzIHRoZSBsZWdhY3kgc3dpdGNo IGNvbnRleHQgb3IgdGhlIGV4ZWNsaXN0IGluaXQgY29udGV4dApjb2RlIGFzIGFwcHJvcHJpYXRl LgoKVGhpcyBwYXRjaCBtb3ZlcyB0aGUgcmluZyBsb29waW5nIG91dCBvZiB0aGF0IGZ1bmN0aW9u IGluIHRvIHRoZSB0b3AgbGV2ZWwKY2FsbGVyIGk5MTVfZ2VtX2luaXRfaHcoKS4gVGhpcyBtZWFu cyB0aGUgYSBzaW5nbGUgcGFzcyBjYW4gYmUgbWFkZSBvdmVyIGFsbApyaW5ncyBkb2luZyB0aGUg UFBHVFQsIEwzIHJlbWFwIGFuZCBjb250ZXh0IGluaXRpYWxpc2F0aW9uIG9mIGVhY2ggcmluZwph bHRvZ2V0aGVyLgoKRm9yOiBWSVotNTExNQpTaWduZWQtb2ZmLWJ5OiBKb2huIEhhcnJpc29uIDxK b2huLkMuSGFycmlzb25ASW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZHJ2LmggICAgICAgICB8ICAgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMg ICAgICAgICB8ICAgMTggKysrKysrKysrKy0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtX2NvbnRleHQuYyB8ICAgMzIgKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLQog MyBmaWxlcyBjaGFuZ2VkLCAyMyBpbnNlcnRpb25zKCspLCAyOSBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kcnYuaAppbmRleCBiZmQ3YjQ3Li42NTNjODJkIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmgKQEAgLTI5ODksNyArMjk4OSw3IEBAIGludCBfX211c3RfY2hlY2sgaTkxNV9nZW1f Y29udGV4dF9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogdm9pZCBpOTE1X2dlbV9jb250 ZXh0X2Zpbmkoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CiB2b2lkIGk5MTVfZ2VtX2NvbnRleHRf cmVzZXQoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CiBpbnQgaTkxNV9nZW1fY29udGV4dF9vcGVu KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBkcm1fZmlsZSAqZmlsZSk7Ci1pbnQgaTkx NV9nZW1fY29udGV4dF9lbmFibGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsK K2ludCBpOTE1X2dlbV9jb250ZXh0X2VuYWJsZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5n KTsKIHZvaWQgaTkxNV9nZW1fY29udGV4dF9jbG9zZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBz dHJ1Y3QgZHJtX2ZpbGUgKmZpbGUpOwogaW50IGk5MTVfc3dpdGNoX2NvbnRleHQoc3RydWN0IGlu dGVsX2VuZ2luZV9jcyAqcmluZywKIAkJCXN0cnVjdCBpbnRlbF9jb250ZXh0ICp0byk7CmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW0uYwppbmRleCA5YmM2MGQ3Li41ODUwOTkxIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtLmMKQEAgLTQ4NDQsNiArNDg0NCw4IEBAIGk5MTVfZ2VtX2luaXRfaHcoc3RydWN0IGRy bV9kZXZpY2UgKmRldikKIAkgKi8KIAlpbml0X3VudXNlZF9yaW5ncyhkZXYpOwogCisJQlVHX09O KCFkZXZfcHJpdi0+cmluZ1tSQ1NdLmRlZmF1bHRfY29udGV4dCk7CisKIAlyZXQgPSBpOTE1X3Bw Z3R0X2luaXRfaHcoZGV2KTsKIAlpZiAocmV0KSB7CiAJCURSTV9FUlJPUigiUFBHVFQgZW5hYmxl IEhXIGZhaWxlZCAlZFxuIiwgcmV0KTsKQEAgLTQ4NTksNiArNDg2MSw4IEBAIGk5MTVfZ2VtX2lu aXRfaHcoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAogCS8qIE5vdyBpdCBpcyBzYWZlIHRvIGdv IGJhY2sgcm91bmQgYW5kIGRvIGV2ZXJ5dGhpbmcgZWxzZTogKi8KIAlmb3JfZWFjaF9yaW5nKHJp bmcsIGRldl9wcml2LCBpKSB7CisJCVdBUk5fT04oIXJpbmctPmRlZmF1bHRfY29udGV4dCk7CisK IAkJaWYgKHJpbmctPmlkID09IFJDUykgewogCQkJZm9yIChpID0gMDsgaSA8IE5VTV9MM19TTElD RVMoZGV2KTsgaSsrKQogCQkJCWk5MTVfZ2VtX2wzX3JlbWFwKHJpbmcsIGkpOwpAQCAtNDg3MCwx NyArNDg3NCwxNyBAQCBpOTE1X2dlbV9pbml0X2h3KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJ CQlpOTE1X2dlbV9jbGVhbnVwX3JpbmdidWZmZXIoZGV2KTsKIAkJCXJldHVybiByZXQ7CiAJCX0K LQl9CiAKLQlyZXQgPSBpOTE1X2dlbV9jb250ZXh0X2VuYWJsZShkZXZfcHJpdik7Ci0JaWYgKHJl dCAmJiByZXQgIT0gLUVJTykgewotCQlEUk1fRVJST1IoIkNvbnRleHQgZW5hYmxlIGZhaWxlZCAl ZFxuIiwgcmV0KTsKLQkJaTkxNV9nZW1fY2xlYW51cF9yaW5nYnVmZmVyKGRldik7CisJCXJldCA9 IGk5MTVfZ2VtX2NvbnRleHRfZW5hYmxlKHJpbmcpOworCQlpZiAocmV0ICYmIHJldCAhPSAtRUlP KSB7CisJCQlEUk1fRVJST1IoIkNvbnRleHQgZW5hYmxlIHJpbmcgIyVkIGZhaWxlZCAlZFxuIiwg aSwgcmV0KTsKKwkJCWk5MTVfZ2VtX2NsZWFudXBfcmluZ2J1ZmZlcihkZXYpOwogCi0JCXJldHVy biByZXQ7CisJCQlyZXR1cm4gcmV0OworCQl9CiAJfQogCi0JcmV0dXJuIHJldDsKKwlyZXR1cm4g MDsKIH0KIAogaW50IGk5MTVfZ2VtX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYwppbmRleCA4NjAzYmY0Li5kZDgzZDYxIDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jCkBAIC00MDMsMzIgKzQwMywy MiBAQCB2b2lkIGk5MTVfZ2VtX2NvbnRleHRfZmluaShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQog CWk5MTVfZ2VtX2NvbnRleHRfdW5yZWZlcmVuY2UoZGN0eCk7CiB9CiAKLWludCBpOTE1X2dlbV9j b250ZXh0X2VuYWJsZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCitpbnQgaTkx NV9nZW1fY29udGV4dF9lbmFibGUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKIHsKLQlz dHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nOwotCWludCByZXQsIGk7Ci0KLQlCVUdfT04oIWRl dl9wcml2LT5yaW5nW1JDU10uZGVmYXVsdF9jb250ZXh0KTsKKwlpbnQgcmV0OwogCiAJaWYgKGk5 MTUuZW5hYmxlX2V4ZWNsaXN0cykgewotCQlmb3JfZWFjaF9yaW5nKHJpbmcsIGRldl9wcml2LCBp KSB7Ci0JCQlpZiAocmluZy0+aW5pdF9jb250ZXh0KSB7Ci0JCQkJcmV0ID0gcmluZy0+aW5pdF9j b250ZXh0KHJpbmcsCi0JCQkJCQlyaW5nLT5kZWZhdWx0X2NvbnRleHQpOwotCQkJCWlmIChyZXQp IHsKLQkJCQkJRFJNX0VSUk9SKCJyaW5nIGluaXQgY29udGV4dDogJWRcbiIsCi0JCQkJCQkJcmV0 KTsKLQkJCQkJcmV0dXJuIHJldDsKLQkJCQl9Ci0JCQl9Ci0JCX0KKwkJaWYgKHJpbmctPmluaXRf Y29udGV4dCA9PSBOVUxMKQorCQkJcmV0dXJuIDA7CiAKKwkJcmV0ID0gcmluZy0+aW5pdF9jb250 ZXh0KHJpbmcsIHJpbmctPmRlZmF1bHRfY29udGV4dCk7CiAJfSBlbHNlCi0JCWZvcl9lYWNoX3Jp bmcocmluZywgZGV2X3ByaXYsIGkpIHsKLQkJCXJldCA9IGk5MTVfc3dpdGNoX2NvbnRleHQocmlu ZywgcmluZy0+ZGVmYXVsdF9jb250ZXh0KTsKLQkJCWlmIChyZXQpCi0JCQkJcmV0dXJuIHJldDsK LQkJfQorCQlyZXQgPSBpOTE1X3N3aXRjaF9jb250ZXh0KHJpbmcsIHJpbmctPmRlZmF1bHRfY29u dGV4dCk7CisKKwlpZiAocmV0KSB7CisJCURSTV9FUlJPUigicmluZyBpbml0IGNvbnRleHQ6ICVk XG4iLCByZXQpOworCQlyZXR1cm4gcmV0OworCX0KIAogCXJldHVybiAwOwogfQotLSAKMS43Ljku NQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwt Z2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK