From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ben Widawsky <benjamin.widawsky@intel.com>
Subject: [PATCH 6/6] drm/i915: obey wbinvd threshold in more
	places
Date: Mon,  9 Feb 2015 13:54:19 -0800
Message-ID: <1423518859-6199-7-git-send-email-benjamin.widawsky@intel.com>
References: <1423518859-6199-1-git-send-email-benjamin.widawsky@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 CB41B6E1FB
 for <intel-gfx@lists.freedesktop.org>; Mon,  9 Feb 2015 13:54:27 -0800 (PST)
In-Reply-To: <1423518859-6199-1-git-send-email-benjamin.widawsky@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 <intel-gfx@lists.freedesktop.org>
Cc: Ben Widawsky <ben@bwidawsk.net>, Ben Widawsky <benjamin.widawsky@intel.com>
List-Id: intel-gfx@lists.freedesktop.org

U2lnbmVkLW9mZi1ieTogQmVuIFdpZGF3c2t5IDxiZW5AYndpZGF3c2submV0PgotLS0KIGRyaXZl
cnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggICAgIHwgIDQgKysrKwogZHJpdmVycy9ncHUvZHJt
L2k5MTUvaTkxNV9nZW0uYyAgICAgfCAzMiArKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0t
LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMgfCAxMyArKysrKysrKysrLS0t
CiAzIGZpbGVzIGNoYW5nZWQsIDQyIGluc2VydGlvbnMoKyksIDcgZGVsZXRpb25zKC0pCgpkaWZm
IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2Ry
bS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggNWQyZjYyZC4uZGZlY2RmZCAxMDA2NDQKLS0tIGEvZHJp
dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p
OTE1X2Rydi5oCkBAIC0yODE4LDYgKzI4MTgsMTAgQEAgc3RhdGljIGlubGluZSBib29sIGNwdV9j
YWNoZV9pc19jb2hlcmVudChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogewogCXJldHVybiBIQVNf
TExDKGRldikgfHwgbGV2ZWwgIT0gSTkxNV9DQUNIRV9OT05FOwogfQorc3RhdGljIGlubGluZSBi
b29sIGk5MTVfZ2VtX29ial9zaG91bGRfY2xmbHVzaChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVj
dCAqb2JqKQoreworCXJldHVybiBvYmotPmJhc2Uuc2l6ZSA+PSB0b19pOTE1KG9iai0+YmFzZS5k
ZXYpLT53YmludmRfdGhyZXNob2xkOworfQogaW50IF9fbXVzdF9jaGVjayBpOTE1X2dlbV9vYmpl
Y3RfZmluaXNoX2dwdShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqKTsKIGludCBfX211
c3RfY2hlY2sgaTkxNV9nZW1faW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKIGludCBpOTE1
X2dlbV9pbml0X3JpbmdzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwpkaWZmIC0tZ2l0IGEvZHJp
dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf
Z2VtLmMKaW5kZXggNGQ1YTY5ZC4uNTliZTcwOSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt
L2k5MTUvaTkxNV9nZW0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCkBA
IC0yMDQsNiArMjA0LDcgQEAgaTkxNV9nZW1fb2JqZWN0X2dldF9wYWdlc19waHlzKHN0cnVjdCBk
cm1faTkxNV9nZW1fb2JqZWN0ICpvYmopCiAJY2hhciAqdmFkZHIgPSBvYmotPnBoeXNfaGFuZGxl
LT52YWRkcjsKIAlzdHJ1Y3Qgc2dfdGFibGUgKnN0OwogCXN0cnVjdCBzY2F0dGVybGlzdCAqc2c7
CisJY29uc3QgYm9vbCBkb193YmludmQgPSBpOTE1X2dlbV9vYmpfc2hvdWxkX2NsZmx1c2gob2Jq
KTsKIAlpbnQgaTsKIAogCWlmIChXQVJOX09OKGk5MTVfZ2VtX29iamVjdF9uZWVkc19iaXQxN19z
d2l6emxlKG9iaikpKQpAQCAtMjE5LDEyICsyMjAsMTUgQEAgaTkxNV9nZW1fb2JqZWN0X2dldF9w
YWdlc19waHlzKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmopCiAKIAkJc3JjID0ga21h
cF9hdG9taWMocGFnZSk7CiAJCW1lbWNweSh2YWRkciwgc3JjLCBQQUdFX1NJWkUpOwotCQlkcm1f
Y2xmbHVzaF92aXJ0X3JhbmdlKHZhZGRyLCBQQUdFX1NJWkUpOworCQlpZiAoIWRvX3diaW52ZCkK
KwkJCWRybV9jbGZsdXNoX3ZpcnRfcmFuZ2UodmFkZHIsIFBBR0VfU0laRSk7CiAJCWt1bm1hcF9h
dG9taWMoc3JjKTsKIAogCQlwYWdlX2NhY2hlX3JlbGVhc2UocGFnZSk7CiAJCXZhZGRyICs9IFBB
R0VfU0laRTsKIAl9CisJaWYgKGRvX3diaW52ZCkKKwkJd2JpbnZkKCk7CiAKIAlpOTE1X2dlbV9j
aGlwc2V0X2ZsdXNoKG9iai0+YmFzZS5kZXYpOwogCkBAIC0yNTIsNiArMjU2LDcgQEAgaTkxNV9n
ZW1fb2JqZWN0X2dldF9wYWdlc19waHlzKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmop
CiBzdGF0aWMgdm9pZAogaTkxNV9nZW1fb2JqZWN0X3B1dF9wYWdlc19waHlzKHN0cnVjdCBkcm1f
aTkxNV9nZW1fb2JqZWN0ICpvYmopCiB7CisJY29uc3QgYm9vbCBkb193YmludmQgPSBpOTE1X2dl
bV9vYmpfc2hvdWxkX2NsZmx1c2gob2JqKTsKIAlpbnQgcmV0OwogCiAJQlVHX09OKG9iai0+bWFk
diA9PSBfX0k5MTVfTUFEVl9QVVJHRUQpOwpAQCAtMjgyLDcgKzI4Nyw4IEBAIGk5MTVfZ2VtX29i
amVjdF9wdXRfcGFnZXNfcGh5cyhzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqKQogCQkJ
CWNvbnRpbnVlOwogCiAJCQlkc3QgPSBrbWFwX2F0b21pYyhwYWdlKTsKLQkJCWRybV9jbGZsdXNo
X3ZpcnRfcmFuZ2UodmFkZHIsIFBBR0VfU0laRSk7CisJCQlpZiAoIWRvX3diaW52ZCkKKwkJCQlk
cm1fY2xmbHVzaF92aXJ0X3JhbmdlKHZhZGRyLCBQQUdFX1NJWkUpOwogCQkJbWVtY3B5KGRzdCwg
dmFkZHIsIFBBR0VfU0laRSk7CiAJCQlrdW5tYXBfYXRvbWljKGRzdCk7CiAKQEAgLTI5NSw2ICsz
MDEsOSBAQCBpOTE1X2dlbV9vYmplY3RfcHV0X3BhZ2VzX3BoeXMoc3RydWN0IGRybV9pOTE1X2dl
bV9vYmplY3QgKm9iaikKIAkJb2JqLT5kaXJ0eSA9IDA7CiAJfQogCisJaWYgKGRvX3diaW52ZCAm
JiAhcmV0KQorCQl3YmludmQoKTsKKwogCXNnX2ZyZWVfdGFibGUob2JqLT5wYWdlcyk7CiAJa2Zy
ZWUob2JqLT5wYWdlcyk7CiAKQEAgLTM5Niw3ICs0MDUsMTAgQEAgaTkxNV9nZW1fcGh5c19wd3Jp
dGUoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwKIAkJCXJldHVybiAtRUZBVUxUOwog
CX0KIAotCWRybV9jbGZsdXNoX3ZpcnRfcmFuZ2UodmFkZHIsIGFyZ3MtPnNpemUpOworCWlmIChh
cmdzLT5zaXplID49IHRvX2k5MTUob2JqLT5iYXNlLmRldiktPndiaW52ZF90aHJlc2hvbGQpCisJ
CXdiaW52ZCgpOworCWVsc2UKKwkJZHJtX2NsZmx1c2hfdmlydF9yYW5nZSh2YWRkciwgYXJncy0+
c2l6ZSk7CiAJaTkxNV9nZW1fY2hpcHNldF9mbHVzaChkZXYpOwogCXJldHVybiAwOwogfQpAQCAt
NjQ3LDYgKzY1OSw3IEBAIGk5MTVfZ2VtX3NobWVtX3ByZWFkKHN0cnVjdCBkcm1fZGV2aWNlICpk
ZXYsCiAJaW50IG9ial9kb19iaXQxN19zd2l6emxpbmcsIHBhZ2VfZG9fYml0MTdfc3dpenpsaW5n
OwogCWludCBwcmVmYXVsdGVkID0gMDsKIAlpbnQgbmVlZHNfY2xmbHVzaCA9IDA7CisJYm9vbCBk
b193YmludmQgPSBmYWxzZTsKIAlzdHJ1Y3Qgc2dfcGFnZV9pdGVyIHNnX2l0ZXI7CiAKIAl1c2Vy
X2RhdGEgPSB0b191c2VyX3B0cihhcmdzLT5kYXRhX3B0cik7CkBAIC02NTgsNiArNjcxLDkgQEAg
aTkxNV9nZW1fc2htZW1fcHJlYWQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAlpZiAocmV0KQog
CQlyZXR1cm4gcmV0OwogCisJaWYgKG5lZWRzX2NsZmx1c2ggJiYgaTkxNV9nZW1fb2JqX3Nob3Vs
ZF9jbGZsdXNoKG9iaikpCisJCWRvX3diaW52ZCA9IHRydWU7CisKIAlvZmZzZXQgPSBhcmdzLT5v
ZmZzZXQ7CiAKIAlmb3JfZWFjaF9zZ19wYWdlKG9iai0+cGFnZXMtPnNnbCwgJnNnX2l0ZXIsIG9i
ai0+cGFnZXMtPm5lbnRzLApAQCAtNzE0LDYgKzczMCw5IEBAIG5leHRfcGFnZToKIAl9CiAKIG91
dDoKKwlpZiAoZG9fd2JpbnZkICYmICFyZXQpCisJCXdiaW52ZCgpOworCiAJaTkxNV9nZW1fb2Jq
ZWN0X3VucGluX3BhZ2VzKG9iaik7CiAKIAlyZXR1cm4gcmV0OwpAQCAtNDA2MSw3ICs0MDgwLDEy
IEBAIGk5MTVfZ2VtX29iamVjdF9zZXRfdG9fY3B1X2RvbWFpbihzdHJ1Y3QgZHJtX2k5MTVfZ2Vt
X29iamVjdCAqb2JqLCBib29sIHdyaXRlKQogCiAJLyogRmx1c2ggdGhlIENQVSBjYWNoZSBpZiBp
dCdzIHN0aWxsIGludmFsaWQuICovCiAJaWYgKChvYmotPmJhc2UucmVhZF9kb21haW5zICYgSTkx
NV9HRU1fRE9NQUlOX0NQVSkgPT0gMCkgewotCQlpOTE1X2dlbV9jbGZsdXNoX29iamVjdChvYmos
IGZhbHNlKTsKKwkJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gb2JqLT5iYXNl
LmRldi0+ZGV2X3ByaXZhdGU7CisJCWlmIChpc19jcHVfZmx1c2hfcmVxdWlyZWQob2JqKSAmJgor
CQkgICAgb2JqLT5iYXNlLnNpemUgPj0gZGV2X3ByaXYtPndiaW52ZF90aHJlc2hvbGQpCisJCQl3
YmludmQoKTsKKwkJZWxzZQorCQkJaTkxNV9nZW1fY2xmbHVzaF9vYmplY3Qob2JqLCBmYWxzZSk7
CiAKIAkJb2JqLT5iYXNlLnJlYWRfZG9tYWlucyB8PSBJOTE1X0dFTV9ET01BSU5fQ1BVOwogCX0K
ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jIGIvZHJpdmVy
cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKaW5kZXggNzQ2Zjc3Zi4uMTNjYzQ5MyAxMDA2
NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKKysrIGIvZHJpdmVy
cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKQEAgLTM3MSw2ICszNzEsOSBAQCBzdGF0aWMg
dm9pZCBnZW44X3BwZ3R0X2luc2VydF9lbnRyaWVzKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2Ug
KnZtLAogCXVuc2lnbmVkIHBkZSA9IHN0YXJ0ID4+IEdFTjhfUERFX1NISUZUICYgR0VOOF9QREVf
TUFTSzsKIAl1bnNpZ25lZCBwdGUgPSBzdGFydCA+PiBHRU44X1BURV9TSElGVCAmIEdFTjhfUFRF
X01BU0s7CiAJc3RydWN0IHNnX3BhZ2VfaXRlciBzZ19pdGVyOworCWNvbnN0IGJvb2wgbmVlZHNf
Zmx1c2ggPSAhSEFTX0xMQyhwcGd0dC0+YmFzZS5kZXYpOworCWJvb2wgZG9fd2JpbnZkID0gbmVl
ZHNfZmx1c2ggJiYKKwkJcGFnZXMtPm5lbnRzICogUEFHRV9TSVpFID49IHRvX2k5MTUodm0tPmRl
diktPndiaW52ZF90aHJlc2hvbGQ7CiAKIAlwdF92YWRkciA9IE5VTEw7CiAKQEAgLTM4NSw3ICsz
ODgsNyBAQCBzdGF0aWMgdm9pZCBnZW44X3BwZ3R0X2luc2VydF9lbnRyaWVzKHN0cnVjdCBpOTE1
X2FkZHJlc3Nfc3BhY2UgKnZtLAogCQkJZ2VuOF9wdGVfZW5jb2RlKHNnX3BhZ2VfaXRlcl9kbWFf
YWRkcmVzcygmc2dfaXRlciksCiAJCQkJCWNhY2hlX2xldmVsLCB0cnVlKTsKIAkJaWYgKCsrcHRl
ID09IEdFTjhfUFRFU19QRVJfUEFHRSkgewotCQkJaWYgKCFIQVNfTExDKHBwZ3R0LT5iYXNlLmRl
dikpCisJCQlpZiAobmVlZHNfZmx1c2ggJiYgIWRvX3diaW52ZCkKIAkJCQlkcm1fY2xmbHVzaF92
aXJ0X3JhbmdlKHB0X3ZhZGRyLCBQQUdFX1NJWkUpOwogCQkJa3VubWFwX2F0b21pYyhwdF92YWRk
cik7CiAJCQlwdF92YWRkciA9IE5VTEw7CkBAIC00MDEsNiArNDA0LDkgQEAgc3RhdGljIHZvaWQg
Z2VuOF9wcGd0dF9pbnNlcnRfZW50cmllcyhzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwK
IAkJCWRybV9jbGZsdXNoX3ZpcnRfcmFuZ2UocHRfdmFkZHIsIFBBR0VfU0laRSk7CiAJCWt1bm1h
cF9hdG9taWMocHRfdmFkZHIpOwogCX0KKworCWlmIChkb193YmludmQpCisJCXdiaW52ZCgpOwog
fQogCiBzdGF0aWMgdm9pZCBnZW44X2ZyZWVfcGFnZV90YWJsZXMoc3RydWN0IHBhZ2UgKipwdF9w
YWdlcykKQEAgLTY2MCwxMSArNjY2LDEyIEBAIHN0YXRpYyBpbnQgZ2VuOF9wcGd0dF9pbml0KHN0
cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwgdWludDY0X3Qgc2l6ZSkKIAkJCXBkX3ZhZGRyW2pd
ID0gZ2VuOF9wZGVfZW5jb2RlKHBwZ3R0LT5iYXNlLmRldiwgYWRkciwKIAkJCQkJCSAgICAgIEk5
MTVfQ0FDSEVfTExDKTsKIAkJfQotCQlpZiAoIUhBU19MTEMocHBndHQtPmJhc2UuZGV2KSkKLQkJ
CWRybV9jbGZsdXNoX3ZpcnRfcmFuZ2UocGRfdmFkZHIsIFBBR0VfU0laRSk7CiAJCWt1bm1hcF9h
dG9taWMocGRfdmFkZHIpOwogCX0KIAorCWlmICghSEFTX0xMQyhwcGd0dC0+YmFzZS5kZXYpKQor
CQl3YmludmQoKTsKKwogCXBwZ3R0LT5zd2l0Y2hfbW0gPSBnZW44X21tX3N3aXRjaDsKIAlwcGd0
dC0+YmFzZS5jbGVhcl9yYW5nZSA9IGdlbjhfcHBndHRfY2xlYXJfcmFuZ2U7CiAJcHBndHQtPmJh
c2UuaW5zZXJ0X2VudHJpZXMgPSBnZW44X3BwZ3R0X2luc2VydF9lbnRyaWVzOwotLSAKMi4zLjAK
Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdm
eCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlz
dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==