From: Ben Widawsky Subject: [PATCH 3/3] drm/i915: Add format modifiers for Intel Date: Fri, 24 Mar 2017 14:29:50 -0700 Message-ID: <20170324212950.2206-3-ben@bwidawsk.net> References: <20170324212950.2206-1-ben@bwidawsk.net> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170324212950.2206-1-ben@bwidawsk.net> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: DRI Development , Intel GFX Cc: Ben Widawsky , "Kristian H . Kristensen" List-Id: dri-devel@lists.freedesktop.org VGhpcyB3YXMgYmFzZWQgb24gYSBwYXRjaCBvcmlnaW5hbGx5IGJ5IEtyaXN0aWFuLiBJdCBoYXMg YmVlbiBtb2RpZmllZApwcmV0dHkgaGVhdmlseSB0byB1c2UgdGhlIG5ldyBjYWxsYmFja3MgZnJv bSB0aGUgcHJldmlvdXMgcGF0Y2guCgp2MjoKICAtIEFkZCBMSU5FQVIgYW5kIFlmIG1vZGlmaWVy cyB0byBsaXN0IChWaWxsZSkKICAtIENvbWJpbmUgaTh4eCBhbmQgaTk2NSBpbnRvIG9uZSBsaXN0 IG9mIGZvcm1hdHMgKFZpbGxlKQogIC0gQWxsb3cgMTAxMDEwMiBmb3JtYXRzIGZvciBZL1lmIHRp bGVkIChWaWxsZSkKCnYzOgogIC0gSGFuZGxlIGN1cnNvciBmb3JtYXRzIChWaWxsZSkKICAtIFB1 dCBoYW5kbGluZyBmb3IgTElORUFSIGluIHRoZSBtb2Rfc3VwcG9ydCBmdW5jdGlvbnMgKFZpbGxl KQoKQ2M6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+CkNj OiBLcmlzdGlhbiBILiBLcmlzdGVuc2VuIDxob2Vnc2JlcmdAZ21haWwuY29tPgpTaWduZWQtb2Zm LWJ5OiBCZW4gV2lkYXdza3kgPGJlbkBid2lkYXdzay5uZXQ+Ci0tLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgMTEyICsrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYyAgfCAgMjUgKysrKysr Ky0KIDIgZmlsZXMgY2hhbmdlZCwgMTMxIGluc2VydGlvbnMoKyksIDYgZGVsZXRpb25zKC0pCgpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IDgwMmE4NDQ5YzVkMy4uYmI1NTlh MTE2ZmRhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC03Miw2ICs3Miwx MiBAQCBzdGF0aWMgY29uc3QgdWludDMyX3QgaTk2NV9wcmltYXJ5X2Zvcm1hdHNbXSA9IHsKIAlE Uk1fRk9STUFUX1hCR1IyMTAxMDEwLAogfTsKIAorc3RhdGljIGNvbnN0IHVpbnQ2NF90IGk5eHhf Zm9ybWF0X21vZGlmaWVyc1tdID0geworCUk5MTVfRk9STUFUX01PRF9YX1RJTEVELAorCURSTV9G T1JNQVRfTU9EX0xJTkVBUiwKKwlEUk1fRk9STUFUX01PRF9JTlZBTElECit9OworCiBzdGF0aWMg Y29uc3QgdWludDMyX3Qgc2tsX3ByaW1hcnlfZm9ybWF0c1tdID0gewogCURSTV9GT1JNQVRfQzgs CiAJRFJNX0ZPUk1BVF9SR0I1NjUsCkBAIC04Nyw2ICs5MywxNCBAQCBzdGF0aWMgY29uc3QgdWlu dDMyX3Qgc2tsX3ByaW1hcnlfZm9ybWF0c1tdID0gewogCURSTV9GT1JNQVRfVllVWSwKIH07CiAK K3N0YXRpYyBjb25zdCB1aW50NjRfdCBza2xfZm9ybWF0X21vZGlmaWVyc1tdID0geworCUk5MTVf Rk9STUFUX01PRF9ZZl9USUxFRCwKKwlJOTE1X0ZPUk1BVF9NT0RfWV9USUxFRCwKKwlJOTE1X0ZP Uk1BVF9NT0RfWF9USUxFRCwKKwlEUk1fRk9STUFUX01PRF9MSU5FQVIsCisJRFJNX0ZPUk1BVF9N T0RfSU5WQUxJRAorfTsKKwogLyogQ3Vyc29yIGZvcm1hdHMgKi8KIHN0YXRpYyBjb25zdCB1aW50 MzJfdCBpbnRlbF9jdXJzb3JfZm9ybWF0c1tdID0gewogCURSTV9GT1JNQVRfQVJHQjg4ODgsCkBA IC0xMzQ1Myw2ICsxMzQ2Nyw4MyBAQCB2b2lkIGludGVsX3BsYW5lX2Rlc3Ryb3koc3RydWN0IGRy bV9wbGFuZSAqcGxhbmUpCiAJa2ZyZWUodG9faW50ZWxfcGxhbmUocGxhbmUpKTsKIH0KIAorc3Rh dGljIGJvb2wgaTh4eF9tb2Rfc3VwcG9ydGVkKHVpbnQzMl90IGZvcm1hdCwgdWludDY0X3QgbW9k aWZpZXIpCit7CisJc3dpdGNoIChmb3JtYXQpIHsKKwljYXNlIERSTV9GT1JNQVRfQzg6CisJY2Fz ZSBEUk1fRk9STUFUX1JHQjU2NToKKwljYXNlIERSTV9GT1JNQVRfWFJHQjE1NTU6CisJY2FzZSBE Uk1fRk9STUFUX1hSR0I4ODg4OgorCQlyZXR1cm4gbW9kaWZpZXIgPT0gRFJNX0ZPUk1BVF9NT0Rf TElORUFSIHx8CisJCQltb2RpZmllciA9PSBJOTE1X0ZPUk1BVF9NT0RfWF9USUxFRDsKKwlkZWZh dWx0OgorCQlyZXR1cm4gZmFsc2U7CisJfQorfQorCitzdGF0aWMgYm9vbCBpOTY1X21vZF9zdXBw b3J0ZWQodWludDMyX3QgZm9ybWF0LCB1aW50NjRfdCBtb2RpZmllcikKK3sKKwlzd2l0Y2ggKGZv cm1hdCkgeworCWNhc2UgRFJNX0ZPUk1BVF9DODoKKwljYXNlIERSTV9GT1JNQVRfUkdCNTY1Ogor CWNhc2UgRFJNX0ZPUk1BVF9YUkdCODg4ODoKKwljYXNlIERSTV9GT1JNQVRfWEJHUjg4ODg6CisJ Y2FzZSBEUk1fRk9STUFUX1hSR0IyMTAxMDEwOgorCWNhc2UgRFJNX0ZPUk1BVF9YQkdSMjEwMTAx MDoKKwkJcmV0dXJuIG1vZGlmaWVyID09IERSTV9GT1JNQVRfTU9EX0xJTkVBUiB8fAorCQkJbW9k aWZpZXIgPT0gSTkxNV9GT1JNQVRfTU9EX1hfVElMRUQ7CisJZGVmYXVsdDoKKwkJcmV0dXJuIGZh bHNlOworCX0KK30KKworc3RhdGljIGJvb2wgc2tsX21vZF9zdXBwb3J0ZWQodWludDMyX3QgZm9y bWF0LCB1aW50NjRfdCBtb2RpZmllcikKK3sKKwlzd2l0Y2ggKGZvcm1hdCkgeworCWNhc2UgRFJN X0ZPUk1BVF9DODoKKwkJcmV0dXJuIG1vZGlmaWVyID09IERSTV9GT1JNQVRfTU9EX0xJTkVBUiB8 fAorCQkJKG1vZGlmaWVyID49IEk5MTVfRk9STUFUX01PRF9YX1RJTEVEICYmCisJCQkgbW9kaWZp ZXIgPCBJOTE1X0ZPUk1BVF9NT0RfWWZfVElMRUQpOworCWNhc2UgRFJNX0ZPUk1BVF9SR0I1NjU6 CisJY2FzZSBEUk1fRk9STUFUX1hSR0I4ODg4OgorCWNhc2UgRFJNX0ZPUk1BVF9YQkdSODg4ODoK KwljYXNlIERSTV9GT1JNQVRfQVJHQjg4ODg6CisJY2FzZSBEUk1fRk9STUFUX0FCR1I4ODg4Ogor CWNhc2UgRFJNX0ZPUk1BVF9YUkdCMjEwMTAxMDoKKwljYXNlIERSTV9GT1JNQVRfWEJHUjIxMDEw MTA6CisJCXJldHVybiBtb2RpZmllciA9PSBEUk1fRk9STUFUX01PRF9MSU5FQVIgfHwKKwkJCSht b2RpZmllciA+PSBJOTE1X0ZPUk1BVF9NT0RfWF9USUxFRCAmJgorCQkJbW9kaWZpZXIgPD0gSTkx NV9GT1JNQVRfTU9EX1lmX1RJTEVEKTsKKwljYXNlIERSTV9GT1JNQVRfWVVZVjoKKwljYXNlIERS TV9GT1JNQVRfWVZZVToKKwljYXNlIERSTV9GT1JNQVRfVVlWWToKKwljYXNlIERSTV9GT1JNQVRf VllVWToKKwkJcmV0dXJuIG1vZGlmaWVyID09IERSTV9GT1JNQVRfTU9EX0xJTkVBUjsKKwlkZWZh dWx0OgorCQlyZXR1cm4gZmFsc2U7CisJfQorCit9CisKK3N0YXRpYyBib29sIGludGVsX3BsYW5l X2Zvcm1hdF9tb2Rfc3VwcG9ydGVkKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAorCQkJCQkgICAg IHVpbnQzMl90IGZvcm1hdCwKKwkJCQkJICAgICB1aW50NjRfdCBtb2RpZmllcikKK3sKKwlzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KHBsYW5lLT5kZXYpOworCisJ aWYgKFdBUk5fT04obW9kaWZpZXIgPT0gRFJNX0ZPUk1BVF9NT0RfSU5WQUxJRCkpCisJCXJldHVy biBmYWxzZTsKKworCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDkpCisJCXJldHVybiBza2xf bW9kX3N1cHBvcnRlZChmb3JtYXQsIG1vZGlmaWVyKTsKKwllbHNlIGlmIChJTlRFTF9HRU4oZGV2 X3ByaXYpID49IDQpCisJCXJldHVybiBpOTY1X21vZF9zdXBwb3J0ZWQoZm9ybWF0LCBtb2RpZmll cik7CisJZWxzZQorCQlyZXR1cm4gaTh4eF9tb2Rfc3VwcG9ydGVkKGZvcm1hdCwgbW9kaWZpZXIp OworCisJcmV0dXJuIGZhbHNlOworfQorCiBjb25zdCBzdHJ1Y3QgZHJtX3BsYW5lX2Z1bmNzIGlu dGVsX3BsYW5lX2Z1bmNzID0gewogCS51cGRhdGVfcGxhbmUgPSBkcm1fYXRvbWljX2hlbHBlcl91 cGRhdGVfcGxhbmUsCiAJLmRpc2FibGVfcGxhbmUgPSBkcm1fYXRvbWljX2hlbHBlcl9kaXNhYmxl X3BsYW5lLApAQCAtMTM0NjIsNiArMTM1NTMsNyBAQCBjb25zdCBzdHJ1Y3QgZHJtX3BsYW5lX2Z1 bmNzIGludGVsX3BsYW5lX2Z1bmNzID0gewogCS5hdG9taWNfc2V0X3Byb3BlcnR5ID0gaW50ZWxf cGxhbmVfYXRvbWljX3NldF9wcm9wZXJ0eSwKIAkuYXRvbWljX2R1cGxpY2F0ZV9zdGF0ZSA9IGlu dGVsX3BsYW5lX2R1cGxpY2F0ZV9zdGF0ZSwKIAkuYXRvbWljX2Rlc3Ryb3lfc3RhdGUgPSBpbnRl bF9wbGFuZV9kZXN0cm95X3N0YXRlLAorCS5mb3JtYXRfbW9kX3N1cHBvcnRlZCA9IGludGVsX3Bs YW5lX2Zvcm1hdF9tb2Rfc3VwcG9ydGVkLAogfTsKIAogc3RhdGljIGludApAQCAtMTM1OTgsNiAr MTM2OTAsNyBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IGRybV9wbGFuZV9mdW5jcyBpbnRlbF9jdXJz b3JfcGxhbmVfZnVuY3MgPSB7CiAJLmF0b21pY19zZXRfcHJvcGVydHkgPSBpbnRlbF9wbGFuZV9h dG9taWNfc2V0X3Byb3BlcnR5LAogCS5hdG9taWNfZHVwbGljYXRlX3N0YXRlID0gaW50ZWxfcGxh bmVfZHVwbGljYXRlX3N0YXRlLAogCS5hdG9taWNfZGVzdHJveV9zdGF0ZSA9IGludGVsX3BsYW5l X2Rlc3Ryb3lfc3RhdGUsCisJLmZvcm1hdF9tb2Rfc3VwcG9ydGVkID0gaW50ZWxfcGxhbmVfZm9y bWF0X21vZF9zdXBwb3J0ZWQsCiB9OwogCiBzdGF0aWMgc3RydWN0IGludGVsX3BsYW5lICoKQEAg LTEzNjA4LDYgKzEzNzAxLDcgQEAgaW50ZWxfcHJpbWFyeV9wbGFuZV9jcmVhdGUoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCBlbnVtIHBpcGUgcGlwZSkKIAljb25zdCB1aW50MzJf dCAqaW50ZWxfcHJpbWFyeV9mb3JtYXRzOwogCXVuc2lnbmVkIGludCBzdXBwb3J0ZWRfcm90YXRp b25zOwogCXVuc2lnbmVkIGludCBudW1fZm9ybWF0czsKKwljb25zdCB1aW50NjRfdCAqaW50ZWxf Zm9ybWF0X21vZGlmaWVyczsKIAlpbnQgcmV0OwogCiAJcHJpbWFyeSA9IGt6YWxsb2Moc2l6ZW9m KCpwcmltYXJ5KSwgR0ZQX0tFUk5FTCk7CkBAIC0xMzY0NiwyNCArMTM3NDAsMjggQEAgaW50ZWxf cHJpbWFyeV9wbGFuZV9jcmVhdGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCBl bnVtIHBpcGUgcGlwZSkKIAlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA5KSB7CiAJCWludGVs X3ByaW1hcnlfZm9ybWF0cyA9IHNrbF9wcmltYXJ5X2Zvcm1hdHM7CiAJCW51bV9mb3JtYXRzID0g QVJSQVlfU0laRShza2xfcHJpbWFyeV9mb3JtYXRzKTsKKwkJaW50ZWxfZm9ybWF0X21vZGlmaWVy cyA9IHNrbF9mb3JtYXRfbW9kaWZpZXJzOwogCiAJCXByaW1hcnktPnVwZGF0ZV9wbGFuZSA9IHNr eWxha2VfdXBkYXRlX3ByaW1hcnlfcGxhbmU7CiAJCXByaW1hcnktPmRpc2FibGVfcGxhbmUgPSBz a3lsYWtlX2Rpc2FibGVfcHJpbWFyeV9wbGFuZTsKIAl9IGVsc2UgaWYgKEhBU19QQ0hfU1BMSVQo ZGV2X3ByaXYpKSB7CiAJCWludGVsX3ByaW1hcnlfZm9ybWF0cyA9IGk5NjVfcHJpbWFyeV9mb3Jt YXRzOwogCQludW1fZm9ybWF0cyA9IEFSUkFZX1NJWkUoaTk2NV9wcmltYXJ5X2Zvcm1hdHMpOwor CQlpbnRlbF9mb3JtYXRfbW9kaWZpZXJzID0gaTl4eF9mb3JtYXRfbW9kaWZpZXJzOwogCiAJCXBy aW1hcnktPnVwZGF0ZV9wbGFuZSA9IGlyb25sYWtlX3VwZGF0ZV9wcmltYXJ5X3BsYW5lOwogCQlw cmltYXJ5LT5kaXNhYmxlX3BsYW5lID0gaTl4eF9kaXNhYmxlX3ByaW1hcnlfcGxhbmU7CiAJfSBl bHNlIGlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDQpIHsKIAkJaW50ZWxfcHJpbWFyeV9mb3Jt YXRzID0gaTk2NV9wcmltYXJ5X2Zvcm1hdHM7CiAJCW51bV9mb3JtYXRzID0gQVJSQVlfU0laRShp OTY1X3ByaW1hcnlfZm9ybWF0cyk7CisJCWludGVsX2Zvcm1hdF9tb2RpZmllcnMgPSBpOXh4X2Zv cm1hdF9tb2RpZmllcnM7CiAKIAkJcHJpbWFyeS0+dXBkYXRlX3BsYW5lID0gaTl4eF91cGRhdGVf cHJpbWFyeV9wbGFuZTsKIAkJcHJpbWFyeS0+ZGlzYWJsZV9wbGFuZSA9IGk5eHhfZGlzYWJsZV9w cmltYXJ5X3BsYW5lOwogCX0gZWxzZSB7CiAJCWludGVsX3ByaW1hcnlfZm9ybWF0cyA9IGk4eHhf cHJpbWFyeV9mb3JtYXRzOwogCQludW1fZm9ybWF0cyA9IEFSUkFZX1NJWkUoaTh4eF9wcmltYXJ5 X2Zvcm1hdHMpOworCQlpbnRlbF9mb3JtYXRfbW9kaWZpZXJzID0gaTl4eF9mb3JtYXRfbW9kaWZp ZXJzOwogCiAJCXByaW1hcnktPnVwZGF0ZV9wbGFuZSA9IGk5eHhfdXBkYXRlX3ByaW1hcnlfcGxh bmU7CiAJCXByaW1hcnktPmRpc2FibGVfcGxhbmUgPSBpOXh4X2Rpc2FibGVfcHJpbWFyeV9wbGFu ZTsKQEAgLTEzNjczLDIxICsxMzc3MSwyMSBAQCBpbnRlbF9wcmltYXJ5X3BsYW5lX2NyZWF0ZShz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIGVudW0gcGlwZSBwaXBlKQogCQlyZXQg PSBkcm1fdW5pdmVyc2FsX3BsYW5lX2luaXQoJmRldl9wcml2LT5kcm0sICZwcmltYXJ5LT5iYXNl LAogCQkJCQkgICAgICAgMCwgJmludGVsX3BsYW5lX2Z1bmNzLAogCQkJCQkgICAgICAgaW50ZWxf cHJpbWFyeV9mb3JtYXRzLCBudW1fZm9ybWF0cywKLQkJCQkJICAgICAgIE5VTEwsCisJCQkJCSAg ICAgICBpbnRlbF9mb3JtYXRfbW9kaWZpZXJzLAogCQkJCQkgICAgICAgRFJNX1BMQU5FX1RZUEVf UFJJTUFSWSwKIAkJCQkJICAgICAgICJwbGFuZSAxJWMiLCBwaXBlX25hbWUocGlwZSkpOwogCWVs c2UgaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gNSB8fCBJU19HNFgoZGV2X3ByaXYpKQogCQly ZXQgPSBkcm1fdW5pdmVyc2FsX3BsYW5lX2luaXQoJmRldl9wcml2LT5kcm0sICZwcmltYXJ5LT5i YXNlLAogCQkJCQkgICAgICAgMCwgJmludGVsX3BsYW5lX2Z1bmNzLAogCQkJCQkgICAgICAgaW50 ZWxfcHJpbWFyeV9mb3JtYXRzLCBudW1fZm9ybWF0cywKLQkJCQkJICAgICAgIE5VTEwsCisJCQkJ CSAgICAgICBpbnRlbF9mb3JtYXRfbW9kaWZpZXJzLAogCQkJCQkgICAgICAgRFJNX1BMQU5FX1RZ UEVfUFJJTUFSWSwKIAkJCQkJICAgICAgICJwcmltYXJ5ICVjIiwgcGlwZV9uYW1lKHBpcGUpKTsK IAllbHNlCiAJCXJldCA9IGRybV91bml2ZXJzYWxfcGxhbmVfaW5pdCgmZGV2X3ByaXYtPmRybSwg JnByaW1hcnktPmJhc2UsCiAJCQkJCSAgICAgICAwLCAmaW50ZWxfcGxhbmVfZnVuY3MsCiAJCQkJ CSAgICAgICBpbnRlbF9wcmltYXJ5X2Zvcm1hdHMsIG51bV9mb3JtYXRzLAotCQkJCQkgICAgICAg TlVMTCwKKwkJCQkJICAgICAgIGludGVsX2Zvcm1hdF9tb2RpZmllcnMsCiAJCQkJCSAgICAgICBE Uk1fUExBTkVfVFlQRV9QUklNQVJZLAogCQkJCQkgICAgICAgInBsYW5lICVjIiwgcGxhbmVfbmFt ZShwcmltYXJ5LT5wbGFuZSkpOwogCWlmIChyZXQpCkBAIC0xMzgxNyw2ICsxMzkxNSwxMSBAQCBp bnRlbF91cGRhdGVfY3Vyc29yX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCWludGVs X2NydGNfdXBkYXRlX2N1cnNvcihjcnRjLCBjcnRjX3N0YXRlLCBzdGF0ZSk7CiB9CiAKK3N0YXRp YyBjb25zdCB1aW50NjRfdCBjdXJzb3JfZm9ybWF0X21vZGlmaWVyc1tdID0geworCURSTV9GT1JN QVRfTU9EX0xJTkVBUiwKKwlEUk1fRk9STUFUX01PRF9JTlZBTElECit9OworCiBzdGF0aWMgc3Ry dWN0IGludGVsX3BsYW5lICoKIGludGVsX2N1cnNvcl9wbGFuZV9jcmVhdGUoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2LCBlbnVtIHBpcGUgcGlwZSkKIHsKQEAgLTEzODUyLDcgKzEz OTU1LDggQEAgaW50ZWxfY3Vyc29yX3BsYW5lX2NyZWF0ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYsIGVudW0gcGlwZSBwaXBlKQogCQkJCSAgICAgICAwLCAmaW50ZWxfY3Vyc29y X3BsYW5lX2Z1bmNzLAogCQkJCSAgICAgICBpbnRlbF9jdXJzb3JfZm9ybWF0cywKIAkJCQkgICAg ICAgQVJSQVlfU0laRShpbnRlbF9jdXJzb3JfZm9ybWF0cyksCi0JCQkJICAgICAgIE5VTEwsIERS TV9QTEFORV9UWVBFX0NVUlNPUiwKKwkJCQkgICAgICAgY3Vyc29yX2Zvcm1hdF9tb2RpZmllcnMs CisJCQkJICAgICAgIERSTV9QTEFORV9UWVBFX0NVUlNPUiwKIAkJCQkgICAgICAgImN1cnNvciAl YyIsIHBpcGVfbmFtZShwaXBlKSk7CiAJaWYgKHJldCkKIAkJZ290byBmYWlsOwpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9zcHJpdGUuYwppbmRleCA5ZjJiZGVmZGM2OTAuLmJmMThkOWVkYzY2ZiAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKQEAgLTEwNTMsNiArMTA1MywxMiBAQCBzdGF0 aWMgY29uc3QgdWludDMyX3QgaWxrX3BsYW5lX2Zvcm1hdHNbXSA9IHsKIAlEUk1fRk9STUFUX1ZZ VVksCiB9OwogCitzdGF0aWMgY29uc3QgdWludDY0X3QgaTl4eF9wbGFuZV9mb3JtYXRfbW9kaWZp ZXJzW10gPSB7CisJSTkxNV9GT1JNQVRfTU9EX1hfVElMRUQsCisJRFJNX0ZPUk1BVF9NT0RfTElO RUFSLAorCURSTV9GT1JNQVRfTU9EX0lOVkFMSUQKK307CisKIHN0YXRpYyBjb25zdCB1aW50MzJf dCBzbmJfcGxhbmVfZm9ybWF0c1tdID0gewogCURSTV9GT1JNQVRfWEJHUjg4ODgsCiAJRFJNX0ZP Uk1BVF9YUkdCODg4OCwKQEAgLTEwODgsNiArMTA5NCwxNCBAQCBzdGF0aWMgdWludDMyX3Qgc2ts X3BsYW5lX2Zvcm1hdHNbXSA9IHsKIAlEUk1fRk9STUFUX1ZZVVksCiB9OwogCitzdGF0aWMgY29u c3QgdWludDY0X3Qgc2tsX3BsYW5lX2Zvcm1hdF9tb2RpZmllcnNbXSA9IHsKKwlJOTE1X0ZPUk1B VF9NT0RfWWZfVElMRUQsCisJSTkxNV9GT1JNQVRfTU9EX1lfVElMRUQsCisJSTkxNV9GT1JNQVRf TU9EX1hfVElMRUQsCisJRFJNX0ZPUk1BVF9NT0RfTElORUFSLAorCURSTV9GT1JNQVRfTU9EX0lO VkFMSUQKK307CisKIHN0cnVjdCBpbnRlbF9wbGFuZSAqCiBpbnRlbF9zcHJpdGVfcGxhbmVfY3Jl YXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCSAgZW51bSBwaXBlIHBp cGUsIGludCBwbGFuZSkKQEAgLTEwOTYsNiArMTExMCw3IEBAIGludGVsX3Nwcml0ZV9wbGFuZV9j cmVhdGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCXN0cnVjdCBpbnRlbF9w bGFuZV9zdGF0ZSAqc3RhdGUgPSBOVUxMOwogCXVuc2lnbmVkIGxvbmcgcG9zc2libGVfY3J0Y3M7 CiAJY29uc3QgdWludDMyX3QgKnBsYW5lX2Zvcm1hdHM7CisJY29uc3QgdWludDY0X3QgKm1vZGlm aWVyczsKIAl1bnNpZ25lZCBpbnQgc3VwcG9ydGVkX3JvdGF0aW9uczsKIAlpbnQgbnVtX3BsYW5l X2Zvcm1hdHM7CiAJaW50IHJldDsKQEAgLTExMjIsNiArMTEzNyw3IEBAIGludGVsX3Nwcml0ZV9w bGFuZV9jcmVhdGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCiAJCXBsYW5l X2Zvcm1hdHMgPSBza2xfcGxhbmVfZm9ybWF0czsKIAkJbnVtX3BsYW5lX2Zvcm1hdHMgPSBBUlJB WV9TSVpFKHNrbF9wbGFuZV9mb3JtYXRzKTsKKwkJbW9kaWZpZXJzID0gc2tsX3BsYW5lX2Zvcm1h dF9tb2RpZmllcnM7CiAJfSBlbHNlIGlmIChJU19WQUxMRVlWSUVXKGRldl9wcml2KSB8fCBJU19D SEVSUllWSUVXKGRldl9wcml2KSkgewogCQlpbnRlbF9wbGFuZS0+Y2FuX3NjYWxlID0gZmFsc2U7 CiAJCWludGVsX3BsYW5lLT5tYXhfZG93bnNjYWxlID0gMTsKQEAgLTExMzEsNiArMTE0Nyw3IEBA IGludGVsX3Nwcml0ZV9wbGFuZV9jcmVhdGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2LAogCiAJCXBsYW5lX2Zvcm1hdHMgPSB2bHZfcGxhbmVfZm9ybWF0czsKIAkJbnVtX3BsYW5l X2Zvcm1hdHMgPSBBUlJBWV9TSVpFKHZsdl9wbGFuZV9mb3JtYXRzKTsKKwkJbW9kaWZpZXJzID0g aTl4eF9wbGFuZV9mb3JtYXRfbW9kaWZpZXJzOwogCX0gZWxzZSBpZiAoSU5URUxfR0VOKGRldl9w cml2KSA+PSA3KSB7CiAJCWlmIChJU19JVllCUklER0UoZGV2X3ByaXYpKSB7CiAJCQlpbnRlbF9w bGFuZS0+Y2FuX3NjYWxlID0gdHJ1ZTsKQEAgLTExNDUsNiArMTE2Miw3IEBAIGludGVsX3Nwcml0 ZV9wbGFuZV9jcmVhdGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCiAJCXBs YW5lX2Zvcm1hdHMgPSBzbmJfcGxhbmVfZm9ybWF0czsKIAkJbnVtX3BsYW5lX2Zvcm1hdHMgPSBB UlJBWV9TSVpFKHNuYl9wbGFuZV9mb3JtYXRzKTsKKwkJbW9kaWZpZXJzID0gaTl4eF9wbGFuZV9m b3JtYXRfbW9kaWZpZXJzOwogCX0gZWxzZSB7CiAJCWludGVsX3BsYW5lLT5jYW5fc2NhbGUgPSB0 cnVlOwogCQlpbnRlbF9wbGFuZS0+bWF4X2Rvd25zY2FsZSA9IDE2OwpAQCAtMTE1Miw2ICsxMTcw LDcgQEAgaW50ZWxfc3ByaXRlX3BsYW5lX2NyZWF0ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYsCiAJCWludGVsX3BsYW5lLT51cGRhdGVfcGxhbmUgPSBpbGtfdXBkYXRlX3BsYW5l OwogCQlpbnRlbF9wbGFuZS0+ZGlzYWJsZV9wbGFuZSA9IGlsa19kaXNhYmxlX3BsYW5lOwogCisJ CW1vZGlmaWVycyA9IGk5eHhfcGxhbmVfZm9ybWF0X21vZGlmaWVyczsKIAkJaWYgKElTX0dFTjYo ZGV2X3ByaXYpKSB7CiAJCQlwbGFuZV9mb3JtYXRzID0gc25iX3BsYW5lX2Zvcm1hdHM7CiAJCQlu dW1fcGxhbmVfZm9ybWF0cyA9IEFSUkFZX1NJWkUoc25iX3BsYW5lX2Zvcm1hdHMpOwpAQCAtMTE4 NiwxMyArMTIwNSwxNSBAQCBpbnRlbF9zcHJpdGVfcGxhbmVfY3JlYXRlKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiwKIAkJcmV0ID0gZHJtX3VuaXZlcnNhbF9wbGFuZV9pbml0KCZk ZXZfcHJpdi0+ZHJtLCAmaW50ZWxfcGxhbmUtPmJhc2UsCiAJCQkJCSAgICAgICBwb3NzaWJsZV9j cnRjcywgJmludGVsX3BsYW5lX2Z1bmNzLAogCQkJCQkgICAgICAgcGxhbmVfZm9ybWF0cywgbnVt X3BsYW5lX2Zvcm1hdHMsCi0JCQkJCSAgICAgICBOVUxMLCBEUk1fUExBTkVfVFlQRV9PVkVSTEFZ LAorCQkJCQkgICAgICAgbW9kaWZpZXJzLAorCQkJCQkgICAgICAgRFJNX1BMQU5FX1RZUEVfT1ZF UkxBWSwKIAkJCQkJICAgICAgICJwbGFuZSAlZCVjIiwgcGxhbmUgKyAyLCBwaXBlX25hbWUocGlw ZSkpOwogCWVsc2UKIAkJcmV0ID0gZHJtX3VuaXZlcnNhbF9wbGFuZV9pbml0KCZkZXZfcHJpdi0+ ZHJtLCAmaW50ZWxfcGxhbmUtPmJhc2UsCiAJCQkJCSAgICAgICBwb3NzaWJsZV9jcnRjcywgJmlu dGVsX3BsYW5lX2Z1bmNzLAogCQkJCQkgICAgICAgcGxhbmVfZm9ybWF0cywgbnVtX3BsYW5lX2Zv cm1hdHMsCi0JCQkJCSAgICAgICBOVUxMLCBEUk1fUExBTkVfVFlQRV9PVkVSTEFZLAorCQkJCQkg ICAgICAgbW9kaWZpZXJzLAorCQkJCQkgICAgICAgRFJNX1BMQU5FX1RZUEVfT1ZFUkxBWSwKIAkJ CQkJICAgICAgICJzcHJpdGUgJWMiLCBzcHJpdGVfbmFtZShwaXBlLCBwbGFuZSkpOwogCWlmIChy ZXQpCiAJCWdvdG8gZmFpbDsKLS0gCjIuMTIuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v bGlzdGluZm8vZHJpLWRldmVsCg==