From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH 21/59] drm/i915: Add explicit request management to i915_gem_init_hw() Date: Thu, 19 Mar 2015 12:30:26 +0000 Message-ID: <1426768264-16996-22-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 DAA5B6EA0F for ; Thu, 19 Mar 2015 05:31:30 -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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KCk5vdyB0aGF0 IGEgc2luZ2xlIHBlciByaW5nIGxvb3AgaXMgYmVpbmcgZG9uZSBmb3IgYWxsIHRoZSBkaWZmZXJl bnQKaW50aWFsaXNhdGlvbiBzdGVwcyBpbiBpOTE1X2dlbV9pbml0X2h3KCksIGl0IGlzIHBvc3Np YmxlIHRvIGFkZCBwcm9wZXIgcmVxdWVzdAptYW5hZ2VtZW50IGFzIHdlbGwuIFRoZSBsYXN0IHJl bWFpbmluZyBpc3N1ZSBpcyB0aGF0IHRoZSBjb250ZXh0IGVuYWJsZSBjYWxsCmV2ZW50dWFsbHkg ZW5kcyB1cCB3aXRoaW4gKl9yZW5kZXJfc3RhdGVfaW5pdCgpIGFuZCB0aGlzIGRvZXMgaXQncyBv d24gcHJpdmF0ZQpfaTkxNV9hZGRfcmVxdWVzdCgpIGNhbGwuCgpUaGlzIHBhdGNoIGFkZHMgZXhw bGljaXQgcmVxdWVzdCBjcmVhdGlvbiBhbmQgc3VibWlzc2lvbiB0byB0aGUgdG9wIGxldmVsIGxv b3AKYW5kIHJlbW92ZXMgdGhlIGFkZF9yZXF1ZXN0KCkgZnJvbSBkZWVwIHdpdGhpbiB0aGUgc3Vi LWZ1bmN0aW9ucy4gTm90ZSB0aGF0IHRoZQpvbGQgYWRkX3JlcXVlc3QoKSBjYWxsIHdhcyBiZWlu ZyBwYXNzZWQgYSBiYXRjaCBvYmplY3QuIFRoaXMgaXMgbm93IGV4cGxpY2l0bHkKd3JpdHRlbiB0 byB0aGUgcmVxdWVzdCBvYmplY3QgaW5zdGVhZC4gQSB3YXJuaW5nIGhhcyBhbHNvIGJlZW4gYWRk ZWQgdG8KaTkxNV9hZGRfcmVxdWVzdCgpIHRvIGVuc3VyZSB0aGF0IHRoZXJlIGlzIG5ldmVyIGFu IGF0dGVtcHQgdG8gYWRkIHR3byBiYXRjaApvYmplY3RzIHRvIGEgc2luZ2xlIHJlcXVlc3QgLSBl LmcuIGJlY2F1c2UgcmVuZGVyX3N0YXRlX2luaXQoKSB3YXMgY2FsbGVkIGR1cmluZwpleGVjYnVm ZmVyIHByb2Nlc3NpbmcuCgp2MjogVXBkYXRlZCBmb3IgcmVtb3ZhbCBvZiBiYXRjaF9vYmogZnJv bSBhZGRfcmVxdWVzdCBjYWxsIGluIHByZXZpb3VzIHBhdGNoCih3aGljaCBpcyBuZXcgdG8gc2Vy aWVzKS4KCkZvcjogVklaLTUxMTUKU2lnbmVkLW9mZi1ieTogSm9obiBIYXJyaXNvbiA8Sm9obi5D LkhhcnJpc29uQEludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5o ICAgICAgICAgICAgICB8ICAgIDMgKystCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5j ICAgICAgICAgICAgICB8ICAgMTIgKysrKysrKysrKysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbV9yZW5kZXJfc3RhdGUuYyB8ICAgIDIgLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2xyYy5jICAgICAgICAgICAgIHwgICAgNSAtLS0tLQogNCBmaWxlcyBjaGFuZ2VkLCAxNCBp bnNlcnRpb25zKCspLCA4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4 IGNjOTU3ZDUuLmFhMDY5NWIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtMjA4Miw3ICsy MDgyLDggQEAgc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0IHsKIAlzdHJ1Y3QgaW50ZWxfY29u dGV4dCAqY3R4OwogCXN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmOwogCi0JLyoqIEJh dGNoIGJ1ZmZlciByZWxhdGVkIHRvIHRoaXMgcmVxdWVzdCBpZiBhbnkgKi8KKwkvKiogQmF0Y2gg YnVmZmVyIHJlbGF0ZWQgdG8gdGhpcyByZXF1ZXN0IGlmIGFueSAodXNlZCBmb3IKKwkgICAgZXJy b3Igc3RhdGUgZHVtcCBvbmx5KSAqLwogCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpiYXRj aF9vYmo7CiAKIAkvKiogVGltZSBhdCB3aGljaCB0aGlzIHJlcXVlc3Qgd2FzIGVtaXR0ZWQsIGlu IGppZmZpZXMuICovCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRleCAyOTU2OGM0Li40NDUyNjE4 IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKQEAgLTQ5MDAsOCArNDkwMCwxNiBAQCBpOTE1X2dl bV9pbml0X2h3KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAKIAkvKiBOb3cgaXQgaXMgc2FmZSB0 byBnbyBiYWNrIHJvdW5kIGFuZCBkbyBldmVyeXRoaW5nIGVsc2U6ICovCiAJZm9yX2VhY2hfcmlu ZyhyaW5nLCBkZXZfcHJpdiwgaSkgeworCQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJl cTsKKwogCQlXQVJOX09OKCFyaW5nLT5kZWZhdWx0X2NvbnRleHQpOwogCisJCXJldCA9IGk5MTVf Z2VtX3JlcXVlc3RfYWxsb2MocmluZywgcmluZy0+ZGVmYXVsdF9jb250ZXh0LCAmcmVxKTsKKwkJ aWYgKHJldCkgeworCQkJaTkxNV9nZW1fY2xlYW51cF9yaW5nYnVmZmVyKGRldik7CisJCQlnb3Rv IG91dDsKKwkJfQorCiAJCWlmIChyaW5nLT5pZCA9PSBSQ1MpIHsKIAkJCWZvciAoaSA9IDA7IGkg PCBOVU1fTDNfU0xJQ0VTKGRldik7IGkrKykKIAkJCQlpOTE1X2dlbV9sM19yZW1hcChyaW5nLCBp KTsKQEAgLTQ5MTAsNiArNDkxOCw3IEBAIGk5MTVfZ2VtX2luaXRfaHcoc3RydWN0IGRybV9kZXZp Y2UgKmRldikKIAkJcmV0ID0gaTkxNV9wcGd0dF9pbml0X3JpbmcocmluZyk7CiAJCWlmIChyZXQg JiYgcmV0ICE9IC1FSU8pIHsKIAkJCURSTV9FUlJPUigiUFBHVFQgZW5hYmxlIHJpbmcgIyVkIGZh aWxlZCAlZFxuIiwgaSwgcmV0KTsKKwkJCWk5MTVfZ2VtX3JlcXVlc3RfY2FuY2VsKHJlcSk7CiAJ CQlpOTE1X2dlbV9jbGVhbnVwX3JpbmdidWZmZXIoZGV2KTsKIAkJCWdvdG8gb3V0OwogCQl9CkBA IC00OTE3LDkgKzQ5MjYsMTIgQEAgaTkxNV9nZW1faW5pdF9odyhzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2KQogCQlyZXQgPSBpOTE1X2dlbV9jb250ZXh0X2VuYWJsZShyaW5nKTsKIAkJaWYgKHJldCAm JiByZXQgIT0gLUVJTykgewogCQkJRFJNX0VSUk9SKCJDb250ZXh0IGVuYWJsZSByaW5nICMlZCBm YWlsZWQgJWRcbiIsIGksIHJldCk7CisJCQlpOTE1X2dlbV9yZXF1ZXN0X2NhbmNlbChyZXEpOwog CQkJaTkxNV9nZW1fY2xlYW51cF9yaW5nYnVmZmVyKGRldik7CiAJCQlnb3RvIG91dDsKIAkJfQor CisJCWk5MTVfYWRkX3JlcXVlc3Rfbm9fZmx1c2gocmluZyk7CiAJfQogCiBvdXQ6CmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9yZW5kZXJfc3RhdGUuYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlbmRlcl9zdGF0ZS5jCmluZGV4IGEzMmE0YjkuLmEw N2I0ZWUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlbmRlcl9z dGF0ZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlbmRlcl9zdGF0ZS5j CkBAIC0xNzMsOCArMTczLDYgQEAgaW50IGk5MTVfZ2VtX3JlbmRlcl9zdGF0ZV9pbml0KHN0cnVj dCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCiAKIAlpOTE1X3ZtYV9tb3ZlX3RvX2FjdGl2ZShpOTE1 X2dlbV9vYmpfdG9fZ2d0dChzby5vYmopLCByaW5nKTsKIAotCV9faTkxNV9hZGRfcmVxdWVzdChy aW5nLCBOVUxMLCBOVUxMLCB0cnVlKTsKLQkvKiBfX2k5MTVfYWRkX3JlcXVlc3QgbW92ZXMgb2Jq ZWN0IHRvIGluYWN0aXZlIGlmIGl0IGZhaWxzICovCiBvdXQ6CiAJaTkxNV9nZW1fcmVuZGVyX3N0 YXRlX2ZpbmkoJnNvKTsKIAlyZXR1cm4gcmV0OwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfbHJjLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwppbmRl eCBmMjRhYjBjLi5iNDMwZTUxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9scmMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwpAQCAtMTMzMCw4 ICsxMzMwLDYgQEAgc3RhdGljIGludCBpbnRlbF9scl9jb250ZXh0X3JlbmRlcl9zdGF0ZV9pbml0 KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCiB7CiAJc3RydWN0IGludGVsX3JpbmdidWZm ZXIgKnJpbmdidWYgPSBjdHgtPmVuZ2luZVtyaW5nLT5pZF0ucmluZ2J1ZjsKIAlzdHJ1Y3QgcmVu ZGVyX3N0YXRlIHNvOwotCXN0cnVjdCBkcm1faTkxNV9maWxlX3ByaXZhdGUgKmZpbGVfcHJpdiA9 IGN0eC0+ZmlsZV9wcml2OwotCXN0cnVjdCBkcm1fZmlsZSAqZmlsZSA9IGZpbGVfcHJpdiA/IGZp bGVfcHJpdi0+ZmlsZSA6IE5VTEw7CiAJaW50IHJldDsKIAogCXJldCA9IGk5MTVfZ2VtX3JlbmRl cl9zdGF0ZV9wcmVwYXJlKHJpbmcsICZzbyk7CkBAIC0xMzUwLDkgKzEzNDgsNiBAQCBzdGF0aWMg aW50IGludGVsX2xyX2NvbnRleHRfcmVuZGVyX3N0YXRlX2luaXQoc3RydWN0IGludGVsX2VuZ2lu ZV9jcyAqcmluZywKIAogCWk5MTVfdm1hX21vdmVfdG9fYWN0aXZlKGk5MTVfZ2VtX29ial90b19n Z3R0KHNvLm9iaiksIHJpbmcpOwogCi0JX19pOTE1X2FkZF9yZXF1ZXN0KHJpbmcsIGZpbGUsIE5V TEwsIHRydWUpOwotCS8qIGludGVsX2xvZ2ljYWxfcmluZ19hZGRfcmVxdWVzdCBtb3ZlcyBvYmpl Y3QgdG8gaW5hY3RpdmUgaWYgaXQKLQkgKiBmYWlscyAqLwogb3V0OgogCWk5MTVfZ2VtX3JlbmRl cl9zdGF0ZV9maW5pKCZzbyk7CiAJcmV0dXJuIHJldDsKLS0gCjEuNy45LjUKCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxp c3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==