From: Gerd Hoffmann Subject: [PATCH 1/8] drm/ttm: turn ttm_bo_device.vma_manager into a pointer Date: Thu, 5 Sep 2019 09:05:02 +0200 Message-ID: <20190905070509.22407-2-kraxel@redhat.com> References: <20190905070509.22407-1-kraxel@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190905070509.22407-1-kraxel-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: "David (ChunMing) Zhou" , Thomas Hellstrom , David Airlie , "open list:DRM DRIVER FOR NVIDIA GEFORCE/QUADRO GPUS" , Maarten Lankhorst , open list , "open list:RADEON and AMDGPU DRM DRIVERS" , "open list:DRM DRIVER FOR QXL VIRTUAL GPU" , Maxime Ripard , Huang Rui , VMware Graphics , Gerd Hoffmann , Daniel Vetter , "open list:DRM DRIVER FOR QXL VIRTUAL GPU" , Alex Deucher , Dave Airlie , Sean Paul , =?UTF-8?q?Christian=20K=C3= UmVuYW1lIHRoZSBlbWJlZGRlZCBzdHJ1Y3Qgdm1hX29mZnNldF9tYW5hZ2VyLCBuZXcgbmFtZSBp cyBfdm1hX21hbmFnZXIuCnR0bV9ib19kZXZpY2Uudm1hX21hbmFnZXIgY2hhbmdlZCB0byBhIHBv aW50ZXIuCgpUaGUgdHRtX2JvX2RldmljZV9pbml0KCkgZnVuY3Rpb24gZ2V0cyBhbiBhZGRpdGlv bmFsIHZtYV9tYW5hZ2VyCmFyZ3VtZW50IHdoaWNoIGFsbG93cyB0byBpbml0aWFsaXplIHR0bSB3 aXRoIGEgZGlmZmVyZW50IHZtYSBtYW5hZ2VyLgpXaGVuIHBhc3NpbmcgTlVMTCB0aGUgZW1iZWRk ZWQgX3ZtYV9tYW5hZ2VyIGlzIHVzZWQuCgpBbGwgY2FsbGVycyBhcmUgdXBkYXRlZCB0byBwYXNz IE5VTEwsIHNvIHRoZSBiZWhhdmlvciBkb2Vzbid0IGNoYW5nZS4KClNpZ25lZC1vZmYtYnk6IEdl cmQgSG9mZm1hbm4gPGtyYXhlbEByZWRoYXQuY29tPgotLS0KIGluY2x1ZGUvZHJtL3R0bS90dG1f Ym9fZHJpdmVyLmggICAgICAgICB8ICA4ICsrKysrKy0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2Ft ZGdwdS9hbWRncHVfdHRtLmMgfCAgMSArCiBkcml2ZXJzL2dwdS9kcm0vZHJtX3ZyYW1fbW1faGVs cGVyLmMgICAgfCAgMSArCiBkcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9ub3V2ZWF1X3R0bS5jICAg fCAgMSArCiBkcml2ZXJzL2dwdS9kcm0vcXhsL3F4bF90dG0uYyAgICAgICAgICAgfCAgMSArCiBk cml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl90dG0uYyAgICAgfCAgMSArCiBkcml2ZXJzL2dw dS9kcm0vdHRtL3R0bV9iby5jICAgICAgICAgICAgfCAxMyArKysrKysrKystLS0tCiBkcml2ZXJz L2dwdS9kcm0vdHRtL3R0bV9ib192bS5jICAgICAgICAgfCAgNiArKystLS0KIGRyaXZlcnMvZ3B1 L2RybS92bXdnZngvdm13Z2Z4X2Rydi5jICAgICB8ICAxICsKIDkgZmlsZXMgY2hhbmdlZCwgMjQg aW5zZXJ0aW9ucygrKSwgOSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9pbmNsdWRlL2RybS90 dG0vdHRtX2JvX2RyaXZlci5oIGIvaW5jbHVkZS9kcm0vdHRtL3R0bV9ib19kcml2ZXIuaAppbmRl eCBlODhlMDBjNmNiZjIuLmUzNjU0MzRmOTJiMyAxMDA2NDQKLS0tIGEvaW5jbHVkZS9kcm0vdHRt L3R0bV9ib19kcml2ZXIuaAorKysgYi9pbmNsdWRlL2RybS90dG0vdHRtX2JvX2RyaXZlci5oCkBA IC00NDEsNyArNDQxLDggQEAgZXh0ZXJuIHN0cnVjdCB0dG1fYm9fZ2xvYmFsIHsKICAqCiAgKiBA ZHJpdmVyOiBQb2ludGVyIHRvIGEgc3RydWN0IHR0bV9ib19kcml2ZXIgc3RydWN0IHNldHVwIGJ5 IHRoZSBkcml2ZXIuCiAgKiBAbWFuOiBBbiBhcnJheSBvZiBtZW1fdHlwZV9tYW5hZ2Vycy4KLSAq IEB2bWFfbWFuYWdlcjogQWRkcmVzcyBzcGFjZSBtYW5hZ2VyCisgKiBAdm1hX21hbmFnZXI6IEFk ZHJlc3Mgc3BhY2UgbWFuYWdlciAocG9pbnRlcikKKyAqIEBfdm1hX21hbmFnZXI6IEFkZHJlc3Mg c3BhY2UgbWFuYWdlciAoZW5iZWRkZWQpCiAgKiBscnVfbG9jazogU3BpbmxvY2sgdGhhdCBwcm90 ZWN0cyB0aGUgYnVmZmVyK2RldmljZSBscnUgbGlzdHMgYW5kCiAgKiBkZGVzdHJveSBsaXN0cy4K ICAqIEBkZXZfbWFwcGluZzogQSBwb2ludGVyIHRvIHRoZSBzdHJ1Y3QgYWRkcmVzc19zcGFjZSBy ZXByZXNlbnRpbmcgdGhlCkBAIC00NjQsNyArNDY1LDggQEAgc3RydWN0IHR0bV9ib19kZXZpY2Ug ewogCS8qCiAJICogUHJvdGVjdGVkIGJ5IGludGVybmFsIGxvY2tzLgogCSAqLwotCXN0cnVjdCBk cm1fdm1hX29mZnNldF9tYW5hZ2VyIHZtYV9tYW5hZ2VyOworCXN0cnVjdCBkcm1fdm1hX29mZnNl dF9tYW5hZ2VyICp2bWFfbWFuYWdlcjsKKwlzdHJ1Y3QgZHJtX3ZtYV9vZmZzZXRfbWFuYWdlciBf dm1hX21hbmFnZXI7CiAKIAkvKgogCSAqIFByb3RlY3RlZCBieSB0aGUgZ2xvYmFsOmxydSBsb2Nr LgpAQCAtNTg1LDYgKzU4Nyw3IEBAIGludCB0dG1fYm9fZGV2aWNlX3JlbGVhc2Uoc3RydWN0IHR0 bV9ib19kZXZpY2UgKmJkZXYpOwogICogQGdsb2I6IEEgcG9pbnRlciB0byBhbiBpbml0aWFsaXpl ZCBzdHJ1Y3QgdHRtX2JvX2dsb2JhbC4KICAqIEBkcml2ZXI6IEEgcG9pbnRlciB0byBhIHN0cnVj dCB0dG1fYm9fZHJpdmVyIHNldCB1cCBieSB0aGUgY2FsbGVyLgogICogQG1hcHBpbmc6IFRoZSBh ZGRyZXNzIHNwYWNlIHRvIHVzZSBmb3IgdGhpcyBiby4KKyAqIEB2bWFfbWFuYWdlcjogQSBwb2lu dGVyIHRvIGEgdm1hIG1hbmFnZXIgb3IgTlVMTC4KICAqIEBmaWxlX3BhZ2Vfb2Zmc2V0OiBPZmZz ZXQgaW50byB0aGUgZGV2aWNlIGFkZHJlc3Mgc3BhY2UgdGhhdCBpcyBhdmFpbGFibGUKICAqIGZv ciBidWZmZXIgZGF0YS4gVGhpcyBlbnN1cmVzIGNvbXBhdGliaWxpdHkgd2l0aCBvdGhlciB1c2Vy cyBvZiB0aGUKICAqIGFkZHJlc3Mgc3BhY2UuCkBAIC01OTYsNiArNTk5LDcgQEAgaW50IHR0bV9i b19kZXZpY2VfcmVsZWFzZShzdHJ1Y3QgdHRtX2JvX2RldmljZSAqYmRldik7CiBpbnQgdHRtX2Jv X2RldmljZV9pbml0KHN0cnVjdCB0dG1fYm9fZGV2aWNlICpiZGV2LAogCQkgICAgICAgc3RydWN0 IHR0bV9ib19kcml2ZXIgKmRyaXZlciwKIAkJICAgICAgIHN0cnVjdCBhZGRyZXNzX3NwYWNlICpt YXBwaW5nLAorCQkgICAgICAgc3RydWN0IGRybV92bWFfb2Zmc2V0X21hbmFnZXIgKnZtYV9tYW5h Z2VyLAogCQkgICAgICAgYm9vbCBuZWVkX2RtYTMyKTsKIAogLyoqCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfdHRtLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1k L2FtZGdwdS9hbWRncHVfdHRtLmMKaW5kZXggZmIwOTMxNGJjZmQ0Li4zNGVlNWQ3MjVmYWYgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV90dG0uYworKysgYi9k cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfdHRtLmMKQEAgLTE3MjgsNiArMTcyOCw3 IEBAIGludCBhbWRncHVfdHRtX2luaXQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAJciA9 IHR0bV9ib19kZXZpY2VfaW5pdCgmYWRldi0+bW1hbi5iZGV2LAogCQkJICAgICAgICZhbWRncHVf Ym9fZHJpdmVyLAogCQkJICAgICAgIGFkZXYtPmRkZXYtPmFub25faW5vZGUtPmlfbWFwcGluZywK KwkJCSAgICAgICBOVUxMLAogCQkJICAgICAgIGFkZXYtPm5lZWRfZG1hMzIpOwogCWlmIChyKSB7 CiAJCURSTV9FUlJPUigiZmFpbGVkIGluaXRpYWxpemluZyBidWZmZXIgb2JqZWN0IGRyaXZlcigl ZCkuXG4iLCByKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fdnJhbV9tbV9oZWxw ZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fdnJhbV9tbV9oZWxwZXIuYwppbmRleCBjOTExNzgx ZDY3MjguLjU2ZmQxNTE5ZWIzNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2RybV92cmFt X21tX2hlbHBlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fdnJhbV9tbV9oZWxwZXIuYwpA QCAtMTcyLDYgKzE3Miw3IEBAIGludCBkcm1fdnJhbV9tbV9pbml0KHN0cnVjdCBkcm1fdnJhbV9t bSAqdm1tLCBzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCiAJcmV0ID0gdHRtX2JvX2RldmljZV9p bml0KCZ2bW0tPmJkZXYsICZib19kcml2ZXIsCiAJCQkJIGRldi0+YW5vbl9pbm9kZS0+aV9tYXBw aW5nLAorCQkJCSBOVUxMLAogCQkJCSB0cnVlKTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0Owpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL25vdXZlYXUvbm91dmVhdV90dG0uYyBiL2RyaXZl cnMvZ3B1L2RybS9ub3V2ZWF1L25vdXZlYXVfdHRtLmMKaW5kZXggZjBkYWY5NThlMDNhLi5lNjdl YjEwODQzZDEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1L25vdXZlYXVfdHRt LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL25vdXZlYXUvbm91dmVhdV90dG0uYwpAQCAtMjM2LDYg KzIzNiw3IEBAIG5vdXZlYXVfdHRtX2luaXQoc3RydWN0IG5vdXZlYXVfZHJtICpkcm0pCiAJcmV0 ID0gdHRtX2JvX2RldmljZV9pbml0KCZkcm0tPnR0bS5iZGV2LAogCQkJCSAgJm5vdXZlYXVfYm9f ZHJpdmVyLAogCQkJCSAgZGV2LT5hbm9uX2lub2RlLT5pX21hcHBpbmcsCisJCQkJIE5VTEwsCiAJ CQkJICBkcm0tPmNsaWVudC5tbXUuZG1hYml0cyA8PSAzMiA/IHRydWUgOiBmYWxzZSk7CiAJaWYg KHJldCkgewogCQlOVl9FUlJPUihkcm0sICJlcnJvciBpbml0aWFsaXNpbmcgYm8gZHJpdmVyLCAl ZFxuIiwgcmV0KTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9xeGwvcXhsX3R0bS5jIGIv ZHJpdmVycy9ncHUvZHJtL3F4bC9xeGxfdHRtLmMKaW5kZXggOWIyNDUxNGM3NWFhLi42OWRhMGVl YTZlNGMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9xeGwvcXhsX3R0bS5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9xeGwvcXhsX3R0bS5jCkBAIC0zMjUsNiArMzI1LDcgQEAgaW50IHF4bF90 dG1faW5pdChzdHJ1Y3QgcXhsX2RldmljZSAqcWRldikKIAlyID0gdHRtX2JvX2RldmljZV9pbml0 KCZxZGV2LT5tbWFuLmJkZXYsCiAJCQkgICAgICAgJnF4bF9ib19kcml2ZXIsCiAJCQkgICAgICAg cWRldi0+ZGRldi5hbm9uX2lub2RlLT5pX21hcHBpbmcsCisJCQkgICAgICAgTlVMTCwKIAkJCSAg ICAgICBmYWxzZSk7CiAJaWYgKHIpIHsKIAkJRFJNX0VSUk9SKCJmYWlsZWQgaW5pdGlhbGl6aW5n IGJ1ZmZlciBvYmplY3QgZHJpdmVyKCVkKS5cbiIsIHIpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL3JhZGVvbi9yYWRlb25fdHRtLmMgYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVv bl90dG0uYwppbmRleCAzNWFjNzVhMTFkMzguLmUyYzEyZTU5NzA0ZCAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fdHRtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3Jh ZGVvbi9yYWRlb25fdHRtLmMKQEAgLTc5NCw2ICs3OTQsNyBAQCBpbnQgcmFkZW9uX3R0bV9pbml0 KHN0cnVjdCByYWRlb25fZGV2aWNlICpyZGV2KQogCXIgPSB0dG1fYm9fZGV2aWNlX2luaXQoJnJk ZXYtPm1tYW4uYmRldiwKIAkJCSAgICAgICAmcmFkZW9uX2JvX2RyaXZlciwKIAkJCSAgICAgICBy ZGV2LT5kZGV2LT5hbm9uX2lub2RlLT5pX21hcHBpbmcsCisJCQkgICAgICAgTlVMTCwKIAkJCSAg ICAgICByZGV2LT5uZWVkX2RtYTMyKTsKIAlpZiAocikgewogCQlEUk1fRVJST1IoImZhaWxlZCBp bml0aWFsaXppbmcgYnVmZmVyIG9iamVjdCBkcml2ZXIoJWQpLlxuIiwgcik7CmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vdHRtL3R0bV9iby5jIGIvZHJpdmVycy9ncHUvZHJtL3R0bS90dG1f Ym8uYwppbmRleCA1OGQxZjJiMjgxMzIuLjhkYzI2YmFiYzVjYiAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL3R0bS90dG1fYm8uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vdHRtL3R0bV9iby5j CkBAIC02NzIsNyArNjcyLDcgQEAgc3RhdGljIHZvaWQgdHRtX2JvX3JlbGVhc2Uoc3RydWN0IGty ZWYgKmtyZWYpCiAJc3RydWN0IHR0bV9ib19kZXZpY2UgKmJkZXYgPSBiby0+YmRldjsKIAlzdHJ1 Y3QgdHRtX21lbV90eXBlX21hbmFnZXIgKm1hbiA9ICZiZGV2LT5tYW5bYm8tPm1lbS5tZW1fdHlw ZV07CiAKLQlkcm1fdm1hX29mZnNldF9yZW1vdmUoJmJkZXYtPnZtYV9tYW5hZ2VyLCAmYm8tPmJh c2Uudm1hX25vZGUpOworCWRybV92bWFfb2Zmc2V0X3JlbW92ZShiZGV2LT52bWFfbWFuYWdlciwg JmJvLT5iYXNlLnZtYV9ub2RlKTsKIAl0dG1fbWVtX2lvX2xvY2sobWFuLCBmYWxzZSk7CiAJdHRt X21lbV9pb19mcmVlX3ZtKGJvKTsKIAl0dG1fbWVtX2lvX3VubG9jayhtYW4pOwpAQCAtMTM1Myw3 ICsxMzUzLDcgQEAgaW50IHR0bV9ib19pbml0X3Jlc2VydmVkKHN0cnVjdCB0dG1fYm9fZGV2aWNl ICpiZGV2LAogCSAqLwogCWlmIChiby0+dHlwZSA9PSB0dG1fYm9fdHlwZV9kZXZpY2UgfHwKIAkg ICAgYm8tPnR5cGUgPT0gdHRtX2JvX3R5cGVfc2cpCi0JCXJldCA9IGRybV92bWFfb2Zmc2V0X2Fk ZCgmYmRldi0+dm1hX21hbmFnZXIsICZiby0+YmFzZS52bWFfbm9kZSwKKwkJcmV0ID0gZHJtX3Zt YV9vZmZzZXRfYWRkKGJkZXYtPnZtYV9tYW5hZ2VyLCAmYm8tPmJhc2Uudm1hX25vZGUsCiAJCQkJ CSBiby0+bWVtLm51bV9wYWdlcyk7CiAKIAkvKiBwYXNzZWQgcmVzZXJ2YXRpb24gb2JqZWN0cyBz aG91bGQgYWxyZWFkeSBiZSBsb2NrZWQsCkBAIC0xNzA0LDcgKzE3MDQsNyBAQCBpbnQgdHRtX2Jv X2RldmljZV9yZWxlYXNlKHN0cnVjdCB0dG1fYm9fZGV2aWNlICpiZGV2KQogCQkJcHJfZGVidWco IlN3YXAgbGlzdCAlZCB3YXMgY2xlYW5cbiIsIGkpOwogCXNwaW5fdW5sb2NrKCZnbG9iLT5scnVf bG9jayk7CiAKLQlkcm1fdm1hX29mZnNldF9tYW5hZ2VyX2Rlc3Ryb3koJmJkZXYtPnZtYV9tYW5h Z2VyKTsKKwlkcm1fdm1hX29mZnNldF9tYW5hZ2VyX2Rlc3Ryb3koJmJkZXYtPl92bWFfbWFuYWdl cik7CiAKIAlpZiAoIXJldCkKIAkJdHRtX2JvX2dsb2JhbF9yZWxlYXNlKCk7CkBAIC0xNzE2LDEx ICsxNzE2LDE1IEBAIEVYUE9SVF9TWU1CT0wodHRtX2JvX2RldmljZV9yZWxlYXNlKTsKIGludCB0 dG1fYm9fZGV2aWNlX2luaXQoc3RydWN0IHR0bV9ib19kZXZpY2UgKmJkZXYsCiAJCSAgICAgICBz dHJ1Y3QgdHRtX2JvX2RyaXZlciAqZHJpdmVyLAogCQkgICAgICAgc3RydWN0IGFkZHJlc3Nfc3Bh Y2UgKm1hcHBpbmcsCisJCSAgICAgICBzdHJ1Y3QgZHJtX3ZtYV9vZmZzZXRfbWFuYWdlciAqdm1h X21hbmFnZXIsCiAJCSAgICAgICBib29sIG5lZWRfZG1hMzIpCiB7CiAJc3RydWN0IHR0bV9ib19n bG9iYWwgKmdsb2IgPSAmdHRtX2JvX2dsb2I7CiAJaW50IHJldDsKIAorCWlmICghdm1hX21hbmFn ZXIpCisJCXZtYV9tYW5hZ2VyID0gJmJkZXYtPl92bWFfbWFuYWdlcjsKKwogCXJldCA9IHR0bV9i b19nbG9iYWxfaW5pdCgpOwogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CkBAIC0xNzM3LDcgKzE3 NDEsOCBAQCBpbnQgdHRtX2JvX2RldmljZV9pbml0KHN0cnVjdCB0dG1fYm9fZGV2aWNlICpiZGV2 LAogCWlmICh1bmxpa2VseShyZXQgIT0gMCkpCiAJCWdvdG8gb3V0X25vX3N5czsKIAotCWRybV92 bWFfb2Zmc2V0X21hbmFnZXJfaW5pdCgmYmRldi0+dm1hX21hbmFnZXIsCisJYmRldi0+dm1hX21h bmFnZXIgPSB2bWFfbWFuYWdlcjsKKwlkcm1fdm1hX29mZnNldF9tYW5hZ2VyX2luaXQoJmJkZXYt Pl92bWFfbWFuYWdlciwKIAkJCQkgICAgRFJNX0ZJTEVfUEFHRV9PRkZTRVRfU1RBUlQsCiAJCQkJ ICAgIERSTV9GSUxFX1BBR0VfT0ZGU0VUX1NJWkUpOwogCUlOSVRfREVMQVlFRF9XT1JLKCZiZGV2 LT53cSwgdHRtX2JvX2RlbGF5ZWRfd29ya3F1ZXVlKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS90dG0vdHRtX2JvX3ZtLmMgYi9kcml2ZXJzL2dwdS9kcm0vdHRtL3R0bV9ib192bS5jCmlu ZGV4IDc2ZWVkYjk2MzY5My4uNGFhMDA3ZWRmZmIwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vdHRtL3R0bV9ib192bS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS90dG0vdHRtX2JvX3ZtLmMK QEAgLTQwOSwxNiArNDA5LDE2IEBAIHN0YXRpYyBzdHJ1Y3QgdHRtX2J1ZmZlcl9vYmplY3QgKnR0 bV9ib192bV9sb29rdXAoc3RydWN0IHR0bV9ib19kZXZpY2UgKmJkZXYsCiAJc3RydWN0IGRybV92 bWFfb2Zmc2V0X25vZGUgKm5vZGU7CiAJc3RydWN0IHR0bV9idWZmZXJfb2JqZWN0ICpibyA9IE5V TEw7CiAKLQlkcm1fdm1hX29mZnNldF9sb2NrX2xvb2t1cCgmYmRldi0+dm1hX21hbmFnZXIpOwor CWRybV92bWFfb2Zmc2V0X2xvY2tfbG9va3VwKGJkZXYtPnZtYV9tYW5hZ2VyKTsKIAotCW5vZGUg PSBkcm1fdm1hX29mZnNldF9sb29rdXBfbG9ja2VkKCZiZGV2LT52bWFfbWFuYWdlciwgb2Zmc2V0 LCBwYWdlcyk7CisJbm9kZSA9IGRybV92bWFfb2Zmc2V0X2xvb2t1cF9sb2NrZWQoYmRldi0+dm1h X21hbmFnZXIsIG9mZnNldCwgcGFnZXMpOwogCWlmIChsaWtlbHkobm9kZSkpIHsKIAkJYm8gPSBj b250YWluZXJfb2Yobm9kZSwgc3RydWN0IHR0bV9idWZmZXJfb2JqZWN0LAogCQkJCSAgYmFzZS52 bWFfbm9kZSk7CiAJCWJvID0gdHRtX2JvX2dldF91bmxlc3NfemVybyhibyk7CiAJfQogCi0JZHJt X3ZtYV9vZmZzZXRfdW5sb2NrX2xvb2t1cCgmYmRldi0+dm1hX21hbmFnZXIpOworCWRybV92bWFf b2Zmc2V0X3VubG9ja19sb29rdXAoYmRldi0+dm1hX21hbmFnZXIpOwogCiAJaWYgKCFibykKIAkJ cHJfZXJyKCJDb3VsZCBub3QgZmluZCBidWZmZXIgb2JqZWN0IHRvIG1hcFxuIik7CmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9kcnYuYyBiL2RyaXZlcnMvZ3B1L2Ry bS92bXdnZngvdm13Z2Z4X2Rydi5jCmluZGV4IGNkMGQ0OWQ4YThkYS4uMjBiYzkxMjE0ZTc1IDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9kcnYuYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9kcnYuYwpAQCAtODMwLDYgKzgzMCw3IEBAIHN0YXRp YyBpbnQgdm13X2RyaXZlcl9sb2FkKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHVuc2lnbmVkIGxv bmcgY2hpcHNldCkKIAlyZXQgPSB0dG1fYm9fZGV2aWNlX2luaXQoJmRldl9wcml2LT5iZGV2LAog CQkJCSAmdm13X2JvX2RyaXZlciwKIAkJCQkgZGV2LT5hbm9uX2lub2RlLT5pX21hcHBpbmcsCisJ CQkJIE5VTEwsCiAJCQkJIGZhbHNlKTsKIAlpZiAodW5saWtlbHkocmV0ICE9IDApKSB7CiAJCURS TV9FUlJPUigiRmFpbGVkIGluaXRpYWxpemluZyBUVE0gYnVmZmVyIG9iamVjdCBkcml2ZXIuXG4i KTsKLS0gCjIuMTguMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KYW1kLWdmeCBtYWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4