From: Dave Gordon Subject: [PATCH 14/17 v2] drm/i915: Integrate GuC-based command submission Date: Thu, 25 Jun 2015 15:40:10 +0100 Message-ID: <1435243213-22308-15-git-send-email-david.s.gordon@intel.com> References: <1435243213-22308-1-git-send-email-david.s.gordon@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 B8D176EC37 for ; Thu, 25 Jun 2015 07:41:06 -0700 (PDT) In-Reply-To: <1435243213-22308-1-git-send-email-david.s.gordon@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 RnJvbTogQWxleCBEYWkgPHl1LmRhaUBpbnRlbC5jb20+CgpHdUMtYmFzZWQgc3VibWlzc2lvbiBp cyBtb3N0bHkgdGhlIHNhbWUgYXMgZXhlY2xpc3QgbW9kZSwgdXAgdG8KaW50ZWxfbG9naWNhbF9y aW5nX2FkdmFuY2VfYW5kX3N1Ym1pdCgpLCB3aGVyZSB0aGUgY29udGV4dCBiZWluZwpkaXNwYXRj aGVkIHdvdWxkIGJlIGFkZGVkIHRvIHRoZSBleGVjbGlzdCBxdWV1ZTsgYXQgdGhpcyBwb2ludAp3 ZSBzdWJtaXQgdGhlIGNvbnRleHQgdG8gdGhlIEd1QyBiYWNrZW5kIGluc3RlYWQuCgpUaGVyZSBh cmUsIGhvd2V2ZXIsIGEgZmV3IG90aGVyIGNoYW5nZXMgYWxzbyByZXF1aXJlZCwgbm90YWJseToK MS4gIENvbnRleHRzIG11c3QgYmUgcGlubmVkIGF0IEdHVFQgYWRkcmVzc2VzIGFjY2Vzc2libGUg YnkgdGhlIEd1QwogICAgaS5lLiBOT1QgaW4gdGhlIHJhbmdlIFswLi5XT1BDTV9TSVpFKSwgc28g d2UgaGF2ZSB0byBhZGQgdGhlCiAgICBQSU5fT0ZGU0VUX0JJQVMgZmxhZyB0byB0aGUgcmVsZXZh bnQgR0dUVC1waW5uaW5nIGNhbGxzLgoKMi4gIFRoZSBHdUMncyBUTEIgbXVzdCBiZSBpbnZhbGlk YXRlZCBhZnRlciBhIGNvbnRleHQgaXMgcGlubmVkIGF0CiAgICBhIG5ldyBHR1RUIGFkZHJlc3Mu CgozLiAgR3VDIGZpcm13YXJlIHVzZXMgdGhlIG9uZSBwYWdlIGJlZm9yZSBSaW5nIENvbnRleHQg YXMgc2hhcmVkIGRhdGEuCiAgICBUaGVyZWZvcmUsIHdoZW5ldmVyIGRyaXZlciB3YW50cyB0byBn ZXQgYmFzZSBhZGRyZXNzIG9mIExSQywgd2UKICAgIHdpbGwgb2Zmc2V0IG9uZSBwYWdlIGZvciBp dC4gTFJDX1BQSFdTUF9QTiBpcyBkZWZpbmVkIGFzIHRoZSBwYWdlCiAgICBudW1iZXIgb2YgTFJD QS4KCjQuICBJbiB0aGUgd29yayBxdWV1ZSB1c2VkIHRvIHBhc3MgcmVxdWVzdHMgdG8gdGhlIEd1 QywgdGhlIEd1QwogICAgZmlybXdhcmUgcmVxdWlyZXMgdGhlIHJpbmctdGFpbC1vZmZzZXQgdG8g YmUgcmVwcmVzZW50ZWQgYXMgYW4KICAgIDExLWJpdCB2YWx1ZSwgZXhwcmVzc2VkIGluIFFXb3Jk cy4gVGhlcmVmb3JlLCB0aGUgcmluZ2J1ZmZlcgogICAgc2l6ZSBtdXN0IGJlIHJlZHVjZWQgdG8g dGhlIHJlcHJlc2VudGFibGUgcmFuZ2UgKDQgcGFnZXMpLgoKdjI6CiAgICBEZWZlciBhZGRpbmcg I2RlZmluZXMgdW50aWwgbmVlZGVkIFtDaHJpcyBXaWxzb25dCiAgICBSYXRpb25hbGlzZSB0eXBl IGRlY2xhcmF0aW9ucyBbQ2hyaXMgV2lsc29uXQoKSXNzdWU6IFZJWi00ODg0ClNpZ25lZC1vZmYt Ynk6IEFsZXggRGFpIDx5dS5kYWlAaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBEYXZlIEdvcmRv biA8ZGF2aWQucy5nb3Jkb25AaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZGVidWdmcy5jICAgICAgICB8ICAgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z3VjX3N1Ym1pc3Npb24uYyB8ICAgNDggKysrKysrKysrKysrKysrKysrKysrKysrKy0tLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmggICAgICAgICAgIHwgICAgMSArCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyAgICAgICAgICAgfCAgIDQ4ICsrKysrKysrKysrKysr KysrKysrLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5oICAgICAgICAg ICB8ICAgIDYgKysrKwogNSBmaWxlcyBjaGFuZ2VkLCA4NyBpbnNlcnRpb25zKCspLCAxOCBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMu YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCmluZGV4IDgyMGUwYzUuLjI5 ZjZjY2MgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCkBAIC0xOTU3LDcgKzE5NTcs NyBAQCBzdGF0aWMgdm9pZCBpOTE1X2R1bXBfbHJjX29iaihzdHJ1Y3Qgc2VxX2ZpbGUgKm0sCiAJ CXJldHVybjsKIAl9CiAKLQlwYWdlID0gaTkxNV9nZW1fb2JqZWN0X2dldF9wYWdlKGN0eF9vYmos IDEpOworCXBhZ2UgPSBpOTE1X2dlbV9vYmplY3RfZ2V0X3BhZ2UoY3R4X29iaiwgTFJDX1NUQVRF X1BOKTsKIAlpZiAoIVdBUk5fT04ocGFnZSA9PSBOVUxMKSkgewogCQlyZWdfc3RhdGUgPSBrbWFw X2F0b21pYyhwYWdlKTsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n dWNfc3VibWlzc2lvbi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lv bi5jCmluZGV4IDNjMjhjOGIuLjA5OWYwNTMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2d1Y19zdWJtaXNzaW9uLmMKQEAgLTM0OCwxNiArMzQ4LDUyIEBAIHN0YXRpYyB2b2lkIGd1Y19p bml0X2N0eF9kZXNjKHN0cnVjdCBpbnRlbF9ndWMgKmd1YywKIHsKIAlzdHJ1Y3QgZ3VjX2NvbnRl eHRfZGVzYyBkZXNjOwogCXN0cnVjdCBzZ190YWJsZSAqc2c7CisJaW50IGk7CiAKIAltZW1zZXQo JmRlc2MsIDAsIHNpemVvZihkZXNjKSk7CiAKIAlkZXNjLmF0dHJpYnV0ZSA9IEdVQ19DVFhfREVT Q19BVFRSX0FDVElWRSB8IEdVQ19DVFhfREVTQ19BVFRSX0tFUk5FTDsKIAlkZXNjLmNvbnRleHRf aWQgPSBjbGllbnQtPmN0eF9pbmRleDsKIAlkZXNjLnByaW9yaXR5ID0gY2xpZW50LT5wcmlvcml0 eTsKLQlkZXNjLmVuZ2luZXNfdXNlZCA9ICgxIDw8IFJDUykgfCAoMSA8PCBWQ1MpIHwgKDEgPDwg QkNTKSB8Ci0JCQkgICAgKDEgPDwgVkVDUykgfCAoMSA8PCBWQ1MyKTsgLyogYWxsIGVuZ2luZXMg Ki8KIAlkZXNjLmRiX2lkID0gY2xpZW50LT5kb29yYmVsbF9pZDsKIAorCWZvciAoaSA9IDA7IGkg PCBJOTE1X05VTV9SSU5HUzsgaSsrKSB7CisJCXN0cnVjdCBndWNfZXhlY2xpc3RfY29udGV4dCAq bHJjID0gJmRlc2MubHJjW2ldOworCQlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nOworCQlz dHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqOworCisJCS8qIFRPRE86IFdlIGhhdmUgYSBk ZXNpZ24gaXNzdWUgdG8gYmUgc29sdmVkIGhlcmUuIE9ubHkgd2hlbiB3ZQorCQkgKiByZWNlaXZl IHRoZSBmaXJzdCBiYXRjaCwgd2Uga25vdyB3aGljaCBlbmdpbmUgaXMgdXNlZCBieSB0aGUKKwkJ ICogdXNlci4gQnV0IGhlcmUgR3VDIGV4cGVjdHMgdGhlIGxyYyBhbmQgcmluZyB0byBiZSBwaW5u ZWQuIEl0CisJCSAqIGlzIG5vdCBhbiBpc3N1ZSBmb3IgZGVmYXVsdCBjb250ZXh0LCB3aGljaCBp cyB0aGUgb25seSBvbmUKKwkJICogZm9yIG5vdyB3aG8gb3ducyBhIEd1QyBjbGllbnQuIEJ1dCBm b3IgZnV0dXJlIG93bmVyIG9mIEd1QworCQkgKiBjbGllbnQsIG5lZWQgdG8gbWFrZSBzdXJlIGxy YyBpcyBwaW5uZWQgcHJpb3IgdG8gZW50ZXIgaGVyZS4KKwkJICovCisJCW9iaiA9IGNsaWVudC0+ b3duZXItPmVuZ2luZVtpXS5zdGF0ZTsKKwkJaWYgKCFvYmopCisJCQlicmVhazsKKworCQlyaW5n ID0gY2xpZW50LT5vd25lci0+ZW5naW5lW2ldLnJpbmdidWYtPnJpbmc7CisKKwkJbHJjLT5jb250 ZXh0X2Rlc2MgPSAodTMyKWludGVsX2xyX2NvbnRleHRfZGVzY3JpcHRvcihyaW5nLCBvYmopOwor CQkvKiBUaGUgc3RhdGUgcGFnZSBpcyBhZnRlciBQUEhXU1AgKi8KKwkJbHJjLT5yaW5nX2xjcmEg PSBpOTE1X2dlbV9vYmpfZ2d0dF9vZmZzZXQob2JqKSArCisJCQkJTFJDX1NUQVRFX1BOICogUEFH RV9TSVpFOworCQlscmMtPmNvbnRleHRfaWQgPSAoY2xpZW50LT5jdHhfaW5kZXggPDwgR1VDX0VM Q19DVFhJRF9PRkZTRVQpIHwKKwkJCQkocmluZy0+aWQgPDwgR1VDX0VMQ19FTkdJTkVfT0ZGU0VU KTsKKworCQlvYmogPSBjbGllbnQtPm93bmVyLT5lbmdpbmVbaV0ucmluZ2J1Zi0+b2JqOworCisJ CWxyYy0+cmluZ19iZWdpbiA9IGk5MTVfZ2VtX29ial9nZ3R0X29mZnNldChvYmopOworCQlscmMt PnJpbmdfZW5kID0gbHJjLT5yaW5nX2JlZ2luICsgb2JqLT5iYXNlLnNpemUgLSAxOworCQlscmMt PnJpbmdfbmV4dF9mcmVlX2xvY2F0aW9uID0gbHJjLT5yaW5nX2JlZ2luOworCQlscmMtPnJpbmdf Y3VycmVudF90YWlsX3BvaW50ZXJfdmFsdWUgPSAwOworCisJCWRlc2MuZW5naW5lc191c2VkIHw9 ICgxIDw8IHJpbmctPmlkKTsKKwl9CisKKwlXQVJOX09OKGRlc2MuZW5naW5lc191c2VkID09IDAp OworCiAJLyoKIAkgKiBUaGUgQ1BVIGFkZHJlc3MgaXMgb25seSBuZWVkZWQgYXQgY2VydGFpbiBw b2ludHMsIHNvIGttYXBfYXRvbWljIG9uCiAJICogZGVtYW5kIGluc3RlYWQgb2Ygc3RvcmluZyBp dCBpbiB0aGUgY3R4IGRlc2NyaXB0b3IuCkBAIC02MzQsMTEgKzY3MCwxMyBAQCBzdGF0aWMgdm9p ZCBndWNfY2xpZW50X2ZyZWUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKICAqIAkJVGhlIGtlcm5l bCBjbGllbnQgdG8gcmVwbGFjZSBFeGVjTGlzdCBzdWJtaXNzaW9uIGlzIGNyZWF0ZWQgd2l0aAog ICogCQlOT1JNQUwgcHJpb3JpdHkuIFByaW9yaXR5IG9mIGEgY2xpZW50IGZvciBzY2hlZHVsZXIg Y2FuIGJlIEhJR0gsCiAgKiAJCXdoaWxlIGEgcHJlZW1wdGlvbiBjb250ZXh0IGNhbiB1c2UgQ1JJ VElDQUwuCisgKiBAY3R4CQl0aGUgY29udGV4dCB0byBvd24gdGhlIGNsaWVudCAod2UgdXNlIHRo ZSBkZWZhdWx0IHJlbmRlciBjb250ZXh0KQogICoKICAqIFJldHVybjoJQW4gaTkxNV9ndWNfY2xp ZW50IG9iamVjdCBpZiBzdWNjZXNzLgogICovCiBzdGF0aWMgc3RydWN0IGk5MTVfZ3VjX2NsaWVu dCAqZ3VjX2NsaWVudF9hbGxvYyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAotCQkJCQkJdWludDMy X3QgcHJpb3JpdHkpCisJCQkJCQl1aW50MzJfdCBwcmlvcml0eSwKKwkJCQkJCXN0cnVjdCBpbnRl bF9jb250ZXh0ICpjdHgpCiB7CiAJc3RydWN0IGk5MTVfZ3VjX2NsaWVudCAqY2xpZW50OwogCXN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CkBAIC02 NTEsNiArNjg5LDcgQEAgc3RhdGljIHN0cnVjdCBpOTE1X2d1Y19jbGllbnQgKmd1Y19jbGllbnRf YWxsb2Moc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAogCWNsaWVudC0+ZG9vcmJlbGxfaWQgPSBH VUNfSU5WQUxJRF9ET09SQkVMTF9JRDsKIAljbGllbnQtPnByaW9yaXR5ID0gcHJpb3JpdHk7CisJ Y2xpZW50LT5vd25lciA9IGN0eDsKIAogCWNsaWVudC0+Y3R4X2luZGV4ID0gKHVpbnQzMl90KWlk YV9zaW1wbGVfZ2V0KCZndWMtPmN0eF9pZHMsIDAsCiAJCQlHVUNfTUFYX0dQVV9DT05URVhUUywg R0ZQX0tFUk5FTCk7CkBAIC03ODQsMTAgKzgyMywxMSBAQCBpbnQgaTkxNV9ndWNfc3VibWlzc2lv bl9lbmFibGUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCXN0cnVjdCBpbnRlbF9ndWMgKmd1 YyA9ICZkZXZfcHJpdi0+Z3VjOworCXN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHggPSBkZXZfcHJp di0+cmluZ1tSQ1NdLmRlZmF1bHRfY29udGV4dDsKIAlzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpj bGllbnQ7CiAKIAkvKiBjbGllbnQgZm9yIGV4ZWNidWYgc3VibWlzc2lvbiAqLwotCWNsaWVudCA9 IGd1Y19jbGllbnRfYWxsb2MoZGV2LCBHVUNfQ1RYX1BSSU9SSVRZX05PUk1BTCk7CisJY2xpZW50 ID0gZ3VjX2NsaWVudF9hbGxvYyhkZXYsIEdVQ19DVFhfUFJJT1JJVFlfTk9STUFMLCBjdHgpOwog CWlmICghY2xpZW50KSB7CiAJCURSTV9FUlJPUigiRmFpbGVkIHRvIGNyZWF0ZSBleGVjYnVmIGd1 Y19jbGllbnRcbiIpOwogCQlyZXR1cm4gLUVOT01FTTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2d1Yy5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmgK aW5kZXggZDdmZmIwZi4uYjQ2YmQyYyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZ3VjLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmgKQEAgLTMw LDYgKzMwLDcgQEAKIAogc3RydWN0IGk5MTVfZ3VjX2NsaWVudCB7CiAJc3RydWN0IGRybV9pOTE1 X2dlbV9vYmplY3QgKmNsaWVudF9vYmo7CisJc3RydWN0IGludGVsX2NvbnRleHQgKm93bmVyOwog CXVpbnQzMl90IHByaW9yaXR5OwogCXVpbnQzMl90IGN0eF9pbmRleDsKIApkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9scmMuYwppbmRleCBhNzdiMjJkLi4wNWFkN2Y0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9scmMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9s cmMuYwpAQCAtMjU3LDcgKzI1Nyw4IEBAIGludCBpbnRlbF9zYW5pdGl6ZV9lbmFibGVfZXhlY2xp c3RzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGludCBlbmFibGVfZXhlY2xpc3RzCiAgKi8KIHUz MiBpbnRlbF9leGVjbGlzdHNfY3R4X2lkKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpjdHhf b2JqKQogewotCXUzMiBscmNhID0gaTkxNV9nZW1fb2JqX2dndHRfb2Zmc2V0KGN0eF9vYmopOwor CXUzMiBscmNhID0gaTkxNV9nZW1fb2JqX2dndHRfb2Zmc2V0KGN0eF9vYmopICsKKwkJCUxSQ19Q UEhXU1BfUE4gKiBQQUdFX1NJWkU7CiAKIAkvKiBMUkNBIGlzIHJlcXVpcmVkIHRvIGJlIDRLIGFs aWduZWQgc28gdGhlIG1vcmUgc2lnbmlmaWNhbnQgMjAgYml0cwogCSAqIGFyZSBnbG9iYWxseSB1 bmlxdWUgKi8KQEAgLTI2OSw3ICsyNzAsOCBAQCB1aW50NjRfdCBpbnRlbF9scl9jb250ZXh0X2Rl c2NyaXB0b3Ioc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKIHsKIAlzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2ID0gcmluZy0+ZGV2OwogCXVpbnQ2NF90IGRlc2M7Ci0JdWludDY0X3QgbHJjYSA9 IGk5MTVfZ2VtX29ial9nZ3R0X29mZnNldChjdHhfb2JqKTsKKwl1aW50NjRfdCBscmNhID0gaTkx NV9nZW1fb2JqX2dndHRfb2Zmc2V0KGN0eF9vYmopICsKKwkJCUxSQ19QUEhXU1BfUE4gKiBQQUdF X1NJWkU7CiAKIAlXQVJOX09OKGxyY2EgJiAweEZGRkZGRkZGMDAwMDBGRkZVTEwpOwogCkBAIC0z MzksNyArMzQxLDcgQEAgdm9pZCBpbnRlbF9scl9jb250ZXh0X3VwZGF0ZShzdHJ1Y3QgZHJtX2k5 MTVfZ2VtX29iamVjdCAqY3R4X29iaiwKIAlzdHJ1Y3QgcGFnZSAqcGFnZTsKIAl1aW50MzJfdCAq cmVnX3N0YXRlOwogCi0JcGFnZSA9IGk5MTVfZ2VtX29iamVjdF9nZXRfcGFnZShjdHhfb2JqLCAx KTsKKwlwYWdlID0gaTkxNV9nZW1fb2JqZWN0X2dldF9wYWdlKGN0eF9vYmosIExSQ19TVEFURV9Q Tik7CiAJcmVnX3N0YXRlID0ga21hcF9hdG9taWMocGFnZSk7CiAKIAlyZWdfc3RhdGVbQ1RYX1JJ TkdfQlVGRkVSX1NUQVJUKzFdID0gaTkxNV9nZW1fb2JqX2dndHRfb2Zmc2V0KHJpbmdfb2JqKTsK QEAgLTY5OCwxMyArNzAwLDE3IEBAIHN0YXRpYyB2b2lkCiBpbnRlbF9sb2dpY2FsX3JpbmdfYWR2 YW5jZV9hbmRfc3VibWl0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdCkKIHsK IAlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nID0gcmVxdWVzdC0+cmluZzsKKwlzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSByZXF1ZXN0LT5pOTE1OwogCiAJaW50ZWxfbG9n aWNhbF9yaW5nX2FkdmFuY2UocmVxdWVzdC0+cmluZ2J1Zik7CiAKIAlpZiAoaW50ZWxfcmluZ19z dG9wcGVkKHJpbmcpKQogCQlyZXR1cm47CiAKLQlleGVjbGlzdHNfY29udGV4dF9xdWV1ZShyZXF1 ZXN0KTsKKwlpZiAoZGV2X3ByaXYtPmd1Yy5leGVjYnVmX2NsaWVudCkKKwkJaTkxNV9ndWNfc3Vi bWl0KGRldl9wcml2LT5ndWMuZXhlY2J1Zl9jbGllbnQsIHJlcXVlc3QtPmN0eCwgcmluZyk7CisJ ZWxzZQorCQlleGVjbGlzdHNfY29udGV4dF9xdWV1ZShyZXF1ZXN0KTsKIH0KIAogc3RhdGljIGlu dCBsb2dpY2FsX3Jpbmdfd3JhcF9idWZmZXIoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpy ZXEpCkBAIC05OTksMTggKzEwMDUsMjMgQEAgc3RhdGljIGludCBpbnRlbF9scl9jb250ZXh0X3Bp bihzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAogewogCXN0cnVjdCBkcm1faTkxNV9nZW1f b2JqZWN0ICpjdHhfb2JqID0gY3R4LT5lbmdpbmVbcmluZy0+aWRdLnN0YXRlOwogCXN0cnVjdCBp bnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmID0gY3R4LT5lbmdpbmVbcmluZy0+aWRdLnJpbmdidWY7 CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gcmluZy0+ZGV2LT5kZXZfcHJp dmF0ZTsKIAlpbnQgcmV0ID0gMDsKIAogCVdBUk5fT04oIW11dGV4X2lzX2xvY2tlZCgmcmluZy0+ ZGV2LT5zdHJ1Y3RfbXV0ZXgpKTsKIAlpZiAoY3R4LT5lbmdpbmVbcmluZy0+aWRdLnBpbl9jb3Vu dCsrID09IDApIHsKLQkJcmV0ID0gaTkxNV9nZW1fb2JqX2dndHRfcGluKGN0eF9vYmosCi0JCQkJ R0VOOF9MUl9DT05URVhUX0FMSUdOLCAwKTsKKwkJcmV0ID0gaTkxNV9nZW1fb2JqX2dndHRfcGlu KGN0eF9vYmosIEdFTjhfTFJfQ09OVEVYVF9BTElHTiwKKwkJCQlQSU5fT0ZGU0VUX0JJQVMgfCBH VUNfV09QQ01fU0laRV9WQUxVRSk7CiAJCWlmIChyZXQpCiAJCQlnb3RvIHJlc2V0X3Bpbl9jb3Vu dDsKIAogCQlyZXQgPSBpbnRlbF9waW5fYW5kX21hcF9yaW5nYnVmZmVyX29iaihyaW5nLT5kZXYs IHJpbmdidWYpOwogCQlpZiAocmV0KQogCQkJZ290byB1bnBpbl9jdHhfb2JqOworCisJCS8qIElu dmFsaWRhdGUgR3VDIFRMQi4gKi8KKwkJaWYgKGk5MTUuZW5hYmxlX2d1Y19zdWJtaXNzaW9uKQor CQkJSTkxNV9XUklURShHRU44X0dUQ1IsIEdFTjhfR1RDUl9JTlZBTElEQVRFKTsKIAl9CiAKIAly ZXR1cm4gcmV0OwpAQCAtMTY0Nyw4ICsxNjU4LDEzIEBAIG91dDoKIAogc3RhdGljIGludCBnZW44 X2luaXRfcmNzX2NvbnRleHQoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpCiB7CisJ c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gcmVxLT5pOTE1OwogCWludCByZXQ7 CiAKKwkvKiBJbnZhbGlkYXRlIEd1QyBUTEIuICovCisJaWYgKGk5MTUuZW5hYmxlX2d1Y19zdWJt aXNzaW9uKQorCQlJOTE1X1dSSVRFKEdFTjhfR1RDUiwgR0VOOF9HVENSX0lOVkFMSURBVEUpOwor CiAJcmV0ID0gaW50ZWxfbG9naWNhbF9yaW5nX3dvcmthcm91bmRzX2VtaXQocmVxKTsKIAlpZiAo cmV0KQogCQlyZXR1cm4gcmV0OwpAQCAtMjAwNSw3ICsyMDIxLDcgQEAgcG9wdWxhdGVfbHJfY29u dGV4dChzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4LCBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVj dCAqY3R4X28KIAogCS8qIFRoZSBzZWNvbmQgcGFnZSBvZiB0aGUgY29udGV4dCBvYmplY3QgY29u dGFpbnMgc29tZSBmaWVsZHMgd2hpY2ggbXVzdAogCSAqIGJlIHNldCB1cCBwcmlvciB0byB0aGUg Zmlyc3QgZXhlY3V0aW9uLiAqLwotCXBhZ2UgPSBpOTE1X2dlbV9vYmplY3RfZ2V0X3BhZ2UoY3R4 X29iaiwgMSk7CisJcGFnZSA9IGk5MTVfZ2VtX29iamVjdF9nZXRfcGFnZShjdHhfb2JqLCBMUkNf U1RBVEVfUE4pOwogCXJlZ19zdGF0ZSA9IGttYXBfYXRvbWljKHBhZ2UpOwogCiAJLyogQSBjb250 ZXh0IGlzIGFjdHVhbGx5IGEgYmlnIGJhdGNoIGJ1ZmZlciB3aXRoIHNldmVyYWwgTUlfTE9BRF9S RUdJU1RFUl9JTU0KQEAgLTIxNjMsMTIgKzIxNzksMTQgQEAgc3RhdGljIHZvaWQgbHJjX3NldHVw X2hhcmR3YXJlX3N0YXR1c19wYWdlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCiAJCXN0 cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpkZWZhdWx0X2N0eF9vYmopCiB7CiAJc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gcmluZy0+ZGV2LT5kZXZfcHJpdmF0ZTsKKwlzdHJ1 Y3QgcGFnZSAqcGFnZTsKIAogCS8qIFRoZSBzdGF0dXMgcGFnZSBpcyBvZmZzZXQgMCBmcm9tIHRo ZSBkZWZhdWx0IGNvbnRleHQgb2JqZWN0CiAJICogaW4gTFJDIG1vZGUuICovCi0JcmluZy0+c3Rh dHVzX3BhZ2UuZ2Z4X2FkZHIgPSBpOTE1X2dlbV9vYmpfZ2d0dF9vZmZzZXQoZGVmYXVsdF9jdHhf b2JqKTsKLQlyaW5nLT5zdGF0dXNfcGFnZS5wYWdlX2FkZHIgPQotCQkJa21hcChzZ19wYWdlKGRl ZmF1bHRfY3R4X29iai0+cGFnZXMtPnNnbCkpOworCXJpbmctPnN0YXR1c19wYWdlLmdmeF9hZGRy ID0gaTkxNV9nZW1fb2JqX2dndHRfb2Zmc2V0KGRlZmF1bHRfY3R4X29iaikKKwkJCSsgTFJDX1BQ SFdTUF9QTiAqIFBBR0VfU0laRTsKKwlwYWdlID0gaTkxNV9nZW1fb2JqZWN0X2dldF9wYWdlKGRl ZmF1bHRfY3R4X29iaiwgTFJDX1BQSFdTUF9QTik7CisJcmluZy0+c3RhdHVzX3BhZ2UucGFnZV9h ZGRyID0ga21hcChwYWdlKTsKIAlyaW5nLT5zdGF0dXNfcGFnZS5vYmogPSBkZWZhdWx0X2N0eF9v Ymo7CiAKIAlJOTE1X1dSSVRFKFJJTkdfSFdTX1BHQShyaW5nLT5tbWlvX2Jhc2UpLApAQCAtMjIw NCw2ICsyMjIyLDkgQEAgaW50IGludGVsX2xyX2NvbnRleHRfZGVmZXJyZWRfY3JlYXRlKHN0cnVj dCBpbnRlbF9jb250ZXh0ICpjdHgsCiAKIAljb250ZXh0X3NpemUgPSByb3VuZF91cChnZXRfbHJf Y29udGV4dF9zaXplKHJpbmcpLCA0MDk2KTsKIAorCS8qIE9uZSBleHRyYSBwYWdlIGFzIHRoZSBz aGFyaW5nIGRhdGEgYmV0d2VlbiBkcml2ZXIgYW5kIEd1QyAqLworCWNvbnRleHRfc2l6ZSArPSBQ QUdFX1NJWkUgKiBMUkNfUFBIV1NQX1BOOworCiAJY3R4X29iaiA9IGk5MTVfZ2VtX2FsbG9jX29i amVjdChkZXYsIGNvbnRleHRfc2l6ZSk7CiAJaWYgKCFjdHhfb2JqKSB7CiAJCURSTV9ERUJVR19E UklWRVIoIkFsbG9jIExSQyBiYWNraW5nIG9iaiBmYWlsZWQuXG4iKTsKQEAgLTIyMTEsNyArMjIz Miw4IEBAIGludCBpbnRlbF9scl9jb250ZXh0X2RlZmVycmVkX2NyZWF0ZShzdHJ1Y3QgaW50ZWxf Y29udGV4dCAqY3R4LAogCX0KIAogCWlmIChpc19nbG9iYWxfZGVmYXVsdF9jdHgpIHsKLQkJcmV0 ID0gaTkxNV9nZW1fb2JqX2dndHRfcGluKGN0eF9vYmosIEdFTjhfTFJfQ09OVEVYVF9BTElHTiwg MCk7CisJCXJldCA9IGk5MTVfZ2VtX29ial9nZ3R0X3BpbihjdHhfb2JqLCBHRU44X0xSX0NPTlRF WFRfQUxJR04sCisJCQkJUElOX09GRlNFVF9CSUFTIHwgR1VDX1dPUENNX1NJWkVfVkFMVUUpOwog CQlpZiAocmV0KSB7CiAJCQlEUk1fREVCVUdfRFJJVkVSKCJQaW4gTFJDIGJhY2tpbmcgb2JqIGZh aWxlZDogJWRcbiIsCiAJCQkJCXJldCk7CkBAIC0yMjMwLDcgKzIyNTIsNyBAQCBpbnQgaW50ZWxf bHJfY29udGV4dF9kZWZlcnJlZF9jcmVhdGUoc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCwKIAog CXJpbmdidWYtPnJpbmcgPSByaW5nOwogCi0JcmluZ2J1Zi0+c2l6ZSA9IDMyICogUEFHRV9TSVpF OworCXJpbmdidWYtPnNpemUgPSA0ICogUEFHRV9TSVpFOwogCXJpbmdidWYtPmVmZmVjdGl2ZV9z aXplID0gcmluZ2J1Zi0+c2l6ZTsKIAlyaW5nYnVmLT5oZWFkID0gMDsKIAlyaW5nYnVmLT50YWls ID0gMDsKQEAgLTIzMzAsNyArMjM1Miw3IEBAIHZvaWQgaW50ZWxfbHJfY29udGV4dF9yZXNldChz dHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQkJV0FSTigxLCAiRmFpbGVkIGdldF9wYWdlcyBmb3Ig Y29udGV4dCBvYmpcbiIpOwogCQkJY29udGludWU7CiAJCX0KLQkJcGFnZSA9IGk5MTVfZ2VtX29i amVjdF9nZXRfcGFnZShjdHhfb2JqLCAxKTsKKwkJcGFnZSA9IGk5MTVfZ2VtX29iamVjdF9nZXRf cGFnZShjdHhfb2JqLCBMUkNfU1RBVEVfUE4pOwogCQlyZWdfc3RhdGUgPSBrbWFwX2F0b21pYyhw YWdlKTsKIAogCQlyZWdfc3RhdGVbQ1RYX1JJTkdfSEVBRCsxXSA9IDA7CmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2xyYy5oCmluZGV4IGIzNjU5YTEuLjQ2NzE1N2MgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2xyYy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xy Yy5oCkBAIC02Niw2ICs2NiwxMiBAQCBzdGF0aWMgaW5saW5lIHZvaWQgaW50ZWxfbG9naWNhbF9y aW5nX2VtaXQoc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYsCiB9CiAKIC8qIExvZ2lj YWwgUmluZyBDb250ZXh0cyAqLworCisvKiBPbmUgZXh0cmEgcGFnZSBpcyBhZGRlZCBiZWZvcmUg TFJDIGZvciBHdUMgYXMgc2hhcmVkIGRhdGEgKi8KKyNkZWZpbmUgTFJDX0dVQ1NIUl9QTgkoMCkK KyNkZWZpbmUgTFJDX1BQSFdTUF9QTgkoTFJDX0dVQ1NIUl9QTiArIDEpCisjZGVmaW5lIExSQ19T VEFURV9QTgkoTFJDX1BQSFdTUF9QTiArIDEpCisKIHZvaWQgaW50ZWxfbHJfY29udGV4dF9mcmVl KHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgpOwogaW50IGludGVsX2xyX2NvbnRleHRfZGVmZXJy ZWRfY3JlYXRlKHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgsCiAJCQkJICAgICBzdHJ1Y3QgaW50 ZWxfZW5naW5lX2NzICpyaW5nKTsKLS0gCjEuNy45LjUKCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4 QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==