From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH 08/51] drm/i915: Update alloc_request to return the allocated request Date: Fri, 13 Feb 2015 11:48:17 +0000 Message-ID: <1423828140-10653-9-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 37543896A3 for ; Fri, 13 Feb 2015 03:49:11 -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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KClRoZSBhbGxv Y19yZXF1ZXN0KCkgZnVuY3Rpb24gZG9lcyBub3QgYWN0dWFsbHkgcmV0dXJuIHRoZSBuZXdseSBh bGxvY2F0ZWQKcmVxdWVzdC4gSW5zdGVhZCwgaXQgbXVzdCBiZSBwdWxsZWQgZnJvbSByaW5nLT5v dXRzdGFuZGluZ19sYXp5X3JlcXVlc3QuIFRoaXMKcGF0Y2ggZml4ZXMgdGhpcyBzbyB0aGF0IGNv ZGUgY2FuIGNyZWF0ZSBhIHJlcXVlc3QgYW5kIHN0YXJ0IHVzaW5nIGl0IGtub3dpbmcKZXhhY3Rs eSB3aGljaCByZXF1ZXN0IGl0IGFjdHVhbGx5IG93bnMuCgpGb3I6IFZJWi01MTE1ClNpZ25lZC1v ZmYtYnk6IEpvaG4gSGFycmlzb24gPEpvaG4uQy5IYXJyaXNvbkBJbnRlbC5jb20+Ci0tLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgICAgICAgIHwgICAgMyArKy0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYyB8ICAgIDMgKystCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyAgICAgICAgICAgfCAgIDEzICsrKysrKysrKy0tLS0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5oICAgICAgICAgICB8ICAgIDMgKystCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMgICAgfCAgIDE0ICsrKysrKysr KystLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmggICAgfCAgICAz ICsrLQogNiBmaWxlcyBjaGFuZ2VkLCAyNyBpbnNlcnRpb25zKCspLCAxMiBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCA3OTU5ZGZhLi45MmMxODNmIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZHJ2LmgKQEAgLTE5MDIsNyArMTkwMiw4IEBAIHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlIHsKIAkvKiBBYnN0cmFjdCB0aGUgc3VibWlzc2lvbiBtZWNoYW5pc20gKGxlZ2FjeSByaW5n YnVmZmVyIG9yIGV4ZWNsaXN0cykgYXdheSAqLwogCXN0cnVjdCB7CiAJCWludCAoKmFsbG9jX3Jl cXVlc3QpKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCi0JCQkJICAgICBzdHJ1Y3QgaW50 ZWxfY29udGV4dCAqY3R4KTsKKwkJCQkgICAgIHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgsCisJ CQkJICAgICBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKipyZXFfb3V0KTsKIAkJaW50ICgq ZG9fZXhlY2J1Zikoc3RydWN0IGk5MTVfZXhlY2J1ZmZlcl9wYXJhbXMgKnBhcmFtcywKIAkJCQkg IHN0cnVjdCBkcm1faTkxNV9nZW1fZXhlY2J1ZmZlcjIgKmFyZ3MsCiAJCQkJICBzdHJ1Y3QgbGlz dF9oZWFkICp2bWFzKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt X2V4ZWNidWZmZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIu YwppbmRleCA2MTQ3MWU5Li4zN2RjYzZmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2dlbV9leGVjYnVmZmVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW1fZXhlY2J1ZmZlci5jCkBAIC0xMzUzLDYgKzEzNTMsNyBAQCBpOTE1X2dlbV9kb19leGVjYnVm ZmVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCiAJc3RydWN0IGk5MTVfYWRk cmVzc19zcGFjZSAqdm07CiAJc3RydWN0IGk5MTVfZXhlY2J1ZmZlcl9wYXJhbXMgcGFyYW1zX21h c3RlcjsgLyogWFhYOiB3aWxsIGJlIHJlbW92ZWQgbGF0ZXIgKi8KIAlzdHJ1Y3QgaTkxNV9leGVj YnVmZmVyX3BhcmFtcyAqcGFyYW1zID0gJnBhcmFtc19tYXN0ZXI7CisJc3RydWN0IGRybV9pOTE1 X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0OwogCWNvbnN0IHUzMiBjdHhfaWQgPSBpOTE1X2V4ZWNidWZm ZXIyX2dldF9jb250ZXh0X2lkKCphcmdzKTsKIAl1MzIgZGlzcGF0Y2hfZmxhZ3M7CiAJaW50IHJl dDsKQEAgLTE1MzEsNyArMTUzMiw3IEBAIGk5MTVfZ2VtX2RvX2V4ZWNidWZmZXIoc3RydWN0IGRy bV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKIAkJcGFyYW1zLT5iYXRjaF9vYmpfdm1fb2Zmc2V0 ID0gaTkxNV9nZW1fb2JqX29mZnNldChiYXRjaF9vYmosIHZtKTsKIAogCS8qIEFsbG9jYXRlIGEg cmVxdWVzdCBmb3IgdGhpcyBiYXRjaCBidWZmZXIgbmljZSBhbmQgZWFybHkuICovCi0JcmV0ID0g ZGV2X3ByaXYtPmd0LmFsbG9jX3JlcXVlc3QocmluZywgY3R4KTsKKwlyZXQgPSBkZXZfcHJpdi0+ Z3QuYWxsb2NfcmVxdWVzdChyaW5nLCBjdHgsICZyZXF1ZXN0KTsKIAlpZiAocmV0KQogCQlnb3Rv IGVycjsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwppbmRleCAyZjkwNmEyLi4zMjVlZjJjIDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYworKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwpAQCAtODQ3LDEzICs4NDcsMTcgQEAgdm9pZCBpbnRl bF9scl9jb250ZXh0X3VucGluKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCiB9CiAKIGlu dCBpbnRlbF9sb2dpY2FsX3JpbmdfYWxsb2NfcmVxdWVzdChzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz ICpyaW5nLAotCQkJCSAgICAgc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCkKKwkJCQkgICAgIHN0 cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgsCisJCQkJICAgICBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3Jl cXVlc3QgKipyZXFfb3V0KQogewogCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVz dDsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXZhdGUgPSByaW5nLT5kZXYtPmRl dl9wcml2YXRlOwogCWludCByZXQ7CiAKLQlpZiAocmluZy0+b3V0c3RhbmRpbmdfbGF6eV9yZXF1 ZXN0KQorCWlmICghcmVxX291dCkKKwkJcmV0dXJuIC1FSU5WQUw7CisKKwlpZiAoKCpyZXFfb3V0 ID0gcmluZy0+b3V0c3RhbmRpbmdfbGF6eV9yZXF1ZXN0KSAhPSBOVUxMKQogCQlyZXR1cm4gMDsK IAogCXJlcXVlc3QgPSBremFsbG9jKHNpemVvZigqcmVxdWVzdCksIEdGUF9LRVJORUwpOwpAQCAt ODg4LDcgKzg5Miw3IEBAIGludCBpbnRlbF9sb2dpY2FsX3JpbmdfYWxsb2NfcmVxdWVzdChzdHJ1 Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAogCWk5MTVfZ2VtX2NvbnRleHRfcmVmZXJlbmNlKHJl cXVlc3QtPmN0eCk7CiAJcmVxdWVzdC0+cmluZ2J1ZiA9IGN0eC0+ZW5naW5lW3JpbmctPmlkXS5y aW5nYnVmOwogCi0JcmluZy0+b3V0c3RhbmRpbmdfbGF6eV9yZXF1ZXN0ID0gcmVxdWVzdDsKKwkq cmVxX291dCA9IHJpbmctPm91dHN0YW5kaW5nX2xhenlfcmVxdWVzdCA9IHJlcXVlc3Q7CiAJcmV0 dXJuIDA7CiB9CiAKQEAgLTEwNDEsNiArMTA0NSw3IEBAIHN0YXRpYyBpbnQgbG9naWNhbF9yaW5n X3ByZXBhcmUoc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYsCiBpbnQgaW50ZWxfbG9n aWNhbF9yaW5nX2JlZ2luKHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmLAogCQkJICAg ICBzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4LCBpbnQgbnVtX2R3b3JkcykKIHsKKwlzdHJ1Y3Qg ZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcTsKIAlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5n ID0gcmluZ2J1Zi0+cmluZzsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gcmluZy0+ZGV2Owog CXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CkBA IC0xMDU2LDcgKzEwNjEsNyBAQCBpbnQgaW50ZWxfbG9naWNhbF9yaW5nX2JlZ2luKHN0cnVjdCBp bnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmLAogCQlyZXR1cm4gcmV0OwogCiAJLyogUHJlYWxsb2Nh dGUgdGhlIG9sciBiZWZvcmUgdG91Y2hpbmcgdGhlIHJpbmcgKi8KLQlyZXQgPSBpbnRlbF9sb2dp Y2FsX3JpbmdfYWxsb2NfcmVxdWVzdChyaW5nLCBjdHgpOworCXJldCA9IGludGVsX2xvZ2ljYWxf cmluZ19hbGxvY19yZXF1ZXN0KHJpbmcsIGN0eCwgJnJlcSk7CiAJaWYgKHJldCkKIAkJcmV0dXJu IHJldDsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmggYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuaAppbmRleCAyYjFiZjgzLi5iNDYyMGI5IDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuaAorKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuaApAQCAtMzUsNyArMzUsOCBAQAogCiAvKiBMb2dpY2Fs IFJpbmdzICovCiBpbnQgX19tdXN0X2NoZWNrIGludGVsX2xvZ2ljYWxfcmluZ19hbGxvY19yZXF1 ZXN0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCi0JCQkJCQkgIHN0cnVjdCBpbnRlbF9j b250ZXh0ICpjdHgpOworCQkJCQkJICBzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4LAorCQkJCQkJ ICBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKipyZXFfb3V0KTsKIHZvaWQgaW50ZWxfbG9n aWNhbF9yaW5nX3N0b3Aoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyk7CiB2b2lkIGludGVs X2xvZ2ljYWxfcmluZ19jbGVhbnVwKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpOwogaW50 IGludGVsX2xvZ2ljYWxfcmluZ3NfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwppbmRleCBjODBlMjBkLi40MGI1ZDgzIDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCkBAIC0yMDg1LDEzICsyMDg1 LDE4IEBAIGludCBpbnRlbF9yaW5nX2lkbGUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykK IH0KIAogaW50Ci1pbnRlbF9yaW5nX2FsbG9jX3JlcXVlc3Qoc3RydWN0IGludGVsX2VuZ2luZV9j cyAqcmluZywgc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCkKK2ludGVsX3JpbmdfYWxsb2NfcmVx dWVzdChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAorCQkJIHN0cnVjdCBpbnRlbF9jb250 ZXh0ICpjdHgsCisJCQkgc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICoqcmVxX291dCkKIHsK IAlpbnQgcmV0OwogCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdDsKIAlzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXZhdGUgPSByaW5nLT5kZXYtPmRldl9wcml2YXRl OwogCi0JaWYgKHJpbmctPm91dHN0YW5kaW5nX2xhenlfcmVxdWVzdCkKKwlpZiAoIXJlcV9vdXQp CisJCXJldHVybiAtRUlOVkFMOworCisJaWYgKCgqcmVxX291dCA9IHJpbmctPm91dHN0YW5kaW5n X2xhenlfcmVxdWVzdCkgIT0gTlVMTCkKIAkJcmV0dXJuIDA7CiAKIAlyZXF1ZXN0ID0ga3phbGxv YyhzaXplb2YoKnJlcXVlc3QpLCBHRlBfS0VSTkVMKTsKQEAgLTIxMDksNyArMjExNCw3IEBAIGlu dGVsX3JpbmdfYWxsb2NfcmVxdWVzdChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLCBzdHJ1 Y3QgaW50ZWxfY29udGV4dCAqY3R4CiAJCXJldHVybiByZXQ7CiAJfQogCi0JcmluZy0+b3V0c3Rh bmRpbmdfbGF6eV9yZXF1ZXN0ID0gcmVxdWVzdDsKKwkqcmVxX291dCA9IHJpbmctPm91dHN0YW5k aW5nX2xhenlfcmVxdWVzdCA9IHJlcXVlc3Q7CiAJcmV0dXJuIDA7CiB9CiAKQEAgLTIxMzcsNiAr MjE0Miw3IEBAIHN0YXRpYyBpbnQgX19pbnRlbF9yaW5nX3ByZXBhcmUoc3RydWN0IGludGVsX2Vu Z2luZV9jcyAqcmluZywKIGludCBpbnRlbF9yaW5nX2JlZ2luKHN0cnVjdCBpbnRlbF9lbmdpbmVf Y3MgKnJpbmcsCiAJCSAgICAgaW50IG51bV9kd29yZHMpCiB7CisJc3RydWN0IGRybV9pOTE1X2dl bV9yZXF1ZXN0ICpyZXE7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gcmlu Zy0+ZGV2LT5kZXZfcHJpdmF0ZTsKIAlpbnQgcmV0OwogCkBAIC0yMTUwLDcgKzIxNTYsNyBAQCBp bnQgaW50ZWxfcmluZ19iZWdpbihzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAogCQlyZXR1 cm4gcmV0OwogCiAJLyogUHJlYWxsb2NhdGUgdGhlIG9sciBiZWZvcmUgdG91Y2hpbmcgdGhlIHJp bmcgKi8KLQlyZXQgPSBpbnRlbF9yaW5nX2FsbG9jX3JlcXVlc3QocmluZywgTlVMTCk7CisJcmV0 ID0gaW50ZWxfcmluZ19hbGxvY19yZXF1ZXN0KHJpbmcsIE5VTEwsICZyZXEpOwogCWlmIChyZXQp CiAJCXJldHVybiByZXQ7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3JpbmdidWZmZXIuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaApp bmRleCA3NGRmMGZjLi5mZGVhYTY2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9yaW5nYnVmZmVyLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1 ZmZlci5oCkBAIC0zOTMsNyArMzkzLDggQEAgdm9pZCBpbnRlbF9jbGVhbnVwX3JpbmdfYnVmZmVy KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpOwogaW50IF9fbXVzdF9jaGVjayBpbnRlbF9y aW5nX2JlZ2luKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsIGludCBuKTsKIGludCBfX211 c3RfY2hlY2sgaW50ZWxfcmluZ19jYWNoZWxpbmVfYWxpZ24oc3RydWN0IGludGVsX2VuZ2luZV9j cyAqcmluZyk7CiBpbnQgX19tdXN0X2NoZWNrIGludGVsX3JpbmdfYWxsb2NfcmVxdWVzdChzdHJ1 Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAotCQkJCQkgIHN0cnVjdCBpbnRlbF9jb250ZXh0ICpj dHgpOworCQkJCQkgIHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgsCisJCQkJCSAgc3RydWN0IGRy bV9pOTE1X2dlbV9yZXF1ZXN0ICoqcmVxX291dCk7CiBzdGF0aWMgaW5saW5lIHZvaWQgaW50ZWxf cmluZ19lbWl0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCiAJCQkJICAgdTMyIGRhdGEp CiB7Ci0tIAoxLjcuOS41CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVs LWdmeAo=