From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH 19/53] drm/i915: Add explicit request management to i915_gem_init_hw() Date: Thu, 19 Feb 2015 17:17:31 +0000 Message-ID: <1424366285-29232-20-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 416B072089 for ; Thu, 19 Feb 2015 09:18:27 -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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KCk5vdyB0aGF0 IGEgc2luZ2xlIHBlciByaW5nIGxvb3AgaXMgYmVpbmcgZG9uZSBmb3IgYWxsIHRoZSBkaWZmZXJl bnQKaW50aWFsaXNhdGlvbiBzdGVwcyBpbiBpOTE1X2dlbV9pbml0X2h3KCksIGl0IGlzIHBvc3Np YmxlIHRvIGFkZCBwcm9wZXIgcmVxdWVzdAptYW5hZ2VtZW50IGFzIHdlbGwuIFRoZSBsYXN0IHJl bWFpbmluZyBpc3N1ZSBpcyB0aGF0IHRoZSBjb250ZXh0IGVuYWJsZSBjYWxsCmV2ZW50dWFsbHkg ZW5kcyB1cCB3aXRoaW4gKl9yZW5kZXJfc3RhdGVfaW5pdCgpIGFuZCB0aGlzIGRvZXMgaXQncyBv d24gcHJpdmF0ZQpfaTkxNV9hZGRfcmVxdWVzdCgpIGNhbGwuCgpUaGlzIHBhdGNoIGFkZHMgZXhw bGljaXQgcmVxdWVzdCBjcmVhdGlvbiBhbmQgc3VibWlzc2lvbiB0byB0aGUgdG9wIGxldmVsIGxv b3AKYW5kIHJlbW92ZXMgdGhlIGFkZF9yZXF1ZXN0KCkgZnJvbSBkZWVwIHdpdGhpbiB0aGUgc3Vi LWZ1bmN0aW9ucy4gTm90ZSB0aGF0IHRoZQpvbGQgYWRkX3JlcXVlc3QoKSBjYWxsIHdhcyBiZWlu ZyBwYXNzZWQgYSBiYXRjaCBvYmplY3QuIFRoaXMgaXMgbm93IGV4cGxpY2l0bHkKd3JpdHRlbiB0 byB0aGUgcmVxdWVzdCBvYmplY3QgaW5zdGVhZC4gQSB3YXJuaW5nIGhhcyBhbHNvIGJlZW4gYWRk ZWQgdG8KaTkxNV9hZGRfcmVxdWVzdCgpIHRvIGVuc3VyZSB0aGF0IHRoZXJlIGlzIG5ldmVyIGFu IGF0dGVtcHQgdG8gYWRkIHR3byBiYXRjaApvYmplY3RzIHRvIGEgc2luZ2xlIHJlcXVlc3QgLSBl LmcuIGJlY2F1c2UgcmVuZGVyX3N0YXRlX2luaXQoKSB3YXMgY2FsbGVkIGR1cmluZwpleGVjYnVm ZmVyIHByb2Nlc3NpbmcuCgpGb3I6IFZJWi01MTE1ClNpZ25lZC1vZmYtYnk6IEpvaG4gSGFycmlz b24gPEpvaG4uQy5IYXJyaXNvbkBJbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kcnYuaCAgICAgICAgICAgICAgfCAgICAzICsrLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9nZW0uYyAgICAgICAgICAgICAgfCAgIDE4ICsrKysrKysrKysrKysrKysrKwogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVuZGVyX3N0YXRlLmMgfCAgICAzICsrLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgICAgICAgICAgICAgfCAgICA4ICsrKy0tLS0tCiA0 IGZpbGVzIGNoYW5nZWQsIDI1IGluc2VydGlvbnMoKyksIDcgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZHJ2LmgKaW5kZXggNjUzYzgyZC4uZWEwZGE2YiAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2Rydi5oCkBAIC0yMTU4LDcgKzIxNTgsOCBAQCBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3Qg ewogCXN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHg7CiAJc3RydWN0IGludGVsX3JpbmdidWZmZXIg KnJpbmdidWY7CiAKLQkvKiogQmF0Y2ggYnVmZmVyIHJlbGF0ZWQgdG8gdGhpcyByZXF1ZXN0IGlm IGFueSAqLworCS8qKiBCYXRjaCBidWZmZXIgcmVsYXRlZCB0byB0aGlzIHJlcXVlc3QgaWYgYW55 ICh1c2VkIGZvcgorCSAgICBlcnJvciBzdGF0ZSBkdW1wIG9ubHkpICovCiAJc3RydWN0IGRybV9p OTE1X2dlbV9vYmplY3QgKmJhdGNoX29iajsKIAogCS8qKiBUaW1lIGF0IHdoaWNoIHRoaXMgcmVx dWVzdCB3YXMgZW1pdHRlZCwgaW4gamlmZmllcy4gKi8KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmlu ZGV4IDU4NTA5OTEuLmVmZWQ0OWEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtMjQ2Nyw2 ICsyNDY3LDcgQEAgaW50IF9faTkxNV9hZGRfcmVxdWVzdChzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz ICpyaW5nLAogCSAqIGluYWN0aXZlX2xpc3QgYW5kIGxvc2UgaXRzIGFjdGl2ZSByZWZlcmVuY2Uu IEhlbmNlIHdlIGRvIG5vdCBuZWVkCiAJICogdG8gZXhwbGljaXRseSBob2xkIGFub3RoZXIgcmVm ZXJlbmNlIGhlcmUuCiAJICovCisJV0FSTl9PTihyZXF1ZXN0LT5iYXRjaF9vYmogJiYgb2JqKTsK IAlyZXF1ZXN0LT5iYXRjaF9vYmogPSBvYmo7CiAKIAlpZiAoIWk5MTUuZW5hYmxlX2V4ZWNsaXN0 cykgewpAQCAtNDg2MSw4ICs0ODYyLDE2IEBAIGk5MTVfZ2VtX2luaXRfaHcoc3RydWN0IGRybV9k ZXZpY2UgKmRldikKIAogCS8qIE5vdyBpdCBpcyBzYWZlIHRvIGdvIGJhY2sgcm91bmQgYW5kIGRv IGV2ZXJ5dGhpbmcgZWxzZTogKi8KIAlmb3JfZWFjaF9yaW5nKHJpbmcsIGRldl9wcml2LCBpKSB7 CisJCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxOworCiAJCVdBUk5fT04oIXJpbmct PmRlZmF1bHRfY29udGV4dCk7CiAKKwkJcmV0ID0gZGV2X3ByaXYtPmd0LmFsbG9jX3JlcXVlc3Qo cmluZywgcmluZy0+ZGVmYXVsdF9jb250ZXh0LCAmcmVxKTsKKwkJaWYgKHJldCkgeworCQkJaTkx NV9nZW1fY2xlYW51cF9yaW5nYnVmZmVyKGRldik7CisJCQlyZXR1cm4gcmV0OworCQl9CisKIAkJ aWYgKHJpbmctPmlkID09IFJDUykgewogCQkJZm9yIChpID0gMDsgaSA8IE5VTV9MM19TTElDRVMo ZGV2KTsgaSsrKQogCQkJCWk5MTVfZ2VtX2wzX3JlbWFwKHJpbmcsIGkpOwpAQCAtNDg3MSw2ICs0 ODgwLDcgQEAgaTkxNV9nZW1faW5pdF9odyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQlyZXQg PSBpOTE1X3BwZ3R0X2luaXRfcmluZyhyaW5nKTsKIAkJaWYgKHJldCAmJiByZXQgIT0gLUVJTykg ewogCQkJRFJNX0VSUk9SKCJQUEdUVCBlbmFibGUgcmluZyAjJWQgZmFpbGVkICVkXG4iLCBpLCBy ZXQpOworCQkJaTkxNV9nZW1fcmVxdWVzdF91bnJlZmVyZW5jZShyZXEpOwogCQkJaTkxNV9nZW1f Y2xlYW51cF9yaW5nYnVmZmVyKGRldik7CiAJCQlyZXR1cm4gcmV0OwogCQl9CkBAIC00ODc4LDgg KzQ4ODgsMTYgQEAgaTkxNV9nZW1faW5pdF9odyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQly ZXQgPSBpOTE1X2dlbV9jb250ZXh0X2VuYWJsZShyaW5nKTsKIAkJaWYgKHJldCAmJiByZXQgIT0g LUVJTykgewogCQkJRFJNX0VSUk9SKCJDb250ZXh0IGVuYWJsZSByaW5nICMlZCBmYWlsZWQgJWRc biIsIGksIHJldCk7CisJCQlpOTE1X2dlbV9yZXF1ZXN0X3VucmVmZXJlbmNlKHJlcSk7CiAJCQlp OTE1X2dlbV9jbGVhbnVwX3JpbmdidWZmZXIoZGV2KTsKKwkJCXJldHVybiByZXQ7CisJCX0KIAor CQlyZXQgPSBpOTE1X2FkZF9yZXF1ZXN0X25vX2ZsdXNoKHJpbmcpOworCQlpZiAocmV0KSB7CisJ CQlEUk1fRVJST1IoIkFkZCByZXF1ZXN0IHJpbmcgIyVkIGZhaWxlZDogJWRcbiIsIGksIHJldCk7 CisJCQlpOTE1X2dlbV9yZXF1ZXN0X3VucmVmZXJlbmNlKHJlcSk7CisJCQlpOTE1X2dlbV9jbGVh bnVwX3JpbmdidWZmZXIoZGV2KTsKIAkJCXJldHVybiByZXQ7CiAJCX0KIAl9CmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9yZW5kZXJfc3RhdGUuYyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlbmRlcl9zdGF0ZS5jCmluZGV4IGFiYTM5YzMuLjk4OTQ3 NmUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlbmRlcl9zdGF0 ZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlbmRlcl9zdGF0ZS5jCkBA IC0xNzMsNyArMTczLDggQEAgaW50IGk5MTVfZ2VtX3JlbmRlcl9zdGF0ZV9pbml0KHN0cnVjdCBp bnRlbF9lbmdpbmVfY3MgKnJpbmcpCiAKIAlpOTE1X3ZtYV9tb3ZlX3RvX2FjdGl2ZShpOTE1X2dl bV9vYmpfdG9fZ2d0dChzby5vYmopLCByaW5nKTsKIAotCXJldCA9IF9faTkxNV9hZGRfcmVxdWVz dChyaW5nLCBOVUxMLCBzby5vYmosIHRydWUpOworCVdBUk5fT04ocmluZy0+b3V0c3RhbmRpbmdf bGF6eV9yZXF1ZXN0LT5iYXRjaF9vYmopOworCXJpbmctPm91dHN0YW5kaW5nX2xhenlfcmVxdWVz dC0+YmF0Y2hfb2JqID0gc28ub2JqOwogCS8qIF9faTkxNV9hZGRfcmVxdWVzdCBtb3ZlcyBvYmpl Y3QgdG8gaW5hY3RpdmUgaWYgaXQgZmFpbHMgKi8KIG91dDoKIAlpOTE1X2dlbV9yZW5kZXJfc3Rh dGVfZmluaSgmc28pOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJj LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwppbmRleCAwZDg4ZTljLi5kZmY3 ODI5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwpAQCAtMTM1MCw4ICsxMzUwLDYgQEAgc3Rh dGljIGludCBpbnRlbF9scl9jb250ZXh0X3JlbmRlcl9zdGF0ZV9pbml0KHN0cnVjdCBpbnRlbF9l bmdpbmVfY3MgKnJpbmcsCiB7CiAJc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYgPSBj dHgtPmVuZ2luZVtyaW5nLT5pZF0ucmluZ2J1ZjsKIAlzdHJ1Y3QgcmVuZGVyX3N0YXRlIHNvOwot CXN0cnVjdCBkcm1faTkxNV9maWxlX3ByaXZhdGUgKmZpbGVfcHJpdiA9IGN0eC0+ZmlsZV9wcml2 OwotCXN0cnVjdCBkcm1fZmlsZSAqZmlsZSA9IGZpbGVfcHJpdiA/IGZpbGVfcHJpdi0+ZmlsZSA6 IE5VTEw7CiAJaW50IHJldDsKIAogCXJldCA9IGk5MTVfZ2VtX3JlbmRlcl9zdGF0ZV9wcmVwYXJl KHJpbmcsICZzbyk7CkBAIC0xMzcwLDkgKzEzNjgsOSBAQCBzdGF0aWMgaW50IGludGVsX2xyX2Nv bnRleHRfcmVuZGVyX3N0YXRlX2luaXQoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKIAog CWk5MTVfdm1hX21vdmVfdG9fYWN0aXZlKGk5MTVfZ2VtX29ial90b19nZ3R0KHNvLm9iaiksIHJp bmcpOwogCi0JcmV0ID0gX19pOTE1X2FkZF9yZXF1ZXN0KHJpbmcsIGZpbGUsIHNvLm9iaiwgdHJ1 ZSk7Ci0JLyogaW50ZWxfbG9naWNhbF9yaW5nX2FkZF9yZXF1ZXN0IG1vdmVzIG9iamVjdCB0byBp bmFjdGl2ZSBpZiBpdAotCSAqIGZhaWxzICovCisJV0FSTl9PTihyaW5nLT5vdXRzdGFuZGluZ19s YXp5X3JlcXVlc3QtPmJhdGNoX29iaik7CisJcmluZy0+b3V0c3RhbmRpbmdfbGF6eV9yZXF1ZXN0 LT5iYXRjaF9vYmogPSBzby5vYmo7CisJLyogX19pOTE1X2FkZF9yZXF1ZXN0IG1vdmVzIG9iamVj dCB0byBpbmFjdGl2ZSBpZiBpdCBmYWlscyAqLwogb3V0OgogCWk5MTVfZ2VtX3JlbmRlcl9zdGF0 ZV9maW5pKCZzbyk7CiAJcmV0dXJuIHJldDsKLS0gCjEuNy45LjUKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50 ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3Jn L21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==