From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 067/190] drm/i915: Unify legacy/execlists emission of MI_BATCHBUFFER_START Date: Mon, 11 Jan 2016 09:17:18 +0000 Message-ID: <1452503961-14837-67-git-send-email-chris@chris-wilson.co.uk> References: <1452503961-14837-1-git-send-email-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0306E6E255 for ; Mon, 11 Jan 2016 01:20:56 -0800 (PST) Received: by mail-wm0-f67.google.com with SMTP id b14so25375921wmb.1 for ; Mon, 11 Jan 2016 01:20:55 -0800 (PST) In-Reply-To: <1452503961-14837-1-git-send-email-chris@chris-wilson.co.uk> 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 Qm90aCB0aGUgLT5kaXNwYXRjaF9leGVjYnVmZmVyIGFuZCAtPmVtaXRfYmJfc3RhcnQgY2FsbGJh Y2tzIGRvIGV4YWN0bHkKdGhlIHNhbWUgdGhpbmcsIGFkZCBNSV9CQVRDSEJVRkZFUl9TVEFSVCB0 byB0aGUgcmVxdWVzdCdzIHJpbmdidWZmZXIgLQp3ZSBuZWVkIG9ubHkgb25lIHZmdW5jLgoKU2ln bmVkLW9mZi1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+Ci0tLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jICAgfCAgNiArLS0KIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlbmRlcl9zdGF0ZS5jIHwgMTYgKysrLS0tLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgICAgICAgICAgICAgfCAgOSArKystCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMgICAgICB8IDY3ICsrKysrKysr KysrKystLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZm ZXIuaCAgICAgIHwgMTIgKysrLS0KIDUgZmlsZXMgY2hhbmdlZCwgNTUgaW5zZXJ0aW9ucygrKSwg NTUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW1fZXhlY2J1ZmZlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZl ci5jCmluZGV4IDM5NTZkNzRkOGM4Yy4uM2U2Mzg0ZGVjYTY1IDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jCkBAIC0xMjk3LDkgKzEyOTcsOSBAQCBpOTE1X2dl bV9yaW5nYnVmZmVyX3N1Ym1pc3Npb24oc3RydWN0IGk5MTVfZXhlY2J1ZmZlcl9wYXJhbXMgKnBh cmFtcywKIAlleGVjX3N0YXJ0ID0gcGFyYW1zLT5iYXRjaF9vYmpfdm1fb2Zmc2V0ICsKIAkJICAg ICBwYXJhbXMtPmFyZ3NfYmF0Y2hfc3RhcnRfb2Zmc2V0OwogCi0JcmV0ID0gcGFyYW1zLT5yaW5n LT5kaXNwYXRjaF9leGVjYnVmZmVyKHBhcmFtcy0+cmVxdWVzdCwKLQkJCQkJCWV4ZWNfc3RhcnQs IGV4ZWNfbGVuLAotCQkJCQkJcGFyYW1zLT5kaXNwYXRjaF9mbGFncyk7CisJcmV0ID0gcGFyYW1z LT5yaW5nLT5lbWl0X2JiX3N0YXJ0KHBhcmFtcy0+cmVxdWVzdCwKKwkJCQkJICBleGVjX3N0YXJ0 LCBleGVjX2xlbiwKKwkJCQkJICBwYXJhbXMtPmRpc3BhdGNoX2ZsYWdzKTsKIAlpZiAocmV0KQog CQlyZXR1cm4gcmV0OwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bV9yZW5kZXJfc3RhdGUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlbmRlcl9z dGF0ZS5jCmluZGV4IGJlZTNmMGNjZDBjZC4uY2NjOTg4YzJiMjI2IDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9yZW5kZXJfc3RhdGUuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbV9yZW5kZXJfc3RhdGUuYwpAQCAtMjA1LDE4ICsyMDUsMTggQEAg aW50IGk5MTVfZ2VtX3JlbmRlcl9zdGF0ZV9pbml0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVz dCAqcmVxKQogCWlmIChzby5yb2RhdGEgPT0gTlVMTCkKIAkJcmV0dXJuIDA7CiAKLQlyZXQgPSBy ZXEtPmVuZ2luZS0+ZGlzcGF0Y2hfZXhlY2J1ZmZlcihyZXEsIHNvLmdndHRfb2Zmc2V0LAotCQkJ CQkgICAgICAgc28ucm9kYXRhLT5iYXRjaF9pdGVtcyAqIDQsCi0JCQkJCSAgICAgICBJOTE1X0RJ U1BBVENIX1NFQ1VSRSk7CisJcmV0ID0gcmVxLT5lbmdpbmUtPmVtaXRfYmJfc3RhcnQocmVxLCBz by5nZ3R0X29mZnNldCwKKwkJCQkJIHNvLnJvZGF0YS0+YmF0Y2hfaXRlbXMgKiA0LAorCQkJCQkg STkxNV9ESVNQQVRDSF9TRUNVUkUpOwogCWlmIChyZXQpCiAJCWdvdG8gb3V0OwogCiAJaWYgKHNv LmF1eF9iYXRjaF9zaXplID4gOCkgewotCQlyZXQgPSByZXEtPmVuZ2luZS0+ZGlzcGF0Y2hfZXhl Y2J1ZmZlcihyZXEsCi0JCQkJCQkgICAgICAgKHNvLmdndHRfb2Zmc2V0ICsKLQkJCQkJCQlzby5h dXhfYmF0Y2hfb2Zmc2V0KSwKLQkJCQkJCSAgICAgICBzby5hdXhfYmF0Y2hfc2l6ZSwKLQkJCQkJ CSAgICAgICBJOTE1X0RJU1BBVENIX1NFQ1VSRSk7CisJCXJldCA9IHJlcS0+ZW5naW5lLT5lbWl0 X2JiX3N0YXJ0KHJlcSwKKwkJCQkJCSAoc28uZ2d0dF9vZmZzZXQgKworCQkJCQkJICBzby5hdXhf YmF0Y2hfb2Zmc2V0KSwKKwkJCQkJCSBzby5hdXhfYmF0Y2hfc2l6ZSwKKwkJCQkJCSBJOTE1X0RJ U1BBVENIX1NFQ1VSRSk7CiAJCWlmIChyZXQpCiAJCQlnb3RvIG91dDsKIAl9CmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2xyYy5jCmluZGV4IDgyYjIxYTg4MzczMi4uMzBlZmZjYTkxMTg0IDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9scmMuYwpAQCAtNzgzLDcgKzc4Myw5IEBAIGludCBpbnRlbF9leGVjbGlzdHNf c3VibWlzc2lvbihzdHJ1Y3QgaTkxNV9leGVjYnVmZmVyX3BhcmFtcyAqcGFyYW1zLAogCWV4ZWNf c3RhcnQgPSBwYXJhbXMtPmJhdGNoX29ial92bV9vZmZzZXQgKwogCQkgICAgIGFyZ3MtPmJhdGNo X3N0YXJ0X29mZnNldDsKIAotCXJldCA9IGVuZ2luZS0+ZW1pdF9iYl9zdGFydChwYXJhbXMtPnJl cXVlc3QsIGV4ZWNfc3RhcnQsIHBhcmFtcy0+ZGlzcGF0Y2hfZmxhZ3MpOworCXJldCA9IGVuZ2lu ZS0+ZW1pdF9iYl9zdGFydChwYXJhbXMtPnJlcXVlc3QsCisJCQkJICAgIGV4ZWNfc3RhcnQsIGFy Z3MtPmJhdGNoX2xlbiwKKwkJCQkgICAgcGFyYW1zLT5kaXNwYXRjaF9mbGFncyk7CiAJaWYgKHJl dCkKIAkJcmV0dXJuIHJldDsKIApAQCAtMTQwOSw3ICsxNDExLDggQEAgc3RhdGljIGludCBpbnRl bF9sb2dpY2FsX3JpbmdfZW1pdF9wZHBzKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVx KQogfQogCiBzdGF0aWMgaW50IGdlbjhfZW1pdF9iYl9zdGFydChzdHJ1Y3QgZHJtX2k5MTVfZ2Vt X3JlcXVlc3QgKnJlcSwKLQkJCSAgICAgIHU2NCBvZmZzZXQsIHVuc2lnbmVkIGRpc3BhdGNoX2Zs YWdzKQorCQkJICAgICAgdTY0IG9mZnNldCwgdTMyIGxlbiwKKwkJCSAgICAgIHVuc2lnbmVkIGRp c3BhdGNoX2ZsYWdzKQogewogCXN0cnVjdCBpbnRlbF9yaW5nICpyaW5nID0gcmVxLT5yaW5nOwog CWJvb2wgcHBndHQgPSAhKGRpc3BhdGNoX2ZsYWdzICYgSTkxNV9ESVNQQVRDSF9TRUNVUkUpOwpA QCAtMTYzNywxMiArMTY0MCwxNCBAQCBzdGF0aWMgaW50IGludGVsX2xyX2NvbnRleHRfcmVuZGVy X3N0YXRlX2luaXQoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpCiAJCXJldHVybiAw OwogCiAJcmV0ID0gcmVxLT5lbmdpbmUtPmVtaXRfYmJfc3RhcnQocmVxLCBzby5nZ3R0X29mZnNl dCwKKwkJCQkJIHNvLnJvZGF0YS0+YmF0Y2hfaXRlbXMgKiA0LAogCQkJCQkgSTkxNV9ESVNQQVRD SF9TRUNVUkUpOwogCWlmIChyZXQpCiAJCWdvdG8gb3V0OwogCiAJcmV0ID0gcmVxLT5lbmdpbmUt PmVtaXRfYmJfc3RhcnQocmVxLAogCQkJCQkgKHNvLmdndHRfb2Zmc2V0ICsgc28uYXV4X2JhdGNo X29mZnNldCksCisJCQkJCSBzby5hdXhfYmF0Y2hfc2l6ZSwKIAkJCQkJIEk5MTVfRElTUEFUQ0hf U0VDVVJFKTsKIAlpZiAocmV0KQogCQlnb3RvIG91dDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3JpbmdidWZmZXIuYwppbmRleCBlNTg0YjBmNjMxZjguLjA0ZjBhNzdkNDljZiAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwpAQCAtMTY1Niw5ICsxNjU2LDkgQEAgZ2Vu OF9yaW5nX2Rpc2FibGVfaXJxKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCiB9CiAKIHN0 YXRpYyBpbnQKLWk5NjVfZGlzcGF0Y2hfZXhlY2J1ZmZlcihzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3Jl cXVlc3QgKnJlcSwKLQkJCSB1NjQgb2Zmc2V0LCB1MzIgbGVuZ3RoLAotCQkJIHVuc2lnbmVkIGRp c3BhdGNoX2ZsYWdzKQoraTk2NV9lbWl0X2JiX3N0YXJ0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVx dWVzdCAqcmVxLAorCQkgICB1NjQgb2Zmc2V0LCB1MzIgbGVuZ3RoLAorCQkgICB1bnNpZ25lZCBk aXNwYXRjaF9mbGFncykKIHsKIAlzdHJ1Y3QgaW50ZWxfcmluZyAqcmluZyA9IHJlcS0+cmluZzsK IAlpbnQgcmV0OwpAQCAtMTY4Myw5ICsxNjgzLDkgQEAgaTk2NV9kaXNwYXRjaF9leGVjYnVmZmVy KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLAogI2RlZmluZSBJODMwX1RMQl9FTlRS SUVTICgyKQogI2RlZmluZSBJODMwX1dBX1NJWkUgbWF4KEk4MzBfVExCX0VOVFJJRVMqNDA5Niwg STgzMF9CQVRDSF9MSU1JVCkKIHN0YXRpYyBpbnQKLWk4MzBfZGlzcGF0Y2hfZXhlY2J1ZmZlcihz dHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwKLQkJCSB1NjQgb2Zmc2V0LCB1MzIgbGVu LAotCQkJIHVuc2lnbmVkIGRpc3BhdGNoX2ZsYWdzKQoraTgzMF9lbWl0X2JiX3N0YXJ0KHN0cnVj dCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLAorCQkgICB1NjQgb2Zmc2V0LCB1MzIgbGVuLAor CQkgICB1bnNpZ25lZCBkaXNwYXRjaF9mbGFncykKIHsKIAlzdHJ1Y3QgaW50ZWxfcmluZyAqcmlu ZyA9IHJlcS0+cmluZzsKIAl1MzIgY3Nfb2Zmc2V0ID0gcmVxLT5lbmdpbmUtPnNjcmF0Y2guZ3R0 X29mZnNldDsKQEAgLTE3NDYsOSArMTc0Niw5IEBAIGk4MzBfZGlzcGF0Y2hfZXhlY2J1ZmZlcihz dHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwKIH0KIAogc3RhdGljIGludAotaTkxNV9k aXNwYXRjaF9leGVjYnVmZmVyKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLAotCQkJ IHU2NCBvZmZzZXQsIHUzMiBsZW4sCi0JCQkgdW5zaWduZWQgZGlzcGF0Y2hfZmxhZ3MpCitpOTE1 X2VtaXRfYmJfc3RhcnQoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsCisJCSAgIHU2 NCBvZmZzZXQsIHUzMiBsZW4sCisJCSAgIHVuc2lnbmVkIGRpc3BhdGNoX2ZsYWdzKQogewogCXN0 cnVjdCBpbnRlbF9yaW5nICpyaW5nID0gcmVxLT5yaW5nOwogCWludCByZXQ7CkBAIC0yMzYxLDkg KzIzNjEsOSBAQCBzdGF0aWMgaW50IGdlbjZfYnNkX3JpbmdfZmx1c2goc3RydWN0IGRybV9pOTE1 X2dlbV9yZXF1ZXN0ICpyZXEsCiB9CiAKIHN0YXRpYyBpbnQKLWdlbjhfcmluZ19kaXNwYXRjaF9l eGVjYnVmZmVyKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLAotCQkJICAgICAgdTY0 IG9mZnNldCwgdTMyIGxlbiwKLQkJCSAgICAgIHVuc2lnbmVkIGRpc3BhdGNoX2ZsYWdzKQorZ2Vu OF9lbWl0X2JiX3N0YXJ0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLAorCQkgICB1 NjQgb2Zmc2V0LCB1MzIgbGVuLAorCQkgICB1bnNpZ25lZCBkaXNwYXRjaF9mbGFncykKIHsKIAlz dHJ1Y3QgaW50ZWxfcmluZyAqcmluZyA9IHJlcS0+cmluZzsKIAlib29sIHBwZ3R0ID0gVVNFU19Q UEdUVChyZXEtPmk5MTUpICYmCkBAIC0yMzg3LDkgKzIzODcsOSBAQCBnZW44X3JpbmdfZGlzcGF0 Y2hfZXhlY2J1ZmZlcihzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwKIH0KIAogc3Rh dGljIGludAotaHN3X3JpbmdfZGlzcGF0Y2hfZXhlY2J1ZmZlcihzdHJ1Y3QgZHJtX2k5MTVfZ2Vt X3JlcXVlc3QgKnJlcSwKLQkJCSAgICAgdTY0IG9mZnNldCwgdTMyIGxlbiwKLQkJCSAgICAgdW5z aWduZWQgZGlzcGF0Y2hfZmxhZ3MpCitoc3dfZW1pdF9iYl9zdGFydChzdHJ1Y3QgZHJtX2k5MTVf Z2VtX3JlcXVlc3QgKnJlcSwKKwkJICB1NjQgb2Zmc2V0LCB1MzIgbGVuLAorCQkgIHVuc2lnbmVk IGRpc3BhdGNoX2ZsYWdzKQogewogCXN0cnVjdCBpbnRlbF9yaW5nICpyaW5nID0gcmVxLT5yaW5n OwogCWludCByZXQ7CkBAIC0yNDEyLDkgKzI0MTIsOSBAQCBoc3dfcmluZ19kaXNwYXRjaF9leGVj YnVmZmVyKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLAogfQogCiBzdGF0aWMgaW50 Ci1nZW42X3JpbmdfZGlzcGF0Y2hfZXhlY2J1ZmZlcihzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVl c3QgKnJlcSwKLQkJCSAgICAgIHU2NCBvZmZzZXQsIHUzMiBsZW4sCi0JCQkgICAgICB1bnNpZ25l ZCBkaXNwYXRjaF9mbGFncykKK2dlbjZfZW1pdF9iYl9zdGFydChzdHJ1Y3QgZHJtX2k5MTVfZ2Vt X3JlcXVlc3QgKnJlcSwKKwkJICAgdTY0IG9mZnNldCwgdTMyIGxlbiwKKwkJICAgdW5zaWduZWQg ZGlzcGF0Y2hfZmxhZ3MpCiB7CiAJc3RydWN0IGludGVsX3JpbmcgKnJpbmcgPSByZXEtPnJpbmc7 CiAJaW50IHJldDsKQEAgLTI1NzgsMTcgKzI1NzgsMTcgQEAgaW50IGludGVsX2luaXRfcmVuZGVy X3JpbmdfYnVmZmVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJcmluZy0+d3JpdGVfdGFpbCA9 IHJpbmdfd3JpdGVfdGFpbDsKIAogCWlmIChJU19IQVNXRUxMKGRldikpCi0JCXJpbmctPmRpc3Bh dGNoX2V4ZWNidWZmZXIgPSBoc3dfcmluZ19kaXNwYXRjaF9leGVjYnVmZmVyOworCQlyaW5nLT5l bWl0X2JiX3N0YXJ0ID0gaHN3X2VtaXRfYmJfc3RhcnQ7CiAJZWxzZSBpZiAoSVNfR0VOOChkZXYp KQotCQlyaW5nLT5kaXNwYXRjaF9leGVjYnVmZmVyID0gZ2VuOF9yaW5nX2Rpc3BhdGNoX2V4ZWNi dWZmZXI7CisJCXJpbmctPmVtaXRfYmJfc3RhcnQgPSBnZW44X2VtaXRfYmJfc3RhcnQ7CiAJZWxz ZSBpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPj0gNikKLQkJcmluZy0+ZGlzcGF0Y2hfZXhlY2J1 ZmZlciA9IGdlbjZfcmluZ19kaXNwYXRjaF9leGVjYnVmZmVyOworCQlyaW5nLT5lbWl0X2JiX3N0 YXJ0ID0gZ2VuNl9lbWl0X2JiX3N0YXJ0OwogCWVsc2UgaWYgKElOVEVMX0lORk8oZGV2KS0+Z2Vu ID49IDQpCi0JCXJpbmctPmRpc3BhdGNoX2V4ZWNidWZmZXIgPSBpOTY1X2Rpc3BhdGNoX2V4ZWNi dWZmZXI7CisJCXJpbmctPmVtaXRfYmJfc3RhcnQgPSBpOTY1X2VtaXRfYmJfc3RhcnQ7CiAJZWxz ZSBpZiAoSVNfSTgzMChkZXYpIHx8IElTXzg0NUcoZGV2KSkKLQkJcmluZy0+ZGlzcGF0Y2hfZXhl Y2J1ZmZlciA9IGk4MzBfZGlzcGF0Y2hfZXhlY2J1ZmZlcjsKKwkJcmluZy0+ZW1pdF9iYl9zdGFy dCA9IGk4MzBfZW1pdF9iYl9zdGFydDsKIAllbHNlCi0JCXJpbmctPmRpc3BhdGNoX2V4ZWNidWZm ZXIgPSBpOTE1X2Rpc3BhdGNoX2V4ZWNidWZmZXI7CisJCXJpbmctPmVtaXRfYmJfc3RhcnQgPSBp OTE1X2VtaXRfYmJfc3RhcnQ7CiAJcmluZy0+aW5pdF9odyA9IGluaXRfcmVuZGVyX3Jpbmc7CiAJ cmluZy0+Y2xlYW51cCA9IHJlbmRlcl9yaW5nX2NsZWFudXA7CiAKQEAgLTI2NDYsOCArMjY0Niw3 IEBAIGludCBpbnRlbF9pbml0X2JzZF9yaW5nX2J1ZmZlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 KQogCQkJCUdUX1JFTkRFUl9VU0VSX0lOVEVSUlVQVCA8PCBHRU44X1ZDUzFfSVJRX1NISUZUOwog CQkJcmluZy0+aXJxX2VuYWJsZSA9IGdlbjhfcmluZ19lbmFibGVfaXJxOwogCQkJcmluZy0+aXJx X2Rpc2FibGUgPSBnZW44X3JpbmdfZGlzYWJsZV9pcnE7Ci0JCQlyaW5nLT5kaXNwYXRjaF9leGVj YnVmZmVyID0KLQkJCQlnZW44X3JpbmdfZGlzcGF0Y2hfZXhlY2J1ZmZlcjsKKwkJCXJpbmctPmVt aXRfYmJfc3RhcnQgPSBnZW44X2VtaXRfYmJfc3RhcnQ7CiAJCQlpZiAoaTkxNS5zZW1hcGhvcmVz KSB7CiAJCQkJcmluZy0+c2VtYXBob3JlLnN5bmNfdG8gPSBnZW44X3Jpbmdfc3luYzsKIAkJCQly aW5nLT5zZW1hcGhvcmUuc2lnbmFsID0gZ2VuOF94Y3Nfc2lnbmFsOwpAQCAtMjY1Nyw4ICsyNjU2 LDcgQEAgaW50IGludGVsX2luaXRfYnNkX3JpbmdfYnVmZmVyKHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYpCiAJCQlyaW5nLT5pcnFfZW5hYmxlX21hc2sgPSBHVF9CU0RfVVNFUl9JTlRFUlJVUFQ7CiAJ CQlyaW5nLT5pcnFfZW5hYmxlID0gZ2VuNl9yaW5nX2VuYWJsZV9pcnE7CiAJCQlyaW5nLT5pcnFf ZGlzYWJsZSA9IGdlbjZfcmluZ19kaXNhYmxlX2lycTsKLQkJCXJpbmctPmRpc3BhdGNoX2V4ZWNi dWZmZXIgPQotCQkJCWdlbjZfcmluZ19kaXNwYXRjaF9leGVjYnVmZmVyOworCQkJcmluZy0+ZW1p dF9iYl9zdGFydCA9IGdlbjZfZW1pdF9iYl9zdGFydDsKIAkJCWlmIChpOTE1LnNlbWFwaG9yZXMp IHsKIAkJCQlyaW5nLT5zZW1hcGhvcmUuc3luY190byA9IGdlbjZfcmluZ19zeW5jOwogCQkJCXJp bmctPnNlbWFwaG9yZS5zaWduYWwgPSBnZW42X3NpZ25hbDsKQEAgLTI2ODcsNyArMjY4NSw3IEBA IGludCBpbnRlbF9pbml0X2JzZF9yaW5nX2J1ZmZlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQog CQkJcmluZy0+aXJxX2VuYWJsZSA9IGk5eHhfcmluZ19lbmFibGVfaXJxOwogCQkJcmluZy0+aXJx X2Rpc2FibGUgPSBpOXh4X3JpbmdfZGlzYWJsZV9pcnE7CiAJCX0KLQkJcmluZy0+ZGlzcGF0Y2hf ZXhlY2J1ZmZlciA9IGk5NjVfZGlzcGF0Y2hfZXhlY2J1ZmZlcjsKKwkJcmluZy0+ZW1pdF9iYl9z dGFydCA9IGk5NjVfZW1pdF9iYl9zdGFydDsKIAl9CiAJcmluZy0+aW5pdF9odyA9IGluaXRfcmlu Z19jb21tb247CiAKQEAgLTI3MTQsOCArMjcxMiw3IEBAIGludCBpbnRlbF9pbml0X2JzZDJfcmlu Z19idWZmZXIoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJCUdUX1JFTkRFUl9VU0VSX0lOVEVS UlVQVCA8PCBHRU44X1ZDUzJfSVJRX1NISUZUOwogCXJpbmctPmlycV9lbmFibGUgPSBnZW44X3Jp bmdfZW5hYmxlX2lycTsKIAlyaW5nLT5pcnFfZGlzYWJsZSA9IGdlbjhfcmluZ19kaXNhYmxlX2ly cTsKLQlyaW5nLT5kaXNwYXRjaF9leGVjYnVmZmVyID0KLQkJCWdlbjhfcmluZ19kaXNwYXRjaF9l eGVjYnVmZmVyOworCXJpbmctPmVtaXRfYmJfc3RhcnQgPSBnZW44X2VtaXRfYmJfc3RhcnQ7CiAJ aWYgKGk5MTUuc2VtYXBob3JlcykgewogCQlyaW5nLT5zZW1hcGhvcmUuc3luY190byA9IGdlbjhf cmluZ19zeW5jOwogCQlyaW5nLT5zZW1hcGhvcmUuc2lnbmFsID0gZ2VuOF94Y3Nfc2lnbmFsOwpA QCAtMjc0NCw3ICsyNzQxLDcgQEAgaW50IGludGVsX2luaXRfYmx0X3JpbmdfYnVmZmVyKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYpCiAJCQlHVF9SRU5ERVJfVVNFUl9JTlRFUlJVUFQgPDwgR0VOOF9C Q1NfSVJRX1NISUZUOwogCQlyaW5nLT5pcnFfZW5hYmxlID0gZ2VuOF9yaW5nX2VuYWJsZV9pcnE7 CiAJCXJpbmctPmlycV9kaXNhYmxlID0gZ2VuOF9yaW5nX2Rpc2FibGVfaXJxOwotCQlyaW5nLT5k aXNwYXRjaF9leGVjYnVmZmVyID0gZ2VuOF9yaW5nX2Rpc3BhdGNoX2V4ZWNidWZmZXI7CisJCXJp bmctPmVtaXRfYmJfc3RhcnQgPSBnZW44X2VtaXRfYmJfc3RhcnQ7CiAJCWlmIChpOTE1LnNlbWFw aG9yZXMpIHsKIAkJCXJpbmctPnNlbWFwaG9yZS5zeW5jX3RvID0gZ2VuOF9yaW5nX3N5bmM7CiAJ CQlyaW5nLT5zZW1hcGhvcmUuc2lnbmFsID0gZ2VuOF94Y3Nfc2lnbmFsOwpAQCAtMjc1NCw3ICsy NzUxLDcgQEAgaW50IGludGVsX2luaXRfYmx0X3JpbmdfYnVmZmVyKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYpCiAJCXJpbmctPmlycV9lbmFibGVfbWFzayA9IEdUX0JMVF9VU0VSX0lOVEVSUlVQVDsK IAkJcmluZy0+aXJxX2VuYWJsZSA9IGdlbjZfcmluZ19lbmFibGVfaXJxOwogCQlyaW5nLT5pcnFf ZGlzYWJsZSA9IGdlbjZfcmluZ19kaXNhYmxlX2lycTsKLQkJcmluZy0+ZGlzcGF0Y2hfZXhlY2J1 ZmZlciA9IGdlbjZfcmluZ19kaXNwYXRjaF9leGVjYnVmZmVyOworCQlyaW5nLT5lbWl0X2JiX3N0 YXJ0ID0gZ2VuNl9lbWl0X2JiX3N0YXJ0OwogCQlpZiAoaTkxNS5zZW1hcGhvcmVzKSB7CiAJCQly aW5nLT5zZW1hcGhvcmUuc2lnbmFsID0gZ2VuNl9zaWduYWw7CiAJCQlyaW5nLT5zZW1hcGhvcmUu c3luY190byA9IGdlbjZfcmluZ19zeW5jOwpAQCAtMjgwMSw3ICsyNzk4LDcgQEAgaW50IGludGVs X2luaXRfdmVib3hfcmluZ19idWZmZXIoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJCUdUX1JF TkRFUl9VU0VSX0lOVEVSUlVQVCA8PCBHRU44X1ZFQ1NfSVJRX1NISUZUOwogCQlyaW5nLT5pcnFf ZW5hYmxlID0gZ2VuOF9yaW5nX2VuYWJsZV9pcnE7CiAJCXJpbmctPmlycV9kaXNhYmxlID0gZ2Vu OF9yaW5nX2Rpc2FibGVfaXJxOwotCQlyaW5nLT5kaXNwYXRjaF9leGVjYnVmZmVyID0gZ2VuOF9y aW5nX2Rpc3BhdGNoX2V4ZWNidWZmZXI7CisJCXJpbmctPmVtaXRfYmJfc3RhcnQgPSBnZW44X2Vt aXRfYmJfc3RhcnQ7CiAJCWlmIChpOTE1LnNlbWFwaG9yZXMpIHsKIAkJCXJpbmctPnNlbWFwaG9y ZS5zeW5jX3RvID0gZ2VuOF9yaW5nX3N5bmM7CiAJCQlyaW5nLT5zZW1hcGhvcmUuc2lnbmFsID0g Z2VuOF94Y3Nfc2lnbmFsOwpAQCAtMjgxMSw3ICsyODA4LDcgQEAgaW50IGludGVsX2luaXRfdmVi b3hfcmluZ19idWZmZXIoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJcmluZy0+aXJxX2VuYWJs ZV9tYXNrID0gUE1fVkVCT1hfVVNFUl9JTlRFUlJVUFQ7CiAJCXJpbmctPmlycV9lbmFibGUgPSBo c3dfdmVib3hfZW5hYmxlX2lycTsKIAkJcmluZy0+aXJxX2Rpc2FibGUgPSBoc3dfdmVib3hfZGlz YWJsZV9pcnE7Ci0JCXJpbmctPmRpc3BhdGNoX2V4ZWNidWZmZXIgPSBnZW42X3JpbmdfZGlzcGF0 Y2hfZXhlY2J1ZmZlcjsKKwkJcmluZy0+ZW1pdF9iYl9zdGFydCA9IGdlbjZfZW1pdF9iYl9zdGFy dDsKIAkJaWYgKGk5MTUuc2VtYXBob3JlcykgewogCQkJcmluZy0+c2VtYXBob3JlLnN5bmNfdG8g PSBnZW42X3Jpbmdfc3luYzsKIAkJCXJpbmctPnNlbWFwaG9yZS5zaWduYWwgPSBnZW42X3NpZ25h bDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaCBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaAppbmRleCBmZGVhZGFlNzI2 YjguLjNhMTAzNzZiODk2ZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf cmluZ2J1ZmZlci5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIu aApAQCAtMjIzLDEyICsyMjMsNiBAQCBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzIHsKIAkgKiBtb25v dG9uaWMsIGV2ZW4gaWYgbm90IGNvaGVyZW50LgogCSAqLwogCXZvaWQJCSgqaXJxX3NlcW5vX2Jh cnJpZXIpKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpOwotCWludAkJKCpkaXNwYXRjaF9l eGVjYnVmZmVyKShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwKLQkJCQkJICAgICAg IHU2NCBvZmZzZXQsIHUzMiBsZW5ndGgsCi0JCQkJCSAgICAgICB1bnNpZ25lZCBkaXNwYXRjaF9m bGFncyk7Ci0jZGVmaW5lIEk5MTVfRElTUEFUQ0hfU0VDVVJFIDB4MQotI2RlZmluZSBJOTE1X0RJ U1BBVENIX1BJTk5FRCAweDIKLSNkZWZpbmUgSTkxNV9ESVNQQVRDSF9SUyAgICAgMHg0CiAJdm9p ZAkJKCpjbGVhbnVwKShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKTsKIAogCS8qIEdFTjgg c2lnbmFsL3dhaXQgdGFibGUgLSBuZXZlciB0cnVzdCBjb21tZW50cyEKQEAgLTMwMSw3ICsyOTUs MTEgQEAgc3RydWN0IGludGVsX2VuZ2luZV9jcyB7CiAJCQkJICAgICAgdTMyIGludmFsaWRhdGVf ZG9tYWlucywKIAkJCQkgICAgICB1MzIgZmx1c2hfZG9tYWlucyk7CiAJaW50CQkoKmVtaXRfYmJf c3RhcnQpKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLAotCQkJCQkgdTY0IG9mZnNl dCwgdW5zaWduZWQgZGlzcGF0Y2hfZmxhZ3MpOworCQkJCQkgdTY0IG9mZnNldCwgdTMyIGxlbmd0 aCwKKwkJCQkJIHVuc2lnbmVkIGRpc3BhdGNoX2ZsYWdzKTsKKyNkZWZpbmUgSTkxNV9ESVNQQVRD SF9TRUNVUkUgMHgxCisjZGVmaW5lIEk5MTVfRElTUEFUQ0hfUElOTkVEIDB4MgorI2RlZmluZSBJ OTE1X0RJU1BBVENIX1JTICAgICAweDQKIAogCS8qKgogCSAqIExpc3Qgb2Ygb2JqZWN0cyBjdXJy ZW50bHkgaW52b2x2ZWQgaW4gcmVuZGVyaW5nIGZyb20gdGhlCi0tIAoyLjcuMC5yYzMKCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWls aW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJl ZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==