From: John.C.Harrison@Intel.com Subject: [PATCH v6 02/34] drm/i915: Prelude to splitting i915_gem_do_execbuffer in two Date: Wed, 20 Apr 2016 18:13:20 +0100 Message-ID: <1461172435-4256-3-git-send-email-John.C.Harrison@Intel.com> References: <1461172435-4256-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 mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id A43706EA80 for ; Wed, 20 Apr 2016 17:13:59 +0000 (UTC) In-Reply-To: <1461172435-4256-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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KClRoZSBzY2hl ZHVsZXIgZGVjb3VwbGVzIHRoZSBzdWJtaXNzaW9uIG9mIGJhdGNoIGJ1ZmZlcnMgdG8gdGhlIGRy aXZlcgp3aXRoIHRoZWlyIHN1Ym1pc3Npb24gdG8gdGhlIGhhcmR3YXJlLiBUaGlzIGJhc2ljYWxs eSBtZWFucyBzcGxpdHRpbmcKdGhlIGV4ZWNidWZmZXIoKSBmdW5jdGlvbiBpbiBoYWxmLiBUaGlz IGNoYW5nZSByZWFycmFuZ2VzIHNvbWUgY29kZQpyZWFkeSBmb3IgdGhlIHNwbGl0IHRvIG9jY3Vy LgoKdjU6IERyb3BwZWQgcnVudGltZSBQTSBjYWxscyBhcyB0aGV5IGNvbmZsaWN0IHdpdGggdGhl IG11dGV4IGxvY2suCkluc3RlYWQgb2YgYmVpbmcgZG9uZSBhdCB0aGUgbG93ZXN0IHN1Ym1pc3Np b24gbGV2ZWwsIHRoZXkgYXJlIG5vdwpsZWZ0IHJpZ2h0IGF0IHRoZSB0b3AgZHJpdmVyIGVudHJ5 IGxldmVsLiBbZmVlZGJhY2sgZnJvbSBDaHJpcyBXaWxzb25dCgp2NjogVXBkYXRlZCB0byBuZXdl ciBuaWdodGx5IChsb3RzIG9mIHJpbmcgLT4gZW5naW5lIHJlbmFtaW5nKS4KCkZvcjogVklaLTE1 ODcKU2lnbmVkLW9mZi1ieTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNv bT4KUmV2aWV3ZWQtYnk6IEplc3NlIEJhcm5lcyA8amJhcm5lc0B2aXJ0dW91c2dlZWsub3JnPgot LS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYyB8IDQxICsrKysr KysrKysrKysrKysrKy0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJj LmMgICAgICAgICAgIHwgMTggKysrKysrKysrLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCAzOCBpbnNl cnRpb25zKCspLCAyMSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bV9leGVjYnVmZmVyLmMKaW5kZXggNDBkMzMzYy4uZjI1ZmQyYyAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYwpAQCAtOTcwLDEwICs5NzAsNyBAQCBpOTE1X2dl bV9leGVjYnVmZmVyX21vdmVfdG9fZ3B1KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVx LAogCWlmIChmbHVzaF9kb21haW5zICYgSTkxNV9HRU1fRE9NQUlOX0dUVCkKIAkJd21iKCk7CiAK LQkvKiBVbmNvbmRpdGlvbmFsbHkgaW52YWxpZGF0ZSBncHUgY2FjaGVzIGFuZCBlbnN1cmUgdGhh dCB3ZSBkbyBmbHVzaAotCSAqIGFueSByZXNpZHVhbCB3cml0ZXMgZnJvbSB0aGUgcHJldmlvdXMg YmF0Y2guCi0JICovCi0JcmV0dXJuIGludGVsX3JpbmdfaW52YWxpZGF0ZV9hbGxfY2FjaGVzKHJl cSk7CisJcmV0dXJuIDA7CiB9CiAKIHN0YXRpYyBib29sCkBAIC0xMjM4LDE3ICsxMjM1LDYgQEAg aTkxNV9nZW1fcmluZ2J1ZmZlcl9zdWJtaXNzaW9uKHN0cnVjdCBpOTE1X2V4ZWNidWZmZXJfcGFy YW1zICpwYXJhbXMsCiAJdTMyIGluc3RwX21hc2s7CiAJaW50IHJldDsKIAotCXJldCA9IGk5MTVf Z2VtX2V4ZWNidWZmZXJfbW92ZV90b19ncHUocGFyYW1zLT5yZXF1ZXN0LCB2bWFzKTsKLQlpZiAo cmV0KQotCQlyZXR1cm4gcmV0OwotCi0JcmV0ID0gaTkxNV9zd2l0Y2hfY29udGV4dChwYXJhbXMt PnJlcXVlc3QpOwotCWlmIChyZXQpCi0JCXJldHVybiByZXQ7Ci0KLQlXQVJOKHBhcmFtcy0+Y3R4 LT5wcGd0dCAmJiBwYXJhbXMtPmN0eC0+cHBndHQtPnBkX2RpcnR5X3JpbmdzICYgKDE8PGVuZ2lu ZS0+aWQpLAotCSAgICAgIiVzIGRpZG4ndCBjbGVhciByZWxvYWRcbiIsIGVuZ2luZS0+bmFtZSk7 Ci0KIAlpbnN0cF9tb2RlID0gYXJncy0+ZmxhZ3MgJiBJOTE1X0VYRUNfQ09OU1RBTlRTX01BU0s7 CiAJaW5zdHBfbWFzayA9IEk5MTVfRVhFQ19DT05TVEFOVFNfTUFTSzsKIAlzd2l0Y2ggKGluc3Rw X21vZGUpIHsKQEAgLTEyODIsNiArMTI2OCwzMCBAQCBpOTE1X2dlbV9yaW5nYnVmZmVyX3N1Ym1p c3Npb24oc3RydWN0IGk5MTVfZXhlY2J1ZmZlcl9wYXJhbXMgKnBhcmFtcywKIAkJcmV0dXJuIC1F SU5WQUw7CiAJfQogCisJcmV0ID0gaTkxNV9nZW1fZXhlY2J1ZmZlcl9tb3ZlX3RvX2dwdShwYXJh bXMtPnJlcXVlc3QsIHZtYXMpOworCWlmIChyZXQpCisJCXJldHVybiByZXQ7CisKKwlpOTE1X2dl bV9leGVjYnVmZmVyX21vdmVfdG9fYWN0aXZlKHZtYXMsIHBhcmFtcy0+cmVxdWVzdCk7CisKKwkv KiBUbyBiZSBzcGxpdCBpbnRvIHR3byBmdW5jdGlvbnMgaGVyZS4uLiAqLworCisJLyoKKwkgKiBV bmNvbmRpdGlvbmFsbHkgaW52YWxpZGF0ZSBncHUgY2FjaGVzIGFuZCBlbnN1cmUgdGhhdCB3ZSBk byBmbHVzaAorCSAqIGFueSByZXNpZHVhbCB3cml0ZXMgZnJvbSB0aGUgcHJldmlvdXMgYmF0Y2gu CisJICovCisJcmV0ID0gaW50ZWxfcmluZ19pbnZhbGlkYXRlX2FsbF9jYWNoZXMocGFyYW1zLT5y ZXF1ZXN0KTsKKwlpZiAocmV0KQorCQlyZXR1cm4gcmV0OworCisJLyogU3dpdGNoIHRvIHRoZSBj b3JyZWN0IGNvbnRleHQgZm9yIHRoZSBiYXRjaCAqLworCXJldCA9IGk5MTVfc3dpdGNoX2NvbnRl eHQocGFyYW1zLT5yZXF1ZXN0KTsKKwlpZiAocmV0KQorCQlyZXR1cm4gcmV0OworCisJV0FSTihw YXJhbXMtPmN0eC0+cHBndHQgJiYgcGFyYW1zLT5jdHgtPnBwZ3R0LT5wZF9kaXJ0eV9yaW5ncyAm ICgxPDxlbmdpbmUtPmlkKSwKKwkgICAgICIlcyBkaWRuJ3QgY2xlYXIgcmVsb2FkXG4iLCBlbmdp bmUtPm5hbWUpOworCiAJaWYgKGVuZ2luZSA9PSAmZGV2X3ByaXYtPmVuZ2luZVtSQ1NdICYmCiAJ ICAgIGluc3RwX21vZGUgIT0gZGV2X3ByaXYtPnJlbGF0aXZlX2NvbnN0YW50c19tb2RlKSB7CiAJ CXJldCA9IGludGVsX3JpbmdfYmVnaW4ocGFyYW1zLT5yZXF1ZXN0LCA0KTsKQEAgLTEzMTgsNyAr MTMyOCw2IEBAIGk5MTVfZ2VtX3JpbmdidWZmZXJfc3VibWlzc2lvbihzdHJ1Y3QgaTkxNV9leGVj YnVmZmVyX3BhcmFtcyAqcGFyYW1zLAogCiAJdHJhY2VfaTkxNV9nZW1fcmluZ19kaXNwYXRjaChw YXJhbXMtPnJlcXVlc3QsIHBhcmFtcy0+ZGlzcGF0Y2hfZmxhZ3MpOwogCi0JaTkxNV9nZW1fZXhl Y2J1ZmZlcl9tb3ZlX3RvX2FjdGl2ZSh2bWFzLCBwYXJhbXMtPnJlcXVlc3QpOwogCWk5MTVfZ2Vt X2V4ZWNidWZmZXJfcmV0aXJlX2NvbW1hbmRzKHBhcmFtcyk7CiAKIAlyZXR1cm4gMDsKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfbHJjLmMKaW5kZXggYTM1MWEwZS4uNTg2NjM0MiAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfbHJjLmMKQEAgLTY5MCwxMCArNjkwLDcgQEAgc3RhdGljIGludCBleGVjbGlzdHNfbW92 ZV90b19ncHUoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsCiAJaWYgKGZsdXNoX2Rv bWFpbnMgJiBJOTE1X0dFTV9ET01BSU5fR1RUKQogCQl3bWIoKTsKIAotCS8qIFVuY29uZGl0aW9u YWxseSBpbnZhbGlkYXRlIGdwdSBjYWNoZXMgYW5kIGVuc3VyZSB0aGF0IHdlIGRvIGZsdXNoCi0J ICogYW55IHJlc2lkdWFsIHdyaXRlcyBmcm9tIHRoZSBwcmV2aW91cyBiYXRjaC4KLQkgKi8KLQly ZXR1cm4gbG9naWNhbF9yaW5nX2ludmFsaWRhdGVfYWxsX2NhY2hlcyhyZXEpOworCXJldHVybiAw OwogfQogCiBpbnQgaW50ZWxfbG9naWNhbF9yaW5nX2FsbG9jX3JlcXVlc3RfZXh0cmFzKHN0cnVj dCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdCkKQEAgLTk4OSw2ICs5ODYsMTggQEAgaW50 IGludGVsX2V4ZWNsaXN0c19zdWJtaXNzaW9uKHN0cnVjdCBpOTE1X2V4ZWNidWZmZXJfcGFyYW1z ICpwYXJhbXMsCiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIAorCWk5MTVfZ2VtX2V4ZWNidWZm ZXJfbW92ZV90b19hY3RpdmUodm1hcywgcGFyYW1zLT5yZXF1ZXN0KTsKKworCS8qIFRvIGJlIHNw bGl0IGludG8gdHdvIGZ1bmN0aW9ucyBoZXJlLi4uICovCisKKwkvKgorCSAqIFVuY29uZGl0aW9u YWxseSBpbnZhbGlkYXRlIGdwdSBjYWNoZXMgYW5kIGVuc3VyZSB0aGF0IHdlIGRvIGZsdXNoCisJ ICogYW55IHJlc2lkdWFsIHdyaXRlcyBmcm9tIHRoZSBwcmV2aW91cyBiYXRjaC4KKwkgKi8KKwly ZXQgPSBsb2dpY2FsX3JpbmdfaW52YWxpZGF0ZV9hbGxfY2FjaGVzKHBhcmFtcy0+cmVxdWVzdCk7 CisJaWYgKHJldCkKKwkJcmV0dXJuIHJldDsKKwogCWlmIChlbmdpbmUgPT0gJmRldl9wcml2LT5l bmdpbmVbUkNTXSAmJgogCSAgICBpbnN0cF9tb2RlICE9IGRldl9wcml2LT5yZWxhdGl2ZV9jb25z dGFudHNfbW9kZSkgewogCQlyZXQgPSBpbnRlbF9sb2dpY2FsX3JpbmdfYmVnaW4ocGFyYW1zLT5y ZXF1ZXN0LCA0KTsKQEAgLTEwMTMsNyArMTAyMiw2IEBAIGludCBpbnRlbF9leGVjbGlzdHNfc3Vi bWlzc2lvbihzdHJ1Y3QgaTkxNV9leGVjYnVmZmVyX3BhcmFtcyAqcGFyYW1zLAogCiAJdHJhY2Vf aTkxNV9nZW1fcmluZ19kaXNwYXRjaChwYXJhbXMtPnJlcXVlc3QsIHBhcmFtcy0+ZGlzcGF0Y2hf ZmxhZ3MpOwogCi0JaTkxNV9nZW1fZXhlY2J1ZmZlcl9tb3ZlX3RvX2FjdGl2ZSh2bWFzLCBwYXJh bXMtPnJlcXVlc3QpOwogCWk5MTVfZ2VtX2V4ZWNidWZmZXJfcmV0aXJlX2NvbW1hbmRzKHBhcmFt cyk7CiAKIAlyZXR1cm4gMDsKLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0 cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9pbnRlbC1nZngK