From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH 06/53] drm/i915: Wrap request allocation with a function pointer Date: Thu, 19 Feb 2015 17:17:18 +0000 Message-ID: <1424366285-29232-7-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 6746C6E604 for ; Thu, 19 Feb 2015 09:18:14 -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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KCkluIG9yZGVy IHRvIGV4cGxpY2l0bHkgbWFuYWdlIHJlcXVlc3RzIGZyb20gY3JlYXRpb24gdG8gc3VibWlzc2lv biwgaXQgaXMKbmVjZXNzYXJ5IHRvIGJlIGFibGUgdG8gZXhwbGljaXRseSBjcmVhdGUgdGhlbSBp biB0aGUgZmlyc3QgcGxhY2UuIFRoaXMgcGF0Y2gKYWRkcyBhbiBpbmRpcmVjdGlvbiB3cmFwcGVy IHRvIHRoZSByZXF1ZXN0IGNyZWF0aW9uIGZ1bmN0aW9uIHNvIHRoYXQgaXQgY2FuIGJlCmNhbGxl ZCBmcm9tIGdlbmVyaWMgY29kZSB3aXRob3V0IGhhdmluZyB0byB3b3JyeSBhYm91dCBleGVjbGlz dCB2cyBsZWdhY3kgbW9kZS4KCkZvcjogVklaLTUxMTUKU2lnbmVkLW9mZi1ieTogSm9obiBIYXJy aXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2Rydi5oICAgICAgICAgfCAgICAyICsrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbS5jICAgICAgICAgfCAgICAyICsrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMu YyAgICAgICAgfCAgICA2ICsrKy0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmgg ICAgICAgIHwgICAgMiArKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5j IHwgICAgNiArKystLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaCB8 ICAgIDIgKysKIDYgZmlsZXMgY2hhbmdlZCwgMTQgaW5zZXJ0aW9ucygrKSwgNiBkZWxldGlvbnMo LSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCBiMzUwOTEwLi44N2E0YTJlIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTE5MDgsNiArMTkwOCw4IEBAIHN0cnVjdCBkcm1faTkxNV9w cml2YXRlIHsKIAogCS8qIEFic3RyYWN0IHRoZSBzdWJtaXNzaW9uIG1lY2hhbmlzbSAobGVnYWN5 IHJpbmdidWZmZXIgb3IgZXhlY2xpc3RzKSBhd2F5ICovCiAJc3RydWN0IHsKKwkJaW50ICgqYWxs b2NfcmVxdWVzdCkoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKKwkJCQkgICAgIHN0cnVj dCBpbnRlbF9jb250ZXh0ICpjdHgpOwogCQlpbnQgKCpkb19leGVjYnVmKShzdHJ1Y3QgaTkxNV9l eGVjYnVmZmVyX3BhcmFtcyAqcGFyYW1zLAogCQkJCSAgc3RydWN0IGRybV9pOTE1X2dlbV9leGVj YnVmZmVyMiAqYXJncywKIAkJCQkgIHN0cnVjdCBsaXN0X2hlYWQgKnZtYXMpOwpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtLmMKaW5kZXggN2EwZGM3Yy4uY2Y5NTllMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bS5jCkBAIC00ODYwLDExICs0ODYwLDEzIEBAIGludCBpOTE1X2dlbV9pbml0KHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYpCiAJfQogCiAJaWYgKCFpOTE1LmVuYWJsZV9leGVjbGlzdHMpIHsKKwkJZGV2 X3ByaXYtPmd0LmFsbG9jX3JlcXVlc3QgPSBpbnRlbF9yaW5nX2FsbG9jX3JlcXVlc3Q7CiAJCWRl dl9wcml2LT5ndC5kb19leGVjYnVmID0gaTkxNV9nZW1fcmluZ2J1ZmZlcl9zdWJtaXNzaW9uOwog CQlkZXZfcHJpdi0+Z3QuaW5pdF9yaW5ncyA9IGk5MTVfZ2VtX2luaXRfcmluZ3M7CiAJCWRldl9w cml2LT5ndC5jbGVhbnVwX3JpbmcgPSBpbnRlbF9jbGVhbnVwX3JpbmdfYnVmZmVyOwogCQlkZXZf cHJpdi0+Z3Quc3RvcF9yaW5nID0gaW50ZWxfc3RvcF9yaW5nX2J1ZmZlcjsKIAl9IGVsc2Ugewor CQlkZXZfcHJpdi0+Z3QuYWxsb2NfcmVxdWVzdCA9IGludGVsX2xvZ2ljYWxfcmluZ19hbGxvY19y ZXF1ZXN0OwogCQlkZXZfcHJpdi0+Z3QuZG9fZXhlY2J1ZiA9IGludGVsX2V4ZWNsaXN0c19zdWJt aXNzaW9uOwogCQlkZXZfcHJpdi0+Z3QuaW5pdF9yaW5ncyA9IGludGVsX2xvZ2ljYWxfcmluZ3Nf aW5pdDsKIAkJZGV2X3ByaXYtPmd0LmNsZWFudXBfcmluZyA9IGludGVsX2xvZ2ljYWxfcmluZ19j bGVhbnVwOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwppbmRleCBkYzQ3NGI0Li44NjI4YWJmIDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYworKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwpAQCAtODU2LDggKzg1Niw4IEBAIHZvaWQgaW50ZWxf bHJfY29udGV4dF91bnBpbihzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAogCX0KIH0KIAot c3RhdGljIGludCBsb2dpY2FsX3JpbmdfYWxsb2NfcmVxdWVzdChzdHJ1Y3QgaW50ZWxfZW5naW5l X2NzICpyaW5nLAotCQkJCSAgICAgIHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgpCitpbnQgaW50 ZWxfbG9naWNhbF9yaW5nX2FsbG9jX3JlcXVlc3Qoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmlu ZywKKwkJCQkgICAgIHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgpCiB7CiAJc3RydWN0IGRybV9p OTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0OwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdmF0ZSA9IHJpbmctPmRldi0+ZGV2X3ByaXZhdGU7CkBAIC0xMDY2LDcgKzEwNjYsNyBAQCBp bnQgaW50ZWxfbG9naWNhbF9yaW5nX2JlZ2luKHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5n YnVmLAogCQlyZXR1cm4gcmV0OwogCiAJLyogUHJlYWxsb2NhdGUgdGhlIG9sciBiZWZvcmUgdG91 Y2hpbmcgdGhlIHJpbmcgKi8KLQlyZXQgPSBsb2dpY2FsX3JpbmdfYWxsb2NfcmVxdWVzdChyaW5n LCBjdHgpOworCXJldCA9IGludGVsX2xvZ2ljYWxfcmluZ19hbGxvY19yZXF1ZXN0KHJpbmcsIGN0 eCk7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfbHJjLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuaApp bmRleCAzYTZhYmNlLi4zY2MzOGJkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9scmMuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuaApAQCAtMzYs NiArMzYsOCBAQAogI2RlZmluZSBSSU5HX0NPTlRFWFRfU1RBVFVTX1BUUihyaW5nKQkoKHJpbmcp LT5tbWlvX2Jhc2UrMHgzYTApCiAKIC8qIExvZ2ljYWwgUmluZ3MgKi8KK2ludCBfX211c3RfY2hl Y2sgaW50ZWxfbG9naWNhbF9yaW5nX2FsbG9jX3JlcXVlc3Qoc3RydWN0IGludGVsX2VuZ2luZV9j cyAqcmluZywKKwkJCQkJCSAgc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCk7CiB2b2lkIGludGVs X2xvZ2ljYWxfcmluZ19zdG9wKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpOwogdm9pZCBp bnRlbF9sb2dpY2FsX3JpbmdfY2xlYW51cChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKTsK IGludCBpbnRlbF9sb2dpY2FsX3JpbmdzX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKaW5kZXggN2ZkODllNS4uNjM1NzA3 YSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwpAQCAtMjE2Myw4ICsy MTYzLDggQEAgaW50IGludGVsX3JpbmdfaWRsZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5n KQogCXJldHVybiBpOTE1X3dhaXRfcmVxdWVzdChyZXEpOwogfQogCi1zdGF0aWMgaW50Ci1pbnRl bF9yaW5nX2FsbG9jX3JlcXVlc3Qoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKK2ludAor aW50ZWxfcmluZ19hbGxvY19yZXF1ZXN0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsIHN0 cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgpCiB7CiAJaW50IHJldDsKIAlzdHJ1Y3QgZHJtX2k5MTVf Z2VtX3JlcXVlc3QgKnJlcXVlc3Q7CkBAIC0yMjI5LDcgKzIyMjksNyBAQCBpbnQgaW50ZWxfcmlu Z19iZWdpbihzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAogCQlyZXR1cm4gcmV0OwogCiAJ LyogUHJlYWxsb2NhdGUgdGhlIG9sciBiZWZvcmUgdG91Y2hpbmcgdGhlIHJpbmcgKi8KLQlyZXQg PSBpbnRlbF9yaW5nX2FsbG9jX3JlcXVlc3QocmluZyk7CisJcmV0ID0gaW50ZWxfcmluZ19hbGxv Y19yZXF1ZXN0KHJpbmcsIE5VTEwpOwogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaCBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaAppbmRleCBmZmEzNzI0Li4yZmQ5NjBhIDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCkBAIC0zOTIsNiArMzkyLDgg QEAgdm9pZCBpbnRlbF9jbGVhbnVwX3JpbmdfYnVmZmVyKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg KnJpbmcpOwogCiBpbnQgX19tdXN0X2NoZWNrIGludGVsX3JpbmdfYmVnaW4oc3RydWN0IGludGVs X2VuZ2luZV9jcyAqcmluZywgaW50IG4pOwogaW50IF9fbXVzdF9jaGVjayBpbnRlbF9yaW5nX2Nh Y2hlbGluZV9hbGlnbihzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKTsKK2ludCBfX211c3Rf Y2hlY2sgaW50ZWxfcmluZ19hbGxvY19yZXF1ZXN0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJp bmcsCisJCQkJCSAgc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCk7CiBzdGF0aWMgaW5saW5lIHZv aWQgaW50ZWxfcmluZ19lbWl0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCiAJCQkJICAg dTMyIGRhdGEpCiB7Ci0tIAoxLjcuOS41CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5m cmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2ludGVsLWdmeAo=