From: Tvrtko Ursulin Subject: [PATCH 1/3] drm/i915: Refactor execlists default context pinning Date: Fri, 15 Apr 2016 12:54:33 +0100 Message-ID: <1460721275-1001-2-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1460721275-1001-1-git-send-email-tvrtko.ursulin@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTP id 8CB2E6EC21 for ; Fri, 15 Apr 2016 11:54:38 +0000 (UTC) In-Reply-To: <1460721275-1001-1-git-send-email-tvrtko.ursulin@linux.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 RnJvbTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+CgpSZWZhY3RvciBw aW5uaW5nIGFuZCB1bnBpbm5pbmcgb2YgY29udGV4dHMsIHN1Y2ggdGhhdCB0aGUgZGVmYXVsdApj b250ZXh0IGZvciBhbiBlbmdpbmUgaXMgcGlubmVkIGR1cmluZyBpbml0aWFsaXNhdGlvbiBhbmQg dW5waW5uZWQKZHVyaW5nIHRlYXJkb3duIChwaW5uaW5nIG9mIHRoZSBjb250ZXh0IGhhbmRsZXMg dGhlIHJlZmVyZW5jZSBjb3VudGluZykuClRodXMgd2UgY2FuIGVsaW1pbmF0ZSB0aGUgc3BlY2lh bCBjYXNlIGhhbmRsaW5nIG9mIHRoZSBkZWZhdWx0IGNvbnRleHQKdGhhdCB3YXMgcmVxdWlyZWQg dG8gbWFzayB0aGF0IGl0IHdhcyBub3QgYmVpbmcgcGlubmVkIG5vcm1hbGx5LgoKdjI6CiAgKiBS ZWJhc2Ugb24gbmlnaHRseTsKICAqIHB1dCBiYWNrIHBpbiBpbiBleGVjbGlzdHNfY29udGV4dF9x dWV1ZS4gKFR2cnRrbyBVcnN1bGluKQoKU2lnbmVkLW9mZi1ieTogQ2hyaXMgV2lsc29uIDxjaHJp c0BjaHJpcy13aWxzb24uY28udWs+ClNpZ25lZC1vZmYtYnk6IFR2cnRrbyBVcnN1bGluIDx0dnJ0 a28udXJzdWxpbkBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1 Z2ZzLmMgfCAgIDUgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgICAgIHwgICAz ICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyAgICB8IDExMSArKysrKysrKysr KysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDMgZmlsZXMgY2hhbmdlZCwgNDUgaW5zZXJ0aW9u cygrKSwgNzQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kZWJ1Z2ZzLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwppbmRl eCA0NmNjMDNiNjAxODMuLjFkZTNlZTc0NjY0MSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1 Z2ZzLmMKQEAgLTIwNjcsOSArMjA2Nyw4IEBAIHN0YXRpYyBpbnQgaTkxNV9kdW1wX2xyYyhzdHJ1 Y3Qgc2VxX2ZpbGUgKm0sIHZvaWQgKnVudXNlZCkKIAkJcmV0dXJuIHJldDsKIAogCWxpc3RfZm9y X2VhY2hfZW50cnkoY3R4LCAmZGV2X3ByaXYtPmNvbnRleHRfbGlzdCwgbGluaykKLQkJaWYgKGN0 eCAhPSBkZXZfcHJpdi0+a2VybmVsX2NvbnRleHQpCi0JCQlmb3JfZWFjaF9lbmdpbmUoZW5naW5l LCBkZXZfcHJpdikKLQkJCQlpOTE1X2R1bXBfbHJjX29iaihtLCBjdHgsIGVuZ2luZSk7CisJCWZv cl9lYWNoX2VuZ2luZShlbmdpbmUsIGRldl9wcml2KQorCQkJaTkxNV9kdW1wX2xyY19vYmoobSwg Y3R4LCBlbmdpbmUpOwogCiAJbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7CiAKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IDZjZTJjMzFiOWE4MS4uZTlkYjU2YzdhMzFmIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtLmMKQEAgLTI3MTksOCArMjcxOSw3IEBAIHZvaWQgaTkxNV9nZW1f cmVxdWVzdF9mcmVlKHN0cnVjdCBrcmVmICpyZXFfcmVmKQogCQlpOTE1X2dlbV9yZXF1ZXN0X3Jl bW92ZV9mcm9tX2NsaWVudChyZXEpOwogCiAJaWYgKGN0eCkgewotCQlpZiAoaTkxNS5lbmFibGVf ZXhlY2xpc3RzICYmIGN0eCAhPSByZXEtPmk5MTUtPmtlcm5lbF9jb250ZXh0KQotCQkJaW50ZWxf bHJfY29udGV4dF91bnBpbihjdHgsIHJlcS0+ZW5naW5lKTsKKwkJaW50ZWxfbHJfY29udGV4dF91 bnBpbihjdHgsIHJlcS0+ZW5naW5lKTsKIAogCQlpOTE1X2dlbV9jb250ZXh0X3VucmVmZXJlbmNl KGN0eCk7CiAJfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwppbmRleCAxNTYyYTc1YWM5ZDEuLjJm NDlkZmFlNTU2MCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKQEAgLTYxMiw4ICs2MTIsNyBA QCBzdGF0aWMgdm9pZCBleGVjbGlzdHNfY29udGV4dF9xdWV1ZShzdHJ1Y3QgZHJtX2k5MTVfZ2Vt X3JlcXVlc3QgKnJlcXVlc3QpCiAJc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpjdXJzb3I7 CiAJaW50IG51bV9lbGVtZW50cyA9IDA7CiAKLQlpZiAocmVxdWVzdC0+Y3R4ICE9IHJlcXVlc3Qt Pmk5MTUtPmtlcm5lbF9jb250ZXh0KQotCQlpbnRlbF9scl9jb250ZXh0X3BpbihyZXF1ZXN0LT5j dHgsIGVuZ2luZSk7CisJaW50ZWxfbHJfY29udGV4dF9waW4ocmVxdWVzdC0+Y3R4LCBlbmdpbmUp OwogCiAJaTkxNV9nZW1fcmVxdWVzdF9yZWZlcmVuY2UocmVxdWVzdCk7CiAKQEAgLTcxNSwxMCAr NzE0LDcgQEAgaW50IGludGVsX2xvZ2ljYWxfcmluZ19hbGxvY19yZXF1ZXN0X2V4dHJhcyhzdHJ1 Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QKIAkJCXJldHVybiByZXQ7CiAJfQogCi0J aWYgKHJlcXVlc3QtPmN0eCAhPSByZXF1ZXN0LT5pOTE1LT5rZXJuZWxfY29udGV4dCkKLQkJcmV0 ID0gaW50ZWxfbHJfY29udGV4dF9waW4ocmVxdWVzdC0+Y3R4LCByZXF1ZXN0LT5lbmdpbmUpOwot Ci0JcmV0dXJuIHJldDsKKwlyZXR1cm4gaW50ZWxfbHJfY29udGV4dF9waW4ocmVxdWVzdC0+Y3R4 LCByZXF1ZXN0LT5lbmdpbmUpOwogfQogCiBzdGF0aWMgaW50IGxvZ2ljYWxfcmluZ193YWl0X2Zv cl9zcGFjZShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwKQEAgLTc5OCwxMiArNzk0 LDggQEAgaW50ZWxfbG9naWNhbF9yaW5nX2FkdmFuY2VfYW5kX3N1Ym1pdChzdHJ1Y3QgZHJtX2k5 MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QpCiAJaWYgKGVuZ2luZS0+bGFzdF9jb250ZXh0ICE9IHJl cXVlc3QtPmN0eCkgewogCQlpZiAoZW5naW5lLT5sYXN0X2NvbnRleHQpCiAJCQlpbnRlbF9scl9j b250ZXh0X3VucGluKGVuZ2luZS0+bGFzdF9jb250ZXh0LCBlbmdpbmUpOwotCQlpZiAocmVxdWVz dC0+Y3R4ICE9IHJlcXVlc3QtPmk5MTUtPmtlcm5lbF9jb250ZXh0KSB7Ci0JCQlpbnRlbF9scl9j b250ZXh0X3BpbihyZXF1ZXN0LT5jdHgsIGVuZ2luZSk7Ci0JCQllbmdpbmUtPmxhc3RfY29udGV4 dCA9IHJlcXVlc3QtPmN0eDsKLQkJfSBlbHNlIHsKLQkJCWVuZ2luZS0+bGFzdF9jb250ZXh0ID0g TlVMTDsKLQkJfQorCQlpbnRlbF9scl9jb250ZXh0X3BpbihyZXF1ZXN0LT5jdHgsIGVuZ2luZSk7 CisJCWVuZ2luZS0+bGFzdF9jb250ZXh0ID0gcmVxdWVzdC0+Y3R4OwogCX0KIAogCWlmIChkZXZf cHJpdi0+Z3VjLmV4ZWNidWZfY2xpZW50KQpAQCAtMTAyNiwxMiArMTAxOCw3IEBAIHZvaWQgaW50 ZWxfZXhlY2xpc3RzX3JldGlyZV9yZXF1ZXN0cyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdp bmUpCiAJc3Bpbl91bmxvY2tfYmgoJmVuZ2luZS0+ZXhlY2xpc3RfbG9jayk7CiAKIAlsaXN0X2Zv cl9lYWNoX2VudHJ5X3NhZmUocmVxLCB0bXAsICZyZXRpcmVkX2xpc3QsIGV4ZWNsaXN0X2xpbmsp IHsKLQkJc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCA9IHJlcS0+Y3R4OwotCQlzdHJ1Y3QgZHJt X2k5MTVfZ2VtX29iamVjdCAqY3R4X29iaiA9Ci0JCQkJY3R4LT5lbmdpbmVbZW5naW5lLT5pZF0u c3RhdGU7Ci0KLQkJaWYgKGN0eF9vYmogJiYgKGN0eCAhPSByZXEtPmk5MTUtPmtlcm5lbF9jb250 ZXh0KSkKLQkJCWludGVsX2xyX2NvbnRleHRfdW5waW4oY3R4LCBlbmdpbmUpOworCQlpbnRlbF9s cl9jb250ZXh0X3VucGluKHJlcS0+Y3R4LCBlbmdpbmUpOwogCiAJCWxpc3RfZGVsKCZyZXEtPmV4 ZWNsaXN0X2xpbmspOwogCQlpOTE1X2dlbV9yZXF1ZXN0X3VucmVmZXJlbmNlKHJlcSk7CkBAIC0x MDc2LDIzICsxMDYzLDI2IEBAIGludCBsb2dpY2FsX3JpbmdfZmx1c2hfYWxsX2NhY2hlcyhzdHJ1 Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSkKIAlyZXR1cm4gMDsKIH0KIAotc3RhdGljIGlu dCBpbnRlbF9scl9jb250ZXh0X2RvX3BpbihzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4LAotCQkJ CSAgIHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKK3N0YXRpYyBpbnQgaW50ZWxfbHJf Y29udGV4dF9waW4oc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCwKKwkJCQlzdHJ1Y3QgaW50ZWxf ZW5naW5lX2NzICplbmdpbmUpCiB7Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGVuZ2luZS0+ ZGV2OwotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZh dGU7Ci0Jc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKmN0eF9vYmogPSBjdHgtPmVuZ2luZVtl bmdpbmUtPmlkXS5zdGF0ZTsKLQlzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiA9IGN0 eC0+ZW5naW5lW2VuZ2luZS0+aWRdLnJpbmdidWY7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2ID0gdG9faTkxNShlbmdpbmUtPmRldik7CisJc3RydWN0IGRybV9pOTE1X2dlbV9v YmplY3QgKmN0eF9vYmo7CisJc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWY7CiAJdm9p ZCAqdmFkZHI7CiAJdTMyICpscmNfcmVnX3N0YXRlOwogCWludCByZXQ7CiAKLQlXQVJOX09OKCFt dXRleF9pc19sb2NrZWQoJmVuZ2luZS0+ZGV2LT5zdHJ1Y3RfbXV0ZXgpKTsKKwlsb2NrZGVwX2Fz c2VydF9oZWxkKCZkZXZfcHJpdi0+ZGV2LT5zdHJ1Y3RfbXV0ZXgpOworCisJaWYgKGN0eC0+ZW5n aW5lW2VuZ2luZS0+aWRdLnBpbl9jb3VudCsrKQorCQlyZXR1cm4gMDsKIAorCWN0eF9vYmogPSBj dHgtPmVuZ2luZVtlbmdpbmUtPmlkXS5zdGF0ZTsKIAlyZXQgPSBpOTE1X2dlbV9vYmpfZ2d0dF9w aW4oY3R4X29iaiwgR0VOOF9MUl9DT05URVhUX0FMSUdOLAotCQkJUElOX09GRlNFVF9CSUFTIHwg R1VDX1dPUENNX1RPUCk7CisJCQkJICAgIFBJTl9PRkZTRVRfQklBUyB8IEdVQ19XT1BDTV9UT1Ap OwogCWlmIChyZXQpCi0JCXJldHVybiByZXQ7CisJCWdvdG8gZXJyOwogCiAJdmFkZHIgPSBpOTE1 X2dlbV9vYmplY3RfcGluX21hcChjdHhfb2JqKTsKIAlpZiAoSVNfRVJSKHZhZGRyKSkgewpAQCAt MTEwMiwxMCArMTA5MiwxMyBAQCBzdGF0aWMgaW50IGludGVsX2xyX2NvbnRleHRfZG9fcGluKHN0 cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgsCiAKIAlscmNfcmVnX3N0YXRlID0gdmFkZHIgKyBMUkNf U1RBVEVfUE4gKiBQQUdFX1NJWkU7CiAKKwlyaW5nYnVmID0gY3R4LT5lbmdpbmVbZW5naW5lLT5p ZF0ucmluZ2J1ZjsKIAlyZXQgPSBpbnRlbF9waW5fYW5kX21hcF9yaW5nYnVmZmVyX29iaihlbmdp bmUtPmRldiwgcmluZ2J1Zik7CiAJaWYgKHJldCkKIAkJZ290byB1bnBpbl9tYXA7CiAKKwlpOTE1 X2dlbV9jb250ZXh0X3JlZmVyZW5jZShjdHgpOworCiAJY3R4LT5lbmdpbmVbZW5naW5lLT5pZF0u bHJjX3ZtYSA9IGk5MTVfZ2VtX29ial90b19nZ3R0KGN0eF9vYmopOwogCWludGVsX2xyX2NvbnRl eHRfZGVzY3JpcHRvcl91cGRhdGUoY3R4LCBlbmdpbmUpOwogCWxyY19yZWdfc3RhdGVbQ1RYX1JJ TkdfQlVGRkVSX1NUQVJUKzFdID0gcmluZ2J1Zi0+dm1hLT5ub2RlLnN0YXJ0OwpAQCAtMTExNiwz MSArMTEwOSwxMyBAQCBzdGF0aWMgaW50IGludGVsX2xyX2NvbnRleHRfZG9fcGluKHN0cnVjdCBp bnRlbF9jb250ZXh0ICpjdHgsCiAJaWYgKGk5MTUuZW5hYmxlX2d1Y19zdWJtaXNzaW9uKQogCQlJ OTE1X1dSSVRFKEdFTjhfR1RDUiwgR0VOOF9HVENSX0lOVkFMSURBVEUpOwogCi0JcmV0dXJuIHJl dDsKKwlyZXR1cm4gMDsKIAogdW5waW5fbWFwOgogCWk5MTVfZ2VtX29iamVjdF91bnBpbl9tYXAo Y3R4X29iaik7CiB1bnBpbl9jdHhfb2JqOgogCWk5MTVfZ2VtX29iamVjdF9nZ3R0X3VucGluKGN0 eF9vYmopOwotCi0JcmV0dXJuIHJldDsKLX0KLQotc3RhdGljIGludCBpbnRlbF9scl9jb250ZXh0 X3BpbihzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4LAotCQkJCXN0cnVjdCBpbnRlbF9lbmdpbmVf Y3MgKmVuZ2luZSkKLXsKLQlpbnQgcmV0ID0gMDsKLQotCWlmIChjdHgtPmVuZ2luZVtlbmdpbmUt PmlkXS5waW5fY291bnQrKyA9PSAwKSB7Ci0JCXJldCA9IGludGVsX2xyX2NvbnRleHRfZG9fcGlu KGN0eCwgZW5naW5lKTsKLQkJaWYgKHJldCkKLQkJCWdvdG8gcmVzZXRfcGluX2NvdW50OwotCi0J CWk5MTVfZ2VtX2NvbnRleHRfcmVmZXJlbmNlKGN0eCk7Ci0JfQotCXJldHVybiByZXQ7Ci0KLXJl c2V0X3Bpbl9jb3VudDoKK2VycjoKIAljdHgtPmVuZ2luZVtlbmdpbmUtPmlkXS5waW5fY291bnQg PSAwOwogCXJldHVybiByZXQ7CiB9CkBAIC0xMTUwLDE3ICsxMTI1LDIxIEBAIHZvaWQgaW50ZWxf bHJfY29udGV4dF91bnBpbihzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4LAogewogCXN0cnVjdCBk cm1faTkxNV9nZW1fb2JqZWN0ICpjdHhfb2JqID0gY3R4LT5lbmdpbmVbZW5naW5lLT5pZF0uc3Rh dGU7CiAKLQlXQVJOX09OKCFtdXRleF9pc19sb2NrZWQoJmN0eC0+aTkxNS0+ZGV2LT5zdHJ1Y3Rf bXV0ZXgpKTsKLQlpZiAoLS1jdHgtPmVuZ2luZVtlbmdpbmUtPmlkXS5waW5fY291bnQgPT0gMCkg ewotCQlpOTE1X2dlbV9vYmplY3RfdW5waW5fbWFwKGN0eF9vYmopOwotCQlpbnRlbF91bnBpbl9y aW5nYnVmZmVyX29iaihjdHgtPmVuZ2luZVtlbmdpbmUtPmlkXS5yaW5nYnVmKTsKLQkJaTkxNV9n ZW1fb2JqZWN0X2dndHRfdW5waW4oY3R4X29iaik7Ci0JCWN0eC0+ZW5naW5lW2VuZ2luZS0+aWRd LmxyY192bWEgPSBOVUxMOwotCQljdHgtPmVuZ2luZVtlbmdpbmUtPmlkXS5scmNfZGVzYyA9IDA7 Ci0JCWN0eC0+ZW5naW5lW2VuZ2luZS0+aWRdLmxyY19yZWdfc3RhdGUgPSBOVUxMOworCWxvY2tk ZXBfYXNzZXJ0X2hlbGQoJmN0eC0+aTkxNS0+ZGV2LT5zdHJ1Y3RfbXV0ZXgpOwogCi0JCWk5MTVf Z2VtX2NvbnRleHRfdW5yZWZlcmVuY2UoY3R4KTsKLQl9CisJaWYgKC0tY3R4LT5lbmdpbmVbZW5n aW5lLT5pZF0ucGluX2NvdW50KQorCQlyZXR1cm47CisKKwlpOTE1X2dlbV9vYmplY3RfdW5waW5f bWFwKGN0eF9vYmopOworCWludGVsX3VucGluX3JpbmdidWZmZXJfb2JqKGN0eC0+ZW5naW5lW2Vu Z2luZS0+aWRdLnJpbmdidWYpOworCisJaTkxNV9nZW1fb2JqZWN0X2dndHRfdW5waW4oY3R4X29i aik7CisKKwljdHgtPmVuZ2luZVtlbmdpbmUtPmlkXS5scmNfdm1hID0gTlVMTDsKKwljdHgtPmVu Z2luZVtlbmdpbmUtPmlkXS5scmNfZGVzYyA9IDA7CisJY3R4LT5lbmdpbmVbZW5naW5lLT5pZF0u bHJjX3JlZ19zdGF0ZSA9IE5VTEw7CisKKwlpOTE1X2dlbV9jb250ZXh0X3VucmVmZXJlbmNlKGN0 eCk7CiB9CiAKIHN0YXRpYyBpbnQgaW50ZWxfbG9naWNhbF9yaW5nX3dvcmthcm91bmRzX2VtaXQo c3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpCkBAIC0yMDU5LDYgKzIwMzgsOCBAQCB2 b2lkIGludGVsX2xvZ2ljYWxfcmluZ19jbGVhbnVwKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVu Z2luZSkKIAkJZW5naW5lLT5zdGF0dXNfcGFnZS5vYmogPSBOVUxMOwogCX0KIAorCWludGVsX2xy X2NvbnRleHRfdW5waW4oZGV2X3ByaXYtPmtlcm5lbF9jb250ZXh0LCBlbmdpbmUpOworCiAJZW5n aW5lLT5pZGxlX2xpdGVfcmVzdG9yZV93YSA9IDA7CiAJZW5naW5lLT5kaXNhYmxlX2xpdGVfcmVz dG9yZV93YSA9IGZhbHNlOwogCWVuZ2luZS0+Y3R4X2Rlc2NfdGVtcGxhdGUgPSAwOwpAQCAtMjE2 MSwxMSArMjE0MiwxMCBAQCBsb2dpY2FsX3JpbmdfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 LCBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiAJCWdvdG8gZXJyb3I7CiAKIAkvKiBB cyB0aGlzIGlzIHRoZSBkZWZhdWx0IGNvbnRleHQsIGFsd2F5cyBwaW4gaXQgKi8KLQlyZXQgPSBp bnRlbF9scl9jb250ZXh0X2RvX3BpbihkY3R4LCBlbmdpbmUpOworCXJldCA9IGludGVsX2xyX2Nv bnRleHRfcGluKGRjdHgsIGVuZ2luZSk7CiAJaWYgKHJldCkgewotCQlEUk1fRVJST1IoCi0JCQki RmFpbGVkIHRvIHBpbiBhbmQgbWFwIHJpbmdidWZmZXIgJXM6ICVkXG4iLAotCQkJZW5naW5lLT5u YW1lLCByZXQpOworCQlEUk1fRVJST1IoIkZhaWxlZCB0byBwaW4gY29udGV4dCBmb3IgJXM6ICVk XG4iLAorCQkJICBlbmdpbmUtPm5hbWUsIHJldCk7CiAJCWdvdG8gZXJyb3I7CiAJfQogCkBAIC0y NTgwLDIwICsyNTYwLDEzIEBAIHZvaWQgaW50ZWxfbHJfY29udGV4dF9mcmVlKHN0cnVjdCBpbnRl bF9jb250ZXh0ICpjdHgpCiAJaW50IGk7CiAKIAlmb3IgKGkgPSBJOTE1X05VTV9FTkdJTkVTOyAt LWkgPj0gMDsgKSB7Ci0JCXN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmID0gY3R4LT5l bmdpbmVbaV0ucmluZ2J1ZjsKIAkJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKmN0eF9vYmog PSBjdHgtPmVuZ2luZVtpXS5zdGF0ZTsKIAogCQlpZiAoIWN0eF9vYmopCiAJCQljb250aW51ZTsK IAotCQlpZiAoY3R4ID09IGN0eC0+aTkxNS0+a2VybmVsX2NvbnRleHQpIHsKLQkJCWludGVsX3Vu cGluX3JpbmdidWZmZXJfb2JqKHJpbmdidWYpOwotCQkJaTkxNV9nZW1fb2JqZWN0X2dndHRfdW5w aW4oY3R4X29iaik7Ci0JCQlpOTE1X2dlbV9vYmplY3RfdW5waW5fbWFwKGN0eF9vYmopOwotCQl9 Ci0KIAkJV0FSTl9PTihjdHgtPmVuZ2luZVtpXS5waW5fY291bnQpOwotCQlpbnRlbF9yaW5nYnVm ZmVyX2ZyZWUocmluZ2J1Zik7CisJCWludGVsX3JpbmdidWZmZXJfZnJlZShjdHgtPmVuZ2luZVtp XS5yaW5nYnVmKTsKIAkJZHJtX2dlbV9vYmplY3RfdW5yZWZlcmVuY2UoJmN0eF9vYmotPmJhc2Up OwogCX0KIH0KLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9p bnRlbC1nZngK