From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [RFC 15/39] drm/i915: Keep the reserved space mechanism happy Date: Fri, 17 Jul 2015 15:33:24 +0100 Message-ID: <1437143628-6329-16-git-send-email-John.C.Harrison@Intel.com> References: <1437143628-6329-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 2C35D6E4E6 for ; Fri, 17 Jul 2015 07:34:08 -0700 (PDT) In-Reply-To: <1437143628-6329-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 CkZvcjogVklaLTE1ODcKU2lnbmVkLW9mZi1ieTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJp c29uQEludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVm ZmVyLmMgfCAgNyArKysrKysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3NjaGVkdWxlci5j ICAgICAgfCAgNCArKysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyAgICAgICAg ICAgfCAxMyArKysrKysrKysrKy0tCiAzIGZpbGVzIGNoYW5nZWQsIDIyIGluc2VydGlvbnMoKyks IDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW1fZXhlY2J1ZmZlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZl ci5jCmluZGV4IDM2NGU5Y2MuLjc1ZDAxOGQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbV9leGVjYnVmZmVyLmMKQEAgLTEzMTcsNiArMTMxNywxMCBAQCBpbnQgaTkxNV9nZW1fcmlu Z2J1ZmZlcl9zdWJtaXNzaW9uX2ZpbmFsKHN0cnVjdCBpOTE1X2V4ZWNidWZmZXJfcGFyYW1zICpw YXJhbXMpCiAJLyogVGhlIG11dGV4IG11c3QgYmUgYWNxdWlyZWQgYmVmb3JlIGNhbGxpbmcgdGhp cyBmdW5jdGlvbiAqLwogCUJVR19PTighbXV0ZXhfaXNfbG9ja2VkKCZwYXJhbXMtPmRldi0+c3Ry dWN0X211dGV4KSk7CiAKKwlyZXQgPSBpbnRlbF9yaW5nX3Jlc2VydmVfc3BhY2UocGFyYW1zLT5y ZXF1ZXN0KTsKKwlpZiAocmV0KQorCQlyZXR1cm4gcmV0OworCiAJaW50ZWxfcnVudGltZV9wbV9n ZXQoZGV2X3ByaXYpOwogCiAJLyoKQEAgLTEzOTIsNiArMTM5Niw5IEBAIGVycm9yOgogCSAqLwog CWludGVsX3J1bnRpbWVfcG1fcHV0KGRldl9wcml2KTsKIAorCWlmIChyZXQpCisJCWludGVsX3Jp bmdfcmVzZXJ2ZWRfc3BhY2VfY2FuY2VsKHBhcmFtcy0+cmVxdWVzdC0+cmluZ2J1Zik7CisKIAly ZXR1cm4gcmV0OwogfQogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3Nj aGVkdWxlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9zY2hlZHVsZXIuYwppbmRleCAz NDk0ZmQ1Li5lMTQ1ODI5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3Nj aGVkdWxlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfc2NoZWR1bGVyLmMKQEAg LTk1LDYgKzk1LDggQEAgaW50IGk5MTVfc2NoZWR1bGVyX3F1ZXVlX2V4ZWNidWZmZXIoc3RydWN0 IGk5MTVfc2NoZWR1bGVyX3F1ZXVlX2VudHJ5ICpxZSkKIAogCQlxZS0+c2NoZWR1bGVyX2luZGV4 ID0gc2NoZWR1bGVyLT5pbmRleCsrOwogCisJCWludGVsX3JpbmdfcmVzZXJ2ZWRfc3BhY2VfY2Fu Y2VsKHFlLT5wYXJhbXMucmVxdWVzdC0+cmluZ2J1Zik7CisKIAkJc2NoZWR1bGVyLT5mbGFnc1tx ZS0+cGFyYW1zLnJpbmctPmlkXSB8PSBpOTE1X3NmX3N1Ym1pdHRpbmc7CiAJCXJldCA9IGRldl9w cml2LT5ndC5leGVjYnVmX2ZpbmFsKCZxZS0+cGFyYW1zKTsKIAkJc2NoZWR1bGVyLT5mbGFnc1tx ZS0+cGFyYW1zLnJpbmctPmlkXSAmPSB+aTkxNV9zZl9zdWJtaXR0aW5nOwpAQCAtMTI2LDYgKzEy OCw4IEBAIGludCBpOTE1X3NjaGVkdWxlcl9xdWV1ZV9leGVjYnVmZmVyKHN0cnVjdCBpOTE1X3Nj aGVkdWxlcl9xdWV1ZV9lbnRyeSAqcWUpCiAJbm9kZS0+c3RhbXAgID0gc3RhbXA7CiAJaTkxNV9n ZW1fcmVxdWVzdF9yZWZlcmVuY2Uobm9kZS0+cGFyYW1zLnJlcXVlc3QpOwogCisJaW50ZWxfcmlu Z19yZXNlcnZlZF9zcGFjZV9jYW5jZWwobm9kZS0+cGFyYW1zLnJlcXVlc3QtPnJpbmdidWYpOwor CiAJQlVHX09OKG5vZGUtPnBhcmFtcy5yZXF1ZXN0LT5zY2hlZHVsZXJfcWUpOwogCW5vZGUtPnBh cmFtcy5yZXF1ZXN0LT5zY2hlZHVsZXJfcWUgPSBub2RlOwogCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xy Yy5jCmluZGV4IGE4Yzc4ZWMuLjc2ZDUwMjMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2xyYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCkBA IC05MDgsMTMgKzkwOCwxNyBAQCBpbnQgaW50ZWxfZXhlY2xpc3RzX3N1Ym1pc3Npb25fZmluYWwo c3RydWN0IGk5MTVfZXhlY2J1ZmZlcl9wYXJhbXMgKnBhcmFtcykKIAkvKiBUaGUgbXV0ZXggbXVz dCBiZSBhY3F1aXJlZCBiZWZvcmUgY2FsbGluZyB0aGlzIGZ1bmN0aW9uICovCiAJQlVHX09OKCFt dXRleF9pc19sb2NrZWQoJnBhcmFtcy0+ZGV2LT5zdHJ1Y3RfbXV0ZXgpKTsKIAorCXJldCA9IGlu dGVsX2xvZ2ljYWxfcmluZ19yZXNlcnZlX3NwYWNlKHBhcmFtcy0+cmVxdWVzdCk7CisJaWYgKHJl dCkKKwkJcmV0dXJuIHJldDsKKwogCS8qCiAJICogVW5jb25kaXRpb25hbGx5IGludmFsaWRhdGUg Z3B1IGNhY2hlcyBhbmQgZW5zdXJlIHRoYXQgd2UgZG8gZmx1c2gKIAkgKiBhbnkgcmVzaWR1YWwg d3JpdGVzIGZyb20gdGhlIHByZXZpb3VzIGJhdGNoLgogCSAqLwogCXJldCA9IGxvZ2ljYWxfcmlu Z19pbnZhbGlkYXRlX2FsbF9jYWNoZXMocGFyYW1zLT5yZXF1ZXN0KTsKIAlpZiAocmV0KQotCQly ZXR1cm4gcmV0OworCQlnb3RvIGVycjsKIAogCWlmIChyaW5nID09ICZkZXZfcHJpdi0+cmluZ1tS Q1NdICYmCiAJICAgIHBhcmFtcy0+aW5zdHBfbW9kZSAhPSBkZXZfcHJpdi0+cmVsYXRpdmVfY29u c3RhbnRzX21vZGUpIHsKQEAgLTkzOCwxMyArOTQyLDE4IEBAIGludCBpbnRlbF9leGVjbGlzdHNf c3VibWlzc2lvbl9maW5hbChzdHJ1Y3QgaTkxNV9leGVjYnVmZmVyX3BhcmFtcyAqcGFyYW1zKQog CiAJcmV0ID0gcmluZy0+ZW1pdF9iYl9zdGFydChwYXJhbXMtPnJlcXVlc3QsIGV4ZWNfc3RhcnQs IHBhcmFtcy0+ZGlzcGF0Y2hfZmxhZ3MpOwogCWlmIChyZXQpCi0JCXJldHVybiByZXQ7CisJCWdv dG8gZXJyOwogCiAJdHJhY2VfaTkxNV9nZW1fcmluZ19kaXNwYXRjaChwYXJhbXMtPnJlcXVlc3Qs IHBhcmFtcy0+ZGlzcGF0Y2hfZmxhZ3MpOwogCiAJaTkxNV9nZW1fZXhlY2J1ZmZlcl9yZXRpcmVf Y29tbWFuZHMocGFyYW1zKTsKIAogCXJldHVybiAwOworCitlcnI6CisJaW50ZWxfcmluZ19yZXNl cnZlZF9zcGFjZV9jYW5jZWwocGFyYW1zLT5yZXF1ZXN0LT5yaW5nYnVmKTsKKworCXJldHVybiBy ZXQ7CiB9CiAKIHZvaWQgaW50ZWxfZXhlY2xpc3RzX3JldGlyZV9yZXF1ZXN0cyhzdHJ1Y3QgaW50 ZWxfZW5naW5lX2NzICpyaW5nKQotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxp c3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v bGlzdGluZm8vaW50ZWwtZ2Z4Cg==