From: John.C.Harrison@Intel.com Subject: [PATCH 19/51] drm/i915: Add explicit request management to i915_gem_init_hw() Date: Fri, 13 Feb 2015 11:48:28 +0000 Message-ID: <1423828140-10653-20-git-send-email-John.C.Harrison@Intel.com> References: <1423828140-10653-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 92A896E7B8 for ; Fri, 13 Feb 2015 03:49:23 -0800 (PST) In-Reply-To: <1423828140-10653-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 cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMgICAgICAgICAgfCAgICA3ICstLS0tLS0KIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlbmRlcl9zdGF0ZS5jIHwgICAgMyArKy0KIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jICAgICAgICAgICAgIHwgICAgOCArKystLS0t LQogNSBmaWxlcyBjaGFuZ2VkLCAyNiBpbnNlcnRpb25zKCspLCAxMyBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCAwOTlhM2VlLi4yMjI5MjM4IDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZHJ2LmgKQEAgLTIxNTEsNyArMjE1MSw4IEBAIHN0cnVjdCBkcm1faTkxNV9nZW1fcmVx dWVzdCB7CiAJc3RydWN0IGludGVsX2NvbnRleHQgKmN0eDsKIAlzdHJ1Y3QgaW50ZWxfcmluZ2J1 ZmZlciAqcmluZ2J1ZjsKIAotCS8qKiBCYXRjaCBidWZmZXIgcmVsYXRlZCB0byB0aGlzIHJlcXVl c3QgaWYgYW55ICovCisJLyoqIEJhdGNoIGJ1ZmZlciByZWxhdGVkIHRvIHRoaXMgcmVxdWVzdCBp ZiBhbnkgKHVzZWQgZm9yCisJICAgIGVycm9yIHN0YXRlIGR1bXAgb25seSkgKi8KIAlzdHJ1Y3Qg ZHJtX2k5MTVfZ2VtX29iamVjdCAqYmF0Y2hfb2JqOwogCiAJLyoqIFRpbWUgYXQgd2hpY2ggdGhp cyByZXF1ZXN0IHdhcyBlbWl0dGVkLCBpbiBqaWZmaWVzLiAqLwpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt LmMKaW5kZXggMWM3MTFjMC4uNWYyNGNlMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9nZW0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCkBAIC0y NDY2LDYgKzI0NjYsNyBAQCBpbnQgX19pOTE1X2FkZF9yZXF1ZXN0KHN0cnVjdCBpbnRlbF9lbmdp bmVfY3MgKnJpbmcsCiAJICogaW5hY3RpdmVfbGlzdCBhbmQgbG9zZSBpdHMgYWN0aXZlIHJlZmVy ZW5jZS4gSGVuY2Ugd2UgZG8gbm90IG5lZWQKIAkgKiB0byBleHBsaWNpdGx5IGhvbGQgYW5vdGhl ciByZWZlcmVuY2UgaGVyZS4KIAkgKi8KKwlXQVJOX09OKHJlcXVlc3QtPmJhdGNoX29iaiAmJiBv YmopOwogCXJlcXVlc3QtPmJhdGNoX29iaiA9IG9iajsKIAogCWlmICghaTkxNS5lbmFibGVfZXhl Y2xpc3RzKSB7CkBAIC00ODU2LDggKzQ4NTcsMTYgQEAgaTkxNV9nZW1faW5pdF9odyhzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2KQogCiAJLyogTm93IGl0IGlzIHNhZmUgdG8gZ28gYmFjayByb3VuZCBh bmQgZG8gZXZlcnl0aGluZyBlbHNlOiAqLwogCWZvcl9lYWNoX3JpbmcocmluZywgZGV2X3ByaXYs IGkpIHsKKwkJc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXE7CisKIAkJV0FSTl9PTigh cmluZy0+ZGVmYXVsdF9jb250ZXh0KTsKIAorCQlyZXQgPSBkZXZfcHJpdi0+Z3QuYWxsb2NfcmVx dWVzdChyaW5nLCByaW5nLT5kZWZhdWx0X2NvbnRleHQsICZyZXEpOworCQlpZiAocmV0KSB7CisJ CQlpOTE1X2dlbV9jbGVhbnVwX3JpbmdidWZmZXIoZGV2KTsKKwkJCXJldHVybiByZXQ7CisJCX0K KwogCQlpZiAocmluZy0+aWQgPT0gUkNTKSB7CiAJCQlmb3IgKGkgPSAwOyBpIDwgTlVNX0wzX1NM SUNFUyhkZXYpOyBpKyspCiAJCQkJaTkxNV9nZW1fbDNfcmVtYXAocmluZywgaSk7CkBAIC00ODY2 LDYgKzQ4NzUsNyBAQCBpOTE1X2dlbV9pbml0X2h3KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJ CXJldCA9IGk5MTVfcHBndHRfaW5pdF9yaW5nKHJpbmcpOwogCQlpZiAocmV0ICYmIHJldCAhPSAt RUlPKSB7CiAJCQlEUk1fRVJST1IoIlBQR1RUIGVuYWJsZSByaW5nICMlZCBmYWlsZWQgJWRcbiIs IGksIHJldCk7CisJCQlpOTE1X2dlbV9yZXF1ZXN0X3VucmVmZXJlbmNlKHJlcSk7CiAJCQlpOTE1 X2dlbV9jbGVhbnVwX3JpbmdidWZmZXIoZGV2KTsKIAkJCXJldHVybiByZXQ7CiAJCX0KQEAgLTQ4 NzMsOCArNDg4MywxNiBAQCBpOTE1X2dlbV9pbml0X2h3KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYp CiAJCXJldCA9IGk5MTVfZ2VtX2NvbnRleHRfZW5hYmxlKHJpbmcpOwogCQlpZiAocmV0ICYmIHJl dCAhPSAtRUlPKSB7CiAJCQlEUk1fRVJST1IoIkNvbnRleHQgZW5hYmxlIHJpbmcgIyVkIGZhaWxl ZCAlZFxuIiwgaSwgcmV0KTsKKwkJCWk5MTVfZ2VtX3JlcXVlc3RfdW5yZWZlcmVuY2UocmVxKTsK IAkJCWk5MTVfZ2VtX2NsZWFudXBfcmluZ2J1ZmZlcihkZXYpOworCQkJcmV0dXJuIHJldDsKKwkJ fQogCisJCXJldCA9IGk5MTVfYWRkX3JlcXVlc3Rfbm9fZmx1c2gocmluZyk7CisJCWlmIChyZXQp IHsKKwkJCURSTV9FUlJPUigiQWRkIHJlcXVlc3QgcmluZyAjJWQgZmFpbGVkOiAlZFxuIiwgaSwg cmV0KTsKKwkJCWk5MTVfZ2VtX3JlcXVlc3RfdW5yZWZlcmVuY2UocmVxKTsKKwkJCWk5MTVfZ2Vt X2NsZWFudXBfcmluZ2J1ZmZlcihkZXYpOwogCQkJcmV0dXJuIHJldDsKIAkJfQogCX0KZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKaW5kZXggMTUyOGU3Ny4uNjA0OGVkOSAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKQEAgLTEyMTEsMTYgKzEyMTEsMTEgQEAgaW50IGk5MTVf cHBndHRfaW5pdF9yaW5nKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCiB7CiAJc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gcmluZy0+ZGV2LT5kZXZfcHJpdmF0ZTsKIAlz dHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQgPSBkZXZfcHJpdi0+bW0uYWxpYXNpbmdfcHBndHQ7 Ci0JaW50IHJldCA9IDA7CiAKIAlpZiAoIXBwZ3R0KQogCQlyZXR1cm4gMDsKIAotCXJldCA9IHBw Z3R0LT5zd2l0Y2hfbW0ocHBndHQsIHJpbmcpOwotCWlmIChyZXQgIT0gMCkKLQkJcmV0dXJuIHJl dDsKLQotCXJldHVybiByZXQ7CisJcmV0dXJuIHBwZ3R0LT5zd2l0Y2hfbW0ocHBndHQsIHJpbmcp OwogfQogCiBzdHJ1Y3QgaTkxNV9od19wcGd0dCAqCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbV9yZW5kZXJfc3RhdGUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtX3JlbmRlcl9zdGF0ZS5jCmluZGV4IGFiYTM5YzMuLjk4OTQ3NmUgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlbmRlcl9zdGF0ZS5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlbmRlcl9zdGF0ZS5jCkBAIC0xNzMsNyArMTczLDgg QEAgaW50IGk5MTVfZ2VtX3JlbmRlcl9zdGF0ZV9pbml0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg KnJpbmcpCiAKIAlpOTE1X3ZtYV9tb3ZlX3RvX2FjdGl2ZShpOTE1X2dlbV9vYmpfdG9fZ2d0dChz by5vYmopLCByaW5nKTsKIAotCXJldCA9IF9faTkxNV9hZGRfcmVxdWVzdChyaW5nLCBOVUxMLCBz by5vYmosIHRydWUpOworCVdBUk5fT04ocmluZy0+b3V0c3RhbmRpbmdfbGF6eV9yZXF1ZXN0LT5i YXRjaF9vYmopOworCXJpbmctPm91dHN0YW5kaW5nX2xhenlfcmVxdWVzdC0+YmF0Y2hfb2JqID0g c28ub2JqOwogCS8qIF9faTkxNV9hZGRfcmVxdWVzdCBtb3ZlcyBvYmplY3QgdG8gaW5hY3RpdmUg aWYgaXQgZmFpbHMgKi8KIG91dDoKIAlpOTE1X2dlbV9yZW5kZXJfc3RhdGVfZmluaSgmc28pOwpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9scmMuYwppbmRleCBjYjEyZWVhLi5kZTAxY2FlIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9scmMuYwpAQCAtMTU5Miw4ICsxNTkyLDYgQEAgaW50IGludGVsX2xyX2NvbnRl eHRfcmVuZGVyX3N0YXRlX2luaXQoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKIHsKIAlz dHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiA9IGN0eC0+ZW5naW5lW3JpbmctPmlkXS5y aW5nYnVmOwogCXN0cnVjdCByZW5kZXJfc3RhdGUgc287Ci0Jc3RydWN0IGRybV9pOTE1X2ZpbGVf cHJpdmF0ZSAqZmlsZV9wcml2ID0gY3R4LT5maWxlX3ByaXY7Ci0Jc3RydWN0IGRybV9maWxlICpm aWxlID0gZmlsZV9wcml2ID8gZmlsZV9wcml2LT5maWxlIDogTlVMTDsKIAlpbnQgcmV0OwogCiAJ cmV0ID0gaTkxNV9nZW1fcmVuZGVyX3N0YXRlX3ByZXBhcmUocmluZywgJnNvKTsKQEAgLTE2MTIs OSArMTYxMCw5IEBAIGludCBpbnRlbF9scl9jb250ZXh0X3JlbmRlcl9zdGF0ZV9pbml0KHN0cnVj dCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCiAKIAlpOTE1X3ZtYV9tb3ZlX3RvX2FjdGl2ZShpOTE1 X2dlbV9vYmpfdG9fZ2d0dChzby5vYmopLCByaW5nKTsKIAotCXJldCA9IF9faTkxNV9hZGRfcmVx dWVzdChyaW5nLCBmaWxlLCBzby5vYmosIHRydWUpOwotCS8qIGludGVsX2xvZ2ljYWxfcmluZ19h ZGRfcmVxdWVzdCBtb3ZlcyBvYmplY3QgdG8gaW5hY3RpdmUgaWYgaXQKLQkgKiBmYWlscyAqLwor CVdBUk5fT04ocmluZy0+b3V0c3RhbmRpbmdfbGF6eV9yZXF1ZXN0LT5iYXRjaF9vYmopOworCXJp bmctPm91dHN0YW5kaW5nX2xhenlfcmVxdWVzdC0+YmF0Y2hfb2JqID0gc28ub2JqOworCS8qIF9f aTkxNV9hZGRfcmVxdWVzdCBtb3ZlcyBvYmplY3QgdG8gaW5hY3RpdmUgaWYgaXQgZmFpbHMgKi8K IG91dDoKIAlpOTE1X2dlbV9yZW5kZXJfc3RhdGVfZmluaSgmc28pOwogCXJldHVybiByZXQ7Ci0t IAoxLjcuOS41CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=