From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH] drm/i915: Retry port as HDMI if dp_is_edp turns out to be false Date: Wed, 12 Aug 2015 16:45:39 +0300 Message-ID: <20150812134539.GX5176@intel.com> References: <1439122373-16425-1-git-send-email-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 74A1D6E14A for ; Wed, 12 Aug 2015 06:45:55 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1439122373-16425-1-git-send-email-chris@chris-wilson.co.uk> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Chris Wilson Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T24gU3VuLCBBdWcgMDksIDIwMTUgYXQgMDE6MTI6NTNQTSArMDEwMCwgQ2hyaXMgV2lsc29uIHdy b3RlOgo+IFdlIGZvbGxvdyB0aGUgVkJUIGFzIHRvIHdoZXRoZXIgYSBEREkgcG9ydCBpcyB1c2Vk IGZvciBlRFAgYW5kIGlmIHNvLCBkbwo+IG5vdCBhdHRhY2ggYSBIRE1JIGVuY29kZXIgdG8gaXQu IEhvd2V2ZXIgdGhlcmUgYXJlIG1hY2hpbmVzIGZvciB3aGljaAo+IHRoZSBWQlQgZURQIGZsYWcg aXMgYSBsaWUgKHNob2NraW5nISkgYW5kIHdlIGZhaWwgdG8gZGV0ZWN0IGEgZURQIGxpbmsuCj4g RnVydGhlcm1vcmUsIG9uIHRob3NlIG1hY2hpbmVzIHRoZSBIRE1JIGlzIGNvbm5lY3RlZCB0byB0 aGF0IERESSBwb3J0Cj4gYnV0IHdlIGlnbm9yZSBpdC4KPiAKPiBJZiB3ZSByZW9yZGVyIG91ciBw b3J0IGluaXRpYWxpc2F0aW9uIHRvIHRyeSB0aGUgZURQIHNldHVwIGZpcnN0IGFuZAo+IGlmIHRo YXQgZmFpbHMgd2UgY2FuIHRyZWF0IGl0IGFzIGEgbm9ybWFsIERQIHBvcnQgYWxvbmcgd2l0aCBh IEhETUkKPiBvdXRwdXQuIFRvIGFjY29tcGxpc2ggdGhpcywgd2UgaGF2ZSB0byBkZWxheSByZWdp c3RlcmluZyB0aGUgRFAKPiBjb25uZWN0b3IvZW5jb2RlciB1bnRpbCBhZnRlciB3ZSBlc3RhYmxp c2ggaXRzIGZpbmFsIHR5cGUuCj4gCj4gQnVnemlsbGE6IGh0dHBzOi8vYnVncy5mcmVlZGVza3Rv cC5vcmcvc2hvd19idWcuY2dpP2lkPTg4MzMxCj4gU2lnbmVkLW9mZi1ieTogQ2hyaXMgV2lsc29u IDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+Cj4gQ2M6IEplc3NlIEJhcm5lcyA8amJhcm5lc0B2 aXJ0dW91c2dlZWsub3JnPgo+IC0tLQo+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNw bGF5LmMgfCAgMjcgKysrKy0tLS0KPiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYyAg ICAgIHwgMTI3ICsrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tCj4gIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rydi5oICAgICB8ICAgNiArLQo+ICAzIGZpbGVzIGNoYW5nZWQs IDc5IGluc2VydGlvbnMoKyksIDgxIGRlbGV0aW9ucygtKQo+IAo+IGRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kaXNwbGF5LmMKPiBpbmRleCAwYmNkMWIxYWJhNGYuLmFhYjhkZmQxZjhhNSAxMDA2NDQK PiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKPiArKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKPiBAQCAtMTM5NDEsNyArMTM5NDEsNiBA QCBzdGF0aWMgdm9pZCBpbnRlbF9zZXR1cF9vdXRwdXRzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYp Cj4gIHsKPiAgCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3By aXZhdGU7Cj4gIAlzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlcjsKPiAtCWJvb2wgZHBkX2lz X2VkcCA9IGZhbHNlOwo+ICAKPiAgCWludGVsX2x2ZHNfaW5pdChkZXYpOwo+ICAKPiBAQCAtMTM5 ODMsMzEgKzEzOTgyLDMzIEBAIHN0YXRpYyB2b2lkIGludGVsX3NldHVwX291dHB1dHMoc3RydWN0 IGRybV9kZXZpY2UgKmRldikKPiAgCQkJaW50ZWxfZGRpX2luaXQoZGV2LCBQT1JUX0QpOwo+ICAJ fSBlbHNlIGlmIChIQVNfUENIX1NQTElUKGRldikpIHsKPiAgCQlpbnQgZm91bmQ7Cj4gLQkJZHBk X2lzX2VkcCA9IGludGVsX2RwX2lzX2VkcChkZXYsIFBPUlRfRCk7Cj4gIAo+ICAJCWlmIChoYXNf ZWRwX2EoZGV2KSkKPiAgCQkJaW50ZWxfZHBfaW5pdChkZXYsIERQX0EsIFBPUlRfQSk7Cj4gIAo+ ICsJCWZvdW5kID0gMDsKPiArCQkvKiBQQ0ggU0RWT0IgbXVsdGlwbGV4IHdpdGggSERNSUIgKi8K PiAgCQlpZiAoSTkxNV9SRUFEKFBDSF9IRE1JQikgJiBTRFZPX0RFVEVDVEVEKSB7Cj4gLQkJCS8q IFBDSCBTRFZPQiBtdWx0aXBsZXggd2l0aCBIRE1JQiAqLwo+ICAJCQlmb3VuZCA9IGludGVsX3Nk dm9faW5pdChkZXYsIFBDSF9TRFZPQiwgdHJ1ZSk7Cj4gIAkJCWlmICghZm91bmQpCj4gIAkJCQlp bnRlbF9oZG1pX2luaXQoZGV2LCBQQ0hfSERNSUIsIFBPUlRfQik7Cj4gLQkJCWlmICghZm91bmQg JiYgKEk5MTVfUkVBRChQQ0hfRFBfQikgJiBEUF9ERVRFQ1RFRCkpCj4gLQkJCQlpbnRlbF9kcF9p bml0KGRldiwgUENIX0RQX0IsIFBPUlRfQik7Cj4gIAkJfQo+ICsJCWlmICghZm91bmQgJiYgSTkx NV9SRUFEKFBDSF9EUF9CKSAmIERQX0RFVEVDVEVEKQo+ICsJCQlpbnRlbF9kcF9pbml0KGRldiwg UENIX0RQX0IsIFBPUlRfQik7Cj4gIAo+IC0JCWlmIChJOTE1X1JFQUQoUENIX0hETUlDKSAmIFNE Vk9fREVURUNURUQpCj4gLQkJCWludGVsX2hkbWlfaW5pdChkZXYsIFBDSF9IRE1JQywgUE9SVF9D KTsKPiAtCj4gLQkJaWYgKCFkcGRfaXNfZWRwICYmIEk5MTVfUkVBRChQQ0hfSERNSUQpICYgU0RW T19ERVRFQ1RFRCkKPiAtCQkJaW50ZWxfaGRtaV9pbml0KGRldiwgUENIX0hETUlELCBQT1JUX0Qp Owo+IC0KPiArCQlmb3VuZCA9IDA7Cj4gIAkJaWYgKEk5MTVfUkVBRChQQ0hfRFBfQykgJiBEUF9E RVRFQ1RFRCkKPiAtCQkJaW50ZWxfZHBfaW5pdChkZXYsIFBDSF9EUF9DLCBQT1JUX0MpOwo+ICsJ CQlmb3VuZCA9IGludGVsX2RwX2luaXQoZGV2LCBQQ0hfRFBfQywgUE9SVF9DKTsKPiArCQlpZiAo Zm91bmQgIT0gRFJNX01PREVfQ09OTkVDVE9SX2VEUCAmJgo+ICsJCSAgICBJOTE1X1JFQUQoUENI X0hETUlDKSAmIFNEVk9fREVURUNURUQpCj4gKwkJCWludGVsX2hkbWlfaW5pdChkZXYsIFBDSF9I RE1JQywgUE9SVF9DKTsKPiAgCj4gKwkJZm91bmQgPSAwOwo+ICAJCWlmIChJOTE1X1JFQUQoUENI X0RQX0QpICYgRFBfREVURUNURUQpCj4gLQkJCWludGVsX2RwX2luaXQoZGV2LCBQQ0hfRFBfRCwg UE9SVF9EKTsKPiArCQkJZm91bmQgPSBpbnRlbF9kcF9pbml0KGRldiwgUENIX0RQX0QsIFBPUlRf RCk7Cj4gKwkJaWYgKGZvdW5kICE9IERSTV9NT0RFX0NPTk5FQ1RPUl9lRFAgJiYKPiArCQkgICAg STkxNV9SRUFEKFBDSF9IRE1JRCkgJiBTRFZPX0RFVEVDVEVEKQo+ICsJCQlpbnRlbF9oZG1pX2lu aXQoZGV2LCBQQ0hfSERNSUQsIFBPUlRfRCk7Cj4gIAl9IGVsc2UgaWYgKElTX1ZBTExFWVZJRVco ZGV2KSkgewo+ICAJCS8qCj4gIAkJICogVGhlIERQX0RFVEVDVEVEIGJpdCBpcyB0aGUgbGF0Y2hl ZCBzdGF0ZSBvZiB0aGUgRERDCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2RwLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jCj4gaW5kZXggMWU2NGE4 YzFlN2NiLi44YWRmNTAwZjM5ODkgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZHAuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMKPiBAQCAt MTAzMSwxNCArMTAzMSwxMyBAQCBpbnRlbF9kcF9hdXhfdHJhbnNmZXIoc3RydWN0IGRybV9kcF9h dXggKmF1eCwgc3RydWN0IGRybV9kcF9hdXhfbXNnICptc2cpCj4gIAlyZXR1cm4gcmV0Owo+ICB9 Cj4gIAo+IC1zdGF0aWMgdm9pZAo+ICtzdGF0aWMgaW50Cj4gIGludGVsX2RwX2F1eF9pbml0KHN0 cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHAsIHN0cnVjdCBpbnRlbF9jb25uZWN0b3IgKmNvbm5lY3Rv cikKPiAgewo+ICAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGludGVsX2RwX3RvX2RldihpbnRl bF9kcCk7Cj4gIAlzdHJ1Y3QgaW50ZWxfZGlnaXRhbF9wb3J0ICppbnRlbF9kaWdfcG9ydCA9IGRw X3RvX2RpZ19wb3J0KGludGVsX2RwKTsKPiAgCWVudW0gcG9ydCBwb3J0ID0gaW50ZWxfZGlnX3Bv cnQtPnBvcnQ7Cj4gIAljb25zdCBjaGFyICpuYW1lID0gTlVMTDsKPiAtCWludCByZXQ7Cj4gIAo+ ICAJc3dpdGNoIChwb3J0KSB7Cj4gIAljYXNlIFBPUlRfQToKPiBAQCAtMTA4MCwyMCArMTA3OSw3 IEBAIGludGVsX2RwX2F1eF9pbml0KHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHAsIHN0cnVjdCBp bnRlbF9jb25uZWN0b3IgKmNvbm5lY3RvcikKPiAgCURSTV9ERUJVR19LTVMoInJlZ2lzdGVyaW5n ICVzIGJ1cyBmb3IgJXNcbiIsIG5hbWUsCj4gIAkJICAgICAgY29ubmVjdG9yLT5iYXNlLmtkZXYt PmtvYmoubmFtZSk7Cj4gIAo+IC0JcmV0ID0gZHJtX2RwX2F1eF9yZWdpc3RlcigmaW50ZWxfZHAt PmF1eCk7Cj4gLQlpZiAocmV0IDwgMCkgewo+IC0JCURSTV9FUlJPUigiZHJtX2RwX2F1eF9yZWdp c3RlcigpIGZvciAlcyBmYWlsZWQgKCVkKVxuIiwKPiAtCQkJICBuYW1lLCByZXQpOwo+IC0JCXJl dHVybjsKPiAtCX0KPiAtCj4gLQlyZXQgPSBzeXNmc19jcmVhdGVfbGluaygmY29ubmVjdG9yLT5i YXNlLmtkZXYtPmtvYmosCj4gLQkJCQkmaW50ZWxfZHAtPmF1eC5kZGMuZGV2LmtvYmosCj4gLQkJ CQlpbnRlbF9kcC0+YXV4LmRkYy5kZXYua29iai5uYW1lKTsKPiAtCWlmIChyZXQgPCAwKSB7Cj4g LQkJRFJNX0VSUk9SKCJzeXNmc19jcmVhdGVfbGluaygpIGZvciAlcyBmYWlsZWQgKCVkKVxuIiwg bmFtZSwgcmV0KTsKPiAtCQlkcm1fZHBfYXV4X3VucmVnaXN0ZXIoJmludGVsX2RwLT5hdXgpOwo+ IC0JfQo+ICsJcmV0dXJuIGRybV9kcF9hdXhfcmVnaXN0ZXIoJmludGVsX2RwLT5hdXgpOwo+ICB9 Cj4gIAo+ICBzdGF0aWMgdm9pZAo+IEBAIC01MDE5LDYgKzUwMDUsMTAgQEAgYm9vbCBpbnRlbF9k cF9pc19lZHAoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgZW51bSBwb3J0IHBvcnQpCj4gIAkJW1BP UlRfRF0gPSBQT1JUX0lEUEQsCj4gIAl9Owo+ICAKPiArCS8qIGVEUCBvbmx5IG9uIHBvcnQgQiBh bmQvb3IgQyBvbiB2bHYvY2h2ICovCj4gKwlpZiAoSVNfVkFMTEVZVklFVyhkZXZfcHJpdikgJiYg IShwb3J0ID09IFBPUlRfQiB8fCBwb3J0ID09IFBPUlRfQykpCj4gKwkJcmV0dXJuIGZhbHNlOwo+ ICsKPiAgCWlmIChwb3J0ID09IFBPUlRfQSkKPiAgCQlyZXR1cm4gdHJ1ZTsKPiAgCj4gQEAgLTU2 NzAsOSArNTY2MCw2IEBAIHN0YXRpYyBib29sIGludGVsX2VkcF9pbml0X2Nvbm5lY3RvcihzdHJ1 Y3QgaW50ZWxfZHAgKmludGVsX2RwLAo+ICAJc3RydWN0IGVkaWQgKmVkaWQ7Cj4gIAllbnVtIHBp cGUgcGlwZSA9IElOVkFMSURfUElQRTsKPiAgCj4gLQlpZiAoIWlzX2VkcChpbnRlbF9kcCkpCj4g LQkJcmV0dXJuIHRydWU7Cj4gLQo+ICAJcHBzX2xvY2soaW50ZWxfZHApOwo+ICAJaW50ZWxfZWRw X3BhbmVsX3ZkZF9zYW5pdGl6ZShpbnRlbF9kcCk7Cj4gIAlwcHNfdW5sb2NrKGludGVsX2RwKTsK PiBAQCAtNTc2Miw3ICs1NzQ5LDcgQEAgc3RhdGljIGJvb2wgaW50ZWxfZWRwX2luaXRfY29ubmVj dG9yKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHAsCj4gIAlyZXR1cm4gdHJ1ZTsKPiAgfQo+ICAK PiAtYm9vbAo+ICtpbnQKPiAgaW50ZWxfZHBfaW5pdF9jb25uZWN0b3Ioc3RydWN0IGludGVsX2Rp Z2l0YWxfcG9ydCAqaW50ZWxfZGlnX3BvcnQsCj4gIAkJCXN0cnVjdCBpbnRlbF9jb25uZWN0b3Ig KmludGVsX2Nvbm5lY3RvcikKPiAgewo+IEBAIC01NzcyLDYgKzU3NTksNyBAQCBpbnRlbF9kcF9p bml0X2Nvbm5lY3RvcihzdHJ1Y3QgaW50ZWxfZGlnaXRhbF9wb3J0ICppbnRlbF9kaWdfcG9ydCwK PiAgCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBpbnRlbF9lbmNvZGVyLT5iYXNlLmRldjsKPiAg CXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7Cj4g IAllbnVtIHBvcnQgcG9ydCA9IGludGVsX2RpZ19wb3J0LT5wb3J0Owo+ICsJaW50IHJldDsKPiAg CWludCB0eXBlOwo+ICAKPiAgCWludGVsX2RwLT5wcHNfcGlwZSA9IElOVkFMSURfUElQRTsKPiBA QCAtNTgwMiwzNCArNTc5MCwxNCBAQCBpbnRlbF9kcF9pbml0X2Nvbm5lY3RvcihzdHJ1Y3QgaW50 ZWxfZGlnaXRhbF9wb3J0ICppbnRlbF9kaWdfcG9ydCwKPiAgCWVsc2UKPiAgCQl0eXBlID0gRFJN X01PREVfQ09OTkVDVE9SX0Rpc3BsYXlQb3J0Owo+ICAKPiAtCS8qCj4gLQkgKiBGb3IgZURQIHdl IGFsd2F5cyBzZXQgdGhlIGVuY29kZXIgdHlwZSB0byBJTlRFTF9PVVRQVVRfRURQLCBidXQKPiAt CSAqIGZvciBEUCB0aGUgZW5jb2RlciB0eXBlIGNhbiBiZSBzZXQgYnkgdGhlIGNhbGxlciB0bwo+ IC0JICogSU5URUxfT1VUUFVUX1VOS05PV04gZm9yIERESSwgc28gZG9uJ3QgcmV3cml0ZSBpdC4K PiAtCSAqLwo+IC0JaWYgKHR5cGUgPT0gRFJNX01PREVfQ09OTkVDVE9SX2VEUCkKPiAtCQlpbnRl bF9lbmNvZGVyLT50eXBlID0gSU5URUxfT1VUUFVUX0VEUDsKCmF1eCAoYW5kIElJUkMgcHBzIHNl dHVwIG9uIHZsdi9jaHYpIG5lZWRzIGlzX2VkcCgpIHRvIHdvcmsuIFNvIEkgdGhpbmsKdGhpcyB3 b3VsZCBicmVhayBzdHVmZi4KCgotLSAKVmlsbGUgU3lyasOkbMOkCkludGVsIE9UQwpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGlu ZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVk ZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=