From: John.C.Harrison@Intel.com Subject: [PATCH v6 13/34] drm/i915: Keep the reserved space mechanism happy Date: Wed, 20 Apr 2016 18:13:31 +0100 Message-ID: <1461172435-4256-14-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 D08BE6EA8D for ; Wed, 20 Apr 2016 17:14:12 +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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KClJpbmcgc3Bh Y2UgaXMgcmVzZXJ2ZWQgd2hlbiBjb25zdHJ1Y3RpbmcgYSByZXF1ZXN0IHRvIGVuc3VyZSB0aGF0 IHRoZQpzdWJzZXF1ZW50ICdhZGRfcmVxdWVzdCgpJyBjYWxsIGNhbm5vdCBmYWlsIGR1ZSB0byB3 YWl0aW5nIGZvciBzcGFjZQpvbiBhIGJ1c3kgb3IgYnJva2VuIEdQVS4gSG93ZXZlciwgdGhlIHNj aGVkdWxlciBqdW1wcyBpbiB0byB0aGUgbWlkZGxlCm9mIHRoZSBleGVjYnVmZmVyIHByb2Nlc3Mg YmV0d2VlbiByZXF1ZXN0IGNyZWF0aW9uIGFuZCByZXF1ZXN0CnN1Ym1pc3Npb24uIFRodXMgaXQg bmVlZHMgdG8gY2FuY2VsIHRoZSByZXNlcnZlZCBzcGFjZSB3aGVuIHRoZQpyZXF1ZXN0IGlzIHNp bXBseSBhZGRlZCB0byB0aGUgc2NoZWR1bGVyJ3MgcXVldWUgYW5kIG5vdCB5ZXQKc3VibWl0dGVk LiBTaW1pbGFybHksIGl0IG5lZWRzIHRvIHJlLXJlc2VydmUgdGhlIHNwYWNlIHdoZW4gaXQgZmlu YWxseQpkb2VzIHdhbnQgdG8gc2VuZCB0aGUgYmF0Y2ggYnVmZmVyIHRvIHRoZSBoYXJkd2FyZS4K CnYzOiBVcGRhdGVkIHRvIHVzZSBsb2NhbGx5IGNhY2hlZCByZXF1ZXN0IHBvaW50ZXIuCgp2NTog VXBkYXRlZCBkdWUgdG8gY2hhbmdlcyB0byBlYXJsaWVyIHBhdGNoZXMgaW4gc2VyaWVzIC0gZm9y IHJ1bnRpbWUKUE0gY2FsbHMgYW5kIHNwbGl0dGluZyBieXBhc3MgbW9kZSBpbnRvIGEgc2VwYXJh dGUgZnVuY3Rpb24uCgpGb3I6IFZJWi0xNTg3ClNpZ25lZC1vZmYtYnk6IEpvaG4gSGFycmlzb24g PEpvaG4uQy5IYXJyaXNvbkBJbnRlbC5jb20+ClJldmlld2VkLWJ5OiBKZXNzZSBCYXJuZXMgPGpi YXJuZXNAdmlydHVvdXNnZWVrLm9yZz4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bV9leGVjYnVmZmVyLmMgfCAyMCArKysrKysrKysrKysrKy0tLS0tLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9zY2hlZHVsZXIuYyAgICAgIHwgIDQgKysrKwogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfbHJjLmMgICAgICAgICAgIHwgMTMgKysrKysrKysrKystLQogMyBmaWxlcyBjaGFu Z2VkLCAyOSBpbnNlcnRpb25zKCspLCA4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYwppbmRleCBmN2YzZWIwLi41ZGY3YWUyIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jCkBAIC0xMjk2LDE4ICsxMjk2 LDIyIEBAIGludCBpOTE1X2dlbV9yaW5nYnVmZmVyX3N1Ym1pc3Npb25fZmluYWwoc3RydWN0IGk5 MTVfZXhlY2J1ZmZlcl9wYXJhbXMgKnBhcmFtcykKIAkvKiBUaGUgbXV0ZXggbXVzdCBiZSBhY3F1 aXJlZCBiZWZvcmUgY2FsbGluZyB0aGlzIGZ1bmN0aW9uICovCiAJV0FSTl9PTighbXV0ZXhfaXNf bG9ja2VkKCZwYXJhbXMtPmRldi0+c3RydWN0X211dGV4KSk7CiAKKwlyZXQgPSBpbnRlbF9yaW5n X3Jlc2VydmVfc3BhY2UocmVxKTsKKwlpZiAocmV0KQorCQlnb3RvIGVycm9yOworCiAJLyoKIAkg KiBVbmNvbmRpdGlvbmFsbHkgaW52YWxpZGF0ZSBncHUgY2FjaGVzIGFuZCBlbnN1cmUgdGhhdCB3 ZSBkbyBmbHVzaAogCSAqIGFueSByZXNpZHVhbCB3cml0ZXMgZnJvbSB0aGUgcHJldmlvdXMgYmF0 Y2guCiAJICovCiAJcmV0ID0gaW50ZWxfcmluZ19pbnZhbGlkYXRlX2FsbF9jYWNoZXMocmVxKTsK IAlpZiAocmV0KQotCQlyZXR1cm4gcmV0OworCQlnb3RvIGVycm9yOwogCiAJLyogU3dpdGNoIHRv IHRoZSBjb3JyZWN0IGNvbnRleHQgZm9yIHRoZSBiYXRjaCAqLwogCXJldCA9IGk5MTVfc3dpdGNo X2NvbnRleHQocmVxKTsKIAlpZiAocmV0KQotCQlyZXR1cm4gcmV0OworCQlnb3RvIGVycm9yOwog CiAJV0FSTihwYXJhbXMtPmN0eC0+cHBndHQgJiYgcGFyYW1zLT5jdHgtPnBwZ3R0LT5wZF9kaXJ0 eV9yaW5ncyAmICgxPDxlbmdpbmUtPmlkKSwKIAkgICAgICIlcyBkaWRuJ3QgY2xlYXIgcmVsb2Fk XG4iLCBlbmdpbmUtPm5hbWUpOwpAQCAtMTMxNiw3ICsxMzIwLDcgQEAgaW50IGk5MTVfZ2VtX3Jp bmdidWZmZXJfc3VibWlzc2lvbl9maW5hbChzdHJ1Y3QgaTkxNV9leGVjYnVmZmVyX3BhcmFtcyAq cGFyYW1zKQogCSAgICBwYXJhbXMtPmluc3RwX21vZGUgIT0gZGV2X3ByaXYtPnJlbGF0aXZlX2Nv bnN0YW50c19tb2RlKSB7CiAJCXJldCA9IGludGVsX3JpbmdfYmVnaW4ocmVxLCA0KTsKIAkJaWYg KHJldCkKLQkJCXJldHVybiByZXQ7CisJCQlnb3RvIGVycm9yOwogCiAJCWludGVsX3JpbmdfZW1p dChlbmdpbmUsIE1JX05PT1ApOwogCQlpbnRlbF9yaW5nX2VtaXQoZW5naW5lLCBNSV9MT0FEX1JF R0lTVEVSX0lNTSgxKSk7CkBAIC0xMzMwLDcgKzEzMzQsNyBAQCBpbnQgaTkxNV9nZW1fcmluZ2J1 ZmZlcl9zdWJtaXNzaW9uX2ZpbmFsKHN0cnVjdCBpOTE1X2V4ZWNidWZmZXJfcGFyYW1zICpwYXJh bXMpCiAJaWYgKHBhcmFtcy0+YXJnc19mbGFncyAmIEk5MTVfRVhFQ19HRU43X1NPTF9SRVNFVCkg ewogCQlyZXQgPSBpOTE1X3Jlc2V0X2dlbjdfc29sX29mZnNldHMocGFyYW1zLT5kZXYsIHJlcSk7 CiAJCWlmIChyZXQpCi0JCQlyZXR1cm4gcmV0OworCQkJZ290byBlcnJvcjsKIAl9CiAKIAlleGVj X2xlbiAgID0gcGFyYW1zLT5hcmdzX2JhdGNoX2xlbjsKQEAgLTEzNDQsMTMgKzEzNDgsMTcgQEAg aW50IGk5MTVfZ2VtX3JpbmdidWZmZXJfc3VibWlzc2lvbl9maW5hbChzdHJ1Y3QgaTkxNV9leGVj YnVmZmVyX3BhcmFtcyAqcGFyYW1zKQogCQkJCQkgIGV4ZWNfc3RhcnQsIGV4ZWNfbGVuLAogCQkJ CQkgIHBhcmFtcy0+ZGlzcGF0Y2hfZmxhZ3MpOwogCWlmIChyZXQpCi0JCXJldHVybiByZXQ7CisJ CWdvdG8gZXJyb3I7CiAKIAl0cmFjZV9pOTE1X2dlbV9yaW5nX2Rpc3BhdGNoKHJlcSwgcGFyYW1z LT5kaXNwYXRjaF9mbGFncyk7CiAKIAlpOTE1X2dlbV9leGVjYnVmZmVyX3JldGlyZV9jb21tYW5k cyhwYXJhbXMpOwogCi0JcmV0dXJuIDA7CitlcnJvcjoKKwlpZiAocmV0KQorCQlpbnRlbF9yaW5n X3Jlc2VydmVkX3NwYWNlX2NhbmNlbChyZXEtPnJpbmdidWYpOworCisJcmV0dXJuIHJldDsKIH0K IAogLyoqCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3NjaGVkdWxlci5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9zY2hlZHVsZXIuYwppbmRleCAyZGM1NTk3Li4y ZmIzZjUyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3NjaGVkdWxlci5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfc2NoZWR1bGVyLmMKQEAgLTUxOSw2ICs1 MTksOCBAQCBzdGF0aWMgaW50IGk5MTVfc2NoZWR1bGVyX3F1ZXVlX2V4ZWNidWZmZXJfYnlwYXNz KHN0cnVjdCBpOTE1X3NjaGVkdWxlcl9xdWV1ZV9lbgogCXN0cnVjdCBpOTE1X3NjaGVkdWxlciAq c2NoZWR1bGVyID0gZGV2X3ByaXYtPnNjaGVkdWxlcjsKIAlpbnQgcmV0OwogCisJaW50ZWxfcmlu Z19yZXNlcnZlZF9zcGFjZV9jYW5jZWwocWUtPnBhcmFtcy5yZXF1ZXN0LT5yaW5nYnVmKTsKKwog CXNjaGVkdWxlci0+ZmxhZ3NbcWUtPnBhcmFtcy5lbmdpbmUtPmlkXSB8PSBJOTE1X1NGX1NVQk1J VFRJTkc7CiAJcmV0ID0gZGV2X3ByaXYtPmd0LmV4ZWNidWZfZmluYWwoJnFlLT5wYXJhbXMpOwog CXNjaGVkdWxlci0+ZmxhZ3NbcWUtPnBhcmFtcy5lbmdpbmUtPmlkXSAmPSB+STkxNV9TRl9TVUJN SVRUSU5HOwpAQCAtNTg0LDYgKzU4Niw4IEBAIGludCBpOTE1X3NjaGVkdWxlcl9xdWV1ZV9leGVj YnVmZmVyKHN0cnVjdCBpOTE1X3NjaGVkdWxlcl9xdWV1ZV9lbnRyeSAqcWUpCiAJbm9kZS0+c3Rh bXAgID0gamlmZmllczsKIAlpOTE1X2dlbV9yZXF1ZXN0X3JlZmVyZW5jZShub2RlLT5wYXJhbXMu cmVxdWVzdCk7CiAKKwlpbnRlbF9yaW5nX3Jlc2VydmVkX3NwYWNlX2NhbmNlbChub2RlLT5wYXJh bXMucmVxdWVzdC0+cmluZ2J1Zik7CisKIAlXQVJOX09OKG5vZGUtPnBhcmFtcy5yZXF1ZXN0LT5z Y2hlZHVsZXJfcWUpOwogCW5vZGUtPnBhcmFtcy5yZXF1ZXN0LT5zY2hlZHVsZXJfcWUgPSBub2Rl OwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCmluZGV4IDZiZjBlM2YuLjBhNGVmNjEgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2xyYy5jCkBAIC0xMDEwLDEzICsxMDEwLDE3IEBAIGludCBpbnRlbF9l eGVjbGlzdHNfc3VibWlzc2lvbl9maW5hbChzdHJ1Y3QgaTkxNV9leGVjYnVmZmVyX3BhcmFtcyAq cGFyYW1zKQogCS8qIFRoZSBtdXRleCBtdXN0IGJlIGFjcXVpcmVkIGJlZm9yZSBjYWxsaW5nIHRo aXMgZnVuY3Rpb24gKi8KIAlXQVJOX09OKCFtdXRleF9pc19sb2NrZWQoJnBhcmFtcy0+ZGV2LT5z dHJ1Y3RfbXV0ZXgpKTsKIAorCXJldCA9IGludGVsX2xvZ2ljYWxfcmluZ19yZXNlcnZlX3NwYWNl KHJlcSk7CisJaWYgKHJldCkKKwkJZ290byBlcnI7CisKIAkvKgogCSAqIFVuY29uZGl0aW9uYWxs eSBpbnZhbGlkYXRlIGdwdSBjYWNoZXMgYW5kIGVuc3VyZSB0aGF0IHdlIGRvIGZsdXNoCiAJICog YW55IHJlc2lkdWFsIHdyaXRlcyBmcm9tIHRoZSBwcmV2aW91cyBiYXRjaC4KIAkgKi8KIAlyZXQg PSBsb2dpY2FsX3JpbmdfaW52YWxpZGF0ZV9hbGxfY2FjaGVzKHJlcSk7CiAJaWYgKHJldCkKLQkJ cmV0dXJuIHJldDsKKwkJZ290byBlcnI7CiAKIAlpZiAoZW5naW5lID09ICZkZXZfcHJpdi0+ZW5n aW5lW1JDU10gJiYKIAkgICAgcGFyYW1zLT5pbnN0cF9tb2RlICE9IGRldl9wcml2LT5yZWxhdGl2 ZV9jb25zdGFudHNfbW9kZSkgewpAQCAtMTAzOCwxMyArMTA0MiwxOCBAQCBpbnQgaW50ZWxfZXhl Y2xpc3RzX3N1Ym1pc3Npb25fZmluYWwoc3RydWN0IGk5MTVfZXhlY2J1ZmZlcl9wYXJhbXMgKnBh cmFtcykKIAogCXJldCA9IGVuZ2luZS0+ZW1pdF9iYl9zdGFydChyZXEsIGV4ZWNfc3RhcnQsIHBh cmFtcy0+ZGlzcGF0Y2hfZmxhZ3MpOwogCWlmIChyZXQpCi0JCXJldHVybiByZXQ7CisJCWdvdG8g ZXJyOwogCiAJdHJhY2VfaTkxNV9nZW1fcmluZ19kaXNwYXRjaChyZXEsIHBhcmFtcy0+ZGlzcGF0 Y2hfZmxhZ3MpOwogCiAJaTkxNV9nZW1fZXhlY2J1ZmZlcl9yZXRpcmVfY29tbWFuZHMocGFyYW1z KTsKIAogCXJldHVybiAwOworCitlcnI6CisJaW50ZWxfcmluZ19yZXNlcnZlZF9zcGFjZV9jYW5j ZWwocGFyYW1zLT5yZXF1ZXN0LT5yaW5nYnVmKTsKKworCXJldHVybiByZXQ7CiB9CiAKIHZvaWQg aW50ZWxfZXhlY2xpc3RzX3JldGlyZV9yZXF1ZXN0cyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpl bmdpbmUpCi0tIAoxLjkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50 ZWwtZ2Z4Cg==