From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH 31/59] drm/i915: Update add_request() to take a request structure Date: Thu, 19 Mar 2015 12:30:36 +0000 Message-ID: <1426768264-16996-32-git-send-email-John.C.Harrison@Intel.com> References: <1426768264-16996-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 mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 8D9586EA0C for ; Thu, 19 Mar 2015 05:31:42 -0700 (PDT) In-Reply-To: <1426768264-16996-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 L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IDFmZDU5 YmMuLjdlMGEwOTUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtMjc1MSwxNCArMjc1MSwx NCBAQCB2b2lkIGk5MTVfZ2VtX2luaXRfc3dpenpsaW5nKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYp Owogdm9pZCBpOTE1X2dlbV9jbGVhbnVwX3JpbmdidWZmZXIoc3RydWN0IGRybV9kZXZpY2UgKmRl dik7CiBpbnQgX19tdXN0X2NoZWNrIGk5MTVfZ3B1X2lkbGUoc3RydWN0IGRybV9kZXZpY2UgKmRl dik7CiBpbnQgX19tdXN0X2NoZWNrIGk5MTVfZ2VtX3N1c3BlbmQoc3RydWN0IGRybV9kZXZpY2Ug KmRldik7Ci12b2lkIF9faTkxNV9hZGRfcmVxdWVzdChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpy aW5nLAordm9pZCBfX2k5MTVfYWRkX3JlcXVlc3Qoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0 ICpyZXEsCiAJCQlzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUsCiAJCQlzdHJ1Y3QgZHJtX2k5MTVfZ2Vt X29iamVjdCAqYmF0Y2hfb2JqLAogCQkJYm9vbCBmbHVzaF9jYWNoZXMpOwotI2RlZmluZSBpOTE1 X2FkZF9yZXF1ZXN0KHJpbmcpIFwKLQlfX2k5MTVfYWRkX3JlcXVlc3QocmluZywgTlVMTCwgTlVM TCwgdHJ1ZSkKLSNkZWZpbmUgaTkxNV9hZGRfcmVxdWVzdF9ub19mbHVzaChyaW5nKSBcCi0JX19p OTE1X2FkZF9yZXF1ZXN0KHJpbmcsIE5VTEwsIE5VTEwsIGZhbHNlKQorI2RlZmluZSBpOTE1X2Fk ZF9yZXF1ZXN0KHJlcSkgXAorCV9faTkxNV9hZGRfcmVxdWVzdChyZXEsIE5VTEwsIE5VTEwsIHRy dWUpCisjZGVmaW5lIGk5MTVfYWRkX3JlcXVlc3Rfbm9fZmx1c2gocmVxKSBcCisJX19pOTE1X2Fk ZF9yZXF1ZXN0KHJlcSwgTlVMTCwgTlVMTCwgZmFsc2UpCiBpbnQgX19pOTE1X3dhaXRfcmVxdWVz dChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwKIAkJCXVuc2lnbmVkIHJlc2V0X2Nv dW50ZXIsCiAJCQlib29sIGludGVycnVwdGlibGUsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRl eCA5MTE0MDcxLi45ZjYxNWJmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKQEAgLTExNjIsNyAr MTE2Miw3IEBAIGk5MTVfZ2VtX2NoZWNrX29scihzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3Qg KnJlcSkKIAlXQVJOX09OKCFtdXRleF9pc19sb2NrZWQoJnJlcS0+cmluZy0+ZGV2LT5zdHJ1Y3Rf bXV0ZXgpKTsKIAogCWlmIChyZXEgPT0gcmVxLT5yaW5nLT5vdXRzdGFuZGluZ19sYXp5X3JlcXVl c3QpCi0JCWk5MTVfYWRkX3JlcXVlc3QocmVxLT5yaW5nKTsKKwkJaTkxNV9hZGRfcmVxdWVzdChy ZXEpOwogCiAJcmV0dXJuIDA7CiB9CkBAIC0yMzI3LDI1ICsyMzI3LDI1IEBAIGk5MTVfZ2VtX2dl dF9zZXFubyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1MzIgKnNlcW5vKQogICogcmVxdWVzdCBp cyBub3QgYmVpbmcgdHJhY2tlZCBmb3IgY29tcGxldGlvbiBidXQgdGhlIHdvcmsgaXRzZWxmIGlz CiAgKiBnb2luZyB0byBoYXBwZW4gb24gdGhlIGhhcmR3YXJlLiBUaGlzIHdvdWxkIGJlIGEgQmFk IFRoaW5nKHRtKS4KICAqLwotdm9pZCBfX2k5MTVfYWRkX3JlcXVlc3Qoc3RydWN0IGludGVsX2Vu Z2luZV9jcyAqcmluZywKK3ZvaWQgX19pOTE1X2FkZF9yZXF1ZXN0KHN0cnVjdCBkcm1faTkxNV9n ZW1fcmVxdWVzdCAqcmVxdWVzdCwKIAkJCXN0cnVjdCBkcm1fZmlsZSAqZmlsZSwKIAkJCXN0cnVj dCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmosCiAJCQlib29sIGZsdXNoX2NhY2hlcykKIHsKLQlz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSByaW5nLT5kZXYtPmRldl9wcml2YXRl OwotCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdDsKKwlzdHJ1Y3QgaW50ZWxf ZW5naW5lX2NzICpyaW5nOworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdjsKIAlz dHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZjsKIAl1MzIgcmVxdWVzdF9zdGFydDsKIAlp bnQgcmV0OwogCi0JcmVxdWVzdCA9IHJpbmctPm91dHN0YW5kaW5nX2xhenlfcmVxdWVzdDsKIAlp ZiAoV0FSTl9PTihyZXF1ZXN0ID09IE5VTEwpKQogCQlyZXR1cm47CiAKLQlpZiAoaTkxNS5lbmFi bGVfZXhlY2xpc3RzKSB7Ci0JCXJpbmdidWYgPSByZXF1ZXN0LT5jdHgtPmVuZ2luZVtyaW5nLT5p ZF0ucmluZ2J1ZjsKLQl9IGVsc2UKLQkJcmluZ2J1ZiA9IHJpbmctPmJ1ZmZlcjsKKwlyaW5nID0g cmVxdWVzdC0+cmluZzsKKwlkZXZfcHJpdiA9IHJpbmctPmRldi0+ZGV2X3ByaXZhdGU7CisJcmlu Z2J1ZiA9IHJlcXVlc3QtPnJpbmdidWY7CisKKwlXQVJOX09OKHJlcXVlc3QgIT0gcmluZy0+b3V0 c3RhbmRpbmdfbGF6eV9yZXF1ZXN0KTsKIAogCS8qCiAJICogVG8gZW5zdXJlIHRoYXQgdGhpcyBj YWxsIHdpbGwgbm90IGZhaWwsIHNwYWNlIGZvciBpdCdzIGVtaXNzaW9ucwpAQCAtMzEzNyw3ICsz MTM3LDcgQEAgaW50IGk5MTVfZ3B1X2lkbGUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJCQly ZXR1cm4gcmV0OwogCQkJfQogCi0JCQlpOTE1X2FkZF9yZXF1ZXN0X25vX2ZsdXNoKHJlcS0+cmlu Zyk7CisJCQlpOTE1X2FkZF9yZXF1ZXN0X25vX2ZsdXNoKHJlcSk7CiAJCX0KIAogCQlXQVJOX09O KHJpbmctPm91dHN0YW5kaW5nX2xhenlfcmVxdWVzdCk7CkBAIC00OTQyLDcgKzQ5NDIsNyBAQCBp OTE1X2dlbV9pbml0X2h3KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCQlnb3RvIG91dDsKIAkJ fQogCi0JCWk5MTVfYWRkX3JlcXVlc3Rfbm9fZmx1c2gocmluZyk7CisJCWk5MTVfYWRkX3JlcXVl c3Rfbm9fZmx1c2gocmVxKTsKIAl9CiAKIG91dDoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z2VtX2V4ZWNidWZmZXIuYwppbmRleCAxOTc4ZjljLi5hZjQ3MThkIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jCkBAIC0xMDYwLDcgKzEwNjAsNyBAQCBpOTE1 X2dlbV9leGVjYnVmZmVyX3JldGlyZV9jb21tYW5kcyhzdHJ1Y3QgaTkxNV9leGVjYnVmZmVyX3Bh cmFtcyAqcGFyYW1zKQogCXBhcmFtcy0+cmluZy0+Z3B1X2NhY2hlc19kaXJ0eSA9IHRydWU7CiAK IAkvKiBBZGQgYSBicmVhZGNydW1iIGZvciB0aGUgY29tcGxldGlvbiBvZiB0aGUgYmF0Y2ggYnVm ZmVyICovCi0JX19pOTE1X2FkZF9yZXF1ZXN0KHBhcmFtcy0+cmluZywgcGFyYW1zLT5maWxlLCBw YXJhbXMtPmJhdGNoX29iaiwgdHJ1ZSk7CisJX19pOTE1X2FkZF9yZXF1ZXN0KHBhcmFtcy0+cmVx dWVzdCwgcGFyYW1zLT5maWxlLCBwYXJhbXMtPmJhdGNoX29iaiwgdHJ1ZSk7CiB9CiAKIHN0YXRp YyBpbnQKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCBjMzljZDM0Li41MjM2 ZTU5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0xMDAxMiw3ICsxMDAx Miw3IEBAIHN0YXRpYyBpbnQgaW50ZWxfY3J0Y19wYWdlX2ZsaXAoc3RydWN0IGRybV9jcnRjICpj cnRjLAogCX0KIAogCWlmIChyZXF1ZXN0KQotCQlpOTE1X2FkZF9yZXF1ZXN0X25vX2ZsdXNoKHJl cXVlc3QtPnJpbmcpOworCQlpOTE1X2FkZF9yZXF1ZXN0X25vX2ZsdXNoKHJlcXVlc3QpOwogCiAJ d29yay0+ZmxpcF9xdWV1ZWRfdmJsYW5rID0gZHJtX2NydGNfdmJsYW5rX2NvdW50KGNydGMpOwog CXdvcmstPmVuYWJsZV9zdGFsbF9jaGVjayA9IHRydWU7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9scmMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5j CmluZGV4IDkzZmFmMTEuLmM3Yzc2MGQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2xyYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCkBAIC0x OTYxLDcgKzE5NjEsNyBAQCBpbnQgaW50ZWxfbHJfY29udGV4dF9kZWZlcnJlZF9jcmVhdGUoc3Ry dWN0IGludGVsX2NvbnRleHQgKmN0eCwKIAkJCQlnb3RvIGVycm9yOwogCQkJfQogCi0JCQlpOTE1 X2FkZF9yZXF1ZXN0X25vX2ZsdXNoKHJlcS0+cmluZyk7CisJCQlpOTE1X2FkZF9yZXF1ZXN0X25v X2ZsdXNoKHJlcSk7CiAJCX0KIAogCQljdHgtPnJjc19pbml0aWFsaXplZCA9IHRydWU7CmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9vdmVybGF5LmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9vdmVybGF5LmMKaW5kZXggMDkwZmVkZC4uOWVlYTMwOCAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfb3ZlcmxheS5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX292ZXJsYXkuYwpAQCAtMjE3LDcgKzIxNyw3IEBAIHN0YXRpYyBp bnQgaW50ZWxfb3ZlcmxheV9kb193YWl0X3JlcXVlc3Qoc3RydWN0IGludGVsX292ZXJsYXkgKm92 ZXJsYXksCiAKIAlCVUdfT04ob3ZlcmxheS0+bGFzdF9mbGlwX3JlcSk7CiAJaTkxNV9nZW1fcmVx dWVzdF9hc3NpZ24oJm92ZXJsYXktPmxhc3RfZmxpcF9yZXEsIHJlcSk7Ci0JaTkxNV9hZGRfcmVx dWVzdChyZXEtPnJpbmcpOworCWk5MTVfYWRkX3JlcXVlc3QocmVxKTsKIAogCW92ZXJsYXktPmZs aXBfdGFpbCA9IHRhaWw7CiAJcmV0ID0gaTkxNV93YWl0X3JlcXVlc3Qob3ZlcmxheS0+bGFzdF9m bGlwX3JlcSk7CkBAIC0zMDAsNyArMzAwLDcgQEAgc3RhdGljIGludCBpbnRlbF9vdmVybGF5X2Nv bnRpbnVlKHN0cnVjdCBpbnRlbF9vdmVybGF5ICpvdmVybGF5LAogCiAJV0FSTl9PTihvdmVybGF5 LT5sYXN0X2ZsaXBfcmVxKTsKIAlpOTE1X2dlbV9yZXF1ZXN0X2Fzc2lnbigmb3ZlcmxheS0+bGFz dF9mbGlwX3JlcSwgcmVxKTsKLQlpOTE1X2FkZF9yZXF1ZXN0KHJlcS0+cmluZyk7CisJaTkxNV9h ZGRfcmVxdWVzdChyZXEpOwogCiAJcmV0dXJuIDA7CiB9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9yaW5nYnVmZmVyLmMKaW5kZXggOGE1NTAzMi4uZGJhMWQ4OCAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3JpbmdidWZmZXIuYwpAQCAtMjE3Myw4ICsyMTczLDkgQEAgaW50IGludGVsX3Jp bmdfaWRsZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQogCXN0cnVjdCBkcm1faTkxNV9n ZW1fcmVxdWVzdCAqcmVxOwogCiAJLyogV2UgbmVlZCB0byBhZGQgYW55IHJlcXVlc3RzIHJlcXVp cmVkIHRvIGZsdXNoIHRoZSBvYmplY3RzIGFuZCByaW5nICovCisJV0FSTl9PTihyaW5nLT5vdXRz dGFuZGluZ19sYXp5X3JlcXVlc3QpOwogCWlmIChyaW5nLT5vdXRzdGFuZGluZ19sYXp5X3JlcXVl c3QpCi0JCWk5MTVfYWRkX3JlcXVlc3QocmluZyk7CisJCWk5MTVfYWRkX3JlcXVlc3QocmluZy0+ b3V0c3RhbmRpbmdfbGF6eV9yZXF1ZXN0KTsKIAogCS8qIFdhaXQgdXBvbiB0aGUgbGFzdCByZXF1 ZXN0IHRvIGJlIGNvbXBsZXRlZCAqLwogCWlmIChsaXN0X2VtcHR5KCZyaW5nLT5yZXF1ZXN0X2xp c3QpKQotLSAKMS43LjkuNQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRl bC1nZngK