From: John.C.Harrison@Intel.com Subject: [PATCH 06/51] drm/i915: Wrap request allocation with a function pointer Date: Fri, 13 Feb 2015 11:48:15 +0000 Message-ID: <1423828140-10653-7-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 527B38955D for ; Fri, 13 Feb 2015 03:49:10 -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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KCkluIG9yZGVy IHRvIGV4cGxpY2l0bHkgbWFuYWdlIHJlcXVlc3RzIGZyb20gY3JlYXRpb24gdG8gc3VibWlzc2lv biwgaXQgaXMKbmVjZXNzYXJ5IHRvIGJlIGFibGUgdG8gZXhwbGljaXRseSBjcmVhdGUgdGhlbSBp biB0aGUgZmlyc3QgcGxhY2UuIFRoaXMgcGF0Y2gKYWRkcyBhbiBpbmRpcmVjdGlvbiB3cmFwcGVy IHRvIHRoZSByZXF1ZXN0IGNyZWF0aW9uIGZ1bmN0aW9uIHNvIHRoYXQgaXQgY2FuIGJlCmNhbGxl ZCBmcm9tIGdlbmVyaWMgY29kZSB3aXRob3V0IGhhdmluZyB0byB3b3JyeSBhYm91dCBleGVjbGlz dCB2cyBsZWdhY3kgbW9kZS4KCkZvcjogVklaLTUxMTUKU2lnbmVkLW9mZi1ieTogSm9obiBIYXJy aXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2Rydi5oICAgICAgICAgfCAgICAyICsrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbS5jICAgICAgICAgfCAgICAyICsrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMu YyAgICAgICAgfCAgICA2ICsrKy0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmgg ICAgICAgIHwgICAgMiArKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5j IHwgICAgNiArKystLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaCB8 ICAgIDIgKysKIDYgZmlsZXMgY2hhbmdlZCwgMTQgaW5zZXJ0aW9ucygrKSwgNiBkZWxldGlvbnMo LSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCAxNDNiYzYzLi43OTU5ZGZhIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTE5MDEsNiArMTkwMSw4IEBAIHN0cnVjdCBkcm1faTkxNV9w cml2YXRlIHsKIAogCS8qIEFic3RyYWN0IHRoZSBzdWJtaXNzaW9uIG1lY2hhbmlzbSAobGVnYWN5 IHJpbmdidWZmZXIgb3IgZXhlY2xpc3RzKSBhd2F5ICovCiAJc3RydWN0IHsKKwkJaW50ICgqYWxs b2NfcmVxdWVzdCkoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKKwkJCQkgICAgIHN0cnVj dCBpbnRlbF9jb250ZXh0ICpjdHgpOwogCQlpbnQgKCpkb19leGVjYnVmKShzdHJ1Y3QgaTkxNV9l eGVjYnVmZmVyX3BhcmFtcyAqcGFyYW1zLAogCQkJCSAgc3RydWN0IGRybV9pOTE1X2dlbV9leGVj YnVmZmVyMiAqYXJncywKIAkJCQkgIHN0cnVjdCBsaXN0X2hlYWQgKnZtYXMpOwpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtLmMKaW5kZXggMmViZTkxNC4uOTU0Njk5MiAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bS5jCkBAIC00ODU1LDExICs0ODU1LDEzIEBAIGludCBpOTE1X2dlbV9pbml0KHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYpCiAJfQogCiAJaWYgKCFpOTE1LmVuYWJsZV9leGVjbGlzdHMpIHsKKwkJZGV2 X3ByaXYtPmd0LmFsbG9jX3JlcXVlc3QgPSBpbnRlbF9yaW5nX2FsbG9jX3JlcXVlc3Q7CiAJCWRl dl9wcml2LT5ndC5kb19leGVjYnVmID0gaTkxNV9nZW1fcmluZ2J1ZmZlcl9zdWJtaXNzaW9uOwog CQlkZXZfcHJpdi0+Z3QuaW5pdF9yaW5ncyA9IGk5MTVfZ2VtX2luaXRfcmluZ3M7CiAJCWRldl9w cml2LT5ndC5jbGVhbnVwX3JpbmcgPSBpbnRlbF9jbGVhbnVwX3JpbmdfYnVmZmVyOwogCQlkZXZf cHJpdi0+Z3Quc3RvcF9yaW5nID0gaW50ZWxfc3RvcF9yaW5nX2J1ZmZlcjsKIAl9IGVsc2Ugewor CQlkZXZfcHJpdi0+Z3QuYWxsb2NfcmVxdWVzdCA9IGludGVsX2xvZ2ljYWxfcmluZ19hbGxvY19y ZXF1ZXN0OwogCQlkZXZfcHJpdi0+Z3QuZG9fZXhlY2J1ZiA9IGludGVsX2V4ZWNsaXN0c19zdWJt aXNzaW9uOwogCQlkZXZfcHJpdi0+Z3QuaW5pdF9yaW5ncyA9IGludGVsX2xvZ2ljYWxfcmluZ3Nf aW5pdDsKIAkJZGV2X3ByaXYtPmd0LmNsZWFudXBfcmluZyA9IGludGVsX2xvZ2ljYWxfcmluZ19j bGVhbnVwOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwppbmRleCA5MDQwMGQwZC4uMmY5MDZhMiAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKQEAgLTg0Niw4ICs4NDYsOCBAQCB2b2lkIGludGVs X2xyX2NvbnRleHRfdW5waW4oc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKIAl9CiB9CiAK LXN0YXRpYyBpbnQgbG9naWNhbF9yaW5nX2FsbG9jX3JlcXVlc3Qoc3RydWN0IGludGVsX2VuZ2lu ZV9jcyAqcmluZywKLQkJCQkgICAgICBzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4KQoraW50IGlu dGVsX2xvZ2ljYWxfcmluZ19hbGxvY19yZXF1ZXN0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJp bmcsCisJCQkJICAgICBzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4KQogewogCXN0cnVjdCBkcm1f aTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdDsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXZhdGUgPSByaW5nLT5kZXYtPmRldl9wcml2YXRlOwpAQCAtMTA1Niw3ICsxMDU2LDcgQEAg aW50IGludGVsX2xvZ2ljYWxfcmluZ19iZWdpbihzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmlu Z2J1ZiwKIAkJcmV0dXJuIHJldDsKIAogCS8qIFByZWFsbG9jYXRlIHRoZSBvbHIgYmVmb3JlIHRv dWNoaW5nIHRoZSByaW5nICovCi0JcmV0ID0gbG9naWNhbF9yaW5nX2FsbG9jX3JlcXVlc3Qocmlu ZywgY3R4KTsKKwlyZXQgPSBpbnRlbF9sb2dpY2FsX3JpbmdfYWxsb2NfcmVxdWVzdChyaW5nLCBj dHgpOwogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2xyYy5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmgK aW5kZXggYWUyZjNlZC4uMmIxYmY4MyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfbHJjLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmgKQEAgLTM0 LDYgKzM0LDggQEAKICNkZWZpbmUgUklOR19DT05URVhUX1NUQVRVU19QVFIocmluZykJKChyaW5n KS0+bW1pb19iYXNlKzB4M2EwKQogCiAvKiBMb2dpY2FsIFJpbmdzICovCitpbnQgX19tdXN0X2No ZWNrIGludGVsX2xvZ2ljYWxfcmluZ19hbGxvY19yZXF1ZXN0KHN0cnVjdCBpbnRlbF9lbmdpbmVf Y3MgKnJpbmcsCisJCQkJCQkgIHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgpOwogdm9pZCBpbnRl bF9sb2dpY2FsX3Jpbmdfc3RvcChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKTsKIHZvaWQg aW50ZWxfbG9naWNhbF9yaW5nX2NsZWFudXAoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyk7 CiBpbnQgaW50ZWxfbG9naWNhbF9yaW5nc19pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCmluZGV4IGNhOWU3ZTYuLmM4MGUy MGQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKQEAgLTIwODQsOCAr MjA4NCw4IEBAIGludCBpbnRlbF9yaW5nX2lkbGUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmlu ZykKIAlyZXR1cm4gaTkxNV93YWl0X3JlcXVlc3QocmVxKTsKIH0KIAotc3RhdGljIGludAotaW50 ZWxfcmluZ19hbGxvY19yZXF1ZXN0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCitpbnQK K2ludGVsX3JpbmdfYWxsb2NfcmVxdWVzdChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLCBz dHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4KQogewogCWludCByZXQ7CiAJc3RydWN0IGRybV9pOTE1 X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0OwpAQCAtMjE1MCw3ICsyMTUwLDcgQEAgaW50IGludGVsX3Jp bmdfYmVnaW4oc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKIAkJcmV0dXJuIHJldDsKIAog CS8qIFByZWFsbG9jYXRlIHRoZSBvbHIgYmVmb3JlIHRvdWNoaW5nIHRoZSByaW5nICovCi0JcmV0 ID0gaW50ZWxfcmluZ19hbGxvY19yZXF1ZXN0KHJpbmcpOworCXJldCA9IGludGVsX3JpbmdfYWxs b2NfcmVxdWVzdChyaW5nLCBOVUxMKTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmggYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKaW5kZXggMjZlNTc3NC4uNzRkZjBmYyAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaApAQCAtMzkyLDYgKzM5Miw4 IEBAIHZvaWQgaW50ZWxfY2xlYW51cF9yaW5nX2J1ZmZlcihzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz ICpyaW5nKTsKIAogaW50IF9fbXVzdF9jaGVjayBpbnRlbF9yaW5nX2JlZ2luKHN0cnVjdCBpbnRl bF9lbmdpbmVfY3MgKnJpbmcsIGludCBuKTsKIGludCBfX211c3RfY2hlY2sgaW50ZWxfcmluZ19j YWNoZWxpbmVfYWxpZ24oc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyk7CitpbnQgX19tdXN0 X2NoZWNrIGludGVsX3JpbmdfYWxsb2NfcmVxdWVzdChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpy aW5nLAorCQkJCQkgIHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgpOwogc3RhdGljIGlubGluZSB2 b2lkIGludGVsX3JpbmdfZW1pdChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAogCQkJCSAg IHUzMiBkYXRhKQogewotLSAKMS43LjkuNQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9pbnRlbC1nZngK