From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH 32/55] drm/i915: Update a bunch of execbuffer helpers to take request structures Date: Fri, 29 May 2015 17:43:53 +0100 Message-ID: <1432917856-12261-33-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 2D45A72147 for ; Fri, 29 May 2015 09:44:53 -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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KClVwZGF0ZWQg Kl9yaW5nX2ludmFsaWRhdGVfYWxsX2NhY2hlcygpLCBpOTE1X3Jlc2V0X2dlbjdfc29sX29mZnNl dHMoKSBhbmQKaTkxNV9lbWl0X2JveCgpIHRvIHRha2UgcmVxdWVzdCBzdHJ1Y3R1cmVzIGluc3Rl YWQgb2YgcmluZyBvciByaW5nYnVmL2NvbnRleHQKcGFpcnMuCgpGb3I6IFZJWi01MTE1ClNpZ25l ZC1vZmYtYnk6IEpvaG4gSGFycmlzb24gPEpvaG4uQy5IYXJyaXNvbkBJbnRlbC5jb20+ClJldmll d2VkLWJ5OiBUb21hcyBFbGYgPHRvbWFzLmVsZkBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jIHwgICAxMiArKysrKysrLS0tLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jICAgICAgICAgICB8ICAgIDkgKysrKy0tLS0tCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMgICAgfCAgICAzICsrLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oICAgIHwgICAgMiArLQogNCBmaWxl cyBjaGFuZ2VkLCAxNCBpbnNlcnRpb25zKCspLCAxMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMKaW5kZXggYTI0ZGU5Yy4uZjJmM2Y5OSAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYwpAQCAtOTE5LDcg KzkxOSw3IEBAIGk5MTVfZ2VtX2V4ZWNidWZmZXJfbW92ZV90b19ncHUoc3RydWN0IGRybV9pOTE1 X2dlbV9yZXF1ZXN0ICpyZXEsCiAJLyogVW5jb25kaXRpb25hbGx5IGludmFsaWRhdGUgZ3B1IGNh Y2hlcyBhbmQgZW5zdXJlIHRoYXQgd2UgZG8gZmx1c2gKIAkgKiBhbnkgcmVzaWR1YWwgd3JpdGVz IGZyb20gdGhlIHByZXZpb3VzIGJhdGNoLgogCSAqLwotCXJldHVybiBpbnRlbF9yaW5nX2ludmFs aWRhdGVfYWxsX2NhY2hlcyhyZXEtPnJpbmcpOworCXJldHVybiBpbnRlbF9yaW5nX2ludmFsaWRh dGVfYWxsX2NhY2hlcyhyZXEpOwogfQogCiBzdGF0aWMgYm9vbApAQCAtMTA2Myw4ICsxMDYzLDkg QEAgaTkxNV9nZW1fZXhlY2J1ZmZlcl9yZXRpcmVfY29tbWFuZHMoc3RydWN0IGk5MTVfZXhlY2J1 ZmZlcl9wYXJhbXMgKnBhcmFtcykKIAogc3RhdGljIGludAogaTkxNV9yZXNldF9nZW43X3NvbF9v ZmZzZXRzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCi0JCQkgICAgc3RydWN0IGludGVsX2VuZ2lu ZV9jcyAqcmluZykKKwkJCSAgICBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSkKIHsK KwlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nID0gcmVxLT5yaW5nOwogCXN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJaW50IHJldCwgaTsK IApAQCAtMTA4OSwxMCArMTA5MCwxMSBAQCBpOTE1X3Jlc2V0X2dlbjdfc29sX29mZnNldHMoc3Ry dWN0IGRybV9kZXZpY2UgKmRldiwKIH0KIAogc3RhdGljIGludAotaTkxNV9lbWl0X2JveChzdHJ1 Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAoraTkxNV9lbWl0X2JveChzdHJ1Y3QgZHJtX2k5MTVf Z2VtX3JlcXVlc3QgKnJlcSwKIAkgICAgICBzdHJ1Y3QgZHJtX2NsaXBfcmVjdCAqYm94LAogCSAg ICAgIGludCBEUjEsIGludCBEUjQpCiB7CisJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyA9 IHJlcS0+cmluZzsKIAlpbnQgcmV0OwogCiAJaWYgKGJveC0+eTIgPD0gYm94LT55MSB8fCBib3gt PngyIDw9IGJveC0+eDEgfHwKQEAgLTEzMDIsNyArMTMwNCw3IEBAIGk5MTVfZ2VtX3JpbmdidWZm ZXJfc3VibWlzc2lvbihzdHJ1Y3QgaTkxNV9leGVjYnVmZmVyX3BhcmFtcyAqcGFyYW1zLAogCX0K IAogCWlmIChhcmdzLT5mbGFncyAmIEk5MTVfRVhFQ19HRU43X1NPTF9SRVNFVCkgewotCQlyZXQg PSBpOTE1X3Jlc2V0X2dlbjdfc29sX29mZnNldHMoZGV2LCByaW5nKTsKKwkJcmV0ID0gaTkxNV9y ZXNldF9nZW43X3NvbF9vZmZzZXRzKGRldiwgcGFyYW1zLT5yZXF1ZXN0KTsKIAkJaWYgKHJldCkK IAkJCWdvdG8gZXJyb3I7CiAJfQpAQCAtMTMxMyw3ICsxMzE1LDcgQEAgaTkxNV9nZW1fcmluZ2J1 ZmZlcl9zdWJtaXNzaW9uKHN0cnVjdCBpOTE1X2V4ZWNidWZmZXJfcGFyYW1zICpwYXJhbXMsCiAK IAlpZiAoY2xpcHJlY3RzKSB7CiAJCWZvciAoaSA9IDA7IGkgPCBhcmdzLT5udW1fY2xpcHJlY3Rz OyBpKyspIHsKLQkJCXJldCA9IGk5MTVfZW1pdF9ib3gocmluZywgJmNsaXByZWN0c1tpXSwKKwkJ CXJldCA9IGk5MTVfZW1pdF9ib3gocGFyYW1zLT5yZXF1ZXN0LCAmY2xpcHJlY3RzW2ldLAogCQkJ CQkgICAgYXJncy0+RFIxLCBhcmdzLT5EUjQpOwogCQkJaWYgKHJldCkKIAkJCQlnb3RvIGVycm9y OwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwppbmRleCA0ODExODI2Li45ZGY5YTBiIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9scmMuYwpAQCAtNjA1LDEwICs2MDUsOSBAQCBzdGF0aWMgaW50IGV4ZWNs aXN0c19jb250ZXh0X3F1ZXVlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCiAJcmV0dXJu IDA7CiB9CiAKLXN0YXRpYyBpbnQgbG9naWNhbF9yaW5nX2ludmFsaWRhdGVfYWxsX2NhY2hlcyhz dHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiwKLQkJCQkJICAgICAgc3RydWN0IGludGVs X2NvbnRleHQgKmN0eCkKK3N0YXRpYyBpbnQgbG9naWNhbF9yaW5nX2ludmFsaWRhdGVfYWxsX2Nh Y2hlcyhzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSkKIHsKLQlzdHJ1Y3QgaW50ZWxf ZW5naW5lX2NzICpyaW5nID0gcmluZ2J1Zi0+cmluZzsKKwlzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz ICpyaW5nID0gcmVxLT5yaW5nOwogCXVpbnQzMl90IGZsdXNoX2RvbWFpbnM7CiAJaW50IHJldDsK IApAQCAtNjE2LDcgKzYxNSw3IEBAIHN0YXRpYyBpbnQgbG9naWNhbF9yaW5nX2ludmFsaWRhdGVf YWxsX2NhY2hlcyhzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiwKIAlpZiAocmluZy0+ Z3B1X2NhY2hlc19kaXJ0eSkKIAkJZmx1c2hfZG9tYWlucyA9IEk5MTVfR0VNX0dQVV9ET01BSU5T OwogCi0JcmV0ID0gcmluZy0+ZW1pdF9mbHVzaChyaW5nYnVmLCBjdHgsCisJcmV0ID0gcmluZy0+ ZW1pdF9mbHVzaChyZXEtPnJpbmdidWYsIHJlcS0+Y3R4LAogCQkJICAgICAgIEk5MTVfR0VNX0dQ VV9ET01BSU5TLCBmbHVzaF9kb21haW5zKTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwpAQCAt NjU1LDcgKzY1NCw3IEBAIHN0YXRpYyBpbnQgZXhlY2xpc3RzX21vdmVfdG9fZ3B1KHN0cnVjdCBk cm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLAogCS8qIFVuY29uZGl0aW9uYWxseSBpbnZhbGlkYXRl IGdwdSBjYWNoZXMgYW5kIGVuc3VyZSB0aGF0IHdlIGRvIGZsdXNoCiAJICogYW55IHJlc2lkdWFs IHdyaXRlcyBmcm9tIHRoZSBwcmV2aW91cyBiYXRjaC4KIAkgKi8KLQlyZXR1cm4gbG9naWNhbF9y aW5nX2ludmFsaWRhdGVfYWxsX2NhY2hlcyhyZXEtPnJpbmdidWYsIHJlcS0+Y3R4KTsKKwlyZXR1 cm4gbG9naWNhbF9yaW5nX2ludmFsaWRhdGVfYWxsX2NhY2hlcyhyZXEpOwogfQogCiBpbnQgaW50 ZWxfbG9naWNhbF9yaW5nX2FsbG9jX3JlcXVlc3RfZXh0cmFzKHN0cnVjdCBkcm1faTkxNV9nZW1f cmVxdWVzdCAqcmVxdWVzdCkKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3JpbmdidWZmZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwpp bmRleCA5Nzg5ODRlLi4yZWNkYzcwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9yaW5nYnVmZmVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1 ZmZlci5jCkBAIC0yODk3LDggKzI4OTcsOSBAQCBpbnRlbF9yaW5nX2ZsdXNoX2FsbF9jYWNoZXMo c3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKIH0KIAogaW50Ci1pbnRlbF9yaW5nX2ludmFs aWRhdGVfYWxsX2NhY2hlcyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQoraW50ZWxfcmlu Z19pbnZhbGlkYXRlX2FsbF9jYWNoZXMoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEp CiB7CisJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyA9IHJlcS0+cmluZzsKIAl1aW50MzJf dCBmbHVzaF9kb21haW5zOwogCWludCByZXQ7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Jp bmdidWZmZXIuaAppbmRleCAxNWM1ZDgzLi5lZjVlYzA0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfcmluZ2J1ZmZlci5oCkBAIC00MjQsNyArNDI0LDcgQEAgYm9vbCBpbnRlbF9yaW5nX3N0 b3BwZWQoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyk7CiBpbnQgX19tdXN0X2NoZWNrIGlu dGVsX3JpbmdfaWRsZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKTsKIHZvaWQgaW50ZWxf cmluZ19pbml0X3NlcW5vKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsIHUzMiBzZXFubyk7 CiBpbnQgaW50ZWxfcmluZ19mbHVzaF9hbGxfY2FjaGVzKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg KnJpbmcpOwotaW50IGludGVsX3JpbmdfaW52YWxpZGF0ZV9hbGxfY2FjaGVzKHN0cnVjdCBpbnRl bF9lbmdpbmVfY3MgKnJpbmcpOworaW50IGludGVsX3JpbmdfaW52YWxpZGF0ZV9hbGxfY2FjaGVz KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxKTsKIAogdm9pZCBpbnRlbF9maW5pX3Bp cGVfY29udHJvbChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKTsKIGludCBpbnRlbF9pbml0 X3BpcGVfY29udHJvbChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKTsKLS0gCjEuNy45LjUK Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdm eCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==