From: Ville Syrjala Subject: [PATCH 1/2] drm/i915/sdvo: Fix multi function encoder stuff Date: Mon, 17 Sep 2018 18:15:03 +0300 Message-ID: <20180917151504.8754-1-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8F6D76E2A3 for ; Mon, 17 Sep 2018 15:15:21 +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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClNE Vk8gZW5jb2RlcnMgY2FuIGhhdmUgbXVsdGlwbGUgZGlmZmVyZW50IHR5cGVzIG9mIG91dHB1dHMg aGFuZ2luZyBvZmYKdGhlbS4gQ3VycmVudGx5IHRoZSBjb2RlIHRyaWVzIHRvIG11Y2sgYXJvdW5k IHdpdGggdmFyaW91cyBpc19mb28KZmxhZ3MgaW4gdGhlIGVuY29kZXIgdG8gZmlndXJlIG91dCB3 aGljaCB0eXBlIGl0cyBkcml2aW5nLiBUaGF0IGRvZXNuJ3QKd29yayB3aXRoIGF0b21pYyBhbmQg b3RoZXIgc3R1ZmYsIHNvIGxldCdzIG51a2UgdGhvc2UgZmxhZ3MgYW5kIGp1c3QKbG9vayBhdCB3 aGljaCB0eXBlIG9mIGNvbm5lY3RvciB3ZSdyZSBhY3R1YWxseSBkZWFsaW5nIHdpdGguCgpUaGUg aXNfaGRtaSB3ZSdsbCBuZWVkIGFzIHRoYXQncyBub3QgZGlzY292ZXJhYmxlIHZpYSB0aGUgb3V0 cHV0IGZsYWdzLApidXQgd2UnbGwganVzdCBtb3ZlIGl0IHVuZGVyIHRoZSBjb25uZWN0b3IuCgpX ZSdsbCBhbHNvIG1vdmUgdGhlIHNkdm8gZml4ZWQgbW9kZSBoYW5kbGluZyBvdXQgZnJvbSB0aGUg LmdldF9tb2RlcygpCmhvb2sgaW50byB0aGUgc2R2byBsdmRzIGluaXQgZnVuY3Rpb24gc28gdGhh dCB3ZSBjYW4gYmFpbCBvdXQgcHJvcGVybHkKaWYgdGhlcmUgaXMgbm8gZml4ZWQgbW9kZSB0byBi ZSBmb3VuZC4KClNpZ25lZC1vZmYtYnk6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBs aW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc2R2by5jIHwg MTAxICsrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdl ZCwgNDQgaW5zZXJ0aW9ucygrKSwgNTcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfc2R2by5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf c2R2by5jCmluZGV4IDgxMmZlN2IwNmY4Ny4uNzAxMzcyZTUxMmE4IDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zZHZvLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfc2R2by5jCkBAIC05OSwzMSArOTksMTIgQEAgc3RydWN0IGludGVsX3Nkdm8gewogCSAq LwogCXVpbnQxNl90IGhvdHBsdWdfYWN0aXZlOwogCi0JLyoqCi0JICogVGhpcyBpcyBzZXQgaWYg d2UncmUgZ29pbmcgdG8gdHJlYXQgdGhlIGRldmljZSBhcyBUVi1vdXQuCi0JICoKLQkgKiBXaGls ZSB3ZSBoYXZlIHRoZXNlIG5pY2UgZnJpZW5kbHkgZmxhZ3MgZm9yIG91dHB1dCB0eXBlcyB0aGF0 IG91Z2h0Ci0JICogdG8gZGVjaWRlIHRoaXMgZm9yIHVzLCB0aGUgUy1WaWRlbyBvdXRwdXQgb24g b3VyIEhETUkrUy1WaWRlbyBjYXJkCi0JICogc2hvd3MgdXAgYXMgUkdCMSAoVkdBKS4KLQkgKi8K LQlib29sIGlzX3R2OwotCiAJZW51bSBwb3J0IHBvcnQ7CiAKLQkvKioKLQkgKiBUaGlzIGlzIHNl dCBpZiB3ZSB0cmVhdCB0aGUgZGV2aWNlIGFzIEhETUksIGluc3RlYWQgb2YgRFZJLgotCSAqLwot CWJvb2wgaXNfaGRtaTsKIAlib29sIGhhc19oZG1pX21vbml0b3I7CiAJYm9vbCBoYXNfaGRtaV9h dWRpbzsKIAlib29sIHJnYl9xdWFudF9yYW5nZV9zZWxlY3RhYmxlOwogCi0JLyoqCi0JICogVGhp cyBpcyBzZXQgaWYgd2UgZGV0ZWN0IG91dHB1dCBvZiBzZHZvIGRldmljZSBhcyBMVkRTIGFuZAot CSAqIGhhdmUgYSB2YWxpZCBmaXhlZCBtb2RlIHRvIHVzZSB3aXRoIHRoZSBwYW5lbC4KLQkgKi8K LQlib29sIGlzX2x2ZHM7Ci0KIAkvKioKIAkgKiBUaGlzIGlzIHNkdm8gZml4ZWQgcGFubmVsIG1v ZGUgcG9pbnRlcgogCSAqLwpAQCAtMTcyLDYgKzE1MywxMSBAQCBzdHJ1Y3QgaW50ZWxfc2R2b19j b25uZWN0b3IgewogCiAJLyogdGhpcyBpcyB0byBnZXQgdGhlIHJhbmdlIG9mIG1hcmdpbi4qLwog CXUzMiBtYXhfaHNjYW4sIG1heF92c2NhbjsKKworCS8qKgorCSAqIFRoaXMgaXMgc2V0IGlmIHdl IHRyZWF0IHRoZSBkZXZpY2UgYXMgSERNSSwgaW5zdGVhZCBvZiBEVkkuCisJICovCisJYm9vbCBp c19oZG1pOwogfTsKIAogc3RydWN0IGludGVsX3Nkdm9fY29ubmVjdG9yX3N0YXRlIHsKQEAgLTc2 Niw2ICs3NTIsNyBAQCBzdGF0aWMgYm9vbCBpbnRlbF9zZHZvX2dldF9pbnB1dF90aW1pbmcoc3Ry dWN0IGludGVsX3Nkdm8gKmludGVsX3Nkdm8sCiAKIHN0YXRpYyBib29sCiBpbnRlbF9zZHZvX2Ny ZWF0ZV9wcmVmZXJyZWRfaW5wdXRfdGltaW5nKHN0cnVjdCBpbnRlbF9zZHZvICppbnRlbF9zZHZv LAorCQkJCQkgc3RydWN0IGludGVsX3Nkdm9fY29ubmVjdG9yICppbnRlbF9zZHZvX2Nvbm5lY3Rv ciwKIAkJCQkJIHVpbnQxNl90IGNsb2NrLAogCQkJCQkgdWludDE2X3Qgd2lkdGgsCiAJCQkJCSB1 aW50MTZfdCBoZWlnaHQpCkBAIC03NzgsNyArNzY1LDcgQEAgaW50ZWxfc2R2b19jcmVhdGVfcHJl ZmVycmVkX2lucHV0X3RpbWluZyhzdHJ1Y3QgaW50ZWxfc2R2byAqaW50ZWxfc2R2bywKIAlhcmdz LmhlaWdodCA9IGhlaWdodDsKIAlhcmdzLmludGVybGFjZSA9IDA7CiAKLQlpZiAoaW50ZWxfc2R2 by0+aXNfbHZkcyAmJgorCWlmIChJU19MVkRTKGludGVsX3Nkdm9fY29ubmVjdG9yKSAmJgogCSAg IChpbnRlbF9zZHZvLT5zZHZvX2x2ZHNfZml4ZWRfbW9kZS0+aGRpc3BsYXkgIT0gd2lkdGggfHwK IAkgICAgaW50ZWxfc2R2by0+c2R2b19sdmRzX2ZpeGVkX21vZGUtPnZkaXNwbGF5ICE9IGhlaWdo dCkpCiAJCWFyZ3Muc2NhbGVkID0gMTsKQEAgLTEwNjcsNiArMTA1NCw3IEBAIGludGVsX3Nkdm9f c2V0X291dHB1dF90aW1pbmdzX2Zyb21fbW9kZShzdHJ1Y3QgaW50ZWxfc2R2byAqaW50ZWxfc2R2 bywKICAqLwogc3RhdGljIGJvb2wKIGludGVsX3Nkdm9fZ2V0X3ByZWZlcnJlZF9pbnB1dF9tb2Rl KHN0cnVjdCBpbnRlbF9zZHZvICppbnRlbF9zZHZvLAorCQkJCSAgICBzdHJ1Y3QgaW50ZWxfc2R2 b19jb25uZWN0b3IgKmludGVsX3Nkdm9fY29ubmVjdG9yLAogCQkJCSAgICBjb25zdCBzdHJ1Y3Qg ZHJtX2Rpc3BsYXlfbW9kZSAqbW9kZSwKIAkJCQkgICAgc3RydWN0IGRybV9kaXNwbGF5X21vZGUg KmFkanVzdGVkX21vZGUpCiB7CkBAIC0xMDc3LDYgKzEwNjUsNyBAQCBpbnRlbF9zZHZvX2dldF9w cmVmZXJyZWRfaW5wdXRfbW9kZShzdHJ1Y3QgaW50ZWxfc2R2byAqaW50ZWxfc2R2bywKIAkJcmV0 dXJuIGZhbHNlOwogCiAJaWYgKCFpbnRlbF9zZHZvX2NyZWF0ZV9wcmVmZXJyZWRfaW5wdXRfdGlt aW5nKGludGVsX3Nkdm8sCisJCQkJCQkgICAgICBpbnRlbF9zZHZvX2Nvbm5lY3RvciwKIAkJCQkJ CSAgICAgIG1vZGUtPmNsb2NrIC8gMTAsCiAJCQkJCQkgICAgICBtb2RlLT5oZGlzcGxheSwKIAkJ CQkJCSAgICAgIG1vZGUtPnZkaXNwbGF5KSkKQEAgLTExMjcsNiArMTExNiw4IEBAIHN0YXRpYyBi b29sIGludGVsX3Nkdm9fY29tcHV0ZV9jb25maWcoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29k ZXIsCiAJc3RydWN0IGludGVsX3Nkdm8gKmludGVsX3Nkdm8gPSB0b19zZHZvKGVuY29kZXIpOwog CXN0cnVjdCBpbnRlbF9zZHZvX2Nvbm5lY3Rvcl9zdGF0ZSAqaW50ZWxfc2R2b19zdGF0ZSA9CiAJ CXRvX2ludGVsX3Nkdm9fY29ubmVjdG9yX3N0YXRlKGNvbm5fc3RhdGUpOworCXN0cnVjdCBpbnRl bF9zZHZvX2Nvbm5lY3RvciAqaW50ZWxfc2R2b19jb25uZWN0b3IgPQorCQl0b19pbnRlbF9zZHZv X2Nvbm5lY3Rvcihjb25uX3N0YXRlLT5jb25uZWN0b3IpOwogCXN0cnVjdCBkcm1fZGlzcGxheV9t b2RlICphZGp1c3RlZF9tb2RlID0gJnBpcGVfY29uZmlnLT5iYXNlLmFkanVzdGVkX21vZGU7CiAJ c3RydWN0IGRybV9kaXNwbGF5X21vZGUgKm1vZGUgPSAmcGlwZV9jb25maWctPmJhc2UubW9kZTsK IApAQCAtMTE0MiwyMCArMTEzMywyMiBAQCBzdGF0aWMgYm9vbCBpbnRlbF9zZHZvX2NvbXB1dGVf Y29uZmlnKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAogCSAqIHRpbWluZ3MsIGV2ZW4g dGhvdWdoIHRoaXMgaXNuJ3QgcmVhbGx5IHRoZSByaWdodCBwbGFjZSBpbgogCSAqIHRoZSBzZXF1 ZW5jZSB0byBkbyBpdC4gT2ggd2VsbC4KIAkgKi8KLQlpZiAoaW50ZWxfc2R2by0+aXNfdHYpIHsK KwlpZiAoSVNfVFYoaW50ZWxfc2R2b19jb25uZWN0b3IpKSB7CiAJCWlmICghaW50ZWxfc2R2b19z ZXRfb3V0cHV0X3RpbWluZ3NfZnJvbV9tb2RlKGludGVsX3Nkdm8sIG1vZGUpKQogCQkJcmV0dXJu IGZhbHNlOwogCiAJCSh2b2lkKSBpbnRlbF9zZHZvX2dldF9wcmVmZXJyZWRfaW5wdXRfbW9kZShp bnRlbF9zZHZvLAorCQkJCQkJCSAgIGludGVsX3Nkdm9fY29ubmVjdG9yLAogCQkJCQkJCSAgIG1v ZGUsCiAJCQkJCQkJICAgYWRqdXN0ZWRfbW9kZSk7CiAJCXBpcGVfY29uZmlnLT5zZHZvX3R2X2Ns b2NrID0gdHJ1ZTsKLQl9IGVsc2UgaWYgKGludGVsX3Nkdm8tPmlzX2x2ZHMpIHsKKwl9IGVsc2Ug aWYgKElTX0xWRFMoaW50ZWxfc2R2b19jb25uZWN0b3IpKSB7CiAJCWlmICghaW50ZWxfc2R2b19z ZXRfb3V0cHV0X3RpbWluZ3NfZnJvbV9tb2RlKGludGVsX3Nkdm8sCiAJCQkJCQkJICAgICBpbnRl bF9zZHZvLT5zZHZvX2x2ZHNfZml4ZWRfbW9kZSkpCiAJCQlyZXR1cm4gZmFsc2U7CiAKIAkJKHZv aWQpIGludGVsX3Nkdm9fZ2V0X3ByZWZlcnJlZF9pbnB1dF9tb2RlKGludGVsX3Nkdm8sCisJCQkJ CQkJICAgaW50ZWxfc2R2b19jb25uZWN0b3IsCiAJCQkJCQkJICAgbW9kZSwKIAkJCQkJCQkgICBh ZGp1c3RlZF9tb2RlKTsKIAl9CkBAIC0xMTk0LDExICsxMTg3LDExIEBAIHN0YXRpYyBib29sIGlu dGVsX3Nkdm9fY29tcHV0ZV9jb25maWcoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCiAJ fQogCiAJLyogQ2xvY2sgY29tcHV0YXRpb24gbmVlZHMgdG8gaGFwcGVuIGFmdGVyIHBpeGVsIG11 bHRpcGxpZXIuICovCi0JaWYgKGludGVsX3Nkdm8tPmlzX3R2KQorCWlmIChJU19UVihpbnRlbF9z ZHZvX2Nvbm5lY3RvcikpCiAJCWk5eHhfYWRqdXN0X3Nkdm9fdHZfY2xvY2socGlwZV9jb25maWcp OwogCiAJLyogU2V0IHVzZXIgc2VsZWN0ZWQgUEFSIHRvIGluY29taW5nIG1vZGUncyBtZW1iZXIg Ki8KLQlpZiAoaW50ZWxfc2R2by0+aXNfaGRtaSkKKwlpZiAoaW50ZWxfc2R2b19jb25uZWN0b3It PmlzX2hkbWkpCiAJCWFkanVzdGVkX21vZGUtPnBpY3R1cmVfYXNwZWN0X3JhdGlvID0gY29ubl9z dGF0ZS0+cGljdHVyZV9hc3BlY3RfcmF0aW87CiAKIAlyZXR1cm4gdHJ1ZTsKQEAgLTEyNzUsNiAr MTI2OCw4IEBAIHN0YXRpYyB2b2lkIGludGVsX3Nkdm9fcHJlX2VuYWJsZShzdHJ1Y3QgaW50ZWxf ZW5jb2RlciAqaW50ZWxfZW5jb2RlciwKIAljb25zdCBzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAq YWRqdXN0ZWRfbW9kZSA9ICZjcnRjX3N0YXRlLT5iYXNlLmFkanVzdGVkX21vZGU7CiAJY29uc3Qg c3RydWN0IGludGVsX3Nkdm9fY29ubmVjdG9yX3N0YXRlICpzZHZvX3N0YXRlID0KIAkJdG9faW50 ZWxfc2R2b19jb25uZWN0b3Jfc3RhdGUoY29ubl9zdGF0ZSk7CisJY29uc3Qgc3RydWN0IGludGVs X3Nkdm9fY29ubmVjdG9yICppbnRlbF9zZHZvX2Nvbm5lY3RvciA9CisJCXRvX2ludGVsX3Nkdm9f Y29ubmVjdG9yKGNvbm5fc3RhdGUtPmNvbm5lY3Rvcik7CiAJY29uc3Qgc3RydWN0IGRybV9kaXNw bGF5X21vZGUgKm1vZGUgPSAmY3J0Y19zdGF0ZS0+YmFzZS5tb2RlOwogCXN0cnVjdCBpbnRlbF9z ZHZvICppbnRlbF9zZHZvID0gdG9fc2R2byhpbnRlbF9lbmNvZGVyKTsKIAl1MzIgc2R2b3g7CkBA IC0xMzA0LDcgKzEyOTksNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9zZHZvX3ByZV9lbmFibGUoc3Ry dWN0IGludGVsX2VuY29kZXIgKmludGVsX2VuY29kZXIsCiAJCXJldHVybjsKIAogCS8qIGx2ZHMg aGFzIGEgc3BlY2lhbCBmaXhlZCBvdXRwdXQgdGltaW5nLiAqLwotCWlmIChpbnRlbF9zZHZvLT5p c19sdmRzKQorCWlmIChJU19MVkRTKGludGVsX3Nkdm9fY29ubmVjdG9yKSkKIAkJaW50ZWxfc2R2 b19nZXRfZHRkX2Zyb21fbW9kZSgmb3V0cHV0X2R0ZCwKIAkJCQkJICAgICBpbnRlbF9zZHZvLT5z ZHZvX2x2ZHNfZml4ZWRfbW9kZSk7CiAJZWxzZQpAQCAtMTMyNSwxMyArMTMyMCwxMyBAQCBzdGF0 aWMgdm9pZCBpbnRlbF9zZHZvX3ByZV9lbmFibGUoc3RydWN0IGludGVsX2VuY29kZXIgKmludGVs X2VuY29kZXIsCiAJfSBlbHNlCiAJCWludGVsX3Nkdm9fc2V0X2VuY29kZShpbnRlbF9zZHZvLCBT RFZPX0VOQ09ERV9EVkkpOwogCi0JaWYgKGludGVsX3Nkdm8tPmlzX3R2ICYmCisJaWYgKElTX1RW KGludGVsX3Nkdm9fY29ubmVjdG9yKSAmJgogCSAgICAhaW50ZWxfc2R2b19zZXRfdHZfZm9ybWF0 KGludGVsX3Nkdm8sIGNvbm5fc3RhdGUpKQogCQlyZXR1cm47CiAKIAlpbnRlbF9zZHZvX2dldF9k dGRfZnJvbV9tb2RlKCZpbnB1dF9kdGQsIGFkanVzdGVkX21vZGUpOwogCi0JaWYgKGludGVsX3Nk dm8tPmlzX3R2IHx8IGludGVsX3Nkdm8tPmlzX2x2ZHMpCisJaWYgKElTX1RWKGludGVsX3Nkdm9f Y29ubmVjdG9yKSB8fCBJU19MVkRTKGludGVsX3Nkdm9fY29ubmVjdG9yKSkKIAkJaW5wdXRfZHRk LnBhcnQyLnNkdm9fZmxhZ3MgPSBpbnRlbF9zZHZvLT5kdGRfc2R2b19mbGFnczsKIAlpZiAoIWlu dGVsX3Nkdm9fc2V0X2lucHV0X3RpbWluZyhpbnRlbF9zZHZvLCAmaW5wdXRfZHRkKSkKIAkJRFJN X0lORk8oIlNldHRpbmcgaW5wdXQgdGltaW5ncyBvbiAlcyBmYWlsZWRcbiIsCkBAIC0xNjMwLDYg KzE2MjUsOCBAQCBpbnRlbF9zZHZvX21vZGVfdmFsaWQoc3RydWN0IGRybV9jb25uZWN0b3IgKmNv bm5lY3RvciwKIAkJICAgICAgc3RydWN0IGRybV9kaXNwbGF5X21vZGUgKm1vZGUpCiB7CiAJc3Ry dWN0IGludGVsX3Nkdm8gKmludGVsX3Nkdm8gPSBpbnRlbF9hdHRhY2hlZF9zZHZvKGNvbm5lY3Rv cik7CisJc3RydWN0IGludGVsX3Nkdm9fY29ubmVjdG9yICppbnRlbF9zZHZvX2Nvbm5lY3RvciA9 CisJCXRvX2ludGVsX3Nkdm9fY29ubmVjdG9yKGNvbm5lY3Rvcik7CiAJaW50IG1heF9kb3RjbGsg PSB0b19pOTE1KGNvbm5lY3Rvci0+ZGV2KS0+bWF4X2RvdGNsa19mcmVxOwogCiAJaWYgKG1vZGUt PmZsYWdzICYgRFJNX01PREVfRkxBR19EQkxTQ0FOKQpAQCAtMTY0NCw3ICsxNjQxLDcgQEAgaW50 ZWxfc2R2b19tb2RlX3ZhbGlkKHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IsCiAJaWYg KG1vZGUtPmNsb2NrID4gbWF4X2RvdGNsaykKIAkJcmV0dXJuIE1PREVfQ0xPQ0tfSElHSDsKIAot CWlmIChpbnRlbF9zZHZvLT5pc19sdmRzKSB7CisJaWYgKElTX0xWRFMoaW50ZWxfc2R2b19jb25u ZWN0b3IpKSB7CiAJCWlmIChtb2RlLT5oZGlzcGxheSA+IGludGVsX3Nkdm8tPnNkdm9fbHZkc19m aXhlZF9tb2RlLT5oZGlzcGxheSkKIAkJCXJldHVybiBNT0RFX1BBTkVMOwogCkBAIC0xNzU5LDYg KzE3NTYsOCBAQCBzdGF0aWMgZW51bSBkcm1fY29ubmVjdG9yX3N0YXR1cwogaW50ZWxfc2R2b190 bWRzX3NpbmtfZGV0ZWN0KHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IpCiB7CiAJc3Ry dWN0IGludGVsX3Nkdm8gKmludGVsX3Nkdm8gPSBpbnRlbF9hdHRhY2hlZF9zZHZvKGNvbm5lY3Rv cik7CisJc3RydWN0IGludGVsX3Nkdm9fY29ubmVjdG9yICppbnRlbF9zZHZvX2Nvbm5lY3RvciA9 CisJCXRvX2ludGVsX3Nkdm9fY29ubmVjdG9yKGNvbm5lY3Rvcik7CiAJZW51bSBkcm1fY29ubmVj dG9yX3N0YXR1cyBzdGF0dXM7CiAJc3RydWN0IGVkaWQgKmVkaWQ7CiAKQEAgLTE3OTcsNyArMTc5 Niw3IEBAIGludGVsX3Nkdm9fdG1kc19zaW5rX2RldGVjdChzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAq Y29ubmVjdG9yKQogCQkvKiBEREMgYnVzIGlzIHNoYXJlZCwgbWF0Y2ggRURJRCB0byBjb25uZWN0 b3IgdHlwZSAqLwogCQlpZiAoZWRpZC0+aW5wdXQgJiBEUk1fRURJRF9JTlBVVF9ESUdJVEFMKSB7 CiAJCQlzdGF0dXMgPSBjb25uZWN0b3Jfc3RhdHVzX2Nvbm5lY3RlZDsKLQkJCWlmIChpbnRlbF9z ZHZvLT5pc19oZG1pKSB7CisJCQlpZiAoaW50ZWxfc2R2b19jb25uZWN0b3ItPmlzX2hkbWkpIHsK IAkJCQlpbnRlbF9zZHZvLT5oYXNfaGRtaV9tb25pdG9yID0gZHJtX2RldGVjdF9oZG1pX21vbml0 b3IoZWRpZCk7CiAJCQkJaW50ZWxfc2R2by0+aGFzX2hkbWlfYXVkaW8gPSBkcm1fZGV0ZWN0X21v bml0b3JfYXVkaW8oZWRpZCk7CiAJCQkJaW50ZWxfc2R2by0+cmdiX3F1YW50X3JhbmdlX3NlbGVj dGFibGUgPQpAQCAtMTg3NSwxNyArMTg3NCw2IEBAIGludGVsX3Nkdm9fZGV0ZWN0KHN0cnVjdCBk cm1fY29ubmVjdG9yICpjb25uZWN0b3IsIGJvb2wgZm9yY2UpCiAJCQlyZXQgPSBjb25uZWN0b3Jf c3RhdHVzX2Nvbm5lY3RlZDsKIAl9CiAKLQkvKiBNYXkgdXBkYXRlIGVuY29kZXIgZmxhZyBmb3Ig bGlrZSBjbG9jayBmb3IgU0RWTyBUViwgZXRjLiovCi0JaWYgKHJldCA9PSBjb25uZWN0b3Jfc3Rh dHVzX2Nvbm5lY3RlZCkgewotCQlpbnRlbF9zZHZvLT5pc190diA9IGZhbHNlOwotCQlpbnRlbF9z ZHZvLT5pc19sdmRzID0gZmFsc2U7Ci0KLQkJaWYgKHJlc3BvbnNlICYgU0RWT19UVl9NQVNLKQot CQkJaW50ZWxfc2R2by0+aXNfdHYgPSB0cnVlOwotCQlpZiAocmVzcG9uc2UgJiBTRFZPX0xWRFNf TUFTSykKLQkJCWludGVsX3Nkdm8tPmlzX2x2ZHMgPSBpbnRlbF9zZHZvLT5zZHZvX2x2ZHNfZml4 ZWRfbW9kZSAhPSBOVUxMOwotCX0KLQogCXJldHVybiByZXQ7CiB9CiAKQEAgLTIwNTQsMTYgKzIw NDIsNiBAQCBzdGF0aWMgdm9pZCBpbnRlbF9zZHZvX2dldF9sdmRzX21vZGVzKHN0cnVjdCBkcm1f Y29ubmVjdG9yICpjb25uZWN0b3IpCiAJICogYXJyYW5nZWQgaW4gcHJpb3JpdHkgb3JkZXIuCiAJ ICovCiAJaW50ZWxfZGRjX2dldF9tb2Rlcyhjb25uZWN0b3IsICZpbnRlbF9zZHZvLT5kZGMpOwot Ci0JbGlzdF9mb3JfZWFjaF9lbnRyeShuZXdtb2RlLCAmY29ubmVjdG9yLT5wcm9iZWRfbW9kZXMs IGhlYWQpIHsKLQkJaWYgKG5ld21vZGUtPnR5cGUgJiBEUk1fTU9ERV9UWVBFX1BSRUZFUlJFRCkg ewotCQkJaW50ZWxfc2R2by0+c2R2b19sdmRzX2ZpeGVkX21vZGUgPQotCQkJCWRybV9tb2RlX2R1 cGxpY2F0ZShjb25uZWN0b3ItPmRldiwgbmV3bW9kZSk7Ci0KLQkJCWludGVsX3Nkdm8tPmlzX2x2 ZHMgPSB0cnVlOwotCQkJYnJlYWs7Ci0JCX0KLQl9CiB9CiAKIHN0YXRpYyBpbnQgaW50ZWxfc2R2 b19nZXRfbW9kZXMoc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvcikKQEAgLTI1NTUsNyAr MjUzMyw3IEBAIGludGVsX3Nkdm9fZHZpX2luaXQoc3RydWN0IGludGVsX3Nkdm8gKmludGVsX3Nk dm8sIGludCBkZXZpY2UpCiAJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gNCAmJgogCSAgICBp bnRlbF9zZHZvX2lzX2hkbWlfY29ubmVjdG9yKGludGVsX3Nkdm8sIGRldmljZSkpIHsKIAkJY29u bmVjdG9yLT5jb25uZWN0b3JfdHlwZSA9IERSTV9NT0RFX0NPTk5FQ1RPUl9IRE1JQTsKLQkJaW50 ZWxfc2R2by0+aXNfaGRtaSA9IHRydWU7CisJCWludGVsX3Nkdm9fY29ubmVjdG9yLT5pc19oZG1p ID0gdHJ1ZTsKIAl9CiAKIAlpZiAoaW50ZWxfc2R2b19jb25uZWN0b3JfaW5pdChpbnRlbF9zZHZv X2Nvbm5lY3RvciwgaW50ZWxfc2R2bykgPCAwKSB7CkBAIC0yNTYzLDcgKzI1NDEsNyBAQCBpbnRl bF9zZHZvX2R2aV9pbml0KHN0cnVjdCBpbnRlbF9zZHZvICppbnRlbF9zZHZvLCBpbnQgZGV2aWNl KQogCQlyZXR1cm4gZmFsc2U7CiAJfQogCi0JaWYgKGludGVsX3Nkdm8tPmlzX2hkbWkpCisJaWYg KGludGVsX3Nkdm9fY29ubmVjdG9yLT5pc19oZG1pKQogCQlpbnRlbF9zZHZvX2FkZF9oZG1pX3By b3BlcnRpZXMoaW50ZWxfc2R2bywgaW50ZWxfc2R2b19jb25uZWN0b3IpOwogCiAJcmV0dXJuIHRy dWU7CkBAIC0yNTkxLDggKzI1NjksNiBAQCBpbnRlbF9zZHZvX3R2X2luaXQoc3RydWN0IGludGVs X3Nkdm8gKmludGVsX3Nkdm8sIGludCB0eXBlKQogCWludGVsX3Nkdm8tPmNvbnRyb2xsZWRfb3V0 cHV0IHw9IHR5cGU7CiAJaW50ZWxfc2R2b19jb25uZWN0b3ItPm91dHB1dF9mbGFnID0gdHlwZTsK IAotCWludGVsX3Nkdm8tPmlzX3R2ID0gdHJ1ZTsKLQogCWlmIChpbnRlbF9zZHZvX2Nvbm5lY3Rv cl9pbml0KGludGVsX3Nkdm9fY29ubmVjdG9yLCBpbnRlbF9zZHZvKSA8IDApIHsKIAkJa2ZyZWUo aW50ZWxfc2R2b19jb25uZWN0b3IpOwogCQlyZXR1cm4gZmFsc2U7CkBAIC0yNjU0LDYgKzI2MzAs NyBAQCBpbnRlbF9zZHZvX2x2ZHNfaW5pdChzdHJ1Y3QgaW50ZWxfc2R2byAqaW50ZWxfc2R2bywg aW50IGRldmljZSkKIAlzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yOwogCXN0cnVjdCBp bnRlbF9jb25uZWN0b3IgKmludGVsX2Nvbm5lY3RvcjsKIAlzdHJ1Y3QgaW50ZWxfc2R2b19jb25u ZWN0b3IgKmludGVsX3Nkdm9fY29ubmVjdG9yOworCXN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICpt b2RlOwogCiAJRFJNX0RFQlVHX0tNUygiaW5pdGlhbGlzaW5nIExWRFMgZGV2aWNlICVkXG4iLCBk ZXZpY2UpOwogCkBAIC0yNjgyLDYgKzI2NTksMTkgQEAgaW50ZWxfc2R2b19sdmRzX2luaXQoc3Ry dWN0IGludGVsX3Nkdm8gKmludGVsX3Nkdm8sIGludCBkZXZpY2UpCiAJaWYgKCFpbnRlbF9zZHZv X2NyZWF0ZV9lbmhhbmNlX3Byb3BlcnR5KGludGVsX3Nkdm8sIGludGVsX3Nkdm9fY29ubmVjdG9y KSkKIAkJZ290byBlcnI7CiAKKwlpbnRlbF9zZHZvX2dldF9sdmRzX21vZGVzKGNvbm5lY3Rvcik7 CisKKwlsaXN0X2Zvcl9lYWNoX2VudHJ5KG1vZGUsICZjb25uZWN0b3ItPnByb2JlZF9tb2Rlcywg aGVhZCkgeworCQlpZiAobW9kZS0+dHlwZSAmIERSTV9NT0RFX1RZUEVfUFJFRkVSUkVEKSB7CisJ CQlpbnRlbF9zZHZvLT5zZHZvX2x2ZHNfZml4ZWRfbW9kZSA9CisJCQkJZHJtX21vZGVfZHVwbGlj YXRlKGNvbm5lY3Rvci0+ZGV2LCBtb2RlKTsKKwkJCWJyZWFrOworCQl9CisJfQorCisJaWYgKCFp bnRlbF9zZHZvLT5zZHZvX2x2ZHNfZml4ZWRfbW9kZSkKKwkJZ290byBlcnI7CisKIAlyZXR1cm4g dHJ1ZTsKIAogZXJyOgpAQCAtMjY5Miw5ICsyNjgyLDYgQEAgaW50ZWxfc2R2b19sdmRzX2luaXQo c3RydWN0IGludGVsX3Nkdm8gKmludGVsX3Nkdm8sIGludCBkZXZpY2UpCiBzdGF0aWMgYm9vbAog aW50ZWxfc2R2b19vdXRwdXRfc2V0dXAoc3RydWN0IGludGVsX3Nkdm8gKmludGVsX3Nkdm8sIHVp bnQxNl90IGZsYWdzKQogewotCWludGVsX3Nkdm8tPmlzX3R2ID0gZmFsc2U7Ci0JaW50ZWxfc2R2 by0+aXNfbHZkcyA9IGZhbHNlOwotCiAJLyogU0RWTyByZXF1aXJlcyBYWFgxIGZ1bmN0aW9uIG1h eSBub3QgZXhpc3QgdW5sZXNzIGl0IGhhcyBYWFgwIGZ1bmN0aW9uLiovCiAKIAlpZiAoZmxhZ3Mg JiBTRFZPX09VVFBVVF9UTURTMCkKLS0gCjIuMTYuNAoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==