From mboxrd@z Thu Jan  1 00:00:00 1970
From: John.C.Harrison@Intel.com
Subject: [PATCH 15/39] drm/i915: Keep the reserved space
	mechanism happy
Date: Mon, 23 Nov 2015 11:39:10 +0000
Message-ID: <1448278774-31376-16-git-send-email-John.C.Harrison@Intel.com>
References: <1448278774-31376-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: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga01.intel.com (mga01.intel.com [192.55.52.88])
 by gabe.freedesktop.org (Postfix) with ESMTP id 22A3E721F4
 for <Intel-GFX@lists.freedesktop.org>; Mon, 23 Nov 2015 03:39:51 -0800 (PST)
In-Reply-To: <1448278774-31376-1-git-send-email-John.C.Harrison@Intel.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
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
ci5jCmluZGV4IGNkNGFhNjQuLjEyYjM0ZDcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p
OTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1
X2dlbV9leGVjYnVmZmVyLmMKQEAgLTEyNDgsNiArMTI0OCwxMCBAQCBpbnQgaTkxNV9nZW1fcmlu
Z2J1ZmZlcl9zdWJtaXNzaW9uX2ZpbmFsKHN0cnVjdCBpOTE1X2V4ZWNidWZmZXJfcGFyYW1zICpw
YXJhbXMpCiAJLyogVGhlIG11dGV4IG11c3QgYmUgYWNxdWlyZWQgYmVmb3JlIGNhbGxpbmcgdGhp
cyBmdW5jdGlvbiAqLwogCUJVR19PTighbXV0ZXhfaXNfbG9ja2VkKCZwYXJhbXMtPmRldi0+c3Ry
dWN0X211dGV4KSk7CiAKKwlyZXQgPSBpbnRlbF9yaW5nX3Jlc2VydmVfc3BhY2UocGFyYW1zLT5y
ZXF1ZXN0KTsKKwlpZiAocmV0KQorCQlyZXR1cm4gcmV0OworCiAJaW50ZWxfcnVudGltZV9wbV9n
ZXQoZGV2X3ByaXYpOwogCiAJLyoKQEAgLTEzMDgsNiArMTMxMiw5IEBAIGVycm9yOgogCSAqLwog
CWludGVsX3J1bnRpbWVfcG1fcHV0KGRldl9wcml2KTsKIAorCWlmIChyZXQpCisJCWludGVsX3Jp
bmdfcmVzZXJ2ZWRfc3BhY2VfY2FuY2VsKHBhcmFtcy0+cmVxdWVzdC0+cmluZ2J1Zik7CisKIAly
ZXR1cm4gcmV0OwogfQogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3Nj
aGVkdWxlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9zY2hlZHVsZXIuYwppbmRleCA3
NTIxMzM4Li43OWQwMmQ3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3Nj
aGVkdWxlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfc2NoZWR1bGVyLmMKQEAg
LTkxLDYgKzkxLDggQEAgaW50IGk5MTVfc2NoZWR1bGVyX3F1ZXVlX2V4ZWNidWZmZXIoc3RydWN0
IGk5MTVfc2NoZWR1bGVyX3F1ZXVlX2VudHJ5ICpxZSkKIAlpZiAoMS8qaTkxNS5zY2hlZHVsZXJf
b3ZlcnJpZGUgJiBpOTE1X3NvX2RpcmVjdF9zdWJtaXQqLykgewogCQlpbnQgcmV0OwogCisJCWlu
dGVsX3JpbmdfcmVzZXJ2ZWRfc3BhY2VfY2FuY2VsKHFlLT5wYXJhbXMucmVxdWVzdC0+cmluZ2J1
Zik7CisKIAkJc2NoZWR1bGVyLT5mbGFnc1txZS0+cGFyYW1zLnJpbmctPmlkXSB8PSBpOTE1X3Nm
X3N1Ym1pdHRpbmc7CiAJCXJldCA9IGRldl9wcml2LT5ndC5leGVjYnVmX2ZpbmFsKCZxZS0+cGFy
YW1zKTsKIAkJc2NoZWR1bGVyLT5mbGFnc1txZS0+cGFyYW1zLnJpbmctPmlkXSAmPSB+aTkxNV9z
Zl9zdWJtaXR0aW5nOwpAQCAtMTIwLDYgKzEyMiw4IEBAIGludCBpOTE1X3NjaGVkdWxlcl9xdWV1
ZV9leGVjYnVmZmVyKHN0cnVjdCBpOTE1X3NjaGVkdWxlcl9xdWV1ZV9lbnRyeSAqcWUpCiAJbm9k
ZS0+c3RhbXAgID0gamlmZmllczsKIAlpOTE1X2dlbV9yZXF1ZXN0X3JlZmVyZW5jZShub2RlLT5w
YXJhbXMucmVxdWVzdCk7CiAKKwlpbnRlbF9yaW5nX3Jlc2VydmVkX3NwYWNlX2NhbmNlbChub2Rl
LT5wYXJhbXMucmVxdWVzdC0+cmluZ2J1Zik7CisKIAlCVUdfT04obm9kZS0+cGFyYW1zLnJlcXVl
c3QtPnNjaGVkdWxlcl9xZSk7CiAJbm9kZS0+cGFyYW1zLnJlcXVlc3QtPnNjaGVkdWxlcl9xZSA9
IG5vZGU7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jIGIv
ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKaW5kZXggMmY0OWZiOS4uMTZjNTMwMiAx
MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKKysrIGIvZHJpdmVy
cy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKQEAgLTkzMiwxMyArOTMyLDE3IEBAIGludCBpbnRl
bF9leGVjbGlzdHNfc3VibWlzc2lvbl9maW5hbChzdHJ1Y3QgaTkxNV9leGVjYnVmZmVyX3BhcmFt
cyAqcGFyYW1zKQogCS8qIFRoZSBtdXRleCBtdXN0IGJlIGFjcXVpcmVkIGJlZm9yZSBjYWxsaW5n
IHRoaXMgZnVuY3Rpb24gKi8KIAlCVUdfT04oIW11dGV4X2lzX2xvY2tlZCgmcGFyYW1zLT5kZXYt
PnN0cnVjdF9tdXRleCkpOwogCisJcmV0ID0gaW50ZWxfbG9naWNhbF9yaW5nX3Jlc2VydmVfc3Bh
Y2UocGFyYW1zLT5yZXF1ZXN0KTsKKwlpZiAocmV0KQorCQlyZXR1cm4gcmV0OworCiAJLyoKIAkg
KiBVbmNvbmRpdGlvbmFsbHkgaW52YWxpZGF0ZSBncHUgY2FjaGVzIGFuZCBlbnN1cmUgdGhhdCB3
ZSBkbyBmbHVzaAogCSAqIGFueSByZXNpZHVhbCB3cml0ZXMgZnJvbSB0aGUgcHJldmlvdXMgYmF0
Y2guCiAJICovCiAJcmV0ID0gbG9naWNhbF9yaW5nX2ludmFsaWRhdGVfYWxsX2NhY2hlcyhwYXJh
bXMtPnJlcXVlc3QpOwogCWlmIChyZXQpCi0JCXJldHVybiByZXQ7CisJCWdvdG8gZXJyOwogCiAJ
aWYgKHJpbmcgPT0gJmRldl9wcml2LT5yaW5nW1JDU10gJiYKIAkgICAgcGFyYW1zLT5pbnN0cF9t
b2RlICE9IGRldl9wcml2LT5yZWxhdGl2ZV9jb25zdGFudHNfbW9kZSkgewpAQCAtOTYyLDEzICs5
NjYsMTggQEAgaW50IGludGVsX2V4ZWNsaXN0c19zdWJtaXNzaW9uX2ZpbmFsKHN0cnVjdCBpOTE1
X2V4ZWNidWZmZXJfcGFyYW1zICpwYXJhbXMpCiAKIAlyZXQgPSByaW5nLT5lbWl0X2JiX3N0YXJ0
KHBhcmFtcy0+cmVxdWVzdCwgZXhlY19zdGFydCwgcGFyYW1zLT5kaXNwYXRjaF9mbGFncyk7CiAJ
aWYgKHJldCkKLQkJcmV0dXJuIHJldDsKKwkJZ290byBlcnI7CiAKIAl0cmFjZV9pOTE1X2dlbV9y
aW5nX2Rpc3BhdGNoKHBhcmFtcy0+cmVxdWVzdCwgcGFyYW1zLT5kaXNwYXRjaF9mbGFncyk7CiAK
IAlpOTE1X2dlbV9leGVjYnVmZmVyX3JldGlyZV9jb21tYW5kcyhwYXJhbXMpOwogCiAJcmV0dXJu
IDA7CisKK2VycjoKKwlpbnRlbF9yaW5nX3Jlc2VydmVkX3NwYWNlX2NhbmNlbChwYXJhbXMtPnJl
cXVlc3QtPnJpbmdidWYpOworCisJcmV0dXJuIHJldDsKIH0KIAogdm9pZCBpbnRlbF9leGVjbGlz
dHNfcmV0aXJlX3JlcXVlc3RzKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCi0tIAoxLjku
MQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwt
Z2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9s
aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK