From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 060/190] drm/i915: Rename backpointer from intel_ringbuffer to intel_engine_cs Date: Mon, 11 Jan 2016 09:17:11 +0000 Message-ID: <1452503961-14837-60-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-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1B6B06E240 for ; Mon, 11 Jan 2016 01:20:47 -0800 (PST) Received: by mail-wm0-f66.google.com with SMTP id l65so25314283wmf.3 for ; Mon, 11 Jan 2016 01:20:47 -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 SGF2aW5nIHJpbmdidWYtPnJpbmcgcG9pbnQgdG8gYW4gZW5naW5lIGlzIGNvbmZ1c2luZywgc28g cmVuYW1lIGl0IG9uY2UKYWdhaW4gdG8gcmluZy0+ZW5naW5lLgoKU2lnbmVkLW9mZi1ieTogQ2hy aXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+Ci0tLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jIHwgMTAgKysrLS0tCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9scmMuYyAgICAgICAgICAgfCAzNSArKysrKysrKystLS0tLS0tLS0tCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMgICAgfCA1NCArKysrKysrKysrKysr KystLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIu aCAgICB8ICAyICstCiA0IGZpbGVzIGNoYW5nZWQsIDQ5IGluc2VydGlvbnMoKyksIDUyIGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1p c3Npb24uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYwppbmRl eCBlODJjYzkxODJkZmEuLjUzYWJlMjE0M2Y4YSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ3VjX3N1Ym1pc3Npb24uYwpAQCAtMzkxLDcgKzM5MSw3IEBAIHN0YXRpYyB2b2lkIGd1Y19p bml0X2N0eF9kZXNjKHN0cnVjdCBpbnRlbF9ndWMgKmd1YywKIAlmb3IgKGkgPSAwOyBpIDwgSTkx NV9OVU1fUklOR1M7IGkrKykgewogCQlzdHJ1Y3QgZ3VjX2V4ZWNsaXN0X2NvbnRleHQgKmxyYyA9 ICZkZXNjLmxyY1tpXTsKIAkJc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYgPSBjdHgt PmVuZ2luZVtpXS5yaW5nYnVmOwotCQlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nOworCQlz dHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmU7CiAJCXN0cnVjdCBkcm1faTkxNV9nZW1fb2Jq ZWN0ICpvYmo7CiAJCXVpbnQ2NF90IGN0eF9kZXNjOwogCkBAIC00MDYsMTUgKzQwNiwxNSBAQCBz dGF0aWMgdm9pZCBndWNfaW5pdF9jdHhfZGVzYyhzdHJ1Y3QgaW50ZWxfZ3VjICpndWMsCiAJCWlm ICghb2JqKQogCQkJYnJlYWs7CS8qIFhYWDogY29udGludWU/ICovCiAKLQkJcmluZyA9IHJpbmdi dWYtPnJpbmc7Ci0JCWN0eF9kZXNjID0gaW50ZWxfbHJfY29udGV4dF9kZXNjcmlwdG9yKGN0eCwg cmluZyk7CisJCWVuZ2luZSA9IHJpbmdidWYtPmVuZ2luZTsKKwkJY3R4X2Rlc2MgPSBpbnRlbF9s cl9jb250ZXh0X2Rlc2NyaXB0b3IoY3R4LCBlbmdpbmUpOwogCQlscmMtPmNvbnRleHRfZGVzYyA9 ICh1MzIpY3R4X2Rlc2M7CiAKIAkJLyogVGhlIHN0YXRlIHBhZ2UgaXMgYWZ0ZXIgUFBIV1NQICov CiAJCWxyYy0+cmluZ19sY3JhID0gaTkxNV9nZW1fb2JqX2dndHRfb2Zmc2V0KG9iaikgKwogCQkJ CUxSQ19TVEFURV9QTiAqIFBBR0VfU0laRTsKIAkJbHJjLT5jb250ZXh0X2lkID0gKGNsaWVudC0+ Y3R4X2luZGV4IDw8IEdVQ19FTENfQ1RYSURfT0ZGU0VUKSB8Ci0JCQkJKHJpbmctPmlkIDw8IEdV Q19FTENfRU5HSU5FX09GRlNFVCk7CisJCQkJKGVuZ2luZS0+aWQgPDwgR1VDX0VMQ19FTkdJTkVf T0ZGU0VUKTsKIAogCQlvYmogPSByaW5nYnVmLT5vYmo7CiAKQEAgLTQyMyw3ICs0MjMsNyBAQCBz dGF0aWMgdm9pZCBndWNfaW5pdF9jdHhfZGVzYyhzdHJ1Y3QgaW50ZWxfZ3VjICpndWMsCiAJCWxy Yy0+cmluZ19uZXh0X2ZyZWVfbG9jYXRpb24gPSBscmMtPnJpbmdfYmVnaW47CiAJCWxyYy0+cmlu Z19jdXJyZW50X3RhaWxfcG9pbnRlcl92YWx1ZSA9IDA7CiAKLQkJZGVzYy5lbmdpbmVzX3VzZWQg fD0gKDEgPDwgcmluZy0+aWQpOworCQlkZXNjLmVuZ2luZXNfdXNlZCB8PSAoMSA8PCBlbmdpbmUt PmlkKTsKIAl9CiAKIAlXQVJOX09OKGRlc2MuZW5naW5lc191c2VkID09IDApOwpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9scmMuYwppbmRleCA4N2QzMjViNmU3ZGMuLjg2MzllYmZhYjk2ZiAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfbHJjLmMKQEAgLTIxNzksMTMgKzIxNzksMTMgQEAgdm9pZCBpbnRlbF9scl9j b250ZXh0X2ZyZWUoc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCkKIAkJaWYgKGN0eF9vYmopIHsK IAkJCXN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmID0KIAkJCQkJY3R4LT5lbmdpbmVb aV0ucmluZ2J1ZjsKLQkJCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcgPSByaW5nYnVmLT5y aW5nOworCQkJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lID0gcmluZ2J1Zi0+ZW5naW5l OwogCi0JCQlpZiAoY3R4ID09IHJpbmctPmRlZmF1bHRfY29udGV4dCkgeworCQkJaWYgKGN0eCA9 PSBlbmdpbmUtPmRlZmF1bHRfY29udGV4dCkgewogCQkJCWludGVsX3VucGluX3JpbmdidWZmZXJf b2JqKHJpbmdidWYpOwogCQkJCWk5MTVfZ2VtX29iamVjdF9nZ3R0X3VucGluKGN0eF9vYmopOwog CQkJfQotCQkJV0FSTl9PTihjdHgtPmVuZ2luZVtyaW5nLT5pZF0ucGluX2NvdW50KTsKKwkJCVdB Uk5fT04oY3R4LT5lbmdpbmVbZW5naW5lLT5pZF0ucGluX2NvdW50KTsKIAkJCWludGVsX3Jpbmdi dWZmZXJfZnJlZShyaW5nYnVmKTsKIAkJCWRybV9nZW1fb2JqZWN0X3VucmVmZXJlbmNlKCZjdHhf b2JqLT5iYXNlKTsKIAkJfQpAQCAtMjI2MSw1NyArMjI2MSw1NCBAQCBzdGF0aWMgdm9pZCBscmNf c2V0dXBfaGFyZHdhcmVfc3RhdHVzX3BhZ2Uoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywK ICAqCiAgKiBSZXR1cm46IG5vbi16ZXJvIG9uIGVycm9yLgogICovCi0KIGludCBpbnRlbF9scl9j b250ZXh0X2RlZmVycmVkX2FsbG9jKHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgsCi0JCQkJICAg ICBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQorCQkJCSAgICBzdHJ1Y3QgaW50ZWxfZW5n aW5lX2NzICplbmdpbmUpCiB7Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IHJpbmctPmRldjsK IAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqY3R4X29iajsKIAl1aW50MzJfdCBjb250ZXh0 X3NpemU7CiAJc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWY7CiAJaW50IHJldDsKIAog CVdBUk5fT04oY3R4LT5sZWdhY3lfaHdfY3R4LnJjc19zdGF0ZSAhPSBOVUxMKTsKLQlXQVJOX09O KGN0eC0+ZW5naW5lW3JpbmctPmlkXS5zdGF0ZSk7CisJV0FSTl9PTihjdHgtPmVuZ2luZVtlbmdp bmUtPmlkXS5zdGF0ZSk7CiAKLQljb250ZXh0X3NpemUgPSByb3VuZF91cChpbnRlbF9scl9jb250 ZXh0X3NpemUocmluZyksIDQwOTYpOworCWNvbnRleHRfc2l6ZSA9IHJvdW5kX3VwKGludGVsX2xy X2NvbnRleHRfc2l6ZShlbmdpbmUpLCA0MDk2KTsKIAogCS8qIE9uZSBleHRyYSBwYWdlIGFzIHRo ZSBzaGFyaW5nIGRhdGEgYmV0d2VlbiBkcml2ZXIgYW5kIEd1QyAqLwogCWNvbnRleHRfc2l6ZSAr PSBQQUdFX1NJWkUgKiBMUkNfUFBIV1NQX1BOOwogCi0JY3R4X29iaiA9IGk5MTVfZ2VtX2FsbG9j X29iamVjdChkZXYsIGNvbnRleHRfc2l6ZSk7CisJY3R4X29iaiA9IGk5MTVfZ2VtX2FsbG9jX29i amVjdChlbmdpbmUtPmRldiwgY29udGV4dF9zaXplKTsKIAlpZiAoIWN0eF9vYmopIHsKIAkJRFJN X0RFQlVHX0RSSVZFUigiQWxsb2MgTFJDIGJhY2tpbmcgb2JqIGZhaWxlZC5cbiIpOwogCQlyZXR1 cm4gLUVOT01FTTsKIAl9CiAKLQlyaW5nYnVmID0gaW50ZWxfZW5naW5lX2NyZWF0ZV9yaW5nYnVm ZmVyKHJpbmcsIDQgKiBQQUdFX1NJWkUpOworCXJpbmdidWYgPSBpbnRlbF9lbmdpbmVfY3JlYXRl X3JpbmdidWZmZXIoZW5naW5lLCA0ICogUEFHRV9TSVpFKTsKIAlpZiAoSVNfRVJSKHJpbmdidWYp KSB7CiAJCXJldCA9IFBUUl9FUlIocmluZ2J1Zik7CiAJCWdvdG8gZXJyb3JfZGVyZWZfb2JqOwog CX0KIAotCXJldCA9IHBvcHVsYXRlX2xyX2NvbnRleHQoY3R4LCBjdHhfb2JqLCByaW5nLCByaW5n YnVmKTsKKwlyZXQgPSBwb3B1bGF0ZV9scl9jb250ZXh0KGN0eCwgY3R4X29iaiwgZW5naW5lLCBy aW5nYnVmKTsKIAlpZiAocmV0KSB7CiAJCURSTV9ERUJVR19EUklWRVIoIkZhaWxlZCB0byBwb3B1 bGF0ZSBMUkM6ICVkXG4iLCByZXQpOwogCQlnb3RvIGVycm9yX3JpbmdidWY7CiAJfQogCi0JY3R4 LT5lbmdpbmVbcmluZy0+aWRdLnJpbmdidWYgPSByaW5nYnVmOwotCWN0eC0+ZW5naW5lW3Jpbmct PmlkXS5zdGF0ZSA9IGN0eF9vYmo7CisJY3R4LT5lbmdpbmVbZW5naW5lLT5pZF0ucmluZ2J1ZiA9 IHJpbmdidWY7CisJY3R4LT5lbmdpbmVbZW5naW5lLT5pZF0uc3RhdGUgPSBjdHhfb2JqOwogCi0J aWYgKGN0eCAhPSByaW5nLT5kZWZhdWx0X2NvbnRleHQgJiYgcmluZy0+aW5pdF9jb250ZXh0KSB7 CisJaWYgKGN0eCAhPSBlbmdpbmUtPmRlZmF1bHRfY29udGV4dCAmJiBlbmdpbmUtPmluaXRfY29u dGV4dCkgewogCQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcTsKIAotCQlyZXQgPSBp OTE1X2dlbV9yZXF1ZXN0X2FsbG9jKHJpbmcsCi0JCQljdHgsICZyZXEpOworCQlyZXQgPSBpOTE1 X2dlbV9yZXF1ZXN0X2FsbG9jKGVuZ2luZSwgY3R4LCAmcmVxKTsKIAkJaWYgKHJldCkgewogCQkJ RFJNX0VSUk9SKCJyaW5nIGNyZWF0ZSByZXE6ICVkXG4iLAogCQkJCXJldCk7CiAJCQlnb3RvIGVy cm9yX3JpbmdidWY7CiAJCX0KIAotCQlyZXQgPSByaW5nLT5pbml0X2NvbnRleHQocmVxKTsKKwkJ cmV0ID0gZW5naW5lLT5pbml0X2NvbnRleHQocmVxKTsKIAkJaWYgKHJldCkgewogCQkJRFJNX0VS Uk9SKCJyaW5nIGluaXQgY29udGV4dDogJWRcbiIsCiAJCQkJcmV0KTsKQEAgLTIzMjYsOCArMjMy Myw4IEBAIGVycm9yX3JpbmdidWY6CiAJaW50ZWxfcmluZ2J1ZmZlcl9mcmVlKHJpbmdidWYpOwog ZXJyb3JfZGVyZWZfb2JqOgogCWRybV9nZW1fb2JqZWN0X3VucmVmZXJlbmNlKCZjdHhfb2JqLT5i YXNlKTsKLQljdHgtPmVuZ2luZVtyaW5nLT5pZF0ucmluZ2J1ZiA9IE5VTEw7Ci0JY3R4LT5lbmdp bmVbcmluZy0+aWRdLnN0YXRlID0gTlVMTDsKKwljdHgtPmVuZ2luZVtlbmdpbmUtPmlkXS5yaW5n YnVmID0gTlVMTDsKKwljdHgtPmVuZ2luZVtlbmdpbmUtPmlkXS5zdGF0ZSA9IE5VTEw7CiAJcmV0 dXJuIHJldDsKIH0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmlu Z2J1ZmZlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCmluZGV4 IGFlMDBlNzljOWM5OS4uYzQzN2I2MWFjMWQwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf cmluZ2J1ZmZlci5jCkBAIC0xOTQwLDcgKzE5NDAsNyBAQCBpbnRlbF9lbmdpbmVfY3JlYXRlX3Jp bmdidWZmZXIoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLCBpbnQgc2l6ZSkKIAkJcmV0 dXJuIEVSUl9QVFIoLUVOT01FTSk7CiAJfQogCi0JcmluZy0+cmluZyA9IGVuZ2luZTsKKwlyaW5n LT5lbmdpbmUgPSBlbmdpbmU7CiAJbGlzdF9hZGQoJnJpbmctPmxpbmssICZlbmdpbmUtPmJ1ZmZl cnMpOwogCiAJcmluZy0+c2l6ZSA9IHNpemU7CkBAIC0xOTc1LDQwICsxOTc1LDQwIEBAIGludGVs X3JpbmdidWZmZXJfZnJlZShzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZykKIAlrZnJlZShy aW5nKTsKIH0KIAotc3RhdGljIGludCBpbnRlbF9pbml0X3JpbmdfYnVmZmVyKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYsCi0JCQkJICBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQorc3RhdGlj IGludCBpbnRlbF9pbml0X2VuZ2luZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAorCQkJICAgICBz dHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiB7CiAJc3RydWN0IGludGVsX3JpbmdidWZm ZXIgKnJpbmdidWY7CiAJaW50IHJldDsKIAotCVdBUk5fT04ocmluZy0+YnVmZmVyKTsKKwlXQVJO X09OKGVuZ2luZS0+YnVmZmVyKTsKIAotCXJpbmctPmRldiA9IGRldjsKLQlyaW5nLT5pOTE1ID0g dG9faTkxNShkZXYpOwotCXJpbmctPmZlbmNlX2NvbnRleHQgPSBmZW5jZV9jb250ZXh0X2FsbG9j KDEpOwotCUlOSVRfTElTVF9IRUFEKCZyaW5nLT5hY3RpdmVfbGlzdCk7Ci0JSU5JVF9MSVNUX0hF QUQoJnJpbmctPnJlcXVlc3RfbGlzdCk7Ci0JSU5JVF9MSVNUX0hFQUQoJnJpbmctPmV4ZWNsaXN0 X3F1ZXVlKTsKLQlJTklUX0xJU1RfSEVBRCgmcmluZy0+YnVmZmVycyk7Ci0JaTkxNV9nZW1fYmF0 Y2hfcG9vbF9pbml0KGRldiwgJnJpbmctPmJhdGNoX3Bvb2wpOwotCW1lbXNldChyaW5nLT5zZW1h cGhvcmUuc3luY19zZXFubywgMCwgc2l6ZW9mKHJpbmctPnNlbWFwaG9yZS5zeW5jX3NlcW5vKSk7 CisJZW5naW5lLT5kZXYgPSBkZXY7CisJZW5naW5lLT5pOTE1ID0gdG9faTkxNShkZXYpOworCWVu Z2luZS0+ZmVuY2VfY29udGV4dCA9IGZlbmNlX2NvbnRleHRfYWxsb2MoMSk7CisJSU5JVF9MSVNU X0hFQUQoJmVuZ2luZS0+YWN0aXZlX2xpc3QpOworCUlOSVRfTElTVF9IRUFEKCZlbmdpbmUtPnJl cXVlc3RfbGlzdCk7CisJSU5JVF9MSVNUX0hFQUQoJmVuZ2luZS0+ZXhlY2xpc3RfcXVldWUpOwor CUlOSVRfTElTVF9IRUFEKCZlbmdpbmUtPmJ1ZmZlcnMpOworCWk5MTVfZ2VtX2JhdGNoX3Bvb2xf aW5pdChkZXYsICZlbmdpbmUtPmJhdGNoX3Bvb2wpOworCW1lbXNldChlbmdpbmUtPnNlbWFwaG9y ZS5zeW5jX3NlcW5vLCAwLCBzaXplb2YoZW5naW5lLT5zZW1hcGhvcmUuc3luY19zZXFubykpOwog Ci0JaW50ZWxfZW5naW5lX2luaXRfYnJlYWRjcnVtYnMocmluZyk7CisJaW50ZWxfZW5naW5lX2lu aXRfYnJlYWRjcnVtYnMoZW5naW5lKTsKIAotCXJpbmdidWYgPSBpbnRlbF9lbmdpbmVfY3JlYXRl X3JpbmdidWZmZXIocmluZywgMzIgKiBQQUdFX1NJWkUpOworCXJpbmdidWYgPSBpbnRlbF9lbmdp bmVfY3JlYXRlX3JpbmdidWZmZXIoZW5naW5lLCAzMiAqIFBBR0VfU0laRSk7CiAJaWYgKElTX0VS UihyaW5nYnVmKSkgewogCQlyZXQgPSBQVFJfRVJSKHJpbmdidWYpOwogCQlnb3RvIGVycm9yOwog CX0KLQlyaW5nLT5idWZmZXIgPSByaW5nYnVmOworCWVuZ2luZS0+YnVmZmVyID0gcmluZ2J1ZjsK IAogCWlmIChJOTE1X05FRURfR0ZYX0hXUyhkZXYpKSB7Ci0JCXJldCA9IGluaXRfc3RhdHVzX3Bh Z2UocmluZyk7CisJCXJldCA9IGluaXRfc3RhdHVzX3BhZ2UoZW5naW5lKTsKIAkJaWYgKHJldCkK IAkJCWdvdG8gZXJyb3I7CiAJfSBlbHNlIHsKLQkJQlVHX09OKHJpbmctPmlkICE9IFJDUyk7Ci0J CXJldCA9IGluaXRfcGh5c19zdGF0dXNfcGFnZShyaW5nKTsKKwkJQlVHX09OKGVuZ2luZS0+aWQg IT0gUkNTKTsKKwkJcmV0ID0gaW5pdF9waHlzX3N0YXR1c19wYWdlKGVuZ2luZSk7CiAJCWlmIChy ZXQpCiAJCQlnb3RvIGVycm9yOwogCX0KQEAgLTIwMTYsMTkgKzIwMTYsMTkgQEAgc3RhdGljIGlu dCBpbnRlbF9pbml0X3JpbmdfYnVmZmVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJcmV0ID0g aW50ZWxfcGluX2FuZF9tYXBfcmluZ2J1ZmZlcl9vYmooZGV2LCByaW5nYnVmKTsKIAlpZiAocmV0 KSB7CiAJCURSTV9FUlJPUigiRmFpbGVkIHRvIHBpbiBhbmQgbWFwIHJpbmdidWZmZXIgJXM6ICVk XG4iLAotCQkJCXJpbmctPm5hbWUsIHJldCk7CisJCQkJZW5naW5lLT5uYW1lLCByZXQpOwogCQlp bnRlbF9kZXN0cm95X3JpbmdidWZmZXJfb2JqKHJpbmdidWYpOwogCQlnb3RvIGVycm9yOwogCX0K IAotCXJldCA9IGk5MTVfY21kX3BhcnNlcl9pbml0X3JpbmcocmluZyk7CisJcmV0ID0gaTkxNV9j bWRfcGFyc2VyX2luaXRfcmluZyhlbmdpbmUpOwogCWlmIChyZXQpCiAJCWdvdG8gZXJyb3I7CiAK IAlyZXR1cm4gMDsKIAogZXJyb3I6Ci0JaW50ZWxfY2xlYW51cF9yaW5nX2J1ZmZlcihyaW5nKTsK KwlpbnRlbF9jbGVhbnVwX3JpbmdfYnVmZmVyKGVuZ2luZSk7CiAJcmV0dXJuIHJldDsKIH0KIApA QCAtMjYxMiw3ICsyNjEyLDcgQEAgaW50IGludGVsX2luaXRfcmVuZGVyX3JpbmdfYnVmZmVyKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCXJpbmctPnNjcmF0Y2guZ3R0X29mZnNldCA9IGk5MTVf Z2VtX29ial9nZ3R0X29mZnNldChvYmopOwogCX0KIAotCXJldCA9IGludGVsX2luaXRfcmluZ19i dWZmZXIoZGV2LCByaW5nKTsKKwlyZXQgPSBpbnRlbF9pbml0X2VuZ2luZShkZXYsIHJpbmcpOwog CWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKQEAgLTI2OTIsNyArMjY5Miw3IEBAIGludCBpbnRl bF9pbml0X2JzZF9yaW5nX2J1ZmZlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCX0KIAlyaW5n LT5pbml0X2h3ID0gaW5pdF9yaW5nX2NvbW1vbjsKIAotCXJldHVybiBpbnRlbF9pbml0X3Jpbmdf YnVmZmVyKGRldiwgcmluZyk7CisJcmV0dXJuIGludGVsX2luaXRfZW5naW5lKGRldiwgcmluZyk7 CiB9CiAKIC8qKgpAQCAtMjcyNCw3ICsyNzI0LDcgQEAgaW50IGludGVsX2luaXRfYnNkMl9yaW5n X2J1ZmZlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCX0KIAlyaW5nLT5pbml0X2h3ID0gaW5p dF9yaW5nX2NvbW1vbjsKIAotCXJldHVybiBpbnRlbF9pbml0X3JpbmdfYnVmZmVyKGRldiwgcmlu Zyk7CisJcmV0dXJuIGludGVsX2luaXRfZW5naW5lKGRldiwgcmluZyk7CiB9CiAKIGludCBpbnRl bF9pbml0X2JsdF9yaW5nX2J1ZmZlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQpAQCAtMjc4MCw3 ICsyNzgwLDcgQEAgaW50IGludGVsX2luaXRfYmx0X3JpbmdfYnVmZmVyKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYpCiAJfQogCXJpbmctPmluaXRfaHcgPSBpbml0X3JpbmdfY29tbW9uOwogCi0JcmV0 dXJuIGludGVsX2luaXRfcmluZ19idWZmZXIoZGV2LCByaW5nKTsKKwlyZXR1cm4gaW50ZWxfaW5p dF9lbmdpbmUoZGV2LCByaW5nKTsKIH0KIAogaW50IGludGVsX2luaXRfdmVib3hfcmluZ19idWZm ZXIoc3RydWN0IGRybV9kZXZpY2UgKmRldikKQEAgLTI4MzAsNyArMjgzMCw3IEBAIGludCBpbnRl bF9pbml0X3ZlYm94X3JpbmdfYnVmZmVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJfQogCXJp bmctPmluaXRfaHcgPSBpbml0X3JpbmdfY29tbW9uOwogCi0JcmV0dXJuIGludGVsX2luaXRfcmlu Z19idWZmZXIoZGV2LCByaW5nKTsKKwlyZXR1cm4gaW50ZWxfaW5pdF9lbmdpbmUoZGV2LCByaW5n KTsKIH0KIAogaW50CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5n YnVmZmVyLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKaW5kZXgg YmM2Y2ViNTRiMWYzLi42YmQ5YjM1NmM5NWQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3JpbmdidWZmZXIuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9y aW5nYnVmZmVyLmgKQEAgLTEwMSw3ICsxMDEsNyBAQCBzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciB7 CiAJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iajsKIAl2b2lkICp2aXJ0dWFsX3N0YXJ0 OwogCi0Jc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZzsKKwlzdHJ1Y3QgaW50ZWxfZW5naW5l X2NzICplbmdpbmU7CiAJc3RydWN0IGxpc3RfaGVhZCBsaW5rOwogCiAJdTMyIGhlYWQ7Ci0tIAoy LjcuMC5yYzMKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo dHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==