From mboxrd@z Thu Jan  1 00:00:00 1970
From: Matthew Auld <matthew.auld@intel.com>
Subject: [PATCH 4/9] drm/i915: nuke the duplicated stolen
	discovery
Date: Thu,  7 Dec 2017 12:28:34 +0000
Message-ID: <20171207122839.29925-5-matthew.auld@intel.com>
References: <20171207122839.29925-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 mga09.intel.com (mga09.intel.com [134.134.136.24])
 by gabe.freedesktop.org (Postfix) with ESMTPS id CBF5A6E7F4
 for <intel-gfx@lists.freedesktop.org>; Thu,  7 Dec 2017 12:28:54 +0000 (UTC)
In-Reply-To: <20171207122839.29925-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
ZCBpbiBpOTE1LApob3dldmVyIG5vdyB0aGF0IHRoZSBzdG9sZW4gcmVnaW9uIGlzIGV4cG9ydGVk
IGFzIGEgcmVzb3VyY2UgZnJvbQplYXJseS1xdWlya3Mgd2UgY2FuIG51a2UgdGhlIGR1cGxpY2F0
aW9uLgoKdjI6IGNoZWNrIG92ZXJmbG93c190eXBlCgpTaWduZWQtb2ZmLWJ5OiBNYXR0aGV3IEF1
bGQgPG1hdHRoZXcuYXVsZEBpbnRlbC5jb20+CkNjOiBKb29uYXMgTGFodGluZW4gPGpvb25hcy5s
YWh0aW5lbkBsaW51eC5pbnRlbC5jb20+CkNjOiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdp
bHNvbi5jby51az4KQ2M6IFBhdWxvIFphbm9uaSA8cGF1bG8uci56YW5vbmlAaW50ZWwuY29tPgpS
ZXZpZXdlZC1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+Ci0tLQog
ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMgICAgfCAgNTEgKy0tLS0tLS0tLS0t
LS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9zdG9sZW4uYyB8IDEwOSArLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgNSBpbnNlcnRpb25z
KCspLCAxNTUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv
aTkxNV9nZW1fZ3R0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwppbmRl
eCAyMDliYjExMWY2NTIuLjAzNmE3OWZlMjUyZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt
L2k5MTUvaTkxNV9nZW1fZ3R0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1f
Z3R0LmMKQEAgLTI5NDksNTAgKzI5NDksNiBAQCBzdGF0aWMgdW5zaWduZWQgaW50IGNodl9nZXRf
dG90YWxfZ3R0X3NpemUodTE2IGdtY2hfY3RybCkKIAlyZXR1cm4gMDsKIH0KIAotc3RhdGljIHNp
emVfdCBnZW42X2dldF9zdG9sZW5fc2l6ZSh1MTYgc25iX2dtY2hfY3RsKQotewotCXNuYl9nbWNo
X2N0bCA+Pj0gU05CX0dNQ0hfR01TX1NISUZUOwotCXNuYl9nbWNoX2N0bCAmPSBTTkJfR01DSF9H
TVNfTUFTSzsKLQlyZXR1cm4gKHNpemVfdClzbmJfZ21jaF9jdGwgPDwgMjU7IC8qIDMyIE1CIHVu
aXRzICovCi19Ci0KLXN0YXRpYyBzaXplX3QgZ2VuOF9nZXRfc3RvbGVuX3NpemUodTE2IGJkd19n
bWNoX2N0bCkKLXsKLQliZHdfZ21jaF9jdGwgPj49IEJEV19HTUNIX0dNU19TSElGVDsKLQliZHdf
Z21jaF9jdGwgJj0gQkRXX0dNQ0hfR01TX01BU0s7Ci0JcmV0dXJuIChzaXplX3QpYmR3X2dtY2hf
Y3RsIDw8IDI1OyAvKiAzMiBNQiB1bml0cyAqLwotfQotCi1zdGF0aWMgc2l6ZV90IGNodl9nZXRf
c3RvbGVuX3NpemUodTE2IGdtY2hfY3RybCkKLXsKLQlnbWNoX2N0cmwgPj49IFNOQl9HTUNIX0dN
U19TSElGVDsKLQlnbWNoX2N0cmwgJj0gU05CX0dNQ0hfR01TX01BU0s7Ci0KLQkvKgotCSAqIDB4
MCAgdG8gMHgxMDogMzJNQiBpbmNyZW1lbnRzIHN0YXJ0aW5nIGF0IDBNQgotCSAqIDB4MTEgdG8g
MHgxNjogNE1CIGluY3JlbWVudHMgc3RhcnRpbmcgYXQgOE1CCi0JICogMHgxNyB0byAweDFkOiA0
TUIgaW5jcmVtZW50cyBzdGFydCBhdCAzNk1CCi0JICovCi0JaWYgKGdtY2hfY3RybCA8IDB4MTEp
Ci0JCXJldHVybiAoc2l6ZV90KWdtY2hfY3RybCA8PCAyNTsKLQllbHNlIGlmIChnbWNoX2N0cmwg
PCAweDE3KQotCQlyZXR1cm4gKHNpemVfdCkoZ21jaF9jdHJsIC0gMHgxMSArIDIpIDw8IDIyOwot
CWVsc2UKLQkJcmV0dXJuIChzaXplX3QpKGdtY2hfY3RybCAtIDB4MTcgKyA5KSA8PCAyMjsKLX0K
LQotc3RhdGljIHNpemVfdCBnZW45X2dldF9zdG9sZW5fc2l6ZSh1MTYgZ2VuOV9nbWNoX2N0bCkK
LXsKLQlnZW45X2dtY2hfY3RsID4+PSBCRFdfR01DSF9HTVNfU0hJRlQ7Ci0JZ2VuOV9nbWNoX2N0
bCAmPSBCRFdfR01DSF9HTVNfTUFTSzsKLQotCWlmIChnZW45X2dtY2hfY3RsIDwgMHhmMCkKLQkJ
cmV0dXJuIChzaXplX3QpZ2VuOV9nbWNoX2N0bCA8PCAyNTsgLyogMzIgTUIgdW5pdHMgKi8KLQll
bHNlCi0JCS8qIDRNQiBpbmNyZW1lbnRzIHN0YXJ0aW5nIGF0IDB4ZjAgZm9yIDRNQiAqLwotCQly
ZXR1cm4gKHNpemVfdCkoZ2VuOV9nbWNoX2N0bCAtIDB4ZjAgKyAxKSA8PCAyMjsKLX0KLQogc3Rh
dGljIGludCBnZ3R0X3Byb2JlX2NvbW1vbihzdHJ1Y3QgaTkxNV9nZ3R0ICpnZ3R0LCB1NjQgc2l6
ZSkKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBnZ3R0LT5iYXNlLmk5
MTU7CkBAIC0zMzQzLDE0ICszMjk5LDEzIEBAIHN0YXRpYyBpbnQgZ2VuOF9nbWNoX3Byb2JlKHN0
cnVjdCBpOTE1X2dndHQgKmdndHQpCiAKIAlwY2lfcmVhZF9jb25maWdfd29yZChwZGV2LCBTTkJf
R01DSF9DVFJMLCAmc25iX2dtY2hfY3RsKTsKIAorCWdndHQtPnN0b2xlbl9zaXplID0gcmVzb3Vy
Y2Vfc2l6ZSgmaW50ZWxfZ3JhcGhpY3Nfc3RvbGVuX3Jlcyk7CisKIAlpZiAoSU5URUxfR0VOKGRl
dl9wcml2KSA+PSA5KSB7Ci0JCWdndHQtPnN0b2xlbl9zaXplID0gZ2VuOV9nZXRfc3RvbGVuX3Np
emUoc25iX2dtY2hfY3RsKTsKIAkJc2l6ZSA9IGdlbjhfZ2V0X3RvdGFsX2d0dF9zaXplKHNuYl9n
bWNoX2N0bCk7CiAJfSBlbHNlIGlmIChJU19DSEVSUllWSUVXKGRldl9wcml2KSkgewotCQlnZ3R0
LT5zdG9sZW5fc2l6ZSA9IGNodl9nZXRfc3RvbGVuX3NpemUoc25iX2dtY2hfY3RsKTsKIAkJc2l6
ZSA9IGNodl9nZXRfdG90YWxfZ3R0X3NpemUoc25iX2dtY2hfY3RsKTsKIAl9IGVsc2UgewotCQln
Z3R0LT5zdG9sZW5fc2l6ZSA9IGdlbjhfZ2V0X3N0b2xlbl9zaXplKHNuYl9nbWNoX2N0bCk7CiAJ
CXNpemUgPSBnZW44X2dldF90b3RhbF9ndHRfc2l6ZShzbmJfZ21jaF9jdGwpOwogCX0KIApAQCAt
MzQwOCw3ICszMzYzLDcgQEAgc3RhdGljIGludCBnZW42X2dtY2hfcHJvYmUoc3RydWN0IGk5MTVf
Z2d0dCAqZ2d0dCkKIAkJRFJNX0VSUk9SKCJDYW4ndCBzZXQgRE1BIG1hc2svY29uc2lzdGVudCBt
YXNrICglZClcbiIsIGVycik7CiAJcGNpX3JlYWRfY29uZmlnX3dvcmQocGRldiwgU05CX0dNQ0hf
Q1RSTCwgJnNuYl9nbWNoX2N0bCk7CiAKLQlnZ3R0LT5zdG9sZW5fc2l6ZSA9IGdlbjZfZ2V0X3N0
b2xlbl9zaXplKHNuYl9nbWNoX2N0bCk7CisJZ2d0dC0+c3RvbGVuX3NpemUgPSByZXNvdXJjZV9z
aXplKCZpbnRlbF9ncmFwaGljc19zdG9sZW5fcmVzKTsKIAogCXNpemUgPSBnZW42X2dldF90b3Rh
bF9ndHRfc2l6ZShzbmJfZ21jaF9jdGwpOwogCWdndHQtPmJhc2UudG90YWwgPSAoc2l6ZSAvIHNp
emVvZihnZW42X3B0ZV90KSkgPDwgUEFHRV9TSElGVDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1
L2RybS9pOTE1L2k5MTVfZ2VtX3N0b2xlbi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n
ZW1fc3RvbGVuLmMKaW5kZXggMTg3N2FlOWExZDliLi5mOGFjMTQzOGMzNWQgMTAwNjQ0Ci0tLSBh
L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3N0b2xlbi5jCisrKyBiL2RyaXZlcnMvZ3B1
L2RybS9pOTE1L2k5MTVfZ2VtX3N0b2xlbi5jCkBAIC0zMCw5ICszMCw2IEBACiAjaW5jbHVkZSA8
ZHJtL2k5MTVfZHJtLmg+CiAjaW5jbHVkZSAiaTkxNV9kcnYuaCIKIAotI2RlZmluZSBLQih4KSAo
KHgpICogMTAyNCkKLSNkZWZpbmUgTUIoeCkgKEtCKHgpICogMTAyNCkKLQogLyoKICAqIFRoZSBC
SU9TIHR5cGljYWxseSByZXNlcnZlcyBzb21lIG9mIHRoZSBzeXN0ZW0ncyBtZW1vcnkgZm9yIHRo
ZSBleGNsdXNpdmUKICAqIHVzZSBvZiB0aGUgaW50ZWdyYXRlZCBncmFwaGljcy4gVGhpcyBtZW1v
cnkgaXMgbm8gbG9uZ2VyIGF2YWlsYWJsZSBmb3IKQEAgLTgxLDExMyArNzgsMTEgQEAgdm9pZCBp
OTE1X2dlbV9zdG9sZW5fcmVtb3ZlX25vZGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w
cml2LAogCiBzdGF0aWMgZG1hX2FkZHJfdCBpOTE1X3N0b2xlbl90b19kbWEoc3RydWN0IGRybV9p
OTE1X3ByaXZhdGUgKmRldl9wcml2KQogewotCXN0cnVjdCBwY2lfZGV2ICpwZGV2ID0gZGV2X3By
aXYtPmRybS5wZGV2OwogCXN0cnVjdCBpOTE1X2dndHQgKmdndHQgPSAmZGV2X3ByaXYtPmdndHQ7
CisJZG1hX2FkZHJfdCBiYXNlID0gaW50ZWxfZ3JhcGhpY3Nfc3RvbGVuX3Jlcy5zdGFydDsKIAlz
dHJ1Y3QgcmVzb3VyY2UgKnI7Ci0JZG1hX2FkZHJfdCBiYXNlOwotCi0JLyogQWxtb3N0IHVuaXZl
cnNhbGx5IHdlIGNhbiBmaW5kIHRoZSBHcmFwaGljcyBCYXNlIG9mIFN0b2xlbiBNZW1vcnkKLQkg
KiBhdCByZWdpc3RlciBCU00gKDB4NWMpIGluIHRoZSBpZ2Z4IGNvbmZpZ3VyYXRpb24gc3BhY2Uu
IE9uIGEgZmV3Ci0JICogKGRlc2t0b3ApIG1hY2hpbmVzIHRoaXMgaXMgYWxzbyBtaXJyb3JlZCBp
biB0aGUgYnJpZGdlIGRldmljZSBhdAotCSAqIGRpZmZlcmVudCBsb2NhdGlvbnMsIG9yIGluIHRo
ZSBNQ0hCQVIuCi0JICoKLQkgKiBPbiA4NjUgd2UganVzdCBjaGVjayB0aGUgVE9VRCByZWdpc3Rl
ci4KLQkgKgotCSAqIE9uIDgzMC84NDUvODV4IHRoZSBzdG9sZW4gbWVtb3J5IGJhc2UgaXNuJ3Qg
YXZhaWxhYmxlIGluIGFueQotCSAqIHJlZ2lzdGVyLiBXZSBuZWVkIHRvIGNhbGN1bGF0ZSBpdCBh
cyBUT00tVFNFR19TSVpFLXN0b2xlbl9zaXplLgotCSAqCi0JICovCi0JYmFzZSA9IDA7Ci0JaWYg
KElOVEVMX0dFTihkZXZfcHJpdikgPj0gMykgewotCQl1MzIgYnNtOwotCi0JCXBjaV9yZWFkX2Nv
bmZpZ19kd29yZChwZGV2LCBJTlRFTF9CU00sICZic20pOwotCi0JCWJhc2UgPSBic20gJiBJTlRF
TF9CU01fTUFTSzsKLQl9IGVsc2UgaWYgKElTX0k4NjVHKGRldl9wcml2KSkgewotCQl1MzIgdHNl
Z19zaXplID0gMDsKLQkJdTE2IHRvdWQgPSAwOwotCQl1OCB0bXA7Ci0KLQkJcGNpX2J1c19yZWFk
X2NvbmZpZ19ieXRlKHBkZXYtPmJ1cywgUENJX0RFVkZOKDAsIDApLAotCQkJCQkgSTg0NV9FU01S
QU1DLCAmdG1wKTsKLQotCQlpZiAodG1wICYgVFNFR19FTkFCTEUpIHsKLQkJCXN3aXRjaCAodG1w
ICYgSTg0NV9UU0VHX1NJWkVfTUFTSykgewotCQkJY2FzZSBJODQ1X1RTRUdfU0laRV81MTJLOgot
CQkJCXRzZWdfc2l6ZSA9IEtCKDUxMik7Ci0JCQkJYnJlYWs7Ci0JCQljYXNlIEk4NDVfVFNFR19T
SVpFXzFNOgotCQkJCXRzZWdfc2l6ZSA9IE1CKDEpOwotCQkJCWJyZWFrOwotCQkJfQotCQl9Ci0K
LQkJcGNpX2J1c19yZWFkX2NvbmZpZ193b3JkKHBkZXYtPmJ1cywgUENJX0RFVkZOKDAsIDApLAot
CQkJCQkgSTg2NV9UT1VELCAmdG91ZCk7Ci0KLQkJYmFzZSA9ICh0b3VkIDw8IDE2KSArIHRzZWdf
c2l6ZTsKLQl9IGVsc2UgaWYgKElTX0k4NVgoZGV2X3ByaXYpKSB7Ci0JCXUzMiB0c2VnX3NpemUg
PSAwOwotCQl1MzIgdG9tOwotCQl1OCB0bXA7Ci0KLQkJcGNpX2J1c19yZWFkX2NvbmZpZ19ieXRl
KHBkZXYtPmJ1cywgUENJX0RFVkZOKDAsIDApLAotCQkJCQkgSTg1WF9FU01SQU1DLCAmdG1wKTsK
LQotCQlpZiAodG1wICYgVFNFR19FTkFCTEUpCi0JCQl0c2VnX3NpemUgPSBNQigxKTsKLQotCQlw
Y2lfYnVzX3JlYWRfY29uZmlnX2J5dGUocGRldi0+YnVzLCBQQ0lfREVWRk4oMCwgMSksCi0JCQkJ
CSBJODVYX0RSQjMsICZ0bXApOwotCQl0b20gPSB0bXAgKiBNQigzMik7Ci0KLQkJYmFzZSA9IHRv
bSAtIHRzZWdfc2l6ZSAtIGdndHQtPnN0b2xlbl9zaXplOwotCX0gZWxzZSBpZiAoSVNfSTg0NUco
ZGV2X3ByaXYpKSB7Ci0JCXUzMiB0c2VnX3NpemUgPSAwOwotCQl1MzIgdG9tOwotCQl1OCB0bXA7
Ci0KLQkJcGNpX2J1c19yZWFkX2NvbmZpZ19ieXRlKHBkZXYtPmJ1cywgUENJX0RFVkZOKDAsIDAp
LAotCQkJCQkgSTg0NV9FU01SQU1DLCAmdG1wKTsKLQotCQlpZiAodG1wICYgVFNFR19FTkFCTEUp
IHsKLQkJCXN3aXRjaCAodG1wICYgSTg0NV9UU0VHX1NJWkVfTUFTSykgewotCQkJY2FzZSBJODQ1
X1RTRUdfU0laRV81MTJLOgotCQkJCXRzZWdfc2l6ZSA9IEtCKDUxMik7Ci0JCQkJYnJlYWs7Ci0J
CQljYXNlIEk4NDVfVFNFR19TSVpFXzFNOgotCQkJCXRzZWdfc2l6ZSA9IE1CKDEpOwotCQkJCWJy
ZWFrOwotCQkJfQotCQl9Ci0KLQkJcGNpX2J1c19yZWFkX2NvbmZpZ19ieXRlKHBkZXYtPmJ1cywg
UENJX0RFVkZOKDAsIDApLAotCQkJCQkgSTgzMF9EUkIzLCAmdG1wKTsKLQkJdG9tID0gdG1wICog
TUIoMzIpOwogCi0JCWJhc2UgPSB0b20gLSB0c2VnX3NpemUgLSBnZ3R0LT5zdG9sZW5fc2l6ZTsK
LQl9IGVsc2UgaWYgKElTX0k4MzAoZGV2X3ByaXYpKSB7Ci0JCXUzMiB0c2VnX3NpemUgPSAwOwot
CQl1MzIgdG9tOwotCQl1OCB0bXA7Ci0KLQkJcGNpX2J1c19yZWFkX2NvbmZpZ19ieXRlKHBkZXYt
PmJ1cywgUENJX0RFVkZOKDAsIDApLAotCQkJCQkgSTgzMF9FU01SQU1DLCAmdG1wKTsKLQotCQlp
ZiAodG1wICYgVFNFR19FTkFCTEUpIHsKLQkJCWlmICh0bXAgJiBJODMwX1RTRUdfU0laRV8xTSkK
LQkJCQl0c2VnX3NpemUgPSBNQigxKTsKLQkJCWVsc2UKLQkJCQl0c2VnX3NpemUgPSBLQig1MTIp
OwotCQl9Ci0KLQkJcGNpX2J1c19yZWFkX2NvbmZpZ19ieXRlKHBkZXYtPmJ1cywgUENJX0RFVkZO
KDAsIDApLAotCQkJCQkgSTgzMF9EUkIzLCAmdG1wKTsKLQkJdG9tID0gdG1wICogTUIoMzIpOwot
Ci0JCWJhc2UgPSB0b20gLSB0c2VnX3NpemUgLSBnZ3R0LT5zdG9sZW5fc2l6ZTsKLQl9CisJR0VN
X0JVR19PTihvdmVyZmxvd3NfdHlwZShpbnRlbF9ncmFwaGljc19zdG9sZW5fcmVzLnN0YXJ0LCBi
YXNlKSk7CiAKIAlpZiAoYmFzZSA9PSAwIHx8IGFkZF9vdmVyZmxvd3MoYmFzZSwgZ2d0dC0+c3Rv
bGVuX3NpemUpKQogCQlyZXR1cm4gMDsKLS0gCjIuMTQuMwoKX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1n
ZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h
aWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==