From: Imre Deak Subject: [PATCH] drm/i915/ilk: Don't attempt to register eDP if LVDS was detected Date: Fri, 17 Jun 2016 18:48:45 +0300 Message-ID: <1466178525-4480-1-git-send-email-imre.deak@intel.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 163096E38C for ; Fri, 17 Jun 2016 15:48:47 +0000 (UTC) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org QXRtIG9uIElMSyB3ZSBhdHRlbXB0IHRvIGRldGVjdCBpZiBlRFAgaXMgcHJlc2VudCBldmVuIGlm IExWRFMgd2FzCmFscmVhZHkgZGV0ZWN0ZWQgYW5kIGFuIGVuY29kZXIgZm9yIGl0IHdhcyByZWdp c3RlcmVkLiBUaGlzIGludm9sdmVzCnRyeWluZyB0byByZWFkIG91dCB0aGUgZURQIEVESUQsIHdo aWNoIGluIHR1cm4gbmVlZHMgdGhlIHNhbWUgcG93ZXIKc2VxdWVuY2VyIHRoYXQgTFZEUyB1c2Vz LiBQb2tpbmcgYXQgdGhlIFZERCBsaW5lIGF0IGFuIHVuZXhwZWN0ZWQgdGltZQptYXkgb3IgbWF5 IG5vdCBpbnRlcmZlcmUgd2l0aCB0aGUgTFZEUyBwYW5lbCwgYnV0IGl0J3MgcHJvYmFibHkgc2Fm ZXIgdG8KcHJldmVudCB0aGlzLiAgUmVnaXN0ZXJpbmcgYm90aCBhbiBMVkRTIGFuZCBhbiBlRFAg Y29ubmVjdG9yIHdvdWxkIGFsc28KcHJlc2VudCBhIHNpbWlsYXIgcHJvYmxlbSBhY2Nlc3Npbmcg dGhlIHNoYXJlZCBQUFMgYXQgYW55IHBvaW50IGxhdGVyIGluCmFuIHVuZXhwZWN0ZWQgd2F5LgoK VGhpcyB3YXMgY2F1Z2h0IGJ5IENJIHdpdGggdGhlIFBQUyBzYW5pdHkgY2hlY2tzIGluIHBsYWNl IGFuZCB0aGUKaW5pdGlhbCBlRFAgRURJRCByZWFkb3V0IHdhaXRpbmcgZm9yIHRoZSBwYW5lbCBw b3dlciBjeWNsZSB0aW1lb3V0CndpdGhvdXQgdGhlIFBQUyByZWdpc3RlcnMgYmVpbmcgaW5pdGlh bGl6ZWQuIFRvIHNvbHZlIHRoaXMgbGF0dGVyCnByb2JsZW0gbW92ZSBQUFMgcmVnaXN0ZXIgaW5p dCBlYXJsaWVyIGJlZm9yZSB0aGUgZmlyc3QgdXNlIG9mIHRoZQpQUFMuCgpDQzogVmlsbGUgU3ly asOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogSW1y ZSBEZWFrIDxpbXJlLmRlYWtAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2RwLmMgfCAxOSArKysrKysrKysrKysrKy0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTQgaW5z ZXJ0aW9ucygrKSwgNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kcC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYwppbmRleCBi ZTA4MzUxLi5mZTU0M2Q3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k cC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMKQEAgLTUzMTYsOCArNTMx NiwyMiBAQCBzdGF0aWMgYm9vbCBpbnRlbF9lZHBfaW5pdF9jb25uZWN0b3Ioc3RydWN0IGludGVs X2RwICppbnRlbF9kcCwKIAlpZiAoIWlzX2VkcChpbnRlbF9kcCkpCiAJCXJldHVybiB0cnVlOwog CisJLyoKKwkgKiBPbiBJTEsgd2UgbWF5IGdldCBoZXJlIHdpdGggTFZEUyBhbHJlYWR5IHJlZ2lz dGVyZWQuIFNpbmNlIHRoZQorCSAqIGRyaXZlciB1c2VzIHRoZSBvbmx5IGludGVybmFsIHBvd2Vy IHNlcXVlbmNlciBhdmFpbGFibGUgZm9yIGJvdGgKKwkgKiBlRFAgYW5kIExWRFMgYmFpbCBvdXQg ZWFybHkgaW4gdGhpcyBjYXNlIHRvIHByZXZlbnQgaW50ZXJmZXJpbmcKKwkgKiB3aXRoIGFuIGFs cmVhZHkgcG93ZXJlZC1vbiBMVkRTIHBvd2VyIHNlcXVlbmNlci4KKwkgKi8KKwlmb3JfZWFjaF9p bnRlbF9lbmNvZGVyKGRldiwgaW50ZWxfZW5jb2RlcikgeworCQlpZiAoaW50ZWxfZW5jb2Rlci0+ dHlwZSA9PSBJTlRFTF9PVVRQVVRfTFZEUykgeworCQkJRFJNX0lORk8oIkxWRFMgd2FzIGRldGVj dGVkLCBub3QgcmVnaXN0ZXJpbmcgZURQXG4iKTsKKwkJCXJldHVybiBmYWxzZTsKKwkJfQorCX0K KwogCXBwc19sb2NrKGludGVsX2RwKTsKIAlpbnRlbF9lZHBfcGFuZWxfdmRkX3Nhbml0aXplKGlu dGVsX2RwKTsKKwlpbnRlbF9kcF9pbml0X3BhbmVsX3Bvd2VyX3NlcXVlbmNlcl9yZWdpc3RlcnMo ZGV2LCBpbnRlbF9kcCk7CiAJcHBzX3VubG9jayhpbnRlbF9kcCk7CiAKIAkvKiBDYWNoZSBEUENE IGFuZCBFRElEIGZvciBlZHAuICovCkBAIC01MzM0LDExICs1MzQ4LDYgQEAgc3RhdGljIGJvb2wg aW50ZWxfZWRwX2luaXRfY29ubmVjdG9yKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHAsCiAJCXJl dHVybiBmYWxzZTsKIAl9CiAKLQkvKiBXZSBub3cga25vdyBpdCdzIG5vdCBhIGdob3N0LCBpbml0 IHBvd2VyIHNlcXVlbmNlIHJlZ3MuICovCi0JcHBzX2xvY2soaW50ZWxfZHApOwotCWludGVsX2Rw X2luaXRfcGFuZWxfcG93ZXJfc2VxdWVuY2VyX3JlZ2lzdGVycyhkZXYsIGludGVsX2RwKTsKLQlw cHNfdW5sb2NrKGludGVsX2RwKTsKLQogCW11dGV4X2xvY2soJmRldi0+bW9kZV9jb25maWcubXV0 ZXgpOwogCWVkaWQgPSBkcm1fZ2V0X2VkaWQoY29ubmVjdG9yLCAmaW50ZWxfZHAtPmF1eC5kZGMp OwogCWlmIChlZGlkKSB7Ci0tIAoyLjUuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz dGluZm8vaW50ZWwtZ2Z4Cg==