From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH] drm/i915: Avoid fluctuating to UNKNOWN connector status during forced probes Date: Mon, 15 Jun 2015 14:29:28 +0200 Message-ID: <20150615122928.GM8341@phenom.ffwll.local> References: <20150604162831.GQ5176@intel.com> <1433490379-31312-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 mail-wi0-f171.google.com (mail-wi0-f171.google.com [209.85.212.171]) by gabe.freedesktop.org (Postfix) with ESMTP id D52426E771 for ; Mon, 15 Jun 2015 05:26:42 -0700 (PDT) Received: by wicnd19 with SMTP id nd19so23005138wic.1 for ; Mon, 15 Jun 2015 05:26:42 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1433490379-31312-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 T24gRnJpLCBKdW4gMDUsIDIwMTUgYXQgMDg6NDY6MTlBTSArMDEwMCwgQ2hyaXMgV2lsc29uIHdy 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+IHYyOiBDb252ZXJ0IHR2X3R5 cGUgdG8gdXNlIHByb3BlciB1bmtub3duIGVudW0gKFZpbGxlKQo+IAo+IFJlZmVyZW5jZXM6IGh0 dHBzOi8vYnVncy5mcmVlZGVza3RvcC5vcmcvc2hvd19idWcuY2dpP2lkPTg3MDQ5Cj4gU2lnbmVk LW9mZi1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+Cj4gQ2M6IFZp bGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+IFt2MV0KPiBSZXZp ZXdlZC1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4g W3YxXQoKVGhpcyBzb2x1dGlvbiBpcyBhdCBvZGRzIHdpdGgKCmNvbW1pdCBiNzcwMzcyNjI1MTE5 MWNkOWYzZWYzYTgwYjJkOTY2NzkwMWVlYzk1CkF1dGhvcjogRGFuaWVsIFZldHRlciA8ZGFuaWVs LnZldHRlckBmZndsbC5jaD4KRGF0ZTogICBXZWQgSmFuIDIxIDA4OjQ1OjIyIDIwMTUgKzAxMDAK CiAgICBkcm0vcHJvYmUtaGVscGVyOiBjbGFtcCB1bmtub3duIGNvbm5lY3RvciBzdGF0dXMgaW4g dGhlIHBvbGwgd29yawoKV2UncmUgbWlzc2luZyB0aGlzIGJpdCBvZiBsb2dpYyBmcm9tIHRoZSBo b3RwbHVnIGhhbmRsZXJzLCBidXQgdGhhdCB3YXMKc29tZXdoYXQgaW50ZW50aW9uYWwgc2luY2Ug YSBob3RwbHVnIHNob3VsZCBpbmRpY2F0ZSB0aGF0IHNvbWV0aGluZyBoYXMKY2hhbmdlZC4gQW5k IGluIHRoZSBpOTE1IGhwZCBoYW5kbGVyIHdlIGZpbHRlciBieSBzb3VyY2UuCgpHaXZlbiB0aGF0 IHRoZSByZXBvcnQgaXMgb2xkZXIgdGhhbiBtZSBoYXZpbmcgcmVzdXJyZWN0IHRoYXQgcGF0Y2gg Y2FuIHdlCmNsb3NlIGl0IGFzIGZpeGVkIG9yIGRvIEkgbWlzcyBzb21ldGhpbmc/CgpUaGFua3Ms IERhbmllbAoKPiAtLS0KPiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY3J0LmMgfCAzOSAr KysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0KPiAgZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfdHYuYyAgfCAzNyArKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tCj4gIDIgZmlsZXMgY2hhbmdlZCwgMzIgaW5zZXJ0aW9ucygrKSwgNDQgZGVsZXRpb25zKC0p Cj4gCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2NydC5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY3J0LmMKPiBpbmRleCA1MjFhZjJjLi43MGM1Mjg4IDEw MDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2NydC5jCj4gKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY3J0LmMKPiBAQCAtNjY2LDggKzY2Niw2IEBAIGludGVs X2NydF9kZXRlY3Qoc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvciwgYm9vbCBmb3JjZSkK PiAgCXN0cnVjdCBpbnRlbF9lbmNvZGVyICppbnRlbF9lbmNvZGVyID0gJmNydC0+YmFzZTsKPiAg CWVudW0gaW50ZWxfZGlzcGxheV9wb3dlcl9kb21haW4gcG93ZXJfZG9tYWluOwo+ICAJZW51bSBk cm1fY29ubmVjdG9yX3N0YXR1cyBzdGF0dXM7Cj4gLQlzdHJ1Y3QgaW50ZWxfbG9hZF9kZXRlY3Rf cGlwZSB0bXA7Cj4gLQlzdHJ1Y3QgZHJtX21vZGVzZXRfYWNxdWlyZV9jdHggY3R4Owo+ICAKPiAg CURSTV9ERUJVR19LTVMoIltDT05ORUNUT1I6JWQ6JXNdIGZvcmNlPSVkXG4iLAo+ICAJCSAgICAg IGNvbm5lY3Rvci0+YmFzZS5pZCwgY29ubmVjdG9yLT5uYW1lLAo+IEBAIC03MDMsMjcgKzcwMSwy NiBAQCBpbnRlbF9jcnRfZGV0ZWN0KHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IsIGJv b2wgZm9yY2UpCj4gIAkJZ290byBvdXQ7Cj4gIAl9Cj4gIAo+IC0JaWYgKCFmb3JjZSkgewo+IC0J CXN0YXR1cyA9IGNvbm5lY3Rvci0+c3RhdHVzOwo+IC0JCWdvdG8gb3V0Owo+IC0JfQo+IC0KPiAt CWRybV9tb2Rlc2V0X2FjcXVpcmVfaW5pdCgmY3R4LCAwKTsKPiAtCj4gLQkvKiBmb3IgcHJlLTk0 NWcgcGxhdGZvcm1zIHVzZSBsb2FkIGRldGVjdCAqLwo+IC0JaWYgKGludGVsX2dldF9sb2FkX2Rl dGVjdF9waXBlKGNvbm5lY3RvciwgTlVMTCwgJnRtcCwgJmN0eCkpIHsKPiAtCQlpZiAoaW50ZWxf Y3J0X2RldGVjdF9kZGMoY29ubmVjdG9yKSkKPiAtCQkJc3RhdHVzID0gY29ubmVjdG9yX3N0YXR1 c19jb25uZWN0ZWQ7Cj4gLQkJZWxzZSBpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPCA0KQo+IC0J CQlzdGF0dXMgPSBpbnRlbF9jcnRfbG9hZF9kZXRlY3QoY3J0KTsKPiAtCQllbHNlCj4gKwlzdGF0 dXMgPSBjb25uZWN0b3ItPnN0YXR1czsKPiArCWlmIChmb3JjZSkgewo+ICsJCXN0cnVjdCBpbnRl bF9sb2FkX2RldGVjdF9waXBlIHRtcDsKPiArCQlzdHJ1Y3QgZHJtX21vZGVzZXRfYWNxdWlyZV9j dHggY3R4Owo+ICsKPiArCQlkcm1fbW9kZXNldF9hY3F1aXJlX2luaXQoJmN0eCwgMCk7Cj4gKwo+ ICsJCS8qIGZvciBwcmUtOTQ1ZyBwbGF0Zm9ybXMgdXNlIGxvYWQgZGV0ZWN0ICovCj4gKwkJaWYg KGludGVsX2dldF9sb2FkX2RldGVjdF9waXBlKGNvbm5lY3RvciwgTlVMTCwgJnRtcCwgJmN0eCkp IHsKPiArCQkJaWYgKGludGVsX2NydF9kZXRlY3RfZGRjKGNvbm5lY3RvcikpCj4gKwkJCQlzdGF0 dXMgPSBjb25uZWN0b3Jfc3RhdHVzX2Nvbm5lY3RlZDsKPiArCQkJZWxzZSBpZiAoSU5URUxfSU5G TyhkZXYpLT5nZW4gPCA0KQo+ICsJCQkJc3RhdHVzID0gaW50ZWxfY3J0X2xvYWRfZGV0ZWN0KGNy dCk7Cj4gKwkJCWludGVsX3JlbGVhc2VfbG9hZF9kZXRlY3RfcGlwZShjb25uZWN0b3IsICZ0bXAs ICZjdHgpOwo+ICsJCX0gZWxzZSBpZiAoc3RhdHVzID09IGNvbm5lY3Rvcl9zdGF0dXNfY29ubmVj dGVkKQo+ICAJCQlzdGF0dXMgPSBjb25uZWN0b3Jfc3RhdHVzX3Vua25vd247Cj4gLQkJaW50ZWxf cmVsZWFzZV9sb2FkX2RldGVjdF9waXBlKGNvbm5lY3RvciwgJnRtcCwgJmN0eCk7Cj4gLQl9IGVs c2UKPiAtCQlzdGF0dXMgPSBjb25uZWN0b3Jfc3RhdHVzX3Vua25vd247Cj4gIAo+IC0JZHJtX21v ZGVzZXRfZHJvcF9sb2NrcygmY3R4KTsKPiAtCWRybV9tb2Rlc2V0X2FjcXVpcmVfZmluaSgmY3R4 KTsKPiArCQlkcm1fbW9kZXNldF9kcm9wX2xvY2tzKCZjdHgpOwo+ICsJCWRybV9tb2Rlc2V0X2Fj cXVpcmVfZmluaSgmY3R4KTsKPiArCX0KPiAgCj4gIG91dDoKPiAgCWludGVsX2Rpc3BsYXlfcG93 ZXJfcHV0KGRldl9wcml2LCBwb3dlcl9kb21haW4pOwo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF90di5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdHYuYwo+ IGluZGV4IDhiOWQzMjUuLjEzNTU4NGYgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfdHYuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3R2LmMKPiBA QCAtMTIzMyw3ICsxMjMzLDYgQEAgaW50ZWxfdHZfZGV0ZWN0X3R5cGUoc3RydWN0IGludGVsX3R2 ICppbnRlbF90diwKPiAgCWludGVsX3dhaXRfZm9yX3ZibGFuayhpbnRlbF90di0+YmFzZS5iYXNl LmRldiwKPiAgCQkJICAgICAgdG9faW50ZWxfY3J0YyhpbnRlbF90di0+YmFzZS5iYXNlLmNydGMp LT5waXBlKTsKPiAgCj4gLQl0eXBlID0gLTE7Cj4gIAl0dl9kYWMgPSBJOTE1X1JFQUQoVFZfREFD KTsKPiAgCURSTV9ERUJVR19LTVMoIlRWIGRldGVjdGVkOiAleCwgJXhcbiIsIHR2X2N0bCwgdHZf ZGFjKTsKPiAgCS8qCj4gQEAgLTEyNTMsNyArMTI1Miw3IEBAIGludGVsX3R2X2RldGVjdF90eXBl KHN0cnVjdCBpbnRlbF90diAqaW50ZWxfdHYsCj4gIAkJdHlwZSA9IERSTV9NT0RFX0NPTk5FQ1RP Ul9Db21wb25lbnQ7Cj4gIAl9IGVsc2Ugewo+ICAJCURSTV9ERUJVR19LTVMoIlVucmVjb2duaXNl ZCBUViBjb25uZWN0aW9uXG4iKTsKPiAtCQl0eXBlID0gLTE7Cj4gKwkJdHlwZSA9IERSTV9NT0RF X0NPTk5FQ1RPUl9Vbmtub3duOwo+ICAJfQo+ICAKPiAgCUk5MTVfV1JJVEUoVFZfREFDLCBzYXZl X3R2X2RhYyAmIH5UVkRBQ19TVEFURV9DSEdfRU4pOwo+IEBAIC0xMzEzLDQ0ICsxMzEyLDM2IEBA IHN0YXRpYyB2b2lkIGludGVsX3R2X2ZpbmRfYmV0dGVyX2Zvcm1hdChzdHJ1Y3QgZHJtX2Nvbm5l Y3RvciAqY29ubmVjdG9yKQo+ICBzdGF0aWMgZW51bSBkcm1fY29ubmVjdG9yX3N0YXR1cwo+ICBp bnRlbF90dl9kZXRlY3Qoc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvciwgYm9vbCBmb3Jj ZSkKPiAgewo+IC0Jc3RydWN0IGRybV9kaXNwbGF5X21vZGUgbW9kZTsKPiAtCXN0cnVjdCBpbnRl bF90diAqaW50ZWxfdHYgPSBpbnRlbF9hdHRhY2hlZF90dihjb25uZWN0b3IpOwo+IC0JZW51bSBk cm1fY29ubmVjdG9yX3N0YXR1cyBzdGF0dXM7Cj4gLQlpbnQgdHlwZTsKPiArCWVudW0gZHJtX2Nv bm5lY3Rvcl9zdGF0dXMgc3RhdHVzID0gY29ubmVjdG9yLT5zdGF0dXM7Cj4gIAo+ICAJRFJNX0RF QlVHX0tNUygiW0NPTk5FQ1RPUjolZDolc10gZm9yY2U9JWRcbiIsCj4gIAkJICAgICAgY29ubmVj dG9yLT5iYXNlLmlkLCBjb25uZWN0b3ItPm5hbWUsCj4gIAkJICAgICAgZm9yY2UpOwo+IC0KPiAt CW1vZGUgPSByZXBvcnRlZF9tb2Rlc1swXTsKPiAtCj4gIAlpZiAoZm9yY2UpIHsKPiArCQlzdHJ1 Y3QgaW50ZWxfdHYgKmludGVsX3R2ID0gaW50ZWxfYXR0YWNoZWRfdHYoY29ubmVjdG9yKTsKPiAr CQlzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSBtb2RlID0gcmVwb3J0ZWRfbW9kZXNbMF07Cj4gIAkJ c3RydWN0IGludGVsX2xvYWRfZGV0ZWN0X3BpcGUgdG1wOwo+ICAJCXN0cnVjdCBkcm1fbW9kZXNl dF9hY3F1aXJlX2N0eCBjdHg7Cj4gIAo+ICAJCWRybV9tb2Rlc2V0X2FjcXVpcmVfaW5pdCgmY3R4 LCAwKTsKPiAgCj4gIAkJaWYgKGludGVsX2dldF9sb2FkX2RldGVjdF9waXBlKGNvbm5lY3Rvciwg Jm1vZGUsICZ0bXAsICZjdHgpKSB7Cj4gLQkJCXR5cGUgPSBpbnRlbF90dl9kZXRlY3RfdHlwZShp bnRlbF90diwgY29ubmVjdG9yKTsKPiArCQkJaW50ZWxfdHYtPnR5cGUgPQo+ICsJCQkJaW50ZWxf dHZfZGV0ZWN0X3R5cGUoaW50ZWxfdHYsIGNvbm5lY3Rvcik7Cj4gIAkJCWludGVsX3JlbGVhc2Vf bG9hZF9kZXRlY3RfcGlwZShjb25uZWN0b3IsICZ0bXAsICZjdHgpOwo+IC0JCQlzdGF0dXMgPSB0 eXBlIDwgMCA/Cj4gLQkJCQljb25uZWN0b3Jfc3RhdHVzX2Rpc2Nvbm5lY3RlZCA6Cj4gLQkJCQlj b25uZWN0b3Jfc3RhdHVzX2Nvbm5lY3RlZDsKPiAtCQl9IGVsc2UKPiArCQkJaWYgKGludGVsX3R2 LT50eXBlICE9IERSTV9NT0RFX0NPTk5FQ1RPUl9Vbmtub3duKSB7Cj4gKwkJCQlpbnRlbF90dl9m aW5kX2JldHRlcl9mb3JtYXQoY29ubmVjdG9yKTsKPiArCQkJCXN0YXR1cyA9IGNvbm5lY3Rvcl9z dGF0dXNfY29ubmVjdGVkOwo+ICsJCQl9IGVsc2UKPiArCQkJCXN0YXR1cyA9IGNvbm5lY3Rvcl9z dGF0dXNfZGlzY29ubmVjdGVkOwo+ICsJCX0gZWxzZSBpZiAoc3RhdHVzID09IGNvbm5lY3Rvcl9z dGF0dXNfY29ubmVjdGVkKQo+ICAJCQlzdGF0dXMgPSBjb25uZWN0b3Jfc3RhdHVzX3Vua25vd247 Cj4gIAo+ICAJCWRybV9tb2Rlc2V0X2Ryb3BfbG9ja3MoJmN0eCk7Cj4gIAkJZHJtX21vZGVzZXRf YWNxdWlyZV9maW5pKCZjdHgpOwo+IC0JfSBlbHNlCj4gLQkJcmV0dXJuIGNvbm5lY3Rvci0+c3Rh dHVzOwo+IC0KPiAtCWlmIChzdGF0dXMgIT0gY29ubmVjdG9yX3N0YXR1c19jb25uZWN0ZWQpCj4g LQkJcmV0dXJuIHN0YXR1czsKPiAtCj4gLQlpbnRlbF90di0+dHlwZSA9IHR5cGU7Cj4gLQlpbnRl bF90dl9maW5kX2JldHRlcl9mb3JtYXQoY29ubmVjdG9yKTsKPiArCX0KPiAgCj4gLQlyZXR1cm4g Y29ubmVjdG9yX3N0YXR1c19jb25uZWN0ZWQ7Cj4gKwlyZXR1cm4gc3RhdHVzOwo+ICB9Cj4gIAo+ ICBzdGF0aWMgY29uc3Qgc3RydWN0IGlucHV0X3JlcyB7Cj4gLS0gCj4gMS45LjEKPiAKPiBfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwo+IEludGVsLWdmeCBt YWlsaW5nIGxpc3QKPiBJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCj4gaHR0cDovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAoKLS0gCkRhbmll bCBWZXR0ZXIKU29mdHdhcmUgRW5naW5lZXIsIEludGVsIENvcnBvcmF0aW9uCmh0dHA6Ly9ibG9n LmZmd2xsLmNoCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo dHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==