From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH 3/7] drm/i915: Convert pineview watermarks to atomic, v2. Date: Mon, 7 Aug 2017 12:48:24 +0200 Message-ID: <20170807104828.21046-4-maarten.lankhorst@linux.intel.com> References: <20170807104828.21046-1-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mblankhorst.nl (mblankhorst.nl [IPv6:2a02:2308::216:3eff:fe92:dfa3]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4C14E6E3E0 for ; Mon, 7 Aug 2017 10:48:41 +0000 (UTC) In-Reply-To: <20170807104828.21046-1-maarten.lankhorst@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 List-Id: intel-gfx@lists.freedesktop.org UGluZXZpZXcgc2VlbXMgdG8gaGF2ZSBkaWZmZXJlbnQgd2F0ZXJtYXJrcyBmcm9tIHRoZSBvdGhl cgpwbGF0Zm9ybXMgYW5kIGFyZSBjYWxjdWxhdGVkIHNlcGFyYXRlbHkuCgpXaXRoIHRoZSBjaGFu Z2UgdG8gYXRvbWljLCBjeHNyIGlzIGF1dG9tYXRpY2FsbHkgZGlzYWJsZWQgZm9yCmludGVybWVk aWF0ZSB3YXRlcm1hcmtzIHdoZW4gcmVxdWlyZWQuIFRoaXMgd2lsbCBmaXgKZmQub3JnIGJ1ZyAj MTAxNTk3IGFzIGEgbmljZSBzaWRlIGVmZmVjdC4KCkNoYW5nZXMgc2luY2UgdjE6Ci0gRml4IGRl YWRsb2NrIGluIHBudl9wcm9ncmFtX3dhdGVybWFya3MuCi0gQWRkIGxpbmsgdG8gYnVnIDEwMTU5 NwoKU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxp bnV4LmludGVsLmNvbT4KQnVnemlsbGE6IGh0dHBzOi8vYnVncy5mcmVlZGVza3RvcC5vcmcvc2hv d19idWcuY2dpP2lkPTEwMTU5NwotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5o IHwgICAzICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jICB8IDEzOCArKysrKysr KysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgOTQgaW5z ZXJ0aW9ucygrKSwgNDcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRl eCAxNzYyNzRkOTllZTYuLmQwZjE3MDRlMWExNyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgK QEAgLTU1Myw3ICs1NTMsOCBAQCBzdHJ1Y3QgaTl4eF93bV9zdGF0ZSB7CiAKIAlzdHJ1Y3Qgewog CQl1aW50MTZfdCBwbGFuZTsKLQl9IHNyOworCQl1aW50MTZfdCBjdXJzb3I7CisJfSBzciwgaHBs bDsKIH07CiAKIHN0cnVjdCBpbnRlbF9jcnRjX3dtX3N0YXRlIHsKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9w bS5jCmluZGV4IDA4ZmQzNTkzMDdlNi4uN2VjZjM5ODE1YWI1IDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3BtLmMKQEAgLTgzMCwxMyArODMwLDE3IEBAIHN0YXRpYyBzdHJ1Y3QgaW50ZWxfY3J0YyAqc2lu Z2xlX2VuYWJsZWRfY3J0YyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJcmV0 dXJuIGVuYWJsZWQ7CiB9CiAKLXN0YXRpYyB2b2lkIHBpbmV2aWV3X3VwZGF0ZV93bShzdHJ1Y3Qg aW50ZWxfY3J0YyAqdW51c2VkX2NydGMpCitzdGF0aWMgaW50IHBudl9jb21wdXRlX3BpcGVfd20o c3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCiB7Ci0Jc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNSh1bnVzZWRfY3J0Yy0+YmFzZS5kZXYpOwotCXN0 cnVjdCBpbnRlbF9jcnRjICpjcnRjOworCXN0cnVjdCBpbnRlbF9jcnRjICpjcnRjID0gdG9faW50 ZWxfY3J0YyhjcnRjX3N0YXRlLT5iYXNlLmNydGMpOworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiA9IHRvX2k5MTUoY3J0Yy0+YmFzZS5kZXYpOworCXN0cnVjdCBpOXh4X3dtX3N0 YXRlICp3bV9zdGF0ZSA9ICZjcnRjX3N0YXRlLT53bS5pOXh4Lm9wdGltYWw7CisJc3RydWN0IGlu dGVsX3BsYW5lICpwbGFuZSA9IHRvX2ludGVsX3BsYW5lKGNydGMtPmJhc2UucHJpbWFyeSk7CisJ c3RydWN0IGludGVsX2F0b21pY19zdGF0ZSAqc3RhdGUgPSB0b19pbnRlbF9hdG9taWNfc3RhdGUo Y3J0Y19zdGF0ZS0+YmFzZS5zdGF0ZSk7CisJY29uc3Qgc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAq cHJpbWFyeV9wbGFuZV9zdGF0ZSA9IE5VTEw7CiAJY29uc3Qgc3RydWN0IGN4c3JfbGF0ZW5jeSAq bGF0ZW5jeTsKLQl1MzIgcmVnOwotCXVuc2lnbmVkIGludCB3bTsKKworCW1lbXNldCh3bV9zdGF0 ZSwgMCwgc2l6ZW9mKCp3bV9zdGF0ZSkpOwogCiAJbGF0ZW5jeSA9IGludGVsX2dldF9jeHNyX2xh dGVuY3koSVNfUElORVZJRVdfRyhkZXZfcHJpdiksCiAJCQkJCSBkZXZfcHJpdi0+aXNfZGRyMywK QEAgLTg0NCw2MCArODQ4LDkwIEBAIHN0YXRpYyB2b2lkIHBpbmV2aWV3X3VwZGF0ZV93bShzdHJ1 Y3QgaW50ZWxfY3J0YyAqdW51c2VkX2NydGMpCiAJCQkJCSBkZXZfcHJpdi0+bWVtX2ZyZXEpOwog CWlmICghbGF0ZW5jeSkgewogCQlEUk1fREVCVUdfS01TKCJVbmtub3duIEZTQi9NRU0gZm91bmQs IGRpc2FibGUgQ3hTUlxuIik7Ci0JCWludGVsX3NldF9tZW1vcnlfY3hzcihkZXZfcHJpdiwgZmFs c2UpOwotCQlyZXR1cm47CisKKwkJcmV0dXJuIDA7CiAJfQogCi0JY3J0YyA9IHNpbmdsZV9lbmFi bGVkX2NydGMoZGV2X3ByaXYpOwotCWlmIChjcnRjKSB7Ci0JCWNvbnN0IHN0cnVjdCBkcm1fZGlz cGxheV9tb2RlICphZGp1c3RlZF9tb2RlID0KLQkJCSZjcnRjLT5jb25maWctPmJhc2UuYWRqdXN0 ZWRfbW9kZTsKKwlpZiAoY3J0Y19zdGF0ZS0+YmFzZS5wbGFuZV9tYXNrICYgQklUKGRybV9wbGFu ZV9pbmRleCgmcGxhbmUtPmJhc2UpKSkKKwkJcHJpbWFyeV9wbGFuZV9zdGF0ZSA9IF9fZHJtX2F0 b21pY19nZXRfY3VycmVudF9wbGFuZV9zdGF0ZSgmc3RhdGUtPmJhc2UsICZwbGFuZS0+YmFzZSk7 CisKKwlpZiAocHJpbWFyeV9wbGFuZV9zdGF0ZSkgewogCQljb25zdCBzdHJ1Y3QgZHJtX2ZyYW1l YnVmZmVyICpmYiA9Ci0JCQljcnRjLT5iYXNlLnByaW1hcnktPnN0YXRlLT5mYjsKKwkJCXByaW1h cnlfcGxhbmVfc3RhdGUtPmZiOwogCQlpbnQgY3BwID0gZmItPmZvcm1hdC0+Y3BwWzBdOwotCQlp bnQgY2xvY2sgPSBhZGp1c3RlZF9tb2RlLT5jcnRjX2Nsb2NrOworCQljb25zdCBzdHJ1Y3QgZHJt X2Rpc3BsYXlfbW9kZSAqYWRqdXN0ZWRfbW9kZSA9CisJCQkmY3J0Y19zdGF0ZS0+YmFzZS5hZGp1 c3RlZF9tb2RlOworCQl1bnNpZ25lZCBhY3RpdmVfY3J0Y3M7CisKKwkJaWYgKHN0YXRlLT5tb2Rl c2V0KQorCQkJYWN0aXZlX2NydGNzID0gc3RhdGUtPmFjdGl2ZV9jcnRjczsKKwkJZWxzZQorCQkJ YWN0aXZlX2NydGNzID0gZGV2X3ByaXYtPmFjdGl2ZV9jcnRjczsKKworCQl3bV9zdGF0ZS0+Y3hz ciA9IGFjdGl2ZV9jcnRjcyA9PSBkcm1fY3J0Y19tYXNrKCZjcnRjLT5iYXNlKTsKKworCQl3bV9z dGF0ZS0+c3IucGxhbmUgPSBpbnRlbF9jYWxjdWxhdGVfd20oYWRqdXN0ZWRfbW9kZS0+Y3J0Y19j bG9jaywKKwkJCQkJCQkmcGluZXZpZXdfZGlzcGxheV93bSwKKwkJCQkJCQlwaW5ldmlld19kaXNw bGF5X3dtLmZpZm9fc2l6ZSwKKwkJCQkJCQljcHAsIGxhdGVuY3ktPmRpc3BsYXlfc3IpOworCisJ CXdtX3N0YXRlLT5zci5jdXJzb3IgPSBpbnRlbF9jYWxjdWxhdGVfd20oYWRqdXN0ZWRfbW9kZS0+ Y3J0Y19jbG9jaywKKwkJCQkJCQkgJnBpbmV2aWV3X2N1cnNvcl93bSwKKwkJCQkJCQkgcGluZXZp ZXdfZGlzcGxheV93bS5maWZvX3NpemUsCisJCQkJCQkJIDQsIGxhdGVuY3ktPmN1cnNvcl9zcik7 CisKKwkJd21fc3RhdGUtPmhwbGwucGxhbmUgPSBpbnRlbF9jYWxjdWxhdGVfd20oYWRqdXN0ZWRf bW9kZS0+Y3J0Y19jbG9jaywKKwkJCQkJCQkJICZwaW5ldmlld19kaXNwbGF5X2hwbGxvZmZfd20s CisJCQkJCQkJCSBwaW5ldmlld19kaXNwbGF5X2hwbGxvZmZfd20uZmlmb19zaXplLAorCQkJCQkJ CQkgY3BwLCBsYXRlbmN5LT5kaXNwbGF5X2hwbGxfZGlzYWJsZSk7CisKKwkJd21fc3RhdGUtPmhw bGwuY3Vyc29yID0gaW50ZWxfY2FsY3VsYXRlX3dtKGFkanVzdGVkX21vZGUtPmNydGNfY2xvY2ss CisJCQkJCQkJCSAgJnBpbmV2aWV3X2N1cnNvcl9ocGxsb2ZmX3dtLAorCQkJCQkJCQkgIHBpbmV2 aWV3X2Rpc3BsYXlfaHBsbG9mZl93bS5maWZvX3NpemUsCisJCQkJCQkJCSAgNCwgbGF0ZW5jeS0+ Y3Vyc29yX2hwbGxfZGlzYWJsZSk7CisKKwkJRFJNX0RFQlVHX0tNUygiRklGTyB3YXRlcm1hcmtz IC0gY2FuIGN4c3I6ICVzLCBkaXNwbGF5IHBsYW5lICVkLCBjdXJzb3IgU1Igc2l6ZTogJWRcbiIs CisJCQkgICAgICB5ZXNubyh3bV9zdGF0ZS0+Y3hzciksIHdtX3N0YXRlLT5zci5wbGFuZSwgd21f c3RhdGUtPnNyLmN1cnNvcik7CisJfSBlbHNlCisJCXdtX3N0YXRlLT5jeHNyID0gZmFsc2U7CisK KwlyZXR1cm4gMDsKK30KKworc3RhdGljIHZvaWQgcG52X3Byb2dyYW1fd2F0ZXJtYXJrcyhzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCit7CisJc3RydWN0IGludGVsX2NydGMgKmNy dGM7CisJc3RydWN0IGk5eHhfd21fc3RhdGUgKndtX3N0YXRlID0gTlVMTDsKKworCWNydGMgPSBz aW5nbGVfZW5hYmxlZF9jcnRjKGRldl9wcml2KTsKKwlpZiAoY3J0YykKKwkJd21fc3RhdGUgPSAm Y3J0Yy0+d20uYWN0aXZlLmk5eHg7CisKKwlpZiAod21fc3RhdGUgJiYgd21fc3RhdGUtPmN4c3Ip IHsKKwkJdTMyIHJlZzsKIAogCQkvKiBEaXNwbGF5IFNSICovCi0JCXdtID0gaW50ZWxfY2FsY3Vs YXRlX3dtKGNsb2NrLCAmcGluZXZpZXdfZGlzcGxheV93bSwKLQkJCQkJcGluZXZpZXdfZGlzcGxh eV93bS5maWZvX3NpemUsCi0JCQkJCWNwcCwgbGF0ZW5jeS0+ZGlzcGxheV9zcik7CiAJCXJlZyA9 IEk5MTVfUkVBRChEU1BGVzEpOwogCQlyZWcgJj0gfkRTUEZXX1NSX01BU0s7Ci0JCXJlZyB8PSBG V19XTSh3bSwgU1IpOworCQlyZWcgfD0gRldfV00od21fc3RhdGUtPnNyLnBsYW5lLCBTUik7CiAJ CUk5MTVfV1JJVEUoRFNQRlcxLCByZWcpOwogCQlEUk1fREVCVUdfS01TKCJEU1BGVzEgcmVnaXN0 ZXIgaXMgJXhcbiIsIHJlZyk7CiAKIAkJLyogY3Vyc29yIFNSICovCi0JCXdtID0gaW50ZWxfY2Fs Y3VsYXRlX3dtKGNsb2NrLCAmcGluZXZpZXdfY3Vyc29yX3dtLAotCQkJCQlwaW5ldmlld19kaXNw bGF5X3dtLmZpZm9fc2l6ZSwKLQkJCQkJNCwgbGF0ZW5jeS0+Y3Vyc29yX3NyKTsKIAkJcmVnID0g STkxNV9SRUFEKERTUEZXMyk7Ci0JCXJlZyAmPSB+RFNQRldfQ1VSU09SX1NSX01BU0s7Ci0JCXJl ZyB8PSBGV19XTSh3bSwgQ1VSU09SX1NSKTsKKwkJcmVnICY9IH4oRFNQRldfQ1VSU09SX1NSX01B U0sgfCBEU1BGV19IUExMX1NSX01BU0sgfCBEU1BGV19IUExMX0NVUlNPUl9NQVNLKTsKKwkJcmVn IHw9IEZXX1dNKHdtX3N0YXRlLT5zci5jdXJzb3IsIENVUlNPUl9TUik7CisJCXJlZyB8PSBGV19X TSh3bV9zdGF0ZS0+aHBsbC5wbGFuZSwgSFBMTF9TUik7CisJCXJlZyB8PSBGV19XTSh3bV9zdGF0 ZS0+aHBsbC5jdXJzb3IsIEhQTExfU1IpOwogCQlJOTE1X1dSSVRFKERTUEZXMywgcmVnKTsKIAot CQkvKiBEaXNwbGF5IEhQTEwgb2ZmIFNSICovCi0JCXdtID0gaW50ZWxfY2FsY3VsYXRlX3dtKGNs b2NrLCAmcGluZXZpZXdfZGlzcGxheV9ocGxsb2ZmX3dtLAotCQkJCQlwaW5ldmlld19kaXNwbGF5 X2hwbGxvZmZfd20uZmlmb19zaXplLAotCQkJCQljcHAsIGxhdGVuY3ktPmRpc3BsYXlfaHBsbF9k aXNhYmxlKTsKLQkJcmVnID0gSTkxNV9SRUFEKERTUEZXMyk7Ci0JCXJlZyAmPSB+RFNQRldfSFBM TF9TUl9NQVNLOwotCQlyZWcgfD0gRldfV00od20sIEhQTExfU1IpOwotCQlJOTE1X1dSSVRFKERT UEZXMywgcmVnKTsKLQotCQkvKiBjdXJzb3IgSFBMTCBvZmYgU1IgKi8KLQkJd20gPSBpbnRlbF9j YWxjdWxhdGVfd20oY2xvY2ssICZwaW5ldmlld19jdXJzb3JfaHBsbG9mZl93bSwKLQkJCQkJcGlu ZXZpZXdfZGlzcGxheV9ocGxsb2ZmX3dtLmZpZm9fc2l6ZSwKLQkJCQkJNCwgbGF0ZW5jeS0+Y3Vy c29yX2hwbGxfZGlzYWJsZSk7Ci0JCXJlZyA9IEk5MTVfUkVBRChEU1BGVzMpOwotCQlyZWcgJj0g fkRTUEZXX0hQTExfQ1VSU09SX01BU0s7Ci0JCXJlZyB8PSBGV19XTSh3bSwgSFBMTF9DVVJTT1Ip OwotCQlJOTE1X1dSSVRFKERTUEZXMywgcmVnKTsKIAkJRFJNX0RFQlVHX0tNUygiRFNQRlczIHJl Z2lzdGVyIGlzICV4XG4iLCByZWcpOwogCi0JCWludGVsX3NldF9tZW1vcnlfY3hzcihkZXZfcHJp diwgdHJ1ZSk7CisJCV9pbnRlbF9zZXRfbWVtb3J5X2N4c3IoZGV2X3ByaXYsIHRydWUpOworCQlk ZXZfcHJpdi0+d20uaTl4eC5jeHNyID0gdHJ1ZTsKIAl9IGVsc2UgewotCQlpbnRlbF9zZXRfbWVt b3J5X2N4c3IoZGV2X3ByaXYsIGZhbHNlKTsKKwkJX2ludGVsX3NldF9tZW1vcnlfY3hzcihkZXZf cHJpdiwgZmFsc2UpOworCQlkZXZfcHJpdi0+d20uaTl4eC5jeHNyID0gZmFsc2U7CiAJfQogfQog CkBAIC0yMzQyLDYgKzIzNzYsOSBAQCBzdGF0aWMgaW50IGk5eHhfY29tcHV0ZV9pbnRlcm1lZGlh dGVfd20oc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAogCWludGVybWVkaWF0ZS0+cGxhbmVfd20g PSBtaW4ob2xkLT5wbGFuZV93bSwgb3B0aW1hbC0+cGxhbmVfd20pOwogCWludGVybWVkaWF0ZS0+ c3IucGxhbmUgPSBtaW4ob2xkLT5zci5wbGFuZSwgb3B0aW1hbC0+c3IucGxhbmUpOworCWludGVy bWVkaWF0ZS0+c3IuY3Vyc29yID0gbWluKG9sZC0+c3IuY3Vyc29yLCBvcHRpbWFsLT5zci5jdXJz b3IpOworCWludGVybWVkaWF0ZS0+aHBsbC5wbGFuZSA9IG1pbihvbGQtPmhwbGwucGxhbmUsIG9w dGltYWwtPmhwbGwucGxhbmUpOworCWludGVybWVkaWF0ZS0+aHBsbC5jdXJzb3IgPSBtaW4ob2xk LT5ocGxsLmN1cnNvciwgb3B0aW1hbC0+aHBsbC5jdXJzb3IpOwogCiBvdXQ6CiAJLyoKQEAgLTI0 NzUsNyArMjUxMiw5IEBAIHN0YXRpYyB2b2lkIGk5eHhfaW5pdGlhbF93YXRlcm1hcmtzKHN0cnVj dCBpbnRlbF9hdG9taWNfc3RhdGUgKnN0YXRlLAogCiAJbXV0ZXhfbG9jaygmZGV2X3ByaXYtPndt LndtX211dGV4KTsKIAljcnRjLT53bS5hY3RpdmUuaTl4eCA9IGNydGNfc3RhdGUtPndtLmk5eHgu aW50ZXJtZWRpYXRlOwotCWlmIChJTlRFTF9JTkZPKGRldl9wcml2KS0+bnVtX3BpcGVzID09IDEp CisJaWYgKElTX1BJTkVWSUVXKGRldl9wcml2KSkKKwkJcG52X3Byb2dyYW1fd2F0ZXJtYXJrcyhk ZXZfcHJpdik7CisJZWxzZSBpZiAoSU5URUxfSU5GTyhkZXZfcHJpdiktPm51bV9waXBlcyA9PSAx KQogCQlpODQ1X3Byb2dyYW1fd2F0ZXJtYXJrcyhpbnRlbF9jcnRjKTsKIAllbHNlCiAJCWk5eHhf cHJvZ3JhbV93YXRlcm1hcmtzKGRldl9wcml2KTsKQEAgLTI0OTMsNyArMjUzMiw5IEBAIHN0YXRp YyB2b2lkIGk5eHhfb3B0aW1pemVfd2F0ZXJtYXJrcyhzdHJ1Y3QgaW50ZWxfYXRvbWljX3N0YXRl ICpzdGF0ZSwKIAogCW11dGV4X2xvY2soJmRldl9wcml2LT53bS53bV9tdXRleCk7CiAJaW50ZWxf Y3J0Yy0+d20uYWN0aXZlLmk5eHggPSBjcnRjX3N0YXRlLT53bS5pOXh4Lm9wdGltYWw7Ci0JaWYg KElOVEVMX0lORk8oZGV2X3ByaXYpLT5udW1fcGlwZXMgPT0gMSkKKwlpZiAoSVNfUElORVZJRVco ZGV2X3ByaXYpKQorCQlwbnZfcHJvZ3JhbV93YXRlcm1hcmtzKGRldl9wcml2KTsKKwllbHNlIGlm IChJTlRFTF9JTkZPKGRldl9wcml2KS0+bnVtX3BpcGVzID09IDEpCiAJCWk4NDVfcHJvZ3JhbV93 YXRlcm1hcmtzKGludGVsX2NydGMpOwogCWVsc2UKIAkJaTl4eF9wcm9ncmFtX3dhdGVybWFya3Mo ZGV2X3ByaXYpOwpAQCAtODkxNSw5ICs4OTU2LDE0IEBAIHZvaWQgaW50ZWxfaW5pdF9wbShzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJCQkJIGRldl9wcml2LT5mc2JfZnJlcSwg ZGV2X3ByaXYtPm1lbV9mcmVxKTsKIAkJCS8qIERpc2FibGUgQ3hTUiBhbmQgbmV2ZXIgdXBkYXRl IGl0cyB3YXRlcm1hcmsgYWdhaW4gKi8KIAkJCWludGVsX3NldF9tZW1vcnlfY3hzcihkZXZfcHJp diwgZmFsc2UpOwotCQkJZGV2X3ByaXYtPmRpc3BsYXkudXBkYXRlX3dtID0gTlVMTDsKLQkJfSBl bHNlCi0JCQlkZXZfcHJpdi0+ZGlzcGxheS51cGRhdGVfd20gPSBwaW5ldmlld191cGRhdGVfd207 CisJCQlkZXZfcHJpdi0+ZGlzcGxheS5jb21wdXRlX3BpcGVfd20gPSBOVUxMOworCQkJZGV2X3By aXYtPmRpc3BsYXkuaW5pdGlhbF93YXRlcm1hcmtzID0gTlVMTDsKKwkJCWRldl9wcml2LT5kaXNw bGF5Lm9wdGltaXplX3dhdGVybWFya3MgPSBOVUxMOworCQl9IGVsc2UgeworCQkJZGV2X3ByaXYt PmRpc3BsYXkuY29tcHV0ZV9waXBlX3dtID0gcG52X2NvbXB1dGVfcGlwZV93bTsKKwkJCWRldl9w cml2LT5kaXNwbGF5LmluaXRpYWxfd2F0ZXJtYXJrcyA9IGk5eHhfaW5pdGlhbF93YXRlcm1hcmtz OworCQkJZGV2X3ByaXYtPmRpc3BsYXkub3B0aW1pemVfd2F0ZXJtYXJrcyA9IGk5eHhfb3B0aW1p emVfd2F0ZXJtYXJrczsKKwkJfQogCX0gZWxzZSBpZiAoSVNfR0VONChkZXZfcHJpdikpIHsKIAkJ ZGV2X3ByaXYtPmRpc3BsYXkudXBkYXRlX3dtID0gaTk2NV91cGRhdGVfd207CiAJfSBlbHNlIGlm IChJU19HRU4zKGRldl9wcml2KSkgewotLSAKMi4xMS4wCgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdm eEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp bG1hbi9saXN0aW5mby9pbnRlbC1nZngK