From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH 11/59] drm/i915: Update alloc_request to return the allocated request Date: Thu, 19 Mar 2015 12:30:16 +0000 Message-ID: <1426768264-16996-12-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 582686EA0D for ; Thu, 19 Mar 2015 05:31:19 -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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KClRoZSBhbGxv Y19yZXF1ZXN0KCkgZnVuY3Rpb24gZG9lcyBub3QgYWN0dWFsbHkgcmV0dXJuIHRoZSBuZXdseSBh bGxvY2F0ZWQKcmVxdWVzdC4gSW5zdGVhZCwgaXQgbXVzdCBiZSBwdWxsZWQgZnJvbSByaW5nLT5v dXRzdGFuZGluZ19sYXp5X3JlcXVlc3QuIFRoaXMKcGF0Y2ggZml4ZXMgdGhpcyBzbyB0aGF0IGNv ZGUgY2FuIGNyZWF0ZSBhIHJlcXVlc3QgYW5kIHN0YXJ0IHVzaW5nIGl0IGtub3dpbmcKZXhhY3Rs eSB3aGljaCByZXF1ZXN0IGl0IGFjdHVhbGx5IG93bnMuCgp2MjogVXBkYXRlZCBmb3IgbmV3IGk5 MTVfZ2VtX3JlcXVlc3RfYWxsb2MoKSBzY2hlbWUuCgpGb3I6IFZJWi01MTE1ClNpZ25lZC1vZmYt Ynk6IEpvaG4gSGFycmlzb24gPEpvaG4uQy5IYXJyaXNvbkBJbnRlbC5jb20+Ci0tLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgICAgICAgIHwgICAgMyArKy0KIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgICAgICAgICAgICB8ICAgMTAgKysrKysrKy0tLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jIHwgICAgMyArKy0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jICAgICAgICAgICB8ICAgIDMgKystCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMgICAgfCAgICAzICsrLQogNSBmaWxlcyBj aGFuZ2VkLCAxNSBpbnNlcnRpb25zKCspLCA3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2Rydi5oCmluZGV4IGUyZDU3OTAuLjJjMmM4YTkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApA QCAtMjEyMSw3ICsyMTIxLDggQEAgc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0IHsKIH07CiAK IGludCBpOTE1X2dlbV9yZXF1ZXN0X2FsbG9jKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcs Ci0JCQkgICBzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4KTsKKwkJCSAgIHN0cnVjdCBpbnRlbF9j b250ZXh0ICpjdHgsCisJCQkgICBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKipyZXFfb3V0 KTsKIHZvaWQgaTkxNV9nZW1fcmVxdWVzdF9jYW5jZWwoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1 ZXN0ICpyZXEpOwogdm9pZCBpOTE1X2dlbV9yZXF1ZXN0X2ZyZWUoc3RydWN0IGtyZWYgKnJlcV9y ZWYpOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRleCBmMzVhYzdmLi45YTMzNWQ1IDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtLmMKQEAgLTI1MTYsMTMgKzI1MTYsMTcgQEAgdm9pZCBpOTE1X2dl bV9yZXF1ZXN0X2ZyZWUoc3RydWN0IGtyZWYgKnJlcV9yZWYpCiB9CiAKIGludCBpOTE1X2dlbV9y ZXF1ZXN0X2FsbG9jKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCi0JCQkgICBzdHJ1Y3Qg aW50ZWxfY29udGV4dCAqY3R4KQorCQkJICAgc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCwKKwkJ CSAgIHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqKnJlcV9vdXQpCiB7CiAJaW50IHJldDsK IAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3Q7CiAJc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2YXRlID0gcmluZy0+ZGV2LT5kZXZfcHJpdmF0ZTsKIAotCWlmIChy aW5nLT5vdXRzdGFuZGluZ19sYXp5X3JlcXVlc3QpCisJaWYgKCFyZXFfb3V0KQorCQlyZXR1cm4g LUVJTlZBTDsKKworCWlmICgoKnJlcV9vdXQgPSByaW5nLT5vdXRzdGFuZGluZ19sYXp5X3JlcXVl c3QpICE9IE5VTEwpCiAJCXJldHVybiAwOwogCiAJcmVxdWVzdCA9IGt6YWxsb2Moc2l6ZW9mKCpy ZXF1ZXN0KSwgR0ZQX0tFUk5FTCk7CkBAIC0yNTgwLDcgKzI1ODQsNyBAQCBpbnQgaTkxNV9nZW1f cmVxdWVzdF9hbGxvYyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAogCQlyZXR1cm4gcmV0 OwogCX0KIAotCXJpbmctPm91dHN0YW5kaW5nX2xhenlfcmVxdWVzdCA9IHJlcXVlc3Q7CisJKnJl cV9vdXQgPSByaW5nLT5vdXRzdGFuZGluZ19sYXp5X3JlcXVlc3QgPSByZXF1ZXN0OwogCXJldHVy biAwOwogfQogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVj YnVmZmVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMKaW5k ZXggZjlkYTBhZC4uMzhmNmM3NiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9nZW1fZXhlY2J1ZmZlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4 ZWNidWZmZXIuYwpAQCAtMTQwNCw2ICsxNDA0LDcgQEAgaTkxNV9nZW1fZG9fZXhlY2J1ZmZlcihz dHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAogCXN0cnVjdCBpOTE1X2FkZHJlc3Nf c3BhY2UgKnZtOwogCXN0cnVjdCBpOTE1X2V4ZWNidWZmZXJfcGFyYW1zIHBhcmFtc19tYXN0ZXI7 IC8qIFhYWDogd2lsbCBiZSByZW1vdmVkIGxhdGVyICovCiAJc3RydWN0IGk5MTVfZXhlY2J1ZmZl cl9wYXJhbXMgKnBhcmFtcyA9ICZwYXJhbXNfbWFzdGVyOworCXN0cnVjdCBkcm1faTkxNV9nZW1f cmVxdWVzdCAqcmVxdWVzdDsKIAljb25zdCB1MzIgY3R4X2lkID0gaTkxNV9leGVjYnVmZmVyMl9n ZXRfY29udGV4dF9pZCgqYXJncyk7CiAJdTMyIGRpc3BhdGNoX2ZsYWdzOwogCWludCByZXQ7CkBA IC0xNTk3LDcgKzE1OTgsNyBAQCBpOTE1X2dlbV9kb19leGVjYnVmZmVyKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYsIHZvaWQgKmRhdGEsCiAJCXBhcmFtcy0+YmF0Y2hfb2JqX3ZtX29mZnNldCA9IGk5 MTVfZ2VtX29ial9vZmZzZXQoYmF0Y2hfb2JqLCB2bSk7CiAKIAkvKiBBbGxvY2F0ZSBhIHJlcXVl c3QgZm9yIHRoaXMgYmF0Y2ggYnVmZmVyIG5pY2UgYW5kIGVhcmx5LiAqLwotCXJldCA9IGk5MTVf Z2VtX3JlcXVlc3RfYWxsb2MocmluZywgY3R4KTsKKwlyZXQgPSBpOTE1X2dlbV9yZXF1ZXN0X2Fs bG9jKHJpbmcsIGN0eCwgJnJlcXVlc3QpOwogCWlmIChyZXQpCiAJCWdvdG8gZXJyX2JhdGNoX3Vu cGluOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCmluZGV4IDIxYWY1ZDYuLmVjZDI5M2EgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCkBAIC04MTMsNiArODEzLDcgQEAgc3RhdGljIGludCBs b2dpY2FsX3JpbmdfcHJlcGFyZShzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiwKIHN0 YXRpYyBpbnQgaW50ZWxfbG9naWNhbF9yaW5nX2JlZ2luKHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVy ICpyaW5nYnVmLAogCQkJCSAgICBzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4LCBpbnQgbnVtX2R3 b3JkcykKIHsKKwlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcTsKIAlzdHJ1Y3QgaW50 ZWxfZW5naW5lX2NzICpyaW5nID0gcmluZ2J1Zi0+cmluZzsKIAlzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2ID0gcmluZy0+ZGV2OwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRl di0+ZGV2X3ByaXZhdGU7CkBAIC04MjgsNyArODI5LDcgQEAgc3RhdGljIGludCBpbnRlbF9sb2dp Y2FsX3JpbmdfYmVnaW4oc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYsCiAJCXJldHVy biByZXQ7CiAKIAkvKiBQcmVhbGxvY2F0ZSB0aGUgb2xyIGJlZm9yZSB0b3VjaGluZyB0aGUgcmlu ZyAqLwotCXJldCA9IGk5MTVfZ2VtX3JlcXVlc3RfYWxsb2MocmluZywgY3R4KTsKKwlyZXQgPSBp OTE1X2dlbV9yZXF1ZXN0X2FsbG9jKHJpbmcsIGN0eCwgJnJlcSk7CiAJaWYgKHJldCkKIAkJcmV0 dXJuIHJldDsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1 ZmZlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCmluZGV4IDFh N2VkOGIuLjk1OGRhMDEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Jp bmdidWZmZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMK QEAgLTIyNTYsNiArMjI1Niw3IEBAIHN0YXRpYyBpbnQgX19pbnRlbF9yaW5nX3ByZXBhcmUoc3Ry dWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywgaW50IGJ5dGVzKQogaW50IGludGVsX3JpbmdfYmVn aW4oc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKIAkJICAgICBpbnQgbnVtX2R3b3JkcykK IHsKKwlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcTsKIAlzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYgPSByaW5nLT5kZXYtPmRldl9wcml2YXRlOwogCWludCByZXQ7CiAK QEAgLTIyNjksNyArMjI3MCw3IEBAIGludCBpbnRlbF9yaW5nX2JlZ2luKHN0cnVjdCBpbnRlbF9l bmdpbmVfY3MgKnJpbmcsCiAJCXJldHVybiByZXQ7CiAKIAkvKiBQcmVhbGxvY2F0ZSB0aGUgb2xy IGJlZm9yZSB0b3VjaGluZyB0aGUgcmluZyAqLwotCXJldCA9IGk5MTVfZ2VtX3JlcXVlc3RfYWxs b2MocmluZywgcmluZy0+ZGVmYXVsdF9jb250ZXh0KTsKKwlyZXQgPSBpOTE1X2dlbV9yZXF1ZXN0 X2FsbG9jKHJpbmcsIHJpbmctPmRlZmF1bHRfY29udGV4dCwgJnJlcSk7CiAJaWYgKHJldCkKIAkJ cmV0dXJuIHJldDsKIAotLSAKMS43LjkuNQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9pbnRlbC1nZngK