From: John.C.Harrison@Intel.com Subject: [PATCH 33/51] drm/i915: Update a bunch of execbuffer heplers to take request structures Date: Fri, 13 Feb 2015 11:48:42 +0000 Message-ID: <1423828140-10653-34-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 573026E7C3 for ; Fri, 13 Feb 2015 03:49:37 -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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KClVwZGF0ZWQg Kl9yaW5nX2ludmFsaWRhdGVfYWxsX2NhY2hlcygpLCBpOTE1X3Jlc2V0X2dlbjdfc29sX29mZnNl dHMoKSBhbmQKaTkxNV9lbWl0X2JveCgpIHRvIHRha2UgcmVxdWVzdCBzdHJ1Y3R1cmVzIGluc3Rl YWQgb2YgcmluZyBvciByaW5nYnVmL2NvbnRleHQKcGFpcnMuCgpGb3I6IFZJWi01MTE1ClNpZ25l ZC1vZmYtYnk6IEpvaG4gSGFycmlzb24gPEpvaG4uQy5IYXJyaXNvbkBJbnRlbC5jb20+Ci0tLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jIHwgICAxMiArKysrKysr LS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jICAgICAgICAgICB8ICAgIDkg KysrKy0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMgICAgfCAg ICAzICsrLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oICAgIHwgICAg MiArLQogNCBmaWxlcyBjaGFuZ2VkLCAxNCBpbnNlcnRpb25zKCspLCAxMiBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMKaW5kZXggZGMxMzc1 MS4uYTc5Yzg5MyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhl Y2J1ZmZlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIu YwpAQCAtODU3LDcgKzg1Nyw3IEBAIGk5MTVfZ2VtX2V4ZWNidWZmZXJfbW92ZV90b19ncHUoc3Ry dWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsCiAJLyogVW5jb25kaXRpb25hbGx5IGludmFs aWRhdGUgZ3B1IGNhY2hlcyBhbmQgZW5zdXJlIHRoYXQgd2UgZG8gZmx1c2gKIAkgKiBhbnkgcmVz aWR1YWwgd3JpdGVzIGZyb20gdGhlIHByZXZpb3VzIGJhdGNoLgogCSAqLwotCXJldHVybiBpbnRl bF9yaW5nX2ludmFsaWRhdGVfYWxsX2NhY2hlcyhyZXEtPnJpbmcpOworCXJldHVybiBpbnRlbF9y aW5nX2ludmFsaWRhdGVfYWxsX2NhY2hlcyhyZXEpOwogfQogCiBzdGF0aWMgYm9vbApAQCAtMTAw Miw4ICsxMDAyLDkgQEAgaTkxNV9nZW1fZXhlY2J1ZmZlcl9yZXRpcmVfY29tbWFuZHMoc3RydWN0 IGk5MTVfZXhlY2J1ZmZlcl9wYXJhbXMgKnBhcmFtcykKIAogc3RhdGljIGludAogaTkxNV9yZXNl dF9nZW43X3NvbF9vZmZzZXRzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCi0JCQkgICAgc3RydWN0 IGludGVsX2VuZ2luZV9jcyAqcmluZykKKwkJCSAgICBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVl c3QgKnJlcSkKIHsKKwlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nID0gcmVxLT5yaW5nOwog CXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJ aW50IHJldCwgaTsKIApAQCAtMTAyOCwxMCArMTAyOSwxMSBAQCBpOTE1X3Jlc2V0X2dlbjdfc29s X29mZnNldHMoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIH0KIAogc3RhdGljIGludAotaTkxNV9l bWl0X2JveChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAoraTkxNV9lbWl0X2JveChzdHJ1 Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwKIAkgICAgICBzdHJ1Y3QgZHJtX2NsaXBfcmVj dCAqYm94LAogCSAgICAgIGludCBEUjEsIGludCBEUjQpCiB7CisJc3RydWN0IGludGVsX2VuZ2lu ZV9jcyAqcmluZyA9IHJlcS0+cmluZzsKIAlpbnQgcmV0OwogCiAJaWYgKGJveC0+eTIgPD0gYm94 LT55MSB8fCBib3gtPngyIDw9IGJveC0+eDEgfHwKQEAgLTEyNDcsNyArMTI0OSw3IEBAIGk5MTVf Z2VtX3JpbmdidWZmZXJfc3VibWlzc2lvbihzdHJ1Y3QgaTkxNV9leGVjYnVmZmVyX3BhcmFtcyAq cGFyYW1zLAogCX0KIAogCWlmIChhcmdzLT5mbGFncyAmIEk5MTVfRVhFQ19HRU43X1NPTF9SRVNF VCkgewotCQlyZXQgPSBpOTE1X3Jlc2V0X2dlbjdfc29sX29mZnNldHMocGFyYW1zLT5kZXYsIHJp bmcpOworCQlyZXQgPSBpOTE1X3Jlc2V0X2dlbjdfc29sX29mZnNldHMocGFyYW1zLT5kZXYsIHBh cmFtcy0+cmVxdWVzdCk7CiAJCWlmIChyZXQpCiAJCQlnb3RvIGVycm9yOwogCX0KQEAgLTEyNTgs NyArMTI2MCw3IEBAIGk5MTVfZ2VtX3JpbmdidWZmZXJfc3VibWlzc2lvbihzdHJ1Y3QgaTkxNV9l eGVjYnVmZmVyX3BhcmFtcyAqcGFyYW1zLAogCiAJaWYgKGNsaXByZWN0cykgewogCQlmb3IgKGkg PSAwOyBpIDwgYXJncy0+bnVtX2NsaXByZWN0czsgaSsrKSB7Ci0JCQlyZXQgPSBpOTE1X2VtaXRf Ym94KHJpbmcsICZjbGlwcmVjdHNbaV0sCisJCQlyZXQgPSBpOTE1X2VtaXRfYm94KHBhcmFtcy0+ cmVxdWVzdCwgJmNsaXByZWN0c1tpXSwKIAkJCQkJICAgIGFyZ3MtPkRSMSwgYXJncy0+RFI0KTsK IAkJCWlmIChyZXQpCiAJCQkJZ290byBlcnJvcjsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2xyYy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKaW5k ZXggMjQ1YTVkYS4uMGMxYThlNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfbHJjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKQEAgLTU1MCwx MCArNTUwLDkgQEAgc3RhdGljIGludCBleGVjbGlzdHNfY29udGV4dF9xdWV1ZShzdHJ1Y3QgaW50 ZWxfZW5naW5lX2NzICpyaW5nLAogCXJldHVybiAwOwogfQogCi1zdGF0aWMgaW50IGxvZ2ljYWxf cmluZ19pbnZhbGlkYXRlX2FsbF9jYWNoZXMoc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdi dWYsCi0JCQkJCSAgICAgIHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgpCitzdGF0aWMgaW50IGxv Z2ljYWxfcmluZ19pbnZhbGlkYXRlX2FsbF9jYWNoZXMoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1 ZXN0ICpyZXEpCiB7Ci0Jc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyA9IHJpbmdidWYtPnJp bmc7CisJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyA9IHJlcS0+cmluZzsKIAl1aW50MzJf dCBmbHVzaF9kb21haW5zOwogCWludCByZXQ7CiAKQEAgLTU2MSw3ICs1NjAsNyBAQCBzdGF0aWMg aW50IGxvZ2ljYWxfcmluZ19pbnZhbGlkYXRlX2FsbF9jYWNoZXMoc3RydWN0IGludGVsX3Jpbmdi dWZmZXIgKnJpbmdidWYsCiAJaWYgKHJpbmctPmdwdV9jYWNoZXNfZGlydHkpCiAJCWZsdXNoX2Rv bWFpbnMgPSBJOTE1X0dFTV9HUFVfRE9NQUlOUzsKIAotCXJldCA9IHJpbmctPmVtaXRfZmx1c2go cmluZ2J1ZiwgY3R4LAorCXJldCA9IHJpbmctPmVtaXRfZmx1c2gocmVxLT5yaW5nYnVmLCByZXEt PmN0eCwKIAkJCSAgICAgICBJOTE1X0dFTV9HUFVfRE9NQUlOUywgZmx1c2hfZG9tYWlucyk7CiAJ aWYgKHJldCkKIAkJcmV0dXJuIHJldDsKQEAgLTU5Nyw3ICs1OTYsNyBAQCBzdGF0aWMgaW50IGV4 ZWNsaXN0c19tb3ZlX3RvX2dwdShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwKIAkv KiBVbmNvbmRpdGlvbmFsbHkgaW52YWxpZGF0ZSBncHUgY2FjaGVzIGFuZCBlbnN1cmUgdGhhdCB3 ZSBkbyBmbHVzaAogCSAqIGFueSByZXNpZHVhbCB3cml0ZXMgZnJvbSB0aGUgcHJldmlvdXMgYmF0 Y2guCiAJICovCi0JcmV0dXJuIGxvZ2ljYWxfcmluZ19pbnZhbGlkYXRlX2FsbF9jYWNoZXMocmVx LT5yaW5nYnVmLCByZXEtPmN0eCk7CisJcmV0dXJuIGxvZ2ljYWxfcmluZ19pbnZhbGlkYXRlX2Fs bF9jYWNoZXMocmVxKTsKIH0KIAogLyoqCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9yaW5nYnVmZmVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVm ZmVyLmMKaW5kZXggMTc4YmY0OS4uZmM1YmM0OCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3JpbmdidWZmZXIuYwpAQCAtMjc3Niw4ICsyNzc2LDkgQEAgaW50ZWxfcmluZ19mbHVzaF9hbGxf Y2FjaGVzKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCiB9CiAKIGludAotaW50ZWxfcmlu Z19pbnZhbGlkYXRlX2FsbF9jYWNoZXMoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKK2lu dGVsX3JpbmdfaW52YWxpZGF0ZV9hbGxfY2FjaGVzKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVz dCAqcmVxKQogeworCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcgPSByZXEtPnJpbmc7CiAJ dWludDMyX3QgZmx1c2hfZG9tYWluczsKIAlpbnQgcmV0OwogCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9yaW5nYnVmZmVyLmgKaW5kZXggNTgyYjBlYy4uNDExY2Q3NiAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaApAQCAtNDE0LDcgKzQxNCw3IEBAIGJvb2wgaW50ZWxf cmluZ19zdG9wcGVkKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpOwogaW50IF9fbXVzdF9j aGVjayBpbnRlbF9yaW5nX2lkbGUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyk7CiB2b2lk IGludGVsX3JpbmdfaW5pdF9zZXFubyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLCB1MzIg c2Vxbm8pOwogaW50IGludGVsX3JpbmdfZmx1c2hfYWxsX2NhY2hlcyhzdHJ1Y3QgaW50ZWxfZW5n aW5lX2NzICpyaW5nKTsKLWludCBpbnRlbF9yaW5nX2ludmFsaWRhdGVfYWxsX2NhY2hlcyhzdHJ1 Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKTsKK2ludCBpbnRlbF9yaW5nX2ludmFsaWRhdGVfYWxs X2NhY2hlcyhzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSk7CiAKIHZvaWQgaW50ZWxf ZmluaV9waXBlX2NvbnRyb2woc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyk7CiBpbnQgaW50 ZWxfaW5pdF9waXBlX2NvbnRyb2woc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyk7Ci0tIAox LjcuOS41CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJ bnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0 cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=