From mboxrd@z Thu Jan  1 00:00:00 1970
From: Matthew Auld <matthew.auld@intel.com>
Subject: [PATCH 3/8] drm/i915: nuke the duplicated stolen
	discovery
Date: Fri, 24 Nov 2017 16:42:52 +0000
Message-ID: <20171124164257.29955-4-matthew.auld@intel.com>
References: <20171124164257.29955-1-matthew.auld@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 mga04.intel.com (mga04.intel.com [192.55.52.120])
 by gabe.freedesktop.org (Postfix) with ESMTPS id B1A4F6E9BC
 for <intel-gfx@lists.freedesktop.org>; Fri, 24 Nov 2017 16:43:04 +0000 (UTC)
In-Reply-To: <20171124164257.29955-1-matthew.auld@intel.com>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://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: <https://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
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
List-Id: intel-gfx@lists.freedesktop.org

V2UgZHVwbGljYXRlIHRoZSBzdG9sZW4gZGlzY292ZXJ5IGNvZGUgaW4gZWFybHktcXVpcmtzIGFu
ZCBpbiBpOTE1LApob3dldmVyIG5vdyB0aGUgc3RvbGVuIHJlZ2lvbiBpcyBleHBvcnRlZCBhcyBh
IHJlc291cmNlIGZyb20KZWFybHktcXVpcmtzIHdlIGNhbiBudWtlIHRoZSBkdXBsaWNhdGlvbi4K
ClNpZ25lZC1vZmYtYnk6IE1hdHRoZXcgQXVsZCA8bWF0dGhldy5hdWxkQGludGVsLmNvbT4KQ2M6
IEpvb25hcyBMYWh0aW5lbiA8am9vbmFzLmxhaHRpbmVuQGxpbnV4LmludGVsLmNvbT4KQ2M6IENo
cmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpDYzogUGF1bG8gWmFub25pIDxw
YXVsby5yLnphbm9uaUBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n
ZW1fZ3R0LmMgICAgfCAgNTEgKy0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p
OTE1X2dlbV9zdG9sZW4uYyB8IDEwOSArLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0K
IDIgZmlsZXMgY2hhbmdlZCwgNCBpbnNlcnRpb25zKCspLCAxNTYgZGVsZXRpb25zKC0pCgpkaWZm
IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMgYi9kcml2ZXJzL2dw
dS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwppbmRleCA0MWEyMDNlMGMxNjAuLjZiNTY3YmFiMjM2
MyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKKysrIGIv
ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKQEAgLTI5NDksNTAgKzI5NDksNiBA
QCBzdGF0aWMgdW5zaWduZWQgaW50IGNodl9nZXRfdG90YWxfZ3R0X3NpemUodTE2IGdtY2hfY3Ry
bCkKIAlyZXR1cm4gMDsKIH0KIAotc3RhdGljIHNpemVfdCBnZW42X2dldF9zdG9sZW5fc2l6ZSh1
MTYgc25iX2dtY2hfY3RsKQotewotCXNuYl9nbWNoX2N0bCA+Pj0gU05CX0dNQ0hfR01TX1NISUZU
OwotCXNuYl9nbWNoX2N0bCAmPSBTTkJfR01DSF9HTVNfTUFTSzsKLQlyZXR1cm4gKHNpemVfdClz
bmJfZ21jaF9jdGwgPDwgMjU7IC8qIDMyIE1CIHVuaXRzICovCi19Ci0KLXN0YXRpYyBzaXplX3Qg
Z2VuOF9nZXRfc3RvbGVuX3NpemUodTE2IGJkd19nbWNoX2N0bCkKLXsKLQliZHdfZ21jaF9jdGwg
Pj49IEJEV19HTUNIX0dNU19TSElGVDsKLQliZHdfZ21jaF9jdGwgJj0gQkRXX0dNQ0hfR01TX01B
U0s7Ci0JcmV0dXJuIChzaXplX3QpYmR3X2dtY2hfY3RsIDw8IDI1OyAvKiAzMiBNQiB1bml0cyAq
LwotfQotCi1zdGF0aWMgc2l6ZV90IGNodl9nZXRfc3RvbGVuX3NpemUodTE2IGdtY2hfY3RybCkK
LXsKLQlnbWNoX2N0cmwgPj49IFNOQl9HTUNIX0dNU19TSElGVDsKLQlnbWNoX2N0cmwgJj0gU05C
X0dNQ0hfR01TX01BU0s7Ci0KLQkvKgotCSAqIDB4MCAgdG8gMHgxMDogMzJNQiBpbmNyZW1lbnRz
IHN0YXJ0aW5nIGF0IDBNQgotCSAqIDB4MTEgdG8gMHgxNjogNE1CIGluY3JlbWVudHMgc3RhcnRp
bmcgYXQgOE1CCi0JICogMHgxNyB0byAweDFkOiA0TUIgaW5jcmVtZW50cyBzdGFydCBhdCAzNk1C
Ci0JICovCi0JaWYgKGdtY2hfY3RybCA8IDB4MTEpCi0JCXJldHVybiAoc2l6ZV90KWdtY2hfY3Ry
bCA8PCAyNTsKLQllbHNlIGlmIChnbWNoX2N0cmwgPCAweDE3KQotCQlyZXR1cm4gKHNpemVfdCko
Z21jaF9jdHJsIC0gMHgxMSArIDIpIDw8IDIyOwotCWVsc2UKLQkJcmV0dXJuIChzaXplX3QpKGdt
Y2hfY3RybCAtIDB4MTcgKyA5KSA8PCAyMjsKLX0KLQotc3RhdGljIHNpemVfdCBnZW45X2dldF9z
dG9sZW5fc2l6ZSh1MTYgZ2VuOV9nbWNoX2N0bCkKLXsKLQlnZW45X2dtY2hfY3RsID4+PSBCRFdf
R01DSF9HTVNfU0hJRlQ7Ci0JZ2VuOV9nbWNoX2N0bCAmPSBCRFdfR01DSF9HTVNfTUFTSzsKLQot
CWlmIChnZW45X2dtY2hfY3RsIDwgMHhmMCkKLQkJcmV0dXJuIChzaXplX3QpZ2VuOV9nbWNoX2N0
bCA8PCAyNTsgLyogMzIgTUIgdW5pdHMgKi8KLQllbHNlCi0JCS8qIDRNQiBpbmNyZW1lbnRzIHN0
YXJ0aW5nIGF0IDB4ZjAgZm9yIDRNQiAqLwotCQlyZXR1cm4gKHNpemVfdCkoZ2VuOV9nbWNoX2N0
bCAtIDB4ZjAgKyAxKSA8PCAyMjsKLX0KLQogc3RhdGljIGludCBnZ3R0X3Byb2JlX2NvbW1vbihz
dHJ1Y3QgaTkxNV9nZ3R0ICpnZ3R0LCB1NjQgc2l6ZSkKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJp
dmF0ZSAqZGV2X3ByaXYgPSBnZ3R0LT5iYXNlLmk5MTU7CkBAIC0zMzQzLDE0ICszMjk5LDEzIEBA
IHN0YXRpYyBpbnQgZ2VuOF9nbWNoX3Byb2JlKHN0cnVjdCBpOTE1X2dndHQgKmdndHQpCiAKIAlw
Y2lfcmVhZF9jb25maWdfd29yZChwZGV2LCBTTkJfR01DSF9DVFJMLCAmc25iX2dtY2hfY3RsKTsK
IAorCWdndHQtPnN0b2xlbl9zaXplID0gcmVzb3VyY2Vfc2l6ZSgmaW50ZWxfZ3JhcGhpY3Nfc3Rv
bGVuX3Jlcyk7CisKIAlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA5KSB7Ci0JCWdndHQtPnN0
b2xlbl9zaXplID0gZ2VuOV9nZXRfc3RvbGVuX3NpemUoc25iX2dtY2hfY3RsKTsKIAkJc2l6ZSA9
IGdlbjhfZ2V0X3RvdGFsX2d0dF9zaXplKHNuYl9nbWNoX2N0bCk7CiAJfSBlbHNlIGlmIChJU19D
SEVSUllWSUVXKGRldl9wcml2KSkgewotCQlnZ3R0LT5zdG9sZW5fc2l6ZSA9IGNodl9nZXRfc3Rv
bGVuX3NpemUoc25iX2dtY2hfY3RsKTsKIAkJc2l6ZSA9IGNodl9nZXRfdG90YWxfZ3R0X3NpemUo
c25iX2dtY2hfY3RsKTsKIAl9IGVsc2UgewotCQlnZ3R0LT5zdG9sZW5fc2l6ZSA9IGdlbjhfZ2V0
X3N0b2xlbl9zaXplKHNuYl9nbWNoX2N0bCk7CiAJCXNpemUgPSBnZW44X2dldF90b3RhbF9ndHRf
c2l6ZShzbmJfZ21jaF9jdGwpOwogCX0KIApAQCAtMzQwOCw3ICszMzYzLDcgQEAgc3RhdGljIGlu
dCBnZW42X2dtY2hfcHJvYmUoc3RydWN0IGk5MTVfZ2d0dCAqZ2d0dCkKIAkJRFJNX0VSUk9SKCJD
YW4ndCBzZXQgRE1BIG1hc2svY29uc2lzdGVudCBtYXNrICglZClcbiIsIGVycik7CiAJcGNpX3Jl
YWRfY29uZmlnX3dvcmQocGRldiwgU05CX0dNQ0hfQ1RSTCwgJnNuYl9nbWNoX2N0bCk7CiAKLQln
Z3R0LT5zdG9sZW5fc2l6ZSA9IGdlbjZfZ2V0X3N0b2xlbl9zaXplKHNuYl9nbWNoX2N0bCk7CisJ
Z2d0dC0+c3RvbGVuX3NpemUgPSByZXNvdXJjZV9zaXplKCZpbnRlbF9ncmFwaGljc19zdG9sZW5f
cmVzKTsKIAogCXNpemUgPSBnZW42X2dldF90b3RhbF9ndHRfc2l6ZShzbmJfZ21jaF9jdGwpOwog
CWdndHQtPmJhc2UudG90YWwgPSAoc2l6ZSAvIHNpemVvZihnZW42X3B0ZV90KSkgPDwgUEFHRV9T
SElGVDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3N0b2xlbi5j
IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fc3RvbGVuLmMKaW5kZXggMTg3N2FlOWEx
ZDliLi5mMWI4ZWVkYTAwNTggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf
Z2VtX3N0b2xlbi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3N0b2xlbi5j
CkBAIC0zMCw5ICszMCw2IEBACiAjaW5jbHVkZSA8ZHJtL2k5MTVfZHJtLmg+CiAjaW5jbHVkZSAi
aTkxNV9kcnYuaCIKIAotI2RlZmluZSBLQih4KSAoKHgpICogMTAyNCkKLSNkZWZpbmUgTUIoeCkg
KEtCKHgpICogMTAyNCkKLQogLyoKICAqIFRoZSBCSU9TIHR5cGljYWxseSByZXNlcnZlcyBzb21l
IG9mIHRoZSBzeXN0ZW0ncyBtZW1vcnkgZm9yIHRoZSBleGNsdXNpdmUKICAqIHVzZSBvZiB0aGUg
aW50ZWdyYXRlZCBncmFwaGljcy4gVGhpcyBtZW1vcnkgaXMgbm8gbG9uZ2VyIGF2YWlsYWJsZSBm
b3IKQEAgLTgxLDExMyArNzgsOSBAQCB2b2lkIGk5MTVfZ2VtX3N0b2xlbl9yZW1vdmVfbm9kZShz
dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAKIHN0YXRpYyBkbWFfYWRkcl90IGk5
MTVfc3RvbGVuX3RvX2RtYShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7Ci0J
c3RydWN0IHBjaV9kZXYgKnBkZXYgPSBkZXZfcHJpdi0+ZHJtLnBkZXY7CiAJc3RydWN0IGk5MTVf
Z2d0dCAqZ2d0dCA9ICZkZXZfcHJpdi0+Z2d0dDsKKwlkbWFfYWRkcl90IGJhc2UgPSBpbnRlbF9n
cmFwaGljc19zdG9sZW5fcmVzLnN0YXJ0OwogCXN0cnVjdCByZXNvdXJjZSAqcjsKLQlkbWFfYWRk
cl90IGJhc2U7Ci0KLQkvKiBBbG1vc3QgdW5pdmVyc2FsbHkgd2UgY2FuIGZpbmQgdGhlIEdyYXBo
aWNzIEJhc2Ugb2YgU3RvbGVuIE1lbW9yeQotCSAqIGF0IHJlZ2lzdGVyIEJTTSAoMHg1YykgaW4g
dGhlIGlnZnggY29uZmlndXJhdGlvbiBzcGFjZS4gT24gYSBmZXcKLQkgKiAoZGVza3RvcCkgbWFj
aGluZXMgdGhpcyBpcyBhbHNvIG1pcnJvcmVkIGluIHRoZSBicmlkZ2UgZGV2aWNlIGF0Ci0JICog
ZGlmZmVyZW50IGxvY2F0aW9ucywgb3IgaW4gdGhlIE1DSEJBUi4KLQkgKgotCSAqIE9uIDg2NSB3
ZSBqdXN0IGNoZWNrIHRoZSBUT1VEIHJlZ2lzdGVyLgotCSAqCi0JICogT24gODMwLzg0NS84NXgg
dGhlIHN0b2xlbiBtZW1vcnkgYmFzZSBpc24ndCBhdmFpbGFibGUgaW4gYW55Ci0JICogcmVnaXN0
ZXIuIFdlIG5lZWQgdG8gY2FsY3VsYXRlIGl0IGFzIFRPTS1UU0VHX1NJWkUtc3RvbGVuX3NpemUu
Ci0JICoKLQkgKi8KLQliYXNlID0gMDsKLQlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSAzKSB7
Ci0JCXUzMiBic207Ci0KLQkJcGNpX3JlYWRfY29uZmlnX2R3b3JkKHBkZXYsIElOVEVMX0JTTSwg
JmJzbSk7Ci0KLQkJYmFzZSA9IGJzbSAmIElOVEVMX0JTTV9NQVNLOwotCX0gZWxzZSBpZiAoSVNf
STg2NUcoZGV2X3ByaXYpKSB7Ci0JCXUzMiB0c2VnX3NpemUgPSAwOwotCQl1MTYgdG91ZCA9IDA7
Ci0JCXU4IHRtcDsKLQotCQlwY2lfYnVzX3JlYWRfY29uZmlnX2J5dGUocGRldi0+YnVzLCBQQ0lf
REVWRk4oMCwgMCksCi0JCQkJCSBJODQ1X0VTTVJBTUMsICZ0bXApOwotCi0JCWlmICh0bXAgJiBU
U0VHX0VOQUJMRSkgewotCQkJc3dpdGNoICh0bXAgJiBJODQ1X1RTRUdfU0laRV9NQVNLKSB7Ci0J
CQljYXNlIEk4NDVfVFNFR19TSVpFXzUxMks6Ci0JCQkJdHNlZ19zaXplID0gS0IoNTEyKTsKLQkJ
CQlicmVhazsKLQkJCWNhc2UgSTg0NV9UU0VHX1NJWkVfMU06Ci0JCQkJdHNlZ19zaXplID0gTUIo
MSk7Ci0JCQkJYnJlYWs7Ci0JCQl9Ci0JCX0KLQotCQlwY2lfYnVzX3JlYWRfY29uZmlnX3dvcmQo
cGRldi0+YnVzLCBQQ0lfREVWRk4oMCwgMCksCi0JCQkJCSBJODY1X1RPVUQsICZ0b3VkKTsKLQot
CQliYXNlID0gKHRvdWQgPDwgMTYpICsgdHNlZ19zaXplOwotCX0gZWxzZSBpZiAoSVNfSTg1WChk
ZXZfcHJpdikpIHsKLQkJdTMyIHRzZWdfc2l6ZSA9IDA7Ci0JCXUzMiB0b207Ci0JCXU4IHRtcDsK
LQotCQlwY2lfYnVzX3JlYWRfY29uZmlnX2J5dGUocGRldi0+YnVzLCBQQ0lfREVWRk4oMCwgMCks
Ci0JCQkJCSBJODVYX0VTTVJBTUMsICZ0bXApOwotCi0JCWlmICh0bXAgJiBUU0VHX0VOQUJMRSkK
LQkJCXRzZWdfc2l6ZSA9IE1CKDEpOwotCi0JCXBjaV9idXNfcmVhZF9jb25maWdfYnl0ZShwZGV2
LT5idXMsIFBDSV9ERVZGTigwLCAxKSwKLQkJCQkJIEk4NVhfRFJCMywgJnRtcCk7Ci0JCXRvbSA9
IHRtcCAqIE1CKDMyKTsKLQotCQliYXNlID0gdG9tIC0gdHNlZ19zaXplIC0gZ2d0dC0+c3RvbGVu
X3NpemU7Ci0JfSBlbHNlIGlmIChJU19JODQ1RyhkZXZfcHJpdikpIHsKLQkJdTMyIHRzZWdfc2l6
ZSA9IDA7Ci0JCXUzMiB0b207Ci0JCXU4IHRtcDsKLQotCQlwY2lfYnVzX3JlYWRfY29uZmlnX2J5
dGUocGRldi0+YnVzLCBQQ0lfREVWRk4oMCwgMCksCi0JCQkJCSBJODQ1X0VTTVJBTUMsICZ0bXAp
OwotCi0JCWlmICh0bXAgJiBUU0VHX0VOQUJMRSkgewotCQkJc3dpdGNoICh0bXAgJiBJODQ1X1RT
RUdfU0laRV9NQVNLKSB7Ci0JCQljYXNlIEk4NDVfVFNFR19TSVpFXzUxMks6Ci0JCQkJdHNlZ19z
aXplID0gS0IoNTEyKTsKLQkJCQlicmVhazsKLQkJCWNhc2UgSTg0NV9UU0VHX1NJWkVfMU06Ci0J
CQkJdHNlZ19zaXplID0gTUIoMSk7Ci0JCQkJYnJlYWs7Ci0JCQl9Ci0JCX0KLQotCQlwY2lfYnVz
X3JlYWRfY29uZmlnX2J5dGUocGRldi0+YnVzLCBQQ0lfREVWRk4oMCwgMCksCi0JCQkJCSBJODMw
X0RSQjMsICZ0bXApOwotCQl0b20gPSB0bXAgKiBNQigzMik7Ci0KLQkJYmFzZSA9IHRvbSAtIHRz
ZWdfc2l6ZSAtIGdndHQtPnN0b2xlbl9zaXplOwotCX0gZWxzZSBpZiAoSVNfSTgzMChkZXZfcHJp
dikpIHsKLQkJdTMyIHRzZWdfc2l6ZSA9IDA7Ci0JCXUzMiB0b207Ci0JCXU4IHRtcDsKLQotCQlw
Y2lfYnVzX3JlYWRfY29uZmlnX2J5dGUocGRldi0+YnVzLCBQQ0lfREVWRk4oMCwgMCksCi0JCQkJ
CSBJODMwX0VTTVJBTUMsICZ0bXApOwotCi0JCWlmICh0bXAgJiBUU0VHX0VOQUJMRSkgewotCQkJ
aWYgKHRtcCAmIEk4MzBfVFNFR19TSVpFXzFNKQotCQkJCXRzZWdfc2l6ZSA9IE1CKDEpOwotCQkJ
ZWxzZQotCQkJCXRzZWdfc2l6ZSA9IEtCKDUxMik7Ci0JCX0KLQotCQlwY2lfYnVzX3JlYWRfY29u
ZmlnX2J5dGUocGRldi0+YnVzLCBQQ0lfREVWRk4oMCwgMCksCi0JCQkJCSBJODMwX0RSQjMsICZ0
bXApOwotCQl0b20gPSB0bXAgKiBNQigzMik7Ci0KLQkJYmFzZSA9IHRvbSAtIHRzZWdfc2l6ZSAt
IGdndHQtPnN0b2xlbl9zaXplOwotCX0KIAogCWlmIChiYXNlID09IDAgfHwgYWRkX292ZXJmbG93
cyhiYXNlLCBnZ3R0LT5zdG9sZW5fc2l6ZSkpCiAJCXJldHVybiAwOwotLSAKMi4xNC4zCgpfX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFp
bGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5m
cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK