From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jim Bride Subject: Re: [PATCH 3/4] drm/i915: Clean up DDI DDC/AUX CH sanitation Date: Thu, 13 Oct 2016 11:17:56 -0700 Message-ID: <20161013181756.GF4042@shiv> References: <1476208368-5710-1-git-send-email-ville.syrjala@linux.intel.com> <1476208368-5710-4-git-send-email-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5049E6E0A3 for ; Thu, 13 Oct 2016 18:19:02 +0000 (UTC) Content-Disposition: inline In-Reply-To: <1476208368-5710-4-git-send-email-ville.syrjala@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: ville.syrjala@linux.intel.com Cc: intel-gfx@lists.freedesktop.org, Maarten Maathuis , stable@vger.kernel.org List-Id: intel-gfx@lists.freedesktop.org T24gVHVlLCBPY3QgMTEsIDIwMTYgYXQgMDg6NTI6NDdQTSArMDMwMCwgdmlsbGUuc3lyamFsYUBs aW51eC5pbnRlbC5jb20gd3JvdGU6Cj4gRnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJq YWxhQGxpbnV4LmludGVsLmNvbT4KPiAKPiBOb3cgdGhhdCB3ZSB1c2UgdGhlIEFVWCBhbmQgR01C VVMgYXNzaWdubWVudCBmcm9tIFZCVCBmb3IgYWxsIHBvcnRzLAo+IGxldCdzIGNsZWFuIHVwIHRo ZSBzYW5pdGl6YXRpb24gb2YgdGhlIHBvcnQgaW5mb3JtYXRpb24gYSBiaXQuCj4gUHJldmlvc3Vs eSB3ZSBvbmx5IGRpZCB0aGlzIGZvciBwb3J0IEUsIGFuZCBvbmx5IGNvbXBsYWluZWQgYWJvdXQg YQo+IG5vbi1zdGFuZGFyZCBhc3NpZ25tZW50IGZvciB0aGUgb3RoZXIgcG9ydHMuIEJ1dCBhcyB3 ZSBrbm93IHRoYXQKPiBub24tc3RhbmRhcmQgYXNzaWdubWVudHMgYXJlIGEgZmFjdCBvZiBsaWZl LCBsZXQncyBleHBhbmQgdGhlCj4gc2FuaXRpemF0aW9uIHRvIGFsbCB0aGUgcG9ydHMuCj4gCj4g djI6IEluY2x1ZGUgYSBjb21taXQgbWVzc2FnZSwgZml4IHVwIHRoZSBjb21tZW50cyBhIGJpdAo+ IAo+IENjOiBzdGFibGVAdmdlci5rZXJuZWwub3JnCj4gQ2M6IE1hYXJ0ZW4gTWFhdGh1aXMgPG1h ZG1hbjIwMDNAZ21haWwuY29tPgo+IFRlc3RlZC1ieTogTWFhcnRlbiBNYWF0aHVpcyA8bWFkbWFu MjAwM0BnbWFpbC5jb20+Cj4gUmVmZXJlbmNlczogaHR0cHM6Ly9idWdzLmZyZWVkZXNrdG9wLm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9OTc4NzcKPiBTaWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJqw6Rsw6Qg PHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgoKUmV2aWV3ZWQtYnk6IEppbSBCcmlkZSA8 amltLmJyaWRlQGxpbnV4LmludGVsLmNvbT4KCj4gLS0tCj4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2Jpb3MuYyB8IDExNiArKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0t LQo+ICAxIGZpbGUgY2hhbmdlZCwgNzEgaW5zZXJ0aW9ucygrKSwgNDUgZGVsZXRpb25zKC0pCj4g Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Jpb3MuYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Jpb3MuYwo+IGluZGV4IDgzNjY3ZThjZGQ2Yi4uNmQxZmZh ODE1ZTk3IDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Jpb3MuYwo+ ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Jpb3MuYwo+IEBAIC0xMDM1LDYgKzEw MzUsNzEgQEAgc3RhdGljIHU4IHRyYW5zbGF0ZV9pYm9vc3QodTggdmFsKQo+ICAJcmV0dXJuIG1h cHBpbmdbdmFsXTsKPiAgfQo+ICAKPiArc3RhdGljIHZvaWQgc2FuaXRpemVfZGRjX3BpbihzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCj4gKwkJCSAgICAgZW51bSBwb3J0IHBvcnQp Cj4gK3sKPiArCWNvbnN0IHN0cnVjdCBkZGlfdmJ0X3BvcnRfaW5mbyAqaW5mbyA9Cj4gKwkJJmRl dl9wcml2LT52YnQuZGRpX3BvcnRfaW5mb1twb3J0XTsKPiArCWVudW0gcG9ydCBwOwo+ICsKPiAr CWZvcl9lYWNoX3BvcnRfbWFza2VkKHAsICgxIDw8IHBvcnQpIC0gMSkgewo+ICsJCXN0cnVjdCBk ZGlfdmJ0X3BvcnRfaW5mbyAqaSA9ICZkZXZfcHJpdi0+dmJ0LmRkaV9wb3J0X2luZm9bcF07Cj4g Kwo+ICsJCWlmIChpbmZvLT5hbHRlcm5hdGVfZGRjX3BpbiAhPSBpLT5hbHRlcm5hdGVfZGRjX3Bp bikKPiArCQkJY29udGludWU7Cj4gKwo+ICsJCURSTV9ERUJVR19LTVMoInBvcnQgJWMgdHJ5aW5n IHRvIHVzZSB0aGUgc2FtZSBEREMgcGluICgweCV4KSBhcyBwb3J0ICVjLCAiCj4gKwkJCSAgICAg ICJkaXNhYmxpbmcgcG9ydCAlYyBEVkkvSERNSSBzdXBwb3J0XG4iLAo+ICsJCQkgICAgICBwb3J0 X25hbWUocCksIGktPmFsdGVybmF0ZV9kZGNfcGluLAo+ICsJCQkgICAgICBwb3J0X25hbWUocG9y dCksIHBvcnRfbmFtZShwKSk7Cj4gKwo+ICsJCS8qCj4gKwkJICogSWYgd2UgaGF2ZSBtdWx0aXBs ZSBwb3J0cyBzdXBwb3NlZGx5IHNoYXJpbmcgdGhlCj4gKwkJICogcGluLCB0aGVuIGR2aS9oZG1p IGNvdWxkbid0IGV4aXN0IG9uIHRoZSBzaGFyZWQKPiArCQkgKiBwb3J0LiBPdGhlcndpc2UgdGhl eSBzaGFyZSB0aGUgc2FtZSBkZGMgYmluIGFuZAo+ICsJCSAqIHN5c3RlbSBjb3VsZG4ndCBjb21t dW5pY2F0ZSB3aXRoIHRoZW0gc2VwYXJhdGVseS4KPiArCQkgKgo+ICsJCSAqIER1ZSB0byBwYXJz aW5nIHRoZSBwb3J0cyBpbiBhbHBoYWJldGljYWwgb3JkZXIsCj4gKwkJICogYSBoaWdoZXIgcG9y dCB3aWxsIGFsd2F5cyBjbG9iYmVyIGEgbG93ZXIgb25lLgo+ICsJCSAqLwo+ICsJCWktPnN1cHBv cnRzX2R2aSA9IGZhbHNlOwo+ICsJCWktPnN1cHBvcnRzX2hkbWkgPSBmYWxzZTsKPiArCQlpLT5h bHRlcm5hdGVfZGRjX3BpbiA9IDA7Cj4gKwl9Cj4gK30KPiArCj4gK3N0YXRpYyB2b2lkIHNhbml0 aXplX2F1eF9jaChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCj4gKwkJCSAgICBl bnVtIHBvcnQgcG9ydCkKPiArewo+ICsJY29uc3Qgc3RydWN0IGRkaV92YnRfcG9ydF9pbmZvICpp bmZvID0KPiArCQkmZGV2X3ByaXYtPnZidC5kZGlfcG9ydF9pbmZvW3BvcnRdOwo+ICsJZW51bSBw b3J0IHA7Cj4gKwo+ICsJZm9yX2VhY2hfcG9ydF9tYXNrZWQocCwgKDEgPDwgcG9ydCkgLSAxKSB7 Cj4gKwkJc3RydWN0IGRkaV92YnRfcG9ydF9pbmZvICppID0gJmRldl9wcml2LT52YnQuZGRpX3Bv cnRfaW5mb1twXTsKPiArCj4gKwkJaWYgKGluZm8tPmFsdGVybmF0ZV9hdXhfY2hhbm5lbCAhPSBp LT5hbHRlcm5hdGVfYXV4X2NoYW5uZWwpCj4gKwkJCWNvbnRpbnVlOwo+ICsKPiArCQlEUk1fREVC VUdfS01TKCJwb3J0ICVjIHRyeWluZyB0byB1c2UgdGhlIHNhbWUgQVVYIENIICgweCV4KSBhcyBw b3J0ICVjLCAiCj4gKwkJCSAgICAgICJkaXNhYmxpbmcgcG9ydCAlYyBEUCBzdXBwb3J0XG4iLAo+ ICsJCQkgICAgICBwb3J0X25hbWUocCksIGktPmFsdGVybmF0ZV9hdXhfY2hhbm5lbCwKPiArCQkJ ICAgICAgcG9ydF9uYW1lKHBvcnQpLCBwb3J0X25hbWUocCkpOwo+ICsKPiArCQkvKgo+ICsJCSAq IElmIHdlIGhhdmUgbXVsdGlwbGUgcG9ydHMgc3VwcG9zZWRsdCBzaGFyaW5nIHRoZQo+ICsJCSAq IGF1eCBjaGFubmVsLCB0aGVuIERQIGNvdWxkbid0IGV4aXN0IG9uIHRoZSBzaGFyZWQKPiArCQkg KiBwb3J0LiBPdGhlcndpc2UgdGhleSBzaGFyZSB0aGUgc2FtZSBhdXggY2hhbm5lbAo+ICsJCSAq IGFuZCBzeXN0ZW0gY291bGRuJ3QgY29tbXVuaWNhdGUgd2l0aCB0aGVtIHNlcGFyYXRlbHkuCj4g KwkJICoKPiArCQkgKiBEdWUgdG8gcGFyc2luZyB0aGUgcG9ydHMgaW4gYWxwaGFiZXRpY2FsIG9y ZGVyLAo+ICsJCSAqIGEgaGlnaGVyIHBvcnQgd2lsbCBhbHdheXMgY2xvYmJlciBhIGxvd2VyIG9u ZS4KPiArCQkgKi8KPiArCQlpLT5zdXBwb3J0c19kcCA9IGZhbHNlOwo+ICsJCWktPmFsdGVybmF0 ZV9hdXhfY2hhbm5lbCA9IDA7Cj4gKwl9Cj4gK30KPiArCj4gIHN0YXRpYyB2b2lkIHBhcnNlX2Rk aV9wb3J0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgZW51bSBwb3J0IHBvcnQs Cj4gIAkJCSAgIGNvbnN0IHN0cnVjdCBiZGJfaGVhZGVyICpiZGIpCj4gIHsKPiBAQCAtMTEwOSw1 NCArMTE3NCwxNSBAQCBzdGF0aWMgdm9pZCBwYXJzZV9kZGlfcG9ydChzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYsIGVudW0gcG9ydCBwb3J0LAo+ICAJCURSTV9ERUJVR19LTVMoIlBv cnQgJWMgaXMgaW50ZXJuYWwgRFBcbiIsIHBvcnRfbmFtZShwb3J0KSk7Cj4gIAo+ICAJaWYgKGlz X2R2aSkgewo+IC0JCWlmIChwb3J0ID09IFBPUlRfRSkgewo+IC0JCQlpbmZvLT5hbHRlcm5hdGVf ZGRjX3BpbiA9IGRkY19waW47Cj4gLQkJCS8qIGlmIERESUUgc2hhcmUgZGRjIHBpbiB3aXRoIG90 aGVyIHBvcnQsIHRoZW4KPiAtCQkJICogZHZpL2hkbWkgY291bGRuJ3QgZXhpc3Qgb24gdGhlIHNo YXJlZCBwb3J0Lgo+IC0JCQkgKiBPdGhlcndpc2UgdGhleSBzaGFyZSB0aGUgc2FtZSBkZGMgYmlu IGFuZCBzeXN0ZW0KPiAtCQkJICogY291bGRuJ3QgY29tbXVuaWNhdGUgd2l0aCB0aGVtIHNlcGVy YXRlbHkuICovCj4gLQkJCWlmIChkZGNfcGluID09IEREQ19QSU5fQikgewo+IC0JCQkJZGV2X3By aXYtPnZidC5kZGlfcG9ydF9pbmZvW1BPUlRfQl0uc3VwcG9ydHNfZHZpID0gMDsKPiAtCQkJCWRl dl9wcml2LT52YnQuZGRpX3BvcnRfaW5mb1tQT1JUX0JdLnN1cHBvcnRzX2hkbWkgPSAwOwo+IC0J CQl9IGVsc2UgaWYgKGRkY19waW4gPT0gRERDX1BJTl9DKSB7Cj4gLQkJCQlkZXZfcHJpdi0+dmJ0 LmRkaV9wb3J0X2luZm9bUE9SVF9DXS5zdXBwb3J0c19kdmkgPSAwOwo+IC0JCQkJZGV2X3ByaXYt PnZidC5kZGlfcG9ydF9pbmZvW1BPUlRfQ10uc3VwcG9ydHNfaGRtaSA9IDA7Cj4gLQkJCX0gZWxz ZSBpZiAoZGRjX3BpbiA9PSBERENfUElOX0QpIHsKPiAtCQkJCWRldl9wcml2LT52YnQuZGRpX3Bv cnRfaW5mb1tQT1JUX0RdLnN1cHBvcnRzX2R2aSA9IDA7Cj4gLQkJCQlkZXZfcHJpdi0+dmJ0LmRk aV9wb3J0X2luZm9bUE9SVF9EXS5zdXBwb3J0c19oZG1pID0gMDsKPiAtCQkJfQo+IC0JCX0gZWxz ZSBpZiAoZGRjX3BpbiA9PSBERENfUElOX0IgJiYgcG9ydCAhPSBQT1JUX0IpCj4gLQkJCURSTV9E RUJVR19LTVMoIlVuZXhwZWN0ZWQgRERDIHBpbiBmb3IgcG9ydCBCXG4iKTsKPiAtCQllbHNlIGlm IChkZGNfcGluID09IEREQ19QSU5fQyAmJiBwb3J0ICE9IFBPUlRfQykKPiAtCQkJRFJNX0RFQlVH X0tNUygiVW5leHBlY3RlZCBEREMgcGluIGZvciBwb3J0IENcbiIpOwo+IC0JCWVsc2UgaWYgKGRk Y19waW4gPT0gRERDX1BJTl9EICYmIHBvcnQgIT0gUE9SVF9EKQo+IC0JCQlEUk1fREVCVUdfS01T KCJVbmV4cGVjdGVkIEREQyBwaW4gZm9yIHBvcnQgRFxuIik7Cj4gKwkJaW5mby0+YWx0ZXJuYXRl X2RkY19waW4gPSBkZGNfcGluOwo+ICsKPiArCQlzYW5pdGl6ZV9kZGNfcGluKGRldl9wcml2LCBw b3J0KTsKPiAgCX0KPiAgCj4gIAlpZiAoaXNfZHApIHsKPiAtCQlpZiAocG9ydCA9PSBQT1JUX0Up IHsKPiAtCQkJaW5mby0+YWx0ZXJuYXRlX2F1eF9jaGFubmVsID0gYXV4X2NoYW5uZWw7Cj4gLQkJ CS8qIGlmIERESUUgc2hhcmUgYXV4IGNoYW5uZWwgd2l0aCBvdGhlciBwb3J0LCB0aGVuCj4gLQkJ CSAqIERQIGNvdWxkbid0IGV4aXN0IG9uIHRoZSBzaGFyZWQgcG9ydC4gT3RoZXJ3aXNlCj4gLQkJ CSAqIHRoZXkgc2hhcmUgdGhlIHNhbWUgYXV4IGNoYW5uZWwgYW5kIHN5c3RlbQo+IC0JCQkgKiBj b3VsZG4ndCBjb21tdW5pY2F0ZSB3aXRoIHRoZW0gc2VwZXJhdGVseS4gKi8KPiAtCQkJaWYgKGF1 eF9jaGFubmVsID09IERQX0FVWF9BKQo+IC0JCQkJZGV2X3ByaXYtPnZidC5kZGlfcG9ydF9pbmZv W1BPUlRfQV0uc3VwcG9ydHNfZHAgPSAwOwo+IC0JCQllbHNlIGlmIChhdXhfY2hhbm5lbCA9PSBE UF9BVVhfQikKPiAtCQkJCWRldl9wcml2LT52YnQuZGRpX3BvcnRfaW5mb1tQT1JUX0JdLnN1cHBv cnRzX2RwID0gMDsKPiAtCQkJZWxzZSBpZiAoYXV4X2NoYW5uZWwgPT0gRFBfQVVYX0MpCj4gLQkJ CQlkZXZfcHJpdi0+dmJ0LmRkaV9wb3J0X2luZm9bUE9SVF9DXS5zdXBwb3J0c19kcCA9IDA7Cj4g LQkJCWVsc2UgaWYgKGF1eF9jaGFubmVsID09IERQX0FVWF9EKQo+IC0JCQkJZGV2X3ByaXYtPnZi dC5kZGlfcG9ydF9pbmZvW1BPUlRfRF0uc3VwcG9ydHNfZHAgPSAwOwo+IC0JCX0KPiAtCQllbHNl IGlmIChhdXhfY2hhbm5lbCA9PSBEUF9BVVhfQSAmJiBwb3J0ICE9IFBPUlRfQSkKPiAtCQkJRFJN X0RFQlVHX0tNUygiVW5leHBlY3RlZCBBVVggY2hhbm5lbCBmb3IgcG9ydCBBXG4iKTsKPiAtCQll bHNlIGlmIChhdXhfY2hhbm5lbCA9PSBEUF9BVVhfQiAmJiBwb3J0ICE9IFBPUlRfQikKPiAtCQkJ RFJNX0RFQlVHX0tNUygiVW5leHBlY3RlZCBBVVggY2hhbm5lbCBmb3IgcG9ydCBCXG4iKTsKPiAt CQllbHNlIGlmIChhdXhfY2hhbm5lbCA9PSBEUF9BVVhfQyAmJiBwb3J0ICE9IFBPUlRfQykKPiAt CQkJRFJNX0RFQlVHX0tNUygiVW5leHBlY3RlZCBBVVggY2hhbm5lbCBmb3IgcG9ydCBDXG4iKTsK PiAtCQllbHNlIGlmIChhdXhfY2hhbm5lbCA9PSBEUF9BVVhfRCAmJiBwb3J0ICE9IFBPUlRfRCkK PiAtCQkJRFJNX0RFQlVHX0tNUygiVW5leHBlY3RlZCBBVVggY2hhbm5lbCBmb3IgcG9ydCBEXG4i KTsKPiArCQlpbmZvLT5hbHRlcm5hdGVfYXV4X2NoYW5uZWwgPSBhdXhfY2hhbm5lbDsKPiArCj4g KwkJc2FuaXRpemVfYXV4X2NoKGRldl9wcml2LCBwb3J0KTsKPiAgCX0KPiAgCj4gIAlpZiAoYmRi LT52ZXJzaW9uID49IDE1OCkgewo+IC0tIAo+IDIuNy40Cj4gCj4gX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KPiBJbnRlbC1nZnggbWFpbGluZyBsaXN0Cj4g SW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwo+IGh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4 QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWls bWFuL2xpc3RpbmZvL2ludGVsLWdmeAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com ([134.134.136.20]:27393 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932666AbcJMSTC (ORCPT ); Thu, 13 Oct 2016 14:19:02 -0400 Date: Thu, 13 Oct 2016 11:17:56 -0700 From: Jim Bride To: ville.syrjala@linux.intel.com Cc: intel-gfx@lists.freedesktop.org, Maarten Maathuis , stable@vger.kernel.org Subject: Re: [Intel-gfx] [PATCH 3/4] drm/i915: Clean up DDI DDC/AUX CH sanitation Message-ID: <20161013181756.GF4042@shiv> References: <1476208368-5710-1-git-send-email-ville.syrjala@linux.intel.com> <1476208368-5710-4-git-send-email-ville.syrjala@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1476208368-5710-4-git-send-email-ville.syrjala@linux.intel.com> Sender: stable-owner@vger.kernel.org List-ID: On Tue, Oct 11, 2016 at 08:52:47PM +0300, ville.syrjala@linux.intel.com wrote: > From: Ville Syrj�l� > > Now that we use the AUX and GMBUS assignment from VBT for all ports, > let's clean up the sanitization of the port information a bit. > Previosuly we only did this for port E, and only complained about a > non-standard assignment for the other ports. But as we know that > non-standard assignments are a fact of life, let's expand the > sanitization to all the ports. > > v2: Include a commit message, fix up the comments a bit > > Cc: stable@vger.kernel.org > Cc: Maarten Maathuis > Tested-by: Maarten Maathuis > References: https://bugs.freedesktop.org/show_bug.cgi?id=97877 > Signed-off-by: Ville Syrj�l� Reviewed-by: Jim Bride > --- > drivers/gpu/drm/i915/intel_bios.c | 116 +++++++++++++++++++++++--------------- > 1 file changed, 71 insertions(+), 45 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c > index 83667e8cdd6b..6d1ffa815e97 100644 > --- a/drivers/gpu/drm/i915/intel_bios.c > +++ b/drivers/gpu/drm/i915/intel_bios.c > @@ -1035,6 +1035,71 @@ static u8 translate_iboost(u8 val) > return mapping[val]; > } > > +static void sanitize_ddc_pin(struct drm_i915_private *dev_priv, > + enum port port) > +{ > + const struct ddi_vbt_port_info *info = > + &dev_priv->vbt.ddi_port_info[port]; > + enum port p; > + > + for_each_port_masked(p, (1 << port) - 1) { > + struct ddi_vbt_port_info *i = &dev_priv->vbt.ddi_port_info[p]; > + > + if (info->alternate_ddc_pin != i->alternate_ddc_pin) > + continue; > + > + DRM_DEBUG_KMS("port %c trying to use the same DDC pin (0x%x) as port %c, " > + "disabling port %c DVI/HDMI support\n", > + port_name(p), i->alternate_ddc_pin, > + port_name(port), port_name(p)); > + > + /* > + * If we have multiple ports supposedly sharing the > + * pin, then dvi/hdmi couldn't exist on the shared > + * port. Otherwise they share the same ddc bin and > + * system couldn't communicate with them separately. > + * > + * Due to parsing the ports in alphabetical order, > + * a higher port will always clobber a lower one. > + */ > + i->supports_dvi = false; > + i->supports_hdmi = false; > + i->alternate_ddc_pin = 0; > + } > +} > + > +static void sanitize_aux_ch(struct drm_i915_private *dev_priv, > + enum port port) > +{ > + const struct ddi_vbt_port_info *info = > + &dev_priv->vbt.ddi_port_info[port]; > + enum port p; > + > + for_each_port_masked(p, (1 << port) - 1) { > + struct ddi_vbt_port_info *i = &dev_priv->vbt.ddi_port_info[p]; > + > + if (info->alternate_aux_channel != i->alternate_aux_channel) > + continue; > + > + DRM_DEBUG_KMS("port %c trying to use the same AUX CH (0x%x) as port %c, " > + "disabling port %c DP support\n", > + port_name(p), i->alternate_aux_channel, > + port_name(port), port_name(p)); > + > + /* > + * If we have multiple ports supposedlt sharing the > + * aux channel, then DP couldn't exist on the shared > + * port. Otherwise they share the same aux channel > + * and system couldn't communicate with them separately. > + * > + * Due to parsing the ports in alphabetical order, > + * a higher port will always clobber a lower one. > + */ > + i->supports_dp = false; > + i->alternate_aux_channel = 0; > + } > +} > + > static void parse_ddi_port(struct drm_i915_private *dev_priv, enum port port, > const struct bdb_header *bdb) > { > @@ -1109,54 +1174,15 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv, enum port port, > DRM_DEBUG_KMS("Port %c is internal DP\n", port_name(port)); > > if (is_dvi) { > - if (port == PORT_E) { > - info->alternate_ddc_pin = ddc_pin; > - /* if DDIE share ddc pin with other port, then > - * dvi/hdmi couldn't exist on the shared port. > - * Otherwise they share the same ddc bin and system > - * couldn't communicate with them seperately. */ > - if (ddc_pin == DDC_PIN_B) { > - dev_priv->vbt.ddi_port_info[PORT_B].supports_dvi = 0; > - dev_priv->vbt.ddi_port_info[PORT_B].supports_hdmi = 0; > - } else if (ddc_pin == DDC_PIN_C) { > - dev_priv->vbt.ddi_port_info[PORT_C].supports_dvi = 0; > - dev_priv->vbt.ddi_port_info[PORT_C].supports_hdmi = 0; > - } else if (ddc_pin == DDC_PIN_D) { > - dev_priv->vbt.ddi_port_info[PORT_D].supports_dvi = 0; > - dev_priv->vbt.ddi_port_info[PORT_D].supports_hdmi = 0; > - } > - } else if (ddc_pin == DDC_PIN_B && port != PORT_B) > - DRM_DEBUG_KMS("Unexpected DDC pin for port B\n"); > - else if (ddc_pin == DDC_PIN_C && port != PORT_C) > - DRM_DEBUG_KMS("Unexpected DDC pin for port C\n"); > - else if (ddc_pin == DDC_PIN_D && port != PORT_D) > - DRM_DEBUG_KMS("Unexpected DDC pin for port D\n"); > + info->alternate_ddc_pin = ddc_pin; > + > + sanitize_ddc_pin(dev_priv, port); > } > > if (is_dp) { > - if (port == PORT_E) { > - info->alternate_aux_channel = aux_channel; > - /* if DDIE share aux channel with other port, then > - * DP couldn't exist on the shared port. Otherwise > - * they share the same aux channel and system > - * couldn't communicate with them seperately. */ > - if (aux_channel == DP_AUX_A) > - dev_priv->vbt.ddi_port_info[PORT_A].supports_dp = 0; > - else if (aux_channel == DP_AUX_B) > - dev_priv->vbt.ddi_port_info[PORT_B].supports_dp = 0; > - else if (aux_channel == DP_AUX_C) > - dev_priv->vbt.ddi_port_info[PORT_C].supports_dp = 0; > - else if (aux_channel == DP_AUX_D) > - dev_priv->vbt.ddi_port_info[PORT_D].supports_dp = 0; > - } > - else if (aux_channel == DP_AUX_A && port != PORT_A) > - DRM_DEBUG_KMS("Unexpected AUX channel for port A\n"); > - else if (aux_channel == DP_AUX_B && port != PORT_B) > - DRM_DEBUG_KMS("Unexpected AUX channel for port B\n"); > - else if (aux_channel == DP_AUX_C && port != PORT_C) > - DRM_DEBUG_KMS("Unexpected AUX channel for port C\n"); > - else if (aux_channel == DP_AUX_D && port != PORT_D) > - DRM_DEBUG_KMS("Unexpected AUX channel for port D\n"); > + info->alternate_aux_channel = aux_channel; > + > + sanitize_aux_ch(dev_priv, port); > } > > if (bdb->version >= 158) { > -- > 2.7.4 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx