From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH 28/55] drm/i915: Update add_request() to take a request structure Date: Fri, 29 May 2015 17:43:49 +0100 Message-ID: <1432917856-12261-29-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 F36ED72130 for ; Fri, 29 May 2015 09:44:48 -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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KCk5vdyB0aGF0 IGFsbCBjYWxsZXJzIG9mIGk5MTVfYWRkX3JlcXVlc3QoKSBoYXZlIGEgcmVxdWVzdCBwb2ludGVy IHRvIGhhbmQsIGl0IGlzCnBvc3NpYmxlIHRvIHVwZGF0ZSB0aGUgYWRkIHJlcXVlc3QgZnVuY3Rp b24gdG8gdGFrZSBhIHJlcXVlc3QgcG9pbnRlciByYXRoZXIKdGhhbiBwdWxsaW5nIGl0IG91dCBv ZiB0aGUgT0xSLgoKRm9yOiBWSVotNTExNQpTaWduZWQtb2ZmLWJ5OiBKb2huIEhhcnJpc29uIDxK b2huLkMuSGFycmlzb25ASW50ZWwuY29tPgpSZXZpZXdlZC1ieTogVG9tYXMgRWxmIDx0b21hcy5l bGZAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggICAgICAg ICAgICB8ICAgMTAgKysrKystLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyAg ICAgICAgICAgIHwgICAyMiArKysrKysrKysrKy0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMgfCAgICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kaXNwbGF5LmMgICAgICAgfCAgICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9scmMuYyAgICAgICAgICAgfCAgICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9vdmVybGF5LmMgICAgICAgfCAgICA0ICsrLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3JpbmdidWZmZXIuYyAgICB8ICAgIDMgKystCiA3IGZpbGVzIGNoYW5nZWQsIDIzIGluc2VydGlv bnMoKyksIDIyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IDY1MGU1 YzcuLmY1MTdmY2MgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtMjg2MywxNCArMjg2Mywx NCBAQCB2b2lkIGk5MTVfZ2VtX2luaXRfc3dpenpsaW5nKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYp Owogdm9pZCBpOTE1X2dlbV9jbGVhbnVwX3JpbmdidWZmZXIoc3RydWN0IGRybV9kZXZpY2UgKmRl dik7CiBpbnQgX19tdXN0X2NoZWNrIGk5MTVfZ3B1X2lkbGUoc3RydWN0IGRybV9kZXZpY2UgKmRl dik7CiBpbnQgX19tdXN0X2NoZWNrIGk5MTVfZ2VtX3N1c3BlbmQoc3RydWN0IGRybV9kZXZpY2Ug KmRldik7Ci12b2lkIF9faTkxNV9hZGRfcmVxdWVzdChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpy aW5nLAordm9pZCBfX2k5MTVfYWRkX3JlcXVlc3Qoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0 ICpyZXEsCiAJCQlzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUsCiAJCQlzdHJ1Y3QgZHJtX2k5MTVfZ2Vt X29iamVjdCAqYmF0Y2hfb2JqLAogCQkJYm9vbCBmbHVzaF9jYWNoZXMpOwotI2RlZmluZSBpOTE1 X2FkZF9yZXF1ZXN0KHJpbmcpIFwKLQlfX2k5MTVfYWRkX3JlcXVlc3QocmluZywgTlVMTCwgTlVM TCwgdHJ1ZSkKLSNkZWZpbmUgaTkxNV9hZGRfcmVxdWVzdF9ub19mbHVzaChyaW5nKSBcCi0JX19p OTE1X2FkZF9yZXF1ZXN0KHJpbmcsIE5VTEwsIE5VTEwsIGZhbHNlKQorI2RlZmluZSBpOTE1X2Fk ZF9yZXF1ZXN0KHJlcSkgXAorCV9faTkxNV9hZGRfcmVxdWVzdChyZXEsIE5VTEwsIE5VTEwsIHRy dWUpCisjZGVmaW5lIGk5MTVfYWRkX3JlcXVlc3Rfbm9fZmx1c2gocmVxKSBcCisJX19pOTE1X2Fk ZF9yZXF1ZXN0KHJlcSwgTlVMTCwgTlVMTCwgZmFsc2UpCiBpbnQgX19pOTE1X3dhaXRfcmVxdWVz dChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwKIAkJCXVuc2lnbmVkIHJlc2V0X2Nv dW50ZXIsCiAJCQlib29sIGludGVycnVwdGlibGUsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRl eCBkYjkwMDQzLi4xMjA3OGJkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKQEAgLTExNTgsNyAr MTE1OCw3IEBAIGk5MTVfZ2VtX2NoZWNrX29scihzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3Qg KnJlcSkKIAlXQVJOX09OKCFtdXRleF9pc19sb2NrZWQoJnJlcS0+cmluZy0+ZGV2LT5zdHJ1Y3Rf bXV0ZXgpKTsKIAogCWlmIChyZXEgPT0gcmVxLT5yaW5nLT5vdXRzdGFuZGluZ19sYXp5X3JlcXVl c3QpCi0JCWk5MTVfYWRkX3JlcXVlc3QocmVxLT5yaW5nKTsKKwkJaTkxNV9hZGRfcmVxdWVzdChy ZXEpOwogCiAJcmV0dXJuIDA7CiB9CkBAIC0yNDY4LDI1ICsyNDY4LDI1IEBAIGk5MTVfZ2VtX2dl dF9zZXFubyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1MzIgKnNlcW5vKQogICogcmVxdWVzdCBp cyBub3QgYmVpbmcgdHJhY2tlZCBmb3IgY29tcGxldGlvbiBidXQgdGhlIHdvcmsgaXRzZWxmIGlz CiAgKiBnb2luZyB0byBoYXBwZW4gb24gdGhlIGhhcmR3YXJlLiBUaGlzIHdvdWxkIGJlIGEgQmFk IFRoaW5nKHRtKS4KICAqLwotdm9pZCBfX2k5MTVfYWRkX3JlcXVlc3Qoc3RydWN0IGludGVsX2Vu Z2luZV9jcyAqcmluZywKK3ZvaWQgX19pOTE1X2FkZF9yZXF1ZXN0KHN0cnVjdCBkcm1faTkxNV9n ZW1fcmVxdWVzdCAqcmVxdWVzdCwKIAkJCXN0cnVjdCBkcm1fZmlsZSAqZmlsZSwKIAkJCXN0cnVj dCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmosCiAJCQlib29sIGZsdXNoX2NhY2hlcykKIHsKLQlz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSByaW5nLT5kZXYtPmRldl9wcml2YXRl OwotCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdDsKKwlzdHJ1Y3QgaW50ZWxf ZW5naW5lX2NzICpyaW5nOworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdjsKIAlz dHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZjsKIAl1MzIgcmVxdWVzdF9zdGFydDsKIAlp bnQgcmV0OwogCi0JcmVxdWVzdCA9IHJpbmctPm91dHN0YW5kaW5nX2xhenlfcmVxdWVzdDsKIAlp ZiAoV0FSTl9PTihyZXF1ZXN0ID09IE5VTEwpKQogCQlyZXR1cm47CiAKLQlpZiAoaTkxNS5lbmFi bGVfZXhlY2xpc3RzKSB7Ci0JCXJpbmdidWYgPSByZXF1ZXN0LT5jdHgtPmVuZ2luZVtyaW5nLT5p ZF0ucmluZ2J1ZjsKLQl9IGVsc2UKLQkJcmluZ2J1ZiA9IHJpbmctPmJ1ZmZlcjsKKwlyaW5nID0g cmVxdWVzdC0+cmluZzsKKwlkZXZfcHJpdiA9IHJpbmctPmRldi0+ZGV2X3ByaXZhdGU7CisJcmlu Z2J1ZiA9IHJlcXVlc3QtPnJpbmdidWY7CisKKwlXQVJOX09OKHJlcXVlc3QgIT0gcmluZy0+b3V0 c3RhbmRpbmdfbGF6eV9yZXF1ZXN0KTsKIAogCS8qCiAJICogVG8gZW5zdXJlIHRoYXQgdGhpcyBj YWxsIHdpbGwgbm90IGZhaWwsIHNwYWNlIGZvciBpdHMgZW1pc3Npb25zCkBAIC0zMzQ0LDcgKzMz NDQsNyBAQCBpbnQgaTkxNV9ncHVfaWRsZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQkJCXJl dHVybiByZXQ7CiAJCQl9CiAKLQkJCWk5MTVfYWRkX3JlcXVlc3Rfbm9fZmx1c2gocmVxLT5yaW5n KTsKKwkJCWk5MTVfYWRkX3JlcXVlc3Rfbm9fZmx1c2gocmVxKTsKIAkJfQogCiAJCVdBUk5fT04o cmluZy0+b3V0c3RhbmRpbmdfbGF6eV9yZXF1ZXN0KTsKQEAgLTUxMjgsNyArNTEyOCw3IEBAIGk5 MTVfZ2VtX2luaXRfaHcoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJCWdvdG8gb3V0OwogCQl9 CiAKLQkJaTkxNV9hZGRfcmVxdWVzdF9ub19mbHVzaChyaW5nKTsKKwkJaTkxNV9hZGRfcmVxdWVz dF9ub19mbHVzaChyZXEpOwogCX0KIAogb3V0OgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW1fZXhlY2J1ZmZlci5jCmluZGV4IGJlYTkyYWQuLjc1MzNmYjMgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMKQEAgLTEwNTgsNyArMTA1OCw3IEBAIGk5MTVf Z2VtX2V4ZWNidWZmZXJfcmV0aXJlX2NvbW1hbmRzKHN0cnVjdCBpOTE1X2V4ZWNidWZmZXJfcGFy YW1zICpwYXJhbXMpCiAJcGFyYW1zLT5yaW5nLT5ncHVfY2FjaGVzX2RpcnR5ID0gdHJ1ZTsKIAog CS8qIEFkZCBhIGJyZWFkY3J1bWIgZm9yIHRoZSBjb21wbGV0aW9uIG9mIHRoZSBiYXRjaCBidWZm ZXIgKi8KLQlfX2k5MTVfYWRkX3JlcXVlc3QocGFyYW1zLT5yaW5nLCBwYXJhbXMtPmZpbGUsIHBh cmFtcy0+YmF0Y2hfb2JqLCB0cnVlKTsKKwlfX2k5MTVfYWRkX3JlcXVlc3QocGFyYW1zLT5yZXF1 ZXN0LCBwYXJhbXMtPmZpbGUsIHBhcmFtcy0+YmF0Y2hfb2JqLCB0cnVlKTsKIH0KIAogc3RhdGlj IGludApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IGExYWM1NTcuLjgxMWZm MGEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTExMjY0LDcgKzExMjY0 LDcgQEAgc3RhdGljIGludCBpbnRlbF9jcnRjX3BhZ2VfZmxpcChzdHJ1Y3QgZHJtX2NydGMgKmNy dGMsCiAJfQogCiAJaWYgKHJlcXVlc3QpCi0JCWk5MTVfYWRkX3JlcXVlc3Rfbm9fZmx1c2gocmVx dWVzdC0+cmluZyk7CisJCWk5MTVfYWRkX3JlcXVlc3Rfbm9fZmx1c2gocmVxdWVzdCk7CiAKIAl3 b3JrLT5mbGlwX3F1ZXVlZF92YmxhbmsgPSBkcm1fY3J0Y192YmxhbmtfY291bnQoY3J0Yyk7CiAJ d29yay0+ZW5hYmxlX3N0YWxsX2NoZWNrID0gdHJ1ZTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2xyYy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMK aW5kZXggZjhlOGZkYi4uNTIxZWNmZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfbHJjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKQEAgLTE5 ODMsNyArMTk4Myw3IEBAIGludCBpbnRlbF9scl9jb250ZXh0X2RlZmVycmVkX2NyZWF0ZShzdHJ1 Y3QgaW50ZWxfY29udGV4dCAqY3R4LAogCQkJCWdvdG8gZXJyb3I7CiAJCQl9CiAKLQkJCWk5MTVf YWRkX3JlcXVlc3Rfbm9fZmx1c2gocmVxLT5yaW5nKTsKKwkJCWk5MTVfYWRkX3JlcXVlc3Rfbm9f Zmx1c2gocmVxKTsKIAkJfQogCiAJCWN0eC0+cmNzX2luaXRpYWxpemVkID0gdHJ1ZTsKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX292ZXJsYXkuYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX292ZXJsYXkuYwppbmRleCAzYWRiNjNlLi4zZjcwOTA0IDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9vdmVybGF5LmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfb3ZlcmxheS5jCkBAIC0yMTcsNyArMjE3LDcgQEAgc3RhdGljIGlu dCBpbnRlbF9vdmVybGF5X2RvX3dhaXRfcmVxdWVzdChzdHJ1Y3QgaW50ZWxfb3ZlcmxheSAqb3Zl cmxheSwKIAogCVdBUk5fT04ob3ZlcmxheS0+bGFzdF9mbGlwX3JlcSk7CiAJaTkxNV9nZW1fcmVx dWVzdF9hc3NpZ24oJm92ZXJsYXktPmxhc3RfZmxpcF9yZXEsIHJlcSk7Ci0JaTkxNV9hZGRfcmVx dWVzdChyZXEtPnJpbmcpOworCWk5MTVfYWRkX3JlcXVlc3QocmVxKTsKIAogCW92ZXJsYXktPmZs aXBfdGFpbCA9IHRhaWw7CiAJcmV0ID0gaTkxNV93YWl0X3JlcXVlc3Qob3ZlcmxheS0+bGFzdF9m bGlwX3JlcSk7CkBAIC0yOTksNyArMjk5LDcgQEAgc3RhdGljIGludCBpbnRlbF9vdmVybGF5X2Nv bnRpbnVlKHN0cnVjdCBpbnRlbF9vdmVybGF5ICpvdmVybGF5LAogCiAJV0FSTl9PTihvdmVybGF5 LT5sYXN0X2ZsaXBfcmVxKTsKIAlpOTE1X2dlbV9yZXF1ZXN0X2Fzc2lnbigmb3ZlcmxheS0+bGFz dF9mbGlwX3JlcSwgcmVxKTsKLQlpOTE1X2FkZF9yZXF1ZXN0KHJlcS0+cmluZyk7CisJaTkxNV9h ZGRfcmVxdWVzdChyZXEpOwogCiAJcmV0dXJuIDA7CiB9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9yaW5nYnVmZmVyLmMKaW5kZXggZWE5MWEzMy4uOTc4OTg0ZSAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3JpbmdidWZmZXIuYwpAQCAtMjE1Nyw4ICsyMTU3LDkgQEAgaW50IGludGVsX3Jp bmdfaWRsZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQogCXN0cnVjdCBkcm1faTkxNV9n ZW1fcmVxdWVzdCAqcmVxOwogCiAJLyogV2UgbmVlZCB0byBhZGQgYW55IHJlcXVlc3RzIHJlcXVp cmVkIHRvIGZsdXNoIHRoZSBvYmplY3RzIGFuZCByaW5nICovCisJV0FSTl9PTihyaW5nLT5vdXRz dGFuZGluZ19sYXp5X3JlcXVlc3QpOwogCWlmIChyaW5nLT5vdXRzdGFuZGluZ19sYXp5X3JlcXVl c3QpCi0JCWk5MTVfYWRkX3JlcXVlc3QocmluZyk7CisJCWk5MTVfYWRkX3JlcXVlc3QocmluZy0+ b3V0c3RhbmRpbmdfbGF6eV9yZXF1ZXN0KTsKIAogCS8qIFdhaXQgdXBvbiB0aGUgbGFzdCByZXF1 ZXN0IHRvIGJlIGNvbXBsZXRlZCAqLwogCWlmIChsaXN0X2VtcHR5KCZyaW5nLT5yZXF1ZXN0X2xp c3QpKQotLSAKMS43LjkuNQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRl bC1nZngK