From mboxrd@z Thu Jan 1 00:00:00 1970 From: ville.syrjala@linux.intel.com Subject: [PATCH 2/3] drm/i915: Register shadow VGA even when it produces spurious detection results Date: Mon, 26 Sep 2016 12:20:45 +0300 Message-ID: <1474881646-1326-2-git-send-email-ville.syrjala@linux.intel.com> References: <1474881646-1326-1-git-send-email-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 261C56E42C for ; Mon, 26 Sep 2016 09:20:53 +0000 (UTC) In-Reply-To: <1474881646-1326-1-git-send-email-ville.syrjala@linux.intel.com> 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 Cc: Olof Johansson , Duncan Laurie List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCkhh dmluZyBhIHNoYWRvdyBWR0EgY29ubmVjdG9yIGlzIHVzZWZ1bCBmb3IgdGVzdGluZyBwdXJwb3Nl cy4gV2UKY3VycmVudGx5IHNraXAgcmVnaXN0ZXJpbmcgdGhlIGNvbm5lY3RvciBvbiBtYWNoaW5l cyB3aGVyZSB0aGUKQ1JUIGRldGVjdCBmYWxzZWx5IHJlcG9ydHMgaXQgYXMgY29ubmVjdGVkLiBM ZXQncyBpbnN0ZWFkIG1vdmUgdGhlCnRoZSBibGFja2xpc3QgY2hlY2sgdG8gdGhlIGRldGVjdCBj YWxsYmFjayAoYW5kIGhwZCBzZXR1cCkgYW5kCmlmIHdlIGdldCBhIG1hdGNoIHdlIGFsd2F5cyBy ZXBvcnQgdGhlIGNvbm5lY3RvciBhcyBkaXNjb25uZWN0ZWQuClRoaXMgd2F5IHdlIGdldCBhIHNo YWRvdyBWR0EgY29ubmVjdG9yIHRvIGhlbHAgd2l0aCB0ZXN0aW5nLCB3aGlsZQp3ZSBzdGlsbCBh dm9pZCB0aGUgdXNlciBmYWNpbmcgcHJvYmxlbXMgZnJvbSB0aGUgaW5jb3JyZWN0CmRldGVjdGlv biByZXN1bHRzLgoKY29tbWl0IDhjYTQwMTNkNzAyZCAoIkNIUk9NSVVNOiBpOTE1OiBBZGQgRE1J IG92ZXJyaWRlIHRvIHNraXAgQ1JUCmluaXRpYWxpemF0aW9uIG9uIFpHQiIpIGRvZXNuJ3QgcHJv dmlkZSBtdWNoIGluIHRoZSB3YXkgb2YgZGV0YWlscwphcyB0byB3aHkgJ0FDRVIgWkdCJyB3YXMg YWRkZWQgdG8gdGhlIGJsYWNrbGlzdC4gVHJ5aW5nIHRvIHRyYWNlIGl0CmZ1cnRoZXIgbGVhZHMg bWUgdG8gYSBjaHJvbWVvcyBidWdyZXBvcnQgSSBjYW4ndCBhY2Nlc3MuIFNvIGJhc2VkIG9uCnRo ZSBmYWN0IHRoYXQgdGhlIGNvbW1pdCBhZGRlZCB0aGUKIi8qIFNraXAgbWFjaGluZXMgd2l0aG91 dCBWR0EgdGhhdCBmYWxzZWx5IHJlcG9ydCBob3RwbHVnIGV2ZW50cyAqLyIKY29tbWVudCwgSSdt IGdvaW5nIHRvIGFzc3VtZSB0aGF0IGl0IHdhcyBqdXN0IHNwdXJpb3VzIENSVCBkZXRlY3Rpb24u ClNvIGl0IHNob3VsZCBiZSBzYWZlIHRvIG1vdmUgdGhlIGJsYWNrbGlzdCB0byBqdXN0IGJsb2Nr IHRoZSBkZXRlY3Rpb24KYW5kIGhwZCB3aXRob3V0IGNhdXNpbmcgYSByZWdyZXNzaW9uIG9uIHNh aWQgbWFjaGluZS4KCkluIGZhY3QgU3TDqXBoYW5lIGNvbmZpcm1lZCBvbiBpcmMgdGhhdCB0aGUg cHJvYmxlbSB3YXMgaW5kZWVkIGp1c3QKY3JhcHB5IGhvdHBsdWcgZGV0ZWN0OgoiMjI6MjkgPCBt YXJjaGV1PiB2c3lyamFsYTogdGhlIHBvcnQgaXNuJ3QgdGhlcmUsIGJ1dCB0aGUgbG9hZCBkZXRl Y3QgaXMKIGltcHJvcGVybHkgc3R1YmJlZCBpbiBodwogMjI6MjkgPCBtYXJjaGV1PiB2c3lyamFs YTogc28gaXQgZmxvYXRzIgpzbyB0aGlzIGNoYW5nZSBzaG91bGQgYmUgcGVyZmVjdGx5IGZpbmUu Cgp2MjogQWRkIGlyYyBxdW90ZSBmcm9tIFN0w6lwaGFuZQoKQ2M6IER1bmNhbiBMYXVyaWUgPGRs YXVyaWVAY2hyb21pdW0ub3JnPgpDYzogT2xvZiBKb2hhbnNzb24gPG9sb2ZqQGNocm9taXVtLm9y Zz4KQ2M6IFN0w6lwaGFuZSBNYXJjaGVzaW4gPG1hcmNoZXVAY2hyb21pdW0ub3JnPgpTaWduZWQt b2ZmLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgot LS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2NydC5jIHwgNDcgKysrKysrKysrKysrKysr KysrKystLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDI0IGluc2VydGlvbnMo KyksIDIzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2NydC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY3J0LmMKaW5kZXggYmEzNzJj MjM5ZDQ4Li5lMzc1MzgwNGM2MTkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2NydC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2NydC5jCkBAIC02NDMs NiArNjQzLDI0IEBAIGludGVsX2NydF9sb2FkX2RldGVjdChzdHJ1Y3QgaW50ZWxfY3J0ICpjcnQs IHVpbnQzMl90IHBpcGUpCiAJcmV0dXJuIHN0YXR1czsKIH0KIAorc3RhdGljIGludCBpbnRlbF9z cHVyaW91c19jcnRfZGV0ZWN0X2RtaV9jYWxsYmFjayhjb25zdCBzdHJ1Y3QgZG1pX3N5c3RlbV9p ZCAqaWQpCit7CisJRFJNX0RFQlVHX0RSSVZFUigiU2tpcHBpbmcgQ1JUIGRldGVjdGlvbiBmb3Ig JXNcbiIsIGlkLT5pZGVudCk7CisJcmV0dXJuIDE7Cit9CisKK3N0YXRpYyBjb25zdCBzdHJ1Y3Qg ZG1pX3N5c3RlbV9pZCBpbnRlbF9zcHVyaW91c19jcnRfZGV0ZWN0W10gPSB7CisJeworCQkuY2Fs bGJhY2sgPSBpbnRlbF9zcHVyaW91c19jcnRfZGV0ZWN0X2RtaV9jYWxsYmFjaywKKwkJLmlkZW50 ID0gIkFDRVIgWkdCIiwKKwkJLm1hdGNoZXMgPSB7CisJCQlETUlfTUFUQ0goRE1JX1NZU19WRU5E T1IsICJBQ0VSIiksCisJCQlETUlfTUFUQ0goRE1JX1BST0RVQ1RfTkFNRSwgIlpHQiIpLAorCQl9 LAorCX0sCisJeyB9Cit9OworCiBzdGF0aWMgZW51bSBkcm1fY29ubmVjdG9yX3N0YXR1cwogaW50 ZWxfY3J0X2RldGVjdChzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yLCBib29sIGZvcmNl KQogewpAQCAtNjU5LDYgKzY3NywxMCBAQCBpbnRlbF9jcnRfZGV0ZWN0KHN0cnVjdCBkcm1fY29u bmVjdG9yICpjb25uZWN0b3IsIGJvb2wgZm9yY2UpCiAJCSAgICAgIGNvbm5lY3Rvci0+YmFzZS5p ZCwgY29ubmVjdG9yLT5uYW1lLAogCQkgICAgICBmb3JjZSk7CiAKKwkvKiBTa2lwIG1hY2hpbmVz IHdpdGhvdXQgVkdBIHRoYXQgZmFsc2VseSByZXBvcnQgaG90cGx1ZyBldmVudHMgKi8KKwlpZiAo ZG1pX2NoZWNrX3N5c3RlbShpbnRlbF9zcHVyaW91c19jcnRfZGV0ZWN0KSkKKwkJcmV0dXJuIGNv bm5lY3Rvcl9zdGF0dXNfZGlzY29ubmVjdGVkOworCiAJcG93ZXJfZG9tYWluID0gaW50ZWxfZGlz cGxheV9wb3J0X3Bvd2VyX2RvbWFpbihpbnRlbF9lbmNvZGVyKTsKIAlpbnRlbF9kaXNwbGF5X3Bv d2VyX2dldChkZXZfcHJpdiwgcG93ZXJfZG9tYWluKTsKIApAQCAtODA4LDI0ICs4MzAsNiBAQCBz dGF0aWMgY29uc3Qgc3RydWN0IGRybV9lbmNvZGVyX2Z1bmNzIGludGVsX2NydF9lbmNfZnVuY3Mg PSB7CiAJLmRlc3Ryb3kgPSBpbnRlbF9lbmNvZGVyX2Rlc3Ryb3ksCiB9OwogCi1zdGF0aWMgaW50 IGludGVsX25vX2NydF9kbWlfY2FsbGJhY2soY29uc3Qgc3RydWN0IGRtaV9zeXN0ZW1faWQgKmlk KQotewotCURSTV9JTkZPKCJTa2lwcGluZyBDUlQgaW5pdGlhbGl6YXRpb24gZm9yICVzXG4iLCBp ZC0+aWRlbnQpOwotCXJldHVybiAxOwotfQotCi1zdGF0aWMgY29uc3Qgc3RydWN0IGRtaV9zeXN0 ZW1faWQgaW50ZWxfbm9fY3J0W10gPSB7Ci0JewotCQkuY2FsbGJhY2sgPSBpbnRlbF9ub19jcnRf ZG1pX2NhbGxiYWNrLAotCQkuaWRlbnQgPSAiQUNFUiBaR0IiLAotCQkubWF0Y2hlcyA9IHsKLQkJ CURNSV9NQVRDSChETUlfU1lTX1ZFTkRPUiwgIkFDRVIiKSwKLQkJCURNSV9NQVRDSChETUlfUFJP RFVDVF9OQU1FLCAiWkdCIiksCi0JCX0sCi0JfSwKLQl7IH0KLX07Ci0KIHZvaWQgaW50ZWxfY3J0 X2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIHsKIAlzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAq Y29ubmVjdG9yOwpAQCAtODM1LDEwICs4MzksNiBAQCB2b2lkIGludGVsX2NydF9pbml0KHN0cnVj dCBkcm1fZGV2aWNlICpkZXYpCiAJaTkxNV9yZWdfdCBhZHBhX3JlZzsKIAl1MzIgYWRwYTsKIAot CS8qIFNraXAgbWFjaGluZXMgd2l0aG91dCBWR0EgdGhhdCBmYWxzZWx5IHJlcG9ydCBob3RwbHVn IGV2ZW50cyAqLwotCWlmIChkbWlfY2hlY2tfc3lzdGVtKGludGVsX25vX2NydCkpCi0JCXJldHVy bjsKLQogCWlmIChIQVNfUENIX1NQTElUKGRldikpCiAJCWFkcGFfcmVnID0gUENIX0FEUEE7CiAJ ZWxzZSBpZiAoSVNfVkFMTEVZVklFVyhkZXYpKQpAQCAtOTA2LDcgKzkwNiw4IEBAIHZvaWQgaW50 ZWxfY3J0X2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJY3J0LT5iYXNlLmRpc2FibGUg PSBpbnRlbF9kaXNhYmxlX2NydDsKIAl9CiAJY3J0LT5iYXNlLmVuYWJsZSA9IGludGVsX2VuYWJs ZV9jcnQ7Ci0JaWYgKEk5MTVfSEFTX0hPVFBMVUcoZGV2KSkKKwlpZiAoSTkxNV9IQVNfSE9UUExV RyhkZXYpICYmCisJICAgICFkbWlfY2hlY2tfc3lzdGVtKGludGVsX3NwdXJpb3VzX2NydF9kZXRl Y3QpKQogCQljcnQtPmJhc2UuaHBkX3BpbiA9IEhQRF9DUlQ7CiAJaWYgKEhBU19EREkoZGV2KSkg ewogCQljcnQtPmJhc2UucG9ydCA9IFBPUlRfRTsKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0Cklu dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK