From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ben Widawsky Subject: [PATCH 2/6] drm/i915: Pass eb_vmas to execbuffer implementations Date: Mon, 9 Feb 2015 13:54:15 -0800 Message-ID: <1423518859-6199-3-git-send-email-benjamin.widawsky@intel.com> References: <1423518859-6199-1-git-send-email-benjamin.widawsky@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 1EFA36E1B6 for ; Mon, 9 Feb 2015 13:54:27 -0800 (PST) In-Reply-To: <1423518859-6199-1-git-send-email-benjamin.widawsky@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 Cc: Ben Widawsky , Ben Widawsky List-Id: intel-gfx@lists.freedesktop.org VGhlIHJvbGUgb2YgZWJfdm1hcyBjb250aW51ZXMgdG8gZ3JvdyBoZXJlIGFzIGl0IGJlY29tZXMg dGhlIHByb3BlcgplbmNhcHN1bGF0aW9uIGZvciB0aGUgZGF0YSBwYXNzZWQgdG8gdGhlIHZhcmlv dXMgZXhlY3V0aW9uIGZ1bmN0aW9uLgoKTmV4dCBwYXRjaCBtYWtlcyB1c2Ugb2YgaXQuLi4gVGhp cyBwYXRjaCB3YXMgaW5pdGlhbGx5IHBhcnQgb2YgdGhlIG5leHQgcGF0Y2gsCmJ1dCBnb3Qgc3Bs aXQgb3V0IGFmdGVyIEkgaGFkIGZvdW5kIGEgYnVnIHRoYXQgY29udmluY2VkIG1lIHRoZSB0d28g c2hvdWxkIGJlCnNlcGFyYXRlLgoKU2lnbmVkLW9mZi1ieTogQmVuIFdpZGF3c2t5IDxiZW5AYndp ZGF3c2submV0PgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggICAgICAgICAg ICB8IDEzICsrKysrKysrKysrLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNi dWZmZXIuYyB8IDI2ICsrKysrKysrKystLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9scmMuYyAgICAgICAgICAgfCAgOCArKysrKy0tLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfbHJjLmggICAgICAgICAgIHwgIDMgKystCiA0IGZpbGVzIGNoYW5nZWQsIDI4 IGluc2VydGlvbnMoKyksIDIyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmlu ZGV4IDQxNzliOTAuLjkwZmY2YWEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtMTY0MSw2 ICsxNjQxLDE1IEBAIHN0cnVjdCBpOTE1X3dvcmthcm91bmRzIHsKIAl1MzIgY291bnQ7CiB9Owog CitzdHJ1Y3QgZWJfdm1hcyB7CisJc3RydWN0IGxpc3RfaGVhZCB2bWFzOworCWludCBhbmQ7CisJ dW5pb24geworCQlzdHJ1Y3QgaTkxNV92bWEgKmx1dFswXTsKKwkJc3RydWN0IGhsaXN0X2hlYWQg YnVja2V0c1swXTsKKwl9OworfTsKKwogc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgewogCXN0cnVj dCBkcm1fZGV2aWNlICpkZXY7CiAJc3RydWN0IGttZW1fY2FjaGUgKnNsYWI7CkBAIC0xODk2LDcg KzE5MDUsNyBAQCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSB7CiAJCQkJICBzdHJ1Y3QgaW50ZWxf ZW5naW5lX2NzICpyaW5nLAogCQkJCSAgc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCwKIAkJCQkg IHN0cnVjdCBkcm1faTkxNV9nZW1fZXhlY2J1ZmZlcjIgKmFyZ3MsCi0JCQkJICBzdHJ1Y3QgbGlz dF9oZWFkICp2bWFzLAorCQkJCSAgc3RydWN0IGViX3ZtYXMgKmViLAogCQkJCSAgc3RydWN0IGRy bV9pOTE1X2dlbV9vYmplY3QgKmJhdGNoX29iaiwKIAkJCQkgIHU2NCBleGVjX3N0YXJ0LCB1MzIg ZmxhZ3MpOwogCQlpbnQgKCppbml0X3JpbmdzKShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKQEAg LTI2MjYsNyArMjYzNSw3IEBAIGludCBpOTE1X2dlbV9yaW5nYnVmZmVyX3N1Ym1pc3Npb24oc3Ry dWN0IGRybV9kZXZpY2UgKmRldiwKIAkJCQkgICBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5n LAogCQkJCSAgIHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgsCiAJCQkJICAgc3RydWN0IGRybV9p OTE1X2dlbV9leGVjYnVmZmVyMiAqYXJncywKLQkJCQkgICBzdHJ1Y3QgbGlzdF9oZWFkICp2bWFz LAorCQkJCSAgIHN0cnVjdCBlYl92bWFzICplYiwKIAkJCQkgICBzdHJ1Y3QgZHJtX2k5MTVfZ2Vt X29iamVjdCAqYmF0Y2hfb2JqLAogCQkJCSAgIHU2NCBleGVjX3N0YXJ0LCB1MzIgZmxhZ3MpOwog aW50IGk5MTVfZ2VtX2V4ZWNidWZmZXIoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0 YSwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIu YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYwppbmRleCBiNzcz MzY4Li4xM2VkMTNlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9l eGVjYnVmZmVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZl ci5jCkBAIC00MSwxNSArNDEsNiBAQAogCiAjZGVmaW5lIEJBVENIX09GRlNFVF9CSUFTICgyNTYq MTAyNCkKIAotc3RydWN0IGViX3ZtYXMgewotCXN0cnVjdCBsaXN0X2hlYWQgdm1hczsKLQlpbnQg YW5kOwotCXVuaW9uIHsKLQkJc3RydWN0IGk5MTVfdm1hICpsdXRbMF07Ci0JCXN0cnVjdCBobGlz dF9oZWFkIGJ1Y2tldHNbMF07Ci0JfTsKLX07Ci0KIHN0YXRpYyBzdHJ1Y3QgZWJfdm1hcyAqCiBl Yl9jcmVhdGUoc3RydWN0IGRybV9pOTE1X2dlbV9leGVjYnVmZmVyMiAqYXJncykKIHsKQEAgLTYx NywxMCArNjA4LDExIEBAIGViX3ZtYV9taXNwbGFjZWQoc3RydWN0IGk5MTVfdm1hICp2bWEpCiAK IHN0YXRpYyBpbnQKIGk5MTVfZ2VtX2V4ZWNidWZmZXJfcmVzZXJ2ZShzdHJ1Y3QgaW50ZWxfZW5n aW5lX2NzICpyaW5nLAotCQkJICAgIHN0cnVjdCBsaXN0X2hlYWQgKnZtYXMsCisJCQkgICAgc3Ry dWN0IGViX3ZtYXMgKmViLAogCQkJICAgIGJvb2wgKm5lZWRfcmVsb2NzKQogewogCXN0cnVjdCBk cm1faTkxNV9nZW1fb2JqZWN0ICpvYmo7CisJc3RydWN0IGxpc3RfaGVhZCAqdm1hcyA9ICZlYi0+ dm1hczsKIAlzdHJ1Y3QgaTkxNV92bWEgKnZtYTsKIAlzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNl ICp2bTsKIAlzdHJ1Y3QgbGlzdF9oZWFkIG9yZGVyZWRfdm1hczsKQEAgLTgwMyw3ICs3OTUsNyBA QCBpOTE1X2dlbV9leGVjYnVmZmVyX3JlbG9jYXRlX3Nsb3coc3RydWN0IGRybV9kZXZpY2UgKmRl diwKIAkJZ290byBlcnI7CiAKIAluZWVkX3JlbG9jcyA9IChhcmdzLT5mbGFncyAmIEk5MTVfRVhF Q19OT19SRUxPQykgPT0gMDsKLQlyZXQgPSBpOTE1X2dlbV9leGVjYnVmZmVyX3Jlc2VydmUocmlu ZywgJmViLT52bWFzLCAmbmVlZF9yZWxvY3MpOworCXJldCA9IGk5MTVfZ2VtX2V4ZWNidWZmZXJf cmVzZXJ2ZShyaW5nLCBlYiwgJm5lZWRfcmVsb2NzKTsKIAlpZiAocmV0KQogCQlnb3RvIGVycjsK IApAQCAtODI5LDggKzgyMSw5IEBAIGVycjoKIAogc3RhdGljIGludAogaTkxNV9nZW1fZXhlY2J1 ZmZlcl9tb3ZlX3RvX2dwdShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAotCQkJCXN0cnVj dCBsaXN0X2hlYWQgKnZtYXMpCisJCQkJc3RydWN0IGViX3ZtYXMgKmViKQogeworCXN0cnVjdCBs aXN0X2hlYWQgKnZtYXMgPSAmZWItPnZtYXM7CiAJc3RydWN0IGk5MTVfdm1hICp2bWE7CiAJdWlu dDMyX3QgZmx1c2hfZG9tYWlucyA9IDA7CiAJYm9vbCBmbHVzaF9jaGlwc2V0ID0gZmFsc2U7CkBA IC0xMTM2LDEyICsxMTI5LDEzIEBAIGk5MTVfZ2VtX3JpbmdidWZmZXJfc3VibWlzc2lvbihzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUsCiAJCQkgICAgICAgc3Ry dWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKIAkJCSAgICAgICBzdHJ1Y3QgaW50ZWxfY29udGV4 dCAqY3R4LAogCQkJICAgICAgIHN0cnVjdCBkcm1faTkxNV9nZW1fZXhlY2J1ZmZlcjIgKmFyZ3Ms Ci0JCQkgICAgICAgc3RydWN0IGxpc3RfaGVhZCAqdm1hcywKKwkJCSAgICAgICBzdHJ1Y3QgZWJf dm1hcyAqZWIsCiAJCQkgICAgICAgc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKmJhdGNoX29i aiwKIAkJCSAgICAgICB1NjQgZXhlY19zdGFydCwgdTMyIGZsYWdzKQogewogCXN0cnVjdCBkcm1f Y2xpcF9yZWN0ICpjbGlwcmVjdHMgPSBOVUxMOwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CisJc3RydWN0IGxpc3RfaGVhZCAqdm1hcyA9ICZl Yi0+dm1hczsKIAl1NjQgZXhlY19sZW47CiAJaW50IGluc3RwX21vZGU7CiAJdTMyIGluc3RwX21h c2s7CkBAIC0xMTkwLDcgKzExODQsNyBAQCBpOTE1X2dlbV9yaW5nYnVmZmVyX3N1Ym1pc3Npb24o c3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGRybV9maWxlICpmaWxlLAogCQl9CiAJfQog Ci0JcmV0ID0gaTkxNV9nZW1fZXhlY2J1ZmZlcl9tb3ZlX3RvX2dwdShyaW5nLCB2bWFzKTsKKwly ZXQgPSBpOTE1X2dlbV9leGVjYnVmZmVyX21vdmVfdG9fZ3B1KHJpbmcsIGViKTsKIAlpZiAocmV0 KQogCQlnb3RvIGVycm9yOwogCkBAIC0xNDYzLDcgKzE0NTcsNyBAQCBpOTE1X2dlbV9kb19leGVj YnVmZmVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCiAKIAkvKiBNb3ZlIHRo ZSBvYmplY3RzIGVuLW1hc3NlIGludG8gdGhlIEdUVCwgZXZpY3RpbmcgaWYgbmVjZXNzYXJ5LiAq LwogCW5lZWRfcmVsb2NzID0gKGFyZ3MtPmZsYWdzICYgSTkxNV9FWEVDX05PX1JFTE9DKSA9PSAw OwotCXJldCA9IGk5MTVfZ2VtX2V4ZWNidWZmZXJfcmVzZXJ2ZShyaW5nLCAmZWItPnZtYXMsICZu ZWVkX3JlbG9jcyk7CisJcmV0ID0gaTkxNV9nZW1fZXhlY2J1ZmZlcl9yZXNlcnZlKHJpbmcsIGVi LCAmbmVlZF9yZWxvY3MpOwogCWlmIChyZXQpCiAJCWdvdG8gZXJyOwogCkBAIC0xNTI3LDcgKzE1 MjEsNyBAQCBpOTE1X2dlbV9kb19leGVjYnVmZmVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZv aWQgKmRhdGEsCiAJCWV4ZWNfc3RhcnQgKz0gaTkxNV9nZW1fb2JqX29mZnNldChiYXRjaF9vYmos IHZtKTsKIAogCXJldCA9IGRldl9wcml2LT5ndC5kb19leGVjYnVmKGRldiwgZmlsZSwgcmluZywg Y3R4LCBhcmdzLAotCQkJCSAgICAgICZlYi0+dm1hcywgYmF0Y2hfb2JqLCBleGVjX3N0YXJ0LCBm bGFncyk7CisJCQkJICAgICAgZWIsIGJhdGNoX29iaiwgZXhlY19zdGFydCwgZmxhZ3MpOwogCiAJ LyoKIAkgKiBGSVhNRTogV2UgY3J1Y2lhbGx5IHJlbHkgdXBvbiB0aGUgYWN0aXZlIHRyYWNraW5n IGZvciB0aGUgKHBwZ3R0KQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf bHJjLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwppbmRleCBlNzI3MjE3Li4w Mzc0MWY5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwpAQCAtNTcxLDkgKzU3MSwxMCBAQCBz dGF0aWMgaW50IGxvZ2ljYWxfcmluZ19pbnZhbGlkYXRlX2FsbF9jYWNoZXMoc3RydWN0IGludGVs X3JpbmdidWZmZXIgKnJpbmdidWYsCiAKIHN0YXRpYyBpbnQgZXhlY2xpc3RzX21vdmVfdG9fZ3B1 KHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmLAogCQkJCSBzdHJ1Y3QgaW50ZWxfY29u dGV4dCAqY3R4LAotCQkJCSBzdHJ1Y3QgbGlzdF9oZWFkICp2bWFzKQorCQkJCSBzdHJ1Y3QgZWJf dm1hcyAqZWIpCiB7CiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyA9IHJpbmdidWYtPnJp bmc7CisJc3RydWN0IGxpc3RfaGVhZCAqdm1hcyA9ICZlYi0+dm1hczsKIAlzdHJ1Y3QgaTkxNV92 bWEgKnZtYTsKIAl1aW50MzJfdCBmbHVzaF9kb21haW5zID0gMDsKIAlpbnQgcmV0OwpAQCAtNjIx LDEyICs2MjIsMTMgQEAgaW50IGludGVsX2V4ZWNsaXN0c19zdWJtaXNzaW9uKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYsIHN0cnVjdCBkcm1fZmlsZSAqZmlsZSwKIAkJCSAgICAgICBzdHJ1Y3QgaW50 ZWxfZW5naW5lX2NzICpyaW5nLAogCQkJICAgICAgIHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgs CiAJCQkgICAgICAgc3RydWN0IGRybV9pOTE1X2dlbV9leGVjYnVmZmVyMiAqYXJncywKLQkJCSAg ICAgICBzdHJ1Y3QgbGlzdF9oZWFkICp2bWFzLAorCQkJICAgICAgIHN0cnVjdCBlYl92bWFzICpl YiwKIAkJCSAgICAgICBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqYmF0Y2hfb2JqLAogCQkJ ICAgICAgIHU2NCBleGVjX3N0YXJ0LCB1MzIgZmxhZ3MpCiB7CiAJc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3QgaW50ZWxfcmluZ2J1 ZmZlciAqcmluZ2J1ZiA9IGN0eC0+ZW5naW5lW3JpbmctPmlkXS5yaW5nYnVmOworCXN0cnVjdCBs aXN0X2hlYWQgKnZtYXMgPSAmZWItPnZtYXM7CiAJaW50IGluc3RwX21vZGU7CiAJdTMyIGluc3Rw X21hc2s7CiAJaW50IHJldDsKQEAgLTY3Nyw3ICs2NzksNyBAQCBpbnQgaW50ZWxfZXhlY2xpc3Rz X3N1Ym1pc3Npb24oc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGRybV9maWxlICpmaWxl LAogCQlyZXR1cm4gLUVJTlZBTDsKIAl9CiAKLQlyZXQgPSBleGVjbGlzdHNfbW92ZV90b19ncHUo cmluZ2J1ZiwgY3R4LCB2bWFzKTsKKwlyZXQgPSBleGVjbGlzdHNfbW92ZV90b19ncHUocmluZ2J1 ZiwgY3R4LCBlYik7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIApkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9scmMuaAppbmRleCA2ZjJkN2RhLi42NjEwODBiYyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfbHJjLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJj LmgKQEAgLTgwLDExICs4MCwxMiBAQCB2b2lkIGludGVsX2xyX2NvbnRleHRfdW5waW4oc3RydWN0 IGludGVsX2VuZ2luZV9jcyAqcmluZywKIAogLyogRXhlY2xpc3RzICovCiBpbnQgaW50ZWxfc2Fu aXRpemVfZW5hYmxlX2V4ZWNsaXN0cyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBpbnQgZW5hYmxl X2V4ZWNsaXN0cyk7CitzdHJ1Y3QgZWJfdm1hczsKIGludCBpbnRlbF9leGVjbGlzdHNfc3VibWlz c2lvbihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUsCiAJCQkg ICAgICAgc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKIAkJCSAgICAgICBzdHJ1Y3QgaW50 ZWxfY29udGV4dCAqY3R4LAogCQkJICAgICAgIHN0cnVjdCBkcm1faTkxNV9nZW1fZXhlY2J1ZmZl cjIgKmFyZ3MsCi0JCQkgICAgICAgc3RydWN0IGxpc3RfaGVhZCAqdm1hcywKKwkJCSAgICAgICBz dHJ1Y3QgZWJfdm1hcyAqZWIsCiAJCQkgICAgICAgc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3Qg KmJhdGNoX29iaiwKIAkJCSAgICAgICB1NjQgZXhlY19zdGFydCwgdTMyIGZsYWdzKTsKIHUzMiBp bnRlbF9leGVjbGlzdHNfY3R4X2lkKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpjdHhfb2Jq KTsKLS0gCjIuMy4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5v cmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdm eAo=