From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: [PATCH v2 4/6] drm/i915: move VBT based DSI presence check to intel_bios.c Date: Tue, 9 Feb 2016 17:29:51 +0200 Message-ID: <1455031793-25240-4-git-send-email-jani.nikula@intel.com> References: <1455031793-25240-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 mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTP id E9FF36E5AA for ; Tue, 9 Feb 2016 07:30:02 -0800 (PST) In-Reply-To: <1455031793-25240-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 djI6IE1vdmUgcG9ydCBjaGVjayB0byBpbnRlbF9iaW9zLmMgKFNpdmFrdW1hcikKClNpZ25lZC1v ZmYtYnk6IEphbmkgTmlrdWxhIDxqYW5pLm5pa3VsYUBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Jpb3MuYyB8IDM5ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHNpLmMgIHwgMTcgKysrKysrKystLS0tLS0tLS0K IDMgZmlsZXMgY2hhbmdlZCwgNDcgaW5zZXJ0aW9ucygrKSwgMTEgZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggYWM2NjU1MmNiMTM1Li45ZTIzYTQwMDg3Y2EgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtMTUxMiw3ICsxNTEyLDYgQEAgc3RydWN0IGludGVsX3Zi dF9kYXRhIHsKIAogCS8qIE1JUEkgRFNJICovCiAJc3RydWN0IHsKLQkJdTE2IHBvcnQ7CiAJCXUx NiBwYW5lbF9pZDsKIAkJc3RydWN0IG1pcGlfY29uZmlnICpjb25maWc7CiAJCXN0cnVjdCBtaXBp X3Bwc19kYXRhICpwcHM7CkBAIC0zMzk2LDYgKzMzOTUsNyBAQCBib29sIGludGVsX2Jpb3NfaXNf dmFsaWRfdmJ0KGNvbnN0IHZvaWQgKmJ1Ziwgc2l6ZV90IHNpemUpOwogYm9vbCBpbnRlbF9iaW9z X2lzX3R2X3ByZXNlbnQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKIGJvb2wg aW50ZWxfYmlvc19pc19sdmRzX3ByZXNlbnQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2LCB1OCAqaTJjX3Bpbik7CiBib29sIGludGVsX2Jpb3NfaXNfcG9ydF9lZHAoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCBlbnVtIHBvcnQgcG9ydCk7Citib29sIGludGVsX2Jp b3NfaXNfZHNpX3ByZXNlbnQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCBlbnVt IHBvcnQgKnBvcnQpOwogCiAvKiBpbnRlbF9vcHJlZ2lvbi5jICovCiAjaWZkZWYgQ09ORklHX0FD UEkKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Jpb3MuYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Jpb3MuYwppbmRleCA3ZjYxY2E4MTY1ZjAuLjRiNmJkNmYy ZTE5MyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYmlvcy5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Jpb3MuYwpAQCAtMTIzNyw3ICsxMjM3LDYgQEAg cGFyc2VfZGV2aWNlX21hcHBpbmcoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAog CQkgICAgJiZwX2NoaWxkLT5jb21tb24uZGV2aWNlX3R5cGUgJiBERVZJQ0VfVFlQRV9NSVBJX09V VFBVVCkgewogCQkJRFJNX0RFQlVHX0tNUygiRm91bmQgTUlQSSBhcyBMRlBcbiIpOwogCQkJZGV2 X3ByaXYtPnZidC5oYXNfbWlwaSA9IDE7Ci0JCQlkZXZfcHJpdi0+dmJ0LmRzaS5wb3J0ID0gcF9j aGlsZC0+Y29tbW9uLmR2b19wb3J0OwogCQl9CiAKIAkJY2hpbGRfZGV2X3B0ciA9IGRldl9wcml2 LT52YnQuY2hpbGRfZGV2ICsgY291bnQ7CkBAIC0xNTU1LDMgKzE1NTQsNDEgQEAgYm9vbCBpbnRl bF9iaW9zX2lzX3BvcnRfZWRwKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgZW51 bSBwb3J0IHBvcnQpCiAKIAlyZXR1cm4gZmFsc2U7CiB9CisKKy8qKgorICogaW50ZWxfYmlvc19p c19kc2lfcHJlc2VudCAtIGlzIERTSSBwcmVzZW50IGluIFZCVAorICogQGRldl9wcml2OglpOTE1 IGRldmljZSBpbnN0YW5jZQorICogQHBvcnQ6CXBvcnQgZm9yIERTSSBpZiBwcmVzZW50CisgKgor ICogUmV0dXJuIHRydWUgaWYgRFNJIGlzIHByZXNlbnQsIGFuZCByZXR1cm4gdGhlIHBvcnQgaW4g JXBvcnQuCisgKi8KK2Jvb2wgaW50ZWxfYmlvc19pc19kc2lfcHJlc2VudChzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCisJCQkgICAgICAgZW51bSBwb3J0ICpwb3J0KQoreworCXVu aW9uIGNoaWxkX2RldmljZV9jb25maWcgKnBfY2hpbGQ7CisJdTggZHZvX3BvcnQ7CisJaW50IGk7 CisKKwlmb3IgKGkgPSAwOyBpIDwgZGV2X3ByaXYtPnZidC5jaGlsZF9kZXZfbnVtOyBpKyspIHsK KwkJcF9jaGlsZCA9IGRldl9wcml2LT52YnQuY2hpbGRfZGV2ICsgaTsKKworCQlpZiAoIShwX2No aWxkLT5jb21tb24uZGV2aWNlX3R5cGUgJiBERVZJQ0VfVFlQRV9NSVBJX09VVFBVVCkpCisJCQlj b250aW51ZTsKKworCQlkdm9fcG9ydCA9IHBfY2hpbGQtPmNvbW1vbi5kdm9fcG9ydDsKKworCQlz d2l0Y2ggKGR2b19wb3J0KSB7CisJCWNhc2UgRFZPX1BPUlRfTUlQSUE6CisJCWNhc2UgRFZPX1BP UlRfTUlQSUM6CisJCQkqcG9ydCA9IGR2b19wb3J0IC0gRFZPX1BPUlRfTUlQSUE7CisJCQlyZXR1 cm4gdHJ1ZTsKKwkJY2FzZSBEVk9fUE9SVF9NSVBJQjoKKwkJY2FzZSBEVk9fUE9SVF9NSVBJRDoK KwkJCURSTV9ERUJVR19LTVMoIlZCVCBoYXMgdW5zdXBwb3J0ZWQgRFNJIHBvcnQgJWNcbiIsCisJ CQkJICAgICAgcG9ydF9uYW1lKGR2b19wb3J0IC0gRFZPX1BPUlRfTUlQSUEpKTsKKwkJCWJyZWFr OworCQl9CisJfQorCisJcmV0dXJuIGZhbHNlOworfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZHNpLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kc2kuYwpp bmRleCAzNzhmODc5ZjQwMTUuLjE4NWVjNWExM2NmNiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZHNpLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHNp LmMKQEAgLTExMTIsNyArMTExMiw3IEBAIHZvaWQgaW50ZWxfZHNpX2luaXQoc3RydWN0IGRybV9k ZXZpY2UgKmRldikKIAlEUk1fREVCVUdfS01TKCJcbiIpOwogCiAJLyogVGhlcmUgaXMgbm8gZGV0 ZWN0aW9uIG1ldGhvZCBmb3IgTUlQSSBzbyByZWx5IG9uIFZCVCAqLwotCWlmICghZGV2X3ByaXYt PnZidC5oYXNfbWlwaSkKKwlpZiAoIWludGVsX2Jpb3NfaXNfZHNpX3ByZXNlbnQoZGV2X3ByaXYs ICZwb3J0KSkKIAkJcmV0dXJuOwogCiAJaWYgKElTX1ZBTExFWVZJRVcoZGV2KSB8fCBJU19DSEVS UllWSUVXKGRldikpIHsKQEAgLTExNTMsMTYgKzExNTMsMTUgQEAgdm9pZCBpbnRlbF9kc2lfaW5p dChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWludGVsX2Nvbm5lY3Rvci0+dW5yZWdpc3RlciA9 IGludGVsX2Nvbm5lY3Rvcl91bnJlZ2lzdGVyOwogCiAJLyogUGlwZSBBIG1hcHMgdG8gTUlQSSBE U0kgcG9ydCBBLCBwaXBlIEIgbWFwcyB0byBNSVBJIERTSSBwb3J0IEMgKi8KLQlpZiAoZGV2X3By aXYtPnZidC5kc2kucG9ydCA9PSBEVk9fUE9SVF9NSVBJQSkgewotCQlpbnRlbF9lbmNvZGVyLT5j cnRjX21hc2sgPSAoMSA8PCBQSVBFX0EpOwotCQlpbnRlbF9kc2ktPnBvcnRzID0gKDEgPDwgUE9S VF9BKTsKLQl9IGVsc2UgaWYgKGRldl9wcml2LT52YnQuZHNpLnBvcnQgPT0gRFZPX1BPUlRfTUlQ SUMpIHsKLQkJaW50ZWxfZW5jb2Rlci0+Y3J0Y19tYXNrID0gKDEgPDwgUElQRV9CKTsKLQkJaW50 ZWxfZHNpLT5wb3J0cyA9ICgxIDw8IFBPUlRfQyk7Ci0JfQorCWlmIChwb3J0ID09IFBPUlRfQSkK KwkJaW50ZWxfZW5jb2Rlci0+Y3J0Y19tYXNrID0gMSA8PCBQSVBFX0E7CisJZWxzZQorCQlpbnRl bF9lbmNvZGVyLT5jcnRjX21hc2sgPSAxIDw8IFBJUEVfQjsKIAogCWlmIChkZXZfcHJpdi0+dmJ0 LmRzaS5jb25maWctPmR1YWxfbGluaykKLQkJaW50ZWxfZHNpLT5wb3J0cyA9ICgoMSA8PCBQT1JU X0EpIHwgKDEgPDwgUE9SVF9DKSk7CisJCWludGVsX2RzaS0+cG9ydHMgPSAoMSA8PCBQT1JUX0Ep IHwgKDEgPDwgUE9SVF9DKTsKKwllbHNlCisJCWludGVsX2RzaS0+cG9ydHMgPSAxIDw8IHBvcnQ7 CiAKIAkvKiBDcmVhdGUgYSBEU0kgaG9zdCAoYW5kIGEgZGV2aWNlKSBmb3IgZWFjaCBwb3J0LiAq LwogCWZvcl9lYWNoX2RzaV9wb3J0KHBvcnQsIGludGVsX2RzaS0+cG9ydHMpIHsKLS0gCjIuMS40 CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1n ZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK