From: Lyude Paul Subject: [PATCH 2/2] drm/nouveau: Prevent redundant connector probes from ACPI Date: Mon, 30 Jul 2018 20:58:35 -0400 Message-ID: <20180731005835.21032-2-lyude@redhat.com> References: <20180731005835.21032-1-lyude@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180731005835.21032-1-lyude-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: nouveau-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "Nouveau" To: nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: David Airlie , Ben Skeggs , dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: dri-devel@lists.freedesktop.org T24gdGhlIExlbm92byBQNTAgSSd2ZSBiZWVuIHdvcmtpbmcgb24sIEFDUEkgbm90aWZpY2F0aW9u cyBmb3IgaG90cGx1Z3MKYWx3YXlzIHNlZW0gaGFwcGVuIGV2ZW4gd2hpbGUgdGhlIEdQVSBoYXMg aXQncyBob3RwbHVncyBlbmFibGVkLiBUaGlzCm1lYW5zIHRoYXQgd2UncmUgdXNlbGVzc2x5IHNj aGVkdWxpbmcgdHdvIGNvbm5lY3RvciBwcm9iZXMgZXZlcnkgdGltZSB3ZQpnZXQgYSBob3RwbHVn LgoKU2luY2Ugd2UgY2FuJ3QgdW5yZWdpc3RlciB0aGUgYWNwaSBoYW5kbGVyIHdpdGhvdXQgY2F1 c2luZyB1c2Vyc3BhY2UgdG8Kc3RhcnQgZ2V0dGluZyBteXN0ZXJpb3VzIGtleXByZXNzZXMgZnJv bSB0aGUgQUNQSV9WSURFT19SRVBST0JFIGV2ZW50cwp0aGF0IGFyZSBtZWFudCBmb3IgdXMsIHNp bXBseSBhZGQgYSBtZW1iZXIgdG8gbm91dmVhdV9kcm0gdGhhdCBjYW4gYmUKdXNlZCB0byBlbmFi bGUvZGlzYWJsZSBvdXIgQUNQSSBldmVudCBoYW5kbGVyIGZyb20gYmVpbmcgYWJsZSB0bwpzY2hl ZHVsZSBjb25uZWN0b3IgcHJvYmVzIG9uIGl0J3Mgb3duLgoKU2lnbmVkLW9mZi1ieTogTHl1ZGUg UGF1bCA8bHl1ZGVAcmVkaGF0LmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9ub3V2 ZWF1X2Rpc3BsYXkuYyB8IDQwICsrKysrKysrKysrKysrKy0tLS0tLS0tCiBkcml2ZXJzL2dwdS9k cm0vbm91dmVhdS9ub3V2ZWF1X2Rpc3BsYXkuaCB8ICA0ICstLQogZHJpdmVycy9ncHUvZHJtL25v dXZlYXUvbm91dmVhdV9kcm0uYyAgICAgfCAgNCArLS0KIGRyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1 L25vdXZlYXVfZHJ2LmggICAgIHwgIDEgKwogNCBmaWxlcyBjaGFuZ2VkLCAzMiBpbnNlcnRpb25z KCspLCAxNyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vbm91dmVh dS9ub3V2ZWF1X2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1L25vdXZlYXVfZGlz cGxheS5jCmluZGV4IGIyYTkzZTNmYTY3Yi4uYjgwMjI2Yzg3NDg3IDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vbm91dmVhdS9ub3V2ZWF1X2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vbm91dmVhdS9ub3V2ZWF1X2Rpc3BsYXkuYwpAQCAtMzgyLDEzICszODIsMTYgQEAgbm91dmVh dV9kaXNwbGF5X2FjcGlfbnRmeShzdHJ1Y3Qgbm90aWZpZXJfYmxvY2sgKm5iLCB1bnNpZ25lZCBs b25nIHZhbCwKIAogCWlmICghc3RyY21wKGluZm8tPmRldmljZV9jbGFzcywgQUNQSV9WSURFT19D TEFTUykpIHsKIAkJaWYgKGluZm8tPnR5cGUgPT0gQUNQSV9WSURFT19OT1RJRllfUFJPQkUpIHsK LQkJCS8qCi0JCQkgKiBUaGlzIG1heSBiZSB0aGUgb25seSBpbmRpY2F0aW9uIHdlIHJlY2VpdmUg b2YgYQotCQkJICogY29ubmVjdG9yIGhvdHBsdWcgb24gYSBydW50aW1lIHN1c3BlbmRlZCBHUFUs Ci0JCQkgKiBzY2hlZHVsZSBocGRfd29yayB0byBjaGVjay4KLQkJCSAqLwotCQkJTlZfREVCVUco ZHJtLCAiQUNQSSByZXF1ZXN0ZWQgY29ubmVjdG9yIHByb2JlXG4iKTsKLQkJCXNjaGVkdWxlX3dv cmsoJmRybS0+aHBkX3dvcmspOworCQkJaWYgKFJFQURfT05DRShkcm0tPmFjcGlfaHBkX2VuYWJs ZWQpKSB7CisJCQkJLyoKKwkJCQkgKiBUaGlzIG1heSBiZSB0aGUgb25seSBpbmRpY2F0aW9uIHdl IHJlY2VpdmUKKwkJCQkgKiBvZiBhIGNvbm5lY3RvciBob3RwbHVnIG9uIGEgcnVudGltZQorCQkJ CSAqIHN1c3BlbmRlZCBHUFUsIHNjaGVkdWxlIGhwZF93b3JrIHRvIGNoZWNrLgorCQkJCSAqLwor CQkJCU5WX0RFQlVHKGRybSwKKwkJCQkJICJBQ1BJIHJlcXVlc3RlZCBjb25uZWN0b3IgcHJvYmVc biIpOworCQkJCXNjaGVkdWxlX3dvcmsoJmRybS0+aHBkX3dvcmspOworCQkJfQogCiAJCQkvKiBh Y3BpLXZpZGVvIHNob3VsZCBub3QgZ2VuZXJhdGUga2V5cHJlc3NlcyBmb3IgdGhpcyAqLwogCQkJ cmV0dXJuIE5PVElGWV9CQUQ7CkBAIC00MDAsNyArNDAzLDcgQEAgbm91dmVhdV9kaXNwbGF5X2Fj cGlfbnRmeShzdHJ1Y3Qgbm90aWZpZXJfYmxvY2sgKm5iLCB1bnNpZ25lZCBsb25nIHZhbCwKICNl bmRpZgogCiBpbnQKLW5vdXZlYXVfZGlzcGxheV9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYp Citub3V2ZWF1X2Rpc3BsYXlfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBib29sIHJ1bnRp bWUpCiB7CiAJc3RydWN0IG5vdXZlYXVfZGlzcGxheSAqZGlzcCA9IG5vdXZlYXVfZGlzcGxheShk ZXYpOwogCXN0cnVjdCBub3V2ZWF1X2RybSAqZHJtID0gbm91dmVhdV9kcm0oZGV2KTsKQEAgLTQy MCwxMyArNDIzLDIwIEBAIG5vdXZlYXVfZGlzcGxheV9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYpCiAJfQogCWRybV9jb25uZWN0b3JfbGlzdF9pdGVyX2VuZCgmY29ubl9pdGVyKTsKIAorCS8q IGRpc2FibGUgQUNQSSBob3RwbHVnIGhhbmRsaW5nIHRvIHByZXZlbnQgZHVwbGljYXRlIGNvbm5l Y3RvcgorCSAqIHByb2JlcworCSAqIEZJWE1FOiBtYWtlIHN1cmUgdGhhdCBXUklURV9PTkNFKCkg aW1wbGllcyBhIHN0b3JlIGJhcnJpZXIKKwkgKiBiZWZvcmVoYW5kCisJICovCisJV1JJVEVfT05D RShkcm0tPmFjcGlfaHBkX2VuYWJsZWQsIGZhbHNlKTsKKwogCS8qIGVuYWJsZSBmbGlwIGNvbXBs ZXRpb24gZXZlbnRzICovCiAJbnZpZl9ub3RpZnlfZ2V0KCZkcm0tPmZsaXApOwogCXJldHVybiBy ZXQ7CiB9CiAKIHZvaWQKLW5vdXZlYXVfZGlzcGxheV9maW5pKHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYsIGJvb2wgc3VzcGVuZCkKK25vdXZlYXVfZGlzcGxheV9maW5pKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYsIGJvb2wgc3VzcGVuZCwgYm9vbCBydW50aW1lKQogewogCXN0cnVjdCBub3V2ZWF1X2Rp c3BsYXkgKmRpc3AgPSBub3V2ZWF1X2Rpc3BsYXkoZGV2KTsKIAlzdHJ1Y3Qgbm91dmVhdV9kcm0g KmRybSA9IG5vdXZlYXVfZHJtKGRldik7CkBAIC00NDMsNiArNDUzLDEwIEBAIG5vdXZlYXVfZGlz cGxheV9maW5pKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGJvb2wgc3VzcGVuZCkKIAkvKiBkaXNh YmxlIGZsaXAgY29tcGxldGlvbiBldmVudHMgKi8KIAludmlmX25vdGlmeV9wdXQoJmRybS0+Zmxp cCk7CiAKKwkvKiBsZXQgQUNQSSBoYW5kbGUgaG90cGx1Z3Mgc2luY2Ugd2Ugd29uJ3QgaGF2ZSB0 aGVtIGVuYWJsZWQgKi8KKwlpZiAocnVudGltZSkKKwkJV1JJVEVfT05DRShkcm0tPmFjcGlfaHBk X2VuYWJsZWQsIHRydWUpOworCiAJLyogZGlzYWJsZSBob3RwbHVnIGludGVycnVwdHMgKi8KIAlk cm1fY29ubmVjdG9yX2xpc3RfaXRlcl9iZWdpbihkZXYsICZjb25uX2l0ZXIpOwogCW5vdXZlYXVf Zm9yX2VhY2hfbm9uX21zdF9jb25uZWN0b3JfaXRlcihjb25uZWN0b3IsICZjb25uX2l0ZXIpIHsK QEAgLTYxOSwxMSArNjMzLDExIEBAIG5vdXZlYXVfZGlzcGxheV9zdXNwZW5kKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYsIGJvb2wgcnVudGltZSkKIAkJCX0KIAkJfQogCi0JCW5vdXZlYXVfZGlzcGxh eV9maW5pKGRldiwgdHJ1ZSk7CisJCW5vdXZlYXVfZGlzcGxheV9maW5pKGRldiwgdHJ1ZSwgcnVu dGltZSk7CiAJCXJldHVybiAwOwogCX0KIAotCW5vdXZlYXVfZGlzcGxheV9maW5pKGRldiwgdHJ1 ZSk7CisJbm91dmVhdV9kaXNwbGF5X2ZpbmkoZGV2LCB0cnVlLCBydW50aW1lKTsKIAogCWxpc3Rf Zm9yX2VhY2hfZW50cnkoY3J0YywgJmRldi0+bW9kZV9jb25maWcuY3J0Y19saXN0LCBoZWFkKSB7 CiAJCXN0cnVjdCBub3V2ZWF1X2ZyYW1lYnVmZmVyICpub3V2ZWF1X2ZiOwpAQCAtNjU2LDcgKzY3 MCw3IEBAIG5vdXZlYXVfZGlzcGxheV9yZXN1bWUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgYm9v bCBydW50aW1lKQogCWludCByZXQ7CiAKIAlpZiAoZHJtX2Rydl91c2VzX2F0b21pY19tb2Rlc2V0 KGRldikpIHsKLQkJbm91dmVhdV9kaXNwbGF5X2luaXQoZGV2KTsKKwkJbm91dmVhdV9kaXNwbGF5 X2luaXQoZGV2LCBydW50aW1lKTsKIAkJaWYgKGRpc3AtPnN1c3BlbmQpIHsKIAkJCWRybV9hdG9t aWNfaGVscGVyX3Jlc3VtZShkZXYsIGRpc3AtPnN1c3BlbmQpOwogCQkJZGlzcC0+c3VzcGVuZCA9 IE5VTEw7CkBAIC02ODksNyArNzAzLDcgQEAgbm91dmVhdV9kaXNwbGF5X3Jlc3VtZShzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2LCBib29sIHJ1bnRpbWUpCiAJCQlOVl9FUlJPUihkcm0sICJDb3VsZCBu b3QgcGluL21hcCBjdXJzb3IuXG4iKTsKIAl9CiAKLQlub3V2ZWF1X2Rpc3BsYXlfaW5pdChkZXYp OworCW5vdXZlYXVfZGlzcGxheV9pbml0KGRldiwgcnVudGltZSk7CiAKIAkvKiBGb3JjZSBDTFVU IHRvIGdldCByZS1sb2FkZWQgZHVyaW5nIG1vZGVzZXQgKi8KIAlsaXN0X2Zvcl9lYWNoX2VudHJ5 KGNydGMsICZkZXYtPm1vZGVfY29uZmlnLmNydGNfbGlzdCwgaGVhZCkgewpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL25vdXZlYXUvbm91dmVhdV9kaXNwbGF5LmggYi9kcml2ZXJzL2dwdS9k cm0vbm91dmVhdS9ub3V2ZWF1X2Rpc3BsYXkuaAppbmRleCA1NGFhN2MzZmE0MmQuLjQ3MzQxMTEy MDIyNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL25vdXZlYXUvbm91dmVhdV9kaXNwbGF5 LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL25vdXZlYXUvbm91dmVhdV9kaXNwbGF5LmgKQEAgLTYx LDggKzYxLDggQEAgbm91dmVhdV9kaXNwbGF5KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAKIGlu dCAgbm91dmVhdV9kaXNwbGF5X2NyZWF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKIHZvaWQg bm91dmVhdV9kaXNwbGF5X2Rlc3Ryb3koc3RydWN0IGRybV9kZXZpY2UgKmRldik7Ci1pbnQgIG5v dXZlYXVfZGlzcGxheV9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwotdm9pZCBub3V2ZWF1 X2Rpc3BsYXlfZmluaShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBib29sIHN1c3BlbmQpOworaW50 ICBub3V2ZWF1X2Rpc3BsYXlfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBib29sIHJ1bnRp bWUpOwordm9pZCBub3V2ZWF1X2Rpc3BsYXlfZmluaShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBi b29sIHN1c3BlbmQsIGJvb2wgcnVudGltZSk7CiBpbnQgIG5vdXZlYXVfZGlzcGxheV9zdXNwZW5k KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGJvb2wgcnVudGltZSk7CiB2b2lkIG5vdXZlYXVfZGlz cGxheV9yZXN1bWUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgYm9vbCBydW50aW1lKTsKIGludCAg bm91dmVhdV9kaXNwbGF5X3ZibGFua19lbmFibGUoc3RydWN0IGRybV9kZXZpY2UgKiwgdW5zaWdu ZWQgaW50KTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1L25vdXZlYXVfZHJt LmMgYi9kcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9ub3V2ZWF1X2RybS5jCmluZGV4IGM3ZWM4NmQ2 YzNjOS4uNjVkYzViNWNmNmNlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9u b3V2ZWF1X2RybS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1L25vdXZlYXVfZHJtLmMK QEAgLTU3NCw3ICs1NzQsNyBAQCBub3V2ZWF1X2RybV9sb2FkKHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYsIHVuc2lnbmVkIGxvbmcgZmxhZ3MpCiAJCWdvdG8gZmFpbF9kaXNwY3RvcjsKIAogCWlmIChk ZXYtPm1vZGVfY29uZmlnLm51bV9jcnRjKSB7Ci0JCXJldCA9IG5vdXZlYXVfZGlzcGxheV9pbml0 KGRldik7CisJCXJldCA9IG5vdXZlYXVfZGlzcGxheV9pbml0KGRldiwgZmFsc2UpOwogCQlpZiAo cmV0KQogCQkJZ290byBmYWlsX2Rpc3Bpbml0OwogCX0KQEAgLTYyOSw3ICs2MjksNyBAQCBub3V2 ZWF1X2RybV91bmxvYWQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlub3V2ZWF1X2RlYnVnZnNf ZmluaShkcm0pOwogCiAJaWYgKGRldi0+bW9kZV9jb25maWcubnVtX2NydGMpCi0JCW5vdXZlYXVf ZGlzcGxheV9maW5pKGRldiwgZmFsc2UpOworCQlub3V2ZWF1X2Rpc3BsYXlfZmluaShkZXYsIGZh bHNlLCBmYWxzZSk7CiAJbm91dmVhdV9kaXNwbGF5X2Rlc3Ryb3koZGV2KTsKIAogCW5vdXZlYXVf Ymlvc190YWtlZG93bihkZXYpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL25vdXZlYXUv bm91dmVhdV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1L25vdXZlYXVfZHJ2LmgKaW5k ZXggNmUxYWNhZWMzNDAwLi4yMmU3MGU3MmVjOGIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9ub3V2ZWF1L25vdXZlYXVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL25vdXZlYXUvbm91 dmVhdV9kcnYuaApAQCAtMjAxLDYgKzIwMSw3IEBAIHN0cnVjdCBub3V2ZWF1X2RybSB7CiAJaW50 IGZiY29uX25ld19zdGF0ZTsKICNpZmRlZiBDT05GSUdfQUNQSQogCXN0cnVjdCBub3RpZmllcl9i bG9jayBhY3BpX25iOworCWJvb2wgYWNwaV9ocGRfZW5hYmxlZDsKICNlbmRpZgogCiAJLyogcG93 ZXIgbWFuYWdlbWVudCAqLwotLSAKMi4xNy4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpOb3V2ZWF1IG1haWxpbmcgbGlzdApOb3V2ZWF1QGxpc3RzLmZy ZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL25vdXZlYXUK