From: Jani Nikula Subject: [PATCH] drm/i915/bios: iterate over child devices to initialize ddi_port_info Date: Fri, 22 Mar 2019 14:10:08 +0200 Message-ID: <20190322121008.4456-1-jani.nikula@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6A5B36E356 for ; Fri, 22 Mar 2019 12:09:48 +0000 (UTC) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org Cc: jani.nikula@intel.com List-Id: intel-gfx@lists.freedesktop.org SXRlcmF0ZSBvdmVyIGNoaWxkIGRldmljZXMgaW5zdGVhZCBvZiBwb3J0cyBpbiBwYXJzZV9kZGlf cG9ydHMoKSB0bwppbml0aWFsaXplIGRyaV9wb3J0X2luZm8uIFdlJ2xsIGV2ZW50dWFsbHkgbmVl ZCB0byBkZWNpZGUgc29tZSBzdHVmZgpiYXNlZCBvbiB0aGUgY2hpbGQgZGV2aWNlIG9yZGVyLCB3 aGljaCBtYXkgYmUgZGlmZmVyZW50IGZyb20gdGhlIHBvcnQKb3JkZXIuCgpBcyBhIGJvbnVzLCB0 aGlzIGFsbG93cyBiZXR0ZXIgYWJzdHJhY3Rpb25zIGZvciBlLmcuIGR2byBwb3J0IG1hcHBpbmcu CgpUaGVyZSdzIGEgc3VidGxlIGNoYW5nZSBpbiB0aGUgRERDIHBpbiBhbmQgQVVYIGNoYW5uZWwg c2FuaXRpemF0aW9uIGFzCndlIGNoYW5nZSB0aGUgb3JkZXIuIE90aGVyd2lzZSwgdGhpcyBzaG91 bGQgbm90IGNoYW5nZSBiZWhhdmlvdXIuCgpSZXZpZXdlZC1ieTogVmlsbGUgU3lyasOkbMOkIDx2 aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogSmFuaSBOaWt1bGEg PGphbmkubmlrdWxhQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry di5oICAgfCAgIDEgKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYmlvcy5jIHwgMTA0ICsr KysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCA1OSBpbnNlcnRp b25zKCspLCA0NiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCBmZWZj YjM5YWVmYzQuLmQ4MmQ2M2RmYTVhMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC05NTQs NiArOTU0LDcgQEAgc3RydWN0IGRkaV92YnRfcG9ydF9pbmZvIHsKICNkZWZpbmUgSERNSV9MRVZF TF9TSElGVF9VTktOT1dOCTB4ZmYKIAl1OCBoZG1pX2xldmVsX3NoaWZ0OwogCisJdTggcHJlc2Vu dDoxOwogCXU4IHN1cHBvcnRzX2R2aToxOwogCXU4IHN1cHBvcnRzX2hkbWk6MTsKIAl1OCBzdXBw b3J0c19kcDoxOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYmlvcy5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYmlvcy5jCmluZGV4IDY0ZjIwMTc1YTZkYy4u MWRjOGQwM2ZmMTI3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9iaW9z LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYmlvcy5jCkBAIC0xMjQ3LDEwICsx MjQ3LDExIEBAIHN0YXRpYyB2b2lkIHNhbml0aXplX2RkY19waW4oc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2LAogCWlmICghaW5mby0+YWx0ZXJuYXRlX2RkY19waW4pCiAJCXJldHVy bjsKIAotCWZvcl9lYWNoX3BvcnRfbWFza2VkKHAsICgxIDw8IHBvcnQpIC0gMSkgeworCWZvciAo cCA9IFBPUlRfQTsgcCA8IEk5MTVfTUFYX1BPUlRTOyBwKyspIHsKIAkJc3RydWN0IGRkaV92YnRf cG9ydF9pbmZvICppID0gJmRldl9wcml2LT52YnQuZGRpX3BvcnRfaW5mb1twXTsKIAotCQlpZiAo aW5mby0+YWx0ZXJuYXRlX2RkY19waW4gIT0gaS0+YWx0ZXJuYXRlX2RkY19waW4pCisJCWlmIChw ID09IHBvcnQgfHwgIWktPnByZXNlbnQgfHwKKwkJICAgIGluZm8tPmFsdGVybmF0ZV9kZGNfcGlu ICE9IGktPmFsdGVybmF0ZV9kZGNfcGluKQogCQkJY29udGludWU7CiAKIAkJRFJNX0RFQlVHX0tN UygicG9ydCAlYyB0cnlpbmcgdG8gdXNlIHRoZSBzYW1lIEREQyBwaW4gKDB4JXgpIGFzIHBvcnQg JWMsICIKQEAgLTEyNjQsOCArMTI2NSw4IEBAIHN0YXRpYyB2b2lkIHNhbml0aXplX2RkY19waW4o c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQkgKiBwb3J0LiBPdGhlcndpc2Ug dGhleSBzaGFyZSB0aGUgc2FtZSBkZGMgYmluIGFuZAogCQkgKiBzeXN0ZW0gY291bGRuJ3QgY29t bXVuaWNhdGUgd2l0aCB0aGVtIHNlcGFyYXRlbHkuCiAJCSAqCi0JCSAqIER1ZSB0byBwYXJzaW5n IHRoZSBwb3J0cyBpbiBhbHBoYWJldGljYWwgb3JkZXIsCi0JCSAqIGEgaGlnaGVyIHBvcnQgd2ls bCBhbHdheXMgY2xvYmJlciBhIGxvd2VyIG9uZS4KKwkJICogRHVlIHRvIHBhcnNpbmcgdGhlIHBv cnRzIGluIGNoaWxkIGRldmljZSBvcmRlciwKKwkJICogYSBsYXRlciBkZXZpY2Ugd2lsbCBhbHdh eXMgY2xvYmJlciBhbiBlYXJsaWVyIG9uZS4KIAkJICovCiAJCWktPnN1cHBvcnRzX2R2aSA9IGZh bHNlOwogCQlpLT5zdXBwb3J0c19oZG1pID0gZmFsc2U7CkBAIC0xMjgzLDEwICsxMjg0LDExIEBA IHN0YXRpYyB2b2lkIHNhbml0aXplX2F1eF9jaChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYsCiAJaWYgKCFpbmZvLT5hbHRlcm5hdGVfYXV4X2NoYW5uZWwpCiAJCXJldHVybjsKIAot CWZvcl9lYWNoX3BvcnRfbWFza2VkKHAsICgxIDw8IHBvcnQpIC0gMSkgeworCWZvciAocCA9IFBP UlRfQTsgcCA8IEk5MTVfTUFYX1BPUlRTOyBwKyspIHsKIAkJc3RydWN0IGRkaV92YnRfcG9ydF9p bmZvICppID0gJmRldl9wcml2LT52YnQuZGRpX3BvcnRfaW5mb1twXTsKIAotCQlpZiAoaW5mby0+ YWx0ZXJuYXRlX2F1eF9jaGFubmVsICE9IGktPmFsdGVybmF0ZV9hdXhfY2hhbm5lbCkKKwkJaWYg KHAgPT0gcG9ydCB8fCAhaS0+cHJlc2VudCB8fAorCQkgICAgaW5mby0+YWx0ZXJuYXRlX2F1eF9j aGFubmVsICE9IGktPmFsdGVybmF0ZV9hdXhfY2hhbm5lbCkKIAkJCWNvbnRpbnVlOwogCiAJCURS TV9ERUJVR19LTVMoInBvcnQgJWMgdHJ5aW5nIHRvIHVzZSB0aGUgc2FtZSBBVVggQ0ggKDB4JXgp IGFzIHBvcnQgJWMsICIKQEAgLTEzMDAsOCArMTMwMiw4IEBAIHN0YXRpYyB2b2lkIHNhbml0aXpl X2F1eF9jaChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCSAqIHBvcnQuIE90 aGVyd2lzZSB0aGV5IHNoYXJlIHRoZSBzYW1lIGF1eCBjaGFubmVsCiAJCSAqIGFuZCBzeXN0ZW0g Y291bGRuJ3QgY29tbXVuaWNhdGUgd2l0aCB0aGVtIHNlcGFyYXRlbHkuCiAJCSAqCi0JCSAqIER1 ZSB0byBwYXJzaW5nIHRoZSBwb3J0cyBpbiBhbHBoYWJldGljYWwgb3JkZXIsCi0JCSAqIGEgaGln aGVyIHBvcnQgd2lsbCBhbHdheXMgY2xvYmJlciBhIGxvd2VyIG9uZS4KKwkJICogRHVlIHRvIHBh cnNpbmcgdGhlIHBvcnRzIGluIGNoaWxkIGRldmljZSBvcmRlciwKKwkJICogYSBsYXRlciBkZXZp Y2Ugd2lsbCBhbHdheXMgY2xvYmJlciBhbiBlYXJsaWVyIG9uZS4KIAkJICovCiAJCWktPnN1cHBv cnRzX2RwID0gZmFsc2U7CiAJCWktPmFsdGVybmF0ZV9hdXhfY2hhbm5lbCA9IDA7CkBAIC0xMzQ5 LDQ5ICsxMzUxLDU4IEBAIHN0YXRpYyB1OCBtYXBfZGRjX3BpbihzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYsIHU4IHZidF9waW4pCiAJcmV0dXJuIDA7CiB9CiAKLXN0YXRpYyB2b2lk IHBhcnNlX2RkaV9wb3J0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgZW51bSBw b3J0IHBvcnQsCi0JCQkgICB1OCBiZGJfdmVyc2lvbikKK3N0YXRpYyBlbnVtIHBvcnQgZHZvX3Bv cnRfdG9fcG9ydCh1OCBkdm9fcG9ydCkKIHsKLQlzdHJ1Y3QgY2hpbGRfZGV2aWNlX2NvbmZpZyAq aXQsICpjaGlsZCA9IE5VTEw7Ci0Jc3RydWN0IGRkaV92YnRfcG9ydF9pbmZvICppbmZvID0gJmRl dl9wcml2LT52YnQuZGRpX3BvcnRfaW5mb1twb3J0XTsKLQlpbnQgaSwgajsKLQlib29sIGlzX2R2 aSwgaXNfaGRtaSwgaXNfZHAsIGlzX2VkcCwgaXNfY3J0OwotCS8qIEVhY2ggRERJIHBvcnQgY2Fu IGhhdmUgbW9yZSB0aGFuIG9uZSB2YWx1ZSBvbiB0aGUgIkRWTyBQb3J0IiBmaWVsZCwKKwkvKgor CSAqIEVhY2ggRERJIHBvcnQgY2FuIGhhdmUgbW9yZSB0aGFuIG9uZSB2YWx1ZSBvbiB0aGUgIkRW TyBQb3J0IiBmaWVsZCwKIAkgKiBzbyBsb29rIGZvciBhbGwgdGhlIHBvc3NpYmxlIHZhbHVlcyBm b3IgZWFjaCBwb3J0LgogCSAqLwotCWludCBkdm9fcG9ydHNbXVszXSA9IHsKLQkJe0RWT19QT1JU X0hETUlBLCBEVk9fUE9SVF9EUEEsIC0xfSwKLQkJe0RWT19QT1JUX0hETUlCLCBEVk9fUE9SVF9E UEIsIC0xfSwKLQkJe0RWT19QT1JUX0hETUlDLCBEVk9fUE9SVF9EUEMsIC0xfSwKLQkJe0RWT19Q T1JUX0hETUlELCBEVk9fUE9SVF9EUEQsIC0xfSwKLQkJe0RWT19QT1JUX0NSVCwgRFZPX1BPUlRf SERNSUUsIERWT19QT1JUX0RQRX0sCi0JCXtEVk9fUE9SVF9IRE1JRiwgRFZPX1BPUlRfRFBGLCAt MX0sCisJc3RhdGljIGNvbnN0IGludCBkdm9fcG9ydHNbXVszXSA9IHsKKwkJW1BPUlRfQV0gPSB7 IERWT19QT1JUX0hETUlBLCBEVk9fUE9SVF9EUEEsIC0xfSwKKwkJW1BPUlRfQl0gPSB7IERWT19Q T1JUX0hETUlCLCBEVk9fUE9SVF9EUEIsIC0xfSwKKwkJW1BPUlRfQ10gPSB7IERWT19QT1JUX0hE TUlDLCBEVk9fUE9SVF9EUEMsIC0xfSwKKwkJW1BPUlRfRF0gPSB7IERWT19QT1JUX0hETUlELCBE Vk9fUE9SVF9EUEQsIC0xfSwKKwkJW1BPUlRfRV0gPSB7IERWT19QT1JUX0NSVCwgRFZPX1BPUlRf SERNSUUsIERWT19QT1JUX0RQRX0sCisJCVtQT1JUX0ZdID0geyBEVk9fUE9SVF9IRE1JRiwgRFZP X1BPUlRfRFBGLCAtMX0sCiAJfTsKKwllbnVtIHBvcnQgcG9ydDsKKwlpbnQgaTsKIAotCS8qCi0J ICogRmluZCB0aGUgZmlyc3QgY2hpbGQgZGV2aWNlIHRvIHJlZmVyZW5jZSB0aGUgcG9ydCwgcmVw b3J0IGlmIG1vcmUKLQkgKiB0aGFuIG9uZSBmb3VuZC4KLQkgKi8KLQlmb3IgKGkgPSAwOyBpIDwg ZGV2X3ByaXYtPnZidC5jaGlsZF9kZXZfbnVtOyBpKyspIHsKLQkJaXQgPSBkZXZfcHJpdi0+dmJ0 LmNoaWxkX2RldiArIGk7Ci0KLQkJZm9yIChqID0gMDsgaiA8IDM7IGorKykgewotCQkJaWYgKGR2 b19wb3J0c1twb3J0XVtqXSA9PSAtMSkKKwlmb3IgKHBvcnQgPSBQT1JUX0E7IHBvcnQgPCBBUlJB WV9TSVpFKGR2b19wb3J0cyk7IHBvcnQrKykgeworCQlmb3IgKGkgPSAwOyBpIDwgQVJSQVlfU0la RShkdm9fcG9ydHNbcG9ydF0pOyBpKyspIHsKKwkJCWlmIChkdm9fcG9ydHNbcG9ydF1baV0gPT0g LTEpCiAJCQkJYnJlYWs7CiAKLQkJCWlmIChpdC0+ZHZvX3BvcnQgPT0gZHZvX3BvcnRzW3BvcnRd W2pdKSB7Ci0JCQkJaWYgKGNoaWxkKSB7Ci0JCQkJCURSTV9ERUJVR19LTVMoIk1vcmUgdGhhbiBv bmUgY2hpbGQgZGV2aWNlIGZvciBwb3J0ICVjIGluIFZCVCwgdXNpbmcgdGhlIGZpcnN0LlxuIiwK LQkJCQkJCSAgICAgIHBvcnRfbmFtZShwb3J0KSk7Ci0JCQkJfSBlbHNlIHsKLQkJCQkJY2hpbGQg PSBpdDsKLQkJCQl9Ci0JCQl9CisJCQlpZiAoZHZvX3BvcnQgPT0gZHZvX3BvcnRzW3BvcnRdW2ld KQorCQkJCXJldHVybiBwb3J0OwogCQl9CiAJfQotCWlmICghY2hpbGQpCisKKwlyZXR1cm4gUE9S VF9OT05FOworfQorCitzdGF0aWMgdm9pZCBwYXJzZV9kZGlfcG9ydChzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYsCisJCQkgICBjb25zdCBzdHJ1Y3QgY2hpbGRfZGV2aWNlX2NvbmZp ZyAqY2hpbGQsCisJCQkgICB1OCBiZGJfdmVyc2lvbikKK3sKKwlzdHJ1Y3QgZGRpX3ZidF9wb3J0 X2luZm8gKmluZm87CisJYm9vbCBpc19kdmksIGlzX2hkbWksIGlzX2RwLCBpc19lZHAsIGlzX2Ny dDsKKwllbnVtIHBvcnQgcG9ydDsKKworCXBvcnQgPSBkdm9fcG9ydF90b19wb3J0KGNoaWxkLT5k dm9fcG9ydCk7CisJaWYgKHBvcnQgPT0gUE9SVF9OT05FKQogCQlyZXR1cm47CiAKKwlpbmZvID0g JmRldl9wcml2LT52YnQuZGRpX3BvcnRfaW5mb1twb3J0XTsKKworCWlmIChpbmZvLT5wcmVzZW50 KSB7CisJCURSTV9ERUJVR19LTVMoIk1vcmUgdGhhbiBvbmUgY2hpbGQgZGV2aWNlIGZvciBwb3J0 ICVjIGluIFZCVCwgdXNpbmcgdGhlIGZpcnN0LlxuIiwKKwkJCSAgICAgIHBvcnRfbmFtZShwb3J0 KSk7CisJCXJldHVybjsKKwl9CisKKwlpbmZvLT5wcmVzZW50ID0gdHJ1ZTsKKwogCWlzX2R2aSA9 IGNoaWxkLT5kZXZpY2VfdHlwZSAmIERFVklDRV9UWVBFX1RNRFNfRFZJX1NJR05BTElORzsKIAlp c19kcCA9IGNoaWxkLT5kZXZpY2VfdHlwZSAmIERFVklDRV9UWVBFX0RJU1BMQVlQT1JUX09VVFBV VDsKIAlpc19jcnQgPSBjaGlsZC0+ZGV2aWNlX3R5cGUgJiBERVZJQ0VfVFlQRV9BTkFMT0dfT1VU UFVUOwpAQCAtMTUyMywxOSArMTUzNCwyMCBAQCBzdGF0aWMgdm9pZCBwYXJzZV9kZGlfcG9ydChz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIGVudW0gcG9ydCBwb3J0LAogCiBzdGF0 aWMgdm9pZCBwYXJzZV9kZGlfcG9ydHMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 LCB1OCBiZGJfdmVyc2lvbikKIHsKLQllbnVtIHBvcnQgcG9ydDsKKwljb25zdCBzdHJ1Y3QgY2hp bGRfZGV2aWNlX2NvbmZpZyAqY2hpbGQ7CisJaW50IGk7CiAKIAlpZiAoIUhBU19EREkoZGV2X3By aXYpICYmICFJU19DSEVSUllWSUVXKGRldl9wcml2KSkKIAkJcmV0dXJuOwogCi0JaWYgKCFkZXZf cHJpdi0+dmJ0LmNoaWxkX2Rldl9udW0pCi0JCXJldHVybjsKLQogCWlmIChiZGJfdmVyc2lvbiA8 IDE1NSkKIAkJcmV0dXJuOwogCi0JZm9yIChwb3J0ID0gUE9SVF9BOyBwb3J0IDwgSTkxNV9NQVhf UE9SVFM7IHBvcnQrKykKLQkJcGFyc2VfZGRpX3BvcnQoZGV2X3ByaXYsIHBvcnQsIGJkYl92ZXJz aW9uKTsKKwlmb3IgKGkgPSAwOyBpIDwgZGV2X3ByaXYtPnZidC5jaGlsZF9kZXZfbnVtOyBpKysp IHsKKwkJY2hpbGQgPSBkZXZfcHJpdi0+dmJ0LmNoaWxkX2RldiArIGk7CisKKwkJcGFyc2VfZGRp X3BvcnQoZGV2X3ByaXYsIGNoaWxkLCBiZGJfdmVyc2lvbik7CisJfQogfQogCiBzdGF0aWMgdm9p ZAotLSAKMi4yMC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5v cmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1n Zng=