From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: [PATCH RESEND 4/5] drm/i915: move VBT based DSI presence check to intel_bios.c Date: Fri, 5 Feb 2016 12:36:39 +0200 Message-ID: <1454668600-22759-4-git-send-email-jani.nikula@intel.com> References: <1454668600-22759-1-git-send-email-jani.nikula@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 C92956E0F3 for ; Fri, 5 Feb 2016 02:36:51 -0800 (PST) In-Reply-To: <1454668600-22759-1-git-send-email-jani.nikula@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: jani.nikula@intel.com List-Id: intel-gfx@lists.freedesktop.org SGlkZSBrbm93bGVkZ2UgYWJvdXQgVkJUIGNoaWxkIGRldmljZXMgaW4gaW50ZWxfYmlvcy5jLgoK U2lnbmVkLW9mZi1ieTogSmFuaSBOaWt1bGEgPGphbmkubmlrdWxhQGludGVsLmNvbT4KLS0tCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgfCAgMiArLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfYmlvcy5jIHwgMzMgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKyst CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kc2kuYyAgfCAyMyArKysrKysrKysrKysrKy0t LS0tLS0tLQogMyBmaWxlcyBjaGFuZ2VkLCA0NyBpbnNlcnRpb25zKCspLCAxMSBkZWxldGlvbnMo LSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCAyMzRmMzM3MDhhMzEuLmNkMjU5NWMyNWY4 ZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC0xNTE2LDcgKzE1MTYsNiBAQCBzdHJ1Y3Qg aW50ZWxfdmJ0X2RhdGEgewogCiAJLyogTUlQSSBEU0kgKi8KIAlzdHJ1Y3QgewotCQl1MTYgcG9y dDsKIAkJdTE2IHBhbmVsX2lkOwogCQlzdHJ1Y3QgbWlwaV9jb25maWcgKmNvbmZpZzsKIAkJc3Ry dWN0IG1pcGlfcHBzX2RhdGEgKnBwczsKQEAgLTM0MDAsNiArMzM5OSw3IEBAIGJvb2wgaW50ZWxf Ymlvc19pc192YWxpZF92YnQoY29uc3Qgdm9pZCAqYnVmLCBzaXplX3Qgc2l6ZSk7CiBib29sIGlu dGVsX2Jpb3NfaXNfdHZfcHJlc2VudChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYp OwogYm9vbCBpbnRlbF9iaW9zX2lzX2x2ZHNfcHJlc2VudChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYsIHU4ICppMmNfcGluKTsKIGJvb2wgaW50ZWxfYmlvc19pc19wb3J0X2VkcChz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIGVudW0gcG9ydCBwb3J0KTsKK2Jvb2wg aW50ZWxfYmlvc19pc19kc2lfcHJlc2VudChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYsIGVudW0gcG9ydCAqcG9ydCk7CiAKIC8qIGludGVsX29wcmVnaW9uLmMgKi8KICNpZmRlZiBD T05GSUdfQUNQSQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYmlvcy5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYmlvcy5jCmluZGV4IDE0MjlkODIxNDg4NS4u YjBjZjMzMjM0YzMzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9iaW9z LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYmlvcy5jCkBAIC0xMjM3LDcgKzEy MzcsNiBAQCBwYXJzZV9kZXZpY2VfbWFwcGluZyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYsCiAJCSAgICAmJnBfY2hpbGQtPmNvbW1vbi5kZXZpY2VfdHlwZSAmIERFVklDRV9UWVBF X01JUElfT1VUUFVUKSB7CiAJCQlEUk1fREVCVUdfS01TKCJGb3VuZCBNSVBJIGFzIExGUFxuIik7 CiAJCQlkZXZfcHJpdi0+dmJ0Lmhhc19taXBpID0gMTsKLQkJCWRldl9wcml2LT52YnQuZHNpLnBv cnQgPSBwX2NoaWxkLT5jb21tb24uZHZvX3BvcnQ7CiAJCX0KIAogCQljaGlsZF9kZXZfcHRyID0g ZGV2X3ByaXYtPnZidC5jaGlsZF9kZXYgKyBjb3VudDsKQEAgLTE1NTIsMyArMTU1MSwzNSBAQCBi b29sIGludGVsX2Jpb3NfaXNfcG9ydF9lZHAoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2LCBlbnVtIHBvcnQgcG9ydCkKIAogCXJldHVybiBmYWxzZTsKIH0KKworLyoqCisgKiBpbnRl bF9iaW9zX2lzX2RzaV9wcmVzZW50IC0gaXMgRFNJIHByZXNlbnQgaW4gVkJUCisgKiBAZGV2X3By aXY6CWk5MTUgZGV2aWNlIGluc3RhbmNlCisgKiBAcG9ydDoJcG9ydCBmb3IgRFNJIGlmIHByZXNl bnQKKyAqCisgKiBSZXR1cm4gdHJ1ZSBpZiBEU0kgaXMgcHJlc2VudCwgYW5kIHJldHVybiB0aGUg cG9ydCBpbiAlcG9ydC4KKyAqLworYm9vbCBpbnRlbF9iaW9zX2lzX2RzaV9wcmVzZW50KHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKKwkJCSAgICAgICBlbnVtIHBvcnQgKnBvcnQp Cit7CisJdW5pb24gY2hpbGRfZGV2aWNlX2NvbmZpZyAqcF9jaGlsZDsKKwlpbnQgaTsKKworCWZv ciAoaSA9IDA7IGkgPCBkZXZfcHJpdi0+dmJ0LmNoaWxkX2Rldl9udW07IGkrKykgeworCQlwX2No aWxkID0gZGV2X3ByaXYtPnZidC5jaGlsZF9kZXYgKyBpOworCisJCWlmICghKHBfY2hpbGQtPmNv bW1vbi5kZXZpY2VfdHlwZSAmIERFVklDRV9UWVBFX01JUElfT1VUUFVUKSkKKwkJCWNvbnRpbnVl OworCisJCXN3aXRjaCAocF9jaGlsZC0+Y29tbW9uLmR2b19wb3J0KSB7CisJCWNhc2UgRFZPX1BP UlRfTUlQSUE6CisJCWNhc2UgRFZPX1BPUlRfTUlQSUI6CisJCWNhc2UgRFZPX1BPUlRfTUlQSUM6 CisJCWNhc2UgRFZPX1BPUlRfTUlQSUQ6CisJCQkqcG9ydCA9IHBfY2hpbGQtPmNvbW1vbi5kdm9f cG9ydCAtIERWT19QT1JUX01JUElBOworCQkJcmV0dXJuIHRydWU7CisJCX0KKwl9CisKKwlyZXR1 cm4gZmFsc2U7Cit9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kc2ku YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RzaS5jCmluZGV4IDM3OGY4NzlmNDAxNS4u NWI2ZWM1NjdlM2NlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kc2ku YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kc2kuYwpAQCAtMTExMiw5ICsxMTEy LDE1IEBAIHZvaWQgaW50ZWxfZHNpX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlEUk1f REVCVUdfS01TKCJcbiIpOwogCiAJLyogVGhlcmUgaXMgbm8gZGV0ZWN0aW9uIG1ldGhvZCBmb3Ig TUlQSSBzbyByZWx5IG9uIFZCVCAqLwotCWlmICghZGV2X3ByaXYtPnZidC5oYXNfbWlwaSkKKwlp ZiAoIWludGVsX2Jpb3NfaXNfZHNpX3ByZXNlbnQoZGV2X3ByaXYsICZwb3J0KSkKIAkJcmV0dXJu OwogCisJaWYgKHBvcnQgIT0gUE9SVF9BICYmIHBvcnQgIT0gUE9SVF9DKSB7CisJCURSTV9ERUJV R19LTVMoIlZCVCBoYXMgdW5zdXBwb3J0ZWQgRFNJIHBvcnQgJWNcbiIsCisJCQkgICAgICBwb3J0 X25hbWUocG9ydCkpOworCQlyZXR1cm47CisJfQorCiAJaWYgKElTX1ZBTExFWVZJRVcoZGV2KSB8 fCBJU19DSEVSUllWSUVXKGRldikpIHsKIAkJZGV2X3ByaXYtPm1pcGlfbW1pb19iYXNlID0gVkxW X01JUElfQkFTRTsKIAl9IGVsc2UgewpAQCAtMTE1MywxNiArMTE1OSwxNSBAQCB2b2lkIGludGVs X2RzaV9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJaW50ZWxfY29ubmVjdG9yLT51bnJl Z2lzdGVyID0gaW50ZWxfY29ubmVjdG9yX3VucmVnaXN0ZXI7CiAKIAkvKiBQaXBlIEEgbWFwcyB0 byBNSVBJIERTSSBwb3J0IEEsIHBpcGUgQiBtYXBzIHRvIE1JUEkgRFNJIHBvcnQgQyAqLwotCWlm IChkZXZfcHJpdi0+dmJ0LmRzaS5wb3J0ID09IERWT19QT1JUX01JUElBKSB7Ci0JCWludGVsX2Vu Y29kZXItPmNydGNfbWFzayA9ICgxIDw8IFBJUEVfQSk7Ci0JCWludGVsX2RzaS0+cG9ydHMgPSAo MSA8PCBQT1JUX0EpOwotCX0gZWxzZSBpZiAoZGV2X3ByaXYtPnZidC5kc2kucG9ydCA9PSBEVk9f UE9SVF9NSVBJQykgewotCQlpbnRlbF9lbmNvZGVyLT5jcnRjX21hc2sgPSAoMSA8PCBQSVBFX0Ip OwotCQlpbnRlbF9kc2ktPnBvcnRzID0gKDEgPDwgUE9SVF9DKTsKLQl9CisJaWYgKHBvcnQgPT0g UE9SVF9BKQorCQlpbnRlbF9lbmNvZGVyLT5jcnRjX21hc2sgPSAxIDw8IFBJUEVfQTsKKwllbHNl CisJCWludGVsX2VuY29kZXItPmNydGNfbWFzayA9IDEgPDwgUElQRV9COwogCiAJaWYgKGRldl9w cml2LT52YnQuZHNpLmNvbmZpZy0+ZHVhbF9saW5rKQotCQlpbnRlbF9kc2ktPnBvcnRzID0gKCgx IDw8IFBPUlRfQSkgfCAoMSA8PCBQT1JUX0MpKTsKKwkJaW50ZWxfZHNpLT5wb3J0cyA9ICgxIDw8 IFBPUlRfQSkgfCAoMSA8PCBQT1JUX0MpOworCWVsc2UKKwkJaW50ZWxfZHNpLT5wb3J0cyA9IDEg PDwgcG9ydDsKIAogCS8qIENyZWF0ZSBhIERTSSBob3N0IChhbmQgYSBkZXZpY2UpIGZvciBlYWNo IHBvcnQuICovCiAJZm9yX2VhY2hfZHNpX3BvcnQocG9ydCwgaW50ZWxfZHNpLT5wb3J0cykgewot LSAKMi4xLjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo dHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==