From: Matt Roper Subject: [PATCH 5/5] drm/i915: Don't assume primary & cursor are always on for wm calculation (v3) Date: Sun, 8 Mar 2015 14:00:45 -0700 Message-ID: <1425848445-19479-6-git-send-email-matthew.d.roper@intel.com> References: <1425848445-19479-1-git-send-email-matthew.d.roper@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 6EBDB6E0E4 for ; Sun, 8 Mar 2015 14:04:15 -0700 (PDT) In-Reply-To: <1425848445-19479-1-git-send-email-matthew.d.roper@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 aHQgYnkgVHZydGtvKQoKdjM6IEZpeCBhIGNvdXBsZSBjb3B5L3Bhc3RlIG1pc3Rha2VzIGluIFNL TCBjb2RlLiAoVHZydGtvKQoKQ2M6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRl bC5jb20+ClJlcG9ydGVkLWJ5OiBNaWNoYWVsIExldWNodGVuYnVyZyA8bWljaGFlbEBzbGFzaGhv bWUub3JnPgpCdWd6aWxsYTogaHR0cHM6Ly9idWdzLmZyZWVkZXNrdG9wLm9yZy9zaG93X2J1Zy5j Z2k/aWQ9ODkzODgKU2lnbmVkLW9mZi1ieTogTWF0dCBSb3BlciA8bWF0dGhldy5kLnJvcGVyQGlu dGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIHwgMTEzICsrKysr KysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA4MiBp bnNlcnRpb25zKCspLCAzMSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwppbmRl eCBkYWZkN2RlLi5jNWQzMjM4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKQEAgLTYwOCwxMiAr NjA4LDE3IEBAIHN0YXRpYyB2b2lkIHBpbmV2aWV3X3VwZGF0ZV93bShzdHJ1Y3QgZHJtX2NydGMg KnVudXNlZF9jcnRjKQogCWNydGMgPSBzaW5nbGVfZW5hYmxlZF9jcnRjKGRldik7CiAJaWYgKGNy dGMpIHsKIAkJY29uc3Qgc3RydWN0IGRybV9kaXNwbGF5X21vZGUgKmFkanVzdGVkX21vZGU7Ci0J CWludCBwaXhlbF9zaXplID0gY3J0Yy0+cHJpbWFyeS0+c3RhdGUtPmZiLT5iaXRzX3Blcl9waXhl bCAvIDg7CisJCWludCBwaXhlbF9zaXplOwogCQlpbnQgY2xvY2s7CiAKIAkJYWRqdXN0ZWRfbW9k ZSA9ICZ0b19pbnRlbF9jcnRjKGNydGMpLT5jb25maWctPmJhc2UuYWRqdXN0ZWRfbW9kZTsKIAkJ Y2xvY2sgPSBhZGp1c3RlZF9tb2RlLT5jcnRjX2Nsb2NrOwogCisJCWlmIChjcnRjLT5wcmltYXJ5 LT5zdGF0ZS0+ZmIpCisJCQlwaXhlbF9zaXplID0gY3J0Yy0+cHJpbWFyeS0+c3RhdGUtPmZiLT5i aXRzX3Blcl9waXhlbCAvIDg7CisJCWVsc2UKKwkJCXBpeGVsX3NpemUgPSA0OworCiAJCS8qIERp c3BsYXkgU1IgKi8KIAkJd20gPSBpbnRlbF9jYWxjdWxhdGVfd20oY2xvY2ssICZwaW5ldmlld19k aXNwbGF5X3dtLAogCQkJCQlwaW5ldmlld19kaXNwbGF5X3dtLmZpZm9fc2l6ZSwKQEAgLTY4NCw3 ICs2ODksMTEgQEAgc3RhdGljIGJvb2wgZzR4X2NvbXB1dGVfd20wKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYsCiAJY2xvY2sgPSBhZGp1c3RlZF9tb2RlLT5jcnRjX2Nsb2NrOwogCWh0b3RhbCA9IGFk anVzdGVkX21vZGUtPmNydGNfaHRvdGFsOwogCWhkaXNwbGF5ID0gdG9faW50ZWxfY3J0YyhjcnRj KS0+Y29uZmlnLT5waXBlX3NyY193OwotCXBpeGVsX3NpemUgPSBjcnRjLT5wcmltYXJ5LT5zdGF0 ZS0+ZmItPmJpdHNfcGVyX3BpeGVsIC8gODsKKworCWlmIChjcnRjLT5wcmltYXJ5LT5zdGF0ZS0+ ZmIpCisJCXBpeGVsX3NpemUgPSBjcnRjLT5wcmltYXJ5LT5zdGF0ZS0+ZmItPmJpdHNfcGVyX3Bp eGVsIC8gODsKKwllbHNlCisJCXBpeGVsX3NpemUgPSA0OwogCiAJLyogVXNlIHRoZSBzbWFsbCBi dWZmZXIgbWV0aG9kIHRvIGNhbGN1bGF0ZSBwbGFuZSB3YXRlcm1hcmsgKi8KIAllbnRyaWVzID0g KChjbG9jayAqIHBpeGVsX3NpemUgLyAxMDAwKSAqIGRpc3BsYXlfbGF0ZW5jeV9ucykgLyAxMDAw OwpAQCAtNzcxLDcgKzc4MCwxMSBAQCBzdGF0aWMgYm9vbCBnNHhfY29tcHV0ZV9zcndtKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYsCiAJY2xvY2sgPSBhZGp1c3RlZF9tb2RlLT5jcnRjX2Nsb2NrOwog CWh0b3RhbCA9IGFkanVzdGVkX21vZGUtPmNydGNfaHRvdGFsOwogCWhkaXNwbGF5ID0gdG9faW50 ZWxfY3J0YyhjcnRjKS0+Y29uZmlnLT5waXBlX3NyY193OwotCXBpeGVsX3NpemUgPSBjcnRjLT5w cmltYXJ5LT5zdGF0ZS0+ZmItPmJpdHNfcGVyX3BpeGVsIC8gODsKKworCWlmIChjcnRjLT5wcmlt YXJ5LT5zdGF0ZS0+ZmIpCisJCXBpeGVsX3NpemUgPSBjcnRjLT5wcmltYXJ5LT5zdGF0ZS0+ZmIt PmJpdHNfcGVyX3BpeGVsIC8gODsKKwllbHNlCisJCXBpeGVsX3NpemUgPSA0OwogCiAJbGluZV90 aW1lX3VzID0gbWF4KGh0b3RhbCAqIDEwMDAgLyBjbG9jaywgMSk7CiAJbGluZV9jb3VudCA9IChs YXRlbmN5X25zIC8gbGluZV90aW1lX3VzICsgMTAwMCkgLyAxMDAwOwpAQCAtMTExOCwxMCArMTEz MSwxNSBAQCBzdGF0aWMgdm9pZCBpOTY1X3VwZGF0ZV93bShzdHJ1Y3QgZHJtX2NydGMgKnVudXNl ZF9jcnRjKQogCQlpbnQgY2xvY2sgPSBhZGp1c3RlZF9tb2RlLT5jcnRjX2Nsb2NrOwogCQlpbnQg aHRvdGFsID0gYWRqdXN0ZWRfbW9kZS0+Y3J0Y19odG90YWw7CiAJCWludCBoZGlzcGxheSA9IHRv X2ludGVsX2NydGMoY3J0YyktPmNvbmZpZy0+cGlwZV9zcmNfdzsKLQkJaW50IHBpeGVsX3NpemUg PSBjcnRjLT5wcmltYXJ5LT5zdGF0ZS0+ZmItPmJpdHNfcGVyX3BpeGVsIC8gODsKKwkJaW50IHBp eGVsX3NpemU7CiAJCXVuc2lnbmVkIGxvbmcgbGluZV90aW1lX3VzOwogCQlpbnQgZW50cmllczsK IAorCQlpZiAoY3J0Yy0+cHJpbWFyeS0+c3RhdGUtPmZiKQorCQkJcGl4ZWxfc2l6ZSA9IGNydGMt PnByaW1hcnktPnN0YXRlLT5mYi0+Yml0c19wZXJfcGl4ZWwgLyA4OworCQllbHNlCisJCQlwaXhl bF9zaXplID0gNDsKKwogCQlsaW5lX3RpbWVfdXMgPSBtYXgoaHRvdGFsICogMTAwMCAvIGNsb2Nr LCAxKTsKIAogCQkvKiBVc2UgbnMvdXMgdGhlbiBkaXZpZGUgdG8gcHJlc2VydmUgcHJlY2lzaW9u ICovCkBAIC0xMTk1LDcgKzEyMTMsMTMgQEAgc3RhdGljIHZvaWQgaTl4eF91cGRhdGVfd20oc3Ry dWN0IGRybV9jcnRjICp1bnVzZWRfY3J0YykKIAljcnRjID0gaW50ZWxfZ2V0X2NydGNfZm9yX3Bs YW5lKGRldiwgMCk7CiAJaWYgKGludGVsX2NydGNfYWN0aXZlKGNydGMpKSB7CiAJCWNvbnN0IHN0 cnVjdCBkcm1fZGlzcGxheV9tb2RlICphZGp1c3RlZF9tb2RlOwotCQlpbnQgY3BwID0gY3J0Yy0+ cHJpbWFyeS0+c3RhdGUtPmZiLT5iaXRzX3Blcl9waXhlbCAvIDg7CisJCWludCBjcHA7CisKKwkJ aWYgKGNydGMtPnByaW1hcnktPnN0YXRlLT5mYikKKwkJCWNwcCA9IGNydGMtPnByaW1hcnktPnN0 YXRlLT5mYi0+Yml0c19wZXJfcGl4ZWwgLyA4OworCQllbHNlCisJCQljcHAgPSA0OworCiAJCWlm IChJU19HRU4yKGRldikpCiAJCQljcHAgPSA0OwogCkBAIC0xMjE3LDcgKzEyNDEsMTMgQEAgc3Rh dGljIHZvaWQgaTl4eF91cGRhdGVfd20oc3RydWN0IGRybV9jcnRjICp1bnVzZWRfY3J0YykKIAlj cnRjID0gaW50ZWxfZ2V0X2NydGNfZm9yX3BsYW5lKGRldiwgMSk7CiAJaWYgKGludGVsX2NydGNf YWN0aXZlKGNydGMpKSB7CiAJCWNvbnN0IHN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICphZGp1c3Rl ZF9tb2RlOwotCQlpbnQgY3BwID0gY3J0Yy0+cHJpbWFyeS0+c3RhdGUtPmZiLT5iaXRzX3Blcl9w aXhlbCAvIDg7CisJCWludCBjcHA7CisKKwkJaWYgKGNydGMtPnByaW1hcnktPnN0YXRlLT5mYikK KwkJCWNwcCA9IGNydGMtPnByaW1hcnktPnN0YXRlLT5mYi0+Yml0c19wZXJfcGl4ZWwgLyA4Owor CQllbHNlCisJCQljcHAgPSA0OworCiAJCWlmIChJU19HRU4yKGRldikpCiAJCQljcHAgPSA0Owog CkBAIC0xMjQzLDcgKzEyNzMsNyBAQCBzdGF0aWMgdm9pZCBpOXh4X3VwZGF0ZV93bShzdHJ1Y3Qg ZHJtX2NydGMgKnVudXNlZF9jcnRjKQogCQlvYmogPSBpbnRlbF9mYl9vYmooZW5hYmxlZC0+cHJp bWFyeS0+c3RhdGUtPmZiKTsKIAogCQkvKiBzZWxmLXJlZnJlc2ggc2VlbXMgYnVzdGVkIHdpdGgg dW50aWxlZCAqLwotCQlpZiAob2JqLT50aWxpbmdfbW9kZSA9PSBJOTE1X1RJTElOR19OT05FKQor CQlpZiAoIW9iaiB8fCBvYmotPnRpbGluZ19tb2RlID09IEk5MTVfVElMSU5HX05PTkUpCiAJCQll bmFibGVkID0gTlVMTDsKIAl9CiAKQEAgLTEyNjQsMTAgKzEyOTQsMTUgQEAgc3RhdGljIHZvaWQg aTl4eF91cGRhdGVfd20oc3RydWN0IGRybV9jcnRjICp1bnVzZWRfY3J0YykKIAkJaW50IGNsb2Nr ID0gYWRqdXN0ZWRfbW9kZS0+Y3J0Y19jbG9jazsKIAkJaW50IGh0b3RhbCA9IGFkanVzdGVkX21v ZGUtPmNydGNfaHRvdGFsOwogCQlpbnQgaGRpc3BsYXkgPSB0b19pbnRlbF9jcnRjKGVuYWJsZWQp LT5jb25maWctPnBpcGVfc3JjX3c7Ci0JCWludCBwaXhlbF9zaXplID0gZW5hYmxlZC0+cHJpbWFy eS0+c3RhdGUtPmZiLT5iaXRzX3Blcl9waXhlbCAvIDg7CisJCWludCBwaXhlbF9zaXplOwogCQl1 bnNpZ25lZCBsb25nIGxpbmVfdGltZV91czsKIAkJaW50IGVudHJpZXM7CiAKKwkJaWYgKGVuYWJs ZWQtPnByaW1hcnktPnN0YXRlLT5mYikKKwkJCXBpeGVsX3NpemUgPSBlbmFibGVkLT5wcmltYXJ5 LT5zdGF0ZS0+ZmItPmJpdHNfcGVyX3BpeGVsIC8gODsKKwkJZWxzZQorCQkJcGl4ZWxfc2l6ZSA9 IDQ7CisKIAkJbGluZV90aW1lX3VzID0gbWF4KGh0b3RhbCAqIDEwMDAgLyBjbG9jaywgMSk7CiAK IAkJLyogVXNlIG5zL3VzIHRoZW4gZGl2aWRlIHRvIHByZXNlcnZlIHByZWNpc2lvbiAqLwpAQCAt MTk2MiwxMyArMTk5NywyNSBAQCBzdGF0aWMgdm9pZCBpbGtfY29tcHV0ZV93bV9wYXJhbWV0ZXJz KHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAlwLT5hY3RpdmUgPSB0cnVlOwogCXAtPnBpcGVfaHRv dGFsID0gaW50ZWxfY3J0Yy0+Y29uZmlnLT5iYXNlLmFkanVzdGVkX21vZGUuY3J0Y19odG90YWw7 CiAJcC0+cGl4ZWxfcmF0ZSA9IGlsa19waXBlX3BpeGVsX3JhdGUoZGV2LCBjcnRjKTsKLQlwLT5w cmkuYnl0ZXNfcGVyX3BpeGVsID0gY3J0Yy0+cHJpbWFyeS0+c3RhdGUtPmZiLT5iaXRzX3Blcl9w aXhlbCAvIDg7Ci0JcC0+Y3VyLmJ5dGVzX3Blcl9waXhlbCA9IDQ7CisKKwlpZiAoY3J0Yy0+cHJp bWFyeS0+c3RhdGUtPmZiKSB7CisJCXAtPnByaS5lbmFibGVkID0gdHJ1ZTsKKwkJcC0+cHJpLmJ5 dGVzX3Blcl9waXhlbCA9CisJCQljcnRjLT5wcmltYXJ5LT5zdGF0ZS0+ZmItPmJpdHNfcGVyX3Bp eGVsIC8gODsKKwl9IGVsc2UgeworCQlwLT5wcmkuZW5hYmxlZCA9IGZhbHNlOworCQlwLT5wcmku Ynl0ZXNfcGVyX3BpeGVsID0gMDsKKwl9CisKKwlpZiAoY3J0Yy0+Y3Vyc29yLT5zdGF0ZS0+ZmIp IHsKKwkJcC0+Y3VyLmVuYWJsZWQgPSB0cnVlOworCQlwLT5jdXIuYnl0ZXNfcGVyX3BpeGVsID0g NDsKKwl9IGVsc2UgeworCQlwLT5jdXIuZW5hYmxlZCA9IGZhbHNlOworCQlwLT5jdXIuYnl0ZXNf cGVyX3BpeGVsID0gMDsKKwl9CiAJcC0+cHJpLmhvcml6X3BpeGVscyA9IGludGVsX2NydGMtPmNv bmZpZy0+cGlwZV9zcmNfdzsKIAlwLT5jdXIuaG9yaXpfcGl4ZWxzID0gaW50ZWxfY3J0Yy0+YmFz ZS5jdXJzb3ItPnN0YXRlLT5jcnRjX3c7Ci0JLyogVE9ETzogZm9yIG5vdywgYXNzdW1lIHByaW1h cnkgYW5kIGN1cnNvciBwbGFuZXMgYXJlIGFsd2F5cyBlbmFibGVkLiAqLwotCXAtPnByaS5lbmFi bGVkID0gdHJ1ZTsKLQlwLT5jdXIuZW5hYmxlZCA9IHRydWU7CiAKIAlkcm1fZm9yX2VhY2hfbGVn YWN5X3BsYW5lKHBsYW5lLCAmZGV2LT5tb2RlX2NvbmZpZy5wbGFuZV9saXN0KSB7CiAJCXN0cnVj dCBpbnRlbF9wbGFuZSAqaW50ZWxfcGxhbmUgPSB0b19pbnRlbF9wbGFuZShwbGFuZSk7CkBAIC0y NzM0LDI3ICsyNzgxLDMxIEBAIHN0YXRpYyB2b2lkIHNrbF9jb21wdXRlX3dtX3BpcGVfcGFyYW1l dGVycyhzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJCXAtPnBpcGVfaHRvdGFsID0gaW50ZWxfY3J0 Yy0+Y29uZmlnLT5iYXNlLmFkanVzdGVkX21vZGUuY3J0Y19odG90YWw7CiAJCXAtPnBpeGVsX3Jh dGUgPSBza2xfcGlwZV9waXhlbF9yYXRlKGludGVsX2NydGMtPmNvbmZpZyk7CiAKLQkJLyoKLQkJ ICogRm9yIG5vdywgYXNzdW1lIHByaW1hcnkgYW5kIGN1cnNvciBwbGFuZXMgYXJlIGFsd2F5cyBl bmFibGVkLgotCQkgKi8KLQkJcC0+cGxhbmVbMF0uZW5hYmxlZCA9IHRydWU7Ci0JCXAtPnBsYW5l WzBdLmJ5dGVzX3Blcl9waXhlbCA9Ci0JCQljcnRjLT5wcmltYXJ5LT5zdGF0ZS0+ZmItPmJpdHNf cGVyX3BpeGVsIC8gODsKLQkJcC0+cGxhbmVbMF0uaG9yaXpfcGl4ZWxzID0gaW50ZWxfY3J0Yy0+ Y29uZmlnLT5waXBlX3NyY193OwotCQlwLT5wbGFuZVswXS52ZXJ0X3BpeGVscyA9IGludGVsX2Ny dGMtPmNvbmZpZy0+cGlwZV9zcmNfaDsKLQkJcC0+cGxhbmVbMF0udGlsaW5nID0gRFJNX0ZPUk1B VF9NT0RfTk9ORTsKIAkJZmIgPSBjcnRjLT5wcmltYXJ5LT5zdGF0ZS0+ZmI7Ci0JCS8qCi0JCSAq IEZyYW1lYnVmZmVyIGNhbiBiZSBOVUxMIG9uIHBsYW5lIGRpc2FibGUsIGJ1dCBpdCBkb2VzIG5v dAotCQkgKiBtYXR0ZXIgZm9yIHdhdGVybWFya3MgaWYgd2UgYXNzdW1lIG5vIHRpbGluZyBpbiB0 aGF0IGNhc2UuCi0JCSAqLwotCQlpZiAoZmIpCisJCWlmIChmYikgeworCQkJcC0+cGxhbmVbMF0u ZW5hYmxlZCA9IHRydWU7CisJCQlwLT5wbGFuZVswXS5ieXRlc19wZXJfcGl4ZWwgPSBmYi0+Yml0 c19wZXJfcGl4ZWwgLyA4OwogCQkJcC0+cGxhbmVbMF0udGlsaW5nID0gZmItPm1vZGlmaWVyWzBd OworCQl9IGVsc2UgeworCQkJcC0+cGxhbmVbMF0uZW5hYmxlZCA9IGZhbHNlOworCQkJcC0+cGxh bmVbMF0uYnl0ZXNfcGVyX3BpeGVsID0gMDsKKwkJCXAtPnBsYW5lWzBdLnRpbGluZyA9IERSTV9G T1JNQVRfTU9EX05PTkU7CisJCX0KKwkJcC0+cGxhbmVbMF0uaG9yaXpfcGl4ZWxzID0gaW50ZWxf Y3J0Yy0+Y29uZmlnLT5waXBlX3NyY193OworCQlwLT5wbGFuZVswXS52ZXJ0X3BpeGVscyA9IGlu dGVsX2NydGMtPmNvbmZpZy0+cGlwZV9zcmNfaDsKIAotCQlwLT5jdXJzb3IuZW5hYmxlZCA9IHRy dWU7Ci0JCXAtPmN1cnNvci5ieXRlc19wZXJfcGl4ZWwgPSA0OwotCQlwLT5jdXJzb3IuaG9yaXpf cGl4ZWxzID0gaW50ZWxfY3J0Yy0+YmFzZS5jdXJzb3ItPnN0YXRlLT5jcnRjX3cgPwotCQkJCQkg aW50ZWxfY3J0Yy0+YmFzZS5jdXJzb3ItPnN0YXRlLT5jcnRjX3cgOiA2NDsKKwkJZmIgPSBjcnRj LT5jdXJzb3ItPnN0YXRlLT5mYjsKKwkJaWYgKGZiKSB7CisJCQlwLT5jdXJzb3IuZW5hYmxlZCA9 IHRydWU7CisJCQlwLT5jdXJzb3IuYnl0ZXNfcGVyX3BpeGVsID0gZmItPmJpdHNfcGVyX3BpeGVs IC8gODsKKwkJCXAtPmN1cnNvci5ob3Jpel9waXhlbHMgPSBjcnRjLT5jdXJzb3ItPnN0YXRlLT5j cnRjX3c7CisJCQlwLT5jdXJzb3IudmVydF9waXhlbHMgPSBjcnRjLT5jdXJzb3ItPnN0YXRlLT5j cnRjX2g7CisJCX0gZWxzZSB7CisJCQlwLT5jdXJzb3IuZW5hYmxlZCA9IGZhbHNlOworCQkJcC0+ Y3Vyc29yLmJ5dGVzX3Blcl9waXhlbCA9IDA7CisJCQlwLT5jdXJzb3IuaG9yaXpfcGl4ZWxzID0g NjQ7CisJCQlwLT5jdXJzb3IudmVydF9waXhlbHMgPSA2NDsKKwkJfQogCX0KIAogCWxpc3RfZm9y X2VhY2hfZW50cnkocGxhbmUsICZkZXYtPm1vZGVfY29uZmlnLnBsYW5lX2xpc3QsIGhlYWQpIHsK LS0gCjEuOC41LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9y ZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4 Cg==