From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeykumar Sankaran Subject: [PATCH 14/25] drm/msm/dpu: remove enc_id tagging for hw blocks Date: Mon, 8 Oct 2018 21:27:31 -0700 Message-ID: <1539059262-8326-15-git-send-email-jsanka@codeaurora.org> References: <1539059262-8326-1-git-send-email-jsanka@codeaurora.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1539059262-8326-1-git-send-email-jsanka-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: freedreno-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "Freedreno" To: dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, freedreno-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, linux-arm-msm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: hoegsberg-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org, Jeykumar Sankaran , jcrouse-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org, seanpaul-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org, robdclark-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org List-Id: linux-arm-msm@vger.kernel.org Uk0gd2FzIHVzaW5nIGVuY29kZXIgaWQncyB0byB0YWcgSFcgYmxvY2sncyB0byByZXNlcnZlCmFu ZCByZXRyaWV2ZSBsYXRlciBmb3IgZGlzcGxheSBwaXBlbGluZS4gTm93CnRoYXQgYWxsIHRoZSBy ZXNlcnZlZCBIVyBibG9ja3MgZm9yIGEgZGlzcGxheSBhcmUKbWFpbnRhaW5lZCBpbiBpdHMgY3J0 YyBzdGF0ZSwgbm8gcmV0cmlldmFsIGlzIG5lZWRlZC4KVGhpcyBwYXRjaCBjbGVhbnMgdXAgUk0g b2YgZW5jb2RlciBpZCB0YWdnaW5nLgoKU2lnbmVkLW9mZi1ieTogSmV5a3VtYXIgU2Fua2FyYW4g PGpzYW5rYUBjb2RlYXVyb3JhLm9yZz4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vbXNtL2Rpc3AvZHB1 MS9kcHVfcm0uYyAgICB8IDkwICsrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIGRyaXZl cnMvZ3B1L2RybS9tc20vZGlzcC9kcHUxL2RwdV90cmFjZS5oIHwgMjggKysrKy0tLS0tLQogMiBm aWxlcyBjaGFuZ2VkLCAzNiBpbnNlcnRpb25zKCspLCA4MiBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vbXNtL2Rpc3AvZHB1MS9kcHVfcm0uYyBiL2RyaXZlcnMvZ3B1 L2RybS9tc20vZGlzcC9kcHUxL2RwdV9ybS5jCmluZGV4IDMwM2YxYjMuLmE4NDYxYjggMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9tc20vZGlzcC9kcHUxL2RwdV9ybS5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9tc20vZGlzcC9kcHUxL2RwdV9ybS5jCkBAIC0yMSw5ICsyMSw2IEBACiAjaW5j bHVkZSAiZHB1X2VuY29kZXIuaCIKICNpbmNsdWRlICJkcHVfdHJhY2UuaCIKIAotI2RlZmluZSBS RVNFUlZFRF9CWV9PVEhFUihoLCByKSAgXAotCQkoKGgpLT5lbmNfaWQgJiYgKGgpLT5lbmNfaWQg IT0gcikKLQogLyoqCiAgKiBzdHJ1Y3QgZHB1X3JtX3JlcXVpcmVtZW50cyAtIFJlc2VydmF0aW9u IHJlcXVpcmVtZW50cyBwYXJhbWV0ZXIgYnVuZGxlCiAgKiBAdG9wb2xvZ3k6ICBzZWxlY3RlZCB0 b3BvbG9neSBmb3IgdGhlIGRpc3BsYXkKQEAgLTM4LDEyICszNSwxMyBAQCBzdHJ1Y3QgZHB1X3Jt X3JlcXVpcmVtZW50cyB7CiAvKioKICAqIHN0cnVjdCBkcHVfcm1faHdfYmxrIC0gaGFyZHdhcmUg YmxvY2sgdHJhY2tpbmcgbGlzdCBtZW1iZXIKICAqIEBsaXN0OglMaXN0IGhlYWQgZm9yIGxpc3Qg b2YgYWxsIGhhcmR3YXJlIGJsb2NrcyB0cmFja2luZyBpdGVtcwotICogQGVuY19pZDoJRW5jb2Rl ciBpZCB0byB3aGljaCB0aGlzIGJsayBpcyBiaW5kZWQKKyAqIEBpbl91c2U6ICAgICBUcnVlLCBp ZiB0aGUgaHcgYmxvY2sgaXMgYXNzaWduZWQgdG8gYSBkaXNwbGF5IHBpcGVsaW5lLgorICoJCUZh bHNlLCBvdGhlcndpc2UKICAqIEBodzoJCVBvaW50ZXIgdG8gdGhlIGhhcmR3YXJlIHJlZ2lzdGVy IGFjY2VzcyBvYmplY3QgZm9yIHRoaXMgYmxvY2sKICAqLwogc3RydWN0IGRwdV9ybV9od19ibGsg ewogCXN0cnVjdCBsaXN0X2hlYWQgbGlzdDsKLQl1aW50MzJfdCBlbmNfaWQ7CisJYm9vbCBpbl91 c2U7CiAJc3RydWN0IGRwdV9od19ibGsgKmh3OwogfTsKIApAQCAtNTEsMjMgKzQ5LDE5IEBAIHN0 cnVjdCBkcHVfcm1faHdfYmxrIHsKICAqIHN0cnVjdCBkcHVfcm1faHdfaXRlciAtIGl0ZXJhdG9y IGZvciB1c2Ugd2l0aCBkcHVfcm0KICAqIEBodzogZHB1X2h3IG9iamVjdCByZXF1ZXN0ZWQsIG9y IE5VTEwgb24gZmFpbHVyZQogICogQGJsazogZHB1X3JtIGludGVybmFsIGJsb2NrIHJlcHJlc2Vu dGF0aW9uLiBDbGllbnRzIGlnbm9yZS4gVXNlZCBhcyBpdGVyYXRvci4KLSAqIEBlbmNfaWQ6IERS TSBJRCBvZiBFbmNvZGVyIGNsaWVudCB3aXNoZXMgdG8gc2VhcmNoIGZvciwgb3IgMCBmb3IgQW55 IEVuY29kZXIKICAqIEB0eXBlOiBIYXJkd2FyZSBCbG9jayBUeXBlIGNsaWVudCB3aXNoZXMgdG8g c2VhcmNoIGZvci4KICAqLwogc3RydWN0IGRwdV9ybV9od19pdGVyIHsKIAlzdHJ1Y3QgZHB1X2h3 X2JsayAqaHc7CiAJc3RydWN0IGRwdV9ybV9od19ibGsgKmJsazsKLQl1aW50MzJfdCBlbmNfaWQ7 CiAJZW51bSBkcHVfaHdfYmxrX3R5cGUgdHlwZTsKIH07CiAKIHN0YXRpYyB2b2lkIF9kcHVfcm1f aW5pdF9od19pdGVyKAogCQlzdHJ1Y3QgZHB1X3JtX2h3X2l0ZXIgKml0ZXIsCi0JCXVpbnQzMl90 IGVuY19pZCwKIAkJZW51bSBkcHVfaHdfYmxrX3R5cGUgdHlwZSkKIHsKIAltZW1zZXQoaXRlciwg MCwgc2l6ZW9mKCppdGVyKSk7Ci0JaXRlci0+ZW5jX2lkID0gZW5jX2lkOwogCWl0ZXItPnR5cGUg PSB0eXBlOwogfQogCkBAIC05MSwxNiArODUsMTIgQEAgc3RhdGljIGJvb2wgX2RwdV9ybV9nZXRf aHdfbG9ja2VkKHN0cnVjdCBkcHVfcm0gKnJtLCBzdHJ1Y3QgZHB1X3JtX2h3X2l0ZXIgKmkpCiAJ aS0+YmxrID0gbGlzdF9wcmVwYXJlX2VudHJ5KGktPmJsaywgYmxrX2xpc3QsIGxpc3QpOwogCiAJ bGlzdF9mb3JfZWFjaF9lbnRyeV9jb250aW51ZShpLT5ibGssIGJsa19saXN0LCBsaXN0KSB7Ci0J CWlmIChpLT5lbmNfaWQgPT0gaS0+YmxrLT5lbmNfaWQpIHsKKwkJaWYgKCFpLT5ibGstPmluX3Vz ZSkgewogCQkJaS0+aHcgPSBpLT5ibGstPmh3OwotCQkJRFBVX0RFQlVHKCJmb3VuZCB0eXBlICVk IGlkICVkIGZvciBlbmMgJWRcbiIsCi0JCQkJCWktPnR5cGUsIGktPmJsay0+aHctPmlkLCBpLT5l bmNfaWQpOwogCQkJcmV0dXJuIHRydWU7CiAJCX0KIAl9CiAKLQlEUFVfREVCVUcoIm5vIG1hdGNo LCB0eXBlICVkIGZvciBlbmMgJWRcbiIsIGktPnR5cGUsIGktPmVuY19pZCk7Ci0KIAlyZXR1cm4g ZmFsc2U7CiB9CiAKQEAgLTE5Niw3ICsxODYsNiBAQCBzdGF0aWMgaW50IF9kcHVfcm1faHdfYmxr X2NyZWF0ZSgKIAl9CiAKIAlibGstPmh3ID0gaHc7Ci0JYmxrLT5lbmNfaWQgPSAwOwogCWxpc3Rf YWRkX3RhaWwoJmJsay0+bGlzdCwgJnJtLT5od19ibGtzW3R5cGVdKTsKIAogCXJldHVybiAwOwpA QCAtMzAxLDcgKzI5MCw2IEBAIHN0YXRpYyBib29sIF9kcHVfcm1fbmVlZHNfc3BsaXRfZGlzcGxh eShjb25zdCBzdHJ1Y3QgbXNtX2Rpc3BsYXlfdG9wb2xvZ3kgKnRvcCkKICAqCXByb3Bvc2VkIHVz ZSBjYXNlIHJlcXVpcmVtZW50cywgaW5jbC4gaGFyZHdpcmVkIGRlcGVuZGVudCBibG9ja3MgbGlr ZQogICoJcGluZ3BvbmcKICAqIEBybTogZHB1IHJlc291cmNlIG1hbmFnZXIgaGFuZGxlCi0gKiBA ZW5jX2lkOiBlbmNvZGVyIGlkIHJlcXVlc3RpbmcgZm9yIGFsbG9jYXRpb24KICAqIEByZXFzOiBw cm9wb3NlZCB1c2UgY2FzZSByZXF1aXJlbWVudHMKICAqIEBsbTogcHJvcG9zZWQgbGF5ZXIgbWl4 ZXIsIGZ1bmN0aW9uIGNoZWNrcyBpZiBsbSwgYW5kIGFsbCBvdGhlciBoYXJkd2lyZWQKICAqICAg ICAgYmxvY2tzIGNvbm5lY3RlZCB0byB0aGUgbG0gKHBwKSBpcyBhdmFpbGFibGUgYW5kIGFwcHJv cHJpYXRlCkBAIC0zMTMsNyArMzAxLDYgQEAgc3RhdGljIGJvb2wgX2RwdV9ybV9uZWVkc19zcGxp dF9kaXNwbGF5KGNvbnN0IHN0cnVjdCBtc21fZGlzcGxheV90b3BvbG9neSAqdG9wKQogICovCiBz dGF0aWMgYm9vbCBfZHB1X3JtX2NoZWNrX2xtX2FuZF9nZXRfY29ubmVjdGVkX2Jsa3MoCiAJCXN0 cnVjdCBkcHVfcm0gKnJtLAotCQl1aW50MzJfdCBlbmNfaWQsCiAJCXN0cnVjdCBkcHVfcm1fcmVx dWlyZW1lbnRzICpyZXFzLAogCQlzdHJ1Y3QgZHB1X3JtX2h3X2JsayAqbG0sCiAJCXN0cnVjdCBk cHVfcm1faHdfYmxrICoqcHAsCkBAIC0zMzksMTMgKzMyNiw3IEBAIHN0YXRpYyBib29sIF9kcHVf cm1fY2hlY2tfbG1fYW5kX2dldF9jb25uZWN0ZWRfYmxrcygKIAkJfQogCX0KIAotCS8qIEFscmVh ZHkgcmVzZXJ2ZWQ/ICovCi0JaWYgKFJFU0VSVkVEX0JZX09USEVSKGxtLCBlbmNfaWQpKSB7Ci0J CURQVV9ERUJVRygibG0gJWQgYWxyZWFkeSByZXNlcnZlZFxuIiwgbG1fY2ZnLT5pZCk7Ci0JCXJl dHVybiBmYWxzZTsKLQl9Ci0KLQlfZHB1X3JtX2luaXRfaHdfaXRlcigmaXRlciwgMCwgRFBVX0hX X0JMS19QSU5HUE9ORyk7CisJX2RwdV9ybV9pbml0X2h3X2l0ZXIoJml0ZXIsIERQVV9IV19CTEtf UElOR1BPTkcpOwogCXdoaWxlIChfZHB1X3JtX2dldF9od19sb2NrZWQocm0sICZpdGVyKSkgewog CQlpZiAoaXRlci5ibGstPmh3LT5pZCA9PSBsbV9jZmctPnBpbmdwb25nKSB7CiAJCQkqcHAgPSBp dGVyLmJsazsKQEAgLTM1OCwxNiArMzM5LDEwIEBAIHN0YXRpYyBib29sIF9kcHVfcm1fY2hlY2tf bG1fYW5kX2dldF9jb25uZWN0ZWRfYmxrcygKIAkJcmV0dXJuIGZhbHNlOwogCX0KIAotCWlmIChS RVNFUlZFRF9CWV9PVEhFUigqcHAsIGVuY19pZCkpIHsKLQkJRFBVX0RFQlVHKCJsbSAlZCBwcCAl ZCBhbHJlYWR5IHJlc2VydmVkXG4iLCBsbS0+aHctPmlkLAotCQkJCSgqcHApLT5ody0+aWQpOwot CQlyZXR1cm4gZmFsc2U7Ci0JfQotCiAJcmV0dXJuIHRydWU7CiB9CiAKLXN0YXRpYyBpbnQgX2Rw dV9ybV9yZXNlcnZlX2xtcyhzdHJ1Y3QgZHB1X3JtICpybSwgdWludDMyX3QgZW5jX2lkLAorc3Rh dGljIGludCBfZHB1X3JtX3Jlc2VydmVfbG1zKHN0cnVjdCBkcHVfcm0gKnJtLAogCQkJICAgICAg IHN0cnVjdCBkcHVfY3J0Y19zdGF0ZSAqZHB1X2NzdGF0ZSwKIAkJCSAgICAgICBzdHJ1Y3QgZHB1 X3JtX3JlcXVpcmVtZW50cyAqcmVxcykKIApAQCAtMzg0LDcgKzM1OSw3IEBAIHN0YXRpYyBpbnQg X2RwdV9ybV9yZXNlcnZlX2xtcyhzdHJ1Y3QgZHB1X3JtICpybSwgdWludDMyX3QgZW5jX2lkLAog CX0KIAogCS8qIEZpbmQgYSBwcmltYXJ5IG1peGVyICovCi0JX2RwdV9ybV9pbml0X2h3X2l0ZXIo Jml0ZXJfaSwgMCwgRFBVX0hXX0JMS19MTSk7CisJX2RwdV9ybV9pbml0X2h3X2l0ZXIoJml0ZXJf aSwgRFBVX0hXX0JMS19MTSk7CiAJd2hpbGUgKGxtX2NvdW50ICE9IHJlcXMtPnRvcG9sb2d5Lm51 bV9sbSAmJgogCQkJX2RwdV9ybV9nZXRfaHdfbG9ja2VkKHJtLCAmaXRlcl9pKSkgewogCQltZW1z ZXQoJmxtLCAwLCBzaXplb2YobG0pKTsKQEAgLTM5NCwxNCArMzY5LDE0IEBAIHN0YXRpYyBpbnQg X2RwdV9ybV9yZXNlcnZlX2xtcyhzdHJ1Y3QgZHB1X3JtICpybSwgdWludDMyX3QgZW5jX2lkLAog CQlsbVtsbV9jb3VudF0gPSBpdGVyX2kuYmxrOwogCiAJCWlmICghX2RwdV9ybV9jaGVja19sbV9h bmRfZ2V0X2Nvbm5lY3RlZF9ibGtzKAotCQkJCXJtLCBlbmNfaWQsIHJlcXMsIGxtW2xtX2NvdW50 XSwKKwkJCQlybSwgcmVxcywgbG1bbG1fY291bnRdLAogCQkJCSZwcFtsbV9jb3VudF0sIE5VTEwp KQogCQkJY29udGludWU7CiAKIAkJKytsbV9jb3VudDsKIAogCQkvKiBWYWxpZCBwcmltYXJ5IG1p eGVyIGZvdW5kLCBmaW5kIG1hdGNoaW5nIHBlZXJzICovCi0JCV9kcHVfcm1faW5pdF9od19pdGVy KCZpdGVyX2osIDAsIERQVV9IV19CTEtfTE0pOworCQlfZHB1X3JtX2luaXRfaHdfaXRlcigmaXRl cl9qLCBEUFVfSFdfQkxLX0xNKTsKIAogCQl3aGlsZSAobG1fY291bnQgIT0gcmVxcy0+dG9wb2xv Z3kubnVtX2xtICYmCiAJCQkJX2RwdV9ybV9nZXRfaHdfbG9ja2VkKHJtLCAmaXRlcl9qKSkgewpA QCAtNDA5LDcgKzM4NCw3IEBAIHN0YXRpYyBpbnQgX2RwdV9ybV9yZXNlcnZlX2xtcyhzdHJ1Y3Qg ZHB1X3JtICpybSwgdWludDMyX3QgZW5jX2lkLAogCQkJCWNvbnRpbnVlOwogCiAJCQlpZiAoIV9k cHVfcm1fY2hlY2tfbG1fYW5kX2dldF9jb25uZWN0ZWRfYmxrcygKLQkJCQkJcm0sIGVuY19pZCwg cmVxcywgaXRlcl9qLmJsaywKKwkJCQkJcm0sIHJlcXMsIGl0ZXJfai5ibGssCiAJCQkJCSZwcFts bV9jb3VudF0sIGl0ZXJfaS5ibGspKQogCQkJCWNvbnRpbnVlOwogCkBAIC00MjcsMTMgKzQwMiwx MyBAQCBzdGF0aWMgaW50IF9kcHVfcm1fcmVzZXJ2ZV9sbXMoc3RydWN0IGRwdV9ybSAqcm0sIHVp bnQzMl90IGVuY19pZCwKIAkJaWYgKCFsbVtpXSkKIAkJCWJyZWFrOwogCi0JCWxtW2ldLT5lbmNf aWQgPSBlbmNfaWQ7Ci0JCXBwW2ldLT5lbmNfaWQgPSBlbmNfaWQ7CisJCWxtW2ldLT5pbl91c2Ug PSB0cnVlOworCQlwcFtpXS0+aW5fdXNlID0gdHJ1ZTsKIAogCQlkcHVfY3N0YXRlLT5taXhlcnNb aV0uaHdfbG0gPSB0b19kcHVfaHdfbWl4ZXIobG1baV0tPmh3KTsKIAkJZHB1X2NzdGF0ZS0+bWl4 ZXJzW2ldLmh3X3BwID0gdG9fZHB1X2h3X3Bpbmdwb25nKHBwW2ldLT5odyk7CiAKLQkJdHJhY2Vf ZHB1X3JtX3Jlc2VydmVfbG1zKGxtW2ldLT5ody0+aWQsIERQVV9IV19CTEtfTE0sIGVuY19pZCwK KwkJdHJhY2VfZHB1X3JtX3Jlc2VydmVfbG1zKGxtW2ldLT5ody0+aWQsIERQVV9IV19CTEtfTE0s CiAJCQkJCSBwcFtpXS0+aHctPmlkKTsKIAl9CiAKQEAgLTQ0NCw3ICs0MTksNiBAQCBzdGF0aWMg aW50IF9kcHVfcm1fcmVzZXJ2ZV9sbXMoc3RydWN0IGRwdV9ybSAqcm0sIHVpbnQzMl90IGVuY19p ZCwKIAogc3RhdGljIGludCBfZHB1X3JtX3Jlc2VydmVfY3RscygKIAkJc3RydWN0IGRwdV9ybSAq cm0sCi0JCXVpbnQzMl90IGVuY19pZCwKIAkJc3RydWN0IGRwdV9jcnRjX3N0YXRlICpkcHVfY3N0 YXRlLAogCQljb25zdCBzdHJ1Y3QgbXNtX2Rpc3BsYXlfdG9wb2xvZ3kgKnRvcCkKIHsKQEAgLTQ2 MCwxNSArNDM0LDEyIEBAIHN0YXRpYyBpbnQgX2RwdV9ybV9yZXNlcnZlX2N0bHMoCiAKIAluZWVk c19zcGxpdF9kaXNwbGF5ID0gX2RwdV9ybV9uZWVkc19zcGxpdF9kaXNwbGF5KHRvcCk7CiAKLQlf ZHB1X3JtX2luaXRfaHdfaXRlcigmaXRlciwgMCwgRFBVX0hXX0JMS19DVEwpOworCV9kcHVfcm1f aW5pdF9od19pdGVyKCZpdGVyLCBEUFVfSFdfQkxLX0NUTCk7CiAJd2hpbGUgKF9kcHVfcm1fZ2V0 X2h3X2xvY2tlZChybSwgJml0ZXIpKSB7CiAJCWNvbnN0IHN0cnVjdCBkcHVfaHdfY3RsICpjdGwg PSB0b19kcHVfaHdfY3RsKGl0ZXIuYmxrLT5odyk7CiAJCXVuc2lnbmVkIGxvbmcgZmVhdHVyZXMg PSBjdGwtPmNhcHMtPmZlYXR1cmVzOwogCQlib29sIGhhc19zcGxpdF9kaXNwbGF5OwogCi0JCWlm IChSRVNFUlZFRF9CWV9PVEhFUihpdGVyLmJsaywgZW5jX2lkKSkKLQkJCWNvbnRpbnVlOwotCiAJ CWhhc19zcGxpdF9kaXNwbGF5ID0gQklUKERQVV9DVExfU1BMSVRfRElTUExBWSkgJiBmZWF0dXJl czsKIAogCQlEUFVfREVCVUcoImN0bCAlZCBjYXBzIDB4JWxYXG4iLCBpdGVyLmJsay0+aHctPmlk LCBmZWF0dXJlcyk7CkBAIC00ODcsMTEgKzQ1OCwxMCBAQCBzdGF0aWMgaW50IF9kcHVfcm1fcmVz ZXJ2ZV9jdGxzKAogCQlyZXR1cm4gLUVOQVZBSUw7CiAKIAlmb3IgKGkgPSAwOyBpIDwgQVJSQVlf U0laRShjdGxzKSAmJiBpIDwgbnVtX2N0bHM7IGkrKykgewotCQljdGxzW2ldLT5lbmNfaWQgPSBl bmNfaWQ7CisJCWN0bHNbaV0tPmluX3VzZSA9IHRydWU7CiAJCWRwdV9jc3RhdGUtPmh3X2N0bHNb aV0gPSB0b19kcHVfaHdfY3RsKGN0bHNbaV0tPmh3KTsKIAotCQl0cmFjZV9kcHVfcm1fcmVzZXJ2 ZV9jdGxzKGN0bHNbaV0tPmh3LT5pZCwgRFBVX0hXX0JMS19DVEwsCi0JCQkJCSAgZW5jX2lkKTsK KwkJdHJhY2VfZHB1X3JtX3Jlc2VydmVfY3RscyhjdGxzW2ldLT5ody0+aWQsIERQVV9IV19CTEtf Q1RMKTsKIAl9CiAKIAlkcHVfY3N0YXRlLT5udW1fY3RscyA9IG51bV9jdGxzOwpAQCAtNTAxLDI2 ICs0NzEsMTkgQEAgc3RhdGljIGludCBfZHB1X3JtX3Jlc2VydmVfY3RscygKIAogc3RhdGljIHN0 cnVjdCBkcHVfcm1faHdfYmxrICpfZHB1X3JtX3Jlc2VydmVfaW50ZigKIAkJc3RydWN0IGRwdV9y bSAqcm0sCi0JCXVpbnQzMl90IGVuY19pZCwKIAkJdWludDMyX3QgaWQsCiAJCWVudW0gZHB1X2h3 X2Jsa190eXBlIHR5cGUpCiB7CiAJc3RydWN0IGRwdV9ybV9od19pdGVyIGl0ZXI7CiAKIAkvKiBG aW5kIHRoZSBibG9jayBlbnRyeSBpbiB0aGUgcm0sIGFuZCBub3RlIHRoZSByZXNlcnZhdGlvbiAq LwotCV9kcHVfcm1faW5pdF9od19pdGVyKCZpdGVyLCAwLCB0eXBlKTsKKwlfZHB1X3JtX2luaXRf aHdfaXRlcigmaXRlciwgdHlwZSk7CiAJd2hpbGUgKF9kcHVfcm1fZ2V0X2h3X2xvY2tlZChybSwg Jml0ZXIpKSB7CiAJCWlmIChpdGVyLmJsay0+aHctPmlkICE9IGlkKQogCQkJY29udGludWU7CiAK LQkJaWYgKFJFU0VSVkVEX0JZX09USEVSKGl0ZXIuYmxrLCBlbmNfaWQpKSB7Ci0JCQlEUFVfRVJS T1IoInR5cGUgJWQgaWQgJWQgYWxyZWFkeSByZXNlcnZlZFxuIiwgdHlwZSwgaWQpOwotCQkJcmV0 dXJuIE5VTEw7Ci0JCX0KKwkJdHJhY2VfZHB1X3JtX3Jlc2VydmVfaW50ZihpdGVyLmJsay0+aHct PmlkLCBEUFVfSFdfQkxLX0lOVEYpOwogCi0JCWl0ZXIuYmxrLT5lbmNfaWQgPSBlbmNfaWQ7Ci0J CXRyYWNlX2RwdV9ybV9yZXNlcnZlX2ludGYoaXRlci5ibGstPmh3LT5pZCwgRFBVX0hXX0JMS19J TlRGLAotCQkJCQkgIGVuY19pZCk7CiAJCWJyZWFrOwogCX0KIApAQCAtNTM1LDcgKzQ5OCw2IEBA IHN0YXRpYyBzdHJ1Y3QgZHB1X3JtX2h3X2JsayAqX2RwdV9ybV9yZXNlcnZlX2ludGYoCiAKIHN0 YXRpYyBpbnQgX2RwdV9ybV9yZXNlcnZlX2ludGZfcmVsYXRlZF9odygKIAkJc3RydWN0IGRwdV9y bSAqcm0sCi0JCXVpbnQzMl90IGVuY19pZCwKIAkJc3RydWN0IGRwdV9jcnRjX3N0YXRlICpkcHVf Y3N0YXRlLAogCQlzdHJ1Y3QgZHB1X2VuY29kZXJfaHdfcmVzb3VyY2VzICpod19yZXMpCiB7CkBA IC01NDYsMTEgKzUwOCwxMiBAQCBzdGF0aWMgaW50IF9kcHVfcm1fcmVzZXJ2ZV9pbnRmX3JlbGF0 ZWRfaHcoCiAJCWlmIChod19yZXMtPmludGZzW2ldID09IElOVEZfTU9ERV9OT05FKQogCQkJY29u dGludWU7CiAKLQkJYmxrID0gX2RwdV9ybV9yZXNlcnZlX2ludGYocm0sIGVuY19pZCwgaSArIElO VEZfMCwKKwkJYmxrID0gX2RwdV9ybV9yZXNlcnZlX2ludGYocm0sIGkgKyBJTlRGXzAsCiAJCQkJ RFBVX0hXX0JMS19JTlRGKTsKIAkJaWYgKCFibGspCiAJCQlyZXR1cm4gLUVOQVZBSUw7CiAKKwkJ YmxrLT5pbl91c2UgPSB0cnVlOwogCQlkcHVfY3N0YXRlLT5od19pbnRmc1tudW1faW50ZnMrK10g PSB0b19kcHVfaHdfaW50ZihibGstPmh3KTsKIAl9CiAKQEAgLTU2MSwyNyArNTI0LDI0IEBAIHN0 YXRpYyBpbnQgX2RwdV9ybV9yZXNlcnZlX2ludGZfcmVsYXRlZF9odygKIAogc3RhdGljIGludCBf ZHB1X3JtX21ha2VfcmVzZXJ2YXRpb24oCiAJCXN0cnVjdCBkcHVfcm0gKnJtLAotCQlzdHJ1Y3Qg ZHJtX2VuY29kZXIgKmVuYywKIAkJc3RydWN0IGRwdV9jcnRjX3N0YXRlICpkcHVfY3N0YXRlLAog CQlzdHJ1Y3QgZHB1X3JtX3JlcXVpcmVtZW50cyAqcmVxcykKIHsKIAlpbnQgcmV0OwogCi0JcmV0 ID0gX2RwdV9ybV9yZXNlcnZlX2xtcyhybSwgZW5jLT5iYXNlLmlkLCBkcHVfY3N0YXRlLCByZXFz KTsKKwlyZXQgPSBfZHB1X3JtX3Jlc2VydmVfbG1zKHJtLCBkcHVfY3N0YXRlLCByZXFzKTsKIAlp ZiAocmV0KSB7CiAJCURQVV9FUlJPUigidW5hYmxlIHRvIGZpbmQgYXBwcm9wcmlhdGUgbWl4ZXJz XG4iKTsKIAkJcmV0dXJuIHJldDsKIAl9CiAKLQlyZXQgPSBfZHB1X3JtX3Jlc2VydmVfY3Rscyhy bSwgZW5jLT5iYXNlLmlkLCBkcHVfY3N0YXRlLAotCQkJCSAgICZyZXFzLT50b3BvbG9neSk7CisJ cmV0ID0gX2RwdV9ybV9yZXNlcnZlX2N0bHMocm0sIGRwdV9jc3RhdGUsICZyZXFzLT50b3BvbG9n eSk7CiAJaWYgKHJldCkgewogCQlEUFVfRVJST1IoInVuYWJsZSB0byBmaW5kIGFwcHJvcHJpYXRl IENUTFxuIik7CiAJCXJldHVybiByZXQ7CiAJfQogCi0JcmV0ID0gX2RwdV9ybV9yZXNlcnZlX2lu dGZfcmVsYXRlZF9odyhybSwgZW5jLT5iYXNlLmlkLCBkcHVfY3N0YXRlLAotCQkJCQkgICAgICAm cmVxcy0+aHdfcmVzKTsKKwlyZXQgPSBfZHB1X3JtX3Jlc2VydmVfaW50Zl9yZWxhdGVkX2h3KHJt LCBkcHVfY3N0YXRlLCAmcmVxcy0+aHdfcmVzKTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0Owog CkBAIC02MTIsNyArNTcyLDcgQEAgc3RhdGljIGludCBfZHB1X3JtX3JlbGVhc2VfaHcoc3RydWN0 IGRwdV9ybSAqcm0sIGVudW0gZHB1X2h3X2Jsa190eXBlIHR5cGUsCiAKIAlsaXN0X2Zvcl9lYWNo X2VudHJ5KGJsaywgJnJtLT5od19ibGtzW3R5cGVdLCBsaXN0KSB7CiAJCWlmIChibGstPmh3LT5p ZCA9PSBpZCkgewotCQkJYmxrLT5lbmNfaWQgPSAwOworCQkJYmxrLT5pbl91c2UgPSBmYWxzZTsK IAkJCXJldHVybiAwOwogCQl9CiAJfQpAQCAtNjk5LDcgKzY1OSw3IEBAIGludCBkcHVfcm1fcmVz ZXJ2ZSgKIAkJZ290byBlbmQ7CiAJfQogCi0JcmV0ID0gX2RwdV9ybV9tYWtlX3Jlc2VydmF0aW9u KHJtLCBlbmMsIGRwdV9jc3RhdGUsICZyZXFzKTsKKwlyZXQgPSBfZHB1X3JtX21ha2VfcmVzZXJ2 YXRpb24ocm0sIGRwdV9jc3RhdGUsICZyZXFzKTsKIAlpZiAocmV0KSB7CiAJCURQVV9FUlJPUigi ZmFpbGVkIHRvIHJlc2VydmUgaHcgcmVzb3VyY2VzOiAlZFxuIiwgcmV0KTsKIAkJX2RwdV9ybV9y ZWxlYXNlX3Jlc2VydmF0aW9uKHJtLCBkcHVfY3N0YXRlKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9tc20vZGlzcC9kcHUxL2RwdV90cmFjZS5oIGIvZHJpdmVycy9ncHUvZHJtL21zbS9k aXNwL2RwdTEvZHB1X3RyYWNlLmgKaW5kZXggNjM2YjMxYi4uMzA2MTk3OCAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL21zbS9kaXNwL2RwdTEvZHB1X3RyYWNlLmgKKysrIGIvZHJpdmVycy9n cHUvZHJtL21zbS9kaXNwL2RwdTEvZHB1X3RyYWNlLmgKQEAgLTg2OSw0OCArODY5LDQyIEBACiAp OwogCiBERUNMQVJFX0VWRU5UX0NMQVNTKGRwdV9ybV9pdGVyX3RlbXBsYXRlLAotCVRQX1BST1RP KHVpbnQzMl90IGlkLCBlbnVtIGRwdV9od19ibGtfdHlwZSB0eXBlLCB1aW50MzJfdCBlbmNfaWQp LAotCVRQX0FSR1MoaWQsIHR5cGUsIGVuY19pZCksCisJVFBfUFJPVE8odWludDMyX3QgaWQsIGVu dW0gZHB1X2h3X2Jsa190eXBlIHR5cGUpLAorCVRQX0FSR1MoaWQsIHR5cGUpLAogCVRQX1NUUlVD VF9fZW50cnkoCiAJCV9fZmllbGQoCXVpbnQzMl90LAkJaWQJKQogCQlfX2ZpZWxkKAllbnVtIGRw dV9od19ibGtfdHlwZSwJdHlwZQkpCi0JCV9fZmllbGQoCXVpbnQzMl90LAkJZW5jX2lkCSkKIAkp LAogCVRQX2Zhc3RfYXNzaWduKAogCQlfX2VudHJ5LT5pZCA9IGlkOwogCQlfX2VudHJ5LT50eXBl ID0gdHlwZTsKLQkJX19lbnRyeS0+ZW5jX2lkID0gZW5jX2lkOwogCSksCi0JVFBfcHJpbnRrKCJp ZDolZCB0eXBlOiVkIGVuY19pZDoldSIsIF9fZW50cnktPmlkLCBfX2VudHJ5LT50eXBlLAotCQkg IF9fZW50cnktPmVuY19pZCkKKwlUUF9wcmludGsoImlkOiVkIHR5cGU6JWQgIiwgX19lbnRyeS0+ aWQsIF9fZW50cnktPnR5cGUpCiApOwogREVGSU5FX0VWRU5UKGRwdV9ybV9pdGVyX3RlbXBsYXRl LCBkcHVfcm1fcmVzZXJ2ZV9pbnRmLAotCVRQX1BST1RPKHVpbnQzMl90IGlkLCBlbnVtIGRwdV9o d19ibGtfdHlwZSB0eXBlLCB1aW50MzJfdCBlbmNfaWQpLAotCVRQX0FSR1MoaWQsIHR5cGUsIGVu Y19pZCkKKwlUUF9QUk9UTyh1aW50MzJfdCBpZCwgZW51bSBkcHVfaHdfYmxrX3R5cGUgdHlwZSks CisJVFBfQVJHUyhpZCwgdHlwZSkKICk7CiBERUZJTkVfRVZFTlQoZHB1X3JtX2l0ZXJfdGVtcGxh dGUsIGRwdV9ybV9yZXNlcnZlX2N0bHMsCi0JVFBfUFJPVE8odWludDMyX3QgaWQsIGVudW0gZHB1 X2h3X2Jsa190eXBlIHR5cGUsIHVpbnQzMl90IGVuY19pZCksCi0JVFBfQVJHUyhpZCwgdHlwZSwg ZW5jX2lkKQorCVRQX1BST1RPKHVpbnQzMl90IGlkLCBlbnVtIGRwdV9od19ibGtfdHlwZSB0eXBl KSwKKwlUUF9BUkdTKGlkLCB0eXBlKQogKTsKIAogVFJBQ0VfRVZFTlQoZHB1X3JtX3Jlc2VydmVf bG1zLAotCVRQX1BST1RPKHVpbnQzMl90IGlkLCBlbnVtIGRwdV9od19ibGtfdHlwZSB0eXBlLCB1 aW50MzJfdCBlbmNfaWQsCi0JCSB1aW50MzJfdCBwcF9pZCksCi0JVFBfQVJHUyhpZCwgdHlwZSwg ZW5jX2lkLCBwcF9pZCksCisJVFBfUFJPVE8odWludDMyX3QgaWQsIGVudW0gZHB1X2h3X2Jsa190 eXBlIHR5cGUsIHVpbnQzMl90IHBwX2lkKSwKKwlUUF9BUkdTKGlkLCB0eXBlLCBwcF9pZCksCiAJ VFBfU1RSVUNUX19lbnRyeSgKIAkJX19maWVsZCgJdWludDMyX3QsCQlpZAkpCiAJCV9fZmllbGQo CWVudW0gZHB1X2h3X2Jsa190eXBlLAl0eXBlCSkKLQkJX19maWVsZCgJdWludDMyX3QsCQllbmNf aWQJKQogCQlfX2ZpZWxkKAl1aW50MzJfdCwJCXBwX2lkCSkKIAkpLAogCVRQX2Zhc3RfYXNzaWdu KAogCQlfX2VudHJ5LT5pZCA9IGlkOwogCQlfX2VudHJ5LT50eXBlID0gdHlwZTsKLQkJX19lbnRy eS0+ZW5jX2lkID0gZW5jX2lkOwogCQlfX2VudHJ5LT5wcF9pZCA9IHBwX2lkOwogCSksCi0JVFBf cHJpbnRrKCJpZDolZCB0eXBlOiVkIGVuY19pZDoldSBwcF9pZDoldSIsIF9fZW50cnktPmlkLAot CQkgIF9fZW50cnktPnR5cGUsIF9fZW50cnktPmVuY19pZCwgX19lbnRyeS0+cHBfaWQpCisJVFBf cHJpbnRrKCJpZDolZCB0eXBlOiVkIHBwX2lkOiV1IiwgX19lbnRyeS0+aWQsCisJCSAgX19lbnRy eS0+dHlwZSwgX19lbnRyeS0+cHBfaWQpCiApOwogCiBUUkFDRV9FVkVOVChkcHVfdmJpZl93YWl0 X3hpbl9oYWx0X2ZhaWwsCi0tIApUaGUgUXVhbGNvbW0gSW5ub3ZhdGlvbiBDZW50ZXIsIEluYy4g aXMgYSBtZW1iZXIgb2YgdGhlIENvZGUgQXVyb3JhIEZvcnVtLAphIExpbnV4IEZvdW5kYXRpb24g Q29sbGFib3JhdGl2ZSBQcm9qZWN0CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwpGcmVlZHJlbm8gbWFpbGluZyBsaXN0CkZyZWVkcmVub0BsaXN0cy5mcmVl ZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9mcmVlZHJlbm8K