From: "Kumar, Mahesh" Subject: [PATCH v4 2/8] drm/i915/skl: New ddb allocation algorithm Date: Thu, 13 Oct 2016 16:28:20 +0530 Message-ID: <20161013105826.9710-3-mahesh1.kumar@intel.com> References: <20161013105826.9710-1-mahesh1.kumar@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7DB9C6E3FD for ; Thu, 13 Oct 2016 10:58:19 +0000 (UTC) In-Reply-To: <20161013105826.9710-1-mahesh1.kumar@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: paulo.r.zanoni@intel.com List-Id: intel-gfx@lists.freedesktop.org RnJvbTogTWFoZXNoIEt1bWFyIDxtYWhlc2gxLmt1bWFyQGludGVsLmNvbT4KClRoaXMgcGF0Y2gg aW1wbGVtZW50cyBuZXcgRERCIGFsbG9jYXRpb24gYWxnb3JpdGhtIGFzIHBlciBIVyB0ZWFtCnJl Y29tbWVuZGF0aW9uLiBUaGlzIGFsZ28gdGFrZWNhcmUgb2Ygc2NlbmFyaW8gd2hlcmUgd2UgYWxs b2NhdGUgbGVzcyBEREIKZm9yIHRoZSBwbGFuZXMgd2l0aCBsb3dlciByZWxhdGl2ZSBwaXhlbCBy YXRlLCBidXQgdGhleSByZXF1aXJlIG1vcmUgRERCCnRvIHdvcmsuCkl0IGFsc28gdGFrZXMgY2Fy ZSBvZiBlbmFibGluZyBzYW1lIHdhdGVybWFyayBsZXZlbCBmb3IgZWFjaApwbGFuZSwgZm9yIGVm ZmljaWVudCBwb3dlciBzYXZpbmcuCgpDaGFuZ2VzIHNpbmNlIHYxOgogLSBSZWJhc2Ugb24gdG9w IG9mIFBhdWxvJ3MgcGF0Y2ggc2VyaWVzCgpDaGFuZ2VzIHNpbmNlIHYyOgogLSBGaXggdGhlIGZv ciBsb29wIGNvbmRpdGlvbiB0byBlbmFibGUgV00KCkNoYW5nZXMgc2luY2UgdjM6CiAtIEZpeCBj cmFzaCBpbiBjdXJzb3IgaS1nLXQgcmVwb3J0ZWQgYnkgTWFhcnRlbgogLSBSZWJhc2UgYWZ0ZXIg YWRkcmVzc2luZyBQYXVsbydzIGNvbW1lbnRzCiAtIEZldyBvdGhlciBVTFQgZml4ZXMKClNpZ25l ZC1vZmYtYnk6IE1haGVzaCBLdW1hciA8bWFoZXNoMS5rdW1hckBpbnRlbC5jb20+Ci0tLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyB8IDE0OSArKysrKysrKysrKysrKysrKysrKyst LS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNzkgaW5zZXJ0aW9ucygrKSwgNzAg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0u YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKaW5kZXggMDk4MzM2ZC4uODRlYzZi MSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCkBAIC0zMzQ0LDYgKzMzNDQsNyBAQCBza2xfZGRi X21pbl9hbGxvYyhjb25zdCBzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpwc3RhdGUsCiAKIHN0YXRp YyBpbnQKIHNrbF9hbGxvY2F0ZV9waXBlX2RkYihzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0 YXRlLAorCQkgICAgICBzdHJ1Y3Qgc2tsX3BpcGVfd20gKnBpcGVfd20sCiAJCSAgICAgIHN0cnVj dCBza2xfZGRiX2FsbG9jYXRpb24gKmRkYiAvKiBvdXQgKi8pCiB7CiAJc3RydWN0IGRybV9hdG9t aWNfc3RhdGUgKnN0YXRlID0gY3N0YXRlLT5iYXNlLnN0YXRlOwpAQCAtMzM1OSw4ICszMzYwLDEy IEBAIHNrbF9hbGxvY2F0ZV9waXBlX2RkYihzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRl LAogCXVpbnQxNl90ICptaW5pbXVtID0gY3N0YXRlLT53bS5za2wubWluaW11bV9ibG9ja3M7CiAJ dWludDE2X3QgKnlfbWluaW11bSA9IGNzdGF0ZS0+d20uc2tsLm1pbmltdW1feV9ibG9ja3M7CiAJ dW5zaWduZWQgaW50IHRvdGFsX2RhdGFfcmF0ZTsKKwl1aW50MTZfdCB0b3RhbF9taW5fYmxvY2tz ID0gMDsKKwl1aW50MTZfdCB0b3RhbF9sZXZlbF9kZGIgPSAwOwogCWludCBudW1fYWN0aXZlOwot CWludCBpZCwgaTsKKwlpbnQgbWF4X2xldmVsLCBsZXZlbDsKKwlpbnQgaWQsIGksIHJldCA9IDA7 CisKIAogCWlmIChXQVJOX09OKCFzdGF0ZSkpCiAJCXJldHVybiAwOwpAQCAtMzQwOSwxOSArMzQx NCw0MiBAQCBza2xfYWxsb2NhdGVfcGlwZV9kZGIoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNz dGF0ZSwKIAl9CiAKIAlmb3IgKGkgPSAwOyBpIDwgUExBTkVfQ1VSU09SOyBpKyspIHsKLQkJYWxs b2Nfc2l6ZSAtPSBtaW5pbXVtW2ldOwotCQlhbGxvY19zaXplIC09IHlfbWluaW11bVtpXTsKKwkJ dG90YWxfbWluX2Jsb2NrcyArPSBtaW5pbXVtW2ldOworCQl0b3RhbF9taW5fYmxvY2tzICs9IHlf bWluaW11bVtpXTsKIAl9CiAKLQkvKgotCSAqIDIuIERpc3RyaWJ1dGUgdGhlIHJlbWFpbmluZyBz cGFjZSBpbiBwcm9wb3J0aW9uIHRvIHRoZSBhbW91bnQgb2YKLQkgKiBkYXRhIGVhY2ggcGxhbmUg bmVlZHMgdG8gZmV0Y2ggZnJvbSBtZW1vcnkuCi0JICoKLQkgKiBGSVhNRTogd2UgbWF5IG5vdCBh bGxvY2F0ZSBldmVyeSBzaW5nbGUgYmxvY2sgaGVyZS4KLQkgKi8KKwlmb3IgKGxldmVsID0gaWxr X3dtX21heF9sZXZlbChkZXYpOyBsZXZlbCA+PSAwOyBsZXZlbC0tKSB7CisJCXRvdGFsX2xldmVs X2RkYiA9IDA7CisJCWZvciAoaSA9IDA7IGkgPCBQTEFORV9DVVJTT1I7IGkrKykgeworCQkJLyoK KwkJCSAqIFRPRE86IFdlIHNob3VsZCBjYWxjdWxhdGUgd2F0ZXJtYXJrIHZhbHVlcyBmb3IgWS9V VgorCQkJICogcGxhbmUgYm90aCBpbiBjYXNlIG9mIE5WMTIgZm9ybWF0IGFuZCB1c2UgYm90aCB2 YWx1ZXMKKwkJCSAqIGZvciBkZGIgY2FsY3VsYXRpb24sIEFzIE5WMTIgaXMgZGlzYWJsZWQgYXMg b2Ygbm93LgorCQkJICogdXNpbmcgb25seSBzaW5nbGUgcGxhbmUgdmFsdWUgaGVyZS4KKwkJCSAq LworCQkJdWludDE2X3QgbWluID0gbWluaW11bVtpXSArIHlfbWluaW11bVtpXTsKKwkJCXVpbnQx Nl90IHBsYW5lX2xldmVsX2RkYl93bSA9CisJCQkJbWF4KHBpcGVfd20tPndtW2xldmVsXS5wbGFu ZV9yZXNfYltpXSwgbWluKTsKKwkJCXRvdGFsX2xldmVsX2RkYiArPSBwbGFuZV9sZXZlbF9kZGJf d207CisJCX0KKworCQlpZiAodG90YWxfbGV2ZWxfZGRiIDw9IGFsbG9jX3NpemUpCisJCQlicmVh azsKKwl9CisKKwlpZiAoKGxldmVsIDwgMCkgfHwgKHRvdGFsX21pbl9ibG9ja3MgPiBhbGxvY19z aXplKSkgeworCQlEUk1fREVCVUdfS01TKCJSZXF1ZXN0ZWQgZGlzcGxheSBjb25maWd1cmF0aW9u IGV4Y2VlZHMgc3lzdGVtIEREQiBsaW1pdGF0aW9ucyIpOworCQlEUk1fREVCVUdfS01TKCJtaW5p bXVtIHJlcXVpcmVkICVkLyVkXG4iLCAobGV2ZWwgPCAwKSA/CisJCQkJdG90YWxfbGV2ZWxfZGRi IDogdG90YWxfbWluX2Jsb2NrcywgYWxsb2Nfc2l6ZSk7CisJCXJldCA9IC1FSU5WQUw7CisJCWdv dG8gZXhpdDsKKwl9CisJbWF4X2xldmVsID0gbGV2ZWw7CisJYWxsb2Nfc2l6ZSAtPSB0b3RhbF9s ZXZlbF9kZGI7CisKIAl0b3RhbF9kYXRhX3JhdGUgPSBza2xfZ2V0X3RvdGFsX3JlbGF0aXZlX2Rh dGFfcmF0ZShjc3RhdGUpOwogCWlmICh0b3RhbF9kYXRhX3JhdGUgPT0gMCkKLQkJcmV0dXJuIDA7 CisJCWdvdG8gZXhpdDsKIAogCXN0YXJ0ID0gYWxsb2MtPnN0YXJ0OwogCWZvcl9lYWNoX2ludGVs X3BsYW5lX29uX2NydGMoZGV2LCBpbnRlbF9jcnRjLCBpbnRlbF9wbGFuZSkgewpAQCAtMzQzNiw3 ICszNDY0LDggQEAgc2tsX2FsbG9jYXRlX3BpcGVfZGRiKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRl ICpjc3RhdGUsCiAJCSAqIHByb21vdGUgdGhlIGV4cHJlc3Npb24gdG8gNjQgYml0cyB0byBhdm9p ZCBvdmVyZmxvd2luZywgdGhlCiAJCSAqIHJlc3VsdCBpcyA8IGF2YWlsYWJsZSBhcyBkYXRhX3Jh dGUgLyB0b3RhbF9kYXRhX3JhdGUgPCAxCiAJCSAqLwotCQlwbGFuZV9ibG9ja3MgPSBtaW5pbXVt W2lkXTsKKwkJcGxhbmVfYmxvY2tzID0gbWF4KHBpcGVfd20tPndtW21heF9sZXZlbF0ucGxhbmVf cmVzX2JbaWRdLAorCQkJCQltaW5pbXVtW2lkXSk7CiAJCXBsYW5lX2Jsb2NrcyArPSBkaXZfdTY0 KCh1aW50NjRfdClhbGxvY19zaXplICogZGF0YV9yYXRlLAogCQkJCQl0b3RhbF9kYXRhX3JhdGUp OwogCkBAIC0zNDQ0LDEyICszNDczLDEzIEBAIHNrbF9hbGxvY2F0ZV9waXBlX2RkYihzdHJ1Y3Qg aW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlLAogCQlpZiAoZGF0YV9yYXRlKSB7CiAJCQlkZGItPnBs YW5lW3BpcGVdW2lkXS5zdGFydCA9IHN0YXJ0OwogCQkJZGRiLT5wbGFuZVtwaXBlXVtpZF0uZW5k ID0gc3RhcnQgKyBwbGFuZV9ibG9ja3M7CisJCQlzdGFydCArPSBwbGFuZV9ibG9ja3M7CiAJCX0K IAotCQlzdGFydCArPSBwbGFuZV9ibG9ja3M7Ci0KIAkJLyoKIAkJICogYWxsb2NhdGlvbiBmb3Ig eV9wbGFuZSBwYXJ0IG9mIHBsYW5hciBmb3JtYXQ6CisJCSAqIFRPRE86IE9uY2Ugd2Ugc3RhcnQg Y2FsY3VsYXRpbmcgd2F0ZXJtYXJrIHZhbHVlcyBmb3IgWS9VVgorCQkgKiBwbGFuZSBib3RoIGNv bnNpZGVyIGl0IGZvciBpbml0aWFsIGFsbG93ZWQgd20gYmxvY2tzLgogCQkgKi8KIAkJeV9kYXRh X3JhdGUgPSBjc3RhdGUtPndtLnNrbC5wbGFuZV95X2RhdGFfcmF0ZVtpZF07CiAKQEAgLTM0NjAs MTIgKzM0OTAsMjkgQEAgc2tsX2FsbG9jYXRlX3BpcGVfZGRiKHN0cnVjdCBpbnRlbF9jcnRjX3N0 YXRlICpjc3RhdGUsCiAJCWlmICh5X2RhdGFfcmF0ZSkgewogCQkJZGRiLT55X3BsYW5lW3BpcGVd W2lkXS5zdGFydCA9IHN0YXJ0OwogCQkJZGRiLT55X3BsYW5lW3BpcGVdW2lkXS5lbmQgPSBzdGFy dCArIHlfcGxhbmVfYmxvY2tzOworCQkJc3RhcnQgKz0geV9wbGFuZV9ibG9ja3M7CiAJCX0KIAot CQlzdGFydCArPSB5X3BsYW5lX2Jsb2NrczsKKwkJLyoKKwkJICogTm93IGVuYWJsZSBhbGwgbGV2 ZWxzIGluIFdNIHN0cnVjdHVyZSB3aGljaCBjYW4gYmUgZW5hYmxlZAorCQkgKiB1c2luZyBjdXJy ZW50IEREQiBhbGxvY2F0aW9uCisJCSAqLworCQlmb3IgKGkgPSBpbGtfd21fbWF4X2xldmVsKGRl dik7IGkgPj0gMDsgaS0tKSB7CisJCQlpZiAoaSA+IG1heF9sZXZlbCB8fCBwaXBlX3dtLT53bVtp XS5wbGFuZV9yZXNfbFtpZF0gPiAzMQorCQkJCQl8fCBwaXBlX3dtLT53bVtpXS5wbGFuZV9yZXNf YltpZF0gPT0gMAorCQkJCQl8fCBwaXBlX3dtLT53bVtpXS5wbGFuZV9yZXNfYltpZF0gPj0KKwkJ CQkJc2tsX2RkYl9lbnRyeV9zaXplKCZkZGItPnBsYW5lW3BpcGVdW2lkXSkpIHsKKwkJCQlwaXBl X3dtLT53bVtpXS5wbGFuZV9lbltpZF0gPSBmYWxzZTsKKwkJCQlwaXBlX3dtLT53bVtpXS5wbGFu ZV9yZXNfYltpZF0gPSAwOworCQkJCXBpcGVfd20tPndtW2ldLnBsYW5lX3Jlc19sW2lkXSA9IDA7 CisJCQl9IGVsc2UgeworCQkJCXBpcGVfd20tPndtW2ldLnBsYW5lX2VuW2lkXSA9IHRydWU7CisJ CQl9CisJCX0KIAl9CiAKLQlyZXR1cm4gMDsKK2V4aXQ6CisJcmV0dXJuIHJldDsKIH0KIAogc3Rh dGljIHVpbnQzMl90IHNrbF9waXBlX3BpeGVsX3JhdGUoY29uc3Qgc3RydWN0IGludGVsX2NydGNf c3RhdGUgKmNvbmZpZykKQEAgLTM1MzYsMTEgKzM1ODMsOSBAQCBzdGF0aWMgdWludDMyX3Qgc2ts X2FkanVzdGVkX3BsYW5lX3BpeGVsX3JhdGUoY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUg KmNzdAogc3RhdGljIGludCBza2xfY29tcHV0ZV9wbGFuZV93bShjb25zdCBzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCQkJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0 ZSwKIAkJCQlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKmludGVsX3BzdGF0ZSwKLQkJCQl1aW50 MTZfdCBkZGJfYWxsb2NhdGlvbiwKIAkJCQlpbnQgbGV2ZWwsCiAJCQkJdWludDE2X3QgKm91dF9i bG9ja3MsIC8qIG91dCAqLwotCQkJCXVpbnQ4X3QgKm91dF9saW5lcywgLyogb3V0ICovCi0JCQkJ Ym9vbCAqZW5hYmxlZCAvKiBvdXQgKi8pCisJCQkJdWludDhfdCAqb3V0X2xpbmVzIC8qIG91dCAq LykKIHsKIAlzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpwc3RhdGUgPSAmaW50ZWxfcHN0YXRlLT5i YXNlOwogCXN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiID0gcHN0YXRlLT5mYjsKQEAgLTM1NTQs MTAgKzM1OTksOCBAQCBzdGF0aWMgaW50IHNrbF9jb21wdXRlX3BsYW5lX3dtKGNvbnN0IHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAl1aW50MzJfdCBwbGFuZV9waXhlbF9yYXRl OwogCXVpbnQzMl90IHlfdGlsZV9taW5pbXVtLCB5X21pbl9zY2FubGluZXM7CiAKLQlpZiAobGF0 ZW5jeSA9PSAwIHx8ICFjc3RhdGUtPmJhc2UuYWN0aXZlIHx8ICFpbnRlbF9wc3RhdGUtPmJhc2Uu dmlzaWJsZSkgewotCQkqZW5hYmxlZCA9IGZhbHNlOworCWlmIChsYXRlbmN5ID09IDAgfHwgIWNz dGF0ZS0+YmFzZS5hY3RpdmUgfHwgIWludGVsX3BzdGF0ZS0+YmFzZS52aXNpYmxlKQogCQlyZXR1 cm4gMDsKLQl9CiAKIAl3aWR0aCA9IGRybV9yZWN0X3dpZHRoKCZpbnRlbF9wc3RhdGUtPmJhc2Uu c3JjKSA+PiAxNjsKIAloZWlnaHQgPSBkcm1fcmVjdF9oZWlnaHQoJmludGVsX3BzdGF0ZS0+YmFz ZS5zcmMpID4+IDE2OwpAQCAtMzY0Miw0NyArMzY4NSwyMiBAQCBzdGF0aWMgaW50IHNrbF9jb21w dXRlX3BsYW5lX3dtKGNvbnN0IHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJ fQogCX0KIAotCWlmIChyZXNfYmxvY2tzID49IGRkYl9hbGxvY2F0aW9uIHx8IHJlc19saW5lcyA+ IDMxKSB7Ci0JCSplbmFibGVkID0gZmFsc2U7Ci0KLQkJLyoKLQkJICogSWYgdGhlcmUgYXJlIG5v IHZhbGlkIGxldmVsIDAgd2F0ZXJtYXJrcywgdGhlbiB3ZSBjYW4ndAotCQkgKiBzdXBwb3J0IHRo aXMgZGlzcGxheSBjb25maWd1cmF0aW9uLgotCQkgKi8KLQkJaWYgKGxldmVsKSB7Ci0JCQlyZXR1 cm4gMDsKLQkJfSBlbHNlIHsKLQkJCURSTV9ERUJVR19LTVMoIlJlcXVlc3RlZCBkaXNwbGF5IGNv bmZpZ3VyYXRpb24gZXhjZWVkcyBzeXN0ZW0gd2F0ZXJtYXJrIGxpbWl0YXRpb25zXG4iKTsKLQkJ CURSTV9ERUJVR19LTVMoIlBsYW5lICVkLiVkOiBibG9ja3MgcmVxdWlyZWQgPSAldS8ldSwgbGlu ZXMgcmVxdWlyZWQgPSAldS8zMVxuIiwKLQkJCQkgICAgICB0b19pbnRlbF9jcnRjKGNzdGF0ZS0+ YmFzZS5jcnRjKS0+cGlwZSwKLQkJCQkgICAgICBza2xfd21fcGxhbmVfaWQodG9faW50ZWxfcGxh bmUocHN0YXRlLT5wbGFuZSkpLAotCQkJCSAgICAgIHJlc19ibG9ja3MsIGRkYl9hbGxvY2F0aW9u LCByZXNfbGluZXMpOwotCi0JCQlyZXR1cm4gLUVJTlZBTDsKLQkJfQotCX0KLQogCSpvdXRfYmxv Y2tzID0gcmVzX2Jsb2NrczsKIAkqb3V0X2xpbmVzID0gcmVzX2xpbmVzOwotCSplbmFibGVkID0g dHJ1ZTsKIAogCXJldHVybiAwOwogfQogCiBzdGF0aWMgaW50CiBza2xfY29tcHV0ZV93bV9sZXZl bChjb25zdCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCi0JCSAgICAgc3RydWN0 IHNrbF9kZGJfYWxsb2NhdGlvbiAqZGRiLAogCQkgICAgIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRl ICpjc3RhdGUsCiAJCSAgICAgaW50IGxldmVsLAogCQkgICAgIHN0cnVjdCBza2xfd21fbGV2ZWwg KnJlc3VsdCkKIHsKIAlzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUgPSBjc3RhdGUtPmJh c2Uuc3RhdGU7Ci0Jc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRj KGNzdGF0ZS0+YmFzZS5jcnRjKTsKIAlzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZTsKIAlzdHJ1Y3Qg aW50ZWxfcGxhbmUgKmludGVsX3BsYW5lOwogCXN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqaW50 ZWxfcHN0YXRlOwotCXVpbnQxNl90IGRkYl9ibG9ja3M7Ci0JZW51bSBwaXBlIHBpcGUgPSBpbnRl bF9jcnRjLT5waXBlOwogCWludCByZXQ7CiAKIAkvKgpAQCAtMzcyMSwxNiArMzczOSwxMiBAQCBz a2xfY29tcHV0ZV93bV9sZXZlbChjb25zdCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYsCiAKIAkJV0FSTl9PTighaW50ZWxfcHN0YXRlLT5iYXNlLmZiKTsKIAotCQlkZGJfYmxvY2tz ID0gc2tsX2RkYl9lbnRyeV9zaXplKCZkZGItPnBsYW5lW3BpcGVdW2ldKTsKLQogCQlyZXQgPSBz a2xfY29tcHV0ZV9wbGFuZV93bShkZXZfcHJpdiwKIAkJCQkJICAgY3N0YXRlLAogCQkJCQkgICBp bnRlbF9wc3RhdGUsCi0JCQkJCSAgIGRkYl9ibG9ja3MsCiAJCQkJCSAgIGxldmVsLAogCQkJCQkg ICAmcmVzdWx0LT5wbGFuZV9yZXNfYltpXSwKLQkJCQkJICAgJnJlc3VsdC0+cGxhbmVfcmVzX2xb aV0sCi0JCQkJCSAgICZyZXN1bHQtPnBsYW5lX2VuW2ldKTsKKwkJCQkJICAgJnJlc3VsdC0+cGxh bmVfcmVzX2xbaV0pOwogCQlpZiAocmV0KQogCQkJcmV0dXJuIHJldDsKIAl9CkBAIC0zNzc5LDEx ICszNzkzLDE1IEBAIHN0YXRpYyBpbnQgc2tsX2J1aWxkX3BpcGVfd20oc3RydWN0IGludGVsX2Ny dGNfc3RhdGUgKmNzdGF0ZSwKIAlpbnQgcmV0OwogCiAJZm9yIChsZXZlbCA9IDA7IGxldmVsIDw9 IG1heF9sZXZlbDsgbGV2ZWwrKykgewotCQlyZXQgPSBza2xfY29tcHV0ZV93bV9sZXZlbChkZXZf cHJpdiwgZGRiLCBjc3RhdGUsCisJCXJldCA9IHNrbF9jb21wdXRlX3dtX2xldmVsKGRldl9wcml2 LCBjc3RhdGUsCiAJCQkJCSAgIGxldmVsLCAmcGlwZV93bS0+d21bbGV2ZWxdKTsKIAkJaWYgKHJl dCkKIAkJCXJldHVybiByZXQ7CiAJfQorCXJldCA9IHNrbF9hbGxvY2F0ZV9waXBlX2RkYihjc3Rh dGUsIHBpcGVfd20sIGRkYik7CisJaWYgKHJldCkKKwkJcmV0dXJuIHJldDsKKwogCXBpcGVfd20t PmxpbmV0aW1lID0gc2tsX2NvbXB1dGVfbGluZXRpbWVfd20oY3N0YXRlKTsKIAogCXNrbF9jb21w dXRlX3RyYW5zaXRpb25fd20oY3N0YXRlLCAmcGlwZV93bS0+dHJhbnNfd20pOwpAQCAtNDAwNiwx MyArNDAyNCwxMiBAQCBza2xfZGRiX2FkZF9hZmZlY3RlZF9wbGFuZXMoc3RydWN0IGludGVsX2Ny dGNfc3RhdGUgKmNzdGF0ZSkKIH0KIAogc3RhdGljIGludAotc2tsX2NvbXB1dGVfZGRiKHN0cnVj dCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKK3NrbF9pbmNsdWRlX2FmZmVjdGVkX3BpcGVzKHN0 cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 ID0gc3RhdGUtPmRldjsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19p OTE1KGRldik7CiAJc3RydWN0IGludGVsX2F0b21pY19zdGF0ZSAqaW50ZWxfc3RhdGUgPSB0b19p bnRlbF9hdG9taWNfc3RhdGUoc3RhdGUpOwogCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRj OwotCXN0cnVjdCBza2xfZGRiX2FsbG9jYXRpb24gKmRkYiA9ICZpbnRlbF9zdGF0ZS0+d21fcmVz dWx0cy5kZGI7CiAJdWludDMyX3QgcmVhbGxvY19waXBlcyA9IHBpcGVzX21vZGlmaWVkKHN0YXRl KTsKIAlpbnQgcmV0OwogCkBAIC00MDY0LDE0ICs0MDgxLDYgQEAgc2tsX2NvbXB1dGVfZGRiKHN0 cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIAkJY3N0YXRlID0gaW50ZWxfYXRvbWljX2dl dF9jcnRjX3N0YXRlKHN0YXRlLCBpbnRlbF9jcnRjKTsKIAkJaWYgKElTX0VSUihjc3RhdGUpKQog CQkJcmV0dXJuIFBUUl9FUlIoY3N0YXRlKTsKLQotCQlyZXQgPSBza2xfYWxsb2NhdGVfcGlwZV9k ZGIoY3N0YXRlLCBkZGIpOwotCQlpZiAocmV0KQotCQkJcmV0dXJuIHJldDsKLQotCQlyZXQgPSBz a2xfZGRiX2FkZF9hZmZlY3RlZF9wbGFuZXMoY3N0YXRlKTsKLQkJaWYgKHJldCkKLQkJCXJldHVy biByZXQ7CiAJfQogCiAJcmV0dXJuIDA7CkBAIC00MTIyLDE5ICs0MTMxLDE1IEBAIHNrbF9jb21w dXRlX3dtKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIAkvKiBDbGVhciBhbGwgZGly dHkgZmxhZ3MgKi8KIAlyZXN1bHRzLT5kaXJ0eV9waXBlcyA9IDA7CiAKLQlyZXQgPSBza2xfY29t cHV0ZV9kZGIoc3RhdGUpOworCXJldCA9IHNrbF9pbmNsdWRlX2FmZmVjdGVkX3BpcGVzKHN0YXRl KTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCiAJLyoKIAkgKiBDYWxjdWxhdGUgV00ncyBm b3IgYWxsIHBpcGVzIHRoYXQgYXJlIHBhcnQgb2YgdGhpcyB0cmFuc2FjdGlvbi4KLQkgKiBOb3Rl IHRoYXQgdGhlIEREQiBhbGxvY2F0aW9uIGFib3ZlIG1heSBoYXZlIGFkZGVkIG1vcmUgQ1JUQydz IHRoYXQKLQkgKiB3ZXJlbid0IG90aGVyd2lzZSBiZWluZyBtb2RpZmllZCAoYW5kIHNldCBiaXRz IGluIGRpcnR5X3BpcGVzKSBpZgotCSAqIHBpcGUgYWxsb2NhdGlvbnMgaGFkIHRvIGNoYW5nZS4K LQkgKgotCSAqIEZJWE1FOiAgTm93IHRoYXQgd2UncmUgZG9pbmcgdGhpcyBpbiB0aGUgYXRvbWlj IGNoZWNrIHBoYXNlLCB3ZQotCSAqIHNob3VsZCBhbGxvdyBza2xfdXBkYXRlX3BpcGVfd20oKSB0 byByZXR1cm4gZmFpbHVyZSBpbiBjYXNlcyB3aGVyZQotCSAqIG5vIHN1aXRhYmxlIHdhdGVybWFy ayB2YWx1ZXMgY2FuIGJlIGZvdW5kLgorCSAqIE5vdGUgdGhhdCBhZmZlY3RlZCBwaXBlIGNhbGN1 bGF0aW9uIGFib3ZlIG1heSBoYXZlIGFkZGVkIG1vcmUKKwkgKiBDUlRDJ3MgdGhhdCB3ZXJlbid0 IG90aGVyd2lzZSBiZWluZyBtb2RpZmllZCAoYW5kIHNldCBiaXRzIGluCisJICogZGlydHlfcGlw ZXMpIGlmIHBpcGUgYWxsb2NhdGlvbnMgaGFkIHRvIGNoYW5nZS4KIAkgKi8KIAlmb3JfZWFjaF9j cnRjX2luX3N0YXRlKHN0YXRlLCBjcnRjLCBjc3RhdGUsIGkpIHsKIAkJc3RydWN0IGludGVsX2Ny dGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOwpAQCAtNDE1MCw2ICs0MTU1LDEw IEBAIHNrbF9jb21wdXRlX3dtKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIAkJaWYg KGNoYW5nZWQpCiAJCQlyZXN1bHRzLT5kaXJ0eV9waXBlcyB8PSBkcm1fY3J0Y19tYXNrKGNydGMp OwogCisJCXJldCA9IHNrbF9kZGJfYWRkX2FmZmVjdGVkX3BsYW5lcyhpbnRlbF9jc3RhdGUpOwor CQlpZiAocmV0KQorCQkJcmV0dXJuIHJldDsKKwogCQlpZiAoKHJlc3VsdHMtPmRpcnR5X3BpcGVz ICYgZHJtX2NydGNfbWFzayhjcnRjKSkgPT0gMCkKIAkJCS8qIFRoaXMgcGlwZSdzIFdNJ3MgZGlk IG5vdCBjaGFuZ2UgKi8KIAkJCWNvbnRpbnVlOwotLSAKMi4xMC4xCgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0Cklu dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK