From: John.C.Harrison@Intel.com Subject: [PATCH 29/51] drm/i915: Update add_request() to take a request structure Date: Fri, 13 Feb 2015 11:48:38 +0000 Message-ID: <1423828140-10653-30-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 6C44B6E7C1 for ; Fri, 13 Feb 2015 03:49:33 -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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KCk5vdyB0aGF0 IGFsbCBjYWxsZXJzIG9mIGk5MTVfYWRkX3JlcXVlc3QoKSBoYXZlIGEgcmVxdWVzdCBwb2ludGVy IHRvIGhhbmQsIGl0IGlzCnBvc3NpYmxlIHRvIHVwZGF0ZSB0aGUgYWRkIHJlcXVlc3QgZnVuY3Rp b24gdG8gdGFrZSBhIHJlcXVlc3QgcG9pbnRlciByYXRoZXIKdGhhbiBwdWxsaW5nIGl0IG91dCBv ZiB0aGUgT0xSLgoKRm9yOiBWSVotNTExNQpTaWduZWQtb2ZmLWJ5OiBKb2huIEhhcnJpc29uIDxK b2huLkMuSGFycmlzb25ASW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZHJ2LmggICAgICAgICAgICB8ICAgMTAgKysrKystLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9nZW0uYyAgICAgICAgICAgIHwgICAyNCArKysrKysrKysrKystLS0tLS0tLS0tLS0KIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYyB8ICAgIDIgKy0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyAgICAgICB8ICAgIDIgKy0KIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2xyYy5jICAgICAgICAgICB8ICAgIDIgKy0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX292ZXJsYXkuYyAgICAgICB8ICAgIDQgKystLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jICAgIHwgICAgMyArKy0KIDcgZmlsZXMgY2hhbmdl ZCwgMjQgaW5zZXJ0aW9ucygrKSwgMjMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2 LmgKaW5kZXggNGI4MmIyZS4uYjdjMDFlMiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC0y ODE0LDE0ICsyODE0LDE0IEBAIHZvaWQgaTkxNV9nZW1faW5pdF9zd2l6emxpbmcoc3RydWN0IGRy bV9kZXZpY2UgKmRldik7CiB2b2lkIGk5MTVfZ2VtX2NsZWFudXBfcmluZ2J1ZmZlcihzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2KTsKIGludCBfX211c3RfY2hlY2sgaTkxNV9ncHVfaWRsZShzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2KTsKIGludCBfX211c3RfY2hlY2sgaTkxNV9nZW1fc3VzcGVuZChzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2KTsKLWludCBfX2k5MTVfYWRkX3JlcXVlc3Qoc3RydWN0IGludGVs X2VuZ2luZV9jcyAqcmluZywKK2ludCBfX2k5MTVfYWRkX3JlcXVlc3Qoc3RydWN0IGRybV9pOTE1 X2dlbV9yZXF1ZXN0ICpyZXEsCiAJCSAgICAgICBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUsCiAJCSAg ICAgICBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqYmF0Y2hfb2JqLAogCQkgICAgICAgYm9v bCBmbHVzaF9jYWNoZXMpOwotI2RlZmluZSBpOTE1X2FkZF9yZXF1ZXN0KHJpbmcpIFwKLQlfX2k5 MTVfYWRkX3JlcXVlc3QocmluZywgTlVMTCwgTlVMTCwgdHJ1ZSkKLSNkZWZpbmUgaTkxNV9hZGRf cmVxdWVzdF9ub19mbHVzaChyaW5nKSBcCi0JX19pOTE1X2FkZF9yZXF1ZXN0KHJpbmcsIE5VTEws IE5VTEwsIGZhbHNlKQorI2RlZmluZSBpOTE1X2FkZF9yZXF1ZXN0KHJlcSkgXAorCV9faTkxNV9h ZGRfcmVxdWVzdChyZXEsIE5VTEwsIE5VTEwsIHRydWUpCisjZGVmaW5lIGk5MTVfYWRkX3JlcXVl c3Rfbm9fZmx1c2gocmVxKSBcCisJX19pOTE1X2FkZF9yZXF1ZXN0KHJlcSwgTlVMTCwgTlVMTCwg ZmFsc2UpCiBpbnQgX19pOTE1X3dhaXRfcmVxdWVzdChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVl c3QgKnJlcSwKIAkJCXVuc2lnbmVkIHJlc2V0X2NvdW50ZXIsCiAJCQlib29sIGludGVycnVwdGli bGUsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRleCA1ZjE3YWRlLi44YjBiZmJkIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtLmMKQEAgLTExNjEsNyArMTE2MSw3IEBAIGk5MTVfZ2VtX2NoZWNrX29s cihzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSkKIAogCXJldCA9IDA7CiAJaWYgKHJl cSA9PSByZXEtPnJpbmctPm91dHN0YW5kaW5nX2xhenlfcmVxdWVzdCkKLQkJcmV0ID0gaTkxNV9h ZGRfcmVxdWVzdChyZXEtPnJpbmcpOworCQlyZXQgPSBpOTE1X2FkZF9yZXF1ZXN0KHJlcSk7CiAK IAlyZXR1cm4gcmV0OwogfQpAQCAtMjQwNiwyNSArMjQwNiwyNSBAQCBpOTE1X2dlbV9nZXRfc2Vx bm8oc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdTMyICpzZXFubykKIAlyZXR1cm4gMDsKIH0KIAot aW50IF9faTkxNV9hZGRfcmVxdWVzdChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAoraW50 IF9faTkxNV9hZGRfcmVxdWVzdChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3Qs CiAJCSAgICAgICBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUsCiAJCSAgICAgICBzdHJ1Y3QgZHJtX2k5 MTVfZ2VtX29iamVjdCAqb2JqLAogCQkgICAgICAgYm9vbCBmbHVzaF9jYWNoZXMpCiB7Ci0Jc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gcmluZy0+ZGV2LT5kZXZfcHJpdmF0ZTsK LQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3Q7CisJc3RydWN0IGludGVsX2Vu Z2luZV9jcyAqcmluZzsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXY7CiAJc3Ry dWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWY7CiAJdTMyIHJlcXVlc3Rfc3RhcnQ7CiAJaW50 IHJldDsKIAotCXJlcXVlc3QgPSByaW5nLT5vdXRzdGFuZGluZ19sYXp5X3JlcXVlc3Q7CiAJaWYg KFdBUk5fT04ocmVxdWVzdCA9PSBOVUxMKSkKIAkJcmV0dXJuIC1FTk9NRU07CiAKLQlpZiAoaTkx NS5lbmFibGVfZXhlY2xpc3RzKSB7Ci0JCXJpbmdidWYgPSByZXF1ZXN0LT5jdHgtPmVuZ2luZVty aW5nLT5pZF0ucmluZ2J1ZjsKLQl9IGVsc2UKLQkJcmluZ2J1ZiA9IHJpbmctPmJ1ZmZlcjsKKwly aW5nID0gcmVxdWVzdC0+cmluZzsKKwlkZXZfcHJpdiA9IHJpbmctPmRldi0+ZGV2X3ByaXZhdGU7 CisJcmluZ2J1ZiA9IHJlcXVlc3QtPnJpbmdidWY7CisKKwlXQVJOX09OKHJlcXVlc3QgIT0gcmlu Zy0+b3V0c3RhbmRpbmdfbGF6eV9yZXF1ZXN0KTsKIAogCXJlcXVlc3Rfc3RhcnQgPSBpbnRlbF9y aW5nX2dldF90YWlsKHJpbmdidWYpOwogCS8qCkBAIC0zMTEzLDcgKzMxMTMsNyBAQCBpbnQgaTkx NV9ncHVfaWRsZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQkJCXJldHVybiByZXQ7CiAJCQl9 CiAKLQkJCXJldCA9IGk5MTVfYWRkX3JlcXVlc3Rfbm9fZmx1c2gocmVxLT5yaW5nKTsKKwkJCXJl dCA9IGk5MTVfYWRkX3JlcXVlc3Rfbm9fZmx1c2gocmVxKTsKIAkJCWlmIChyZXQpIHsKIAkJCQlp OTE1X2dlbV9yZXF1ZXN0X3VucmVmZXJlbmNlKHJlcSk7CiAJCQkJcmV0dXJuIHJldDsKQEAgLTM5 NjEsNyArMzk2MSw3IEBAIGk5MTVfZ2VtX29iamVjdF9waW5fdG9fZGlzcGxheV9wbGFuZShzdHJ1 Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAogCQkJaWYgKHJldCkKIAkJCQlyZXR1cm4gcmV0 OwogCi0JCQlyZXQgPSBpOTE1X2FkZF9yZXF1ZXN0X25vX2ZsdXNoKHJlcS0+cmluZyk7CisJCQly ZXQgPSBpOTE1X2FkZF9yZXF1ZXN0X25vX2ZsdXNoKHJlcSk7CiAJCQlpZiAocmV0KQogCQkJCXJl dHVybiByZXQ7CiAJCX0KQEAgLTQ4NzksNyArNDg3OSw3IEBAIGk5MTVfZ2VtX2luaXRfaHcoc3Ry dWN0IGRybV9kZXZpY2UgKmRldikKIAkJCXJldHVybiByZXQ7CiAJCX0KIAotCQlyZXQgPSBpOTE1 X2FkZF9yZXF1ZXN0X25vX2ZsdXNoKHJpbmcpOworCQlyZXQgPSBpOTE1X2FkZF9yZXF1ZXN0X25v X2ZsdXNoKHJlcSk7CiAJCWlmIChyZXQpIHsKIAkJCURSTV9FUlJPUigiQWRkIHJlcXVlc3Qgcmlu ZyAjJWQgZmFpbGVkOiAlZFxuIiwgaSwgcmV0KTsKIAkJCWk5MTVfZ2VtX3JlcXVlc3RfdW5yZWZl cmVuY2UocmVxKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4 ZWNidWZmZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYwpp bmRleCAxZTJmYzgwLi4xNWUzM2E5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbV9leGVjYnVmZmVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1f ZXhlY2J1ZmZlci5jCkBAIC05OTYsNyArOTk2LDcgQEAgaTkxNV9nZW1fZXhlY2J1ZmZlcl9yZXRp cmVfY29tbWFuZHMoc3RydWN0IGk5MTVfZXhlY2J1ZmZlcl9wYXJhbXMgKnBhcmFtcykKIAlwYXJh bXMtPnJpbmctPmdwdV9jYWNoZXNfZGlydHkgPSB0cnVlOwogCiAJLyogQWRkIGEgYnJlYWRjcnVt YiBmb3IgdGhlIGNvbXBsZXRpb24gb2YgdGhlIGJhdGNoIGJ1ZmZlciAqLwotCXJldHVybiBfX2k5 MTVfYWRkX3JlcXVlc3QocGFyYW1zLT5yaW5nLCBwYXJhbXMtPmZpbGUsCisJcmV0dXJuIF9faTkx NV9hZGRfcmVxdWVzdChwYXJhbXMtPnJlcXVlc3QsIHBhcmFtcy0+ZmlsZSwKIAkJCQkgIHBhcmFt cy0+YmF0Y2hfb2JqLCB0cnVlKTsKIH0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5j CmluZGV4IGYyM2YyOGUuLjRhYWExOTAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5 LmMKQEAgLTk4NTksNyArOTg1OSw3IEBAIHN0YXRpYyBpbnQgaW50ZWxfY3J0Y19wYWdlX2ZsaXAo c3RydWN0IGRybV9jcnRjICpjcnRjLAogCiAJCWk5MTVfZ2VtX3JlcXVlc3RfYXNzaWduKCZ3b3Jr LT5mbGlwX3F1ZXVlZF9yZXEsIHJlcXVlc3QpOwogCi0JCXJldCA9IGk5MTVfYWRkX3JlcXVlc3Rf bm9fZmx1c2gocmVxdWVzdC0+cmluZyk7CisJCXJldCA9IGk5MTVfYWRkX3JlcXVlc3Rfbm9fZmx1 c2gocmVxdWVzdCk7CiAJCWlmIChyZXQpCiAJCQlnb3RvIGNsZWFudXBfcmVxdWVzdF9hc3NpZ247 CiAJfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwppbmRleCBhZDEzY2M3Li41NjE1MWMzIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9scmMuYwpAQCAtMTkxNiw3ICsxOTE2LDcgQEAgaW50IGludGVsX2xy X2NvbnRleHRfZGVmZXJyZWRfY3JlYXRlKHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgsCiAJCQkJ Z290byBlcnJvcjsKIAkJCX0KIAotCQkJcmV0ID0gaTkxNV9hZGRfcmVxdWVzdF9ub19mbHVzaChy ZXEtPnJpbmcpOworCQkJcmV0ID0gaTkxNV9hZGRfcmVxdWVzdF9ub19mbHVzaChyZXEpOwogCQkJ aWYgKHJldCkgewogCQkJCURSTV9FUlJPUigicmluZyBpbml0IGNvbnRleHQ6ICVkXG4iLCByZXQp OwogCQkJCWk5MTVfZ2VtX3JlcXVlc3RfdW5yZWZlcmVuY2UocmVxKTsKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX292ZXJsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX292ZXJsYXkuYwppbmRleCBkYzIwOWJmLi4yMjhjOWQxIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9vdmVybGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfb3ZlcmxheS5jCkBAIC0yMTcsNyArMjE3LDcgQEAgc3RhdGljIGludCBpbnRlbF9v dmVybGF5X2RvX3dhaXRfcmVxdWVzdChzdHJ1Y3QgaW50ZWxfb3ZlcmxheSAqb3ZlcmxheSwKIAog CUJVR19PTihvdmVybGF5LT5sYXN0X2ZsaXBfcmVxKTsKIAlpOTE1X2dlbV9yZXF1ZXN0X2Fzc2ln bigmb3ZlcmxheS0+bGFzdF9mbGlwX3JlcSwgcmVxKTsKLQlyZXQgPSBpOTE1X2FkZF9yZXF1ZXN0 KHJlcS0+cmluZyk7CisJcmV0ID0gaTkxNV9hZGRfcmVxdWVzdChyZXEpOwogCWlmIChyZXQpIHsK IAkJaTkxNV9nZW1fcmVxdWVzdF91bnJlZmVyZW5jZShyZXEpOwogCQlyZXR1cm4gcmV0OwpAQCAt MzA0LDcgKzMwNCw3IEBAIHN0YXRpYyBpbnQgaW50ZWxfb3ZlcmxheV9jb250aW51ZShzdHJ1Y3Qg aW50ZWxfb3ZlcmxheSAqb3ZlcmxheSwKIAogCVdBUk5fT04ob3ZlcmxheS0+bGFzdF9mbGlwX3Jl cSk7CiAJaTkxNV9nZW1fcmVxdWVzdF9hc3NpZ24oJm92ZXJsYXktPmxhc3RfZmxpcF9yZXEsIHJl cSk7Ci0JcmV0ID0gaTkxNV9hZGRfcmVxdWVzdChyZXEtPnJpbmcpOworCXJldCA9IGk5MTVfYWRk X3JlcXVlc3QocmVxKTsKIAlpZiAocmV0KQogCQlpOTE1X2dlbV9yZXF1ZXN0X3VucmVmZXJlbmNl KHJlcSk7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZm ZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwppbmRleCA5YTBl OTQ0Li4xNzhiZjQ5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5n YnVmZmVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCkBA IC0yMDY2LDggKzIwNjYsOSBAQCBpbnQgaW50ZWxfcmluZ19pZGxlKHN0cnVjdCBpbnRlbF9lbmdp bmVfY3MgKnJpbmcpCiAJaW50IHJldDsKIAogCS8qIFdlIG5lZWQgdG8gYWRkIGFueSByZXF1ZXN0 cyByZXF1aXJlZCB0byBmbHVzaCB0aGUgb2JqZWN0cyBhbmQgcmluZyAqLworCVdBUk5fT04ocmlu Zy0+b3V0c3RhbmRpbmdfbGF6eV9yZXF1ZXN0KTsKIAlpZiAocmluZy0+b3V0c3RhbmRpbmdfbGF6 eV9yZXF1ZXN0KSB7Ci0JCXJldCA9IGk5MTVfYWRkX3JlcXVlc3QocmluZyk7CisJCXJldCA9IGk5 MTVfYWRkX3JlcXVlc3QocmluZy0+b3V0c3RhbmRpbmdfbGF6eV9yZXF1ZXN0KTsKIAkJaWYgKHJl dCkKIAkJCXJldHVybiByZXQ7CiAJfQotLSAKMS43LjkuNQoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1n ZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp bG1hbi9saXN0aW5mby9pbnRlbC1nZngK