From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH 08/55] drm/i915: Update alloc_request to return the allocated request Date: Fri, 29 May 2015 17:43:29 +0100 Message-ID: <1432917856-12261-9-git-send-email-John.C.Harrison@Intel.com> References: <1432917856-12261-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 BE4BC6EDE9 for ; Fri, 29 May 2015 09:44:26 -0700 (PDT) In-Reply-To: <1432917856-12261-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+ClJldmlld2VkLWJ5 OiBUb21hcyBFbGYgPHRvbWFzLmVsZkBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9kcnYuaCAgICAgICAgICAgIHwgICAgMyArKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtLmMgICAgICAgICAgICB8ICAgMTAgKysrKysrKy0tLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jIHwgICAgMyArKy0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2xyYy5jICAgICAgICAgICB8ICAgIDMgKystCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9yaW5nYnVmZmVyLmMgICAgfCAgICAzICsrLQogNSBmaWxlcyBjaGFuZ2VkLCAxNSBp bnNlcnRpb25zKCspLCA3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4 IGJiODU0NGMuLmFiMWIzZWMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtMjE5Myw3ICsy MTkzLDggQEAgc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0IHsKIH07CiAKIGludCBpOTE1X2dl bV9yZXF1ZXN0X2FsbG9jKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCi0JCQkgICBzdHJ1 Y3QgaW50ZWxfY29udGV4dCAqY3R4KTsKKwkJCSAgIHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgs CisJCQkgICBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKipyZXFfb3V0KTsKIHZvaWQgaTkx NV9nZW1fcmVxdWVzdF9jYW5jZWwoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpOwog dm9pZCBpOTE1X2dlbV9yZXF1ZXN0X2ZyZWUoc3RydWN0IGtyZWYgKnJlcV9yZWYpOwogCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW0uYwppbmRleCA0NThhNDQ5Li5iYTJlN2Y3IDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtLmMKQEAgLTI2MzQsMTMgKzI2MzQsMTcgQEAgdm9pZCBpOTE1X2dlbV9yZXF1ZXN0X2Zy ZWUoc3RydWN0IGtyZWYgKnJlcV9yZWYpCiB9CiAKIGludCBpOTE1X2dlbV9yZXF1ZXN0X2FsbG9j KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCi0JCQkgICBzdHJ1Y3QgaW50ZWxfY29udGV4 dCAqY3R4KQorCQkJICAgc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCwKKwkJCSAgIHN0cnVjdCBk cm1faTkxNV9nZW1fcmVxdWVzdCAqKnJlcV9vdXQpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2ID0gdG9faTkxNShyaW5nLT5kZXYpOwogCXN0cnVjdCBkcm1faTkxNV9nZW1f cmVxdWVzdCAqcmVxOwogCWludCByZXQ7CiAKLQlpZiAocmluZy0+b3V0c3RhbmRpbmdfbGF6eV9y ZXF1ZXN0KQorCWlmICghcmVxX291dCkKKwkJcmV0dXJuIC1FSU5WQUw7CisKKwlpZiAoKCpyZXFf b3V0ID0gcmluZy0+b3V0c3RhbmRpbmdfbGF6eV9yZXF1ZXN0KSAhPSBOVUxMKQogCQlyZXR1cm4g MDsKIAogCXJlcSA9IGttZW1fY2FjaGVfemFsbG9jKGRldl9wcml2LT5yZXF1ZXN0cywgR0ZQX0tF Uk5FTCk7CkBAIC0yNjg3LDcgKzI2OTEsNyBAQCBpbnQgaTkxNV9nZW1fcmVxdWVzdF9hbGxvYyhz dHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAogCSAqLwogCWludGVsX3JpbmdfcmVzZXJ2ZWRf c3BhY2VfcmVzZXJ2ZShyZXEtPnJpbmdidWYsIE1JTl9TUEFDRV9GT1JfQUREX1JFUVVFU1QpOwog Ci0JcmluZy0+b3V0c3RhbmRpbmdfbGF6eV9yZXF1ZXN0ID0gcmVxOworCSpyZXFfb3V0ID0gcmlu Zy0+b3V0c3RhbmRpbmdfbGF6eV9yZXF1ZXN0ID0gcmVxOwogCXJldHVybiAwOwogCiBlcnI6CmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMKaW5kZXggMGE0MzY2NS4u ZjJkMTlhZmUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNi dWZmZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMK QEAgLTE0MDcsNiArMTQwNyw3IEBAIGk5MTVfZ2VtX2RvX2V4ZWNidWZmZXIoc3RydWN0IGRybV9k ZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKIAlzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bTsK IAlzdHJ1Y3QgaTkxNV9leGVjYnVmZmVyX3BhcmFtcyBwYXJhbXNfbWFzdGVyOyAvKiBYWFg6IHdp bGwgYmUgcmVtb3ZlZCBsYXRlciAqLwogCXN0cnVjdCBpOTE1X2V4ZWNidWZmZXJfcGFyYW1zICpw YXJhbXMgPSAmcGFyYW1zX21hc3RlcjsKKwlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJl cXVlc3Q7CiAJY29uc3QgdTMyIGN0eF9pZCA9IGk5MTVfZXhlY2J1ZmZlcjJfZ2V0X2NvbnRleHRf aWQoKmFyZ3MpOwogCXUzMiBkaXNwYXRjaF9mbGFnczsKIAlpbnQgcmV0OwpAQCAtMTYwNiw3ICsx NjA3LDcgQEAgaTkxNV9nZW1fZG9fZXhlY2J1ZmZlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2 b2lkICpkYXRhLAogCQlwYXJhbXMtPmJhdGNoX29ial92bV9vZmZzZXQgPSBpOTE1X2dlbV9vYmpf b2Zmc2V0KGJhdGNoX29iaiwgdm0pOwogCiAJLyogQWxsb2NhdGUgYSByZXF1ZXN0IGZvciB0aGlz IGJhdGNoIGJ1ZmZlciBuaWNlIGFuZCBlYXJseS4gKi8KLQlyZXQgPSBpOTE1X2dlbV9yZXF1ZXN0 X2FsbG9jKHJpbmcsIGN0eCk7CisJcmV0ID0gaTkxNV9nZW1fcmVxdWVzdF9hbGxvYyhyaW5nLCBj dHgsICZyZXF1ZXN0KTsKIAlpZiAocmV0KQogCQlnb3RvIGVycl9iYXRjaF91bnBpbjsKIApkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9scmMuYwppbmRleCAzNDhlNmI4Li4xMzQ3NjAxIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9scmMuYwpAQCAtODA3LDYgKzgwNyw3IEBAIHN0YXRpYyBpbnQgbG9naWNhbF9yaW5n X3ByZXBhcmUoc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYsCiBzdGF0aWMgaW50IGlu dGVsX2xvZ2ljYWxfcmluZ19iZWdpbihzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiwK IAkJCQkgICAgc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCwgaW50IG51bV9kd29yZHMpCiB7CisJ c3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXE7CiAJc3RydWN0IGludGVsX2VuZ2luZV9j cyAqcmluZyA9IHJpbmdidWYtPnJpbmc7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IHJpbmct PmRldjsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2 YXRlOwpAQCAtODIyLDcgKzgyMyw3IEBAIHN0YXRpYyBpbnQgaW50ZWxfbG9naWNhbF9yaW5nX2Jl Z2luKHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmLAogCQlyZXR1cm4gcmV0OwogCiAJ LyogUHJlYWxsb2NhdGUgdGhlIG9sciBiZWZvcmUgdG91Y2hpbmcgdGhlIHJpbmcgKi8KLQlyZXQg PSBpOTE1X2dlbV9yZXF1ZXN0X2FsbG9jKHJpbmcsIGN0eCk7CisJcmV0ID0gaTkxNV9nZW1fcmVx dWVzdF9hbGxvYyhyaW5nLCBjdHgsICZyZXEpOwogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwppbmRleCA3MDYxYjA3Li5kNzY2 YzFkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCkBAIC0yMjY0LDYg KzIyNjQsNyBAQCBzdGF0aWMgaW50IF9faW50ZWxfcmluZ19wcmVwYXJlKHN0cnVjdCBpbnRlbF9l bmdpbmVfY3MgKnJpbmcsIGludCBieXRlcykKIGludCBpbnRlbF9yaW5nX2JlZ2luKHN0cnVjdCBp bnRlbF9lbmdpbmVfY3MgKnJpbmcsCiAJCSAgICAgaW50IG51bV9kd29yZHMpCiB7CisJc3RydWN0 IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXE7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2ID0gcmluZy0+ZGV2LT5kZXZfcHJpdmF0ZTsKIAlpbnQgcmV0OwogCkBAIC0yMjc3LDcg KzIyNzgsNyBAQCBpbnQgaW50ZWxfcmluZ19iZWdpbihzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpy aW5nLAogCQlyZXR1cm4gcmV0OwogCiAJLyogUHJlYWxsb2NhdGUgdGhlIG9sciBiZWZvcmUgdG91 Y2hpbmcgdGhlIHJpbmcgKi8KLQlyZXQgPSBpOTE1X2dlbV9yZXF1ZXN0X2FsbG9jKHJpbmcsIHJp bmctPmRlZmF1bHRfY29udGV4dCk7CisJcmV0ID0gaTkxNV9nZW1fcmVxdWVzdF9hbGxvYyhyaW5n LCByaW5nLT5kZWZhdWx0X2NvbnRleHQsICZyZXEpOwogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7 CiAKLS0gCjEuNy45LjUKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwt Z2Z4Cg==