From: Ander Conselvan de Oliveira Subject: [PATCH 4/9] drm/i915: Add infrastructure for choosing DPLLs before disabling crtcs Date: Wed, 29 Oct 2014 11:32:33 +0200 Message-ID: <1414575158-28148-5-git-send-email-ander.conselvan.de.oliveira@intel.com> References: <1414575158-28148-1-git-send-email-ander.conselvan.de.oliveira@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id C60BB6E4DC for ; Wed, 29 Oct 2014 02:33:57 -0700 (PDT) In-Reply-To: <1414575158-28148-1-git-send-email-ander.conselvan.de.oliveira@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: Ander Conselvan de Oliveira , ville.syrjala@intel.com, shuang.he@linux.intel.com List-Id: intel-gfx@lists.freedesktop.org SXQgaXMgcG9zc2libGUgZm9yIGEgbW9kZSBzZXQgdG8gZmFpbCBpZiB0aGVyZSBhcmVuJ3Qgc2hh cmVkIERQTExTIHRoYXQKbWF0Y2ggdGhlIG5ldyBjb25maWd1cmF0aW9uIHJlcXVpcmVtZW50IG9y IG90aGVyIGVycm9ycyBpbiBjbG9jawpjb21wdXRhdGlvbi4gSWYgdGhhdCBzdGVwIGlzIGV4ZWN1 dGVkIGFmdGVyIGRpc2FibGluZyBjcnRjcywgaW4gdGhlCmZhaWx1cmUgY2FzZSB0aGUgaGFyZHdh cmUgY29uZmlndXJhdGlvbiBpcyBjaGFuZ2VkIGFuZCBuZWVkcyB0byBiZQpyZXN0b3JlZC4gRG9p bmcgdGhvc2UgdGhpbmdzIGVhcmx5IHdpbGwgYWxsb3cgdGhlIG1vZGUgc2V0IHRvIGZhaWwKYmVm b3JlIGFjdHVhbGx5IHRvdWNoaW5nIHRoZSBoYXJkd2FyZS4KCkZvbGxvdyB1cCBwYXRjaGVzIHdp bGwgY29udmVydCBkaWZmZXJlbnQgcGxhdGZvcm1zIHRvIHVzZSB0aGUgbmV3CmluZnJhc3RydWN0 dXJlLgoKdjI6IEtlZXAgcGxsLT5uZXdfY29uZmlnIHZhbGlkIG9ubHkgZHVyaW5nIG1vZGUgc2V0 IChWaWxsZSkKICAgIFVzZSBrbWVtZHVwKCkgaW4gaTkxNV9zaGFyZWRfZHBsbF9zdGFydF9jb25m aWcoKSAoVmlsbGUpCiAgICBSZXN0b3JlIG9sZCBwbGwgY29uZmlnIGlmIHNvbWV0aGluZyBmYWls cyBiZWZvcmUgY29tbWl0IChWaWxsZSkKICAgIERvbid0IHNldCBjb21wdXRlX2Nsb2NrIGhvb2tz IHNpbmNlIGRldl9wcml2IGlzIGt6YWxsb2MoKSdkIChWaWxsZSkKClNpZ25lZC1vZmYtYnk6IEFu ZGVyIENvbnNlbHZhbiBkZSBPbGl2ZWlyYSA8YW5kZXIuY29uc2VsdmFuLmRlLm9saXZlaXJhQGlu dGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICAgfCAgIDMg KwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgMTQyICsrKysrKysrKysr KysrKysrKysrKysrKysrKystLS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDExNyBpbnNlcnRpb25z KCspLCAyOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCA0YjNjMDBm Li4yZDA3Yjc5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTIzMyw2ICsyMzMsOCBAQCBz dHJ1Y3QgaW50ZWxfc2hhcmVkX2RwbGxfY29uZmlnIHsKIAogc3RydWN0IGludGVsX3NoYXJlZF9k cGxsIHsKIAlzdHJ1Y3QgaW50ZWxfc2hhcmVkX2RwbGxfY29uZmlnIGNvbmZpZzsKKwlzdHJ1Y3Qg aW50ZWxfc2hhcmVkX2RwbGxfY29uZmlnICpuZXdfY29uZmlnOworCiAJaW50IGFjdGl2ZTsgLyog Y291bnQgb2YgbnVtYmVyIG9mIGFjdGl2ZSBDUlRDcyAoaS5lLiBEUE1TIG9uKSAqLwogCWJvb2wg b247IC8qIGlzIHRoZSBQTEwgYWN0dWFsbHkgYWN0aXZlPyBEaXNhYmxlZCBkdXJpbmcgbW9kZXNl dCAqLwogCWNvbnN0IGNoYXIgKm5hbWU7CkBAIC00ODEsNiArNDgzLDcgQEAgc3RydWN0IGRybV9p OTE1X2Rpc3BsYXlfZnVuY3MgewogCQkJCXN0cnVjdCBpbnRlbF9jcnRjX2NvbmZpZyAqKTsKIAl2 b2lkICgqZ2V0X3BsYW5lX2NvbmZpZykoc3RydWN0IGludGVsX2NydGMgKiwKIAkJCQkgc3RydWN0 IGludGVsX3BsYW5lX2NvbmZpZyAqKTsKKwlpbnQgKCpjcnRjX2NvbXB1dGVfY2xvY2spKHN0cnVj dCBpbnRlbF9jcnRjICpjcnRjKTsKIAlpbnQgKCpjcnRjX21vZGVfc2V0KShzdHJ1Y3QgaW50ZWxf Y3J0YyAqY3J0YywKIAkJCSAgICAgaW50IHgsIGludCB5LAogCQkJICAgICBzdHJ1Y3QgZHJtX2Zy YW1lYnVmZmVyICpvbGRfZmIpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4 IGFmZjlhYTUuLjY3Zjg4MjggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAg LTM4NTksMTUgKzM4NTksOSBAQCB2b2lkIGludGVsX3B1dF9zaGFyZWRfZHBsbChzdHJ1Y3QgaW50 ZWxfY3J0YyAqY3J0YykKIHN0cnVjdCBpbnRlbF9zaGFyZWRfZHBsbCAqaW50ZWxfZ2V0X3NoYXJl ZF9kcGxsKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiA9IGNydGMtPmJhc2UuZGV2LT5kZXZfcHJpdmF0ZTsKLQlzdHJ1Y3QgaW50 ZWxfc2hhcmVkX2RwbGwgKnBsbCA9IGludGVsX2NydGNfdG9fc2hhcmVkX2RwbGwoY3J0Yyk7CisJ c3RydWN0IGludGVsX3NoYXJlZF9kcGxsICpwbGw7CiAJZW51bSBpbnRlbF9kcGxsX2lkIGk7CiAK LQlpZiAocGxsKSB7Ci0JCURSTV9ERUJVR19LTVMoIkNSVEM6JWQgZHJvcHBpbmcgZXhpc3Rpbmcg JXNcbiIsCi0JCQkgICAgICBjcnRjLT5iYXNlLmJhc2UuaWQsIHBsbC0+bmFtZSk7Ci0JCWludGVs X3B1dF9zaGFyZWRfZHBsbChjcnRjKTsKLQl9Ci0KIAlpZiAoSEFTX1BDSF9JQlgoZGV2X3ByaXYt PmRldikpIHsKIAkJLyogSXJvbmxha2UgUENIIGhhcyBhIGZpeGVkIFBMTC0+UENIIHBpcGUgbWFw cGluZy4gKi8KIAkJaSA9IChlbnVtIGludGVsX2RwbGxfaWQpIGNydGMtPnBpcGU7CkBAIC0zODc2 LDcgKzM4NzAsNyBAQCBzdHJ1Y3QgaW50ZWxfc2hhcmVkX2RwbGwgKmludGVsX2dldF9zaGFyZWRf ZHBsbChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIAkJRFJNX0RFQlVHX0tNUygiQ1JUQzolZCB1 c2luZyBwcmUtYWxsb2NhdGVkICVzXG4iLAogCQkJICAgICAgY3J0Yy0+YmFzZS5iYXNlLmlkLCBw bGwtPm5hbWUpOwogCi0JCVdBUk5fT04ocGxsLT5jb25maWcuY3J0Y19tYXNrKTsKKwkJV0FSTl9P TihwbGwtPm5ld19jb25maWctPmNydGNfbWFzayk7CiAKIAkJZ290byBmb3VuZDsKIAl9CkBAIC0z ODg1LDE3ICszODc5LDE2IEBAIHN0cnVjdCBpbnRlbF9zaGFyZWRfZHBsbCAqaW50ZWxfZ2V0X3No YXJlZF9kcGxsKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQogCQlwbGwgPSAmZGV2X3ByaXYtPnNo YXJlZF9kcGxsc1tpXTsKIAogCQkvKiBPbmx5IHdhbnQgdG8gY2hlY2sgZW5hYmxlZCB0aW1pbmdz IGZpcnN0ICovCi0JCWlmIChwbGwtPmNvbmZpZy5jcnRjX21hc2sgPT0gMCkKKwkJaWYgKHBsbC0+ bmV3X2NvbmZpZy0+Y3J0Y19tYXNrID09IDApCiAJCQljb250aW51ZTsKIAotCQlpZiAobWVtY21w KCZjcnRjLT5jb25maWcuZHBsbF9od19zdGF0ZSwKLQkJCSAgICZwbGwtPmNvbmZpZy5od19zdGF0 ZSwKLQkJCSAgIHNpemVvZihwbGwtPmNvbmZpZy5od19zdGF0ZSkpID09IDApIHsKLQkJCURSTV9E RUJVR19LTVMoIkNSVEM6JWQgc2hhcmluZyBleGlzdGluZyAlcyAiCi0JCQkJICAgICAgIihjcnRj X21hc2sgMHglMDh4LCBhY3RpdmUgJWQpXG4iLAorCQlpZiAobWVtY21wKCZjcnRjLT5uZXdfY29u ZmlnLT5kcGxsX2h3X3N0YXRlLAorCQkJICAgJnBsbC0+bmV3X2NvbmZpZy0+aHdfc3RhdGUsCisJ CQkgICBzaXplb2YocGxsLT5uZXdfY29uZmlnLT5od19zdGF0ZSkpID09IDApIHsKKwkJCURSTV9E RUJVR19LTVMoIkNSVEM6JWQgc2hhcmluZyBleGlzdGluZyAlcyAoY3J0YyBtYXNrIDB4JTA4eCwg YXRpdmUgJWQpXG4iLAogCQkJCSAgICAgIGNydGMtPmJhc2UuYmFzZS5pZCwgcGxsLT5uYW1lLAot CQkJCSAgICAgIHBsbC0+Y29uZmlnLmNydGNfbWFzaywgcGxsLT5hY3RpdmUpOwotCisJCQkJICAg ICAgcGxsLT5uZXdfY29uZmlnLT5jcnRjX21hc2ssCisJCQkJICAgICAgcGxsLT5hY3RpdmUpOwog CQkJZ290byBmb3VuZDsKIAkJfQogCX0KQEAgLTM5MDMsNyArMzg5Niw3IEBAIHN0cnVjdCBpbnRl bF9zaGFyZWRfZHBsbCAqaW50ZWxfZ2V0X3NoYXJlZF9kcGxsKHN0cnVjdCBpbnRlbF9jcnRjICpj cnRjKQogCS8qIE9rIG5vIG1hdGNoaW5nIHRpbWluZ3MsIG1heWJlIHRoZXJlJ3MgYSBmcmVlIG9u ZT8gKi8KIAlmb3IgKGkgPSAwOyBpIDwgZGV2X3ByaXYtPm51bV9zaGFyZWRfZHBsbDsgaSsrKSB7 CiAJCXBsbCA9ICZkZXZfcHJpdi0+c2hhcmVkX2RwbGxzW2ldOwotCQlpZiAocGxsLT5jb25maWcu Y3J0Y19tYXNrID09IDApIHsKKwkJaWYgKHBsbC0+bmV3X2NvbmZpZy0+Y3J0Y19tYXNrID09IDAp IHsKIAkJCURSTV9ERUJVR19LTVMoIkNSVEM6JWQgYWxsb2NhdGVkICVzXG4iLAogCQkJCSAgICAg IGNydGMtPmJhc2UuYmFzZS5pZCwgcGxsLT5uYW1lKTsKIAkJCWdvdG8gZm91bmQ7CkBAIC0zOTEz LDE4ICszOTA2LDg1IEBAIHN0cnVjdCBpbnRlbF9zaGFyZWRfZHBsbCAqaW50ZWxfZ2V0X3NoYXJl ZF9kcGxsKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQogCXJldHVybiBOVUxMOwogCiBmb3VuZDoK LQlpZiAocGxsLT5jb25maWcuY3J0Y19tYXNrID09IDApCi0JCXBsbC0+Y29uZmlnLmh3X3N0YXRl ID0gY3J0Yy0+Y29uZmlnLmRwbGxfaHdfc3RhdGU7CisJaWYgKHBsbC0+bmV3X2NvbmZpZy0+Y3J0 Y19tYXNrID09IDApCisJCXBsbC0+bmV3X2NvbmZpZy0+aHdfc3RhdGUgPSBjcnRjLT5uZXdfY29u ZmlnLT5kcGxsX2h3X3N0YXRlOwogCi0JY3J0Yy0+Y29uZmlnLnNoYXJlZF9kcGxsID0gaTsKKwlj cnRjLT5uZXdfY29uZmlnLT5zaGFyZWRfZHBsbCA9IGk7CiAJRFJNX0RFQlVHX0RSSVZFUigidXNp bmcgJXMgZm9yIHBpcGUgJWNcbiIsIHBsbC0+bmFtZSwKIAkJCSBwaXBlX25hbWUoY3J0Yy0+cGlw ZSkpOwogCi0JcGxsLT5jb25maWcuY3J0Y19tYXNrIHw9IDEgPDwgY3J0Yy0+cGlwZTsKKwlwbGwt Pm5ld19jb25maWctPmNydGNfbWFzayB8PSAxIDw8IGNydGMtPnBpcGU7CiAKIAlyZXR1cm4gcGxs OwogfQogCisvKioKKyAqIGludGVsX3NoYXJlZF9kcGxsX3N0YXJ0X2NvbmZpZyAtIHN0YXJ0IGEg bmV3IFBMTCBzdGFnZWQgY29uZmlnCisgKiBAZGV2X3ByaXY6IERSTSBkZXZpY2UKKyAqIEBjbGVh cl9waXBlczogbWFzayBvZiBwaXBlcyB0aGF0IHdpbGwgaGF2ZSB0aGVpciBQTExzIGZyZWVkCisg KgorICogU3RhcnRzIGEgbmV3IFBMTCBzdGFnZWQgY29uZmlnLCBjb3B5aW5nIHRoZSBjdXJyZW50 IGNvbmZpZyBidXQKKyAqIHJlbGVhc2luZyB0aGUgcmVmZXJlbmNlcyBvZiBwaXBlcyBzcGVjaWZp ZWQgaW4gY2xlYXJfcGlwZXMuCisgKi8KK3N0YXRpYyBpbnQgaW50ZWxfc2hhcmVkX2RwbGxfc3Rh cnRfY29uZmlnKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKKwkJCQkJICB1bnNp Z25lZCBjbGVhcl9waXBlcykKK3sKKwlzdHJ1Y3QgaW50ZWxfc2hhcmVkX2RwbGwgKnBsbDsKKwll bnVtIGludGVsX2RwbGxfaWQgaTsKKworCWZvciAoaSA9IDA7IGkgPCBkZXZfcHJpdi0+bnVtX3No YXJlZF9kcGxsOyBpKyspIHsKKwkJcGxsID0gJmRldl9wcml2LT5zaGFyZWRfZHBsbHNbaV07CisK KwkJcGxsLT5uZXdfY29uZmlnID0ga21lbWR1cCgmcGxsLT5jb25maWcsIHNpemVvZiBwbGwtPmNv bmZpZywKKwkJCQkJICBHRlBfS0VSTkVMKTsKKwkJaWYgKCFwbGwtPm5ld19jb25maWcpCisJCQln b3RvIGNsZWFudXA7CisKKwkJcGxsLT5uZXdfY29uZmlnLT5jcnRjX21hc2sgJj0gfmNsZWFyX3Bp cGVzOworCX0KKworCXJldHVybiAwOworCitjbGVhbnVwOgorCXdoaWxlICgtLWkgPj0gMCkgewor CQlwbGwgPSAmZGV2X3ByaXYtPnNoYXJlZF9kcGxsc1tpXTsKKwkJcGxsLT5uZXdfY29uZmlnID0g TlVMTDsKKwl9CisKKwlyZXR1cm4gLUVOT01FTTsKK30KKworc3RhdGljIHZvaWQgaW50ZWxfc2hh cmVkX2RwbGxfY29tbWl0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKK3sKKwlz dHJ1Y3QgaW50ZWxfc2hhcmVkX2RwbGwgKnBsbDsKKwllbnVtIGludGVsX2RwbGxfaWQgaTsKKwor CWZvciAoaSA9IDA7IGkgPCBkZXZfcHJpdi0+bnVtX3NoYXJlZF9kcGxsOyBpKyspIHsKKwkJcGxs ID0gJmRldl9wcml2LT5zaGFyZWRfZHBsbHNbaV07CisKKwkJV0FSTl9PTihwbGwtPm5ld19jb25m aWcgPT0gJnBsbC0+Y29uZmlnKTsKKworCQlwbGwtPmNvbmZpZyA9ICpwbGwtPm5ld19jb25maWc7 CisJCWtmcmVlKHBsbC0+bmV3X2NvbmZpZyk7CisJCXBsbC0+bmV3X2NvbmZpZyA9IE5VTEw7CisJ fQorfQorCitzdGF0aWMgdm9pZCBpbnRlbF9zaGFyZWRfZHBsbF9hYm9ydF9jb25maWcoc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQoreworCXN0cnVjdCBpbnRlbF9zaGFyZWRfZHBs bCAqcGxsOworCWVudW0gaW50ZWxfZHBsbF9pZCBpOworCisJZm9yIChpID0gMDsgaSA8IGRldl9w cml2LT5udW1fc2hhcmVkX2RwbGw7IGkrKykgeworCQlwbGwgPSAmZGV2X3ByaXYtPnNoYXJlZF9k cGxsc1tpXTsKKworCQlXQVJOX09OKHBsbC0+bmV3X2NvbmZpZyA9PSAmcGxsLT5jb25maWcpOwor CisJCWtmcmVlKHBsbC0+bmV3X2NvbmZpZyk7CisJCXBsbC0+bmV3X2NvbmZpZyA9IE5VTEw7CisJ fQorfQorCiBzdGF0aWMgdm9pZCBjcHRfdmVyaWZ5X21vZGVzZXQoc3RydWN0IGRybV9kZXZpY2Ug KmRldiwgaW50IHBpcGUpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0g ZGV2LT5kZXZfcHJpdmF0ZTsKQEAgLTU0MDksMTEgKzU0NjksMTEgQEAgc3RhdGljIGludCBpbnRl bF9jcnRjX2NvbXB1dGVfY29uZmlnKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogCQkJCSAgICAg c3RydWN0IGludGVsX2NydGNfY29uZmlnICpwaXBlX2NvbmZpZykKIHsKIAlzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2ID0gY3J0Yy0+YmFzZS5kZXY7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqYWRq dXN0ZWRfbW9kZSA9ICZwaXBlX2NvbmZpZy0+YWRqdXN0ZWRfbW9kZTsKIAogCS8qIEZJWE1FIHNo b3VsZCBjaGVjayBwaXhlbCBjbG9jayBsaW1pdHMgb24gYWxsIHBsYXRmb3JtcyAqLwogCWlmIChJ TlRFTF9JTkZPKGRldiktPmdlbiA8IDQpIHsKLQkJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAkJaW50IGNsb2NrX2xpbWl0ID0KIAkJCWRldl9w cml2LT5kaXNwbGF5LmdldF9kaXNwbGF5X2Nsb2NrX3NwZWVkKGRldik7CiAKQEAgLTU0NjMsMTAg KzU1MjMsMTEgQEAgc3RhdGljIGludCBpbnRlbF9jcnRjX2NvbXB1dGVfY29uZmlnKHN0cnVjdCBp bnRlbF9jcnRjICpjcnRjLAogCQloc3dfY29tcHV0ZV9pcHNfY29uZmlnKGNydGMsIHBpcGVfY29u ZmlnKTsKIAogCS8qCi0JICogWFhYOiBQQ0gvV1JQTEwgY2xvY2sgc2hhcmluZyBpcyBkb25lIGlu IC0+bW9kZV9zZXQsIHNvIG1ha2Ugc3VyZSB0aGUKLQkgKiBvbGQgY2xvY2sgc3Vydml2ZXMgZm9y IG5vdy4KKwkgKiBYWFg6IFBDSC9XUlBMTCBjbG9jayBzaGFyaW5nIGlzIGRvbmUgaW4gLT5tb2Rl X3NldCBpZiAtPmNvbXB1dGVfY2xvY2sgaXMgbm90CisJICogc2V0LCBzbyBtYWtlIHN1cmUgdGhl IG9sZCBjbG9jayBzdXJ2aXZlcyBmb3Igbm93LgogCSAqLwotCWlmIChIQVNfUENIX0lCWChkZXYp IHx8IEhBU19QQ0hfQ1BUKGRldikgfHwgSEFTX0RESShkZXYpKQorCWlmIChkZXZfcHJpdi0+ZGlz cGxheS5jcnRjX2NvbXB1dGVfY2xvY2sgPT0gTlVMTCAmJgorICAgICAgICAgICAgKEhBU19QQ0hf SUJYKGRldikgfHwgSEFTX1BDSF9DUFQoZGV2KSB8fCBIQVNfRERJKGRldikpKQogCQlwaXBlX2Nv bmZpZy0+c2hhcmVkX2RwbGwgPSBjcnRjLT5jb25maWcuc2hhcmVkX2RwbGw7CiAKIAlpZiAocGlw ZV9jb25maWctPmhhc19wY2hfZW5jb2RlcikKQEAgLTczOTUsNiArNzQ1Niw5IEBAIHN0YXRpYyBp bnQgaXJvbmxha2VfY3J0Y19tb2RlX3NldChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKIAkJZWxz ZQogCQkJY3J0Yy0+bmV3X2NvbmZpZy0+ZHBsbF9od19zdGF0ZS5mcDEgPSBmcDsKIAorCQlpZiAo aW50ZWxfY3J0Y190b19zaGFyZWRfZHBsbChjcnRjKSkKKwkJCWludGVsX3B1dF9zaGFyZWRfZHBs bChjcnRjKTsKKwogCQlwbGwgPSBpbnRlbF9nZXRfc2hhcmVkX2RwbGwoY3J0Yyk7CiAJCWlmIChw bGwgPT0gTlVMTCkgewogCQkJRFJNX0RFQlVHX0RSSVZFUigiZmFpbGVkIHRvIGZpbmQgUExMIGZv ciBwaXBlICVjXG4iLApAQCAtMTA3MzksNiArMTA4MDMsMjIgQEAgc3RhdGljIGludCBfX2ludGVs X3NldF9tb2RlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkJcHJlcGFyZV9waXBlcyAmPSB+ZGlz YWJsZV9waXBlczsKIAl9CiAKKwlpZiAoZGV2X3ByaXYtPmRpc3BsYXkuY3J0Y19jb21wdXRlX2Ns b2NrKSB7CisJCXVuc2lnbmVkIGNsZWFyX3BpcGVzID0gbW9kZXNldF9waXBlcyB8IGRpc2FibGVf cGlwZXM7CisKKwkJcmV0ID0gaW50ZWxfc2hhcmVkX2RwbGxfc3RhcnRfY29uZmlnKGRldl9wcml2 LCBjbGVhcl9waXBlcyk7CisJCWlmIChyZXQpCisJCQlnb3RvIGRvbmU7CisKKwkJZm9yX2VhY2hf aW50ZWxfY3J0Y19tYXNrZWQoZGV2LCBtb2Rlc2V0X3BpcGVzLCBpbnRlbF9jcnRjKSB7CisJCQly ZXQgPSBkZXZfcHJpdi0+ZGlzcGxheS5jcnRjX2NvbXB1dGVfY2xvY2soaW50ZWxfY3J0Yyk7CisJ CQlpZiAocmV0KSB7CisJCQkJaW50ZWxfc2hhcmVkX2RwbGxfYWJvcnRfY29uZmlnKGRldl9wcml2 KTsKKwkJCQlnb3RvIGRvbmU7CisJCQl9CisJCX0KKwl9CisKIAlmb3JfZWFjaF9pbnRlbF9jcnRj X21hc2tlZChkZXYsIGRpc2FibGVfcGlwZXMsIGludGVsX2NydGMpCiAJCWludGVsX2NydGNfZGlz YWJsZSgmaW50ZWxfY3J0Yy0+YmFzZSk7CiAKQEAgLTEwNzY2LDYgKzEwODQ2LDkgQEAgc3RhdGlj IGludCBfX2ludGVsX3NldF9tb2RlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkJCQkJCSZwaXBl X2NvbmZpZy0+YWRqdXN0ZWRfbW9kZSk7CiAJfQogCisJaWYgKGRldl9wcml2LT5kaXNwbGF5LmNy dGNfY29tcHV0ZV9jbG9jaykKKwkJaW50ZWxfc2hhcmVkX2RwbGxfY29tbWl0KGRldl9wcml2KTsK KwogCS8qIE9ubHkgYWZ0ZXIgZGlzYWJsaW5nIGFsbCBvdXRwdXQgcGlwZWxpbmVzIHRoYXQgd2ls bCBiZSBjaGFuZ2VkIGNhbiB3ZQogCSAqIHVwZGF0ZSB0aGUgdGhlIG91dHB1dCBjb25maWd1cmF0 aW9uLiAqLwogCWludGVsX21vZGVzZXRfdXBkYXRlX3N0YXRlKGRldiwgcHJlcGFyZV9waXBlcyk7 CkBAIC0xMDgwMCw5ICsxMDg4MywxMiBAQCBzdGF0aWMgaW50IF9faW50ZWxfc2V0X21vZGUoc3Ry dWN0IGRybV9jcnRjICpjcnRjLAogCQljcnRjLT54ID0geDsKIAkJY3J0Yy0+eSA9IHk7CiAKLQkJ cmV0ID0gZGV2X3ByaXYtPmRpc3BsYXkuY3J0Y19tb2RlX3NldChpbnRlbF9jcnRjLCB4LCB5LCBm Yik7Ci0JCWlmIChyZXQpCi0JCQlnb3RvIGRvbmU7CisJCWlmIChkZXZfcHJpdi0+ZGlzcGxheS5j cnRjX21vZGVfc2V0KSB7CisJCQlyZXQgPSBkZXZfcHJpdi0+ZGlzcGxheS5jcnRjX21vZGVfc2V0 KGludGVsX2NydGMsCisJCQkJCQkJICAgICAgeCwgeSwgZmIpOworCQkJaWYgKHJldCkKKwkJCQln b3RvIGRvbmU7CisJCX0KIAl9CiAKIAkvKiBOb3cgZW5hYmxlIHRoZSBjbG9ja3MsIHBsYW5lLCBw aXBlLCBhbmQgY29ubmVjdG9ycyB0aGF0IHdlIHNldCB1cC4gKi8KLS0gCjEuOS4xCgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGlu ZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVk ZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=