From mboxrd@z Thu Jan  1 00:00:00 1970
From: Chris Wilson <chris@chris-wilson.co.uk>
Subject: [PATCH 094/190] drm/i915: Remove early l3-remap
Date: Mon, 11 Jan 2016 10:44:38 +0000
Message-ID: <1452509174-16671-8-git-send-email-chris@chris-wilson.co.uk>
References: <1452503961-14837-1-git-send-email-chris@chris-wilson.co.uk>
 <1452509174-16671-1-git-send-email-chris@chris-wilson.co.uk>
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 mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 95F326E2D1
 for <intel-gfx@lists.freedesktop.org>; Mon, 11 Jan 2016 02:46:35 -0800 (PST)
Received: by mail-wm0-f65.google.com with SMTP id f206so25660512wmf.2
 for <intel-gfx@lists.freedesktop.org>; Mon, 11 Jan 2016 02:46:35 -0800 (PST)
In-Reply-To: <1452509174-16671-1-git-send-email-chris@chris-wilson.co.uk>
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

U2luY2Ugd2UgZG8gdGhlIGwzLXJlbWFwIG9uIGNvbnRleHQgc3dpdGNoLCBhbmQgcHJvY2VlZCB0
byBkbyBhIGNvbnRleHQKc3dpdGNoIGltbWVkaWF0ZWx5IGFmdGVyIG1hbnVhbGx5IGRvaW5nIHRo
ZSBsMy1yZW1hcCwgd2UgY2FuIHJlbW92ZSB0aGUKcmVkdW5kYW50IG1hbnVhbCBjYWxsLgoKU2ln
bmVkLW9mZi1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+Ci0tLQog
ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgICAgIHwgIDEgLQogZHJpdmVycy9n
cHUvZHJtL2k5MTUvaTkxNV9nZW0uYyAgICAgICAgIHwgMzUgKy0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMgfCAz
MCArKysrKysrKysrKysrKysrKysrKysrKysrKystCiAzIGZpbGVzIGNoYW5nZWQsIDMwIGluc2Vy
dGlvbnMoKyksIDM2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p
OTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IGY1
ZjQ1NzkyMDk0NC4uN2RjM2VlZDcxZWIzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx
NS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTI4
MjcsNyArMjgyNyw2IEBAIGJvb2wgaTkxNV9nZW1fY2xmbHVzaF9vYmplY3Qoc3RydWN0IGRybV9p
OTE1X2dlbV9vYmplY3QgKm9iaiwgYm9vbCBmb3JjZSk7CiBpbnQgX19tdXN0X2NoZWNrIGk5MTVf
Z2VtX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CiBpbnQgaTkxNV9nZW1faW5pdF9yaW5n
cyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKIGludCBfX211c3RfY2hlY2sgaTkxNV9nZW1faW5p
dF9odyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKLWludCBpOTE1X2dlbV9sM19yZW1hcChzdHJ1
Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwgaW50IHNsaWNlKTsKIHZvaWQgaTkxNV9nZW1f
aW5pdF9zd2l6emxpbmcoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CiB2b2lkIGk5MTVfZ2VtX2Ns
ZWFudXBfcmluZ2J1ZmZlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKIGludCBfX211c3RfY2hl
Y2sgaTkxNV9ncHVfaWRsZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKZGlmZiAtLWdpdCBhL2Ry
aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1
X2dlbS5jCmluZGV4IDk4OTIyMmViMTA3Yi4uMzc5OTEzMjIxYWIxIDEwMDY0NAotLS0gYS9kcml2
ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5
MTVfZ2VtLmMKQEAgLTM5NTEsMzQgKzM5NTEsNiBAQCBlcnI6CiAJcmV0dXJuIHJldDsKIH0KIAot
aW50IGk5MTVfZ2VtX2wzX3JlbWFwKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLCBp
bnQgc2xpY2UpCi17Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gcmVxLT5p
OTE1OwotCXUzMiAqcmVtYXBfaW5mbyA9IGRldl9wcml2LT5sM19wYXJpdHkucmVtYXBfaW5mb1tz
bGljZV07Ci0JaW50IGksIHJldDsKLQotCWlmICghSEFTX0wzX0RQRihkZXZfcHJpdikgfHwgIXJl
bWFwX2luZm8pCi0JCXJldHVybiAwOwotCi0JcmV0ID0gaW50ZWxfcmluZ19iZWdpbihyZXEsIEdF
TjdfTDNMT0dfU0laRSAvIDQgKiAzKTsKLQlpZiAocmV0KQotCQlyZXR1cm4gcmV0OwotCi0JLyoK
LQkgKiBOb3RlOiBXZSBkbyBub3Qgd29ycnkgYWJvdXQgdGhlIGNvbmN1cnJlbnQgcmVnaXN0ZXIg
Y2FjaGVsaW5lIGhhbmcKLQkgKiBoZXJlIGJlY2F1c2Ugbm8gb3RoZXIgY29kZSBzaG91bGQgYWNj
ZXNzIHRoZXNlIHJlZ2lzdGVycyBvdGhlciB0aGFuCi0JICogYXQgaW5pdGlhbGl6YXRpb24gdGlt
ZS4KLQkgKi8KLQlmb3IgKGkgPSAwOyBpIDwgR0VON19MM0xPR19TSVpFIC8gNDsgaSsrKSB7Ci0J
CWludGVsX3JpbmdfZW1pdChyZXEtPnJpbmcsIE1JX0xPQURfUkVHSVNURVJfSU1NKDEpKTsKLQkJ
aW50ZWxfcmluZ19lbWl0X3JlZyhyZXEtPnJpbmcsIEdFTjdfTDNMT0coc2xpY2UsIGkpKTsKLQkJ
aW50ZWxfcmluZ19lbWl0KHJlcS0+cmluZywgcmVtYXBfaW5mb1tpXSk7Ci0JfQotCWludGVsX3Jp
bmdfYWR2YW5jZShyZXEtPnJpbmcpOwotCi0JcmV0dXJuIHJldDsKLX0KLQogdm9pZCBpOTE1X2dl
bV9pbml0X3N3aXp6bGluZyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogewogCXN0cnVjdCBkcm1f
aTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CkBAIC00MDgzLDcgKzQw
NTUsNyBAQCBpOTE1X2dlbV9pbml0X2h3KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7CiAJc3Ry
dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1
Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nOwotCWludCByZXQsIGksIGo7CisJaW50IHJldCwgaTsK
IAogCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA8IDYgJiYgIWludGVsX2VuYWJsZV9ndHQoKSkK
IAkJcmV0dXJuIC1FSU87CkBAIC00MTU4LDExICs0MTMwLDYgQEAgaTkxNV9nZW1faW5pdF9odyhz
dHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQkJZ290byBvdXQ7CiAJCX0KIAotCQlpZiAocmluZy0+
aWQgPT0gUkNTKSB7Ci0JCQlmb3IgKGogPSAwOyBqIDwgTlVNX0wzX1NMSUNFUyhkZXYpOyBqKysp
Ci0JCQkJaTkxNV9nZW1fbDNfcmVtYXAocmVxLCBqKTsKLQkJfQotCiAJCXJldCA9IGk5MTVfcHBn
dHRfaW5pdF9yaW5nKHJlcSk7CiAJCWlmIChyZXQgJiYgcmV0ICE9IC1FSU8pIHsKIAkJCURSTV9F
UlJPUigiUFBHVFQgZW5hYmxlIHJpbmcgIyVkIGZhaWxlZCAlZFxuIiwgaSwgcmV0KTsKZGlmZiAt
LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYyBiL2RyaXZlcnMv
Z3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYwppbmRleCBlMGVjZmRmYjBjOGMuLjE1ZTJl
MmFiZDcyZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4
dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYwpAQCAtNjY1
LDYgKzY2NSwzNCBAQCBuZWVkc19wZF9sb2FkX3Bvc3Qoc3RydWN0IGludGVsX2VuZ2luZV9jcyAq
cmluZywgc3RydWN0IGludGVsX2NvbnRleHQgKnRvLAogCXJldHVybiBmYWxzZTsKIH0KIAorc3Rh
dGljIGludCByZW1hcF9sMyhzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwgaW50IHNs
aWNlKQoreworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHJlcS0+aTkxNTsK
Kwl1MzIgKnJlbWFwX2luZm8gPSBkZXZfcHJpdi0+bDNfcGFyaXR5LnJlbWFwX2luZm9bc2xpY2Vd
OworCWludCBpLCByZXQ7CisKKwlpZiAoIUhBU19MM19EUEYoZGV2X3ByaXYpIHx8ICFyZW1hcF9p
bmZvKQorCQlyZXR1cm4gMDsKKworCXJldCA9IGludGVsX3JpbmdfYmVnaW4ocmVxLCBHRU43X0wz
TE9HX1NJWkUgLyA0ICogMyk7CisJaWYgKHJldCkKKwkJcmV0dXJuIHJldDsKKworCS8qCisJICog
Tm90ZTogV2UgZG8gbm90IHdvcnJ5IGFib3V0IHRoZSBjb25jdXJyZW50IHJlZ2lzdGVyIGNhY2hl
bGluZSBoYW5nCisJICogaGVyZSBiZWNhdXNlIG5vIG90aGVyIGNvZGUgc2hvdWxkIGFjY2VzcyB0
aGVzZSByZWdpc3RlcnMgb3RoZXIgdGhhbgorCSAqIGF0IGluaXRpYWxpemF0aW9uIHRpbWUuCisJ
ICovCisJZm9yIChpID0gMDsgaSA8IEdFTjdfTDNMT0dfU0laRSAvIDQ7IGkrKykgeworCQlpbnRl
bF9yaW5nX2VtaXQocmVxLT5yaW5nLCBNSV9MT0FEX1JFR0lTVEVSX0lNTSgxKSk7CisJCWludGVs
X3JpbmdfZW1pdF9yZWcocmVxLT5yaW5nLCBHRU43X0wzTE9HKHNsaWNlLCBpKSk7CisJCWludGVs
X3JpbmdfZW1pdChyZXEtPnJpbmcsIHJlbWFwX2luZm9baV0pOworCX0KKwlpbnRlbF9yaW5nX2Fk
dmFuY2UocmVxLT5yaW5nKTsKKworCXJldHVybiAwOworfQorCiBzdGF0aWMgaW50IGRvX3N3aXRj
aChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSkKIHsKIAlzdHJ1Y3QgaW50ZWxfY29u
dGV4dCAqdG8gPSByZXEtPmN0eDsKQEAgLTc2NCw3ICs3OTIsNyBAQCBzdGF0aWMgaW50IGRvX3N3
aXRjaChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSkKIAkJaWYgKCEodG8tPnJlbWFw
X3NsaWNlICYgKDE8PGkpKSkKIAkJCWNvbnRpbnVlOwogCi0JCXJldCA9IGk5MTVfZ2VtX2wzX3Jl
bWFwKHJlcSwgaSk7CisJCXJldCA9IHJlbWFwX2wzKHJlcSwgaSk7CiAJCS8qIElmIGl0IGZhaWxl
ZCwgdHJ5IGFnYWluIG5leHQgcm91bmQgKi8KIAkJaWYgKHJldCkKIAkJCURSTV9ERUJVR19EUklW
RVIoIkwzIHJlbWFwcGluZyBmYWlsZWRcbiIpOwotLSAKMi43LjAucmMzCgpfX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0
CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9w
Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=