From: Ben Widawsky Subject: [PATCH 3/4] drm/i915: Add format modifiers for Intel Date: Fri, 23 Jun 2017 09:45:43 -0700 Message-ID: <20170623164544.7362-4-ben@bwidawsk.net> References: <20170623164544.7362-1-ben@bwidawsk.net> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170623164544.7362-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: Emil Velikov , Ben Widawsky , "Kristian H . Kristensen" , Daniel Stone List-Id: dri-devel@lists.freedesktop.org VGhpcyB3YXMgYmFzZWQgb24gYSBwYXRjaCBvcmlnaW5hbGx5IGJ5IEtyaXN0aWFuLiBJdCBoYXMg YmVlbiBtb2RpZmllZApwcmV0dHkgaGVhdmlseSB0byB1c2UgdGhlIG5ldyBjYWxsYmFja3MgZnJv bSB0aGUgcHJldmlvdXMgcGF0Y2guCgp2MjoKICAtIEFkZCBMSU5FQVIgYW5kIFlmIG1vZGlmaWVy cyB0byBsaXN0IChWaWxsZSkKICAtIENvbWJpbmUgaTh4eCBhbmQgaTk2NSBpbnRvIG9uZSBsaXN0 IG9mIGZvcm1hdHMgKFZpbGxlKQogIC0gQWxsb3cgMTAxMDEwMiBmb3JtYXRzIGZvciBZL1lmIHRp bGVkIChWaWxsZSkKCnYzOgogIC0gSGFuZGxlIGN1cnNvciBmb3JtYXRzIChWaWxsZSkKICAtIFB1 dCBoYW5kbGluZyBmb3IgTElORUFSIGluIHRoZSBtb2Rfc3VwcG9ydCBmdW5jdGlvbnMgKFZpbGxl KQoKdjQ6CiAgLSBMaXN0IGVhY2ggbW9kaWZpZXIgZXhwbGljaXRseSBpbiBzdXBwb3J0ZWQgbW9k aWZpZXJzIChWaWxsZSkKICAtIEhhbmRsZSB0aGUgQ1VSU09SIHBsYW5lIChWaWxsZSkKCnY1Ogog IC0gU3BsaXQgb3V0IGN1cnNvciBhbmQgc3ByaXRlIGhhbmRsaW5nIChWaWxsZSkKCnY2OgogIC0g QWN0dWFsbHkgdXNlIHRoZSBzcHJpdGUgZnVuY3MgKEVtaWwpCiAgLSBVc2UgdW5yZWFjaGFibGUg KEVtaWwpCgp2NzoKICAtIE9ubHkgYWxsb3cgSW50ZWwgbW9kaWZpZXJzIGFuZCBMSU5FQVIgKEJl bikKCnY4CiAgLSBGaXggc3BpdGUgYXNzZXJ0IGludHJvZHVjZWQgaW4gdjYgKERhbmllbCkKCkNj OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgpDYzogS3Jp c3RpYW4gSC4gS3Jpc3RlbnNlbiA8aG9lZ3NiZXJnQGdtYWlsLmNvbT4KQ2M6IEVtaWwgVmVsaWtv diA8ZW1pbC5sLnZlbGlrb3ZAZ21haWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBCZW4gV2lkYXdza3kg PGJlbkBid2lkYXdzay5uZXQ+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh eS5jIHwgMTM2ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYyAgfCAgODIgKysrKysrKysrKysrKysrKysrKystCiAy IGZpbGVzIGNoYW5nZWQsIDIxMSBpbnNlcnRpb25zKCspLCA3IGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCA3ZDU1YzVlM2RmMjguLjg3N2E1MTUxNGM2 MSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtNzIsNiArNzIsMTIgQEAg c3RhdGljIGNvbnN0IHVpbnQzMl90IGk5NjVfcHJpbWFyeV9mb3JtYXRzW10gPSB7CiAJRFJNX0ZP Uk1BVF9YQkdSMjEwMTAxMCwKIH07CiAKK3N0YXRpYyBjb25zdCB1aW50NjRfdCBpOXh4X2Zvcm1h dF9tb2RpZmllcnNbXSA9IHsKKwlJOTE1X0ZPUk1BVF9NT0RfWF9USUxFRCwKKwlEUk1fRk9STUFU X01PRF9MSU5FQVIsCisJRFJNX0ZPUk1BVF9NT0RfSU5WQUxJRAorfTsKKwogc3RhdGljIGNvbnN0 IHVpbnQzMl90IHNrbF9wcmltYXJ5X2Zvcm1hdHNbXSA9IHsKIAlEUk1fRk9STUFUX0M4LAogCURS TV9GT1JNQVRfUkdCNTY1LApAQCAtODcsMTEgKzkzLDI0IEBAIHN0YXRpYyBjb25zdCB1aW50MzJf dCBza2xfcHJpbWFyeV9mb3JtYXRzW10gPSB7CiAJRFJNX0ZPUk1BVF9WWVVZLAogfTsKIAorc3Rh dGljIGNvbnN0IHVpbnQ2NF90IHNrbF9mb3JtYXRfbW9kaWZpZXJzW10gPSB7CisJSTkxNV9GT1JN QVRfTU9EX1lmX1RJTEVELAorCUk5MTVfRk9STUFUX01PRF9ZX1RJTEVELAorCUk5MTVfRk9STUFU X01PRF9YX1RJTEVELAorCURSTV9GT1JNQVRfTU9EX0xJTkVBUiwKKwlEUk1fRk9STUFUX01PRF9J TlZBTElECit9OworCiAvKiBDdXJzb3IgZm9ybWF0cyAqLwogc3RhdGljIGNvbnN0IHVpbnQzMl90 IGludGVsX2N1cnNvcl9mb3JtYXRzW10gPSB7CiAJRFJNX0ZPUk1BVF9BUkdCODg4OCwKIH07CiAK K3N0YXRpYyBjb25zdCB1aW50NjRfdCBjdXJzb3JfZm9ybWF0X21vZGlmaWVyc1tdID0geworCURS TV9GT1JNQVRfTU9EX0xJTkVBUiwKKwlEUk1fRk9STUFUX01PRF9JTlZBTElECit9OworCiBzdGF0 aWMgdm9pZCBpOXh4X2NydGNfY2xvY2tfZ2V0KHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogCQkJ CXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpwaXBlX2NvbmZpZyk7CiBzdGF0aWMgdm9pZCBpcm9u bGFrZV9wY2hfY2xvY2tfZ2V0KHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLApAQCAtMTM4MTAsNiAr MTM4MjksMTA4IEBAIHZvaWQgaW50ZWxfcGxhbmVfZGVzdHJveShzdHJ1Y3QgZHJtX3BsYW5lICpw bGFuZSkKIAlrZnJlZSh0b19pbnRlbF9wbGFuZShwbGFuZSkpOwogfQogCitzdGF0aWMgYm9vbCBp OHh4X21vZF9zdXBwb3J0ZWQodWludDMyX3QgZm9ybWF0LCB1aW50NjRfdCBtb2RpZmllcikKK3sK Kwlzd2l0Y2ggKGZvcm1hdCkgeworCWNhc2UgRFJNX0ZPUk1BVF9DODoKKwljYXNlIERSTV9GT1JN QVRfUkdCNTY1OgorCWNhc2UgRFJNX0ZPUk1BVF9YUkdCMTU1NToKKwljYXNlIERSTV9GT1JNQVRf WFJHQjg4ODg6CisJCXJldHVybiBtb2RpZmllciA9PSBEUk1fRk9STUFUX01PRF9MSU5FQVIgfHwK KwkJCW1vZGlmaWVyID09IEk5MTVfRk9STUFUX01PRF9YX1RJTEVEOworCWRlZmF1bHQ6CisJCXJl dHVybiBmYWxzZTsKKwl9Cit9CisKK3N0YXRpYyBib29sIGk5NjVfbW9kX3N1cHBvcnRlZCh1aW50 MzJfdCBmb3JtYXQsIHVpbnQ2NF90IG1vZGlmaWVyKQoreworCXN3aXRjaCAoZm9ybWF0KSB7CisJ Y2FzZSBEUk1fRk9STUFUX0M4OgorCWNhc2UgRFJNX0ZPUk1BVF9SR0I1NjU6CisJY2FzZSBEUk1f Rk9STUFUX1hSR0I4ODg4OgorCWNhc2UgRFJNX0ZPUk1BVF9YQkdSODg4ODoKKwljYXNlIERSTV9G T1JNQVRfWFJHQjIxMDEwMTA6CisJY2FzZSBEUk1fRk9STUFUX1hCR1IyMTAxMDEwOgorCQlyZXR1 cm4gbW9kaWZpZXIgPT0gRFJNX0ZPUk1BVF9NT0RfTElORUFSIHx8CisJCQltb2RpZmllciA9PSBJ OTE1X0ZPUk1BVF9NT0RfWF9USUxFRDsKKwlkZWZhdWx0OgorCQlyZXR1cm4gZmFsc2U7CisJfQor fQorCitzdGF0aWMgYm9vbCBza2xfbW9kX3N1cHBvcnRlZCh1aW50MzJfdCBmb3JtYXQsIHVpbnQ2 NF90IG1vZGlmaWVyKQoreworCXN3aXRjaCAoZm9ybWF0KSB7CisJY2FzZSBEUk1fRk9STUFUX0M4 OgorCQlzd2l0Y2ggKG1vZGlmaWVyKSB7CisJCWNhc2UgRFJNX0ZPUk1BVF9NT0RfTElORUFSOgor CQljYXNlIEk5MTVfRk9STUFUX01PRF9YX1RJTEVEOgorCQljYXNlIEk5MTVfRk9STUFUX01PRF9Z X1RJTEVEOgorCQkJcmV0dXJuIHRydWU7CisJCWRlZmF1bHQ6CisJCQlyZXR1cm4gZmFsc2U7CisJ CX0KKwljYXNlIERSTV9GT1JNQVRfUkdCNTY1OgorCWNhc2UgRFJNX0ZPUk1BVF9YUkdCODg4ODoK KwljYXNlIERSTV9GT1JNQVRfWEJHUjg4ODg6CisJY2FzZSBEUk1fRk9STUFUX0FSR0I4ODg4Ogor CWNhc2UgRFJNX0ZPUk1BVF9BQkdSODg4ODoKKwljYXNlIERSTV9GT1JNQVRfWFJHQjIxMDEwMTA6 CisJY2FzZSBEUk1fRk9STUFUX1hCR1IyMTAxMDEwOgorCWNhc2UgRFJNX0ZPUk1BVF9ZVVlWOgor CWNhc2UgRFJNX0ZPUk1BVF9ZVllVOgorCWNhc2UgRFJNX0ZPUk1BVF9VWVZZOgorCWNhc2UgRFJN X0ZPUk1BVF9WWVVZOgorCQkvKiBBbGwgaTkxNSBtb2RpZmllcnMgYXJlIGZpbmUgKi8KKwkJc3dp dGNoIChtb2RpZmllcikgeworCQljYXNlIERSTV9GT1JNQVRfTU9EX0xJTkVBUjoKKwkJY2FzZSBJ OTE1X0ZPUk1BVF9NT0RfWF9USUxFRDoKKwkJY2FzZSBJOTE1X0ZPUk1BVF9NT0RfWV9USUxFRDoK KwkJY2FzZSBJOTE1X0ZPUk1BVF9NT0RfWWZfVElMRUQ6CisJCQlyZXR1cm4gdHJ1ZTsKKwkJZGVm YXVsdDoKKwkJCXJldHVybiBmYWxzZTsKKwkJfQorCWRlZmF1bHQ6CisJCXJldHVybiBmYWxzZTsK Kwl9Cit9CisKK3N0YXRpYyBib29sIGludGVsX3ByaW1hcnlfcGxhbmVfZm9ybWF0X21vZF9zdXBw b3J0ZWQoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCisJCQkJCQkgICAgIHVpbnQzMl90IGZvcm1h dCwKKwkJCQkJCSAgICAgdWludDY0X3QgbW9kaWZpZXIpCit7CisJc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShwbGFuZS0+ZGV2KTsKKworCWlmIChXQVJOX09OKG1v ZGlmaWVyID09IERSTV9GT1JNQVRfTU9EX0lOVkFMSUQpKQorCQlyZXR1cm4gZmFsc2U7CisKKwlp ZiAoKG1vZGlmaWVyID4+IDU2KSAhPSBEUk1fRk9STUFUX01PRF9WRU5ET1JfSU5URUwgJiYKKwkg ICAgbW9kaWZpZXIgIT0gRFJNX0ZPUk1BVF9NT0RfTElORUFSKQorCQlyZXR1cm4gZmFsc2U7CisK KworCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDkpCisJCXJldHVybiBza2xfbW9kX3N1cHBv cnRlZChmb3JtYXQsIG1vZGlmaWVyKTsKKwllbHNlIGlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49 IDQpCisJCXJldHVybiBpOTY1X21vZF9zdXBwb3J0ZWQoZm9ybWF0LCBtb2RpZmllcik7CisJZWxz ZQorCQlyZXR1cm4gaTh4eF9tb2Rfc3VwcG9ydGVkKGZvcm1hdCwgbW9kaWZpZXIpOworCisJdW5y ZWFjaGFibGUoKTsKK30KKworc3RhdGljIGJvb2wgaW50ZWxfY3Vyc29yX3BsYW5lX2Zvcm1hdF9t b2Rfc3VwcG9ydGVkKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAorCQkJCQkJICAgIHVpbnQzMl90 IGZvcm1hdCwKKwkJCQkJCSAgICB1aW50NjRfdCBtb2RpZmllcikKK3sKKwlpZiAoV0FSTl9PTiht b2RpZmllciA9PSBEUk1fRk9STUFUX01PRF9JTlZBTElEKSkKKwkJcmV0dXJuIGZhbHNlOworCisJ cmV0dXJuIG1vZGlmaWVyID09IERSTV9GT1JNQVRfTU9EX0xJTkVBUiAmJiBmb3JtYXQgPT0gRFJN X0ZPUk1BVF9BUkdCODg4ODsKK30KKwogY29uc3Qgc3RydWN0IGRybV9wbGFuZV9mdW5jcyBpbnRl bF9wbGFuZV9mdW5jcyA9IHsKIAkudXBkYXRlX3BsYW5lID0gZHJtX2F0b21pY19oZWxwZXJfdXBk YXRlX3BsYW5lLAogCS5kaXNhYmxlX3BsYW5lID0gZHJtX2F0b21pY19oZWxwZXJfZGlzYWJsZV9w bGFuZSwKQEAgLTEzODE5LDYgKzEzOTQwLDcgQEAgY29uc3Qgc3RydWN0IGRybV9wbGFuZV9mdW5j cyBpbnRlbF9wbGFuZV9mdW5jcyA9IHsKIAkuYXRvbWljX3NldF9wcm9wZXJ0eSA9IGludGVsX3Bs YW5lX2F0b21pY19zZXRfcHJvcGVydHksCiAJLmF0b21pY19kdXBsaWNhdGVfc3RhdGUgPSBpbnRl bF9wbGFuZV9kdXBsaWNhdGVfc3RhdGUsCiAJLmF0b21pY19kZXN0cm95X3N0YXRlID0gaW50ZWxf cGxhbmVfZGVzdHJveV9zdGF0ZSwKKwkuZm9ybWF0X21vZF9zdXBwb3J0ZWQgPSBpbnRlbF9wcmlt YXJ5X3BsYW5lX2Zvcm1hdF9tb2Rfc3VwcG9ydGVkLAogfTsKIAogc3RhdGljIGludApAQCAtMTM5 NTQsNiArMTQwNzYsNyBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IGRybV9wbGFuZV9mdW5jcyBpbnRl bF9jdXJzb3JfcGxhbmVfZnVuY3MgPSB7CiAJLmF0b21pY19zZXRfcHJvcGVydHkgPSBpbnRlbF9w bGFuZV9hdG9taWNfc2V0X3Byb3BlcnR5LAogCS5hdG9taWNfZHVwbGljYXRlX3N0YXRlID0gaW50 ZWxfcGxhbmVfZHVwbGljYXRlX3N0YXRlLAogCS5hdG9taWNfZGVzdHJveV9zdGF0ZSA9IGludGVs X3BsYW5lX2Rlc3Ryb3lfc3RhdGUsCisJLmZvcm1hdF9tb2Rfc3VwcG9ydGVkID0gaW50ZWxfY3Vy c29yX3BsYW5lX2Zvcm1hdF9tb2Rfc3VwcG9ydGVkLAogfTsKIAogc3RhdGljIHN0cnVjdCBpbnRl bF9wbGFuZSAqCkBAIC0xMzk2NCw2ICsxNDA4Nyw3IEBAIGludGVsX3ByaW1hcnlfcGxhbmVfY3Jl YXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgZW51bSBwaXBlIHBpcGUpCiAJ Y29uc3QgdWludDMyX3QgKmludGVsX3ByaW1hcnlfZm9ybWF0czsKIAl1bnNpZ25lZCBpbnQgc3Vw cG9ydGVkX3JvdGF0aW9uczsKIAl1bnNpZ25lZCBpbnQgbnVtX2Zvcm1hdHM7CisJY29uc3QgdWlu dDY0X3QgKmludGVsX2Zvcm1hdF9tb2RpZmllcnM7CiAJaW50IHJldDsKIAogCXByaW1hcnkgPSBr emFsbG9jKHNpemVvZigqcHJpbWFyeSksIEdGUF9LRVJORUwpOwpAQCAtMTQwMDIsMTggKzE0MTI2 LDIxIEBAIGludGVsX3ByaW1hcnlfcGxhbmVfY3JlYXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiwgZW51bSBwaXBlIHBpcGUpCiAJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0g OSkgewogCQlpbnRlbF9wcmltYXJ5X2Zvcm1hdHMgPSBza2xfcHJpbWFyeV9mb3JtYXRzOwogCQlu dW1fZm9ybWF0cyA9IEFSUkFZX1NJWkUoc2tsX3ByaW1hcnlfZm9ybWF0cyk7CisJCWludGVsX2Zv cm1hdF9tb2RpZmllcnMgPSBza2xfZm9ybWF0X21vZGlmaWVyczsKIAogCQlwcmltYXJ5LT51cGRh dGVfcGxhbmUgPSBza3lsYWtlX3VwZGF0ZV9wcmltYXJ5X3BsYW5lOwogCQlwcmltYXJ5LT5kaXNh YmxlX3BsYW5lID0gc2t5bGFrZV9kaXNhYmxlX3ByaW1hcnlfcGxhbmU7CiAJfSBlbHNlIGlmIChJ TlRFTF9HRU4oZGV2X3ByaXYpID49IDQpIHsKIAkJaW50ZWxfcHJpbWFyeV9mb3JtYXRzID0gaTk2 NV9wcmltYXJ5X2Zvcm1hdHM7CiAJCW51bV9mb3JtYXRzID0gQVJSQVlfU0laRShpOTY1X3ByaW1h cnlfZm9ybWF0cyk7CisJCWludGVsX2Zvcm1hdF9tb2RpZmllcnMgPSBpOXh4X2Zvcm1hdF9tb2Rp ZmllcnM7CiAKIAkJcHJpbWFyeS0+dXBkYXRlX3BsYW5lID0gaTl4eF91cGRhdGVfcHJpbWFyeV9w bGFuZTsKIAkJcHJpbWFyeS0+ZGlzYWJsZV9wbGFuZSA9IGk5eHhfZGlzYWJsZV9wcmltYXJ5X3Bs YW5lOwogCX0gZWxzZSB7CiAJCWludGVsX3ByaW1hcnlfZm9ybWF0cyA9IGk4eHhfcHJpbWFyeV9m b3JtYXRzOwogCQludW1fZm9ybWF0cyA9IEFSUkFZX1NJWkUoaTh4eF9wcmltYXJ5X2Zvcm1hdHMp OworCQlpbnRlbF9mb3JtYXRfbW9kaWZpZXJzID0gaTl4eF9mb3JtYXRfbW9kaWZpZXJzOwogCiAJ CXByaW1hcnktPnVwZGF0ZV9wbGFuZSA9IGk5eHhfdXBkYXRlX3ByaW1hcnlfcGxhbmU7CiAJCXBy aW1hcnktPmRpc2FibGVfcGxhbmUgPSBpOXh4X2Rpc2FibGVfcHJpbWFyeV9wbGFuZTsKQEAgLTE0 MDIzLDIxICsxNDE1MCwyMSBAQCBpbnRlbF9wcmltYXJ5X3BsYW5lX2NyZWF0ZShzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIGVudW0gcGlwZSBwaXBlKQogCQlyZXQgPSBkcm1fdW5p dmVyc2FsX3BsYW5lX2luaXQoJmRldl9wcml2LT5kcm0sICZwcmltYXJ5LT5iYXNlLAogCQkJCQkg ICAgICAgMCwgJmludGVsX3BsYW5lX2Z1bmNzLAogCQkJCQkgICAgICAgaW50ZWxfcHJpbWFyeV9m b3JtYXRzLCBudW1fZm9ybWF0cywKLQkJCQkJICAgICAgIE5VTEwsCisJCQkJCSAgICAgICBpbnRl bF9mb3JtYXRfbW9kaWZpZXJzLAogCQkJCQkgICAgICAgRFJNX1BMQU5FX1RZUEVfUFJJTUFSWSwK IAkJCQkJICAgICAgICJwbGFuZSAxJWMiLCBwaXBlX25hbWUocGlwZSkpOwogCWVsc2UgaWYgKElO VEVMX0dFTihkZXZfcHJpdikgPj0gNSB8fCBJU19HNFgoZGV2X3ByaXYpKQogCQlyZXQgPSBkcm1f dW5pdmVyc2FsX3BsYW5lX2luaXQoJmRldl9wcml2LT5kcm0sICZwcmltYXJ5LT5iYXNlLAogCQkJ CQkgICAgICAgMCwgJmludGVsX3BsYW5lX2Z1bmNzLAogCQkJCQkgICAgICAgaW50ZWxfcHJpbWFy eV9mb3JtYXRzLCBudW1fZm9ybWF0cywKLQkJCQkJICAgICAgIE5VTEwsCisJCQkJCSAgICAgICBp bnRlbF9mb3JtYXRfbW9kaWZpZXJzLAogCQkJCQkgICAgICAgRFJNX1BMQU5FX1RZUEVfUFJJTUFS WSwKIAkJCQkJICAgICAgICJwcmltYXJ5ICVjIiwgcGlwZV9uYW1lKHBpcGUpKTsKIAllbHNlCiAJ CXJldCA9IGRybV91bml2ZXJzYWxfcGxhbmVfaW5pdCgmZGV2X3ByaXYtPmRybSwgJnByaW1hcnkt PmJhc2UsCiAJCQkJCSAgICAgICAwLCAmaW50ZWxfcGxhbmVfZnVuY3MsCiAJCQkJCSAgICAgICBp bnRlbF9wcmltYXJ5X2Zvcm1hdHMsIG51bV9mb3JtYXRzLAotCQkJCQkgICAgICAgTlVMTCwKKwkJ CQkJICAgICAgIGludGVsX2Zvcm1hdF9tb2RpZmllcnMsCiAJCQkJCSAgICAgICBEUk1fUExBTkVf VFlQRV9QUklNQVJZLAogCQkJCQkgICAgICAgInBsYW5lICVjIiwgcGxhbmVfbmFtZShwcmltYXJ5 LT5wbGFuZSkpOwogCWlmIChyZXQpCkBAIC0xNDEyMyw3ICsxNDI1MCw4IEBAIGludGVsX2N1cnNv cl9wbGFuZV9jcmVhdGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQkJCSAg ICAgICAwLCAmaW50ZWxfY3Vyc29yX3BsYW5lX2Z1bmNzLAogCQkJCSAgICAgICBpbnRlbF9jdXJz b3JfZm9ybWF0cywKIAkJCQkgICAgICAgQVJSQVlfU0laRShpbnRlbF9jdXJzb3JfZm9ybWF0cyks Ci0JCQkJICAgICAgIE5VTEwsIERSTV9QTEFORV9UWVBFX0NVUlNPUiwKKwkJCQkgICAgICAgY3Vy c29yX2Zvcm1hdF9tb2RpZmllcnMsCisJCQkJICAgICAgIERSTV9QTEFORV9UWVBFX0NVUlNPUiwK IAkJCQkgICAgICAgImN1cnNvciAlYyIsIHBpcGVfbmFtZShwaXBlKSk7CiAJaWYgKHJldCkKIAkJ Z290byBmYWlsOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRl LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwppbmRleCAxNWJiNDM3ODdl YjUuLmU4MDgzNGNiMWY0YyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf c3ByaXRlLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKQEAgLTMw LDYgKzMwLDcgQEAKICAqIHN1cHBvcnQuCiAgKi8KICNpbmNsdWRlIDxkcm0vZHJtUC5oPgorI2lu Y2x1ZGUgPGRybS9kcm1fYXRvbWljX2hlbHBlci5oPgogI2luY2x1ZGUgPGRybS9kcm1fY3J0Yy5o PgogI2luY2x1ZGUgPGRybS9kcm1fZm91cmNjLmg+CiAjaW5jbHVkZSA8ZHJtL2RybV9yZWN0Lmg+ CkBAIC0xMDQzLDYgKzEwNDQsMTIgQEAgc3RhdGljIGNvbnN0IHVpbnQzMl90IGc0eF9wbGFuZV9m b3JtYXRzW10gPSB7CiAJRFJNX0ZPUk1BVF9WWVVZLAogfTsKIAorc3RhdGljIGNvbnN0IHVpbnQ2 NF90IGk5eHhfcGxhbmVfZm9ybWF0X21vZGlmaWVyc1tdID0geworCUk5MTVfRk9STUFUX01PRF9Y X1RJTEVELAorCURSTV9GT1JNQVRfTU9EX0xJTkVBUiwKKwlEUk1fRk9STUFUX01PRF9JTlZBTElE Cit9OworCiBzdGF0aWMgY29uc3QgdWludDMyX3Qgc25iX3BsYW5lX2Zvcm1hdHNbXSA9IHsKIAlE Uk1fRk9STUFUX1hCR1I4ODg4LAogCURSTV9GT1JNQVRfWFJHQjg4ODgsCkBAIC0xMDc4LDYgKzEw ODUsNjggQEAgc3RhdGljIHVpbnQzMl90IHNrbF9wbGFuZV9mb3JtYXRzW10gPSB7CiAJRFJNX0ZP Uk1BVF9WWVVZLAogfTsKIAorc3RhdGljIGNvbnN0IHVpbnQ2NF90IHNrbF9wbGFuZV9mb3JtYXRf bW9kaWZpZXJzW10gPSB7CisJSTkxNV9GT1JNQVRfTU9EX1lmX1RJTEVELAorCUk5MTVfRk9STUFU X01PRF9ZX1RJTEVELAorCUk5MTVfRk9STUFUX01PRF9YX1RJTEVELAorCURSTV9GT1JNQVRfTU9E X0xJTkVBUiwKKwlEUk1fRk9STUFUX01PRF9JTlZBTElECit9OworCitzdGF0aWMgYm9vbCBpbnRl bF9zcHJpdGVfcGxhbmVfZm9ybWF0X21vZF9zdXBwb3J0ZWQoc3RydWN0IGRybV9wbGFuZSAqcGxh bmUsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg dWludDMyX3QgZm9ybWF0LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHVpbnQ2NF90IG1vZGlmaWVyKQoreworCXN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUocGxhbmUtPmRldik7CisKKwlpZiAoV0FSTl9PTihtb2Rp ZmllciA9PSBEUk1fRk9STUFUX01PRF9JTlZBTElEKSkKKwkJcmV0dXJuIGZhbHNlOworCisJQlVH X09OKHBsYW5lLT50eXBlICE9IERSTV9QTEFORV9UWVBFX09WRVJMQVkpOworCisJaWYgKChtb2Rp ZmllciA+PiA1NikgIT0gRFJNX0ZPUk1BVF9NT0RfVkVORE9SX0lOVEVMICYmCisJICAgIG1vZGlm aWVyICE9IERSTV9GT1JNQVRfTU9EX0xJTkVBUikKKwkJcmV0dXJuIGZhbHNlOworCisJc3dpdGNo IChmb3JtYXQpIHsKKwkJY2FzZSBEUk1fRk9STUFUX1hCR1IyMTAxMDEwOgorCQljYXNlIERSTV9G T1JNQVRfQUJHUjIxMDEwMTA6CisJCQlpZiAoSVNfVkFMTEVZVklFVyhkZXZfcHJpdikgfHwgSVNf Q0hFUlJZVklFVyhkZXZfcHJpdikpCisJCQkJcmV0dXJuIHRydWU7CisJCQlicmVhazsKKwkJY2Fz ZSBEUk1fRk9STUFUX1JHQjU2NToKKwkJY2FzZSBEUk1fRk9STUFUX0FCR1I4ODg4OgorCQljYXNl IERSTV9GT1JNQVRfQVJHQjg4ODg6CisJCQlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA5IHx8 IElTX1ZBTExFWVZJRVcoZGV2X3ByaXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKQorCQkJ CXJldHVybiB0cnVlOworCQkJYnJlYWs7CisJCWNhc2UgRFJNX0ZPUk1BVF9YQkdSODg4ODoKKwkJ CWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDYpCisJCQkJcmV0dXJuIHRydWU7CisJCQlicmVh azsKKwkJY2FzZSBEUk1fRk9STUFUX1hSR0I4ODg4OgorCQljYXNlIERSTV9GT1JNQVRfWVVZVjoK KwkJY2FzZSBEUk1fRk9STUFUX1lWWVU6CisJCWNhc2UgRFJNX0ZPUk1BVF9VWVZZOgorCQljYXNl IERSTV9GT1JNQVRfVllVWToKKwkJCXJldHVybiB0cnVlOworCX0KKworCXJldHVybiBmYWxzZTsK K30KKworY29uc3Qgc3RydWN0IGRybV9wbGFuZV9mdW5jcyBpbnRlbF9zcHJpdGVfcGxhbmVfZnVu Y3MgPSB7CisgICAgICAgIC51cGRhdGVfcGxhbmUgPSBkcm1fYXRvbWljX2hlbHBlcl91cGRhdGVf cGxhbmUsCisgICAgICAgIC5kaXNhYmxlX3BsYW5lID0gZHJtX2F0b21pY19oZWxwZXJfZGlzYWJs ZV9wbGFuZSwKKyAgICAgICAgLmRlc3Ryb3kgPSBpbnRlbF9wbGFuZV9kZXN0cm95LAorICAgICAg ICAuc2V0X3Byb3BlcnR5ID0gZHJtX2F0b21pY19oZWxwZXJfcGxhbmVfc2V0X3Byb3BlcnR5LAor ICAgICAgICAuYXRvbWljX2dldF9wcm9wZXJ0eSA9IGludGVsX3BsYW5lX2F0b21pY19nZXRfcHJv cGVydHksCisgICAgICAgIC5hdG9taWNfc2V0X3Byb3BlcnR5ID0gaW50ZWxfcGxhbmVfYXRvbWlj X3NldF9wcm9wZXJ0eSwKKyAgICAgICAgLmF0b21pY19kdXBsaWNhdGVfc3RhdGUgPSBpbnRlbF9w bGFuZV9kdXBsaWNhdGVfc3RhdGUsCisgICAgICAgIC5hdG9taWNfZGVzdHJveV9zdGF0ZSA9IGlu dGVsX3BsYW5lX2Rlc3Ryb3lfc3RhdGUsCisgICAgICAgIC5mb3JtYXRfbW9kX3N1cHBvcnRlZCA9 IGludGVsX3Nwcml0ZV9wbGFuZV9mb3JtYXRfbW9kX3N1cHBvcnRlZCwKK307CisKIHN0cnVjdCBp bnRlbF9wbGFuZSAqCiBpbnRlbF9zcHJpdGVfcGxhbmVfY3JlYXRlKHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiwKIAkJCSAgZW51bSBwaXBlIHBpcGUsIGludCBwbGFuZSkKQEAgLTEw ODYsNiArMTE1NSw3IEBAIGludGVsX3Nwcml0ZV9wbGFuZV9jcmVhdGUoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2LAogCXN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqc3RhdGUgPSBO VUxMOwogCXVuc2lnbmVkIGxvbmcgcG9zc2libGVfY3J0Y3M7CiAJY29uc3QgdWludDMyX3QgKnBs YW5lX2Zvcm1hdHM7CisJY29uc3QgdWludDY0X3QgKm1vZGlmaWVyczsKIAl1bnNpZ25lZCBpbnQg c3VwcG9ydGVkX3JvdGF0aW9uczsKIAlpbnQgbnVtX3BsYW5lX2Zvcm1hdHM7CiAJaW50IHJldDsK QEAgLTExMTIsNiArMTE4Miw3IEBAIGludGVsX3Nwcml0ZV9wbGFuZV9jcmVhdGUoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCiAJCXBsYW5lX2Zvcm1hdHMgPSBza2xfcGxhbmVf Zm9ybWF0czsKIAkJbnVtX3BsYW5lX2Zvcm1hdHMgPSBBUlJBWV9TSVpFKHNrbF9wbGFuZV9mb3Jt YXRzKTsKKwkJbW9kaWZpZXJzID0gc2tsX3BsYW5lX2Zvcm1hdF9tb2RpZmllcnM7CiAJfSBlbHNl IGlmIChJU19WQUxMRVlWSUVXKGRldl9wcml2KSB8fCBJU19DSEVSUllWSUVXKGRldl9wcml2KSkg ewogCQlpbnRlbF9wbGFuZS0+Y2FuX3NjYWxlID0gZmFsc2U7CiAJCWludGVsX3BsYW5lLT5tYXhf ZG93bnNjYWxlID0gMTsKQEAgLTExMjEsNiArMTE5Miw3IEBAIGludGVsX3Nwcml0ZV9wbGFuZV9j cmVhdGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCiAJCXBsYW5lX2Zvcm1h dHMgPSB2bHZfcGxhbmVfZm9ybWF0czsKIAkJbnVtX3BsYW5lX2Zvcm1hdHMgPSBBUlJBWV9TSVpF KHZsdl9wbGFuZV9mb3JtYXRzKTsKKwkJbW9kaWZpZXJzID0gaTl4eF9wbGFuZV9mb3JtYXRfbW9k aWZpZXJzOwogCX0gZWxzZSBpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA3KSB7CiAJCWlmIChJ U19JVllCUklER0UoZGV2X3ByaXYpKSB7CiAJCQlpbnRlbF9wbGFuZS0+Y2FuX3NjYWxlID0gdHJ1 ZTsKQEAgLTExMzUsNiArMTIwNyw3IEBAIGludGVsX3Nwcml0ZV9wbGFuZV9jcmVhdGUoc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCiAJCXBsYW5lX2Zvcm1hdHMgPSBzbmJfcGxh bmVfZm9ybWF0czsKIAkJbnVtX3BsYW5lX2Zvcm1hdHMgPSBBUlJBWV9TSVpFKHNuYl9wbGFuZV9m b3JtYXRzKTsKKwkJbW9kaWZpZXJzID0gaTl4eF9wbGFuZV9mb3JtYXRfbW9kaWZpZXJzOwogCX0g ZWxzZSB7CiAJCWludGVsX3BsYW5lLT5jYW5fc2NhbGUgPSB0cnVlOwogCQlpbnRlbF9wbGFuZS0+ bWF4X2Rvd25zY2FsZSA9IDE2OwpAQCAtMTE0Miw2ICsxMjE1LDcgQEAgaW50ZWxfc3ByaXRlX3Bs YW5lX2NyZWF0ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCWludGVsX3Bs YW5lLT51cGRhdGVfcGxhbmUgPSBnNHhfdXBkYXRlX3BsYW5lOwogCQlpbnRlbF9wbGFuZS0+ZGlz YWJsZV9wbGFuZSA9IGc0eF9kaXNhYmxlX3BsYW5lOwogCisJCW1vZGlmaWVycyA9IGk5eHhfcGxh bmVfZm9ybWF0X21vZGlmaWVyczsKIAkJaWYgKElTX0dFTjYoZGV2X3ByaXYpKSB7CiAJCQlwbGFu ZV9mb3JtYXRzID0gc25iX3BsYW5lX2Zvcm1hdHM7CiAJCQludW1fcGxhbmVfZm9ybWF0cyA9IEFS UkFZX1NJWkUoc25iX3BsYW5lX2Zvcm1hdHMpOwpAQCAtMTE3NCwxNSArMTI0OCwxNyBAQCBpbnRl bF9zcHJpdGVfcGxhbmVfY3JlYXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwK IAogCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDkpCiAJCXJldCA9IGRybV91bml2ZXJzYWxf cGxhbmVfaW5pdCgmZGV2X3ByaXYtPmRybSwgJmludGVsX3BsYW5lLT5iYXNlLAotCQkJCQkgICAg ICAgcG9zc2libGVfY3J0Y3MsICZpbnRlbF9wbGFuZV9mdW5jcywKKwkJCQkJICAgICAgIHBvc3Np YmxlX2NydGNzLCAmaW50ZWxfc3ByaXRlX3BsYW5lX2Z1bmNzLAogCQkJCQkgICAgICAgcGxhbmVf Zm9ybWF0cywgbnVtX3BsYW5lX2Zvcm1hdHMsCi0JCQkJCSAgICAgICBOVUxMLCBEUk1fUExBTkVf VFlQRV9PVkVSTEFZLAorCQkJCQkgICAgICAgbW9kaWZpZXJzLAorCQkJCQkgICAgICAgRFJNX1BM QU5FX1RZUEVfT1ZFUkxBWSwKIAkJCQkJICAgICAgICJwbGFuZSAlZCVjIiwgcGxhbmUgKyAyLCBw aXBlX25hbWUocGlwZSkpOwogCWVsc2UKIAkJcmV0ID0gZHJtX3VuaXZlcnNhbF9wbGFuZV9pbml0 KCZkZXZfcHJpdi0+ZHJtLCAmaW50ZWxfcGxhbmUtPmJhc2UsCiAJCQkJCSAgICAgICBwb3NzaWJs ZV9jcnRjcywgJmludGVsX3BsYW5lX2Z1bmNzLAogCQkJCQkgICAgICAgcGxhbmVfZm9ybWF0cywg bnVtX3BsYW5lX2Zvcm1hdHMsCi0JCQkJCSAgICAgICBOVUxMLCBEUk1fUExBTkVfVFlQRV9PVkVS TEFZLAorCQkJCQkgICAgICAgbW9kaWZpZXJzLAorCQkJCQkgICAgICAgRFJNX1BMQU5FX1RZUEVf T1ZFUkxBWSwKIAkJCQkJICAgICAgICJzcHJpdGUgJWMiLCBzcHJpdGVfbmFtZShwaXBlLCBwbGFu ZSkpOwogCWlmIChyZXQpCiAJCWdvdG8gZmFpbDsKLS0gCjIuMTMuMQoKX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApk cmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Au b3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==