From: Dave Gordon Subject: [PATCH 07/17 v2] drm/i915: Split late for_each_ring loop from i915_gem_init_hw() Date: Thu, 25 Jun 2015 15:40:03 +0100 Message-ID: <1435243213-22308-8-git-send-email-david.s.gordon@intel.com> References: <1435243213-22308-1-git-send-email-david.s.gordon@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 800236EC2C for ; Thu, 25 Jun 2015 07:40:50 -0700 (PDT) In-Reply-To: <1435243213-22308-1-git-send-email-david.s.gordon@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 VGhpcyBmdW5jdGlvbiB3YXMgcmVzdHJ1Y3R1cmVkIGJ5IHR3byByZWNlbnQgcGF0Y2hlczoKICAg IGRybS9pOTE1OiBBZGQgZXhwbGljaXQgcmVxdWVzdCBtYW5hZ2VtZW50IHRvIGk5MTVfZ2VtX2lu aXRfaHcoKQogICAgZHJtL2k5MTU6IE1vdmVkIHRoZSBmb3JfZWFjaF9yaW5nIGxvb3Agb3V0c2lk ZSBvZiBpOTE1X2dlbV9jb250ZXh0X2VuYWJsZSgpCgpOb3cgd2UgbmVlZCB0byBtb3ZlIHRoZSBl bnRpcmUgbG9vcCBpbnRvIGEgc2VwYXJhdGUgZnVuY3Rpb24KaTkxNV9nZW1faW5pdF9od19sYXRl KCksIHJlcGxhY2luZyB0aGUgaW5saW5lIGxvb3Agd2l0aCBhIGNhbGwuClRoaXMgd2lsbCBhbGxv dyBhIGZ1dHVyZSBwYXRjaCB0byBhZGQgYSBjYWxsIGZyb20gYW5vdGhlcgpsb2NhdGlvbnMgKGZv ciBub3csIHRoZXJlIGFyZSBubyBvdGhlciBjYWxscykuCgpTaWduZWQtb2ZmLWJ5OiBEYXZlIEdv cmRvbiA8ZGF2aWQucy5nb3Jkb25AaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZHJ2LmggfCAgICAxICsKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgfCAg IDg1ICsrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLQogMiBmaWxlcyBjaGFu Z2VkLCA1MCBpbnNlcnRpb25zKCspLCAzNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k cnYuaAppbmRleCBhM2QyZmQ5Li5kMGVhNzRlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAg LTI4OTcsNiArMjg5Nyw3IEBAIGJvb2wgaTkxNV9nZW1fY2xmbHVzaF9vYmplY3Qoc3RydWN0IGRy bV9pOTE1X2dlbV9vYmplY3QgKm9iaiwgYm9vbCBmb3JjZSk7CiBpbnQgX19tdXN0X2NoZWNrIGk5 MTVfZ2VtX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CiBpbnQgaTkxNV9nZW1faW5pdF9y aW5ncyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKIGludCBfX211c3RfY2hlY2sgaTkxNV9nZW1f aW5pdF9odyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKK2ludCBfX211c3RfY2hlY2sgaTkxNV9n ZW1faW5pdF9od19sYXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogaW50IGk5MTVfZ2VtX2wz X3JlbWFwKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLCBpbnQgc2xpY2UpOwogdm9p ZCBpOTE1X2dlbV9pbml0X3N3aXp6bGluZyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKIHZvaWQg aTkxNV9nZW1fY2xlYW51cF9yaW5nYnVmZmVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtLmMKaW5kZXggMzAyZDFiYy4uYjdiMjJlMyAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbS5jCkBAIC01MDE3LDExICs1MDE3LDU4IEBAIGNsZWFudXBfcmVuZGVyX3Jpbmc6CiB9 CiAKIGludAoraTkxNV9nZW1faW5pdF9od19sYXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCit7 CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsK KwlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nOworCWludCBpLCBqLCByZXQgPSAwOworCisJ LyogTm93IGl0IGlzIHNhZmUgdG8gZ28gYmFjayByb3VuZCBhbmQgZG8gZXZlcnl0aGluZyBlbHNl OiAqLworCWZvcl9lYWNoX3JpbmcocmluZywgZGV2X3ByaXYsIGkpIHsKKwkJc3RydWN0IGRybV9p OTE1X2dlbV9yZXF1ZXN0ICpyZXE7CisKKwkJV0FSTl9PTighcmluZy0+ZGVmYXVsdF9jb250ZXh0 KTsKKworCQlyZXQgPSBpOTE1X2dlbV9yZXF1ZXN0X2FsbG9jKHJpbmcsIHJpbmctPmRlZmF1bHRf Y29udGV4dCwgJnJlcSk7CisJCWlmIChyZXQpIHsKKwkJCWk5MTVfZ2VtX2NsZWFudXBfcmluZ2J1 ZmZlcihkZXYpOworCQkJZ290byBvdXQ7CisJCX0KKworCQlpZiAocmluZy0+aWQgPT0gUkNTKSB7 CisJCQlmb3IgKGogPSAwOyBqIDwgTlVNX0wzX1NMSUNFUyhkZXYpOyBqKyspCisJCQkJaTkxNV9n ZW1fbDNfcmVtYXAocmVxLCBqKTsKKwkJfQorCisJCXJldCA9IGk5MTVfcHBndHRfaW5pdF9yaW5n KHJlcSk7CisJCWlmIChyZXQgJiYgcmV0ICE9IC1FSU8pIHsKKwkJCURSTV9FUlJPUigiUFBHVFQg ZW5hYmxlIHJpbmcgIyVkIGZhaWxlZCAlZFxuIiwgaSwgcmV0KTsKKwkJCWk5MTVfZ2VtX3JlcXVl c3RfY2FuY2VsKHJlcSk7CisJCQlpOTE1X2dlbV9jbGVhbnVwX3JpbmdidWZmZXIoZGV2KTsKKwkJ CWdvdG8gb3V0OworCQl9CisKKwkJcmV0ID0gaTkxNV9nZW1fY29udGV4dF9lbmFibGUocmVxKTsK KwkJaWYgKHJldCAmJiByZXQgIT0gLUVJTykgeworCQkJRFJNX0VSUk9SKCJDb250ZXh0IGVuYWJs ZSByaW5nICMlZCBmYWlsZWQgJWRcbiIsIGksIHJldCk7CisJCQlpOTE1X2dlbV9yZXF1ZXN0X2Nh bmNlbChyZXEpOworCQkJaTkxNV9nZW1fY2xlYW51cF9yaW5nYnVmZmVyKGRldik7CisJCQlnb3Rv IG91dDsKKwkJfQorCisJCWk5MTVfYWRkX3JlcXVlc3Rfbm9fZmx1c2gocmVxKTsKKwl9CisKK291 dDoKKwlyZXR1cm4gcmV0OworfQorCitpbnQKIGk5MTVfZ2VtX2luaXRfaHcoc3RydWN0IGRybV9k ZXZpY2UgKmRldikKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYt PmRldl9wcml2YXRlOwogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmc7Ci0JaW50IHJldCwg aSwgajsKKwlpbnQgaSwgcmV0OwogCiAJaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuIDwgNiAmJiAh aW50ZWxfZW5hYmxlX2d0dCgpKQogCQlyZXR1cm4gLUVJTzsKQEAgLTUwNzYsNDEgKzUxMjMsNyBA QCBpOTE1X2dlbV9pbml0X2h3KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJLyogV2UgY2FuJ3Qg ZW5hYmxlIGNvbnRleHRzIHVudGlsIGFsbCBmaXJtd2FyZSBpcyBsb2FkZWQgKi8KIAlyZXQgPSBp bnRlbF9ndWNfdWNvZGVfbG9hZChkZXYsIHRydWUpOwogCi0JLyogTm93IGl0IGlzIHNhZmUgdG8g Z28gYmFjayByb3VuZCBhbmQgZG8gZXZlcnl0aGluZyBlbHNlOiAqLwotCWZvcl9lYWNoX3Jpbmco cmluZywgZGV2X3ByaXYsIGkpIHsKLQkJc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXE7 Ci0KLQkJV0FSTl9PTighcmluZy0+ZGVmYXVsdF9jb250ZXh0KTsKLQotCQlyZXQgPSBpOTE1X2dl bV9yZXF1ZXN0X2FsbG9jKHJpbmcsIHJpbmctPmRlZmF1bHRfY29udGV4dCwgJnJlcSk7Ci0JCWlm IChyZXQpIHsKLQkJCWk5MTVfZ2VtX2NsZWFudXBfcmluZ2J1ZmZlcihkZXYpOwotCQkJZ290byBv dXQ7Ci0JCX0KLQotCQlpZiAocmluZy0+aWQgPT0gUkNTKSB7Ci0JCQlmb3IgKGogPSAwOyBqIDwg TlVNX0wzX1NMSUNFUyhkZXYpOyBqKyspCi0JCQkJaTkxNV9nZW1fbDNfcmVtYXAocmVxLCBqKTsK LQkJfQotCi0JCXJldCA9IGk5MTVfcHBndHRfaW5pdF9yaW5nKHJlcSk7Ci0JCWlmIChyZXQgJiYg cmV0ICE9IC1FSU8pIHsKLQkJCURSTV9FUlJPUigiUFBHVFQgZW5hYmxlIHJpbmcgIyVkIGZhaWxl ZCAlZFxuIiwgaSwgcmV0KTsKLQkJCWk5MTVfZ2VtX3JlcXVlc3RfY2FuY2VsKHJlcSk7Ci0JCQlp OTE1X2dlbV9jbGVhbnVwX3JpbmdidWZmZXIoZGV2KTsKLQkJCWdvdG8gb3V0OwotCQl9Ci0KLQkJ cmV0ID0gaTkxNV9nZW1fY29udGV4dF9lbmFibGUocmVxKTsKLQkJaWYgKHJldCAmJiByZXQgIT0g LUVJTykgewotCQkJRFJNX0VSUk9SKCJDb250ZXh0IGVuYWJsZSByaW5nICMlZCBmYWlsZWQgJWRc biIsIGksIHJldCk7Ci0JCQlpOTE1X2dlbV9yZXF1ZXN0X2NhbmNlbChyZXEpOwotCQkJaTkxNV9n ZW1fY2xlYW51cF9yaW5nYnVmZmVyKGRldik7Ci0JCQlnb3RvIG91dDsKLQkJfQotCi0JCWk5MTVf YWRkX3JlcXVlc3Rfbm9fZmx1c2gocmVxKTsKLQl9CisJcmV0ID0gaTkxNV9nZW1faW5pdF9od19s YXRlKGRldik7CiAKIG91dDoKIAlpbnRlbF91bmNvcmVfZm9yY2V3YWtlX3B1dChkZXZfcHJpdiwg Rk9SQ0VXQUtFX0FMTCk7Ci0tIAoxLjcuOS41CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0 cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xp c3RpbmZvL2ludGVsLWdmeAo=