From: Matt Roper Subject: [CI 15/17] drm/i915/gen9: Calculate watermarks during atomic 'check' (v2) Date: Thu, 12 May 2016 15:11:40 -0700 Message-ID: <1463091100-13747-1-git-send-email-matthew.d.roper@intel.com> References: <1463061971-19638-16-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 mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTP id 94B486E99F for ; Thu, 12 May 2016 22:11:59 +0000 (UTC) In-Reply-To: <1463061971-19638-16-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 TW92aW5nIHdhdGVybWFyayBjYWxjdWxhdGlvbiBpbnRvIHRoZSBjaGVjayBwaGFzZSB3aWxsIGFs bG93IHVzIHRvIHRvCnJlamVjdCBkaXNwbGF5IGNvbmZpZ3VyYXRpb25zIGZvciB3aGljaCB0aGVy ZSBhcmUgbm8gdmFsaWQgd2F0ZXJtYXJrCnZhbHVlcyBiZWZvcmUgd2Ugc3RhcnQgdHJ5aW5nIHRv IHByb2dyYW0gdGhlIGhhcmR3YXJlIChhbHRob3VnaCB0aG9zZQp0ZXN0cyB3aWxsIGNvbWUgaW4g YSBzdWJzZXF1ZW50IHBhdGNoKS4KCkFub3RoZXIgYWR2YW50YWdlIG9mIG1vdmluZyB0aGlzIGNh bGN1bGF0aW9uIHRvIHRoZSBjaGVjayBwaGFzZSBpcyB0aGF0CndlIGNhbiBjYWxjdWxhdGUgdGhl IHdhdGVybWFya3MgaW4gYSBzaW5nbGUgc2hvdCBhcyBwYXJ0IG9mIHRoZSBhdG9taWMKdHJhbnNh Y3Rpb24uICBUaGUgd2F0ZXJtYXJrIGludGVyZmFjZXMgd2UgaW5oZXJpdGVkIGZyb20gb3VyIGxl Z2FjeQptb2Rlc2V0dGluZyBkYXlzIGFyZSBhIGJpdCBicm9rZW4gaW4gdGhlIGF0b21pYyBkZXNp Z24gYmVjYXVzZSB0aGV5IHVzZQpwZXItY3J0YyBlbnRyeSBwb2ludHMgYnV0IGFjdHVhbGx5IHJl LWNhbGN1bGF0ZSBhbmQgcmUtcHJvZ3JhbSBzb21ldGhpbmcKdGhhdCBpcyByZWFsbHkgbW9yZSBv ZiBhIGdsb2JhbCBzdGF0ZS4gIFRoYXQgd29ya2VkIG9rYXkgaW4gdGhlIGxlZ2FjeQptb2Rlc2V0 dGluZyB3b3JsZCBiZWNhdXNlIG9wZXJhdGlvbnMgb25seSBldmVyIHVwZGF0ZWQgYSBzaW5nbGUg Q1JUQyBhdAphIHRpbWUuICBIb3dldmVyIGluIHRoZSBhdG9taWMgd29ybGQsIGEgdHJhbnNhY3Rp b24gY2FuIGludm9sdmUgbXVsdGlwbGUKQ1JUQydzLCB3aGljaCBtZWFucyB3ZSB3aW5kIHVwIGNv bXB1dGluZyBhbmQgcHJvZ3JhbW1pbmcgdGhlIHdhdGVybWFya3MKTnhOIHRpbWVzICh3aGVyZSBO IGlzIHRoZSBudW1iZXIgb2YgQ1JUQydzIGludm9sdmVkKS4gIFdpdGggdGhpcyBwYXRjaAp3ZSBl bGltaW5hdGUgdGhlIHJlZHVuZGFudCByZS1jYWxjdWxhdGlvbiBvZiB3YXRlcm1hcmsgZGF0YSBm b3IgYXRvbWljCnN0YXRlcyAod2hpY2ggd2FzIHRoZSBjYXVzZSBvZiB0aGUgV0FSTl9PTighd21f Y2hhbmdlZCkgcHJvYmxlbXMgdGhhdApoYXZlIHBsYWd1ZWQgdXMgZm9yIGEgd2hpbGUpLgoKV2Ug c3RpbGwgbmVlZCB0byB3b3JrIG9uIHRoZSAnY29tbWl0JyBzaWRlIG9mIHdhdGVybWFyayBoYW5k bGluZyBzbyB0aGF0CndlIGFyZW4ndCBkb2luZyByZWR1bmRhbnQgTnhOIHByb2dyYW1taW5nIG9m IHdhdGVybWFya3MsIGJ1dCB0aGF0J3MKY29udGVudCBmb3IgZnV0dXJlIHBhdGNoZXMuCgp2MjoK IC0gQmFpbCBvdXQgb2Ygc2tsX3dyaXRlX3dtX3ZhbHVlcygpIGlmIHRoZSBDUlRDIGlzbid0IGFj dGl2ZS4gIE5vdyB0aGF0CiAgIHdlIHNldCBkaXJ0eV9waXBlcyB0byB+MCBpZiB0aGUgYWN0aXZl IHBpcGVzIGNoYW5nZSAoYmVjYXVzZQogICB3ZSBuZWVkIHRvIGRlYWwgd2l0aCBEREIgY2hhbmdl cyksIHdlIGNhbiBub3cgd2luZCB1cCBoZXJlIGZvcgogICBkaXNhYmxlZCBwaXBlcywgd2hlcmVh cyB3ZSBjb3VsZG4ndCBiZWZvcmUuCgpCdWd6aWxsYTogaHR0cHM6Ly9idWdzLmZyZWVkZXNrdG9w Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODkwNTUKQnVnemlsbGE6IGh0dHBzOi8vYnVncy5mcmVlZGVz a3RvcC5vcmcvc2hvd19idWcuY2dpP2lkPTkyMTgxCkNjOiBNYWFydGVuIExhbmtob3JzdCA8bWFh cnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBNYXR0IFJvcGVy IDxtYXR0aGV3LmQucm9wZXJAaW50ZWwuY29tPgpUZXN0ZWQtYnk6IERhbmllbCBTdG9uZSA8ZGFu aWVsc0Bjb2xsYWJvcmEuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3Bs YXkuYyB8ICAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggICAgIHwgICAy ICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jICAgICAgfCAxNDAgKysrKysrKysr KysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDMgZmlsZXMgY2hhbmdlZCwgNTQgaW5zZXJ0aW9u cygrKSwgOTAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmlu ZGV4IDMzZjZjNGIuLjc5MGFlN2EgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMK QEAgLTEzNjAxLDcgKzEzNjAxLDcgQEAgc3RhdGljIGludCBpbnRlbF9hdG9taWNfY29tbWl0KHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJZHJtX2F0b21pY19oZWxwZXJfc3dhcF9zdGF0ZShkZXYs IHN0YXRlKTsKIAlkZXZfcHJpdi0+d20uY29uZmlnID0gaW50ZWxfc3RhdGUtPndtX2NvbmZpZzsK IAlkZXZfcHJpdi0+d20uZGlzdHJ1c3RfYmlvc193bSA9IGZhbHNlOwotCWRldl9wcml2LT53bS5z a2xfcmVzdWx0cy5kZGIgPSBpbnRlbF9zdGF0ZS0+ZGRiOworCWRldl9wcml2LT53bS5za2xfcmVz dWx0cyA9IGludGVsX3N0YXRlLT53bV9yZXN1bHRzOwogCWludGVsX3NoYXJlZF9kcGxsX2NvbW1p dChzdGF0ZSk7CiAKIAlpZiAoaW50ZWxfc3RhdGUtPm1vZGVzZXQpIHsKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZHJ2LmgKaW5kZXggYzlhNGM0Mi4uYjQ3Nzk3OCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2 LmgKQEAgLTMxNCw3ICszMTQsNyBAQCBzdHJ1Y3QgaW50ZWxfYXRvbWljX3N0YXRlIHsKIAlib29s IHNraXBfaW50ZXJtZWRpYXRlX3dtOwogCiAJLyogR2VuOSsgb25seSAqLwotCXN0cnVjdCBza2xf ZGRiX2FsbG9jYXRpb24gZGRiOworCXN0cnVjdCBza2xfd21fdmFsdWVzIHdtX3Jlc3VsdHM7CiB9 OwogCiBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgewpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfcG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKaW5k ZXggMWQ4NDA3YS4uZjlkZmY1ZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfcG0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCkBAIC0zMjIxLDIz ICszMjIxLDYgQEAgc3RhdGljIHVpbnQzMl90IHNrbF93bV9tZXRob2QyKHVpbnQzMl90IHBpeGVs X3JhdGUsIHVpbnQzMl90IHBpcGVfaHRvdGFsLAogCXJldHVybiByZXQ7CiB9CiAKLXN0YXRpYyBi b29sIHNrbF9kZGJfYWxsb2NhdGlvbl9jaGFuZ2VkKGNvbnN0IHN0cnVjdCBza2xfZGRiX2FsbG9j YXRpb24gKm5ld19kZGIsCi0JCQkJICAgICAgIGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjICppbnRl bF9jcnRjKQotewotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBpbnRlbF9jcnRjLT5iYXNlLmRl djsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRl OwotCWNvbnN0IHN0cnVjdCBza2xfZGRiX2FsbG9jYXRpb24gKmN1cl9kZGIgPSAmZGV2X3ByaXYt PndtLnNrbF9ody5kZGI7Ci0KLQkvKgotCSAqIElmIGRkYiBhbGxvY2F0aW9uIG9mIHBpcGVzIGNo YW5nZWQsIGl0IG1heSByZXF1aXJlIHJlY2FsY3VsYXRpb24gb2YKLQkgKiB3YXRlcm1hcmtzCi0J ICovCi0JaWYgKG1lbWNtcChuZXdfZGRiLT5waXBlLCBjdXJfZGRiLT5waXBlLCBzaXplb2YobmV3 X2RkYi0+cGlwZSkpKQotCQlyZXR1cm4gdHJ1ZTsKLQotCXJldHVybiBmYWxzZTsKLX0KLQogc3Rh dGljIGludCBza2xfY29tcHV0ZV9wbGFuZV93bShjb25zdCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYsCiAJCQkJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSwKIAkJCQlz dHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKmludGVsX3BzdGF0ZSwKQEAgLTM1MzMsNiArMzUxNiw4 IEBAIHN0YXRpYyB2b2lkIHNrbF93cml0ZV93bV92YWx1ZXMoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2LAogCiAJCWlmICgobmV3LT5kaXJ0eV9waXBlcyAmIGRybV9jcnRjX21hc2so JmNydGMtPmJhc2UpKSA9PSAwKQogCQkJY29udGludWU7CisJCWlmICghY3J0Yy0+YWN0aXZlKQor CQkJY29udGludWU7CiAKIAkJSTkxNV9XUklURShQSVBFX1dNX0xJTkVUSU1FKHBpcGUpLCBuZXct PndtX2xpbmV0aW1lW3BpcGVdKTsKIApAQCAtMzcxNiw2NiArMzcwMSw5IEBAIHN0YXRpYyBpbnQg c2tsX3VwZGF0ZV9waXBlX3dtKHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3N0YXRlLAogCWVsc2UK IAkJKmNoYW5nZWQgPSB0cnVlOwogCi0JaW50ZWxfY3J0Yy0+d20uYWN0aXZlLnNrbCA9ICpwaXBl X3dtOwotCiAJcmV0dXJuIDA7CiB9CiAKLXN0YXRpYyB2b2lkIHNrbF91cGRhdGVfb3RoZXJfcGlw ZV93bShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAotCQkJCSAgICAgc3RydWN0IGRybV9jcnRjICpj cnRjLAotCQkJCSAgICAgc3RydWN0IHNrbF93bV92YWx1ZXMgKnIpCi17Ci0Jc3RydWN0IGludGVs X2NydGMgKmludGVsX2NydGM7Ci0Jc3RydWN0IGludGVsX2NydGMgKnRoaXNfY3J0YyA9IHRvX2lu dGVsX2NydGMoY3J0Yyk7Ci0KLQkvKgotCSAqIElmIHRoZSBXTSB1cGRhdGUgaGFzbid0IGNoYW5n ZWQgdGhlIGFsbG9jYXRpb24gZm9yIHRoaXNfY3J0YyAodGhlCi0JICogY3J0YyB3ZSBhcmUgY3Vy cmVudGx5IGNvbXB1dGluZyB0aGUgbmV3IFdNIHZhbHVlcyBmb3IpLCBvdGhlcgotCSAqIGVuYWJs ZWQgY3J0Y3Mgd2lsbCBrZWVwIHRoZSBzYW1lIGFsbG9jYXRpb24gYW5kIHdlIGRvbid0IG5lZWQg dG8KLQkgKiByZWNvbXB1dGUgYW55dGhpbmcgZm9yIHRoZW0uCi0JICovCi0JaWYgKCFza2xfZGRi X2FsbG9jYXRpb25fY2hhbmdlZCgmci0+ZGRiLCB0aGlzX2NydGMpKQotCQlyZXR1cm47Ci0KLQkv KgotCSAqIE90aGVyd2lzZSwgYmVjYXVzZSBvZiB0aGlzX2NydGMgYmVpbmcgZnJlc2hseSBlbmFi bGVkL2Rpc2FibGVkLCB0aGUKLQkgKiBvdGhlciBhY3RpdmUgcGlwZXMgbmVlZCBuZXcgRERCIGFs bG9jYXRpb24gYW5kIFdNIHZhbHVlcy4KLQkgKi8KLQlmb3JfZWFjaF9pbnRlbF9jcnRjKGRldiwg aW50ZWxfY3J0YykgewotCQlzdHJ1Y3Qgc2tsX3BpcGVfd20gcGlwZV93bSA9IHt9OwotCQlib29s IHdtX2NoYW5nZWQ7Ci0KLQkJaWYgKHRoaXNfY3J0Yy0+cGlwZSA9PSBpbnRlbF9jcnRjLT5waXBl KQotCQkJY29udGludWU7Ci0KLQkJaWYgKCFpbnRlbF9jcnRjLT5hY3RpdmUpCi0JCQljb250aW51 ZTsKLQotCQlza2xfdXBkYXRlX3BpcGVfd20oaW50ZWxfY3J0Yy0+YmFzZS5zdGF0ZSwKLQkJCQkg ICAmci0+ZGRiLCAmcGlwZV93bSwgJndtX2NoYW5nZWQpOwotCi0JCS8qCi0JCSAqIElmIHdlIGVu ZCB1cCByZS1jb21wdXRpbmcgdGhlIG90aGVyIHBpcGUgV00gdmFsdWVzLCBpdCdzCi0JCSAqIGJl Y2F1c2UgaXQgd2FzIHJlYWxseSBuZWVkZWQsIHNvIHdlIGV4cGVjdCB0aGUgV00gdmFsdWVzIHRv Ci0JCSAqIGJlIGRpZmZlcmVudC4KLQkJICovCi0JCVdBUk5fT04oIXdtX2NoYW5nZWQpOwotCi0J CXNrbF9jb21wdXRlX3dtX3Jlc3VsdHMoZGV2LCAmcGlwZV93bSwgciwgaW50ZWxfY3J0Yyk7Ci0J CXItPmRpcnR5X3BpcGVzIHw9IGRybV9jcnRjX21hc2soJmludGVsX2NydGMtPmJhc2UpOwotCX0K LX0KLQotc3RhdGljIHZvaWQgc2tsX2NsZWFyX3dtKHN0cnVjdCBza2xfd21fdmFsdWVzICp3YXRl cm1hcmtzLCBlbnVtIHBpcGUgcGlwZSkKLXsKLQl3YXRlcm1hcmtzLT53bV9saW5ldGltZVtwaXBl XSA9IDA7Ci0JbWVtc2V0KHdhdGVybWFya3MtPnBsYW5lW3BpcGVdLCAwLAotCSAgICAgICBzaXpl b2YodWludDMyX3QpICogOCAqIEk5MTVfTUFYX1BMQU5FUyk7Ci0JbWVtc2V0KHdhdGVybWFya3Mt PnBsYW5lX3RyYW5zW3BpcGVdLAotCSAgICAgICAwLCBzaXplb2YodWludDMyX3QpICogSTkxNV9N QVhfUExBTkVTKTsKLQl3YXRlcm1hcmtzLT5wbGFuZV90cmFuc1twaXBlXVtQTEFORV9DVVJTT1Jd ID0gMDsKLX0KLQogc3RhdGljIGludAogc2tsX2NvbXB1dGVfZGRiKHN0cnVjdCBkcm1fYXRvbWlj X3N0YXRlICpzdGF0ZSkKIHsKQEAgLTM3ODMsNiArMzcxMSw3IEBAIHNrbF9jb21wdXRlX2RkYihz dHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpCiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2ID0gdG9faTkxNShkZXYpOwogCXN0cnVjdCBpbnRlbF9hdG9taWNfc3RhdGUgKmlu dGVsX3N0YXRlID0gdG9faW50ZWxfYXRvbWljX3N0YXRlKHN0YXRlKTsKIAlzdHJ1Y3QgaW50ZWxf Y3J0YyAqaW50ZWxfY3J0YzsKKwlzdHJ1Y3Qgc2tsX2RkYl9hbGxvY2F0aW9uICpkZGIgPSAmaW50 ZWxfc3RhdGUtPndtX3Jlc3VsdHMuZGRiOwogCXVuc2lnbmVkIHJlYWxsb2NfcGlwZXMgPSBkZXZf cHJpdi0+YWN0aXZlX2NydGNzOwogCWludCByZXQ7CiAKQEAgLTM4MDgsOCArMzczNywxMCBAQCBz a2xfY29tcHV0ZV9kZGIoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKQogCSAqIGFueSBv dGhlciBkaXNwbGF5IHVwZGF0ZXMgcmFjZSB3aXRoIHRoaXMgdHJhbnNhY3Rpb24sIHNvIHdlIG5l ZWQKIAkgKiB0byBncmFiIHRoZSBsb2NrIG9uICphbGwqIENSVEMncy4KIAkgKi8KLQlpZiAoaW50 ZWxfc3RhdGUtPmFjdGl2ZV9waXBlX2NoYW5nZXMpCisJaWYgKGludGVsX3N0YXRlLT5hY3RpdmVf cGlwZV9jaGFuZ2VzKSB7CiAJCXJlYWxsb2NfcGlwZXMgPSB+MDsKKwkJaW50ZWxfc3RhdGUtPndt X3Jlc3VsdHMuZGlydHlfcGlwZXMgPSB+MDsKKwl9CiAKIAlmb3JfZWFjaF9pbnRlbF9jcnRjX21h c2soZGV2LCBpbnRlbF9jcnRjLCByZWFsbG9jX3BpcGVzKSB7CiAJCXN0cnVjdCBpbnRlbF9jcnRj X3N0YXRlICpjc3RhdGU7CkBAIC0zODE4LDcgKzM3NDksNyBAQCBza2xfY29tcHV0ZV9kZGIoc3Ry dWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKQogCQlpZiAoSVNfRVJSKGNzdGF0ZSkpCiAJCQly ZXR1cm4gUFRSX0VSUihjc3RhdGUpOwogCi0JCXJldCA9IHNrbF9hbGxvY2F0ZV9waXBlX2RkYihj c3RhdGUsICZpbnRlbF9zdGF0ZS0+ZGRiKTsKKwkJcmV0ID0gc2tsX2FsbG9jYXRlX3BpcGVfZGRi KGNzdGF0ZSwgZGRiKTsKIAkJaWYgKHJldCkKIAkJCXJldHVybiByZXQ7CiAJfQpAQCAtMzgzMSw4 ICszNzYyLDExIEBAIHNrbF9jb21wdXRlX3dtKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0 ZSkKIHsKIAlzdHJ1Y3QgZHJtX2NydGMgKmNydGM7CiAJc3RydWN0IGRybV9jcnRjX3N0YXRlICpj c3RhdGU7Ci0JaW50IHJldCwgaTsKKwlzdHJ1Y3QgaW50ZWxfYXRvbWljX3N0YXRlICppbnRlbF9z dGF0ZSA9IHRvX2ludGVsX2F0b21pY19zdGF0ZShzdGF0ZSk7CisJc3RydWN0IHNrbF93bV92YWx1 ZXMgKnJlc3VsdHMgPSAmaW50ZWxfc3RhdGUtPndtX3Jlc3VsdHM7CisJc3RydWN0IHNrbF9waXBl X3dtICpwaXBlX3dtOwogCWJvb2wgY2hhbmdlZCA9IGZhbHNlOworCWludCByZXQsIGk7CiAKIAkv KgogCSAqIElmIHRoaXMgdHJhbnNhY3Rpb24gaXNuJ3QgYWN0dWFsbHkgdG91Y2hpbmcgYW55IENS VEMncywgZG9uJ3QKQEAgLTM4NDcsMTAgKzM3ODEsNDUgQEAgc2tsX2NvbXB1dGVfd20oc3RydWN0 IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKQogCWlmICghY2hhbmdlZCkKIAkJcmV0dXJuIDA7CiAK KwkvKiBDbGVhciBhbGwgZGlydHkgZmxhZ3MgKi8KKwlyZXN1bHRzLT5kaXJ0eV9waXBlcyA9IDA7 CisKIAlyZXQgPSBza2xfY29tcHV0ZV9kZGIoc3RhdGUpOwogCWlmIChyZXQpCiAJCXJldHVybiBy ZXQ7CiAKKwkvKgorCSAqIENhbGN1bGF0ZSBXTSdzIGZvciBhbGwgcGlwZXMgdGhhdCBhcmUgcGFy dCBvZiB0aGlzIHRyYW5zYWN0aW9uLgorCSAqIE5vdGUgdGhhdCB0aGUgRERCIGFsbG9jYXRpb24g YWJvdmUgbWF5IGhhdmUgYWRkZWQgbW9yZSBDUlRDJ3MgdGhhdAorCSAqIHdlcmVuJ3Qgb3RoZXJ3 aXNlIGJlaW5nIG1vZGlmaWVkIChhbmQgc2V0IGJpdHMgaW4gZGlydHlfcGlwZXMpIGlmCisJICog cGlwZSBhbGxvY2F0aW9ucyBoYWQgdG8gY2hhbmdlLgorCSAqCisJICogRklYTUU6ICBOb3cgdGhh dCB3ZSdyZSBkb2luZyB0aGlzIGluIHRoZSBhdG9taWMgY2hlY2sgcGhhc2UsIHdlCisJICogc2hv dWxkIGFsbG93IHNrbF91cGRhdGVfcGlwZV93bSgpIHRvIHJldHVybiBmYWlsdXJlIGluIGNhc2Vz IHdoZXJlCisJICogbm8gc3VpdGFibGUgd2F0ZXJtYXJrIHZhbHVlcyBjYW4gYmUgZm91bmQuCisJ ICovCisJZm9yX2VhY2hfY3J0Y19pbl9zdGF0ZShzdGF0ZSwgY3J0YywgY3N0YXRlLCBpKSB7CisJ CXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKKwkJ c3RydWN0IGludGVsX2NydGNfc3RhdGUgKmludGVsX2NzdGF0ZSA9CisJCQl0b19pbnRlbF9jcnRj X3N0YXRlKGNzdGF0ZSk7CisKKwkJcGlwZV93bSA9ICZpbnRlbF9jc3RhdGUtPndtLnNrbC5vcHRp bWFsOworCQlyZXQgPSBza2xfdXBkYXRlX3BpcGVfd20oY3N0YXRlLCAmcmVzdWx0cy0+ZGRiLCBw aXBlX3dtLAorCQkJCQkgJmNoYW5nZWQpOworCQlpZiAocmV0KQorCQkJcmV0dXJuIHJldDsKKwor CQlpZiAoY2hhbmdlZCkKKwkJCXJlc3VsdHMtPmRpcnR5X3BpcGVzIHw9IGRybV9jcnRjX21hc2so Y3J0Yyk7CisKKwkJaWYgKChyZXN1bHRzLT5kaXJ0eV9waXBlcyAmIGRybV9jcnRjX21hc2soY3J0 YykpID09IDApCisJCQkvKiBUaGlzIHBpcGUncyBXTSdzIGRpZCBub3QgY2hhbmdlICovCisJCQlj b250aW51ZTsKKworCQlpbnRlbF9jc3RhdGUtPnVwZGF0ZV93bV9wcmUgPSB0cnVlOworCQlza2xf Y29tcHV0ZV93bV9yZXN1bHRzKGNydGMtPmRldiwgcGlwZV93bSwgcmVzdWx0cywgaW50ZWxfY3J0 Yyk7CisJfQorCiAJcmV0dXJuIDA7CiB9CiAKQEAgLTM4NjIsMjYgKzM4MzEsMjEgQEAgc3RhdGlj IHZvaWQgc2tsX3VwZGF0ZV93bShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJc3RydWN0IHNrbF93 bV92YWx1ZXMgKnJlc3VsdHMgPSAmZGV2X3ByaXYtPndtLnNrbF9yZXN1bHRzOwogCXN0cnVjdCBp bnRlbF9jcnRjX3N0YXRlICpjc3RhdGUgPSB0b19pbnRlbF9jcnRjX3N0YXRlKGNydGMtPnN0YXRl KTsKIAlzdHJ1Y3Qgc2tsX3BpcGVfd20gKnBpcGVfd20gPSAmY3N0YXRlLT53bS5za2wub3B0aW1h bDsKLQlib29sIHdtX2NoYW5nZWQ7Ci0KLQkvKiBDbGVhciBhbGwgZGlydHkgZmxhZ3MgKi8KLQly ZXN1bHRzLT5kaXJ0eV9waXBlcyA9IDA7CiAKLQlza2xfY2xlYXJfd20ocmVzdWx0cywgaW50ZWxf Y3J0Yy0+cGlwZSk7Ci0KLQlza2xfdXBkYXRlX3BpcGVfd20oY3J0Yy0+c3RhdGUsICZyZXN1bHRz LT5kZGIsIHBpcGVfd20sICZ3bV9jaGFuZ2VkKTsKLQlpZiAoIXdtX2NoYW5nZWQpCisJaWYgKChy ZXN1bHRzLT5kaXJ0eV9waXBlcyAmIGRybV9jcnRjX21hc2soY3J0YykpID09IDApCiAJCXJldHVy bjsKIAotCXNrbF9jb21wdXRlX3dtX3Jlc3VsdHMoZGV2LCBwaXBlX3dtLCByZXN1bHRzLCBpbnRl bF9jcnRjKTsKLQlyZXN1bHRzLT5kaXJ0eV9waXBlcyB8PSBkcm1fY3J0Y19tYXNrKCZpbnRlbF9j cnRjLT5iYXNlKTsKKwlpbnRlbF9jcnRjLT53bS5hY3RpdmUuc2tsID0gKnBpcGVfd207CisKKwlt dXRleF9sb2NrKCZkZXZfcHJpdi0+d20ud21fbXV0ZXgpOwogCi0Jc2tsX3VwZGF0ZV9vdGhlcl9w aXBlX3dtKGRldiwgY3J0YywgcmVzdWx0cyk7CiAJc2tsX3dyaXRlX3dtX3ZhbHVlcyhkZXZfcHJp diwgcmVzdWx0cyk7CiAJc2tsX2ZsdXNoX3dtX3ZhbHVlcyhkZXZfcHJpdiwgcmVzdWx0cyk7CiAK IAkvKiBzdG9yZSB0aGUgbmV3IGNvbmZpZ3VyYXRpb24gKi8KIAlkZXZfcHJpdi0+d20uc2tsX2h3 ID0gKnJlc3VsdHM7CisKKwltdXRleF91bmxvY2soJmRldl9wcml2LT53bS53bV9tdXRleCk7CiB9 CiAKIHN0YXRpYyB2b2lkIGlsa19jb21wdXRlX3dtX2NvbmZpZyhzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2LAotLSAKMi4xLjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVs LWdmeAo=