From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH 08/53] drm/i915: Update alloc_request to return the allocated request Date: Thu, 19 Feb 2015 17:17:20 +0000 Message-ID: <1424366285-29232-9-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 2C0C77201F for ; Thu, 19 Feb 2015 09:18:16 -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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KClRoZSBhbGxv Y19yZXF1ZXN0KCkgZnVuY3Rpb24gZG9lcyBub3QgYWN0dWFsbHkgcmV0dXJuIHRoZSBuZXdseSBh bGxvY2F0ZWQKcmVxdWVzdC4gSW5zdGVhZCwgaXQgbXVzdCBiZSBwdWxsZWQgZnJvbSByaW5nLT5v dXRzdGFuZGluZ19sYXp5X3JlcXVlc3QuIFRoaXMKcGF0Y2ggZml4ZXMgdGhpcyBzbyB0aGF0IGNv ZGUgY2FuIGNyZWF0ZSBhIHJlcXVlc3QgYW5kIHN0YXJ0IHVzaW5nIGl0IGtub3dpbmcKZXhhY3Rs eSB3aGljaCByZXF1ZXN0IGl0IGFjdHVhbGx5IG93bnMuCgpGb3I6IFZJWi01MTE1ClNpZ25lZC1v ZmYtYnk6IEpvaG4gSGFycmlzb24gPEpvaG4uQy5IYXJyaXNvbkBJbnRlbC5jb20+Ci0tLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgICAgICAgIHwgICAgMyArKy0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYyB8ICAgIDMgKystCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyAgICAgICAgICAgfCAgIDEzICsrKysrKysrKy0tLS0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5oICAgICAgICAgICB8ICAgIDMgKystCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMgICAgfCAgIDE0ICsrKysrKysr KystLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmggICAgfCAgICAz ICsrLQogNiBmaWxlcyBjaGFuZ2VkLCAyNyBpbnNlcnRpb25zKCspLCAxMiBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCA4N2E0YTJlLi45MDIyM2YyMDggMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kcnYuaApAQCAtMTkwOSw3ICsxOTA5LDggQEAgc3RydWN0IGRybV9pOTE1X3By aXZhdGUgewogCS8qIEFic3RyYWN0IHRoZSBzdWJtaXNzaW9uIG1lY2hhbmlzbSAobGVnYWN5IHJp bmdidWZmZXIgb3IgZXhlY2xpc3RzKSBhd2F5ICovCiAJc3RydWN0IHsKIAkJaW50ICgqYWxsb2Nf cmVxdWVzdCkoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKLQkJCQkgICAgIHN0cnVjdCBp bnRlbF9jb250ZXh0ICpjdHgpOworCQkJCSAgICAgc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCwK KwkJCQkgICAgIHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqKnJlcV9vdXQpOwogCQlpbnQg KCpkb19leGVjYnVmKShzdHJ1Y3QgaTkxNV9leGVjYnVmZmVyX3BhcmFtcyAqcGFyYW1zLAogCQkJ CSAgc3RydWN0IGRybV9pOTE1X2dlbV9leGVjYnVmZmVyMiAqYXJncywKIAkJCQkgIHN0cnVjdCBs aXN0X2hlYWQgKnZtYXMpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW1fZXhlY2J1ZmZlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZl ci5jCmluZGV4IDYxNDcxZTkuLjM3ZGNjNmYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbV9leGVjYnVmZmVyLmMKQEAgLTEzNTMsNiArMTM1Myw3IEBAIGk5MTVfZ2VtX2RvX2V4ZWNi dWZmZXIoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKIAlzdHJ1Y3QgaTkxNV9h ZGRyZXNzX3NwYWNlICp2bTsKIAlzdHJ1Y3QgaTkxNV9leGVjYnVmZmVyX3BhcmFtcyBwYXJhbXNf bWFzdGVyOyAvKiBYWFg6IHdpbGwgYmUgcmVtb3ZlZCBsYXRlciAqLwogCXN0cnVjdCBpOTE1X2V4 ZWNidWZmZXJfcGFyYW1zICpwYXJhbXMgPSAmcGFyYW1zX21hc3RlcjsKKwlzdHJ1Y3QgZHJtX2k5 MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3Q7CiAJY29uc3QgdTMyIGN0eF9pZCA9IGk5MTVfZXhlY2J1 ZmZlcjJfZ2V0X2NvbnRleHRfaWQoKmFyZ3MpOwogCXUzMiBkaXNwYXRjaF9mbGFnczsKIAlpbnQg cmV0OwpAQCAtMTUzMSw3ICsxNTMyLDcgQEAgaTkxNV9nZW1fZG9fZXhlY2J1ZmZlcihzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAogCQlwYXJhbXMtPmJhdGNoX29ial92bV9vZmZz ZXQgPSBpOTE1X2dlbV9vYmpfb2Zmc2V0KGJhdGNoX29iaiwgdm0pOwogCiAJLyogQWxsb2NhdGUg YSByZXF1ZXN0IGZvciB0aGlzIGJhdGNoIGJ1ZmZlciBuaWNlIGFuZCBlYXJseS4gKi8KLQlyZXQg PSBkZXZfcHJpdi0+Z3QuYWxsb2NfcmVxdWVzdChyaW5nLCBjdHgpOworCXJldCA9IGRldl9wcml2 LT5ndC5hbGxvY19yZXF1ZXN0KHJpbmcsIGN0eCwgJnJlcXVlc3QpOwogCWlmIChyZXQpCiAJCWdv dG8gZXJyOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCmluZGV4IDg2MjhhYmYuLmMzYzc4M2Yg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCkBAIC04NTcsMTMgKzg1NywxNyBAQCB2b2lkIGlu dGVsX2xyX2NvbnRleHRfdW5waW4oc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKIH0KIAog aW50IGludGVsX2xvZ2ljYWxfcmluZ19hbGxvY19yZXF1ZXN0KHN0cnVjdCBpbnRlbF9lbmdpbmVf Y3MgKnJpbmcsCi0JCQkJICAgICBzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4KQorCQkJCSAgICAg c3RydWN0IGludGVsX2NvbnRleHQgKmN0eCwKKwkJCQkgICAgIHN0cnVjdCBkcm1faTkxNV9nZW1f cmVxdWVzdCAqKnJlcV9vdXQpCiB7CiAJc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1 ZXN0OwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdmF0ZSA9IHJpbmctPmRldi0+ ZGV2X3ByaXZhdGU7CiAJaW50IHJldDsKIAotCWlmIChyaW5nLT5vdXRzdGFuZGluZ19sYXp5X3Jl cXVlc3QpCisJaWYgKCFyZXFfb3V0KQorCQlyZXR1cm4gLUVJTlZBTDsKKworCWlmICgoKnJlcV9v dXQgPSByaW5nLT5vdXRzdGFuZGluZ19sYXp5X3JlcXVlc3QpICE9IE5VTEwpCiAJCXJldHVybiAw OwogCiAJcmVxdWVzdCA9IGt6YWxsb2Moc2l6ZW9mKCpyZXF1ZXN0KSwgR0ZQX0tFUk5FTCk7CkBA IC04OTgsNyArOTAyLDcgQEAgaW50IGludGVsX2xvZ2ljYWxfcmluZ19hbGxvY19yZXF1ZXN0KHN0 cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCiAJaTkxNV9nZW1fY29udGV4dF9yZWZlcmVuY2Uo cmVxdWVzdC0+Y3R4KTsKIAlyZXF1ZXN0LT5yaW5nYnVmID0gY3R4LT5lbmdpbmVbcmluZy0+aWRd LnJpbmdidWY7CiAKLQlyaW5nLT5vdXRzdGFuZGluZ19sYXp5X3JlcXVlc3QgPSByZXF1ZXN0Owor CSpyZXFfb3V0ID0gcmluZy0+b3V0c3RhbmRpbmdfbGF6eV9yZXF1ZXN0ID0gcmVxdWVzdDsKIAly ZXR1cm4gMDsKIH0KIApAQCAtMTA1MSw2ICsxMDU1LDcgQEAgc3RhdGljIGludCBsb2dpY2FsX3Jp bmdfcHJlcGFyZShzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiwKIGludCBpbnRlbF9s b2dpY2FsX3JpbmdfYmVnaW4oc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYsCiAJCQkg ICAgIHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgsIGludCBudW1fZHdvcmRzKQogeworCXN0cnVj dCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxOwogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJp bmcgPSByaW5nYnVmLT5yaW5nOwogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSByaW5nLT5kZXY7 CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsK QEAgLTEwNjYsNyArMTA3MSw3IEBAIGludCBpbnRlbF9sb2dpY2FsX3JpbmdfYmVnaW4oc3RydWN0 IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYsCiAJCXJldHVybiByZXQ7CiAKIAkvKiBQcmVhbGxv Y2F0ZSB0aGUgb2xyIGJlZm9yZSB0b3VjaGluZyB0aGUgcmluZyAqLwotCXJldCA9IGludGVsX2xv Z2ljYWxfcmluZ19hbGxvY19yZXF1ZXN0KHJpbmcsIGN0eCk7CisJcmV0ID0gaW50ZWxfbG9naWNh bF9yaW5nX2FsbG9jX3JlcXVlc3QocmluZywgY3R4LCAmcmVxKTsKIAlpZiAocmV0KQogCQlyZXR1 cm4gcmV0OwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuaCBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5oCmluZGV4IDNjYzM4YmQuLjc3ZGU4YWMg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5oCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5oCkBAIC0zNyw3ICszNyw4IEBACiAKIC8qIExvZ2lj YWwgUmluZ3MgKi8KIGludCBfX211c3RfY2hlY2sgaW50ZWxfbG9naWNhbF9yaW5nX2FsbG9jX3Jl cXVlc3Qoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKLQkJCQkJCSAgc3RydWN0IGludGVs X2NvbnRleHQgKmN0eCk7CisJCQkJCQkgIHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgsCisJCQkJ CQkgIHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqKnJlcV9vdXQpOwogdm9pZCBpbnRlbF9s b2dpY2FsX3Jpbmdfc3RvcChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKTsKIHZvaWQgaW50 ZWxfbG9naWNhbF9yaW5nX2NsZWFudXAoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyk7CiBp bnQgaW50ZWxfbG9naWNhbF9yaW5nc19pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCmluZGV4IDYzNTcwN2EuLjFhOWY4ODQg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKQEAgLTIxNjQsMTMgKzIx NjQsMTggQEAgaW50IGludGVsX3JpbmdfaWRsZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5n KQogfQogCiBpbnQKLWludGVsX3JpbmdfYWxsb2NfcmVxdWVzdChzdHJ1Y3QgaW50ZWxfZW5naW5l X2NzICpyaW5nLCBzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4KQoraW50ZWxfcmluZ19hbGxvY19y ZXF1ZXN0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCisJCQkgc3RydWN0IGludGVsX2Nv bnRleHQgKmN0eCwKKwkJCSBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKipyZXFfb3V0KQog ewogCWludCByZXQ7CiAJc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0OwogCXN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdmF0ZSA9IHJpbmctPmRldi0+ZGV2X3ByaXZh dGU7CiAKLQlpZiAocmluZy0+b3V0c3RhbmRpbmdfbGF6eV9yZXF1ZXN0KQorCWlmICghcmVxX291 dCkKKwkJcmV0dXJuIC1FSU5WQUw7CisKKwlpZiAoKCpyZXFfb3V0ID0gcmluZy0+b3V0c3RhbmRp bmdfbGF6eV9yZXF1ZXN0KSAhPSBOVUxMKQogCQlyZXR1cm4gMDsKIAogCXJlcXVlc3QgPSBremFs bG9jKHNpemVvZigqcmVxdWVzdCksIEdGUF9LRVJORUwpOwpAQCAtMjE4OCw3ICsyMTkzLDcgQEAg aW50ZWxfcmluZ19hbGxvY19yZXF1ZXN0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsIHN0 cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgKIAkJcmV0dXJuIHJldDsKIAl9CiAKLQlyaW5nLT5vdXRz dGFuZGluZ19sYXp5X3JlcXVlc3QgPSByZXF1ZXN0OworCSpyZXFfb3V0ID0gcmluZy0+b3V0c3Rh bmRpbmdfbGF6eV9yZXF1ZXN0ID0gcmVxdWVzdDsKIAlyZXR1cm4gMDsKIH0KIApAQCAtMjIxNiw2 ICsyMjIxLDcgQEAgc3RhdGljIGludCBfX2ludGVsX3JpbmdfcHJlcGFyZShzdHJ1Y3QgaW50ZWxf ZW5naW5lX2NzICpyaW5nLAogaW50IGludGVsX3JpbmdfYmVnaW4oc3RydWN0IGludGVsX2VuZ2lu ZV9jcyAqcmluZywKIAkJICAgICBpbnQgbnVtX2R3b3JkcykKIHsKKwlzdHJ1Y3QgZHJtX2k5MTVf Z2VtX3JlcXVlc3QgKnJlcTsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBy aW5nLT5kZXYtPmRldl9wcml2YXRlOwogCWludCByZXQ7CiAKQEAgLTIyMjksNyArMjIzNSw3IEBA IGludCBpbnRlbF9yaW5nX2JlZ2luKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCiAJCXJl dHVybiByZXQ7CiAKIAkvKiBQcmVhbGxvY2F0ZSB0aGUgb2xyIGJlZm9yZSB0b3VjaGluZyB0aGUg cmluZyAqLwotCXJldCA9IGludGVsX3JpbmdfYWxsb2NfcmVxdWVzdChyaW5nLCBOVUxMKTsKKwly ZXQgPSBpbnRlbF9yaW5nX2FsbG9jX3JlcXVlc3QocmluZywgTlVMTCwgJnJlcSk7CiAJaWYgKHJl dCkKIAkJcmV0dXJuIHJldDsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfcmluZ2J1ZmZlci5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5o CmluZGV4IDJmZDk2MGEuLjRmOGExNGEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3JpbmdidWZmZXIuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5n YnVmZmVyLmgKQEAgLTM5Myw3ICszOTMsOCBAQCB2b2lkIGludGVsX2NsZWFudXBfcmluZ19idWZm ZXIoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyk7CiBpbnQgX19tdXN0X2NoZWNrIGludGVs X3JpbmdfYmVnaW4oc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywgaW50IG4pOwogaW50IF9f bXVzdF9jaGVjayBpbnRlbF9yaW5nX2NhY2hlbGluZV9hbGlnbihzdHJ1Y3QgaW50ZWxfZW5naW5l X2NzICpyaW5nKTsKIGludCBfX211c3RfY2hlY2sgaW50ZWxfcmluZ19hbGxvY19yZXF1ZXN0KHN0 cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCi0JCQkJCSAgc3RydWN0IGludGVsX2NvbnRleHQg KmN0eCk7CisJCQkJCSAgc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCwKKwkJCQkJICBzdHJ1Y3Qg ZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKipyZXFfb3V0KTsKIHN0YXRpYyBpbmxpbmUgdm9pZCBpbnRl bF9yaW5nX2VtaXQoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKIAkJCQkgICB1MzIgZGF0 YSkKIHsKLS0gCjEuNy45LjUKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50 ZWwtZ2Z4Cg==