From: Matt Roper Subject: [PATCH 2/2] drm/i915: Don't assume primary & cursor are always on for wm calculation (v2) Date: Thu, 5 Mar 2015 17:31:18 -0800 Message-ID: <1425605478-21129-1-git-send-email-matthew.d.roper@intel.com> References: <54F74106.7040309@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 ESMTP id 33E606E3E4 for ; Thu, 5 Mar 2015 17:32:41 -0800 (PST) In-Reply-To: <54F74106.7040309@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 Q3VycmVudCBJTEstc3R5bGUgd2F0ZXJtYXJrIGNvZGUgYXNzdW1lcyB0aGUgcHJpbWFyeSBwbGFu ZSBhbmQgY3Vyc29yCnBsYW5lIGFyZSBhbHdheXMgZW5hYmxlZC4gIFRoaXMgYXNzdW1wdGlvbiwg YWxvbmcgd2l0aCB0aGUgY29tYmluYXRpb24Kb2YgdHdvIGluZGVwZW5kZW50IGNvbW1pdHMgdGhh dCBnb3QgbWVyZ2VkIGF0IHRoZSBzYW1lIHRpbWUsIHJlc3VsdHMgaW4KYSBOVUxMIGRlcmVmZXJl bmNlLiAgVGhlIG9mZmVuZGluZyBjb21taXRzIGFyZToKCiAgICAgICAgY29tbWl0IGZkMmQ2MTM0 MWJmMzlkMTA1NDI1NmMwN2Q2ZWRkZDYyNGViYzQyNDEKICAgICAgICBBdXRob3I6IE1hdHQgUm9w ZXIgPG1hdHRoZXcuZC5yb3BlckBpbnRlbC5jb20+CiAgICAgICAgRGF0ZTogICBGcmkgRmViIDI3 IDEwOjEyOjAxIDIwMTUgLTA4MDAKCiAgICAgICAgICAgIGRybS9pOTE1OiBVc2UgcGxhbmUtPnN0 YXRlLT5mYiBpbiB3YXRlcm1hcmsgY29kZSAodjIpCgphbmQKCiAgICAgICAgY29tbWl0IDBmZGE2 NTY4MGU5MjU0NWNhZWE1YmU3ODA1YTdmMGE2MTdmYjZjMjAKICAgICAgICBBdXRob3I6IFR2cnRr byBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+CiAgICAgICAgRGF0ZTogICBGcmkg RmViIDI3IDE1OjEyOjM1IDIwMTUgKzAwMDAKCiAgICAgICAgICAgIGRybS9pOTE1L3NrbDogVXBk YXRlIHdhdGVybWFya3MgZm9yIFkgdGlsaW5nCgpUaGUgZmlyc3QgY29tbWl0IGNhdXNlcyB1cyB0 byB1c2UgdGhlIEZCIGZyb20gcGxhbmUtPnN0YXRlLT5mYiByYXRoZXIKdGhhbiB0aGUgbGVnYWN5 IHBsYW5lLT5mYiwgd2hpY2ggaXMgdXBkYXRlZCBhIGJpdCBsYXRlciBpbiB0aGUgcHJvY2Vzcy4K ClRoZSBzZWNvbmQgY29tbWl0IGluY2x1ZGVzIGEgY2hhbmdlIHRoYXQgbm93IHRyaWdnZXJzIHdh dGVybWFyawpyZXByb2dyYW1taW5nIG9uIHByaW1hcnkgcGxhbmUgZW5hYmxlL2Rpc2FibGUgd2hl cmUgd2UgZGlkbid0IGhhdmUgb25lCmJlZm9yZSAod2hpY2ggd2Fzbid0IHJlYWxseSBjb3JyZWN0 LCBidXQgd2UgaGFkIGJlZW4gZ2V0dGluZyBsdWNreQpiZWNhdXNlIHdlIGFsd2F5cyBjYWxjdWxh dGVkIGFzIGlmIHRoZSBwcmltYXJ5IHBsYW5lIHdhcyBvbikuCgpUb2dldGhlciwgdGhlc2UgdHdv IGNvbW1pdHMgY2F1c2UgdGhlIHdhdGVybWFyayBjYWxjdWxhdGlvbiB0bwoocHJvcGVybHkpIHNl ZSBwbGFuZS0+c3RhdGUtPmZiID0gTlVMTCB3aGVuIHdlJ3JlIGluIHRoZSBwcm9jZXNzIG9mCmRp c2FibGluZyB0aGUgcHJpbWFyeSBwbGFuZS4gIEhvd2V2ZXIgdGhlIGV4aXN0aW5nIHdhdGVybWFy ayBjb2RlCmFzc3VtZXMgdGhlcmUncyBhbHdheXMgYSBwcmltYXJ5IGZiIGFuZCB0cmllcyB0byBk ZXJlZmVyZW5jZSBpdCB0byBmaW5kCm91dCBwaXhlbCBmb3JtYXQgLyBicHAgaW5mb3JtYXRpb24u CgpUaGUgZml4IGlzIHRvIG1ha2UgSUxLLXN0eWxlIHdhdGVybWFyayBjYWxjdWxhdGlvbiBhY3R1 YWxseSBjaGVjayB0aGUKdHJ1ZSBzdGF0dXMgb2YgcHJpbWFyeSAmIGN1cnNvciBwbGFuZXMgYW5k IGFkanVzdCBvdXIgd2F0ZXJtYXJrIGxvZ2ljCmFjY29yZGluZ2x5LgoKdjI6IFVwZGF0ZSB1bmNo ZWNrZWQgdXNlcyBvZiBzdGF0ZS0+ZmIgZm9yIG90aGVyIHBsYXRmb3JtcyAocG52LCBza2wsCiAg ICBldGMuKS4gIE5vdGUgdGhhdCB0aGlzIGlzIGp1c3QgYSB0ZW1wb3JhcnkgZml4LiAgVWx0aW1h dGVseSB0aGUKICAgIHVzZWZ1bCBpbmZvcm1hdGlvbiBpcyBnb2luZyB0byBiZSBjb21wdXRlZCBh dCBjaGVjayB0aW1lIGFuZCBzdG9yZWQKICAgIHJpZ2h0IGluIHRoZSBzdGF0ZSBzdHJ1Y3R1cmVz IHNvIHRoYXQgd2UgZG9uJ3QgaGF2ZSB0byBmaWd1cmUgdGhpcwogICAgYWxsIG91dCB3aGlsZSB3 ZSdyZSBzdXBwb3NlZCB0byBiZSBwcm9ncmFtbWluZyB0aGUgd2F0ZXJtYXJrcy4KICAgIChjYXVn aHQgYnkgVHZydGtvKQoKQ2M6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5j b20+ClJlcG9ydGVkLWJ5OiBNaWNoYWVsIExldWNodGVuYnVyZyA8bWljaGFlbEBzbGFzaGhvbWUu b3JnPgpCdWd6aWxsYTogaHR0cHM6Ly9idWdzLmZyZWVkZXNrdG9wLm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9ODkzODgKU2lnbmVkLW9mZi1ieTogTWF0dCBSb3BlciA8bWF0dGhldy5kLnJvcGVyQGludGVs LmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIHwgMTE2ICsrKysrKysr KysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA4NSBpbnNl cnRpb25zKCspLCAzMSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwppbmRleCBl MmU4NDE0Li4wOWUyMTBjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9w bS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKQEAgLTU1MywxMiArNTUz LDE3IEBAIHN0YXRpYyB2b2lkIHBpbmV2aWV3X3VwZGF0ZV93bShzdHJ1Y3QgZHJtX2NydGMgKnVu dXNlZF9jcnRjKQogCWNydGMgPSBzaW5nbGVfZW5hYmxlZF9jcnRjKGRldik7CiAJaWYgKGNydGMp IHsKIAkJY29uc3Qgc3RydWN0IGRybV9kaXNwbGF5X21vZGUgKmFkanVzdGVkX21vZGU7Ci0JCWlu dCBwaXhlbF9zaXplID0gY3J0Yy0+cHJpbWFyeS0+c3RhdGUtPmZiLT5iaXRzX3Blcl9waXhlbCAv IDg7CisJCWludCBwaXhlbF9zaXplOwogCQlpbnQgY2xvY2s7CiAKIAkJYWRqdXN0ZWRfbW9kZSA9 ICZ0b19pbnRlbF9jcnRjKGNydGMpLT5jb25maWctPmJhc2UuYWRqdXN0ZWRfbW9kZTsKIAkJY2xv Y2sgPSBhZGp1c3RlZF9tb2RlLT5jcnRjX2Nsb2NrOwogCisJCWlmIChjcnRjLT5wcmltYXJ5LT5z dGF0ZS0+ZmIpCisJCQlwaXhlbF9zaXplID0gY3J0Yy0+cHJpbWFyeS0+c3RhdGUtPmZiLT5iaXRz X3Blcl9waXhlbCAvIDg7CisJCWVsc2UKKwkJCXBpeGVsX3NpemUgPSA0OworCiAJCS8qIERpc3Bs YXkgU1IgKi8KIAkJd20gPSBpbnRlbF9jYWxjdWxhdGVfd20oY2xvY2ssICZwaW5ldmlld19kaXNw bGF5X3dtLAogCQkJCQlwaW5ldmlld19kaXNwbGF5X3dtLmZpZm9fc2l6ZSwKQEAgLTYyOSw3ICs2 MzQsMTEgQEAgc3RhdGljIGJvb2wgZzR4X2NvbXB1dGVfd20wKHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYsCiAJY2xvY2sgPSBhZGp1c3RlZF9tb2RlLT5jcnRjX2Nsb2NrOwogCWh0b3RhbCA9IGFkanVz dGVkX21vZGUtPmNydGNfaHRvdGFsOwogCWhkaXNwbGF5ID0gdG9faW50ZWxfY3J0YyhjcnRjKS0+ Y29uZmlnLT5waXBlX3NyY193OwotCXBpeGVsX3NpemUgPSBjcnRjLT5wcmltYXJ5LT5zdGF0ZS0+ ZmItPmJpdHNfcGVyX3BpeGVsIC8gODsKKworCWlmIChjcnRjLT5wcmltYXJ5LT5zdGF0ZS0+ZmIp CisJCXBpeGVsX3NpemUgPSBjcnRjLT5wcmltYXJ5LT5zdGF0ZS0+ZmItPmJpdHNfcGVyX3BpeGVs IC8gODsKKwllbHNlCisJCXBpeGVsX3NpemUgPSA0OwogCiAJLyogVXNlIHRoZSBzbWFsbCBidWZm ZXIgbWV0aG9kIHRvIGNhbGN1bGF0ZSBwbGFuZSB3YXRlcm1hcmsgKi8KIAllbnRyaWVzID0gKChj bG9jayAqIHBpeGVsX3NpemUgLyAxMDAwKSAqIGRpc3BsYXlfbGF0ZW5jeV9ucykgLyAxMDAwOwpA QCAtNzE2LDcgKzcyNSwxMSBAQCBzdGF0aWMgYm9vbCBnNHhfY29tcHV0ZV9zcndtKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYsCiAJY2xvY2sgPSBhZGp1c3RlZF9tb2RlLT5jcnRjX2Nsb2NrOwogCWh0 b3RhbCA9IGFkanVzdGVkX21vZGUtPmNydGNfaHRvdGFsOwogCWhkaXNwbGF5ID0gdG9faW50ZWxf Y3J0YyhjcnRjKS0+Y29uZmlnLT5waXBlX3NyY193OwotCXBpeGVsX3NpemUgPSBjcnRjLT5wcmlt YXJ5LT5zdGF0ZS0+ZmItPmJpdHNfcGVyX3BpeGVsIC8gODsKKworCWlmIChjcnRjLT5wcmltYXJ5 LT5zdGF0ZS0+ZmIpCisJCXBpeGVsX3NpemUgPSBjcnRjLT5wcmltYXJ5LT5zdGF0ZS0+ZmItPmJp dHNfcGVyX3BpeGVsIC8gODsKKwllbHNlCisJCXBpeGVsX3NpemUgPSA0OwogCiAJbGluZV90aW1l X3VzID0gbWF4KGh0b3RhbCAqIDEwMDAgLyBjbG9jaywgMSk7CiAJbGluZV9jb3VudCA9IChsYXRl bmN5X25zIC8gbGluZV90aW1lX3VzICsgMTAwMCkgLyAxMDAwOwpAQCAtNzk5LDcgKzgxMiwxMCBA QCBzdGF0aWMgdm9pZCB2bHZfdXBkYXRlX2RyYWluX2xhdGVuY3koc3RydWN0IGRybV9jcnRjICpj cnRjKQogCX0KIAogCS8qIFByaW1hcnkgcGxhbmUgRHJhaW4gTGF0ZW5jeSAqLwotCXBpeGVsX3Np emUgPSBjcnRjLT5wcmltYXJ5LT5zdGF0ZS0+ZmItPmJpdHNfcGVyX3BpeGVsIC8gODsJLyogQlBQ ICovCisJaWYgKGNydGMtPnByaW1hcnktPnN0YXRlLT5mYikKKwkJcGl4ZWxfc2l6ZSA9IGNydGMt PnByaW1hcnktPnN0YXRlLT5mYi0+Yml0c19wZXJfcGl4ZWwgLyA4OworCWVsc2UKKwkJcGl4ZWxf c2l6ZSA9IDQ7CiAJaWYgKHZsdl9jb21wdXRlX2RyYWluX2xhdGVuY3koY3J0YywgcGl4ZWxfc2l6 ZSwgJnByZWNfbXVsdCwgJmRyYWluX2xhdGVuY3kpKSB7CiAJCXBsYW5lX3ByZWMgPSAocHJlY19t dWx0ID09IGhpZ2hfcHJlY2lzaW9uKSA/CiAJCQkJCSAgIERETF9QTEFORV9QUkVDSVNJT05fSElH SCA6CkBAIC0xMDgwLDEwICsxMDk2LDE1IEBAIHN0YXRpYyB2b2lkIGk5NjVfdXBkYXRlX3dtKHN0 cnVjdCBkcm1fY3J0YyAqdW51c2VkX2NydGMpCiAJCWludCBjbG9jayA9IGFkanVzdGVkX21vZGUt PmNydGNfY2xvY2s7CiAJCWludCBodG90YWwgPSBhZGp1c3RlZF9tb2RlLT5jcnRjX2h0b3RhbDsK IAkJaW50IGhkaXNwbGF5ID0gdG9faW50ZWxfY3J0YyhjcnRjKS0+Y29uZmlnLT5waXBlX3NyY193 OwotCQlpbnQgcGl4ZWxfc2l6ZSA9IGNydGMtPnByaW1hcnktPnN0YXRlLT5mYi0+Yml0c19wZXJf cGl4ZWwgLyA4OworCQlpbnQgcGl4ZWxfc2l6ZTsKIAkJdW5zaWduZWQgbG9uZyBsaW5lX3RpbWVf dXM7CiAJCWludCBlbnRyaWVzOwogCisJCWlmIChjcnRjLT5wcmltYXJ5LT5zdGF0ZS0+ZmIpCisJ CQlwaXhlbF9zaXplID0gY3J0Yy0+cHJpbWFyeS0+c3RhdGUtPmZiLT5iaXRzX3Blcl9waXhlbCAv IDg7CisJCWVsc2UKKwkJCXBpeGVsX3NpemUgPSA0OworCiAJCWxpbmVfdGltZV91cyA9IG1heCho dG90YWwgKiAxMDAwIC8gY2xvY2ssIDEpOwogCiAJCS8qIFVzZSBucy91cyB0aGVuIGRpdmlkZSB0 byBwcmVzZXJ2ZSBwcmVjaXNpb24gKi8KQEAgLTExNTcsNyArMTE3OCwxMyBAQCBzdGF0aWMgdm9p ZCBpOXh4X3VwZGF0ZV93bShzdHJ1Y3QgZHJtX2NydGMgKnVudXNlZF9jcnRjKQogCWNydGMgPSBp bnRlbF9nZXRfY3J0Y19mb3JfcGxhbmUoZGV2LCAwKTsKIAlpZiAoaW50ZWxfY3J0Y19hY3RpdmUo Y3J0YykpIHsKIAkJY29uc3Qgc3RydWN0IGRybV9kaXNwbGF5X21vZGUgKmFkanVzdGVkX21vZGU7 Ci0JCWludCBjcHAgPSBjcnRjLT5wcmltYXJ5LT5zdGF0ZS0+ZmItPmJpdHNfcGVyX3BpeGVsIC8g ODsKKwkJaW50IGNwcDsKKworCQlpZiAoY3J0Yy0+cHJpbWFyeS0+c3RhdGUtPmZiKQorCQkJY3Bw ID0gY3J0Yy0+cHJpbWFyeS0+c3RhdGUtPmZiLT5iaXRzX3Blcl9waXhlbCAvIDg7CisJCWVsc2UK KwkJCWNwcCA9IDQ7CisKIAkJaWYgKElTX0dFTjIoZGV2KSkKIAkJCWNwcCA9IDQ7CiAKQEAgLTEx NzksNyArMTIwNiwxMyBAQCBzdGF0aWMgdm9pZCBpOXh4X3VwZGF0ZV93bShzdHJ1Y3QgZHJtX2Ny dGMgKnVudXNlZF9jcnRjKQogCWNydGMgPSBpbnRlbF9nZXRfY3J0Y19mb3JfcGxhbmUoZGV2LCAx KTsKIAlpZiAoaW50ZWxfY3J0Y19hY3RpdmUoY3J0YykpIHsKIAkJY29uc3Qgc3RydWN0IGRybV9k aXNwbGF5X21vZGUgKmFkanVzdGVkX21vZGU7Ci0JCWludCBjcHAgPSBjcnRjLT5wcmltYXJ5LT5z dGF0ZS0+ZmItPmJpdHNfcGVyX3BpeGVsIC8gODsKKwkJaW50IGNwcDsKKworCQlpZiAoY3J0Yy0+ cHJpbWFyeS0+c3RhdGUtPmZiKQorCQkJY3BwID0gY3J0Yy0+cHJpbWFyeS0+c3RhdGUtPmZiLT5i aXRzX3Blcl9waXhlbCAvIDg7CisJCWVsc2UKKwkJCWNwcCA9IDQ7CisKIAkJaWYgKElTX0dFTjIo ZGV2KSkKIAkJCWNwcCA9IDQ7CiAKQEAgLTEyMDUsNyArMTIzOCw3IEBAIHN0YXRpYyB2b2lkIGk5 eHhfdXBkYXRlX3dtKHN0cnVjdCBkcm1fY3J0YyAqdW51c2VkX2NydGMpCiAJCW9iaiA9IGludGVs X2ZiX29iaihlbmFibGVkLT5wcmltYXJ5LT5zdGF0ZS0+ZmIpOwogCiAJCS8qIHNlbGYtcmVmcmVz aCBzZWVtcyBidXN0ZWQgd2l0aCB1bnRpbGVkICovCi0JCWlmIChvYmotPnRpbGluZ19tb2RlID09 IEk5MTVfVElMSU5HX05PTkUpCisJCWlmICghb2JqIHx8IG9iai0+dGlsaW5nX21vZGUgPT0gSTkx NV9USUxJTkdfTk9ORSkKIAkJCWVuYWJsZWQgPSBOVUxMOwogCX0KIApAQCAtMTIyNiwxMCArMTI1 OSwxNSBAQCBzdGF0aWMgdm9pZCBpOXh4X3VwZGF0ZV93bShzdHJ1Y3QgZHJtX2NydGMgKnVudXNl ZF9jcnRjKQogCQlpbnQgY2xvY2sgPSBhZGp1c3RlZF9tb2RlLT5jcnRjX2Nsb2NrOwogCQlpbnQg aHRvdGFsID0gYWRqdXN0ZWRfbW9kZS0+Y3J0Y19odG90YWw7CiAJCWludCBoZGlzcGxheSA9IHRv X2ludGVsX2NydGMoZW5hYmxlZCktPmNvbmZpZy0+cGlwZV9zcmNfdzsKLQkJaW50IHBpeGVsX3Np emUgPSBlbmFibGVkLT5wcmltYXJ5LT5zdGF0ZS0+ZmItPmJpdHNfcGVyX3BpeGVsIC8gODsKKwkJ aW50IHBpeGVsX3NpemU7CiAJCXVuc2lnbmVkIGxvbmcgbGluZV90aW1lX3VzOwogCQlpbnQgZW50 cmllczsKIAorCQlpZiAoZW5hYmxlZC0+cHJpbWFyeS0+c3RhdGUtPmZiKQorCQkJcGl4ZWxfc2l6 ZSA9IGVuYWJsZWQtPnByaW1hcnktPnN0YXRlLT5mYi0+Yml0c19wZXJfcGl4ZWwgLyA4OworCQll bHNlCisJCQlwaXhlbF9zaXplID0gNDsKKwogCQlsaW5lX3RpbWVfdXMgPSBtYXgoaHRvdGFsICog MTAwMCAvIGNsb2NrLCAxKTsKIAogCQkvKiBVc2UgbnMvdXMgdGhlbiBkaXZpZGUgdG8gcHJlc2Vy dmUgcHJlY2lzaW9uICovCkBAIC0xOTI0LDEzICsxOTYyLDI1IEBAIHN0YXRpYyB2b2lkIGlsa19j b21wdXRlX3dtX3BhcmFtZXRlcnMoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCXAtPmFjdGl2ZSA9 IHRydWU7CiAJcC0+cGlwZV9odG90YWwgPSBpbnRlbF9jcnRjLT5jb25maWctPmJhc2UuYWRqdXN0 ZWRfbW9kZS5jcnRjX2h0b3RhbDsKIAlwLT5waXhlbF9yYXRlID0gaWxrX3BpcGVfcGl4ZWxfcmF0 ZShkZXYsIGNydGMpOwotCXAtPnByaS5ieXRlc19wZXJfcGl4ZWwgPSBjcnRjLT5wcmltYXJ5LT5z dGF0ZS0+ZmItPmJpdHNfcGVyX3BpeGVsIC8gODsKLQlwLT5jdXIuYnl0ZXNfcGVyX3BpeGVsID0g NDsKKworCWlmIChjcnRjLT5wcmltYXJ5LT5zdGF0ZS0+ZmIpIHsKKwkJcC0+cHJpLmVuYWJsZWQg PSB0cnVlOworCQlwLT5wcmkuYnl0ZXNfcGVyX3BpeGVsID0KKwkJCWNydGMtPnByaW1hcnktPnN0 YXRlLT5mYi0+Yml0c19wZXJfcGl4ZWwgLyA4OworCX0gZWxzZSB7CisJCXAtPnByaS5lbmFibGVk ID0gZmFsc2U7CisJCXAtPnByaS5ieXRlc19wZXJfcGl4ZWwgPSAwOworCX0KKworCWlmIChjcnRj LT5jdXJzb3ItPnN0YXRlLT5mYikgeworCQlwLT5jdXIuZW5hYmxlZCA9IHRydWU7CisJCXAtPmN1 ci5ieXRlc19wZXJfcGl4ZWwgPSA0OworCX0gZWxzZSB7CisJCXAtPmN1ci5lbmFibGVkID0gZmFs c2U7CisJCXAtPmN1ci5ieXRlc19wZXJfcGl4ZWwgPSAwOworCX0KIAlwLT5wcmkuaG9yaXpfcGl4 ZWxzID0gaW50ZWxfY3J0Yy0+Y29uZmlnLT5waXBlX3NyY193OwogCXAtPmN1ci5ob3Jpel9waXhl bHMgPSBpbnRlbF9jcnRjLT5iYXNlLmN1cnNvci0+c3RhdGUtPmNydGNfdzsKLQkvKiBUT0RPOiBm b3Igbm93LCBhc3N1bWUgcHJpbWFyeSBhbmQgY3Vyc29yIHBsYW5lcyBhcmUgYWx3YXlzIGVuYWJs ZWQuICovCi0JcC0+cHJpLmVuYWJsZWQgPSB0cnVlOwotCXAtPmN1ci5lbmFibGVkID0gdHJ1ZTsK IAogCWRybV9mb3JfZWFjaF9sZWdhY3lfcGxhbmUocGxhbmUsICZkZXYtPm1vZGVfY29uZmlnLnBs YW5lX2xpc3QpIHsKIAkJc3RydWN0IGludGVsX3BsYW5lICppbnRlbF9wbGFuZSA9IHRvX2ludGVs X3BsYW5lKHBsYW5lKTsKQEAgLTI2OTYsMjcgKzI3NDYsMzEgQEAgc3RhdGljIHZvaWQgc2tsX2Nv bXB1dGVfd21fcGlwZV9wYXJhbWV0ZXJzKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkJcC0+cGlw ZV9odG90YWwgPSBpbnRlbF9jcnRjLT5jb25maWctPmJhc2UuYWRqdXN0ZWRfbW9kZS5jcnRjX2h0 b3RhbDsKIAkJcC0+cGl4ZWxfcmF0ZSA9IHNrbF9waXBlX3BpeGVsX3JhdGUoaW50ZWxfY3J0Yy0+ Y29uZmlnKTsKIAotCQkvKgotCQkgKiBGb3Igbm93LCBhc3N1bWUgcHJpbWFyeSBhbmQgY3Vyc29y IHBsYW5lcyBhcmUgYWx3YXlzIGVuYWJsZWQuCi0JCSAqLwotCQlwLT5wbGFuZVswXS5lbmFibGVk ID0gdHJ1ZTsKLQkJcC0+cGxhbmVbMF0uYnl0ZXNfcGVyX3BpeGVsID0KLQkJCWNydGMtPnByaW1h cnktPnN0YXRlLT5mYi0+Yml0c19wZXJfcGl4ZWwgLyA4OworCQlmYiA9IGNydGMtPnByaW1hcnkt PnN0YXRlLT5mYjsKKwkJaWYgKGZiKSB7CisJCQlwLT5wbGFuZVswXS5lbmFibGVkID0gdHJ1ZTsK KwkJCXAtPnBsYW5lWzBdLmJ5dGVzX3Blcl9waXhlbCA9IGZiLT5iaXRzX3Blcl9waXhlbCAvIDg7 CisJCQlwLT5wbGFuZVswXS50aWxpbmcgPSBmYi0+bW9kaWZpZXJbMF07CisJCX0gZWxzZSB7CisJ CQlwLT5wbGFuZVswXS5lbmFibGVkID0gZmFsc2U7CisJCQlwLT5wbGFuZVswXS5ieXRlc19wZXJf cGl4ZWwgPSAwOworCQl9CiAJCXAtPnBsYW5lWzBdLmhvcml6X3BpeGVscyA9IGludGVsX2NydGMt PmNvbmZpZy0+cGlwZV9zcmNfdzsKIAkJcC0+cGxhbmVbMF0udmVydF9waXhlbHMgPSBpbnRlbF9j cnRjLT5jb25maWctPnBpcGVfc3JjX2g7CiAJCXAtPnBsYW5lWzBdLnRpbGluZyA9IERSTV9GT1JN QVRfTU9EX05PTkU7Ci0JCWZiID0gY3J0Yy0+cHJpbWFyeS0+c3RhdGUtPmZiOwotCQkvKgotCQkg KiBGcmFtZWJ1ZmZlciBjYW4gYmUgTlVMTCBvbiBwbGFuZSBkaXNhYmxlLCBidXQgaXQgZG9lcyBu b3QKLQkJICogbWF0dGVyIGZvciB3YXRlcm1hcmtzIGlmIHdlIGFzc3VtZSBubyB0aWxpbmcgaW4g dGhhdCBjYXNlLgotCQkgKi8KLQkJaWYgKGZiKQotCQkJcC0+cGxhbmVbMF0udGlsaW5nID0gZmIt Pm1vZGlmaWVyWzBdOwogCi0JCXAtPmN1cnNvci5lbmFibGVkID0gdHJ1ZTsKLQkJcC0+Y3Vyc29y LmJ5dGVzX3Blcl9waXhlbCA9IDQ7Ci0JCXAtPmN1cnNvci5ob3Jpel9waXhlbHMgPSBpbnRlbF9j cnRjLT5iYXNlLmN1cnNvci0+c3RhdGUtPmNydGNfdyA/Ci0JCQkJCSBpbnRlbF9jcnRjLT5iYXNl LmN1cnNvci0+c3RhdGUtPmNydGNfdyA6IDY0OworCQlmYiA9IGNydGMtPnByaW1hcnktPnN0YXRl LT5mYjsKKwkJaWYgKGZiKSB7CisJCQlwLT5jdXJzb3IuZW5hYmxlZCA9IHRydWU7CisJCQlwLT5j dXJzb3IuYnl0ZXNfcGVyX3BpeGVsID0gZmItPmJpdHNfcGVyX3BpeGVsIC8gODsKKwkJCXAtPmN1 cnNvci5ob3Jpel9waXhlbHMgPSBjcnRjLT5jdXJzb3ItPnN0YXRlLT5jcnRjX3c7CisJCQlwLT5j dXJzb3IudmVydF9waXhlbHMgPSBjcnRjLT5jdXJzb3ItPnN0YXRlLT5jcnRjX2g7CisJCX0gZWxz ZSB7CisJCQlwLT5jdXJzb3IuZW5hYmxlZCA9IGZhbHNlOworCQkJcC0+Y3Vyc29yLmJ5dGVzX3Bl cl9waXhlbCA9IDA7CisJCQlwLT5jdXJzb3IuaG9yaXpfcGl4ZWxzID0gNjQ7CisJCQlwLT5jdXJz b3IudmVydF9waXhlbHMgPSA2NDsKKwkJfQogCX0KIAogCWxpc3RfZm9yX2VhY2hfZW50cnkocGxh bmUsICZkZXYtPm1vZGVfY29uZmlnLnBsYW5lX2xpc3QsIGhlYWQpIHsKLS0gCjEuOC41LjEKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBt YWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMu ZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==