From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH] drm/i915: Avoid fluctuating to UNKNOWN connector status during forced probes Date: Thu, 4 Jun 2015 19:28:31 +0300 Message-ID: <20150604162831.GQ5176@intel.com> References: <1433431578-14373-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 mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 934696E1C2 for ; Thu, 4 Jun 2015 09:29:10 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1433431578-14373-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 T24gVGh1LCBKdW4gMDQsIDIwMTUgYXQgMDQ6MjY6MThQTSArMDEwMCwgQ2hyaXMgV2lsc29uIHdy b3RlOgo+IEZvciBvbGQtc2Nob29sIGNvbXBvbmVudCBUViBhbmQgQ1JUIGNvbm5lY3RvcnMsIHdl IHJlcXVpcmUgYSBoZWF2eXdlaWdodAo+IGxvYWQtZGV0ZWN0aW9uIG1lY2hhbmlzbS4gVGhpcyBp bnZvbHZlcyBzZXR0aW5nIHVwIGEgQ1JUQyBhbmQgc2VuZGluZyBhCj4gc2lnbmFsIHRvIHRoZSBv dXRwdXQsIGJlZm9yZSByZWFkaW5nIGJhY2sgYW55IHJlc3BvbnNlLiBBcyB0aGF0IGlzIHF1aXRl Cj4gc2xvdyBhbmQgQ1BVIGhlYXZ5LCB0aGUgcHJvY2VzcyBpcyBvbmx5IHBlcmZvcm1lZCB3aGVu IHRoZSBvdXRwdXQKPiBkZXRlY3Rpb24gaXMgZm9yY2VkIGJ5IHVzZXIgcmVxdWVzdC4gQXMgaXQg cmVxdWlyZXMgYSBkcml2aW5nIENSVEMsIHdlCj4gb2Z0ZW4gZG9uJ3QgaGF2ZSB0aGUgcmVzb3Vy Y2VzIHRvIGNvbXBsZXRlIHRoZSBwcm9iZS4gVGhpcyBsZWF2ZXMgdXMgaW4KPiBhIHF1YW5kYXJ5 IHdoZXJlIHRoZSB1bmZvcmNlZCBwYXRoIGp1c3QgcmV0dXJucyB0aGUgb2xkIGNvbm5lY3Rvcgo+ IHN0YXR1cywgYnV0IHRoZSBmb3JjZWQgZGV0ZWN0aW9uIHBhdGggZWxlY3RzIHRvIHJldHVybiBV TktOT1dOLiBJZiB3ZQo+IGhhdmUgYW4gYWN0aXZlIGNvbm5lY3Rpb24sIHdlIGxpa2VseSBoYXZl IHRoZSByZXNvdXJjZXMgYXZhaWxhYmxlIHRvCj4gY29tcGxldGUgdGhlIHByb2JlIC0gYnV0IGlm IGl0IGlzIGN1cnJlbnRseSBkaXNjb25uZWN0ZWQsIHRoZW4gaXQKPiBiZWNvbWVzIHVua25vd24g YW5kIHRyaWdnZXJzIGEgaG90cGx1ZyBldmVudCwgd2l0aCBvZnRlbiBxdWl0ZSB1bmZvcnR1bmF0 ZQo+IHVzZXJzcGFjZSBiZWhhdmlvdXIgKGUuZy4gb25lIG91dHB1dCBpcyBibGFua2VkIGFuZCB0 aGUgc3B1cmlvdXMgVFYKPiB0dXJuZWQgb24pLgo+IAo+IFRvIHJlZHVjZSBzcHVyaW91cyBob3Rw bHVnIGV2ZW50cyBvbiBvbGRlciBkZXZpY2VzLCB3ZSBjYW4gcHJldmVudAo+IHRyYW5zaXRpb25z IGJldHdlZW4gZGlzY29ubmVjdGVkIDwtPiB1bmtub3duLgo+IAo+IFJlZmVyZW5jZXM6IGh0dHBz Oi8vYnVncy5mcmVlZGVza3RvcC5vcmcvc2hvd19idWcuY2dpP2lkPTg3MDQ5Cj4gU2lnbmVkLW9m Zi1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+Cj4gLS0tCj4gIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2NydC5jIHwgMzkgKysrKysrKysrKysrKysrKysrLS0t LS0tLS0tLS0tLS0tLS0tLS0tCj4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3R2LmMgIHwg MjUgKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLQo+ICAyIGZpbGVzIGNoYW5nZWQsIDI3IGluc2Vy dGlvbnMoKyksIDM3IGRlbGV0aW9ucygtKQo+IAo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9jcnQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2NydC5jCj4g aW5kZXggNTIxYWYyYy4uNzBjNTI4OCAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9jcnQuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2NydC5jCj4g QEAgLTY2Niw4ICs2NjYsNiBAQCBpbnRlbF9jcnRfZGV0ZWN0KHN0cnVjdCBkcm1fY29ubmVjdG9y ICpjb25uZWN0b3IsIGJvb2wgZm9yY2UpCj4gIAlzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqaW50ZWxf ZW5jb2RlciA9ICZjcnQtPmJhc2U7Cj4gIAllbnVtIGludGVsX2Rpc3BsYXlfcG93ZXJfZG9tYWlu IHBvd2VyX2RvbWFpbjsKPiAgCWVudW0gZHJtX2Nvbm5lY3Rvcl9zdGF0dXMgc3RhdHVzOwo+IC0J c3RydWN0IGludGVsX2xvYWRfZGV0ZWN0X3BpcGUgdG1wOwo+IC0Jc3RydWN0IGRybV9tb2Rlc2V0 X2FjcXVpcmVfY3R4IGN0eDsKPiAgCj4gIAlEUk1fREVCVUdfS01TKCJbQ09OTkVDVE9SOiVkOiVz XSBmb3JjZT0lZFxuIiwKPiAgCQkgICAgICBjb25uZWN0b3ItPmJhc2UuaWQsIGNvbm5lY3Rvci0+ bmFtZSwKPiBAQCAtNzAzLDI3ICs3MDEsMjYgQEAgaW50ZWxfY3J0X2RldGVjdChzdHJ1Y3QgZHJt X2Nvbm5lY3RvciAqY29ubmVjdG9yLCBib29sIGZvcmNlKQo+ICAJCWdvdG8gb3V0Owo+ICAJfQo+ ICAKPiAtCWlmICghZm9yY2UpIHsKPiAtCQlzdGF0dXMgPSBjb25uZWN0b3ItPnN0YXR1czsKPiAt CQlnb3RvIG91dDsKPiAtCX0KPiAtCj4gLQlkcm1fbW9kZXNldF9hY3F1aXJlX2luaXQoJmN0eCwg MCk7Cj4gLQo+IC0JLyogZm9yIHByZS05NDVnIHBsYXRmb3JtcyB1c2UgbG9hZCBkZXRlY3QgKi8K PiAtCWlmIChpbnRlbF9nZXRfbG9hZF9kZXRlY3RfcGlwZShjb25uZWN0b3IsIE5VTEwsICZ0bXAs ICZjdHgpKSB7Cj4gLQkJaWYgKGludGVsX2NydF9kZXRlY3RfZGRjKGNvbm5lY3RvcikpCj4gLQkJ CXN0YXR1cyA9IGNvbm5lY3Rvcl9zdGF0dXNfY29ubmVjdGVkOwo+IC0JCWVsc2UgaWYgKElOVEVM X0lORk8oZGV2KS0+Z2VuIDwgNCkKPiAtCQkJc3RhdHVzID0gaW50ZWxfY3J0X2xvYWRfZGV0ZWN0 KGNydCk7Cj4gLQkJZWxzZQo+ICsJc3RhdHVzID0gY29ubmVjdG9yLT5zdGF0dXM7Cj4gKwlpZiAo Zm9yY2UpIHsKPiArCQlzdHJ1Y3QgaW50ZWxfbG9hZF9kZXRlY3RfcGlwZSB0bXA7Cj4gKwkJc3Ry dWN0IGRybV9tb2Rlc2V0X2FjcXVpcmVfY3R4IGN0eDsKPiArCj4gKwkJZHJtX21vZGVzZXRfYWNx dWlyZV9pbml0KCZjdHgsIDApOwo+ICsKPiArCQkvKiBmb3IgcHJlLTk0NWcgcGxhdGZvcm1zIHVz ZSBsb2FkIGRldGVjdCAqLwo+ICsJCWlmIChpbnRlbF9nZXRfbG9hZF9kZXRlY3RfcGlwZShjb25u ZWN0b3IsIE5VTEwsICZ0bXAsICZjdHgpKSB7Cj4gKwkJCWlmIChpbnRlbF9jcnRfZGV0ZWN0X2Rk Yyhjb25uZWN0b3IpKQo+ICsJCQkJc3RhdHVzID0gY29ubmVjdG9yX3N0YXR1c19jb25uZWN0ZWQ7 CgpIbW0uIEkgd29uZGVyIHdoYXQgdGhpcyBEREMgZGV0ZWN0aW9uIGlzIGRvaW5nIGhlcmUgaW4g dGhlIGZpcnN0IHBsYWNlLgpJdCBkb2Vzbid0IG5lZWQgYSBsb2FkIGRldGVjdCBwaXBlLCBhbmQg aWYgd2UgZW5kIHVwIGhlcmUgd2UndmUgYWxyZWFkeQp0cmllZCBhbmQgZmFpbGVkIGF0IEREQyBi YXNlZCBkZXRlY3Rpb24gZWFybGllci4KCj4gKwkJCWVsc2UgaWYgKElOVEVMX0lORk8oZGV2KS0+ Z2VuIDwgNCkKPiArCQkJCXN0YXR1cyA9IGludGVsX2NydF9sb2FkX2RldGVjdChjcnQpOwo+ICsJ CQlpbnRlbF9yZWxlYXNlX2xvYWRfZGV0ZWN0X3BpcGUoY29ubmVjdG9yLCAmdG1wLCAmY3R4KTsK PiArCQl9IGVsc2UgaWYgKHN0YXR1cyA9PSBjb25uZWN0b3Jfc3RhdHVzX2Nvbm5lY3RlZCkKPiAg CQkJc3RhdHVzID0gY29ubmVjdG9yX3N0YXR1c191bmtub3duOwo+IC0JCWludGVsX3JlbGVhc2Vf bG9hZF9kZXRlY3RfcGlwZShjb25uZWN0b3IsICZ0bXAsICZjdHgpOwo+IC0JfSBlbHNlCj4gLQkJ c3RhdHVzID0gY29ubmVjdG9yX3N0YXR1c191bmtub3duOwo+ICAKPiAtCWRybV9tb2Rlc2V0X2Ry b3BfbG9ja3MoJmN0eCk7Cj4gLQlkcm1fbW9kZXNldF9hY3F1aXJlX2ZpbmkoJmN0eCk7Cj4gKwkJ ZHJtX21vZGVzZXRfZHJvcF9sb2NrcygmY3R4KTsKPiArCQlkcm1fbW9kZXNldF9hY3F1aXJlX2Zp bmkoJmN0eCk7Cj4gKwl9CgpUaGUgbWFpbiBiaXQgdGhlcmUgc2VlbXMgdG8gYmUgdGhlCidlbHNl IGlmIChzdGF0dXMgPT0gY29ubmVjdG9yX3N0YXR1c19jb25uZWN0ZWQpJyBjaGVjay4gVGhlIHJl c3QgaXMKbW9zdGx5IGluZGVudGF0aW9uIGNoYW5nZXMsIGJ1dCB0aGlzIGRvZXMgcHVsbCB0aGUg bG9hZCBkZXRlY3QKdmFyaWFibGVzIGludG8gdGhlIHNhbWUgYmxvY2ssIHNvIHBlcmhhcHMgaXQn cyBiZXR0ZXIgdGhpcyB3YXkuCgpUaGUgbG9naWMgbWFrZXMgc2Vuc2UgdG8gbWUuIElmIGl0IHdh cyBkaXNjb25uZWN0ZWQgYW5kIHdlIGRvbid0IGhhdmUKZnJlZSBwaXBlcyB0byBmaWd1cmUgb3V0 IGlmIGl0IG1pZ2h0IGJlIGNvbm5lY3RlZCBub3csIGp1c3QgbGVhdmUgaXQKYXMgZGlzY29ubmVj dGVkIGluc3RlYWQgb2YgY2hhbmdpbmcgdG8gdW5rbm93bi4KCj4gIAo+ICBvdXQ6Cj4gIAlpbnRl bF9kaXNwbGF5X3Bvd2VyX3B1dChkZXZfcHJpdiwgcG93ZXJfZG9tYWluKTsKPiBkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdHYuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3R2LmMKPiBpbmRleCA4YjlkMzI1Li5lM2MwZmVkIDEwMDY0NAo+IC0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3R2LmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF90di5jCj4gQEAgLTEzMTMsNDQgKzEzMTMsMzcgQEAgc3RhdGljIHZvaWQgaW50ZWxfdHZf ZmluZF9iZXR0ZXJfZm9ybWF0KHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IpCj4gIHN0 YXRpYyBlbnVtIGRybV9jb25uZWN0b3Jfc3RhdHVzCj4gIGludGVsX3R2X2RldGVjdChzdHJ1Y3Qg ZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yLCBib29sIGZvcmNlKQo+ICB7Cj4gLQlzdHJ1Y3QgZHJt X2Rpc3BsYXlfbW9kZSBtb2RlOwo+ICAJc3RydWN0IGludGVsX3R2ICppbnRlbF90diA9IGludGVs X2F0dGFjaGVkX3R2KGNvbm5lY3Rvcik7Cj4gLQllbnVtIGRybV9jb25uZWN0b3Jfc3RhdHVzIHN0 YXR1czsKPiAtCWludCB0eXBlOwo+ICsJZW51bSBkcm1fY29ubmVjdG9yX3N0YXR1cyBzdGF0dXMg PSBjb25uZWN0b3ItPnN0YXR1czsKPiAgCj4gIAlEUk1fREVCVUdfS01TKCJbQ09OTkVDVE9SOiVk OiVzXSBmb3JjZT0lZFxuIiwKPiAgCQkgICAgICBjb25uZWN0b3ItPmJhc2UuaWQsIGNvbm5lY3Rv ci0+bmFtZSwKPiAgCQkgICAgICBmb3JjZSk7Cj4gLQo+IC0JbW9kZSA9IHJlcG9ydGVkX21vZGVz WzBdOwo+IC0KPiAgCWlmIChmb3JjZSkgewo+ICsJCXN0cnVjdCBkcm1fZGlzcGxheV9tb2RlIG1v ZGUgPSByZXBvcnRlZF9tb2Rlc1swXTsKPiAgCQlzdHJ1Y3QgaW50ZWxfbG9hZF9kZXRlY3RfcGlw ZSB0bXA7Cj4gIAkJc3RydWN0IGRybV9tb2Rlc2V0X2FjcXVpcmVfY3R4IGN0eDsKPiAgCj4gIAkJ ZHJtX21vZGVzZXRfYWNxdWlyZV9pbml0KCZjdHgsIDApOwo+ICAKPiAgCQlpZiAoaW50ZWxfZ2V0 X2xvYWRfZGV0ZWN0X3BpcGUoY29ubmVjdG9yLCAmbW9kZSwgJnRtcCwgJmN0eCkpIHsKPiAtCQkJ dHlwZSA9IGludGVsX3R2X2RldGVjdF90eXBlKGludGVsX3R2LCBjb25uZWN0b3IpOwo+ICsJCQlp bnQgdHlwZSA9IGludGVsX3R2X2RldGVjdF90eXBlKGludGVsX3R2LCBjb25uZWN0b3IpOwo+ICAJ CQlpbnRlbF9yZWxlYXNlX2xvYWRfZGV0ZWN0X3BpcGUoY29ubmVjdG9yLCAmdG1wLCAmY3R4KTsK PiAgCQkJc3RhdHVzID0gdHlwZSA8IDAgPwo+ICAJCQkJY29ubmVjdG9yX3N0YXR1c19kaXNjb25u ZWN0ZWQgOgo+ICAJCQkJY29ubmVjdG9yX3N0YXR1c19jb25uZWN0ZWQ7Cj4gLQkJfSBlbHNlCj4g KwkJCWludGVsX3R2LT50eXBlID0gdHlwZTsKPiArCQl9IGVsc2UgaWYgKHN0YXR1cyA9PSBjb25u ZWN0b3Jfc3RhdHVzX2Nvbm5lY3RlZCkKPiAgCQkJc3RhdHVzID0gY29ubmVjdG9yX3N0YXR1c191 bmtub3duOwo+ICAKPiAgCQlkcm1fbW9kZXNldF9kcm9wX2xvY2tzKCZjdHgpOwo+ICAJCWRybV9t b2Rlc2V0X2FjcXVpcmVfZmluaSgmY3R4KTsKPiAtCX0gZWxzZQo+IC0JCXJldHVybiBjb25uZWN0 b3ItPnN0YXR1czsKPiAgCj4gLQlpZiAoc3RhdHVzICE9IGNvbm5lY3Rvcl9zdGF0dXNfY29ubmVj dGVkKQo+IC0JCXJldHVybiBzdGF0dXM7Cj4gLQo+IC0JaW50ZWxfdHYtPnR5cGUgPSB0eXBlOwo+ IC0JaW50ZWxfdHZfZmluZF9iZXR0ZXJfZm9ybWF0KGNvbm5lY3Rvcik7Cj4gKwkJaWYgKHN0YXR1 cyA9PSBjb25uZWN0b3Jfc3RhdHVzX2Nvbm5lY3RlZCkKPiArCQkJaW50ZWxfdHZfZmluZF9iZXR0 ZXJfZm9ybWF0KGNvbm5lY3Rvcik7Cj4gKwl9CgpTbyBiZXNpZGVzIGF2b2lkaW5nIHRoZSBkaXNj b25uZWN0ZWQtPnVua25vd24gdHJhbnNpdGlvbiwgdGhlIG90aGVyIHRoaW5nCndlIG5vdyBzZWVt IHRvIGRvIGlzIHNldCBpbnRlbF90di0+dHlwZSB0byAtMSB3aGVuIHdlIGZpbmQgdGhhdCB0aGlu Z3MKYXJlIGRpc2Nvbm5lY3RlZC4gSG93ZXZlciB0aGF0IGRvZXNuJ3Qgc2VlbSB0byBiZSB1c2Vy IHZpc2libGUsIGFuZCBJCmNhbid0IHNlZSBhbnkgcGxhY2UgaW4gdGhlIGNvZGUgd2hlcmUgaXQg c2hvdWxkIGNhdXNlIHByb2JsZW1zLgoKSXQgaXMgYSBiaXQgaW5jb25zaXN0ZW50IGhvd2V2ZXIg ZHVlIHRvIHRoZSBmYWN0IHRoYXQgd2UgaW5pdGlhbGl6ZSB0eXBlCnRvIERSTV9NT0RFX0NPTk5F Q1RPUl9Vbmtub3duLCBhbmQgbGF0ZXIgd2UgdXNlIHRoZSAtMSB0byBpbmRpY2F0ZSBtb3JlCm9y IGxlc3MgdGhlIHNhbWUgdGhpbmcuIFNlZW1zIGxpa2Ugd2Ugc2hvdWxkIHBpY2sgb3IgdGhlIG90 aGVyIGZvcgpjb25zaXN0ZW5jeS4KCkFwYXJ0IGZyb20gdGhlIGxpdHRsZSB0aGluZ3MgbGlrZSB0 aGUgd2VpcmQgcHJlLWV4aXNpbmcgZXh0cmEKZGRjIGRldGVjdCBhbmQgdGhlIGludGVsX3R2LT50 eXBlIGluY29uc2lzdGVuY3kgdGhpcyBwYXRjaCBsb29rcyBPSyB0bwptZSwgc28KUmV2aWV3ZWQt Ynk6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Cgo+ICAK PiAtCXJldHVybiBjb25uZWN0b3Jfc3RhdHVzX2Nvbm5lY3RlZDsKPiArCXJldHVybiBzdGF0dXM7 Cj4gIH0KPiAgCj4gIHN0YXRpYyBjb25zdCBzdHJ1Y3QgaW5wdXRfcmVzIHsKPiAtLSAKPiAxLjku MQo+IAo+IF9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCj4g SW50ZWwtZ2Z4IG1haWxpbmcgbGlzdAo+IEludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK PiBodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4 CgotLSAKVmlsbGUgU3lyasOkbMOkCkludGVsIE9UQwpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2ludGVsLWdmeAo=