From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH 42/53] drm/i915: Update ring->dispatch_execbuffer() to take a request structure Date: Thu, 19 Feb 2015 17:17:54 +0000 Message-ID: <1424366285-29232-43-git-send-email-John.C.Harrison@Intel.com> References: <1423828140-10653-1-git-send-email-John.C.Harrison@Intel.com> <1424366285-29232-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 mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id DB479720A3 for ; Thu, 19 Feb 2015 09:18:49 -0800 (PST) In-Reply-To: <1424366285-29232-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 dGhlIHZhcmlvdXMgcmluZy0+ZGlzcGF0Y2hfZXhlY2J1ZmZlcigpIGltcGxlbWVudGF0aW9ucyB0 byB0YWtlIGEKcmVxdWVzdCBpbnN0ZWFkIG9mIGEgcmluZy4KCkZvcjogVklaLTUxMTUKU2lnbmVk LW9mZi1ieTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KLS0tCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMgICB8ICAgIDQgKystLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVuZGVyX3N0YXRlLmMgfCAgICAzICstLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jICAgICAgfCAgIDE4ICsrKysr KysrKysrKy0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oICAg ICAgfCAgICAyICstCiA0IGZpbGVzIGNoYW5nZWQsIDE2IGluc2VydGlvbnMoKyksIDExIGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNi dWZmZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYwppbmRl eCBhNzljODkzLi44YjRmOGE5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbV9leGVjYnVmZmVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhl Y2J1ZmZlci5jCkBAIC0xMjY1LDE0ICsxMjY1LDE0IEBAIGk5MTVfZ2VtX3JpbmdidWZmZXJfc3Vi bWlzc2lvbihzdHJ1Y3QgaTkxNV9leGVjYnVmZmVyX3BhcmFtcyAqcGFyYW1zLAogCQkJaWYgKHJl dCkKIAkJCQlnb3RvIGVycm9yOwogCi0JCQlyZXQgPSByaW5nLT5kaXNwYXRjaF9leGVjYnVmZmVy KHJpbmcsCisJCQlyZXQgPSByaW5nLT5kaXNwYXRjaF9leGVjYnVmZmVyKHBhcmFtcy0+cmVxdWVz dCwKIAkJCQkJCQlleGVjX3N0YXJ0LCBleGVjX2xlbiwKIAkJCQkJCQlwYXJhbXMtPmRpc3BhdGNo X2ZsYWdzKTsKIAkJCWlmIChyZXQpCiAJCQkJZ290byBlcnJvcjsKIAkJfQogCX0gZWxzZSB7Ci0J CXJldCA9IHJpbmctPmRpc3BhdGNoX2V4ZWNidWZmZXIocmluZywKKwkJcmV0ID0gcmluZy0+ZGlz cGF0Y2hfZXhlY2J1ZmZlcihwYXJhbXMtPnJlcXVlc3QsCiAJCQkJCQlleGVjX3N0YXJ0LCBleGVj X2xlbiwKIAkJCQkJCXBhcmFtcy0+ZGlzcGF0Y2hfZmxhZ3MpOwogCQlpZiAocmV0KQpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVuZGVyX3N0YXRlLmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9yZW5kZXJfc3RhdGUuYwppbmRleCA4NjYyNzRjLi5j ZGYyZmVlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9yZW5kZXJf c3RhdGUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9yZW5kZXJfc3RhdGUu YwpAQCAtMTY0LDggKzE2NCw3IEBAIGludCBpOTE1X2dlbV9yZW5kZXJfc3RhdGVfaW5pdChzdHJ1 Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSkKIAlpZiAoc28ucm9kYXRhID09IE5VTEwpCiAJ CXJldHVybiAwOwogCi0JcmV0ID0gcmVxLT5yaW5nLT5kaXNwYXRjaF9leGVjYnVmZmVyKHJlcS0+ cmluZywKLQkJCQkJICAgICBzby5nZ3R0X29mZnNldCwKKwlyZXQgPSByZXEtPnJpbmctPmRpc3Bh dGNoX2V4ZWNidWZmZXIocmVxLCBzby5nZ3R0X29mZnNldCwKIAkJCQkJICAgICBzby5yb2RhdGEt PmJhdGNoX2l0ZW1zICogNCwKIAkJCQkJICAgICBJOTE1X0RJU1BBVENIX1NFQ1VSRSk7CiAJaWYg KHJldCkKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIu YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwppbmRleCA5OWYwZGQx Li44NzYxMmYxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVm ZmVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCkBAIC0x Njk0LDEwICsxNjk0LDExIEBAIGdlbjhfcmluZ19wdXRfaXJxKHN0cnVjdCBpbnRlbF9lbmdpbmVf Y3MgKnJpbmcpCiB9CiAKIHN0YXRpYyBpbnQKLWk5NjVfZGlzcGF0Y2hfZXhlY2J1ZmZlcihzdHJ1 Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAoraTk2NV9kaXNwYXRjaF9leGVjYnVmZmVyKHN0cnVj dCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLAogCQkJIHU2NCBvZmZzZXQsIHUzMiBsZW5ndGgs CiAJCQkgdW5zaWduZWQgZGlzcGF0Y2hfZmxhZ3MpCiB7CisJc3RydWN0IGludGVsX2VuZ2luZV9j cyAqcmluZyA9IHJlcS0+cmluZzsKIAlpbnQgcmV0OwogCiAJcmV0ID0gaW50ZWxfcmluZ19iZWdp bihyaW5nLCAyKTsKQEAgLTE3MjAsMTAgKzE3MjEsMTEgQEAgaTk2NV9kaXNwYXRjaF9leGVjYnVm ZmVyKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCiAjZGVmaW5lIEk4MzBfVExCX0VOVFJJ RVMgKDIpCiAjZGVmaW5lIEk4MzBfV0FfU0laRSBtYXgoSTgzMF9UTEJfRU5UUklFUyo0MDk2LCBJ ODMwX0JBVENIX0xJTUlUKQogc3RhdGljIGludAotaTgzMF9kaXNwYXRjaF9leGVjYnVmZmVyKHN0 cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCitpODMwX2Rpc3BhdGNoX2V4ZWNidWZmZXIoc3Ry dWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsCiAJCQkgdTY0IG9mZnNldCwgdTMyIGxlbiwK IAkJCSB1bnNpZ25lZCBkaXNwYXRjaF9mbGFncykKIHsKKwlzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz ICpyaW5nID0gcmVxLT5yaW5nOwogCXUzMiBjc19vZmZzZXQgPSByaW5nLT5zY3JhdGNoLmd0dF9v ZmZzZXQ7CiAJaW50IHJldDsKIApAQCAtMTc4MiwxMCArMTc4NCwxMSBAQCBpODMwX2Rpc3BhdGNo X2V4ZWNidWZmZXIoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKIH0KIAogc3RhdGljIGlu dAotaTkxNV9kaXNwYXRjaF9leGVjYnVmZmVyKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcs CitpOTE1X2Rpc3BhdGNoX2V4ZWNidWZmZXIoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpy ZXEsCiAJCQkgdTY0IG9mZnNldCwgdTMyIGxlbiwKIAkJCSB1bnNpZ25lZCBkaXNwYXRjaF9mbGFn cykKIHsKKwlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nID0gcmVxLT5yaW5nOwogCWludCBy ZXQ7CiAKIAlyZXQgPSBpbnRlbF9yaW5nX2JlZ2luKHJpbmcsIDIpOwpAQCAtMjM3MCwxMCArMjM3 MywxMSBAQCBzdGF0aWMgaW50IGdlbjZfYnNkX3JpbmdfZmx1c2goc3RydWN0IGRybV9pOTE1X2dl bV9yZXF1ZXN0ICpyZXEsCiB9CiAKIHN0YXRpYyBpbnQKLWdlbjhfcmluZ19kaXNwYXRjaF9leGVj YnVmZmVyKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCitnZW44X3JpbmdfZGlzcGF0Y2hf ZXhlY2J1ZmZlcihzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwKIAkJCSAgICAgIHU2 NCBvZmZzZXQsIHUzMiBsZW4sCiAJCQkgICAgICB1bnNpZ25lZCBkaXNwYXRjaF9mbGFncykKIHsK KwlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nID0gcmVxLT5yaW5nOwogCWJvb2wgcHBndHQg PSBVU0VTX1BQR1RUKHJpbmctPmRldikgJiYKIAkJCSEoZGlzcGF0Y2hfZmxhZ3MgJiBJOTE1X0RJ U1BBVENIX1NFQ1VSRSk7CiAJaW50IHJldDsKQEAgLTIzOTMsMTAgKzIzOTcsMTEgQEAgZ2VuOF9y aW5nX2Rpc3BhdGNoX2V4ZWNidWZmZXIoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKIH0K IAogc3RhdGljIGludAotaHN3X3JpbmdfZGlzcGF0Y2hfZXhlY2J1ZmZlcihzdHJ1Y3QgaW50ZWxf ZW5naW5lX2NzICpyaW5nLAoraHN3X3JpbmdfZGlzcGF0Y2hfZXhlY2J1ZmZlcihzdHJ1Y3QgZHJt X2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwKIAkJCSAgICAgdTY0IG9mZnNldCwgdTMyIGxlbiwKIAkJ CSAgICAgdW5zaWduZWQgZGlzcGF0Y2hfZmxhZ3MpCiB7CisJc3RydWN0IGludGVsX2VuZ2luZV9j cyAqcmluZyA9IHJlcS0+cmluZzsKIAlpbnQgcmV0OwogCiAJcmV0ID0gaW50ZWxfcmluZ19iZWdp bihyaW5nLCAyKTsKQEAgLTI0MTUsMTAgKzI0MjAsMTEgQEAgaHN3X3JpbmdfZGlzcGF0Y2hfZXhl Y2J1ZmZlcihzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAogfQogCiBzdGF0aWMgaW50Ci1n ZW42X3JpbmdfZGlzcGF0Y2hfZXhlY2J1ZmZlcihzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5n LAorZ2VuNl9yaW5nX2Rpc3BhdGNoX2V4ZWNidWZmZXIoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1 ZXN0ICpyZXEsCiAJCQkgICAgICB1NjQgb2Zmc2V0LCB1MzIgbGVuLAogCQkJICAgICAgdW5zaWdu ZWQgZGlzcGF0Y2hfZmxhZ3MpCiB7CisJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyA9IHJl cS0+cmluZzsKIAlpbnQgcmV0OwogCiAJcmV0ID0gaW50ZWxfcmluZ19iZWdpbihyaW5nLCAyKTsK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaCBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaAppbmRleCBkODMwMGYyLi4wYjAz YjNhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCkBAIC0xNjEsNyAr MTYxLDcgQEAgc3RydWN0ICBpbnRlbF9lbmdpbmVfY3MgewogCQkJCSAgICAgYm9vbCBsYXp5X2Nv aGVyZW5jeSk7CiAJdm9pZAkJKCpzZXRfc2Vxbm8pKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJp bmcsCiAJCQkJICAgICB1MzIgc2Vxbm8pOwotCWludAkJKCpkaXNwYXRjaF9leGVjYnVmZmVyKShz dHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAorCWludAkJKCpkaXNwYXRjaF9leGVjYnVmZmVy KShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwKIAkJCQkJICAgICAgIHU2NCBvZmZz ZXQsIHUzMiBsZW5ndGgsCiAJCQkJCSAgICAgICB1bnNpZ25lZCBkaXNwYXRjaF9mbGFncyk7CiAj ZGVmaW5lIEk5MTVfRElTUEFUQ0hfU0VDVVJFIDB4MQotLSAKMS43LjkuNQoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlz dApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3Rv cC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK