From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH 2/2] drm/i915: Use new i915_gem_object_pin_map for LRC Date: Tue, 12 Apr 2016 15:40:42 +0100 Message-ID: <1460472042-1998-2-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1460472042-1998-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 mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 48D446E394 for ; Tue, 12 Apr 2016 14:40:49 +0000 (UTC) In-Reply-To: <1460472042-1998-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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCldlIGNhbiB1 c2UgdGhlIG5ldyBwaW4vbGF6eSB1bnBpbiBBUEkgZm9yIHNpbXBsaWNpdHkKYW5kIG1vcmUgcGVy Zm9ybWFuY2UgaW4gdGhlIGV4ZWNsaXN0IHN1Ym1pc3Npb24gcGF0aHMuCgp2MjoKICAqIEZpeCBl cnJvciBoYW5kbGluZyBhbmQgY29udmVydCBtb3JlIHVzZXJzLgogICogQ29tcGFjdCBzb21lIG5h bWVzIGZvciByZWFkYWJpbGl0eS4KCnYzOgogICogaW50ZWxfbHJfY29udGV4dF9mcmVlIHdhcyBu b3QgdW5waW5uaW5nLgogICogU3BlY2lhbCBjYXNlIGZvciBHUFUgcmVzZXQgd2hpY2ggb3RoZXJ3 aXNlIHVuYmFsYW5jZXMKICAgIHRoZSBIV1Mgb2JqZWN0IHBhZ2VzIHBpbiBjb3VudCBieSBydW5u aW5nIHRoZSBlbmdpbmUKICAgIGluaXRpYWxpemF0aW9uIG9ubHkgKG5vdCBkZXN0cnVjdG9ycyku Cgp2NDoKICAqIFJlYmFzZWQgb24gdG9wIG9mIGh3cyBzZXR1cC9pbml0IHNwbGl0LgoKU2lnbmVk LW9mZi1ieTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KQ2M6IENo cmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgotLS0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYyB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9scmMuYyAgICAgICAgfCA4MiArKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5oICAgICAgICB8ICA3ICsrLQogMyBmaWxl cyBjaGFuZ2VkLCA1MiBpbnNlcnRpb25zKCspLCAzOSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMKaW5kZXggZmU1ODBjYjk1MDFhLi45MTAyOGQ5YzYy NjkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMKQEAgLTM0Miw3ICsz NDIsNyBAQCB2b2lkIGk5MTVfZ2VtX2NvbnRleHRfcmVzZXQoc3RydWN0IGRybV9kZXZpY2UgKmRl dikKIAkJc3RydWN0IGludGVsX2NvbnRleHQgKmN0eDsKIAogCQlsaXN0X2Zvcl9lYWNoX2VudHJ5 KGN0eCwgJmRldl9wcml2LT5jb250ZXh0X2xpc3QsIGxpbmspCi0JCQlpbnRlbF9scl9jb250ZXh0 X3Jlc2V0KGRldiwgY3R4KTsKKwkJCWludGVsX2xyX2NvbnRleHRfcmVzZXQoZGV2X3ByaXYsIGN0 eCk7CiAJfQogCiAJZm9yIChpID0gMDsgaSA8IEk5MTVfTlVNX0VOR0lORVM7IGkrKykgewpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9scmMuYwppbmRleCAzZmQyYWU2Y2U4ZTcuLmI2MWY4ZGE1ZDZmMyAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKQEAgLTEwOTEsOCArMTA5MSw4IEBAIHN0YXRpYyBpbnQg aW50ZWxfbHJfY29udGV4dF9kb19waW4oc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCwKIAlzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCXN0cnVj dCBkcm1faTkxNV9nZW1fb2JqZWN0ICpjdHhfb2JqID0gY3R4LT5lbmdpbmVbZW5naW5lLT5pZF0u c3RhdGU7CiAJc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYgPSBjdHgtPmVuZ2luZVtl bmdpbmUtPmlkXS5yaW5nYnVmOwotCXN0cnVjdCBwYWdlICpscmNfc3RhdGVfcGFnZTsKLQl1aW50 MzJfdCAqbHJjX3JlZ19zdGF0ZTsKKwl2b2lkICpvYmpfYWRkcjsKKwl1MzIgKmxyY19yZWdfc3Rh dGU7CiAJaW50IHJldDsKIAogCVdBUk5fT04oIW11dGV4X2lzX2xvY2tlZCgmZW5naW5lLT5kZXYt PnN0cnVjdF9tdXRleCkpOwpAQCAtMTEwMiwxOSArMTEwMiwyMCBAQCBzdGF0aWMgaW50IGludGVs X2xyX2NvbnRleHRfZG9fcGluKHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgsCiAJaWYgKHJldCkK IAkJcmV0dXJuIHJldDsKIAotCWxyY19zdGF0ZV9wYWdlID0gaTkxNV9nZW1fb2JqZWN0X2dldF9k aXJ0eV9wYWdlKGN0eF9vYmosIExSQ19TVEFURV9QTik7Ci0JaWYgKFdBUk5fT04oIWxyY19zdGF0 ZV9wYWdlKSkgewotCQlyZXQgPSAtRU5PREVWOworCW9ial9hZGRyID0gaTkxNV9nZW1fb2JqZWN0 X3Bpbl9tYXAoY3R4X29iaik7CisJaWYgKElTX0VSUihvYmpfYWRkcikpIHsKKwkJcmV0ID0gUFRS X0VSUihvYmpfYWRkcik7CiAJCWdvdG8gdW5waW5fY3R4X29iajsKIAl9CiAKKwlscmNfcmVnX3N0 YXRlID0gb2JqX2FkZHIgKyBMUkNfU1RBVEVfUE4gKiBQQUdFX1NJWkU7CisKIAlyZXQgPSBpbnRl bF9waW5fYW5kX21hcF9yaW5nYnVmZmVyX29iaihlbmdpbmUtPmRldiwgcmluZ2J1Zik7CiAJaWYg KHJldCkKLQkJZ290byB1bnBpbl9jdHhfb2JqOworCQlnb3RvIHVucGluX21hcDsKIAogCWN0eC0+ ZW5naW5lW2VuZ2luZS0+aWRdLmxyY192bWEgPSBpOTE1X2dlbV9vYmpfdG9fZ2d0dChjdHhfb2Jq KTsKIAlpbnRlbF9scl9jb250ZXh0X2Rlc2NyaXB0b3JfdXBkYXRlKGN0eCwgZW5naW5lKTsKLQls cmNfcmVnX3N0YXRlID0ga21hcChscmNfc3RhdGVfcGFnZSk7CiAJbHJjX3JlZ19zdGF0ZVtDVFhf UklOR19CVUZGRVJfU1RBUlQrMV0gPSByaW5nYnVmLT52bWEtPm5vZGUuc3RhcnQ7CiAJY3R4LT5l bmdpbmVbZW5naW5lLT5pZF0ubHJjX3JlZ19zdGF0ZSA9IGxyY19yZWdfc3RhdGU7CiAJY3R4X29i ai0+ZGlydHkgPSB0cnVlOwpAQCAtMTEyNSw2ICsxMTI2LDggQEAgc3RhdGljIGludCBpbnRlbF9s cl9jb250ZXh0X2RvX3BpbihzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4LAogCiAJcmV0dXJuIHJl dDsKIAordW5waW5fbWFwOgorCWk5MTVfZ2VtX29iamVjdF91bnBpbl9tYXAoY3R4X29iaik7CiB1 bnBpbl9jdHhfb2JqOgogCWk5MTVfZ2VtX29iamVjdF9nZ3R0X3VucGluKGN0eF9vYmopOwogCkBA IC0xMTU3LDcgKzExNjAsNyBAQCB2b2lkIGludGVsX2xyX2NvbnRleHRfdW5waW4oc3RydWN0IGlu dGVsX2NvbnRleHQgKmN0eCwKIAogCVdBUk5fT04oIW11dGV4X2lzX2xvY2tlZCgmY3R4LT5pOTE1 LT5kZXYtPnN0cnVjdF9tdXRleCkpOwogCWlmICgtLWN0eC0+ZW5naW5lW2VuZ2luZS0+aWRdLnBp bl9jb3VudCA9PSAwKSB7Ci0JCWt1bm1hcChrbWFwX3RvX3BhZ2UoY3R4LT5lbmdpbmVbZW5naW5l LT5pZF0ubHJjX3JlZ19zdGF0ZSkpOworCQlpOTE1X2dlbV9vYmplY3RfdW5waW5fbWFwKGN0eF9v YmopOwogCQlpbnRlbF91bnBpbl9yaW5nYnVmZmVyX29iaihjdHgtPmVuZ2luZVtlbmdpbmUtPmlk XS5yaW5nYnVmKTsKIAkJaTkxNV9nZW1fb2JqZWN0X2dndHRfdW5waW4oY3R4X29iaik7CiAJCWN0 eC0+ZW5naW5lW2VuZ2luZS0+aWRdLmxyY192bWEgPSBOVUxMOwpAQCAtMjA1NCw3ICsyMDU3LDcg QEAgdm9pZCBpbnRlbF9sb2dpY2FsX3JpbmdfY2xlYW51cChzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz ICplbmdpbmUpCiAJaTkxNV9nZW1fYmF0Y2hfcG9vbF9maW5pKCZlbmdpbmUtPmJhdGNoX3Bvb2wp OwogCiAJaWYgKGVuZ2luZS0+c3RhdHVzX3BhZ2Uub2JqKSB7Ci0JCWt1bm1hcChzZ19wYWdlKGVu Z2luZS0+c3RhdHVzX3BhZ2Uub2JqLT5wYWdlcy0+c2dsKSk7CisJCWk5MTVfZ2VtX29iamVjdF91 bnBpbl9tYXAoZW5naW5lLT5zdGF0dXNfcGFnZS5vYmopOwogCQllbmdpbmUtPnN0YXR1c19wYWdl Lm9iaiA9IE5VTEw7CiAJfQogCkBAIC0yMDkyLDE4ICsyMDk1LDIyIEBAIGxvZ2ljYWxfcmluZ19k ZWZhdWx0X2lycXMoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLCB1bnNpZ25lZCBzaGlm dCkKIAllbmdpbmUtPmlycV9rZWVwX21hc2sgPSBHVF9DT05URVhUX1NXSVRDSF9JTlRFUlJVUFQg PDwgc2hpZnQ7CiB9CiAKLXN0YXRpYyB2b2lkCitzdGF0aWMgaW50CiBscmNfc2V0dXBfaHdzKHN0 cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSwKIAkgICAgICBzdHJ1Y3QgZHJtX2k5MTVfZ2Vt X29iamVjdCAqZGN0eF9vYmopCiB7Ci0Jc3RydWN0IHBhZ2UgKnBhZ2U7CisJdm9pZCAqaHdzOwog CiAJLyogVGhlIEhXU1AgaXMgcGFydCBvZiB0aGUgZGVmYXVsdCBjb250ZXh0IG9iamVjdCBpbiBM UkMgbW9kZS4gKi8KIAllbmdpbmUtPnN0YXR1c19wYWdlLmdmeF9hZGRyID0gaTkxNV9nZW1fb2Jq X2dndHRfb2Zmc2V0KGRjdHhfb2JqKSArCiAJCQkJICAgICAgIExSQ19QUEhXU1BfUE4gKiBQQUdF X1NJWkU7Ci0JcGFnZSA9IGk5MTVfZ2VtX29iamVjdF9nZXRfcGFnZShkY3R4X29iaiwgTFJDX1BQ SFdTUF9QTik7Ci0JZW5naW5lLT5zdGF0dXNfcGFnZS5wYWdlX2FkZHIgPSBrbWFwKHBhZ2UpOwor CWh3cyA9IGk5MTVfZ2VtX29iamVjdF9waW5fbWFwKGRjdHhfb2JqKTsKKwlpZiAoSVNfRVJSKGh3 cykpCisJCXJldHVybiBQVFJfRVJSKGh3cyk7CisJZW5naW5lLT5zdGF0dXNfcGFnZS5wYWdlX2Fk ZHIgPSBod3MgKyBMUkNfUFBIV1NQX1BOICogUEFHRV9TSVpFOwogCWVuZ2luZS0+c3RhdHVzX3Bh Z2Uub2JqID0gZGN0eF9vYmo7CisKKwlyZXR1cm4gMDsKIH0KIAogc3RhdGljIGludApAQCAtMjE2 NSw3ICsyMTcyLDExIEBAIGxvZ2ljYWxfcmluZ19pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYs IHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAl9CiAKIAkvKiBBbmQgc2V0dXAgdGhl IGhhcmR3YXJlIHN0YXR1cyBwYWdlLiAqLwotCWxyY19zZXR1cF9od3MoZW5naW5lLCBkY3R4LT5l bmdpbmVbZW5naW5lLT5pZF0uc3RhdGUpOworCXJldCA9IGxyY19zZXR1cF9od3MoZW5naW5lLCBk Y3R4LT5lbmdpbmVbZW5naW5lLT5pZF0uc3RhdGUpOworCWlmIChyZXQpIHsKKwkJRFJNX0VSUk9S KCJGYWlsZWQgdG8gc2V0IHVwIGh3ZCAlczogJWRcbiIsIGVuZ2luZS0+bmFtZSwgcmV0KTsKKwkJ Z290byBlcnJvcjsKKwl9CiAKIAlyZXR1cm4gMDsKIApAQCAtMjQxNywxNSArMjQyOCwxNiBAQCBz dGF0aWMgdTMyIGludGVsX2xyX2luZGlyZWN0X2N0eF9vZmZzZXQoc3RydWN0IGludGVsX2VuZ2lu ZV9jcyAqZW5naW5lKQogfQogCiBzdGF0aWMgaW50Ci1wb3B1bGF0ZV9scl9jb250ZXh0KHN0cnVj dCBpbnRlbF9jb250ZXh0ICpjdHgsIHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpjdHhfb2Jq LAorcG9wdWxhdGVfbHJfY29udGV4dChzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4LAorCQkgICAg c3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKmN0eF9vYmosCiAJCSAgICBzdHJ1Y3QgaW50ZWxf ZW5naW5lX2NzICplbmdpbmUsCiAJCSAgICBzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1 ZikKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gZW5naW5lLT5kZXY7CiAJc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3QgaTkx NV9od19wcGd0dCAqcHBndHQgPSBjdHgtPnBwZ3R0OwotCXN0cnVjdCBwYWdlICpwYWdlOwotCXVp bnQzMl90ICpyZWdfc3RhdGU7CisJdm9pZCAqb2JqX2FkZHI7CisJdTMyICpyZWdfc3RhdGU7CiAJ aW50IHJldDsKIAogCWlmICghcHBndHQpCkBAIC0yNDM3LDE4ICsyNDQ5LDE3IEBAIHBvcHVsYXRl X2xyX2NvbnRleHQoc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCwgc3RydWN0IGRybV9pOTE1X2dl bV9vYmplY3QgKmN0eF9vCiAJCXJldHVybiByZXQ7CiAJfQogCi0JcmV0ID0gaTkxNV9nZW1fb2Jq ZWN0X2dldF9wYWdlcyhjdHhfb2JqKTsKLQlpZiAocmV0KSB7Ci0JCURSTV9ERUJVR19EUklWRVIo IkNvdWxkIG5vdCBnZXQgb2JqZWN0IHBhZ2VzXG4iKTsKKwlvYmpfYWRkciA9IGk5MTVfZ2VtX29i amVjdF9waW5fbWFwKGN0eF9vYmopOworCWlmIChJU19FUlIob2JqX2FkZHIpKSB7CisJCXJldCA9 IFBUUl9FUlIob2JqX2FkZHIpOworCQlEUk1fREVCVUdfRFJJVkVSKCJDb3VsZCBub3QgbWFwIG9i amVjdCBwYWdlcyEgKCVkKVxuIiwgcmV0KTsKIAkJcmV0dXJuIHJldDsKIAl9Ci0KLQlpOTE1X2dl bV9vYmplY3RfcGluX3BhZ2VzKGN0eF9vYmopOworCWN0eF9vYmotPmRpcnR5ID0gdHJ1ZTsKIAog CS8qIFRoZSBzZWNvbmQgcGFnZSBvZiB0aGUgY29udGV4dCBvYmplY3QgY29udGFpbnMgc29tZSBm aWVsZHMgd2hpY2ggbXVzdAogCSAqIGJlIHNldCB1cCBwcmlvciB0byB0aGUgZmlyc3QgZXhlY3V0 aW9uLiAqLwotCXBhZ2UgPSBpOTE1X2dlbV9vYmplY3RfZ2V0X2RpcnR5X3BhZ2UoY3R4X29iaiwg TFJDX1NUQVRFX1BOKTsKLQlyZWdfc3RhdGUgPSBrbWFwX2F0b21pYyhwYWdlKTsKKwlyZWdfc3Rh dGUgPSBvYmpfYWRkciArIExSQ19TVEFURV9QTiAqIFBBR0VfU0laRTsKIAogCS8qIEEgY29udGV4 dCBpcyBhY3R1YWxseSBhIGJpZyBiYXRjaCBidWZmZXIgd2l0aCBzZXZlcmFsIE1JX0xPQURfUkVH SVNURVJfSU1NCiAJICogY29tbWFuZHMgZm9sbG93ZWQgYnkgKHJlZywgdmFsdWUpIHBhaXJzLiBU aGUgdmFsdWVzIHdlIGFyZSBzZXR0aW5nIGhlcmUgYXJlCkBAIC0yNTUzLDggKzI1NjQsNyBAQCBw b3B1bGF0ZV9scl9jb250ZXh0KHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgsIHN0cnVjdCBkcm1f aTkxNV9nZW1fb2JqZWN0ICpjdHhfbwogCQkJICAgICAgIG1ha2VfcnBjcyhkZXYpKTsKIAl9CiAK LQlrdW5tYXBfYXRvbWljKHJlZ19zdGF0ZSk7Ci0JaTkxNV9nZW1fb2JqZWN0X3VucGluX3BhZ2Vz KGN0eF9vYmopOworCWk5MTVfZ2VtX29iamVjdF91bnBpbl9tYXAoY3R4X29iaik7CiAKIAlyZXR1 cm4gMDsKIH0KQEAgLTI1ODEsNiArMjU5MSw3IEBAIHZvaWQgaW50ZWxfbHJfY29udGV4dF9mcmVl KHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgpCiAJCWlmIChjdHggPT0gY3R4LT5pOTE1LT5rZXJu ZWxfY29udGV4dCkgewogCQkJaW50ZWxfdW5waW5fcmluZ2J1ZmZlcl9vYmoocmluZ2J1Zik7CiAJ CQlpOTE1X2dlbV9vYmplY3RfZ2d0dF91bnBpbihjdHhfb2JqKTsKKwkJCWk5MTVfZ2VtX29iamVj dF91bnBpbl9tYXAoY3R4X29iaik7CiAJCX0KIAogCQlXQVJOX09OKGN0eC0+ZW5naW5lW2ldLnBp bl9jb3VudCk7CkBAIC0yNzA5LDEwICsyNzIwLDkgQEAgZXJyb3JfZGVyZWZfb2JqOgogCXJldHVy biByZXQ7CiB9CiAKLXZvaWQgaW50ZWxfbHJfY29udGV4dF9yZXNldChzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2LAotCQkJc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCkKK3ZvaWQgaW50ZWxfbHJfY29u dGV4dF9yZXNldChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCisJCQkgICAgc3Ry dWN0IGludGVsX2NvbnRleHQgKmN0eCkKIHsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2lu ZTsKIAogCWZvcl9lYWNoX2VuZ2luZShlbmdpbmUsIGRldl9wcml2KSB7CkBAIC0yNzIwLDIzICsy NzMwLDIzIEBAIHZvaWQgaW50ZWxfbHJfY29udGV4dF9yZXNldChzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2LAogCQkJCWN0eC0+ZW5naW5lW2VuZ2luZS0+aWRdLnN0YXRlOwogCQlzdHJ1Y3QgaW50ZWxf cmluZ2J1ZmZlciAqcmluZ2J1ZiA9CiAJCQkJY3R4LT5lbmdpbmVbZW5naW5lLT5pZF0ucmluZ2J1 ZjsKKwkJdm9pZCAqb2JqX2FkZHI7CiAJCXVpbnQzMl90ICpyZWdfc3RhdGU7Ci0JCXN0cnVjdCBw YWdlICpwYWdlOwogCiAJCWlmICghY3R4X29iaikKIAkJCWNvbnRpbnVlOwogCi0JCWlmIChpOTE1 X2dlbV9vYmplY3RfZ2V0X3BhZ2VzKGN0eF9vYmopKSB7Ci0JCQlXQVJOKDEsICJGYWlsZWQgZ2V0 X3BhZ2VzIGZvciBjb250ZXh0IG9ialxuIik7CisJCW9ial9hZGRyID0gaTkxNV9nZW1fb2JqZWN0 X3Bpbl9tYXAoY3R4X29iaik7CisJCWlmIChXQVJOX09OKElTX0VSUihvYmpfYWRkcikpKQogCQkJ Y29udGludWU7Ci0JCX0KLQkJcGFnZSA9IGk5MTVfZ2VtX29iamVjdF9nZXRfZGlydHlfcGFnZShj dHhfb2JqLCBMUkNfU1RBVEVfUE4pOwotCQlyZWdfc3RhdGUgPSBrbWFwX2F0b21pYyhwYWdlKTsK KworCQlyZWdfc3RhdGUgPSBvYmpfYWRkciArIExSQ19TVEFURV9QTiAqIFBBR0VfU0laRTsKKwkJ Y3R4X29iai0+ZGlydHkgPSB0cnVlOwogCiAJCXJlZ19zdGF0ZVtDVFhfUklOR19IRUFEKzFdID0g MDsKIAkJcmVnX3N0YXRlW0NUWF9SSU5HX1RBSUwrMV0gPSAwOwogCi0JCWt1bm1hcF9hdG9taWMo cmVnX3N0YXRlKTsKKwkJaTkxNV9nZW1fb2JqZWN0X3VucGluX21hcChjdHhfb2JqKTsKIAogCQly aW5nYnVmLT5oZWFkID0gMDsKIAkJcmluZ2J1Zi0+dGFpbCA9IDA7CmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2xyYy5oCmluZGV4IDhkZTFlYTUzNmFkNC4uOWFmZmRhMmM2NTBjIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9scmMuaApAQCAtMTA0LDggKzEwNCwxMSBAQCBpbnQgaW50ZWxfbHJfY29udGV4dF9kZWZl cnJlZF9hbGxvYyhzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4LAogCQkJCSAgICBzdHJ1Y3QgaW50 ZWxfZW5naW5lX2NzICplbmdpbmUpOwogdm9pZCBpbnRlbF9scl9jb250ZXh0X3VucGluKHN0cnVj dCBpbnRlbF9jb250ZXh0ICpjdHgsCiAJCQkgICAgc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5n aW5lKTsKLXZvaWQgaW50ZWxfbHJfY29udGV4dF9yZXNldChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 LAotCQkJc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCk7CisKK3N0cnVjdCBkcm1faTkxNV9wcml2 YXRlOworCit2b2lkIGludGVsX2xyX2NvbnRleHRfcmVzZXQoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2LAorCQkJICAgIHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgpOwogdWludDY0 X3QgaW50ZWxfbHJfY29udGV4dF9kZXNjcmlwdG9yKHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgs CiAJCQkJICAgICBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpOwogCi0tIAoxLjkuMQoK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==