From: Matt Roper Subject: [RFC 15/15] drm/i915: Add intermediate watermarks Date: Wed, 20 May 2015 19:12:27 -0700 Message-ID: <1432174347-19138-16-git-send-email-matthew.d.roper@intel.com> References: <1432174347-19138-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 mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id DE08A6E808 for ; Wed, 20 May 2015 19:12:30 -0700 (PDT) In-Reply-To: <1432174347-19138-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 RnJvbTogTWF0dCBSb3BlciA8bWF0dEBtYXR0cm9wZS5jb20+CgpJbiBhZGRpdGlvbiB0byBjYWxj dWxhdGluZyBmaW5hbCB3YXRlcm1hcmtzLCBsZXQncyBhbHNvIHByZS1jYWxjdWxhdGUgYQpzZXQg b2YgJ2ludGVybWVkaWF0ZScgd2F0ZXJtYXJrIHZhbHVlcy4gIFRoZXNlIGludGVybWVkaWF0ZSB3 YXRlcm1hcmtzCm1lcmdlIHRoZSB3YXRlcm1hcmtzIG9mIHRoZSBvbGQgc3RhdGUgYW5kIHRoZSBu ZXcgc3RhdGUgc3VjaCB0aGF0IHRoZXkKd2lsbCBzYXRpc2Z5IHRoZSByZXF1aXJlbWVudHMgb2Yg Ym90aCBzdGF0ZXMuICBUaGlzIG1lYW5zIHRoZXkgY2FuIGJlCnByb2dyYW1tZWQgaW1tZWRpYXRl bHkgKHdpdGhvdXQgd2FpdGluZyBmb3IgYSB2YmxhbmspLiAgT25jZSB0aGUgdmJsYW5rCmRvZXMg aGFwcGVuLCB3ZSBjYW4gdGhlbiByZS1wcm9ncmFtIHdhdGVybWFya3MgdG8gdGhlIG1vcmUgb3B0 aW1hbAp0YXJnZXQgdmFsdWUuCgpOb3RlIHRoYXQgd2UgYWRkIGEgbmV3ICdwZW5kaW5nJyBzZXQg b2Ygd2F0ZXJtYXJrIHZhbHVlcyB0aGF0IHRoZQppbnRlcm1lZGlhdGUgdmFsdWVzIGFyZSBvcmln aW5hbGx5IHdyaXR0ZW4gaW50by4gIFRoZSB3YXRlcm1hcmsKcHJvZ3JhbW1pbmcgcm91dGluZSBp cyB1cGRhdGVkIHRvIHVzZSB0aGVzZSAncGVuZGluZycgdmFsdWVzLiAgV2hlbiBhCnZibGFuayBo YXBwZW5zLCB0aGUgZmluYWwgJ3RhcmdldCcgdmFsdWVzIGFyZSBjb3BpZWQgdG8gdGhlICdwZW5k aW5nJwpzdHJ1Y3R1cmUgc28gdGhhdCBhbGwgc3Vic2VxdWVudCBvcGVyYXRpb25zIHdpbGwgbWFr ZSB1c2Ugb2YgdGhvc2UKdmFsdWVzLgoKU2lnbmVkLW9mZi1ieTogTWF0dCBSb3BlciA8bWF0dGhl dy5kLnJvcGVyQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5o ICAgICAgfCAgMyArKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljLmMgIHwgMTUg KysrKysrKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDM4ICsrKysr KysrKysrKysrKysrLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oICAgICB8IDE2 ICsrKysrKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jICAgICAgfCA3MiArKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0KIDUgZmlsZXMgY2hhbmdlZCwgMTI2IGlu c2VydGlvbnMoKyksIDE4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4 IDUxMzQxMDEuLmY1ZmVmZmMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtNTY0LDYgKzU2 NCw5IEBAIHN0cnVjdCBkcm1faTkxNV9kaXNwbGF5X2Z1bmNzIHsKIAkJCSAgc3RydWN0IGRwbGwg KmJlc3RfY2xvY2spOwogCWludCAoKmNvbXB1dGVfcGlwZV93bSkoc3RydWN0IGRybV9jcnRjICpj cnRjLAogCQkJICAgICAgIHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSk7CisJdm9pZCAo KmNvbXB1dGVfaW50ZXJtZWRpYXRlX3dtKShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAorCQkJCQlz dHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqbmV3c3RhdGUsCisJCQkJCWNvbnN0IHN0cnVjdCBpbnRl bF9jcnRjX3N0YXRlICpvbGRzdGF0ZSk7CiAJdm9pZCAoKnVwZGF0ZV93bSkoc3RydWN0IGRybV9j cnRjICpjcnRjKTsKIAl2b2lkICgqdXBkYXRlX3Nwcml0ZV93bSkoc3RydWN0IGRybV9wbGFuZSAq cGxhbmUsCiAJCQkJIHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2F0b21pYy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf YXRvbWljLmMKaW5kZXggNTI5NDg0MC4uOTJjMjliNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfYXRvbWljLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf YXRvbWljLmMKQEAgLTQzNSwxMiArNDM1LDI1IEBAIGludGVsX2NoZWNrX2NydGMoc3RydWN0IGRy bV9jcnRjICpjcnRjLAogCQkgc3RydWN0IGRybV9jcnRjX3N0YXRlICpzdGF0ZSkKIHsKIAlzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGNydGMtPmRldik7CisJc3Ry dWN0IGludGVsX2NydGNfc3RhdGUgKm5ld19zdGF0ZSA9IHRvX2ludGVsX2NydGNfc3RhdGUoc3Rh dGUpOworCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpvbGRfc3RhdGUgPSB0b19pbnRlbF9jcnRj X3N0YXRlKGNydGMtPnN0YXRlKTsKIAlpbnQgcmV0OwogCiAJaWYgKCFkZXZfcHJpdi0+ZGlzcGxh eS5jb21wdXRlX3BpcGVfd20pCiAJCXJldHVybiAwOworCWlmIChXQVJOX09OKCFkZXZfcHJpdi0+ ZGlzcGxheS5jb21wdXRlX2ludGVybWVkaWF0ZV93bSkpCisJCXJldHVybiAwOwogCiAJcmV0ID0g ZGV2X3ByaXYtPmRpc3BsYXkuY29tcHV0ZV9waXBlX3dtKGNydGMsIHN0YXRlLT5zdGF0ZSk7CisJ aWYgKHJldCkKKwkJcmV0dXJuIHJldDsKIAotCXJldHVybiByZXQ7CisJLyoKKwkgKiBDYWxjdWxh dGUgJ2ludGVybWVkaWF0ZScgd2F0ZXJtYXJrcyB0aGF0IHNhdGlzZnkgYm90aCB0aGUgb2xkIHN0 YXRlCisJICogYW5kIHRoZSBuZXcgc3RhdGUuICBXZSBjYW4gcHJvZ3JhbSB0aGVzZSBpbW1lZGlh dGVseS4KKwkgKi8KKwlkZXZfcHJpdi0+ZGlzcGxheS5jb21wdXRlX2ludGVybWVkaWF0ZV93bShj cnRjLT5kZXYsIG5ld19zdGF0ZSwKKwkJCQkJCSAgb2xkX3N0YXRlKTsKKworCXJldHVybiAwOwog fQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IGIyMDEyYzkuLjQ1ZmRiZWMg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTEzMjI3LDYgKzEzMjI3LDE3 IEBAIGRvX3VwZGF0ZV93YXRlcm1hcmtzKHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjLAog CWRldl9wcml2LT5kaXNwbGF5LnByb2dyYW1fd2F0ZXJtYXJrcyhkZXZfcHJpdik7CiB9CiAKK3N0 YXRpYyB2b2lkCitkb19sYXRjaF93YXRlcm1hcmtzKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAor CQkgICAgdm9pZCAqZGF0YSwKKwkJICAgIGJvb2wgZWFybHksCisJCSAgICB1MzIgc2VxKQorewor CXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUgPSB0b19pbnRlbF9jcnRjX3N0YXRlKGNy dGMtPmJhc2Uuc3RhdGUpOworCisJY3N0YXRlLT53bS5wZW5kaW5nID0gY3N0YXRlLT53bS50YXJn ZXQ7Cit9CisKIHN0YXRpYyB2b2lkIGludGVsX2JlZ2luX2NydGNfY29tbWl0KHN0cnVjdCBkcm1f Y3J0YyAqY3J0YykKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+ZGV2OwpAQCAt MTMyNjksOCArMTMyODAsMjEgQEAgc3RhdGljIHZvaWQgaW50ZWxfYmVnaW5fY3J0Y19jb21taXQo c3RydWN0IGRybV9jcnRjICpjcnRjKQogCWlmIChpbnRlbF9jcnRjLT5hdG9taWMucHJlX2Rpc2Fi bGVfcHJpbWFyeSkKIAkJaW50ZWxfcHJlX2Rpc2FibGVfcHJpbWFyeShjcnRjKTsKIAotCWlmICgh SEFTX0FUT01JQ19XTShkZXZfcHJpdikgJiYgaW50ZWxfY3J0Yy0+YXRvbWljLnVwZGF0ZV93bSkK KwkvKgorCSAqIEZvciBwbGF0Zm9ybXMgdGhhdCBzdXBwb3J0IGF0b21pYyB3YXRlcm1hcmtzLCBw cm9ncmFtIHRoZQorCSAqIGludGVybWVkaWF0ZSB3YXRlcm1hcmtzIGltbWVkaWF0ZWx5LiAgV2hl biB2YmxhbmsgaGFwcGVucywgJ3BlbmRpbmcnCisJICogdmFsdWVzIHdpbGwgYmUgc2V0IHRvIHRo ZSBmaW5hbCAndGFyZ2V0JyB2YWx1ZXMgYW5kIHdlJ2xsIGRvIHRoaXMKKwkgKiBhZ2FpbiB0byBn ZXQgdGhlIG9wdGltYWwgd2F0ZXJtYXJrcy4KKwkgKgorCSAqIElmIGEgcGxhdGZvcm0gaGFzbid0 IGJlZW4gdHJhbnNpdGlvbmVkIHRvIGF0b21pYyB3YXRlcm1hcmtzIHlldCwKKwkgKiB3ZSdsbCBj b250aW51ZSB0byB1cGRhdGUgd2F0ZXJtYXJrcyB0aGUgb2xkIHdheSwgaWYgZmxhZ3MgdGVsbAor CSAqIHVzIHRvLgorCSAqLworCWlmIChIQVNfQVRPTUlDX1dNKGRldl9wcml2KSkgeworCQlkZXZf cHJpdi0+ZGlzcGxheS5wcm9ncmFtX3dhdGVybWFya3MoZGV2X3ByaXYpOworCX0gZWxzZSBpZiAo aW50ZWxfY3J0Yy0+YXRvbWljLnVwZGF0ZV93bSkgewogCQlpbnRlbF91cGRhdGVfd2F0ZXJtYXJr cyhjcnRjKTsKKwl9CiAKIAlpbnRlbF9ydW50aW1lX3BtX2dldChkZXZfcHJpdik7CiAKQEAgLTEz MjkxLDExICsxMzMxNSwxOSBAQCBzdGF0aWMgdm9pZCBpbnRlbF9maW5pc2hfY3J0Y19jb21taXQo c3RydWN0IGRybV9jcnRjICpjcnRjKQogCS8qCiAJICogSWYgdGhpcyBwbGF0Zm9ybSBzdXBwb3J0 cyBhdG9taWMgd2F0ZXJtYXJrcywgc2NoZWR1bGUgYSBqb2IgdG8KIAkgKiB1cGRhdGUgd2F0ZXJt YXJrcyB3aGVuIHRoZSBuZXh0IHZibGFuayBvY2N1cnMuICBPdGhlcndpc2UsIGp1c3QKLQkgKiB1 cGRhdGUgd2F0ZXJtYXJrcyB0aGUgb2xkLWZhc2hpb25lZCB3YXkuCisJICogdXBkYXRlIHdhdGVy bWFya3MgdGhlIG9sZC1mYXNoaW9uZWQgd2F5LiAgQWxzbywgc2NoZWR1bGUgYSBzZWNvbmQKKwkg KiB0YXNrIHRoYXQgcnVucyBkaXJlY3RseSBpbiB0aGUgaW50ZXJydXB0IGhhbmRsZXIgKHJhdGhl ciB0aGFuCisJICogaW4gYSB3cSB0YXNrKSB0aGF0IGNvcGllcyB0aGUgJ3RhcmdldCcgd2F0ZXJt YXJrIHZhbHVlcyB0byB0aGUKKwkgKiAncGVuZGluZycgd2F0ZXJtYXJrIHN0cnVjdHVyZSBzbyB0 aGF0IHRoZSBwcm9wZXIgdmFsdWVzIHdpbGwgYmUKKwkgKiB1c2VkIGZvciBhbGwgc3Vic2VxdWVu dCBjYWxjdWxhdGlvbnMuCisJICoKIAkgKi8KLQlpZiAoSEFTX0FUT01JQ19XTShkZXZfcHJpdikp CisJaWYgKEhBU19BVE9NSUNfV00oZGV2X3ByaXYpKSB7CiAJCWludGVsX3NjaGVkdWxlX3ZibGFu a19qb2IoaW50ZWxfY3J0YywgZG9fdXBkYXRlX3dhdGVybWFya3MsCiAJCQkJCSAgTlVMTCwgZGV2 X3ByaXYtPndxLCAxKTsKKwkJaW50ZWxfc2NoZWR1bGVfdmJsYW5rX2pvYihpbnRlbF9jcnRjLCBk b19sYXRjaF93YXRlcm1hcmtzLAorCQkJCQkgIE5VTEwsIE5VTEwsIDEpOworCX0KIAogCWlmIChp bnRlbF9jcnRjLT5hdG9taWMuZXZhZGUpCiAJCWludGVsX3BpcGVfdXBkYXRlX2VuZChpbnRlbF9j cnRjLApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCA2MzBlN2MxLi4zZjQ1NWNlIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtMzM0LDYgKzMzNCwxMSBAQCBzdHJ1Y3Qgc2tsX3Bp cGVfd20gewogCXVpbnQzMl90IGxpbmV0aW1lOwogfTsKIAordW5pb24gcGlwZV93bSB7CisJc3Ry dWN0IGludGVsX3BpcGVfd20gaWxrOworCXN0cnVjdCBza2xfcGlwZV93bSBza2w7Cit9OworCiBz dHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSB7CiAJc3RydWN0IGRybV9jcnRjX3N0YXRlIGJhc2U7CiAK QEAgLTQ2NSwxMCArNDcwLDEzIEBAIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlIHsKIAogCXN0cnVj dCB7CiAJCS8qIGZpbmFsLCB0YXJnZXQgd2F0ZXJtYXJrcyBmb3Igc3RhdGUgKi8KLQkJdW5pb24g ewotCQkJc3RydWN0IGludGVsX3BpcGVfd20gaWxrOwotCQkJc3RydWN0IHNrbF9waXBlX3dtIHNr bDsKLQkJfSB0YXJnZXQ7CisJCXVuaW9uIHBpcGVfd20gdGFyZ2V0OworCisJCS8qCisJCSAqIHBl bmRpbmcgd2F0ZXJtYXJrIChpbnRlcm1lZGlhdGUgYmVmb3JlIHZibGFuaywgdGFyZ2V0IGFmdGVy CisJCSAqIHZibGFuayBmaXJlcykKKwkJICovCisJCXVuaW9uIHBpcGVfd20gcGVuZGluZzsKIAl9 IHdtOwogfTsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKaW5kZXggN2YwYTBjMS4uODg3ZDM5YSAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYworKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCkBAIC0yMDYwLDcgKzIwNjAsNyBAQCBzdGF0aWMgdm9p ZCBpbGtfY29tcHV0ZV93bV9jb25maWcoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAlmb3JfZWFj aF9pbnRlbF9jcnRjKGRldiwgaW50ZWxfY3J0YykgewogCQljb25zdCBzdHJ1Y3QgaW50ZWxfY3J0 Y19zdGF0ZSAqY3N0YXRlID0KIAkJCXRvX2ludGVsX2NydGNfc3RhdGUoaW50ZWxfY3J0Yy0+YmFz ZS5zdGF0ZSk7Ci0JCWNvbnN0IHN0cnVjdCBpbnRlbF9waXBlX3dtICp3bSA9ICZjc3RhdGUtPndt LnRhcmdldC5pbGs7CisJCWNvbnN0IHN0cnVjdCBpbnRlbF9waXBlX3dtICp3bSA9ICZjc3RhdGUt PndtLnBlbmRpbmcuaWxrOwogCiAJCWlmICghd20tPnBpcGVfZW5hYmxlZCkKIAkJCWNvbnRpbnVl OwpAQCAtMjA3MSw2ICsyMDcxLDI0IEBAIHN0YXRpYyB2b2lkIGlsa19jb21wdXRlX3dtX2NvbmZp ZyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCX0KIH0KIAorc3RhdGljIGJvb2wgaWxrX3ZhbGlk YXRlX3BpcGVfd20oc3RydWN0IGRybV9kZXZpY2UgKmRldiwKKwkJCQkgc3RydWN0IGludGVsX3dt X2NvbmZpZyAqY29uZmlnLAorCQkJCSBzdHJ1Y3QgaW50ZWxfcGlwZV93bSAqcGlwZV93bSkKK3sK KwlzdHJ1Y3QgaWxrX3dtX21heGltdW1zIG1heDsKKworCS8qIExQMCB3YXRlcm1hcmtzIGFsd2F5 cyB1c2UgMS8yIEREQiBwYXJ0aXRpb25pbmcgKi8KKwlpbGtfY29tcHV0ZV93bV9tYXhpbXVtcyhk ZXYsIDAsIGNvbmZpZywgSU5URUxfRERCX1BBUlRfMV8yLCAmbWF4KTsKKworCS8qIEF0IGxlYXN0 IExQMCBtdXN0IGJlIHZhbGlkICovCisJaWYgKCFpbGtfdmFsaWRhdGVfd21fbGV2ZWwoMCwgJm1h eCwgJnBpcGVfd20tPndtWzBdKSkgeworCQlEUk1fREVCVUdfS01TKCJMUDAgd2F0ZXJtYXJrIGlu dmFsaWRcbiIpOworCQlyZXR1cm4gZmFsc2U7CisJfQorCisJcmV0dXJuIHRydWU7Cit9CisKIC8q IENvbXB1dGUgbmV3IHdhdGVybWFya3MgZm9yIHRoZSBwaXBlICovCiBzdGF0aWMgaW50IGlsa19j b21wdXRlX3BpcGVfd20oc3RydWN0IGRybV9jcnRjICpjcnRjLAogCQkJICAgICAgIHN0cnVjdCBk cm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKQEAgLTIxMzgsMTIgKzIxNTYsOCBAQCBzdGF0aWMgaW50 IGlsa19jb21wdXRlX3BpcGVfd20oc3RydWN0IGRybV9jcnRjICpjcnRjLAogCWlmIChJU19IQVNX RUxMKGRldikgfHwgSVNfQlJPQURXRUxMKGRldikpCiAJCXBpcGVfd20tPmxpbmV0aW1lID0gaHN3 X2NvbXB1dGVfbGluZXRpbWVfd20oZGV2LCBjcnRjKTsKIAotCS8qIExQMCB3YXRlcm1hcmtzIGFs d2F5cyB1c2UgMS8yIEREQiBwYXJ0aXRpb25pbmcgKi8KLQlpbGtfY29tcHV0ZV93bV9tYXhpbXVt cyhkZXYsIDAsICZjb25maWcsIElOVEVMX0REQl9QQVJUXzFfMiwgJm1heCk7Ci0KLQkvKiBBdCBs ZWFzdCBMUDAgbXVzdCBiZSB2YWxpZCAqLwotCWlmICghaWxrX3ZhbGlkYXRlX3dtX2xldmVsKDAs ICZtYXgsICZwaXBlX3dtLT53bVswXSkpCi0JCXJldHVybiAtRUlOVkFMOworCWlmICghaWxrX3Zh bGlkYXRlX3BpcGVfd20oZGV2LCAmY29uZmlnLCBwaXBlX3dtKSkKKwkJcmV0dXJuIGZhbHNlOwog CiAJaWxrX2NvbXB1dGVfd21fcmVnX21heGltdW1zKGRldiwgMSwgJm1heCk7CiAKQEAgLTIxNjgs NiArMjE4Miw0MCBAQCBzdGF0aWMgaW50IGlsa19jb21wdXRlX3BpcGVfd20oc3RydWN0IGRybV9j cnRjICpjcnRjLAogfQogCiAvKgorICogQnVpbGQgYSBzZXQgb2YgJ2ludGVybWVkaWF0ZScgd2F0 ZXJtYXJrIHZhbHVlcyB0aGF0IHNhdGlzZnkgYm90aCB0aGUgb2xkCisgKiBzdGF0ZSBhbmQgdGhl IG5ldyBzdGF0ZS4gIFRoZXNlIGNhbiBiZSBwcm9ncmFtbWVkIHRvIHRoZSBoYXJkd2FyZQorICog aW1tZWRpYXRlbHkuCisgKi8KK3ZvaWQgaWxrX2NvbXB1dGVfaW50ZXJtZWRpYXRlX3dtKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYsCisJCQkJIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpuZXdzdGF0 ZSwKKwkJCQkgY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKm9sZHN0YXRlKQoreworCXN0 cnVjdCBpbnRlbF9waXBlX3dtICphID0gJm5ld3N0YXRlLT53bS5wZW5kaW5nLmlsazsKKwljb25z dCBzdHJ1Y3QgaW50ZWxfcGlwZV93bSAqYiA9ICZvbGRzdGF0ZS0+d20ucGVuZGluZy5pbGs7CisJ aW50IGxldmVsLCBtYXhfbGV2ZWwgPSBpbGtfd21fbWF4X2xldmVsKGRldik7CisKKwkvKgorCSAq IFN0YXJ0IHdpdGggdGhlIGZpbmFsLCB0YXJnZXQgd2F0ZXJtYXJrcywgdGhlbiBjb21iaW5lIHdp dGggdGhlCisJICogY3VycmVudCBzdGF0ZSdzIHdhdGVybWFya3MuCisJICovCisJKmEgPSBuZXdz dGF0ZS0+d20udGFyZ2V0LmlsazsKKwlhLT5waXBlX2VuYWJsZWQgfD0gYi0+cGlwZV9lbmFibGVk OworCWEtPnNwcml0ZXNfZW5hYmxlZCB8PSBiLT5zcHJpdGVzX2VuYWJsZWQ7CisJYS0+c3ByaXRl c19zY2FsZWQgfD0gYi0+c3ByaXRlc19zY2FsZWQ7CisKKwlmb3IgKGxldmVsID0gMDsgbGV2ZWwg PD0gbWF4X2xldmVsOyBsZXZlbCsrKSB7CisJCXN0cnVjdCBpbnRlbF93bV9sZXZlbCAqYV93bSA9 ICZhLT53bVtsZXZlbF07CisJCWNvbnN0IHN0cnVjdCBpbnRlbF93bV9sZXZlbCAqYl93bSA9ICZi LT53bVtsZXZlbF07CisKKwkJYV93bS0+ZW5hYmxlICY9IGJfd20tPmVuYWJsZTsKKwkJYV93bS0+ cHJpX3ZhbCA9IG1heChhX3dtLT5wcmlfdmFsLCBiX3dtLT5wcmlfdmFsKTsKKwkJYV93bS0+c3By X3ZhbCA9IG1heChhX3dtLT5zcHJfdmFsLCBiX3dtLT5zcHJfdmFsKTsKKwkJYV93bS0+Y3VyX3Zh bCA9IG1heChhX3dtLT5jdXJfdmFsLCBiX3dtLT5jdXJfdmFsKTsKKwkJYV93bS0+ZmJjX3ZhbCA9 IG1heChhX3dtLT5mYmNfdmFsLCBiX3dtLT5mYmNfdmFsKTsKKwl9Cit9CisKKy8qCiAgKiBNZXJn ZSB0aGUgd2F0ZXJtYXJrcyBmcm9tIGFsbCBhY3RpdmUgcGlwZXMgZm9yIGEgc3BlY2lmaWMgbGV2 ZWwuCiAgKi8KIHN0YXRpYyB2b2lkIGlsa19tZXJnZV93bV9sZXZlbChzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2LApAQCAtMjE4MSw3ICsyMjI5LDcgQEAgc3RhdGljIHZvaWQgaWxrX21lcmdlX3dtX2xl dmVsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJZm9yX2VhY2hfaW50ZWxfY3J0YyhkZXYsIGlu dGVsX2NydGMpIHsKIAkJY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSA9CiAJ CQl0b19pbnRlbF9jcnRjX3N0YXRlKGludGVsX2NydGMtPmJhc2Uuc3RhdGUpOwotCQljb25zdCBz dHJ1Y3QgaW50ZWxfcGlwZV93bSAqYWN0aXZlID0gJmNzdGF0ZS0+d20udGFyZ2V0LmlsazsKKwkJ Y29uc3Qgc3RydWN0IGludGVsX3BpcGVfd20gKmFjdGl2ZSA9ICZjc3RhdGUtPndtLnBlbmRpbmcu aWxrOwogCQljb25zdCBzdHJ1Y3QgaW50ZWxfd21fbGV2ZWwgKndtID0gJmFjdGl2ZS0+d21bbGV2 ZWxdOwogCiAJCWlmICghYWN0aXZlLT5waXBlX2VuYWJsZWQpCkBAIC0yMzMwLDEyICsyMzc4LDEy IEBAIHN0YXRpYyB2b2lkIGlsa19jb21wdXRlX3dtX3Jlc3VsdHMoc3RydWN0IGRybV9kZXZpY2Ug KmRldiwKIAkJY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSA9CiAJCQl0b19p bnRlbF9jcnRjX3N0YXRlKGludGVsX2NydGMtPmJhc2Uuc3RhdGUpOwogCQllbnVtIHBpcGUgcGlw ZSA9IGludGVsX2NydGMtPnBpcGU7Ci0JCWNvbnN0IHN0cnVjdCBpbnRlbF93bV9sZXZlbCAqciA9 ICZjc3RhdGUtPndtLnRhcmdldC5pbGsud21bMF07CisJCWNvbnN0IHN0cnVjdCBpbnRlbF93bV9s ZXZlbCAqciA9ICZjc3RhdGUtPndtLnBlbmRpbmcuaWxrLndtWzBdOwogCiAJCWlmIChXQVJOX09O KCFyLT5lbmFibGUpKQogCQkJY29udGludWU7CiAKLQkJcmVzdWx0cy0+d21fbGluZXRpbWVbcGlw ZV0gPSBjc3RhdGUtPndtLnRhcmdldC5pbGsubGluZXRpbWU7CisJCXJlc3VsdHMtPndtX2xpbmV0 aW1lW3BpcGVdID0gY3N0YXRlLT53bS5wZW5kaW5nLmlsay5saW5ldGltZTsKIAogCQlyZXN1bHRz LT53bV9waXBlW3BpcGVdID0KIAkJCShyLT5wcmlfdmFsIDw8IFdNMF9QSVBFX1BMQU5FX1NISUZU KSB8CkBAIC0zNjY5LDYgKzM3MTcsOCBAQCBzdGF0aWMgdm9pZCBpbGtfcGlwZV93bV9nZXRfaHdf c3RhdGUoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCQlmb3IgKGxldmVsID0gMDsgbGV2ZWwgPD0g bWF4X2xldmVsOyBsZXZlbCsrKQogCQkJYWN0aXZlLT53bVtsZXZlbF0uZW5hYmxlID0gdHJ1ZTsK IAl9CisKKwljc3RhdGUtPndtLnBlbmRpbmcuaWxrID0gKmFjdGl2ZTsKIH0KIAogdm9pZCBpbGtf d21fZ2V0X2h3X3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCkBAIC02NjI2LDYgKzY2NzYs OCBAQCB2b2lkIGludGVsX2luaXRfcG0oc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJCWRldl9w cml2LT5kaXNwbGF5LnVwZGF0ZV93bSA9IGlsa191cGRhdGVfd207CiAJCQlkZXZfcHJpdi0+ZGlz cGxheS51cGRhdGVfc3ByaXRlX3dtID0gaWxrX3VwZGF0ZV9zcHJpdGVfd207CiAJCQlkZXZfcHJp di0+ZGlzcGxheS5jb21wdXRlX3BpcGVfd20gPSBpbGtfY29tcHV0ZV9waXBlX3dtOworCQkJZGV2 X3ByaXYtPmRpc3BsYXkuY29tcHV0ZV9pbnRlcm1lZGlhdGVfd20gPQorCQkJCWlsa19jb21wdXRl X2ludGVybWVkaWF0ZV93bTsKIAkJCWRldl9wcml2LT5kaXNwbGF5LnByb2dyYW1fd2F0ZXJtYXJr cyA9IGlsa19wcm9ncmFtX3dhdGVybWFya3M7CiAJCX0gZWxzZSB7CiAJCQlEUk1fREVCVUdfS01T KCJGYWlsZWQgdG8gcmVhZCBkaXNwbGF5IHBsYW5lIGxhdGVuY3kuICIKLS0gCjEuOC41LjEKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBt YWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMu ZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==