From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH 03/59] drm/i915: Move common request allocation code into a common function Date: Thu, 19 Mar 2015 12:30:08 +0000 Message-ID: <1426768264-16996-4-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 1A0FB6EA05 for ; Thu, 19 Mar 2015 05:31:10 -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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KClRoZSByZXF1 ZXN0IGFsbG9jYXRpb24gY29kZSBpcyBsYXJnZWx5IGR1cGxpY2F0ZWQgYmV0d2VlbiBsZWdhY3kg bW9kZSBhbmQKZXhlY2xpc3QgbW9kZS4gVGhlIGFjdHVhbCBkaWZmZXJlbmNlIGJldHdlZW4gdGhl IHR3byB2ZXJzaW9ucyBvZiB0aGUgY29kZSBpcwpwcmV0dHkgbWluaW1hbC4KClRoaXMgcGF0Y2gg bW92ZXMgdGhlIGNvbW1vbiBjb2RlIG91dCBpbnRvIGEgc2VwYXJhdGUgZnVuY3Rpb24uIFRoaXMg aXMgdGhlbgpjYWxsZWQgYnkgdGhlIGV4ZWN1dGlvbiBzcGVjaWZpYyB2ZXJzaW9uIHByaW9yIHRv IHNldHRpbmcgdXAgdGhlIG9uZSBkaWZmZXJlbnQKdmFsdWUuCgpGb3I6IFZJWi01MTkwClNpZ25l ZC1vZmYtYnk6IEpvaG4gSGFycmlzb24gPEpvaG4uQy5IYXJyaXNvbkBJbnRlbC5jb20+Ci0tLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgICAgIHwgICAgMiArKwogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyAgICAgICAgIHwgICAzNyArKysrKysrKysrKysrKysr KysrKysrKysrKysrKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgICAgICAgIHwg ICAzOSArKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9scmMuaCAgICAgICAgfCAgICAyICsrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9yaW5nYnVmZmVyLmMgfCAgIDI4ICsrKy0tLS0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaCB8ICAgIDIgKysKIDYgZmlsZXMgY2hhbmdlZCwg NTQgaW5zZXJ0aW9ucygrKSwgNTYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgK aW5kZXggMWEyMzQ0NS4uNGViZDQyMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC0yMTEz LDYgKzIxMTMsOCBAQCBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgewogCiB9OwogCitpbnQg aTkxNV9nZW1fcmVxdWVzdF9hbGxvYyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAorCQkJ ICAgc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCk7CiB2b2lkIGk5MTVfZ2VtX3JlcXVlc3RfZnJl ZShzdHJ1Y3Qga3JlZiAqcmVxX3JlZik7CiAKIHN0YXRpYyBpbmxpbmUgdWludDMyX3QKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbS5jCmluZGV4IDUxY2RmYjcuLjQ4MjRhZGYgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9nZW0uYwpAQCAtMjUxOCw2ICsyNTE4LDQzIEBAIHZvaWQgaTkxNV9nZW1fcmVxdWVzdF9mcmVl KHN0cnVjdCBrcmVmICpyZXFfcmVmKQogCWtmcmVlKHJlcSk7CiB9CiAKK2ludCBpOTE1X2dlbV9y ZXF1ZXN0X2FsbG9jKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCisJCQkgICBzdHJ1Y3Qg aW50ZWxfY29udGV4dCAqY3R4KQoreworCWludCByZXQ7CisJc3RydWN0IGRybV9pOTE1X2dlbV9y ZXF1ZXN0ICpyZXF1ZXN0OworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdmF0ZSA9 IHJpbmctPmRldi0+ZGV2X3ByaXZhdGU7CisKKwlpZiAocmluZy0+b3V0c3RhbmRpbmdfbGF6eV9y ZXF1ZXN0KQorCQlyZXR1cm4gMDsKKworCXJlcXVlc3QgPSBremFsbG9jKHNpemVvZigqcmVxdWVz dCksIEdGUF9LRVJORUwpOworCWlmIChyZXF1ZXN0ID09IE5VTEwpCisJCXJldHVybiAtRU5PTUVN OworCisJcmV0ID0gaTkxNV9nZW1fZ2V0X3NlcW5vKHJpbmctPmRldiwgJnJlcXVlc3QtPnNlcW5v KTsKKwlpZiAocmV0KSB7CisJCWtmcmVlKHJlcXVlc3QpOworCQlyZXR1cm4gcmV0OworCX0KKwor CWtyZWZfaW5pdCgmcmVxdWVzdC0+cmVmKTsKKwlyZXF1ZXN0LT5yaW5nID0gcmluZzsKKwlyZXF1 ZXN0LT51bmlxID0gZGV2X3ByaXZhdGUtPnJlcXVlc3RfdW5pcSsrOworCisJaWYgKGk5MTUuZW5h YmxlX2V4ZWNsaXN0cykKKwkJcmV0ID0gaW50ZWxfbG9naWNhbF9yaW5nX2FsbG9jX3JlcXVlc3Rf ZXh0cmFzKHJlcXVlc3QsIGN0eCk7CisJZWxzZQorCQlyZXQgPSBpbnRlbF9yaW5nX2FsbG9jX3Jl cXVlc3RfZXh0cmFzKHJlcXVlc3QpOworCWlmIChyZXQpIHsKKwkJa2ZyZWUocmVxdWVzdCk7CisJ CXJldHVybiByZXQ7CisJfQorCisJcmluZy0+b3V0c3RhbmRpbmdfbGF6eV9yZXF1ZXN0ID0gcmVx dWVzdDsKKwlyZXR1cm4gMDsKK30KKwogc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICoKIGk5 MTVfZ2VtX2ZpbmRfYWN0aXZlX3JlcXVlc3Qoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykK IHsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKaW5kZXggY2FkNDMwMC4uNjUwNDY4OSAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfbHJjLmMKQEAgLTYxMSw0NCArNjExLDIxIEBAIHN0YXRpYyBpbnQgZXhl Y2xpc3RzX21vdmVfdG9fZ3B1KHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmLAogCXJl dHVybiBsb2dpY2FsX3JpbmdfaW52YWxpZGF0ZV9hbGxfY2FjaGVzKHJpbmdidWYsIGN0eCk7CiB9 CiAKLXN0YXRpYyBpbnQgbG9naWNhbF9yaW5nX2FsbG9jX3JlcXVlc3Qoc3RydWN0IGludGVsX2Vu Z2luZV9jcyAqcmluZywKLQkJCQkgICAgICBzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4KQoraW50 IGludGVsX2xvZ2ljYWxfcmluZ19hbGxvY19yZXF1ZXN0X2V4dHJhcyhzdHJ1Y3QgZHJtX2k5MTVf Z2VtX3JlcXVlc3QgKnJlcXVlc3QsCisJCQkJCSAgICBzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4 KQogewotCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdDsKLQlzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXZhdGUgPSByaW5nLT5kZXYtPmRldl9wcml2YXRlOwogCWlu dCByZXQ7CiAKLQlpZiAocmluZy0+b3V0c3RhbmRpbmdfbGF6eV9yZXF1ZXN0KQotCQlyZXR1cm4g MDsKLQotCXJlcXVlc3QgPSBremFsbG9jKHNpemVvZigqcmVxdWVzdCksIEdGUF9LRVJORUwpOwot CWlmIChyZXF1ZXN0ID09IE5VTEwpCi0JCXJldHVybiAtRU5PTUVNOwotCi0JaWYgKGN0eCAhPSBy aW5nLT5kZWZhdWx0X2NvbnRleHQpIHsKLQkJcmV0ID0gaW50ZWxfbHJfY29udGV4dF9waW4ocmlu ZywgY3R4KTsKLQkJaWYgKHJldCkgewotCQkJa2ZyZWUocmVxdWVzdCk7CisJaWYgKGN0eCAhPSBy ZXF1ZXN0LT5yaW5nLT5kZWZhdWx0X2NvbnRleHQpIHsKKwkJcmV0ID0gaW50ZWxfbHJfY29udGV4 dF9waW4ocmVxdWVzdC0+cmluZywgY3R4KTsKKwkJaWYgKHJldCkKIAkJCXJldHVybiByZXQ7Ci0J CX0KLQl9Ci0KLQlrcmVmX2luaXQoJnJlcXVlc3QtPnJlZik7Ci0JcmVxdWVzdC0+cmluZyA9IHJp bmc7Ci0JcmVxdWVzdC0+dW5pcSA9IGRldl9wcml2YXRlLT5yZXF1ZXN0X3VuaXErKzsKLQotCXJl dCA9IGk5MTVfZ2VtX2dldF9zZXFubyhyaW5nLT5kZXYsICZyZXF1ZXN0LT5zZXFubyk7Ci0JaWYg KHJldCkgewotCQlpbnRlbF9scl9jb250ZXh0X3VucGluKHJpbmcsIGN0eCk7Ci0JCWtmcmVlKHJl cXVlc3QpOwotCQlyZXR1cm4gcmV0OwogCX0KIAotCXJlcXVlc3QtPmN0eCA9IGN0eDsKKwlyZXF1 ZXN0LT5yaW5nYnVmID0gY3R4LT5lbmdpbmVbcmVxdWVzdC0+cmluZy0+aWRdLnJpbmdidWY7CisJ cmVxdWVzdC0+Y3R4ICAgICA9IGN0eDsKIAlpOTE1X2dlbV9jb250ZXh0X3JlZmVyZW5jZShyZXF1 ZXN0LT5jdHgpOwotCXJlcXVlc3QtPnJpbmdidWYgPSBjdHgtPmVuZ2luZVtyaW5nLT5pZF0ucmlu Z2J1ZjsKIAotCXJpbmctPm91dHN0YW5kaW5nX2xhenlfcmVxdWVzdCA9IHJlcXVlc3Q7CiAJcmV0 dXJuIDA7CiB9CiAKQEAgLTg0MCw3ICs4MTcsNyBAQCBzdGF0aWMgaW50IGludGVsX2xvZ2ljYWxf cmluZ19iZWdpbihzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiwKIAkJcmV0dXJuIHJl dDsKIAogCS8qIFByZWFsbG9jYXRlIHRoZSBvbHIgYmVmb3JlIHRvdWNoaW5nIHRoZSByaW5nICov Ci0JcmV0ID0gbG9naWNhbF9yaW5nX2FsbG9jX3JlcXVlc3QocmluZywgY3R4KTsKKwlyZXQgPSBp OTE1X2dlbV9yZXF1ZXN0X2FsbG9jKHJpbmcsIGN0eCk7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJl dDsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmggYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuaAppbmRleCBhYzhmODFhLi4wNGQzYTZkIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuaAorKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9scmMuaApAQCAtMzYsNiArMzYsOCBAQAogI2RlZmluZSBSSU5HX0NP TlRFWFRfU1RBVFVTX1BUUihyaW5nKQkoKHJpbmcpLT5tbWlvX2Jhc2UrMHgzYTApCiAKIC8qIExv Z2ljYWwgUmluZ3MgKi8KK2ludCBpbnRlbF9sb2dpY2FsX3JpbmdfYWxsb2NfcmVxdWVzdF9leHRy YXMoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0LAorCQkJCQkgICAgc3RydWN0 IGludGVsX2NvbnRleHQgKmN0eCk7CiB2b2lkIGludGVsX2xvZ2ljYWxfcmluZ19zdG9wKHN0cnVj dCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpOwogdm9pZCBpbnRlbF9sb2dpY2FsX3JpbmdfY2xlYW51 cChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKTsKIGludCBpbnRlbF9sb2dpY2FsX3Jpbmdz X2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9y aW5nYnVmZmVyLmMKaW5kZXggNDQxZTI1MC4uOTlmYjJmMCAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3JpbmdidWZmZXIuYwpAQCAtMjE4MSwzMiArMjE4MSwxMCBAQCBpbnQgaW50ZWxfcmlu Z19pZGxlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCiAJcmV0dXJuIGk5MTVfd2FpdF9y ZXF1ZXN0KHJlcSk7CiB9CiAKLXN0YXRpYyBpbnQKLWludGVsX3JpbmdfYWxsb2NfcmVxdWVzdChz dHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQoraW50IGludGVsX3JpbmdfYWxsb2NfcmVxdWVz dF9leHRyYXMoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0KQogewotCWludCBy ZXQ7Ci0Jc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0OwotCXN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdmF0ZSA9IHJpbmctPmRldi0+ZGV2X3ByaXZhdGU7Ci0KLQlp ZiAocmluZy0+b3V0c3RhbmRpbmdfbGF6eV9yZXF1ZXN0KQotCQlyZXR1cm4gMDsKLQotCXJlcXVl c3QgPSBremFsbG9jKHNpemVvZigqcmVxdWVzdCksIEdGUF9LRVJORUwpOwotCWlmIChyZXF1ZXN0 ID09IE5VTEwpCi0JCXJldHVybiAtRU5PTUVNOwotCi0Ja3JlZl9pbml0KCZyZXF1ZXN0LT5yZWYp OwotCXJlcXVlc3QtPnJpbmcgPSByaW5nOwotCXJlcXVlc3QtPnJpbmdidWYgPSByaW5nLT5idWZm ZXI7Ci0JcmVxdWVzdC0+dW5pcSA9IGRldl9wcml2YXRlLT5yZXF1ZXN0X3VuaXErKzsKLQotCXJl dCA9IGk5MTVfZ2VtX2dldF9zZXFubyhyaW5nLT5kZXYsICZyZXF1ZXN0LT5zZXFubyk7Ci0JaWYg KHJldCkgewotCQlrZnJlZShyZXF1ZXN0KTsKLQkJcmV0dXJuIHJldDsKLQl9CisJcmVxdWVzdC0+ cmluZ2J1ZiA9IHJlcXVlc3QtPnJpbmctPmJ1ZmZlcjsKIAotCXJpbmctPm91dHN0YW5kaW5nX2xh enlfcmVxdWVzdCA9IHJlcXVlc3Q7CiAJcmV0dXJuIDA7CiB9CiAKQEAgLTIyNDcsNyArMjIyNSw3 IEBAIGludCBpbnRlbF9yaW5nX2JlZ2luKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCiAJ CXJldHVybiByZXQ7CiAKIAkvKiBQcmVhbGxvY2F0ZSB0aGUgb2xyIGJlZm9yZSB0b3VjaGluZyB0 aGUgcmluZyAqLwotCXJldCA9IGludGVsX3JpbmdfYWxsb2NfcmVxdWVzdChyaW5nKTsKKwlyZXQg PSBpOTE1X2dlbV9yZXF1ZXN0X2FsbG9jKHJpbmcsIHJpbmctPmRlZmF1bHRfY29udGV4dCk7CiAJ aWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfcmluZ2J1ZmZlci5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1 ZmZlci5oCmluZGV4IGM3NjFmZTAuLjY1NjZkZDQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9yaW5nYnVmZmVyLmgKQEAgLTM5MCw2ICszOTAsOCBAQCBpbnQgaW50ZWxfYWxsb2NfcmluZ2J1 ZmZlcl9vYmooc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIHZvaWQgaW50ZWxfc3RvcF9yaW5nX2J1 ZmZlcihzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKTsKIHZvaWQgaW50ZWxfY2xlYW51cF9y aW5nX2J1ZmZlcihzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKTsKIAoraW50IGludGVsX3Jp bmdfYWxsb2NfcmVxdWVzdF9leHRyYXMoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1 ZXN0KTsKKwogaW50IF9fbXVzdF9jaGVjayBpbnRlbF9yaW5nX2JlZ2luKHN0cnVjdCBpbnRlbF9l bmdpbmVfY3MgKnJpbmcsIGludCBuKTsKIGludCBfX211c3RfY2hlY2sgaW50ZWxfcmluZ19jYWNo ZWxpbmVfYWxpZ24oc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyk7CiBzdGF0aWMgaW5saW5l IHZvaWQgaW50ZWxfcmluZ19lbWl0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCi0tIAox LjcuOS41CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJ bnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0 cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=