From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH 18/55] drm/i915: Add explicit request management to i915_gem_init_hw() Date: Fri, 29 May 2015 17:43:39 +0100 Message-ID: <1432917856-12261-19-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 787326EDE7 for ; Fri, 29 May 2015 09:44:37 -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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KCk5vdyB0aGF0 IGEgc2luZ2xlIHBlciByaW5nIGxvb3AgaXMgYmVpbmcgZG9uZSBmb3IgYWxsIHRoZSBkaWZmZXJl bnQKaW50aWFsaXNhdGlvbiBzdGVwcyBpbiBpOTE1X2dlbV9pbml0X2h3KCksIGl0IGlzIHBvc3Np YmxlIHRvIGFkZCBwcm9wZXIgcmVxdWVzdAptYW5hZ2VtZW50IGFzIHdlbGwuIFRoZSBsYXN0IHJl bWFpbmluZyBpc3N1ZSBpcyB0aGF0IHRoZSBjb250ZXh0IGVuYWJsZSBjYWxsCmV2ZW50dWFsbHkg ZW5kcyB1cCB3aXRoaW4gKl9yZW5kZXJfc3RhdGVfaW5pdCgpIGFuZCB0aGlzIGRvZXMgaXRzIG93 biBwcml2YXRlCl9pOTE1X2FkZF9yZXF1ZXN0KCkgY2FsbC4KClRoaXMgcGF0Y2ggYWRkcyBleHBs aWNpdCByZXF1ZXN0IGNyZWF0aW9uIGFuZCBzdWJtaXNzaW9uIHRvIHRoZSB0b3AgbGV2ZWwgbG9v cAphbmQgcmVtb3ZlcyB0aGUgYWRkX3JlcXVlc3QoKSBmcm9tIGRlZXAgd2l0aGluIHRoZSBzdWIt ZnVuY3Rpb25zLgoKdjI6IFVwZGF0ZWQgZm9yIHJlbW92YWwgb2YgYmF0Y2hfb2JqIGZyb20gYWRk X3JlcXVlc3QgY2FsbCBpbiBwcmV2aW91cyBwYXRjaC4KCkZvcjogVklaLTUxMTUKU2lnbmVkLW9m Zi1ieTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KLS0tCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICAgICAgICAgICB8ICAgIDMgKystCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jICAgICAgICAgICAgICB8ICAgMTIgKysrKysrKysr KysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9yZW5kZXJfc3RhdGUuYyB8ICAgIDIg LS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jICAgICAgICAgICAgIHwgICAgNSAt LS0tLQogNCBmaWxlcyBjaGFuZ2VkLCAxNCBpbnNlcnRpb25zKCspLCA4IGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IDY5YzhmNTYuLjIxMDQ1ZTcgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9kcnYuaApAQCAtMjE1NCw3ICsyMTU0LDggQEAgc3RydWN0IGRybV9pOTE1X2dlbV9y ZXF1ZXN0IHsKIAlzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4OwogCXN0cnVjdCBpbnRlbF9yaW5n YnVmZmVyICpyaW5nYnVmOwogCi0JLyoqIEJhdGNoIGJ1ZmZlciByZWxhdGVkIHRvIHRoaXMgcmVx dWVzdCBpZiBhbnkgKi8KKwkvKiogQmF0Y2ggYnVmZmVyIHJlbGF0ZWQgdG8gdGhpcyByZXF1ZXN0 IGlmIGFueSAodXNlZCBmb3IKKwkgICAgZXJyb3Igc3RhdGUgZHVtcCBvbmx5KSAqLwogCXN0cnVj dCBkcm1faTkxNV9nZW1fb2JqZWN0ICpiYXRjaF9vYmo7CiAKIAkvKiogVGltZSBhdCB3aGljaCB0 aGlzIHJlcXVlc3Qgd2FzIGVtaXR0ZWQsIGluIGppZmZpZXMuICovCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW0uYwppbmRleCBhMjcxMmE2Li4xOTYwZTMwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKQEAg LTUwNzMsOCArNTA3MywxNiBAQCBpOTE1X2dlbV9pbml0X2h3KHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYpCiAKIAkvKiBOb3cgaXQgaXMgc2FmZSB0byBnbyBiYWNrIHJvdW5kIGFuZCBkbyBldmVyeXRo aW5nIGVsc2U6ICovCiAJZm9yX2VhY2hfcmluZyhyaW5nLCBkZXZfcHJpdiwgaSkgeworCQlzdHJ1 Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcTsKKwogCQlXQVJOX09OKCFyaW5nLT5kZWZhdWx0 X2NvbnRleHQpOwogCisJCXJldCA9IGk5MTVfZ2VtX3JlcXVlc3RfYWxsb2MocmluZywgcmluZy0+ ZGVmYXVsdF9jb250ZXh0LCAmcmVxKTsKKwkJaWYgKHJldCkgeworCQkJaTkxNV9nZW1fY2xlYW51 cF9yaW5nYnVmZmVyKGRldik7CisJCQlnb3RvIG91dDsKKwkJfQorCiAJCWlmIChyaW5nLT5pZCA9 PSBSQ1MpIHsKIAkJCWZvciAoaSA9IDA7IGkgPCBOVU1fTDNfU0xJQ0VTKGRldik7IGkrKykKIAkJ CQlpOTE1X2dlbV9sM19yZW1hcChyaW5nLCBpKTsKQEAgLTUwODMsNiArNTA5MSw3IEBAIGk5MTVf Z2VtX2luaXRfaHcoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJcmV0ID0gaTkxNV9wcGd0dF9p bml0X3JpbmcocmluZyk7CiAJCWlmIChyZXQgJiYgcmV0ICE9IC1FSU8pIHsKIAkJCURSTV9FUlJP UigiUFBHVFQgZW5hYmxlIHJpbmcgIyVkIGZhaWxlZCAlZFxuIiwgaSwgcmV0KTsKKwkJCWk5MTVf Z2VtX3JlcXVlc3RfY2FuY2VsKHJlcSk7CiAJCQlpOTE1X2dlbV9jbGVhbnVwX3JpbmdidWZmZXIo ZGV2KTsKIAkJCWdvdG8gb3V0OwogCQl9CkBAIC01MDkwLDkgKzUwOTksMTIgQEAgaTkxNV9nZW1f aW5pdF9odyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQlyZXQgPSBpOTE1X2dlbV9jb250ZXh0 X2VuYWJsZShyaW5nKTsKIAkJaWYgKHJldCAmJiByZXQgIT0gLUVJTykgewogCQkJRFJNX0VSUk9S KCJDb250ZXh0IGVuYWJsZSByaW5nICMlZCBmYWlsZWQgJWRcbiIsIGksIHJldCk7CisJCQlpOTE1 X2dlbV9yZXF1ZXN0X2NhbmNlbChyZXEpOwogCQkJaTkxNV9nZW1fY2xlYW51cF9yaW5nYnVmZmVy KGRldik7CiAJCQlnb3RvIG91dDsKIAkJfQorCisJCWk5MTVfYWRkX3JlcXVlc3Rfbm9fZmx1c2go cmluZyk7CiAJfQogCiBvdXQ6CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbV9yZW5kZXJfc3RhdGUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlbmRl cl9zdGF0ZS5jCmluZGV4IGEzMmE0YjkuLmEwN2I0ZWUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtX3JlbmRlcl9zdGF0ZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtX3JlbmRlcl9zdGF0ZS5jCkBAIC0xNzMsOCArMTczLDYgQEAgaW50IGk5MTVf Z2VtX3JlbmRlcl9zdGF0ZV9pbml0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCiAKIAlp OTE1X3ZtYV9tb3ZlX3RvX2FjdGl2ZShpOTE1X2dlbV9vYmpfdG9fZ2d0dChzby5vYmopLCByaW5n KTsKIAotCV9faTkxNV9hZGRfcmVxdWVzdChyaW5nLCBOVUxMLCBOVUxMLCB0cnVlKTsKLQkvKiBf X2k5MTVfYWRkX3JlcXVlc3QgbW92ZXMgb2JqZWN0IHRvIGluYWN0aXZlIGlmIGl0IGZhaWxzICov CiBvdXQ6CiAJaTkxNV9nZW1fcmVuZGVyX3N0YXRlX2ZpbmkoJnNvKTsKIAlyZXR1cm4gcmV0Owpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9scmMuYwppbmRleCBjNzQ0MzYyLi4zN2VmYTkzIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9scmMuYwpAQCAtMTM1MSw4ICsxMzUxLDYgQEAgc3RhdGljIGludCBpbnRlbF9s cl9jb250ZXh0X3JlbmRlcl9zdGF0ZV9pbml0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcs CiB7CiAJc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYgPSBjdHgtPmVuZ2luZVtyaW5n LT5pZF0ucmluZ2J1ZjsKIAlzdHJ1Y3QgcmVuZGVyX3N0YXRlIHNvOwotCXN0cnVjdCBkcm1faTkx NV9maWxlX3ByaXZhdGUgKmZpbGVfcHJpdiA9IGN0eC0+ZmlsZV9wcml2OwotCXN0cnVjdCBkcm1f ZmlsZSAqZmlsZSA9IGZpbGVfcHJpdiA/IGZpbGVfcHJpdi0+ZmlsZSA6IE5VTEw7CiAJaW50IHJl dDsKIAogCXJldCA9IGk5MTVfZ2VtX3JlbmRlcl9zdGF0ZV9wcmVwYXJlKHJpbmcsICZzbyk7CkBA IC0xMzcxLDkgKzEzNjksNiBAQCBzdGF0aWMgaW50IGludGVsX2xyX2NvbnRleHRfcmVuZGVyX3N0 YXRlX2luaXQoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKIAogCWk5MTVfdm1hX21vdmVf dG9fYWN0aXZlKGk5MTVfZ2VtX29ial90b19nZ3R0KHNvLm9iaiksIHJpbmcpOwogCi0JX19pOTE1 X2FkZF9yZXF1ZXN0KHJpbmcsIGZpbGUsIE5VTEwsIHRydWUpOwotCS8qIGludGVsX2xvZ2ljYWxf cmluZ19hZGRfcmVxdWVzdCBtb3ZlcyBvYmplY3QgdG8gaW5hY3RpdmUgaWYgaXQKLQkgKiBmYWls cyAqLwogb3V0OgogCWk5MTVfZ2VtX3JlbmRlcl9zdGF0ZV9maW5pKCZzbyk7CiAJcmV0dXJuIHJl dDsKLS0gCjEuNy45LjUKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwt Z2Z4Cg==