From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH 05/23] drm/i915: Complete sw/hw split Date: Fri, 20 Sep 2019 13:42:17 +0200 Message-ID: <20190920114235.22411-5-maarten.lankhorst@linux.intel.com> References: <20190920114235.22411-1-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mblankhorst.nl (mblankhorst.nl [IPv6:2a02:2308::216:3eff:fe92:dfa3]) by gabe.freedesktop.org (Postfix) with ESMTPS id D17A36FC9A for ; Fri, 20 Sep 2019 11:42:40 +0000 (UTC) In-Reply-To: <20190920114235.22411-1-maarten.lankhorst@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 Tm93IHRoYXQgd2Ugc2VwYXJhdGVkIGV2ZXJ5dGhpbmcgaW50byB1YXBpIGFuZCBodywgaXQncwp0 aW1lIHRvIG1ha2UgdGhlIHNwbGl0IGRlZmluaXRpdmUuIFJlbW92ZSB0aGUgdW5pb24gYW5kCm1h a2UgYSBjb3B5IG9mIHRoZSBodyBzdGF0ZSBvbiBtb2Rlc2V0IGFuZCBmYXN0c2V0LgoKQ29sb3Ig YmxvYnMgYXJlIGNvcGllZCBpbiBjcnRjIGF0b21pY19jaGVjaygpLCByaWdodApiZWZvcmUgY29s b3IgbWFuYWdlbWVudCBpcyBjaGVja2VkLgoKU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9y c3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9kaXNwbGF5L2ludGVsX2F0b21pYy5jICAgfCA0NCArKysrKysrKysrKysrKysrKysr CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2F0b21pYy5oICAgfCAgMiArCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rpc3BsYXkuYyAgfCAzOSArKysrKysr KysrKysrLS0tCiAuLi4vZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5X3R5cGVzLmggICAg fCAgOCArKy0tCiA0IGZpbGVzIGNoYW5nZWQsIDg1IGluc2VydGlvbnMoKyksIDggZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9hdG9t aWMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfYXRvbWljLmMKaW5kZXgg ZjQ0NDBlZGU5NWM1Li5mYjU1MGQzY2VhN2YgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2Rpc3BsYXkvaW50ZWxfYXRvbWljLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlz cGxheS9pbnRlbF9hdG9taWMuYwpAQCAtMTk1LDYgKzE5NSwxNCBAQCBpbnRlbF9jcnRjX2R1cGxp Y2F0ZV9zdGF0ZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAKIAlfX2RybV9hdG9taWNfaGVscGVy X2NydGNfZHVwbGljYXRlX3N0YXRlKGNydGMsICZjcnRjX3N0YXRlLT51YXBpKTsKIAorCS8qIGNv cHkgY29sb3IgYmxvYnMgKi8KKwlpZiAoY3J0Y19zdGF0ZS0+aHcuZGVnYW1tYV9sdXQpCisJCWRy bV9wcm9wZXJ0eV9ibG9iX2dldChjcnRjX3N0YXRlLT5ody5kZWdhbW1hX2x1dCk7CisJaWYgKGNy dGNfc3RhdGUtPmh3LmN0bSkKKwkJZHJtX3Byb3BlcnR5X2Jsb2JfZ2V0KGNydGNfc3RhdGUtPmh3 LmN0bSk7CisJaWYgKGNydGNfc3RhdGUtPmh3LmdhbW1hX2x1dCkKKwkJZHJtX3Byb3BlcnR5X2Js b2JfZ2V0KGNydGNfc3RhdGUtPmh3LmdhbW1hX2x1dCk7CisKIAljcnRjX3N0YXRlLT51cGRhdGVf cGlwZSA9IGZhbHNlOwogCWNydGNfc3RhdGUtPmRpc2FibGVfbHBfd20gPSBmYWxzZTsKIAljcnRj X3N0YXRlLT5kaXNhYmxlX2N4c3IgPSBmYWxzZTsKQEAgLTIwOSw2ICsyMTcsNDEgQEAgaW50ZWxf Y3J0Y19kdXBsaWNhdGVfc3RhdGUoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCXJldHVybiAmY3J0 Y19zdGF0ZS0+dWFwaTsKIH0KIAorc3RhdGljIHZvaWQgaW50ZWxfY3J0Y19wdXRfY29sb3JfYmxv YnMoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCit7CisJZHJtX3Byb3BlcnR5 X2Jsb2JfcHV0KGNydGNfc3RhdGUtPmh3LmRlZ2FtbWFfbHV0KTsKKwlkcm1fcHJvcGVydHlfYmxv Yl9wdXQoY3J0Y19zdGF0ZS0+aHcuZ2FtbWFfbHV0KTsKKwlkcm1fcHJvcGVydHlfYmxvYl9wdXQo Y3J0Y19zdGF0ZS0+aHcuY3RtKTsKK30KKwordm9pZCBpbnRlbF9jcnRjX2ZyZWVfaHdfc3RhdGUo c3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCit7CisJaW50ZWxfY3J0Y19wdXRf Y29sb3JfYmxvYnMoY3J0Y19zdGF0ZSk7Cit9CisKK3ZvaWQgaW50ZWxfY3J0Y19jb3B5X2NvbG9y X2Jsb2JzKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKQoreworCWludGVsX2Ny dGNfcHV0X2NvbG9yX2Jsb2JzKGNydGNfc3RhdGUpOworCisJaWYgKGNydGNfc3RhdGUtPnVhcGku ZGVnYW1tYV9sdXQpCisJCWNydGNfc3RhdGUtPmh3LmRlZ2FtbWFfbHV0ID0KKwkJCWRybV9wcm9w ZXJ0eV9ibG9iX2dldChjcnRjX3N0YXRlLT51YXBpLmRlZ2FtbWFfbHV0KTsKKwllbHNlCisJCWNy dGNfc3RhdGUtPmh3LmRlZ2FtbWFfbHV0ID0gTlVMTDsKKworCWlmIChjcnRjX3N0YXRlLT51YXBp LmdhbW1hX2x1dCkKKwkJY3J0Y19zdGF0ZS0+aHcuZ2FtbWFfbHV0ID0KKwkJCWRybV9wcm9wZXJ0 eV9ibG9iX2dldChjcnRjX3N0YXRlLT51YXBpLmdhbW1hX2x1dCk7CisJZWxzZQorCQljcnRjX3N0 YXRlLT5ody5nYW1tYV9sdXQgPSBOVUxMOworCisJaWYgKGNydGNfc3RhdGUtPnVhcGkuY3RtKQor CQljcnRjX3N0YXRlLT5ody5jdG0gPQorCQkJZHJtX3Byb3BlcnR5X2Jsb2JfZ2V0KGNydGNfc3Rh dGUtPnVhcGkuY3RtKTsKKwllbHNlCisJCWNydGNfc3RhdGUtPmh3LmN0bSA9IE5VTEw7Cit9CisK IC8qKgogICogaW50ZWxfY3J0Y19kZXN0cm95X3N0YXRlIC0gZGVzdHJveSBjcnRjIHN0YXRlCiAg KiBAY3J0YzogZHJtIGNydGMKQEAgLTIyNCw2ICsyNjcsNyBAQCBpbnRlbF9jcnRjX2Rlc3Ryb3lf c3RhdGUoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpj cnRjX3N0YXRlID0gdG9faW50ZWxfY3J0Y19zdGF0ZShzdGF0ZSk7CiAKIAlfX2RybV9hdG9taWNf aGVscGVyX2NydGNfZGVzdHJveV9zdGF0ZSgmY3J0Y19zdGF0ZS0+dWFwaSk7CisJaW50ZWxfY3J0 Y19mcmVlX2h3X3N0YXRlKGNydGNfc3RhdGUpOwogCWtmcmVlKGNydGNfc3RhdGUpOwogfQogCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2F0b21pYy5oIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9hdG9taWMuaAppbmRleCA1ODA2NWQz MTYxYTMuLjQyYmU5MWUwNzcyYSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlz cGxheS9pbnRlbF9hdG9taWMuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2lu dGVsX2F0b21pYy5oCkBAIC0zNSw2ICszNSw4IEBAIGludGVsX2RpZ2l0YWxfY29ubmVjdG9yX2R1 cGxpY2F0ZV9zdGF0ZShzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yKTsKIHN0cnVjdCBk cm1fY3J0Y19zdGF0ZSAqaW50ZWxfY3J0Y19kdXBsaWNhdGVfc3RhdGUoc3RydWN0IGRybV9jcnRj ICpjcnRjKTsKIHZvaWQgaW50ZWxfY3J0Y19kZXN0cm95X3N0YXRlKHN0cnVjdCBkcm1fY3J0YyAq Y3J0YywKIAkJCSAgICAgICBzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKnN0YXRlKTsKK3ZvaWQgaW50 ZWxfY3J0Y19mcmVlX2h3X3N0YXRlKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRl KTsKK3ZvaWQgaW50ZWxfY3J0Y19jb3B5X2NvbG9yX2Jsb2JzKHN0cnVjdCBpbnRlbF9jcnRjX3N0 YXRlICpjcnRjX3N0YXRlKTsKIHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICppbnRlbF9hdG9taWNf c3RhdGVfYWxsb2Moc3RydWN0IGRybV9kZXZpY2UgKmRldik7CiB2b2lkIGludGVsX2F0b21pY19z dGF0ZV9jbGVhcihzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpOwogCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheS5jCmluZGV4IDMyYmJiNWJmNDhmMy4u ZTQwNDg1YTFlNTAzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2lu dGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rp c3BsYXkuYwpAQCAtMTE0LDYgKzExNCw3IEBAIHN0YXRpYyBjb25zdCB1NjQgY3Vyc29yX2Zvcm1h dF9tb2RpZmllcnNbXSA9IHsKIAlEUk1fRk9STUFUX01PRF9JTlZBTElECiB9OwogCitzdGF0aWMg dm9pZCBjb3B5X3VhcGlfdG9faHdfc3RhdGUoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNf c3RhdGUpOwogc3RhdGljIHZvaWQgaTl4eF9jcnRjX2Nsb2NrX2dldChzdHJ1Y3QgaW50ZWxfY3J0 YyAqY3J0YywKIAkJCQlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9jb25maWcpOwogc3Rh dGljIHZvaWQgaXJvbmxha2VfcGNoX2Nsb2NrX2dldChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywK QEAgLTcwOTcsNiArNzA5OCw3IEBAIHN0YXRpYyB2b2lkIGludGVsX2NydGNfZGlzYWJsZV9ub2F0 b21pYyhzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJY3J0Yy0+ZW5hYmxlZCA9IGZhbHNlOwogCWNy dGMtPnN0YXRlLT5jb25uZWN0b3JfbWFzayA9IDA7CiAJY3J0Yy0+c3RhdGUtPmVuY29kZXJfbWFz ayA9IDA7CisJY29weV91YXBpX3RvX2h3X3N0YXRlKHRvX2ludGVsX2NydGNfc3RhdGUoY3J0Yy0+ c3RhdGUpKTsKIAogCWZvcl9lYWNoX2VuY29kZXJfb25fY3J0YyhjcnRjLT5kZXYsIGNydGMsIGVu Y29kZXIpCiAJCWVuY29kZXItPmJhc2UuY3J0YyA9IE5VTEw7CkBAIC0xMTgwNCw2ICsxMTgwNiw5 IEBAIHN0YXRpYyBpbnQgaW50ZWxfY3J0Y19hdG9taWNfY2hlY2soc3RydWN0IGRybV9jcnRjICpf Y3J0YywKIAogCWlmIChtb2RlX2NoYW5nZWQgfHwgY3J0Y19zdGF0ZS0+dXBkYXRlX3BpcGUgfHwK IAkgICAgY3J0Y19zdGF0ZS0+dWFwaS5jb2xvcl9tZ210X2NoYW5nZWQpIHsKKwkJLyogQ29weSBj b2xvciBibG9icyB0byBodyBzdGF0ZSAqLworCQlpbnRlbF9jcnRjX2NvcHlfY29sb3JfYmxvYnMo Y3J0Y19zdGF0ZSk7CisKIAkJcmV0ID0gaW50ZWxfY29sb3JfY2hlY2soY3J0Y19zdGF0ZSk7CiAJ CWlmIChyZXQpCiAJCQlyZXR1cm4gcmV0OwpAQCAtMTIyNTEsNiArMTIyNTYsMjIgQEAgc3RhdGlj IGJvb2wgY2hlY2tfZGlnaXRhbF9wb3J0X2NvbmZsaWN0cyhzdHJ1Y3QgaW50ZWxfYXRvbWljX3N0 YXRlICpzdGF0ZSkKIAlyZXR1cm4gcmV0OwogfQogCitzdGF0aWMgdm9pZCBjb3B5X3VhcGlfdG9f aHdfc3RhdGUoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCit7CisJY3J0Y19z dGF0ZS0+aHcuZW5hYmxlID0gY3J0Y19zdGF0ZS0+dWFwaS5lbmFibGU7CisJY3J0Y19zdGF0ZS0+ aHcuYWN0aXZlID0gY3J0Y19zdGF0ZS0+dWFwaS5hY3RpdmU7CisJY3J0Y19zdGF0ZS0+aHcubW9k ZSA9IGNydGNfc3RhdGUtPnVhcGkubW9kZTsKKwljcnRjX3N0YXRlLT5ody5hZGp1c3RlZF9tb2Rl ID0gY3J0Y19zdGF0ZS0+dWFwaS5hZGp1c3RlZF9tb2RlOworfQorCitzdGF0aWMgdm9pZCBjb3B5 X2h3X3RvX3VhcGlfc3RhdGUoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCit7 CisJY3J0Y19zdGF0ZS0+dWFwaS5lbmFibGUgPSBjcnRjX3N0YXRlLT5ody5lbmFibGU7CisJY3J0 Y19zdGF0ZS0+dWFwaS5hY3RpdmUgPSBjcnRjX3N0YXRlLT5ody5hY3RpdmU7CisJY3J0Y19zdGF0 ZS0+dWFwaS5tb2RlID0gY3J0Y19zdGF0ZS0+aHcubW9kZTsKKwljcnRjX3N0YXRlLT51YXBpLmFk anVzdGVkX21vZGUgPSBjcnRjX3N0YXRlLT5ody5hZGp1c3RlZF9tb2RlOworfQorCiBzdGF0aWMg aW50CiBjbGVhcl9pbnRlbF9jcnRjX3N0YXRlKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRj X3N0YXRlKQogewpAQCAtMTIyNjcsNiArMTIyODgsNyBAQCBjbGVhcl9pbnRlbF9jcnRjX3N0YXRl KHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKQogCSAqIGZpeGVkLCBzbyB0aGF0 IHRoZSBjcnRjX3N0YXRlIGNhbiBiZSBzYWZlbHkgZHVwbGljYXRlZC4gRm9yIG5vdywKIAkgKiBv bmx5IGZpZWxkcyB0aGF0IGFyZSBrbm93IHRvIG5vdCBjYXVzZSBwcm9ibGVtcyBhcmUgcHJlc2Vy dmVkLiAqLwogCisJc2F2ZWRfc3RhdGUtPnVhcGkgPSBjcnRjX3N0YXRlLT51YXBpOwogCXNhdmVk X3N0YXRlLT5zY2FsZXJfc3RhdGUgPSBjcnRjX3N0YXRlLT5zY2FsZXJfc3RhdGU7CiAJc2F2ZWRf c3RhdGUtPnNoYXJlZF9kcGxsID0gY3J0Y19zdGF0ZS0+c2hhcmVkX2RwbGw7CiAJc2F2ZWRfc3Rh dGUtPmRwbGxfaHdfc3RhdGUgPSBjcnRjX3N0YXRlLT5kcGxsX2h3X3N0YXRlOwpAQCAtMTIyNzcs MTEgKzEyMjk5LDkgQEAgY2xlYXJfaW50ZWxfY3J0Y19zdGF0ZShzdHJ1Y3QgaW50ZWxfY3J0Y19z dGF0ZSAqY3J0Y19zdGF0ZSkKIAkgICAgSVNfVkFMTEVZVklFVyhkZXZfcHJpdikgfHwgSVNfQ0hF UlJZVklFVyhkZXZfcHJpdikpCiAJCXNhdmVkX3N0YXRlLT53bSA9IGNydGNfc3RhdGUtPndtOwog Ci0JLyogS2VlcCBiYXNlIGRybV9jcnRjX3N0YXRlIGludGFjdCwgb25seSBjbGVhciBvdXIgZXh0 ZW5kZWQgc3RydWN0ICovCi0JQlVJTERfQlVHX09OKG9mZnNldG9mKHN0cnVjdCBpbnRlbF9jcnRj X3N0YXRlLCB1YXBpKSk7Ci0JQlVJTERfQlVHX09OKG9mZnNldG9mKHN0cnVjdCBpbnRlbF9jcnRj X3N0YXRlLCBodykpOwotCW1lbWNweSgmY3J0Y19zdGF0ZS0+dWFwaSArIDEsICZzYXZlZF9zdGF0 ZS0+dWFwaSArIDEsCi0JICAgICAgIHNpemVvZigqY3J0Y19zdGF0ZSkgLSBzaXplb2YoY3J0Y19z dGF0ZS0+dWFwaSkpOworCWludGVsX2NydGNfZnJlZV9od19zdGF0ZShjcnRjX3N0YXRlKTsKKwlt ZW1jcHkoY3J0Y19zdGF0ZSwgc2F2ZWRfc3RhdGUsIHNpemVvZigqY3J0Y19zdGF0ZSkpOworCWNv cHlfdWFwaV90b19od19zdGF0ZShjcnRjX3N0YXRlKTsKIAogCWtmcmVlKHNhdmVkX3N0YXRlKTsK IAlyZXR1cm4gMDsKQEAgLTEyNDIxLDYgKzEyNDQxLDkgQEAgaW50ZWxfbW9kZXNldF9waXBlX2Nv bmZpZyhzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9jb25maWcpCiAJRFJNX0RFQlVHX0tN UygiaHcgbWF4IGJwcDogJWksIHBpcGUgYnBwOiAlaSwgZGl0aGVyaW5nOiAlaVxuIiwKIAkJICAg ICAgYmFzZV9icHAsIHBpcGVfY29uZmlnLT5waXBlX2JwcCwgcGlwZV9jb25maWctPmRpdGhlcik7 CiAKKwkvKiB1YXBpIHdhbnRzIGEgY29weSBvZiB0aGUgYWRqdXN0ZWRfbW9kZSBmb3IgdmJsYW5r IGJvb2trZWVwaW5nICovCisJcGlwZV9jb25maWctPnVhcGkuYWRqdXN0ZWRfbW9kZSA9IHBpcGVf Y29uZmlnLT5ody5hZGp1c3RlZF9tb2RlOworCiAJcmV0dXJuIDA7CiB9CiAKQEAgLTEzMTQyLDYg KzEzMTY1LDggQEAgdmVyaWZ5X2NydGNfc3RhdGUoc3RydWN0IGludGVsX2NydGMgKmNydGMsCiAK IAlzdGF0ZSA9IG9sZF9jcnRjX3N0YXRlLT51YXBpLnN0YXRlOwogCV9fZHJtX2F0b21pY19oZWxw ZXJfY3J0Y19kZXN0cm95X3N0YXRlKCZvbGRfY3J0Y19zdGF0ZS0+dWFwaSk7CisJaW50ZWxfY3J0 Y19mcmVlX2h3X3N0YXRlKG9sZF9jcnRjX3N0YXRlKTsKKwogCXBpcGVfY29uZmlnID0gb2xkX2Ny dGNfc3RhdGU7CiAJbWVtc2V0KHBpcGVfY29uZmlnLCAwLCBzaXplb2YoKnBpcGVfY29uZmlnKSk7 CiAJcGlwZV9jb25maWctPnVhcGkuY3J0YyA9ICZjcnRjLT5iYXNlOwpAQCAtMTM1NjgsNiArMTM1 OTMsNyBAQCBzdGF0aWMgaW50IGludGVsX2F0b21pY19jaGVjayhzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2LAogCiAJCWlmICghbmV3X2NydGNfc3RhdGUtPnVhcGkuZW5hYmxlKSB7CiAJCQlhbnlfbXMg PSB0cnVlOworCQkJY2xlYXJfaW50ZWxfY3J0Y19zdGF0ZShuZXdfY3J0Y19zdGF0ZSk7CiAJCQlj b250aW51ZTsKIAkJfQogCkBAIC0xNjY4Niw2ICsxNjcxMiw3IEBAIHN0YXRpYyB2b2lkIGludGVs X21vZGVzZXRfcmVhZG91dF9od19zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQkJdG9f aW50ZWxfY3J0Y19zdGF0ZShjcnRjLT5iYXNlLnN0YXRlKTsKIAogCQlfX2RybV9hdG9taWNfaGVs cGVyX2NydGNfZGVzdHJveV9zdGF0ZSgmY3J0Y19zdGF0ZS0+dWFwaSk7CisJCWludGVsX2NydGNf ZnJlZV9od19zdGF0ZShjcnRjX3N0YXRlKTsKIAkJbWVtc2V0KGNydGNfc3RhdGUsIDAsIHNpemVv ZigqY3J0Y19zdGF0ZSkpOwogCQlfX2RybV9hdG9taWNfaGVscGVyX2NydGNfcmVzZXQoJmNydGMt PmJhc2UsICZjcnRjX3N0YXRlLT51YXBpKTsKIApAQCAtMTY4MDIsNiArMTY4MjksNyBAQCBzdGF0 aWMgdm9pZCBpbnRlbF9tb2Rlc2V0X3JlYWRvdXRfaHdfc3RhdGUoc3RydWN0IGRybV9kZXZpY2Ug KmRldikKIAkJCWNydGMtPmJhc2UubW9kZS52ZGlzcGxheSA9IGNydGNfc3RhdGUtPnBpcGVfc3Jj X2g7CiAJCQlpbnRlbF9tb2RlX2Zyb21fcGlwZV9jb25maWcoJmNydGNfc3RhdGUtPmh3LmFkanVz dGVkX21vZGUsCiAJCQkJCQkgICAgY3J0Y19zdGF0ZSk7CisJCQljcnRjX3N0YXRlLT5ody5tb2Rl ID0gY3J0Yy0+YmFzZS5tb2RlOwogCQkJV0FSTl9PTihkcm1fYXRvbWljX3NldF9tb2RlX2Zvcl9j cnRjKGNydGMtPmJhc2Uuc3RhdGUsICZjcnRjLT5iYXNlLm1vZGUpKTsKIAogCQkJLyoKQEAgLTE2 ODQ3LDYgKzE2ODc1LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfbW9kZXNldF9yZWFkb3V0X2h3X3N0 YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAKIAkJaW50ZWxfYndfY3J0Y191cGRhdGUoYndf c3RhdGUsIGNydGNfc3RhdGUpOwogCisJCWNvcHlfaHdfdG9fdWFwaV9zdGF0ZShjcnRjX3N0YXRl KTsKIAkJaW50ZWxfcGlwZV9jb25maWdfc2FuaXR5X2NoZWNrKGRldl9wcml2LCBjcnRjX3N0YXRl KTsKIAl9CiB9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVs X2Rpc3BsYXlfdHlwZXMuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlz cGxheV90eXBlcy5oCmluZGV4IDJjMzU2NzA4MWUxNi4uZTgxYjc4NWNjOGYyIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rpc3BsYXlfdHlwZXMuaAorKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rpc3BsYXlfdHlwZXMuaApAQCAt NzQ5LDcgKzc0OSw2IEBAIGVudW0gaW50ZWxfb3V0cHV0X2Zvcm1hdCB7CiB9OwogCiBzdHJ1Y3Qg aW50ZWxfY3J0Y19zdGF0ZSB7Ci0JdW5pb24gewogCS8qCiAJICogdWFwaSAoZHJtKSBzdGF0ZS4g VGhpcyBpcyB0aGUgc29mdHdhcmUgc3RhdGUgc2hvd24gdG8gdXNlcnNwYWNlLgogCSAqIEluIHBh cnRpY3VsYXIsIHRoZSBmb2xsb3dpbmcgbWVtYmVycyBhcmUgdXNlZCBmb3IgYm9va2tlZXBpbmc6 CkBAIC03NzIsOCArNzcxLDExIEBAIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlIHsKIAkgKgogCSAq IER1cmluZyBpbml0aWFsIGh3IHJlYWRvdXQsIHRoZXkgbmVlZCB0byBiZSBjb3BpZWQgdG8gdWFw aS4KIAkgKi8KLQlzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgaHc7Ci0JfTsKKwlzdHJ1Y3QgeworCQli b29sIGFjdGl2ZSwgZW5hYmxlOworCQlzdHJ1Y3QgZHJtX3Byb3BlcnR5X2Jsb2IgKmRlZ2FtbWFf bHV0LCAqZ2FtbWFfbHV0LCAqY3RtOworCQlzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSBtb2RlLCBh ZGp1c3RlZF9tb2RlOworCX0gaHc7CiAKIAkvKioKIAkgKiBxdWlya3MgLSBiaXRmaWVsZCB3aXRo IGh3IHN0YXRlIHJlYWRvdXQgcXVpcmtzCi0tIAoyLjIwLjEKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeA==