From mboxrd@z Thu Jan  1 00:00:00 1970
From: John.C.Harrison@Intel.com
Subject: [PATCH 16/40] drm/i915: Keep the reserved space
	mechanism happy
Date: Fri, 11 Dec 2015 13:19:29 +0000
Message-ID: <1449839969-22385-1-git-send-email-John.C.Harrison@Intel.com>
References: <1448278774-31376-16-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 mga09.intel.com (mga09.intel.com [134.134.136.24])
 by gabe.freedesktop.org (Postfix) with ESMTP id BBFA56EFCF
 for <Intel-GFX@lists.freedesktop.org>; Fri, 11 Dec 2015 05:19:31 -0800 (PST)
In-Reply-To: <1448278774-31376-16-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
CnYzOiBVcGRhdGVkIHRvIHVzZSBsb2NhbGx5IGNhY2hlZCByZXF1ZXN0IHBvaW50ZXIuCgpGb3I6
IFZJWi0xNTg3ClNpZ25lZC1vZmYtYnk6IEpvaG4gSGFycmlzb24gPEpvaG4uQy5IYXJyaXNvbkBJ
bnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5j
IHwgIDcgKysrKysrKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9zY2hlZHVsZXIuYyAgICAg
IHwgIDQgKysrKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgICAgICAgICAgIHwg
MTMgKysrKysrKysrKystLQogMyBmaWxlcyBjaGFuZ2VkLCAyMiBpbnNlcnRpb25zKCspLCAyIGRl
bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4
ZWNidWZmZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYwpp
bmRleCBiNWQ2MThhLi4yYzdhMzk1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p
OTE1X2dlbV9leGVjYnVmZmVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1f
ZXhlY2J1ZmZlci5jCkBAIC0xMjQ5LDYgKzEyNDksMTAgQEAgaW50IGk5MTVfZ2VtX3JpbmdidWZm
ZXJfc3VibWlzc2lvbl9maW5hbChzdHJ1Y3QgaTkxNV9leGVjYnVmZmVyX3BhcmFtcyAqcGFyYW1z
KQogCS8qIFRoZSBtdXRleCBtdXN0IGJlIGFjcXVpcmVkIGJlZm9yZSBjYWxsaW5nIHRoaXMgZnVu
Y3Rpb24gKi8KIAlCVUdfT04oIW11dGV4X2lzX2xvY2tlZCgmcGFyYW1zLT5kZXYtPnN0cnVjdF9t
dXRleCkpOwogCisJcmV0ID0gaW50ZWxfcmluZ19yZXNlcnZlX3NwYWNlKHJlcSk7CisJaWYgKHJl
dCkKKwkJcmV0dXJuIHJldDsKKwogCWludGVsX3J1bnRpbWVfcG1fZ2V0KGRldl9wcml2KTsKIAog
CS8qCkBAIC0xMzA5LDYgKzEzMTMsOSBAQCBlcnJvcjoKIAkgKi8KIAlpbnRlbF9ydW50aW1lX3Bt
X3B1dChkZXZfcHJpdik7CiAKKwlpZiAocmV0KQorCQlpbnRlbF9yaW5nX3Jlc2VydmVkX3NwYWNl
X2NhbmNlbChyZXEtPnJpbmdidWYpOworCiAJcmV0dXJuIHJldDsKIH0KIApkaWZmIC0tZ2l0IGEv
ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9zY2hlZHVsZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9p
OTE1L2k5MTVfc2NoZWR1bGVyLmMKaW5kZXggMGU2NTdjZi4uOWQxNDc1ZiAxMDA2NDQKLS0tIGEv
ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9zY2hlZHVsZXIuYworKysgYi9kcml2ZXJzL2dwdS9k
cm0vaTkxNS9pOTE1X3NjaGVkdWxlci5jCkBAIC0xNDUsNiArMTQ1LDggQEAgaW50IGk5MTVfc2No
ZWR1bGVyX3F1ZXVlX2V4ZWNidWZmZXIoc3RydWN0IGk5MTVfc2NoZWR1bGVyX3F1ZXVlX2VudHJ5
ICpxZSkKIAlpZiAoMS8qaTkxNS5zY2hlZHVsZXJfb3ZlcnJpZGUgJiBpOTE1X3NvX2RpcmVjdF9z
dWJtaXQqLykgewogCQlpbnQgcmV0OwogCisJCWludGVsX3JpbmdfcmVzZXJ2ZWRfc3BhY2VfY2Fu
Y2VsKHFlLT5wYXJhbXMucmVxdWVzdC0+cmluZ2J1Zik7CisKIAkJc2NoZWR1bGVyLT5mbGFnc1tx
ZS0+cGFyYW1zLnJpbmctPmlkXSB8PSBpOTE1X3NmX3N1Ym1pdHRpbmc7CiAJCXJldCA9IGRldl9w
cml2LT5ndC5leGVjYnVmX2ZpbmFsKCZxZS0+cGFyYW1zKTsKIAkJc2NoZWR1bGVyLT5mbGFnc1tx
ZS0+cGFyYW1zLnJpbmctPmlkXSAmPSB+aTkxNV9zZl9zdWJtaXR0aW5nOwpAQCAtMTc0LDYgKzE3
Niw4IEBAIGludCBpOTE1X3NjaGVkdWxlcl9xdWV1ZV9leGVjYnVmZmVyKHN0cnVjdCBpOTE1X3Nj
aGVkdWxlcl9xdWV1ZV9lbnRyeSAqcWUpCiAJbm9kZS0+c3RhbXAgID0gamlmZmllczsKIAlpOTE1
X2dlbV9yZXF1ZXN0X3JlZmVyZW5jZShub2RlLT5wYXJhbXMucmVxdWVzdCk7CiAKKwlpbnRlbF9y
aW5nX3Jlc2VydmVkX3NwYWNlX2NhbmNlbChub2RlLT5wYXJhbXMucmVxdWVzdC0+cmluZ2J1Zik7
CisKIAlCVUdfT04obm9kZS0+cGFyYW1zLnJlcXVlc3QtPnNjaGVkdWxlcl9xZSk7CiAJbm9kZS0+
cGFyYW1zLnJlcXVlc3QtPnNjaGVkdWxlcl9xZSA9IG5vZGU7CiAKZGlmZiAtLWdpdCBhL2RyaXZl
cnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf
bHJjLmMKaW5kZXggZjE0ZDliMi4uZWJjOTUxZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt
L2k5MTUvaW50ZWxfbHJjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMK
QEAgLTkzNCwxMyArOTM0LDE3IEBAIGludCBpbnRlbF9leGVjbGlzdHNfc3VibWlzc2lvbl9maW5h
bChzdHJ1Y3QgaTkxNV9leGVjYnVmZmVyX3BhcmFtcyAqcGFyYW1zKQogCS8qIFRoZSBtdXRleCBt
dXN0IGJlIGFjcXVpcmVkIGJlZm9yZSBjYWxsaW5nIHRoaXMgZnVuY3Rpb24gKi8KIAlCVUdfT04o
IW11dGV4X2lzX2xvY2tlZCgmcGFyYW1zLT5kZXYtPnN0cnVjdF9tdXRleCkpOwogCisJcmV0ID0g
aW50ZWxfbG9naWNhbF9yaW5nX3Jlc2VydmVfc3BhY2UocmVxKTsKKwlpZiAocmV0KQorCQlyZXR1
cm4gcmV0OworCiAJLyoKIAkgKiBVbmNvbmRpdGlvbmFsbHkgaW52YWxpZGF0ZSBncHUgY2FjaGVz
IGFuZCBlbnN1cmUgdGhhdCB3ZSBkbyBmbHVzaAogCSAqIGFueSByZXNpZHVhbCB3cml0ZXMgZnJv
bSB0aGUgcHJldmlvdXMgYmF0Y2guCiAJICovCiAJcmV0ID0gbG9naWNhbF9yaW5nX2ludmFsaWRh
dGVfYWxsX2NhY2hlcyhyZXEpOwogCWlmIChyZXQpCi0JCXJldHVybiByZXQ7CisJCWdvdG8gZXJy
OwogCiAJaWYgKHJpbmcgPT0gJmRldl9wcml2LT5yaW5nW1JDU10gJiYKIAkgICAgcGFyYW1zLT5p
bnN0cF9tb2RlICE9IGRldl9wcml2LT5yZWxhdGl2ZV9jb25zdGFudHNfbW9kZSkgewpAQCAtOTYy
LDEzICs5NjYsMTggQEAgaW50IGludGVsX2V4ZWNsaXN0c19zdWJtaXNzaW9uX2ZpbmFsKHN0cnVj
dCBpOTE1X2V4ZWNidWZmZXJfcGFyYW1zICpwYXJhbXMpCiAKIAlyZXQgPSByaW5nLT5lbWl0X2Ji
X3N0YXJ0KHJlcSwgZXhlY19zdGFydCwgcGFyYW1zLT5kaXNwYXRjaF9mbGFncyk7CiAJaWYgKHJl
dCkKLQkJcmV0dXJuIHJldDsKKwkJZ290byBlcnI7CiAKIAl0cmFjZV9pOTE1X2dlbV9yaW5nX2Rp
c3BhdGNoKHJlcSwgcGFyYW1zLT5kaXNwYXRjaF9mbGFncyk7CiAKIAlpOTE1X2dlbV9leGVjYnVm
ZmVyX3JldGlyZV9jb21tYW5kcyhwYXJhbXMpOwogCiAJcmV0dXJuIDA7CisKK2VycjoKKwlpbnRl
bF9yaW5nX3Jlc2VydmVkX3NwYWNlX2NhbmNlbChwYXJhbXMtPnJlcXVlc3QtPnJpbmdidWYpOwor
CisJcmV0dXJuIHJldDsKIH0KIAogdm9pZCBpbnRlbF9leGVjbGlzdHNfcmV0aXJlX3JlcXVlc3Rz
KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCi0tIAoxLjkuMQoKX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJ
bnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5v
cmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK