From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH] Revert "drm: Stop resetting connector state to unknown" Date: Tue, 15 Dec 2015 22:44:06 +0200 Message-ID: <20151215204406.GS4437@intel.com> References: <1450202871-15062-1-git-send-email-cpaul@redhat.com> <20151215183339.GO4437@intel.com> <1450211658.8084.11.camel@redhat.com> 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 3EBE56E7B8 for ; Tue, 15 Dec 2015 12:44:11 -0800 (PST) Content-Disposition: inline In-Reply-To: <1450211658.8084.11.camel@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Lyude Cc: kuddel.mail@gmx.de, Julien Wajsberg , Daniel Vetter , open list , "open list:DRM DRIVERS" , Benjamin Tissoires , Lennart Poettering List-Id: dri-devel@lists.freedesktop.org T24gVHVlLCBEZWMgMTUsIDIwMTUgYXQgMDM6MzQ6MThQTSAtMDUwMCwgTHl1ZGUgd3JvdGU6Cj4g T24gVHVlLCAyMDE1LTEyLTE1IGF0IDEzOjQyIC0wNTAwLCBSb2IgQ2xhcmsgd3JvdGU6Cj4gPiBP biBUdWUsIERlYyAxNSwgMjAxNSBhdCAxOjMzIFBNLCBWaWxsZSBTeXJqw6Rsw6QKPiA+IDx2aWxs ZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4gd3JvdGU6Cj4gPiA+IE9uIFR1ZSwgRGVjIDE1LCAy MDE1IGF0IDAxOjIzOjA2UE0gLTA1MDAsIFJvYiBDbGFyayB3cm90ZToKPiA+ID4gPiBPbiBUdWUs IERlYyAxNSwgMjAxNSBhdCAxOjA3IFBNLCBMeXVkZSA8Y3BhdWxAcmVkaGF0LmNvbT4gd3JvdGU6 Cj4gPiA+ID4gPiBUaGlzIHJldmVydHMgY29tbWl0IDU2NzdkNjdhZTM5NCAoImRybTogU3RvcCBy ZXNldHRpbmcgY29ubmVjdG9yIHN0YXRlCj4gPiA+ID4gPiB0bwo+ID4gPiA+ID4gdW5rbm93biIp Cj4gPiA+ID4gPiAKPiA+ID4gPiA+IFVuZm9ydHVuYXRlbHksIG5vdCByZXNldHRpbmcgdGhlIGNv bm5lY3RvciBzdGF0dXMgdG8gdW5rbm93biBhY3R1YWxseQo+ID4gPiA+ID4gYnJlYWtzIHJlcHJv YmluZyBvbiBzdXNwZW5kL3Jlc3VtZSBpbiBpOTE1LCB3aGljaCBpcyBpbXBvcnRhbnQgdG8gaGF2 ZQo+ID4gPiA+ID4gd29ya2luZyBzaW5jZSBpdCBtZWFucyBhIHVzZXIgZG9ja2luZyB0aGVpciBs YXB0b3AgaW4gc3VzcGVuZCB3b24ndCBoYXZlCj4gPiA+ID4gPiB0aGVpciBtb25pdG9ycyB3b3Jr IGFmdGVyIHJlc3VtZS4gVGhpcyBjb21taXQgd2FzIG9yaWdpbmFsbHkgcHVzaGVkIHRvCj4gPiA+ ID4gPiBmaXgKPiA+ID4gPiA+IGEgYnVnIHdpdGggc3lzdGVtZFsxXSwgaG93ZXZlciBzYWlkIGJ1 ZyBoYXMgYWxyZWFkeSBiZWVuIGZpeGVkIGluCj4gPiA+ID4gPiB1c2Vyc3BhY2UuCj4gPiA+ID4g PiAKPiA+ID4gPiA+IFNpbmNlICJ1bmtub3duIiBpcyB0ZWNobmljYWxseSBhIHZhbGlkIG9wdGlv biB0byByZXR1cm4gdG8gdXNlcnNwYWNlIGZvcgo+ID4gPiA+ID4gYQo+ID4gPiA+ID4gY29ubmVj dG9yJ3Mgc3RhdHVzLCBJIHdvdWxkIHRoaW5rIHRoYXQgdGhpcyBzb3J0IG9mIGJlaGF2aW9yIHNo b3VsZAo+ID4gPiA+ID4gcHJvYmFibHkgYmUgZXhwZWN0ZWQgZnJvbSB1c2Vyc3BhY2UuIFNvbWUg Z29vZCBleGFtcGxlcyBvZiB0aGlzIGFyZSB0aGUKPiA+ID4gPiA+IHJhZGVvbiBkcml2ZXIgcmVw b3J0aW5nICJ1bmtub3duIiBmb3IgY29ubmVjdG9ycyB0aGF0IGhhdmUgZG9uZQo+ID4gPiA+ID4g c29tZXRoaW5nCj4gPiA+ID4gPiB3b25reSBkdXJpbmcgYSBob3RwbHVnIGV2ZW50IChlLmcuIHBh cnQgb2YgdGhlIGluaXRpYWxpemF0aW9uIG9mIHRoZQo+ID4gPiA+ID4gY29ubmVjdG9yIGZhaWxl ZCksIGFuZCB0aGUgb21hcGRybSBkcml2ZXIgcmV0dXJucyAidW5rbm93biIgZm9yIGNlcnRhaW4K PiA+ID4gPiA+IGNvbm5lY3RvciB0eXBlcyBieSBkZWZhdWx0Lgo+ID4gPiA+ID4gCj4gPiA+ID4g PiBbMV06IGh0dHBzOi8vYnVnemlsbGEua2VybmVsLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAwNjQx Cj4gPiA+ID4gPiAKPiA+ID4gPiA+IFNpZ25lZC1vZmYtYnk6IEx5dWRlIDxjcGF1bEByZWRoYXQu Y29tPgo+ID4gPiA+ID4gLS0tCj4gPiA+ID4gPiDCoGRyaXZlcnMvZ3B1L2RybS9kcm1fY3J0Yy5j IHwgNyArKysrLS0tCj4gPiA+ID4gPiDCoDEgZmlsZSBjaGFuZ2VkLCA0IGluc2VydGlvbnMoKyks IDMgZGVsZXRpb25zKC0pCj4gPiA+ID4gPiAKPiA+ID4gPiA+IGRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vZHJtX2NydGMuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fY3J0Yy5jCj4gPiA+ID4g PiBpbmRleCAyNGM1NDM0Li40NzRlNjM2IDEwMDY0NAo+ID4gPiA+ID4gLS0tIGEvZHJpdmVycy9n cHUvZHJtL2RybV9jcnRjLmMKPiA+ID4gPiA+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fY3J0 Yy5jCj4gPiA+ID4gPiBAQCAtNTMxMiwxMSArNTMxMiwxMiBAQCB2b2lkIGRybV9tb2RlX2NvbmZp Z19yZXNldChzdHJ1Y3QgZHJtX2RldmljZQo+ID4gPiA+ID4gKmRldikKPiA+ID4gPiA+IMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgaWYgKGVuY29kZXItPmZ1bmNzLT5yZXNldCkKPiA+ ID4gPiA+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoGVu Y29kZXItPmZ1bmNzLT5yZXNldChlbmNvZGVyKTsKPiA+ID4gPiA+IAo+ID4gPiA+ID4gLcKgwqDC oMKgwqDCoMKgbXV0ZXhfbG9jaygmZGV2LT5tb2RlX2NvbmZpZy5tdXRleCk7Cj4gPiA+ID4gPiAt wqDCoMKgwqDCoMKgwqBkcm1fZm9yX2VhY2hfY29ubmVjdG9yKGNvbm5lY3RvciwgZGV2KQo+ID4g PiA+ID4gK8KgwqDCoMKgwqDCoMKgbGlzdF9mb3JfZWFjaF9lbnRyeShjb25uZWN0b3IsICZkZXYt Pm1vZGVfY29uZmlnLmNvbm5lY3Rvcl9saXN0LCAKPiA+ID4gPiA+IGhlYWQpIHsKPiA+ID4gPiA+ ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqBjb25uZWN0b3ItPnN0YXR1cyA9IGNvbm5l Y3Rvcl9zdGF0dXNfdW5rbm93bjsKPiA+ID4gPiA+ICsKPiA+ID4gPiA+IMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgaWYgKGNvbm5lY3Rvci0+ZnVuY3MtPnJlc2V0KQo+ID4gPiA+ID4g wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgY29ubmVjdG9y LT5mdW5jcy0+cmVzZXQoY29ubmVjdG9yKTsKPiA+ID4gPiA+IC3CoMKgwqDCoMKgwqDCoG11dGV4 X3VubG9jaygmZGV2LT5tb2RlX2NvbmZpZy5tdXRleCk7Cj4gPiA+ID4gPiArwqDCoMKgwqDCoMKg wqB9Cj4gPiA+ID4gPiDCoH0KPiA+ID4gPiAKPiA+ID4gPiBsb29rcyBsaWtlIGdpdC1yZXZlcnQg bWlnaHQgaGF2ZSBiZWVuIGEgYml0IG92ZXItYW1iaXRpb3VzIGFuZAo+ID4gPiA+IGNsb2JiZXJl ZCBhIGNvdXBsZSBzdWJzZXF1ZW50IGNoYW5nZXMuLiBidXQgdGhhdCBpcyBlYXN5IGVub3VnaCB0 byBmaXgKPiA+ID4gPiBvbmNlIHdlIGZpZ3VyZSBvdXQgd2hhdCB0aGUgcmlnaHQgdGhpbmcgdG8g ZG8gaXMuCj4gPiA+ID4gCj4gPiA+ID4gQmV5b25kIHRoYXQuLiBJJ20gbm90IHJlYWxseSBzdXJl IGhvdyB0byBhcHBseSB0aGUgImRvIG5vdCBicmVhawo+ID4gPiA+IHVzZXJzcGFjZSIgcnVsZSBo ZXJlLi4gc2luY2UgcHJpb3IgdG8KPiA+ID4gPiBjNDg0ZjAyZDBmMDJmYmJmYzZkZWNjOTQ1YTY5 YWFlMDExMDQxYTI3IHVzZXJzcGFjZSBjb3VsZCBzZWUgInVua25vd24iCj4gPiA+ID4gZm9yIGNl cnRhaW4gaGFyZHdhcmUuwqDCoEJ1dCBhZnRlciB0aGF0IGNvbW1pdCBpdCBjb3VsZCBzdGFydCBz ZWVpbmcKPiA+ID4gPiAidW5rbm93biIgZm9yIGRyaXZlcnMvY29ubmVjdG9ycyB0aGF0IG5ldmVy IHdvdWxkIGhhdmUgcmV0dXJuZWQKPiA+ID4gPiAidW5rbm93biIgYmVmb3JlLsKgwqBJZiB1c2Vy c3BhY2UgaGFkIGEgcHJvYmxlbSB3aXRoICJ1bmtub3duIiwgaXQKPiA+ID4gPiBzb3VuZHMgbGlr ZSBhIHVzZXJzcGFjZSBidWcgdGhhdCB3YXMganVzdCB1bm5vdGljZWQgYmVjYXVzZSBubyBvbmUK PiA+ID4gPiB0ZXN0ZWQgb24gdGhlIHJpZ2h0IGhhcmR3YXJlLgo+ID4gPiA+IAo+ID4gPiA+IEJ1 dCBhbnl3YXlzLCBvbmUgaWRlYSB0byByZXZlcnQgdGhpbmdzIHRvIG9yaWdpbmFsIGJlaGF2aW9y IHByaW9yIHRvCj4gPiA+ID4gYzQ4NGYwMmQwZjAyZmJiZmM2ZGVjYzk0NWE2OWFhZTAxMTA0MWEy NyAoc28gYXQgbGVhc3QgdXNlcnNwYWNlCj4gPiA+ID4gZG9lc24ndCBzZWUgJ3Vua25vd24nIGZv ciBkcml2ZXJzL2Nvbm5lY3RvcnMgdGhhdCBuZXZlciB1c2VkIHRvIHJlcG9ydAo+ID4gPiA+ICd1 bmtub3duJykgd291bGQgYmUgdG8gZG8gc29tZXRoaW5nIHJvdWdobHkgbGlrZSB0aGlzIGluCj4g PiA+ID4gc3RhdHVzX3Nob3coKToKPiA+ID4gPiAKPiA+ID4gPiDCoCBpZiAoc3RhdHVzID09IHVu a25vd24pCj4gPiA+ID4gwqDCoMKgwqDCoHN0YXR1cyA9IGNvbm5lY3Rvci0+ZnVuY3MtPmRldGVj dChjb25uZWN0b3IpCj4gPiA+ID4gCj4gPiA+ID4gU28gSSBjb3VsZCBnbyB3aXRoIGVpdGhlciBq dXN0IHJldmVydGluZyB0aGlzIGNvbW1pdCwgb3IgcmV2ZXJ0aW5nCj4gPiA+ID4gY29tbWl0IHBs dXMgYWJvdmUgY2hhbmdlLsKgwqBNeSAkMC4wMiBhbnl3YXlzLi4KPiA+ID4gCj4gPiA+IEhtbS4g T3IgbWF5YmUgbGVhdmUgdGhlIHN0YXRlcyBhbG9uZSwgYW5kIGp1c3QgZmlyZSBvZmYgdGhlIHVl dmVudAo+ID4gPiB1bmNvbmRpdGlvbmFsbHkgYW5kIGxldCB1c2Vyc3BhY2UgaW5pdGlhdGUgdGhl IHByb2JlLiBUaGF0IHdheSB3ZSBjb3VsZAo+ID4gPiBza2lwIGFsbCAtPmRldGVjdCgpIGNhbGxz IGR1cmluZyByZXN1bWUgZm9yIGEgYml0IG9mIGV4dHJhIHNwZWVkLgo+IFRoZSBjdXJyZW50IHB1 cnBvc2Ugb2YgYWxsIG9mIHRoZSBkZXRlY3QoKSBjYWxscyBpcyB0byBjaGVjayB3aGV0aGVyIG9y IG5vdCBpdAo+IHdvdWxkIGJlIGFwcHJvcHJpYXRlIHRvIHNlbmQgdGhlIGhvdHBsdWcgZXZlbnQg KGFzc3VtaW5nIHlvdSBtZWFuCj4gZHJtX2ttc19oZWxwZXJfaG90cGx1Z19ldmVudCgpKSwganVz dCBzbyB0aGF0IHdlIGNhbiBzYXZlIHJlcHJvYmluZyBhIGRpc3BsYXkgaWYKPiBub3RoaW5nIGNo YW5nZWQuIEFueXdheSwgaWYgc3BlZWQgd2VyZSBhbiBpc3N1ZSBoZXJlIHdlIGNvdWxkIGp1c3Qg ZmlyZSBvZmYgYQo+IHdvcmtlciBzbyB0aGF0IHRoZSByZXByb2JpbmcgZG9lc24ndCBob2xkIHVw IHRoZSByZXN1bWUgcHJvY2Vzcy4KCkFGQUlDUyBpZiB5b3UgZm9yY2UgZXZlcnl0aGluZyB0byB1 bmtub3duIHlvdSBhcmUgZWZmZWN0aXZlbHkgZm9yY2luZyBpdAp0byBzZW5kIHRoZSB1ZXZlbnQg YW55d2F5ICh1bmxlc3MgdGhlIHByb2JlIGFjdHVhbGx5IHJldHVybnMgInVua25vd24iCmZvciBl dmVyeXRoaW5nKS4gU2VlbXMgYSBiaXQgcG9pbnRsZXNzIHRvIGRvIHRoZSBwcm9iZSBhdCBhbGwg d2hlbiB5b3UKcmVhbGx5IGtub3cgdGhhdCB5b3UncmUgZ29pbmcgdG8gc2VuZCB0aGUgZXZlbnQg YW55d2F5LgoKPiAKPiBXaGlsZSBJJ2QgYmUgZmluZSB3aXRoIGp1c3QgZmlyaW5nIG9mZiBhIHBy b2JlLCBJIGRvbid0IHRoaW5rIGl0IG1ha2VzIHNlbnNlIHRvCj4gYXZvaWQgaGF2aW5nIGFuIHVu a25vd24gc3RhdGUgaGVyZSB3aGVuIG51bWVyb3VzIGRyaXZlcnMgYWxyZWFkeSB1c2UgdW5rbm93 bgo+IHN0YXRlcyByZWd1bGFybHksIHVubGVzcyB0aGVyZSB3YXMgYSByZWFzb24gb3RoZXIgdGhl biB0aGUgb25lIG1lbnRpb25lZCBpbiB0aGUKPiBidWd6aWxsYSBmb3IgZG9pbmcgdGhpcy4KPiAK PiA+IFRoYXQgaXMsIGlpcmMsIHNvbWV0aGluZyB0aGF0IEx5dWRlIHN1Z2dlc3RlZCB3aGVuIHdl IGRpc2N1c3NlZCBpbgo+ID4gcGVyc29uIChidXQgSSBhc2tlZCBoaW0gdG8gc2VuZCByZXZlcnQg cGF0Y2gganVzdCB0byBzdGFydCBicm9hZGVyCj4gKmhlciBwbGVhc2UgOikKPiAKPiA+IGRpc2N1 c3Npb24gb24gd2hhdCB0aGUgcmlnaHQgc29sdXRpb24gd291bGQgYmUpLsKgwqBEZXBlbmRpbmcg b24KPiA+IHVzZXJzcGFjZSB0byByZXByb2JlIHNlZW1zIGxpa2UgYXQgbGVhc3QgdGhlIHdyb25n IHRoaW5nIGZvciBmYmNvbi4uCj4gPiB3aGljaCBhcyBtdWNoIGFzIEkgd2lzaCBpdCB3b3VsZCBn byBhd2F5LCBhcyBsb25nIGFzIGl0IGlzIGVuYWJsZWQgaW4KPiA+IGtlcm5lbCBjb25maWcsIEkg ZG9uJ3QgdGhpbmsgd2UgY2FuIGlnbm9yZS4KPiA+IAo+ID4gQlIsCj4gPiAtUgo+ID4gCj4gPiA+ IE5vdCAxMDAlIGlmIHRoYXQgd291bGQgYmUgc2FmZS4gTWF5YmUgc29tZXRoaW5nIGludGVybmFs IGRlcGVuZHMgb24gdGhlCj4gPiA+IC0+ZGV0ZWN0KCkgaGF2aW5nIGJlZW4gY2FsbGVkPyBEUCBz dHVmZiBwZXJoYXBzPyBXaGljaCBtYWtlcyBtZSB3b25kZXIKPiA+ID4gaG93IGk5MTUgY29wZXMg d2l0aCBhIERQIG1vbml0b3IgZ2V0aW5nIHVucGx1Z2dlZC9jaGFuZ2Ugd2hpbGUKPiA+ID4gc3Vz cGVuZGVkLiBJIHNob3VsZCBwcm9iYWJseSB0cnkgdGhhdC4KPiA+ID4gCj4gPiA+IC0tCj4gPiA+ IFZpbGxlIFN5cmrDpGzDpAo+ID4gPiBJbnRlbCBPVEMKPiAtLSAKPiBDaGVlcnMsCj4gCUx5dWRl CgotLSAKVmlsbGUgU3lyasOkbMOkCkludGVsIE9UQwpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965459AbbLOUoM (ORCPT ); Tue, 15 Dec 2015 15:44:12 -0500 Received: from mga14.intel.com ([192.55.52.115]:30392 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933593AbbLOUoL (ORCPT ); Tue, 15 Dec 2015 15:44:11 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,434,1444719600"; d="scan'208";a="841878768" Date: Tue, 15 Dec 2015 22:44:06 +0200 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Lyude Cc: Rob Clark , kuddel.mail@gmx.de, Daniel Vetter , open list , "open list:DRM DRIVERS" , Julien Wajsberg , Benjamin Tissoires , Lennart Poettering Subject: Re: [PATCH] Revert "drm: Stop resetting connector state to unknown" Message-ID: <20151215204406.GS4437@intel.com> References: <1450202871-15062-1-git-send-email-cpaul@redhat.com> <20151215183339.GO4437@intel.com> <1450211658.8084.11.camel@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1450211658.8084.11.camel@redhat.com> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Dec 15, 2015 at 03:34:18PM -0500, Lyude wrote: > On Tue, 2015-12-15 at 13:42 -0500, Rob Clark wrote: > > On Tue, Dec 15, 2015 at 1:33 PM, Ville Syrjälä > > wrote: > > > On Tue, Dec 15, 2015 at 01:23:06PM -0500, Rob Clark wrote: > > > > On Tue, Dec 15, 2015 at 1:07 PM, Lyude wrote: > > > > > This reverts commit 5677d67ae394 ("drm: Stop resetting connector state > > > > > to > > > > > unknown") > > > > > > > > > > Unfortunately, not resetting the connector status to unknown actually > > > > > breaks reprobing on suspend/resume in i915, which is important to have > > > > > working since it means a user docking their laptop in suspend won't have > > > > > their monitors work after resume. This commit was originally pushed to > > > > > fix > > > > > a bug with systemd[1], however said bug has already been fixed in > > > > > userspace. > > > > > > > > > > Since "unknown" is technically a valid option to return to userspace for > > > > > a > > > > > connector's status, I would think that this sort of behavior should > > > > > probably be expected from userspace. Some good examples of this are the > > > > > radeon driver reporting "unknown" for connectors that have done > > > > > something > > > > > wonky during a hotplug event (e.g. part of the initialization of the > > > > > connector failed), and the omapdrm driver returns "unknown" for certain > > > > > connector types by default. > > > > > > > > > > [1]: https://bugzilla.kernel.org/show_bug.cgi?id=100641 > > > > > > > > > > Signed-off-by: Lyude > > > > > --- > > > > >  drivers/gpu/drm/drm_crtc.c | 7 ++++--- > > > > >  1 file changed, 4 insertions(+), 3 deletions(-) > > > > > > > > > > diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c > > > > > index 24c5434..474e636 100644 > > > > > --- a/drivers/gpu/drm/drm_crtc.c > > > > > +++ b/drivers/gpu/drm/drm_crtc.c > > > > > @@ -5312,11 +5312,12 @@ void drm_mode_config_reset(struct drm_device > > > > > *dev) > > > > >                 if (encoder->funcs->reset) > > > > >                         encoder->funcs->reset(encoder); > > > > > > > > > > -       mutex_lock(&dev->mode_config.mutex); > > > > > -       drm_for_each_connector(connector, dev) > > > > > +       list_for_each_entry(connector, &dev->mode_config.connector_list, > > > > > head) { > > > > > +               connector->status = connector_status_unknown; > > > > > + > > > > >                 if (connector->funcs->reset) > > > > >                         connector->funcs->reset(connector); > > > > > -       mutex_unlock(&dev->mode_config.mutex); > > > > > +       } > > > > >  } > > > > > > > > looks like git-revert might have been a bit over-ambitious and > > > > clobbered a couple subsequent changes.. but that is easy enough to fix > > > > once we figure out what the right thing to do is. > > > > > > > > Beyond that.. I'm not really sure how to apply the "do not break > > > > userspace" rule here.. since prior to > > > > c484f02d0f02fbbfc6decc945a69aae011041a27 userspace could see "unknown" > > > > for certain hardware.  But after that commit it could start seeing > > > > "unknown" for drivers/connectors that never would have returned > > > > "unknown" before.  If userspace had a problem with "unknown", it > > > > sounds like a userspace bug that was just unnoticed because no one > > > > tested on the right hardware. > > > > > > > > But anyways, one idea to revert things to original behavior prior to > > > > c484f02d0f02fbbfc6decc945a69aae011041a27 (so at least userspace > > > > doesn't see 'unknown' for drivers/connectors that never used to report > > > > 'unknown') would be to do something roughly like this in > > > > status_show(): > > > > > > > >   if (status == unknown) > > > >      status = connector->funcs->detect(connector) > > > > > > > > So I could go with either just reverting this commit, or reverting > > > > commit plus above change.  My $0.02 anyways.. > > > > > > Hmm. Or maybe leave the states alone, and just fire off the uevent > > > unconditionally and let userspace initiate the probe. That way we could > > > skip all ->detect() calls during resume for a bit of extra speed. > The current purpose of all of the detect() calls is to check whether or not it > would be appropriate to send the hotplug event (assuming you mean > drm_kms_helper_hotplug_event()), just so that we can save reprobing a display if > nothing changed. Anyway, if speed were an issue here we could just fire off a > worker so that the reprobing doesn't hold up the resume process. AFAICS if you force everything to unknown you are effectively forcing it to send the uevent anyway (unless the probe actually returns "unknown" for everything). Seems a bit pointless to do the probe at all when you really know that you're going to send the event anyway. > > While I'd be fine with just firing off a probe, I don't think it makes sense to > avoid having an unknown state here when numerous drivers already use unknown > states regularly, unless there was a reason other then the one mentioned in the > bugzilla for doing this. > > > That is, iirc, something that Lyude suggested when we discussed in > > person (but I asked him to send revert patch just to start broader > *her please :) > > > discussion on what the right solution would be).  Depending on > > userspace to reprobe seems like at least the wrong thing for fbcon.. > > which as much as I wish it would go away, as long as it is enabled in > > kernel config, I don't think we can ignore. > > > > BR, > > -R > > > > > Not 100% if that would be safe. Maybe something internal depends on the > > > ->detect() having been called? DP stuff perhaps? Which makes me wonder > > > how i915 copes with a DP monitor geting unplugged/change while > > > suspended. I should probably try that. > > > > > > -- > > > Ville Syrjälä > > > Intel OTC > -- > Cheers, > Lyude -- Ville Syrjälä Intel OTC