From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH 35/59] drm/i915: Update a bunch of execbuffer helpers to take request structures Date: Thu, 19 Mar 2015 12:30:40 +0000 Message-ID: <1426768264-16996-36-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 3C0E36EA24 for ; Thu, 19 Mar 2015 05:31:47 -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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KClVwZGF0ZWQg Kl9yaW5nX2ludmFsaWRhdGVfYWxsX2NhY2hlcygpLCBpOTE1X3Jlc2V0X2dlbjdfc29sX29mZnNl dHMoKSBhbmQKaTkxNV9lbWl0X2JveCgpIHRvIHRha2UgcmVxdWVzdCBzdHJ1Y3R1cmVzIGluc3Rl YWQgb2YgcmluZyBvciByaW5nYnVmL2NvbnRleHQKcGFpcnMuCgpGb3I6IFZJWi01MTE1ClNpZ25l ZC1vZmYtYnk6IEpvaG4gSGFycmlzb24gPEpvaG4uQy5IYXJyaXNvbkBJbnRlbC5jb20+ClJldmll d2VkLWJ5OiBUb21hcyBFbGYgPHRvbWFzLmVsZkBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jIHwgICAxMiArKysrKysrLS0tLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jICAgICAgICAgICB8ICAgIDkgKysrKy0tLS0tCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMgICAgfCAgICAzICsrLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oICAgIHwgICAgMiArLQogNCBmaWxl cyBjaGFuZ2VkLCAxNCBpbnNlcnRpb25zKCspLCAxMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMKaW5kZXggZmFjNTk2Ni4uZTU4ZTg4YiAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYwpAQCAtOTIxLDcg KzkyMSw3IEBAIGk5MTVfZ2VtX2V4ZWNidWZmZXJfbW92ZV90b19ncHUoc3RydWN0IGRybV9pOTE1 X2dlbV9yZXF1ZXN0ICpyZXEsCiAJLyogVW5jb25kaXRpb25hbGx5IGludmFsaWRhdGUgZ3B1IGNh Y2hlcyBhbmQgZW5zdXJlIHRoYXQgd2UgZG8gZmx1c2gKIAkgKiBhbnkgcmVzaWR1YWwgd3JpdGVz IGZyb20gdGhlIHByZXZpb3VzIGJhdGNoLgogCSAqLwotCXJldHVybiBpbnRlbF9yaW5nX2ludmFs aWRhdGVfYWxsX2NhY2hlcyhyZXEtPnJpbmcpOworCXJldHVybiBpbnRlbF9yaW5nX2ludmFsaWRh dGVfYWxsX2NhY2hlcyhyZXEpOwogfQogCiBzdGF0aWMgYm9vbApAQCAtMTA2NSw4ICsxMDY1LDkg QEAgaTkxNV9nZW1fZXhlY2J1ZmZlcl9yZXRpcmVfY29tbWFuZHMoc3RydWN0IGk5MTVfZXhlY2J1 ZmZlcl9wYXJhbXMgKnBhcmFtcykKIAogc3RhdGljIGludAogaTkxNV9yZXNldF9nZW43X3NvbF9v ZmZzZXRzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCi0JCQkgICAgc3RydWN0IGludGVsX2VuZ2lu ZV9jcyAqcmluZykKKwkJCSAgICBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSkKIHsK KwlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nID0gcmVxLT5yaW5nOwogCXN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJaW50IHJldCwgaTsK IApAQCAtMTA5MSwxMCArMTA5MiwxMSBAQCBpOTE1X3Jlc2V0X2dlbjdfc29sX29mZnNldHMoc3Ry dWN0IGRybV9kZXZpY2UgKmRldiwKIH0KIAogc3RhdGljIGludAotaTkxNV9lbWl0X2JveChzdHJ1 Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAoraTkxNV9lbWl0X2JveChzdHJ1Y3QgZHJtX2k5MTVf Z2VtX3JlcXVlc3QgKnJlcSwKIAkgICAgICBzdHJ1Y3QgZHJtX2NsaXBfcmVjdCAqYm94LAogCSAg ICAgIGludCBEUjEsIGludCBEUjQpCiB7CisJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyA9 IHJlcS0+cmluZzsKIAlpbnQgcmV0OwogCiAJaWYgKGJveC0+eTIgPD0gYm94LT55MSB8fCBib3gt PngyIDw9IGJveC0+eDEgfHwKQEAgLTEyOTksNyArMTMwMSw3IEBAIGk5MTVfZ2VtX3JpbmdidWZm ZXJfc3VibWlzc2lvbihzdHJ1Y3QgaTkxNV9leGVjYnVmZmVyX3BhcmFtcyAqcGFyYW1zLAogCX0K IAogCWlmIChhcmdzLT5mbGFncyAmIEk5MTVfRVhFQ19HRU43X1NPTF9SRVNFVCkgewotCQlyZXQg PSBpOTE1X3Jlc2V0X2dlbjdfc29sX29mZnNldHMocGFyYW1zLT5kZXYsIHJpbmcpOworCQlyZXQg PSBpOTE1X3Jlc2V0X2dlbjdfc29sX29mZnNldHMocGFyYW1zLT5kZXYsIHBhcmFtcy0+cmVxdWVz dCk7CiAJCWlmIChyZXQpCiAJCQlnb3RvIGVycm9yOwogCX0KQEAgLTEzMTAsNyArMTMxMiw3IEBA IGk5MTVfZ2VtX3JpbmdidWZmZXJfc3VibWlzc2lvbihzdHJ1Y3QgaTkxNV9leGVjYnVmZmVyX3Bh cmFtcyAqcGFyYW1zLAogCiAJaWYgKGNsaXByZWN0cykgewogCQlmb3IgKGkgPSAwOyBpIDwgYXJn cy0+bnVtX2NsaXByZWN0czsgaSsrKSB7Ci0JCQlyZXQgPSBpOTE1X2VtaXRfYm94KHJpbmcsICZj bGlwcmVjdHNbaV0sCisJCQlyZXQgPSBpOTE1X2VtaXRfYm94KHBhcmFtcy0+cmVxdWVzdCwgJmNs aXByZWN0c1tpXSwKIAkJCQkJICAgIGFyZ3MtPkRSMSwgYXJncy0+RFI0KTsKIAkJCWlmIChyZXQp CiAJCQkJZ290byBlcnJvcjsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2xyYy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKaW5kZXggNTQ4MTUxNC4u OTE3YTc2YyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKQEAgLTU1OSwxMCArNTU5LDkgQEAg c3RhdGljIGludCBleGVjbGlzdHNfY29udGV4dF9xdWV1ZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz ICpyaW5nLAogCXJldHVybiAwOwogfQogCi1zdGF0aWMgaW50IGxvZ2ljYWxfcmluZ19pbnZhbGlk YXRlX2FsbF9jYWNoZXMoc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYsCi0JCQkJCSAg ICAgIHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgpCitzdGF0aWMgaW50IGxvZ2ljYWxfcmluZ19p bnZhbGlkYXRlX2FsbF9jYWNoZXMoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpCiB7 Ci0Jc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyA9IHJpbmdidWYtPnJpbmc7CisJc3RydWN0 IGludGVsX2VuZ2luZV9jcyAqcmluZyA9IHJlcS0+cmluZzsKIAl1aW50MzJfdCBmbHVzaF9kb21h aW5zOwogCWludCByZXQ7CiAKQEAgLTU3MCw3ICs1NjksNyBAQCBzdGF0aWMgaW50IGxvZ2ljYWxf cmluZ19pbnZhbGlkYXRlX2FsbF9jYWNoZXMoc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdi dWYsCiAJaWYgKHJpbmctPmdwdV9jYWNoZXNfZGlydHkpCiAJCWZsdXNoX2RvbWFpbnMgPSBJOTE1 X0dFTV9HUFVfRE9NQUlOUzsKIAotCXJldCA9IHJpbmctPmVtaXRfZmx1c2gocmluZ2J1ZiwgY3R4 LAorCXJldCA9IHJpbmctPmVtaXRfZmx1c2gocmVxLT5yaW5nYnVmLCByZXEtPmN0eCwKIAkJCSAg ICAgICBJOTE1X0dFTV9HUFVfRE9NQUlOUywgZmx1c2hfZG9tYWlucyk7CiAJaWYgKHJldCkKIAkJ cmV0dXJuIHJldDsKQEAgLTYwNiw3ICs2MDUsNyBAQCBzdGF0aWMgaW50IGV4ZWNsaXN0c19tb3Zl X3RvX2dwdShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwKIAkvKiBVbmNvbmRpdGlv bmFsbHkgaW52YWxpZGF0ZSBncHUgY2FjaGVzIGFuZCBlbnN1cmUgdGhhdCB3ZSBkbyBmbHVzaAog CSAqIGFueSByZXNpZHVhbCB3cml0ZXMgZnJvbSB0aGUgcHJldmlvdXMgYmF0Y2guCiAJICovCi0J cmV0dXJuIGxvZ2ljYWxfcmluZ19pbnZhbGlkYXRlX2FsbF9jYWNoZXMocmVxLT5yaW5nYnVmLCBy ZXEtPmN0eCk7CisJcmV0dXJuIGxvZ2ljYWxfcmluZ19pbnZhbGlkYXRlX2FsbF9jYWNoZXMocmVx KTsKIH0KIAogaW50IGludGVsX2xvZ2ljYWxfcmluZ19hbGxvY19yZXF1ZXN0X2V4dHJhcyhzdHJ1 Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9yaW5nYnVmZmVyLmMKaW5kZXggZGJhMWQ4OC4uODQ4ODVmMiAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3JpbmdidWZmZXIuYwpAQCAtMjg4OSw4ICsyODg5LDkgQEAgaW50ZWxfcmluZ19m bHVzaF9hbGxfY2FjaGVzKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCiB9CiAKIGludAot aW50ZWxfcmluZ19pbnZhbGlkYXRlX2FsbF9jYWNoZXMoc3RydWN0IGludGVsX2VuZ2luZV9jcyAq cmluZykKK2ludGVsX3JpbmdfaW52YWxpZGF0ZV9hbGxfY2FjaGVzKHN0cnVjdCBkcm1faTkxNV9n ZW1fcmVxdWVzdCAqcmVxKQogeworCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcgPSByZXEt PnJpbmc7CiAJdWludDMyX3QgZmx1c2hfZG9tYWluczsKIAlpbnQgcmV0OwogCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmggYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKaW5kZXggNWZhYzEwMS4uYmM3OWFhMyAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaApAQCAtNDE2LDcgKzQxNiw3IEBAIGJv b2wgaW50ZWxfcmluZ19zdG9wcGVkKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpOwogaW50 IF9fbXVzdF9jaGVjayBpbnRlbF9yaW5nX2lkbGUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmlu Zyk7CiB2b2lkIGludGVsX3JpbmdfaW5pdF9zZXFubyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpy aW5nLCB1MzIgc2Vxbm8pOwogaW50IGludGVsX3JpbmdfZmx1c2hfYWxsX2NhY2hlcyhzdHJ1Y3Qg aW50ZWxfZW5naW5lX2NzICpyaW5nKTsKLWludCBpbnRlbF9yaW5nX2ludmFsaWRhdGVfYWxsX2Nh Y2hlcyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKTsKK2ludCBpbnRlbF9yaW5nX2ludmFs aWRhdGVfYWxsX2NhY2hlcyhzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSk7CiAKIHZv aWQgaW50ZWxfZmluaV9waXBlX2NvbnRyb2woc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyk7 CiBpbnQgaW50ZWxfaW5pdF9waXBlX2NvbnRyb2woc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmlu Zyk7Ci0tIAoxLjcuOS41CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVs LWdmeAo=