From: Jani Nikula Subject: [PATCH] drm/i915: fix VBT parsing for SDVO child device mapping Date: Tue, 18 Aug 2015 14:28:55 +0300 Message-ID: <1439897335-7804-1-git-send-email-jani.nikula@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 78FE76E352 for ; Tue, 18 Aug 2015 04:25:57 -0700 (PDT) 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 Y29tbWl0IDc1MDY3ZGRlY2YyMTI3MTYzMWJjMDE4ZDJmYjIzZGRkMDliNjZhYWUKQXV0aG9yOiBB bnR0aSBLb3NraXBhYSA8YW50dGkua29za2lwYWFAbGludXguaW50ZWwuY29tPgpEYXRlOiAgIEZy aSBKdWwgMTAgMTQ6MTA6NTUgMjAxNSArMDMwMAoKICAgIGRybS9pOTE1OiBQZXItRERJIElfYm9v c3Qgb3ZlcnJpZGUKCmluY3JlYXNlZCBzaXplIG9mIHVuaW9uIGNoaWxkX2RldmljZV9jb25maWcg d2l0aG91dCB0YWtpbmcgaW50byBhY2NvdW50CnRoZSBzaXplIGNoZWNrIGluIHBhcnNlX3Nkdm9f ZGV2aWNlX21hcHBpbmcoKS4gU3dpdGNoIHRoZSBmdW5jdGlvbiBvdmVyCnRvIHVzaW5nIHRoZSBs ZWdhY3kgc3RydWN0IG9ubHkuCgpGaXhlczogNzUwNjdkZGVjZjIxICgiZHJtL2k5MTU6IFBlci1E REkgSV9ib29zdCBvdmVycmlkZSIpCkNjOiBBbnR0aSBLb3NraXBhYSA8YW50dGkua29za2lwYWFA bGludXguaW50ZWwuY29tPgpDYzogRGF2aWQgV2VpbmVoYWxsIDxkYXZpZC53ZWluZWhhbGxAbGlu dXguaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBKYW5pIE5pa3VsYSA8amFuaS5uaWt1bGFAaW50 ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Jpb3MuYyB8IDUwICsrKysr KysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDI1IGlu c2VydGlvbnMoKyksIDI1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Jpb3MuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Jpb3MuYwpp bmRleCA4ZTQ2MTQ5YmFmZGQuLjFiN2UxYTU5MWEzNyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfYmlvcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Jp b3MuYwpAQCAtNDAxLDcgKzQwMSw3IEBAIHBhcnNlX3Nkdm9fZGV2aWNlX21hcHBpbmcoc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogewogCXN0cnVjdCBzZHZvX2RldmljZV9tYXBw aW5nICpwX21hcHBpbmc7CiAJY29uc3Qgc3RydWN0IGJkYl9nZW5lcmFsX2RlZmluaXRpb25zICpw X2RlZnM7Ci0JY29uc3QgdW5pb24gY2hpbGRfZGV2aWNlX2NvbmZpZyAqcF9jaGlsZDsKKwljb25z dCBzdHJ1Y3Qgb2xkX2NoaWxkX2Rldl9jb25maWcgKmNoaWxkOyAvKiBsZWdhY3kgKi8KIAlpbnQg aSwgY2hpbGRfZGV2aWNlX251bSwgY291bnQ7CiAJdTE2CWJsb2NrX3NpemU7CiAKQEAgLTQxMCwx NCArNDEwLDE0IEBAIHBhcnNlX3Nkdm9fZGV2aWNlX21hcHBpbmcoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2LAogCQlEUk1fREVCVUdfS01TKCJObyBnZW5lcmFsIGRlZmluaXRpb24g YmxvY2sgaXMgZm91bmQsIHVuYWJsZSB0byBjb25zdHJ1Y3Qgc2R2byBtYXBwaW5nLlxuIik7CiAJ CXJldHVybjsKIAl9Ci0JLyoganVkZ2Ugd2hldGhlciB0aGUgc2l6ZSBvZiBjaGlsZCBkZXZpY2Ug bWVldHMgdGhlIHJlcXVpcmVtZW50cy4KLQkgKiBJZiB0aGUgY2hpbGQgZGV2aWNlIHNpemUgb2J0 YWluZWQgZnJvbSBnZW5lcmFsIGRlZmluaXRpb24gYmxvY2sKLQkgKiBpcyBkaWZmZXJlbnQgd2l0 aCBzaXplb2Yoc3RydWN0IGNoaWxkX2RldmljZV9jb25maWcpLCBza2lwIHRoZQotCSAqIHBhcnNp bmcgb2Ygc2R2byBkZXZpY2UgaW5mbworCisJLyoKKwkgKiBPbmx5IHBhcnNlIFNEVk8gbWFwcGlu Z3Mgd2hlbiB0aGUgZ2VuZXJhbCBkZWZpbml0aW9ucyBibG9jayBjaGlsZAorCSAqIGRldmljZSBz aXplIG1hdGNoZXMgdGhhdCBvZiB0aGUgKmxlZ2FjeSogY2hpbGQgZGV2aWNlIGNvbmZpZworCSAq IHN0cnVjdC4gVGh1cywgU0RWTyBtYXBwaW5nIHdpbGwgYmUgc2tpcHBlZCBmb3IgbmV3ZXIgVkJU LgogCSAqLwotCWlmIChwX2RlZnMtPmNoaWxkX2Rldl9zaXplICE9IHNpemVvZigqcF9jaGlsZCkp IHsKLQkJLyogZGlmZmVyZW50IGNoaWxkIGRldiBzaXplIC4gSWdub3JlIGl0ICovCi0JCURSTV9E RUJVR19LTVMoImRpZmZlcmVudCBjaGlsZCBzaXplIGlzIGZvdW5kLiBJbnZhbGlkLlxuIik7CisJ aWYgKHBfZGVmcy0+Y2hpbGRfZGV2X3NpemUgIT0gc2l6ZW9mKCpjaGlsZCkpIHsKKwkJRFJNX0RF QlVHX0tNUygiVW5zdXBwb3J0ZWQgY2hpbGQgZGV2aWNlIHNpemUgZm9yIFNEVk8gbWFwcGluZy5c biIpOwogCQlyZXR1cm47CiAJfQogCS8qIGdldCB0aGUgYmxvY2sgc2l6ZSBvZiBnZW5lcmFsIGRl ZmluaXRpb25zICovCkBAIC00MjcsMzcgKzQyNywzNyBAQCBwYXJzZV9zZHZvX2RldmljZV9tYXBw aW5nKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJcF9kZWZzLT5jaGlsZF9k ZXZfc2l6ZTsKIAljb3VudCA9IDA7CiAJZm9yIChpID0gMDsgaSA8IGNoaWxkX2RldmljZV9udW07 IGkrKykgewotCQlwX2NoaWxkID0gY2hpbGRfZGV2aWNlX3B0cihwX2RlZnMsIGkpOwotCQlpZiAo IXBfY2hpbGQtPm9sZC5kZXZpY2VfdHlwZSkgeworCQljaGlsZCA9ICZjaGlsZF9kZXZpY2VfcHRy KHBfZGVmcywgaSktPm9sZDsKKwkJaWYgKCFjaGlsZC0+ZGV2aWNlX3R5cGUpIHsKIAkJCS8qIHNr aXAgdGhlIGRldmljZSBibG9jayBpZiBkZXZpY2UgdHlwZSBpcyBpbnZhbGlkICovCiAJCQljb250 aW51ZTsKIAkJfQotCQlpZiAocF9jaGlsZC0+b2xkLnNsYXZlX2FkZHIgIT0gU0xBVkVfQUREUjEg JiYKLQkJCXBfY2hpbGQtPm9sZC5zbGF2ZV9hZGRyICE9IFNMQVZFX0FERFIyKSB7CisJCWlmIChj aGlsZC0+c2xhdmVfYWRkciAhPSBTTEFWRV9BRERSMSAmJgorCQkgICAgY2hpbGQtPnNsYXZlX2Fk ZHIgIT0gU0xBVkVfQUREUjIpIHsKIAkJCS8qCiAJCQkgKiBJZiB0aGUgc2xhdmUgYWRkcmVzcyBp cyBuZWl0aGVyIDB4NzAgbm9yIDB4NzIsCiAJCQkgKiBpdCBpcyBub3QgYSBTRFZPIGRldmljZS4g U2tpcCBpdC4KIAkJCSAqLwogCQkJY29udGludWU7CiAJCX0KLQkJaWYgKHBfY2hpbGQtPm9sZC5k dm9fcG9ydCAhPSBERVZJQ0VfUE9SVF9EVk9CICYmCi0JCQlwX2NoaWxkLT5vbGQuZHZvX3BvcnQg IT0gREVWSUNFX1BPUlRfRFZPQykgeworCQlpZiAoY2hpbGQtPmR2b19wb3J0ICE9IERFVklDRV9Q T1JUX0RWT0IgJiYKKwkJICAgIGNoaWxkLT5kdm9fcG9ydCAhPSBERVZJQ0VfUE9SVF9EVk9DKSB7 CiAJCQkvKiBza2lwIHRoZSBpbmNvcnJlY3QgU0RWTyBwb3J0ICovCiAJCQlEUk1fREVCVUdfS01T KCJJbmNvcnJlY3QgU0RWTyBwb3J0LiBTa2lwIGl0XG4iKTsKIAkJCWNvbnRpbnVlOwogCQl9CiAJ CURSTV9ERUJVR19LTVMoInRoZSBTRFZPIGRldmljZSB3aXRoIHNsYXZlIGFkZHIgJTJ4IGlzIGZv dW5kIG9uIgotCQkJCSIgJXMgcG9ydFxuIiwKLQkJCQlwX2NoaWxkLT5vbGQuc2xhdmVfYWRkciwK LQkJCQkocF9jaGlsZC0+b2xkLmR2b19wb3J0ID09IERFVklDRV9QT1JUX0RWT0IpID8KLQkJCQkJ IlNEVk9CIiA6ICJTRFZPQyIpOwotCQlwX21hcHBpbmcgPSAmKGRldl9wcml2LT5zZHZvX21hcHBp bmdzW3BfY2hpbGQtPm9sZC5kdm9fcG9ydCAtIDFdKTsKKwkJCSAgICAgICIgJXMgcG9ydFxuIiwK KwkJCSAgICAgIGNoaWxkLT5zbGF2ZV9hZGRyLAorCQkJICAgICAgKGNoaWxkLT5kdm9fcG9ydCA9 PSBERVZJQ0VfUE9SVF9EVk9CKSA/CisJCQkgICAgICAiU0RWT0IiIDogIlNEVk9DIik7CisJCXBf bWFwcGluZyA9ICYoZGV2X3ByaXYtPnNkdm9fbWFwcGluZ3NbY2hpbGQtPmR2b19wb3J0IC0gMV0p OwogCQlpZiAoIXBfbWFwcGluZy0+aW5pdGlhbGl6ZWQpIHsKLQkJCXBfbWFwcGluZy0+ZHZvX3Bv cnQgPSBwX2NoaWxkLT5vbGQuZHZvX3BvcnQ7Ci0JCQlwX21hcHBpbmctPnNsYXZlX2FkZHIgPSBw X2NoaWxkLT5vbGQuc2xhdmVfYWRkcjsKLQkJCXBfbWFwcGluZy0+ZHZvX3dpcmluZyA9IHBfY2hp bGQtPm9sZC5kdm9fd2lyaW5nOwotCQkJcF9tYXBwaW5nLT5kZGNfcGluID0gcF9jaGlsZC0+b2xk LmRkY19waW47Ci0JCQlwX21hcHBpbmctPmkyY19waW4gPSBwX2NoaWxkLT5vbGQuaTJjX3BpbjsK KwkJCXBfbWFwcGluZy0+ZHZvX3BvcnQgPSBjaGlsZC0+ZHZvX3BvcnQ7CisJCQlwX21hcHBpbmct PnNsYXZlX2FkZHIgPSBjaGlsZC0+c2xhdmVfYWRkcjsKKwkJCXBfbWFwcGluZy0+ZHZvX3dpcmlu ZyA9IGNoaWxkLT5kdm9fd2lyaW5nOworCQkJcF9tYXBwaW5nLT5kZGNfcGluID0gY2hpbGQtPmRk Y19waW47CisJCQlwX21hcHBpbmctPmkyY19waW4gPSBjaGlsZC0+aTJjX3BpbjsKIAkJCXBfbWFw cGluZy0+aW5pdGlhbGl6ZWQgPSAxOwogCQkJRFJNX0RFQlVHX0tNUygiU0RWTyBkZXZpY2U6IGR2 bz0leCwgYWRkcj0leCwgd2lyaW5nPSVkLCBkZGNfcGluPSVkLCBpMmNfcGluPSVkXG4iLAogCQkJ CSAgICAgIHBfbWFwcGluZy0+ZHZvX3BvcnQsCkBAIC00NjksNyArNDY5LDcgQEAgcGFyc2Vfc2R2 b19kZXZpY2VfbWFwcGluZyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCQlE Uk1fREVCVUdfS01TKCJNYXliZSBvbmUgU0RWTyBwb3J0IGlzIHNoYXJlZCBieSAiCiAJCQkJCSAi dHdvIFNEVk8gZGV2aWNlLlxuIik7CiAJCX0KLQkJaWYgKHBfY2hpbGQtPm9sZC5zbGF2ZTJfYWRk cikgeworCQlpZiAoY2hpbGQtPnNsYXZlMl9hZGRyKSB7CiAJCQkvKiBNYXliZSB0aGlzIGlzIGEg U0RWTyBkZXZpY2Ugd2l0aCBtdWx0aXBsZSBpbnB1dHMgKi8KIAkJCS8qIEFuZCB0aGUgbWFwcGlu ZyBpbmZvIGlzIG5vdCBhZGRlZCAqLwogCQkJRFJNX0RFQlVHX0tNUygidGhlcmUgZXhpc3RzIHRo ZSBzbGF2ZTJfYWRkci4gTWF5YmUgdGhpcyIKLS0gCjIuMS40CgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVs LWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=