From: Michel Thierry Subject: [PATCH v2 05/18] drm/i915/gen8: Abstract PDP usage Date: Wed, 10 Jun 2015 17:46:42 +0100 Message-ID: <1433954816-13787-6-git-send-email-michel.thierry@intel.com> References: <1433954816-13787-1-git-send-email-michel.thierry@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 3C06F6E2E7 for ; Wed, 10 Jun 2015 09:46:51 -0700 (PDT) In-Reply-To: <1433954816-13787-1-git-send-email-michel.thierry@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 VXAgdW50aWwgbm93LCBwcGd0dC0+cGRwIGhhcyBhbHdheXMgYmVlbiB0aGUgcm9vdCBvZiBvdXIg cGFnZSB0YWJsZXMuCkxlZ2FjeSAzMmIgYWRkcmVzc2VzIGFjdGVkIGxpa2UgaXQgaGFkIDEgUERQ IHdpdGggNCBQRFBFcy4KCkluIHByZXBhcmF0aW9uIGZvciA0IGxldmVsIHBhZ2UgdGFibGVzLCB3 ZSBuZWVkIHRvIHN0b3AgdXNlIHBwZ3R0LT5wZHAKZGlyZWN0bHkgdW5sZXNzIHdlIGtub3cgaXQn cyB3aGF0IHdlIHdhbnQuIFRoZSBmdXR1cmUgc3RydWN0dXJlIHdpbGwgdXNlCnBwZ3R0LT5wbWw0 IGZvciB0aGUgdG9wIGxldmVsLCBhbmQgdGhlIHBkcCBpcyBqdXN0IG9uZSBvZiB0aGUgZW50cmll cwpiZWluZyBwb2ludGVkIHRvIGJ5IGEgcG1sNGUuCgp2MjogVXBkYXRlZCBhZnRlciBkeW5hbWlj IHBhZ2UgYWxsb2NhdGlvbiBjaGFuZ2VzLgp2MzogUmViYXNlIGFmdGVyIHMvcGFnZV90YWJsZXMv cGFnZV90YWJsZS8uCnY0OiBSZWJhc2UgYWZ0ZXIgY2hhbmdlcyBpbiAiRHluYW1pYyBwYWdlIHRh YmxlIGFsbG9jYXRpb25zIiBwYXRjaC4KdjU6IFJlYmFzZSBhZnRlciBNaWthJ3MgcHBndHQgY2xl YW51cCAvIHNjcmF0Y2ggbWVyZ2UgcGF0Y2ggc2VyaWVzLgoKU2lnbmVkLW9mZi1ieTogQmVuIFdp ZGF3c2t5IDxiZW5AYndpZGF3c2submV0PgpTaWduZWQtb2ZmLWJ5OiBNaWNoZWwgVGhpZXJyeSA8 bWljaGVsLnRoaWVycnlAaW50ZWwuY29tPiAodjIrKQotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtX2d0dC5jIHwgMTM4ICsrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0t LQogMSBmaWxlIGNoYW5nZWQsIDg5IGluc2VydGlvbnMoKyksIDQ5IGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKaW5kZXggODVlNDljNS4uODU3ZTI4NyAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKQEAgLTQ5NSw2ICs0OTUsMjUgQEAgc3RhdGljIHZv aWQgZ2VuOF9pbml0aWFsaXplX3BkKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAogCWZp bGxfcHgodm0tPmRldiwgcGQsIHNjcmF0Y2hfcGRlKTsKIH0KIAorLyogSXQncyBsaWtlbHkgd2Un bGwgbWFwIG1vcmUgdGhhbiBvbmUgcGFnZSB0YWJsZSBhdCBhIHRpbWUuIFRoaXMgZnVuY3Rpb24g d2lsbAorICogc2F2ZSB1cyB1bm5lY2Vzc2FyeSBrbWFwIGNhbGxzLCBidXQgZG8gbm8gbW9yZSBm dW5jdGlvbmFsbHkgdGhhbiBtdWx0aXBsZQorICogY2FsbHMgdG8gcGRlX2VuY29kZS4gVGhlIHBw Z3R0IGlzIG9ubHkgbmVlZGVkIHRvIHJldXNlIHRoZSBrdW5tYXAgbWFjcm8uICovCitzdGF0aWMg dm9pZCBnZW44X21hcF9wYWdldGFibGVfcmFuZ2Uoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0 LAorCQkJCSAgICAgc3RydWN0IGk5MTVfcGFnZV9kaXJlY3RvcnkgKnBkLAorCQkJCSAgICAgdWlu dDY0X3Qgc3RhcnQsCisJCQkJICAgICB1aW50NjRfdCBsZW5ndGgpCit7CisJZ2VuOF9wZGVfdCAq IGNvbnN0IHBhZ2VfZGlyZWN0b3J5ID0ga21hcF9weChwZCk7CisJc3RydWN0IGk5MTVfcGFnZV90 YWJsZSAqcHQ7CisJdWludDY0X3QgdGVtcCwgcGRlOworCisJZ2VuOF9mb3JfZWFjaF9wZGUocHQs IHBkLCBzdGFydCwgbGVuZ3RoLCB0ZW1wLCBwZGUpCisJCXBhZ2VfZGlyZWN0b3J5W3BkZV0gPSBn ZW44X3BkZV9lbmNvZGUocHhfZG1hKHB0KSwKKwkJCQkJCSAgICAgIEk5MTVfQ0FDSEVfTExDKTsK KworCWt1bm1hcF9weChwcGd0dCwgcGFnZV9kaXJlY3RvcnkpOworfQorCiBzdGF0aWMgaW50IF9f cGRwX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJICAgICAgc3RydWN0IGk5MTVfcGFn ZV9kaXJlY3RvcnlfcG9pbnRlciAqcGRwKQogewpAQCAtNzIxLDYgKzc0MCw3IEBAIHN0YXRpYyB2 b2lkIGdlbjhfcHBndHRfY2xlYXJfcmFuZ2Uoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0s CiB7CiAJc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0ID0KIAkJY29udGFpbmVyX29mKHZtLCBz dHJ1Y3QgaTkxNV9od19wcGd0dCwgYmFzZSk7CisJc3RydWN0IGk5MTVfcGFnZV9kaXJlY3Rvcnlf cG9pbnRlciAqcGRwID0gJnBwZ3R0LT5wZHA7IC8qIEZJWE1FOiA0OGIgKi8KIAlnZW44X3B0ZV90 ICpwdF92YWRkciwgc2NyYXRjaF9wdGU7CiAJdW5zaWduZWQgcGRwZSA9IHN0YXJ0ID4+IEdFTjhf UERQRV9TSElGVCAmIEdFTjhfUERQRV9NQVNLOwogCXVuc2lnbmVkIHBkZSA9IHN0YXJ0ID4+IEdF TjhfUERFX1NISUZUICYgR0VOOF9QREVfTUFTSzsKQEAgLTczNSwxMCArNzU1LDEwIEBAIHN0YXRp YyB2b2lkIGdlbjhfcHBndHRfY2xlYXJfcmFuZ2Uoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAq dm0sCiAJCXN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5ICpwZDsKIAkJc3RydWN0IGk5MTVfcGFn ZV90YWJsZSAqcHQ7CiAKLQkJaWYgKFdBUk5fT04oIXBwZ3R0LT5wZHAucGFnZV9kaXJlY3Rvcnlb cGRwZV0pKQorCQlpZiAoV0FSTl9PTighcGRwLT5wYWdlX2RpcmVjdG9yeVtwZHBlXSkpCiAJCQlj b250aW51ZTsKIAotCQlwZCA9IHBwZ3R0LT5wZHAucGFnZV9kaXJlY3RvcnlbcGRwZV07CisJCXBk ID0gcGRwLT5wYWdlX2RpcmVjdG9yeVtwZHBlXTsKIAogCQlpZiAoV0FSTl9PTighcGQtPnBhZ2Vf dGFibGVbcGRlXSkpCiAJCQljb250aW51ZTsKQEAgLTc3Niw2ICs3OTYsNyBAQCBzdGF0aWMgdm9p ZCBnZW44X3BwZ3R0X2luc2VydF9lbnRyaWVzKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZt LAogewogCXN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCA9CiAJCWNvbnRhaW5lcl9vZih2bSwg c3RydWN0IGk5MTVfaHdfcHBndHQsIGJhc2UpOworCXN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5 X3BvaW50ZXIgKnBkcCA9ICZwcGd0dC0+cGRwOyAvKiBGSVhNRTogNDhiICovCiAJZ2VuOF9wdGVf dCAqcHRfdmFkZHI7CiAJdW5zaWduZWQgcGRwZSA9IHN0YXJ0ID4+IEdFTjhfUERQRV9TSElGVCAm IEdFTjhfUERQRV9NQVNLOwogCXVuc2lnbmVkIHBkZSA9IHN0YXJ0ID4+IEdFTjhfUERFX1NISUZU ICYgR0VOOF9QREVfTUFTSzsKQEAgLTc4Niw3ICs4MDcsNyBAQCBzdGF0aWMgdm9pZCBnZW44X3Bw Z3R0X2luc2VydF9lbnRyaWVzKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAogCiAJZm9y X2VhY2hfc2dfcGFnZShwYWdlcy0+c2dsLCAmc2dfaXRlciwgcGFnZXMtPm5lbnRzLCAwKSB7CiAJ CWlmIChwdF92YWRkciA9PSBOVUxMKSB7Ci0JCQlzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeSAq cGQgPSBwcGd0dC0+cGRwLnBhZ2VfZGlyZWN0b3J5W3BkcGVdOworCQkJc3RydWN0IGk5MTVfcGFn ZV9kaXJlY3RvcnkgKnBkID0gcGRwLT5wYWdlX2RpcmVjdG9yeVtwZHBlXTsKIAkJCXN0cnVjdCBp OTE1X3BhZ2VfdGFibGUgKnB0ID0gcGQtPnBhZ2VfdGFibGVbcGRlXTsKIAkJCXB0X3ZhZGRyID0g a21hcF9weChwdCk7CiAJCX0KQEAgLTgzMiwyMyArODUzLDI4IEBAIHN0YXRpYyB2b2lkIGdlbjhf cHBndHRfY2xlYW51cChzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSkKIAkJY29udGFpbmVy X29mKHZtLCBzdHJ1Y3QgaTkxNV9od19wcGd0dCwgYmFzZSk7CiAJaW50IGk7CiAKLQlmb3JfZWFj aF9zZXRfYml0KGksIHBwZ3R0LT5wZHAudXNlZF9wZHBlcywKLQkJCQlJOTE1X1BEUEVTX1BFUl9Q RFAocHBndHQtPmJhc2UuZGV2KSkgewotCQlpZiAoV0FSTl9PTighcHBndHQtPnBkcC5wYWdlX2Rp cmVjdG9yeVtpXSkpCi0JCQljb250aW51ZTsKKwlpZiAoIVVTRVNfRlVMTF80OEJJVF9QUEdUVChw cGd0dC0+YmFzZS5kZXYpKSB7CisJCWZvcl9lYWNoX3NldF9iaXQoaSwgcHBndHQtPnBkcC51c2Vk X3BkcGVzLAorCQkJCSBJOTE1X1BEUEVTX1BFUl9QRFAocHBndHQtPmJhc2UuZGV2KSkgeworCQkJ aWYgKFdBUk5fT04oIXBwZ3R0LT5wZHAucGFnZV9kaXJlY3RvcnlbaV0pKQorCQkJCWNvbnRpbnVl OwogCi0JCWdlbjhfZnJlZV9wYWdlX3RhYmxlcyhwcGd0dC0+YmFzZS5kZXYsCi0JCQkJICAgICAg cHBndHQtPnBkcC5wYWdlX2RpcmVjdG9yeVtpXSk7Ci0JCWZyZWVfcGQocHBndHQtPmJhc2UuZGV2 LCBwcGd0dC0+cGRwLnBhZ2VfZGlyZWN0b3J5W2ldKTsKKwkJCWdlbjhfZnJlZV9wYWdlX3RhYmxl cyhwcGd0dC0+YmFzZS5kZXYsCisJCQkJCSAgICAgIHBwZ3R0LT5wZHAucGFnZV9kaXJlY3Rvcnlb aV0pOworCQkJZnJlZV9wZChwcGd0dC0+YmFzZS5kZXYsCisJCQkJcHBndHQtPnBkcC5wYWdlX2Rp cmVjdG9yeVtpXSk7CisJCX0KKwkJZnJlZV9wZHAocHBndHQtPmJhc2UuZGV2LCAmcHBndHQtPnBk cCk7CisJfSBlbHNlIHsKKwkJV0FSTl9PTigxKTsgLyogdG8gYmUgaW1wbGVtZW50ZWQgbGF0ZXIg Ki8KIAl9CiAKLQlmcmVlX3BkcChwcGd0dC0+YmFzZS5kZXYsICZwcGd0dC0+cGRwKTsKIAljbGVh bnVwX3NjcmF0Y2godm0pOwogfQogCiAvKioKICAqIGdlbjhfcHBndHRfYWxsb2NfcGFnZXRhYnMo KSAtIEFsbG9jYXRlIHBhZ2UgdGFibGVzIGZvciBWQSByYW5nZS4KLSAqIEBwcGd0dDoJTWFzdGVy IHBwZ3R0IHN0cnVjdHVyZS4KKyAqIEB2bToJCU1hc3RlciB2bSBzdHJ1Y3R1cmUuCiAgKiBAcGQ6 CQlQYWdlIGRpcmVjdG9yeSBmb3IgdGhpcyBhZGRyZXNzIHJhbmdlLgogICogQHN0YXJ0OglTdGFy dGluZyB2aXJ0dWFsIGFkZHJlc3MgdG8gYmVnaW4gYWxsb2NhdGlvbnMuCiAgKiBAbGVuZ3RoCVNp emUgb2YgdGhlIGFsbG9jYXRpb25zLgpAQCAtODY0LDEzICs4OTAsMTUgQEAgc3RhdGljIHZvaWQg Z2VuOF9wcGd0dF9jbGVhbnVwKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtKQogICoKICAq IFJldHVybjogMCBpZiBzdWNjZXNzOyBuZWdhdGl2ZSBlcnJvciBjb2RlIG90aGVyd2lzZS4KICAq Lwotc3RhdGljIGludCBnZW44X3BwZ3R0X2FsbG9jX3BhZ2V0YWJzKHN0cnVjdCBpOTE1X2h3X3Bw Z3R0ICpwcGd0dCwKK3N0YXRpYyBpbnQgZ2VuOF9wcGd0dF9hbGxvY19wYWdldGFicyhzdHJ1Y3Qg aTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIAkJCQkgICAgIHN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0 b3J5ICpwZCwKIAkJCQkgICAgIHVpbnQ2NF90IHN0YXJ0LAogCQkJCSAgICAgdWludDY0X3QgbGVu Z3RoLAogCQkJCSAgICAgdW5zaWduZWQgbG9uZyAqbmV3X3B0cykKIHsKLQlzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2ID0gcHBndHQtPmJhc2UuZGV2OworCXN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0 dCA9CisJICAgIGNvbnRhaW5lcl9vZih2bSwgc3RydWN0IGk5MTVfaHdfcHBndHQsIGJhc2UpOwor CXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSB2bS0+ZGV2OwogCXN0cnVjdCBpOTE1X3BhZ2VfdGFi bGUgKnB0OwogCXVpbnQ2NF90IHRlbXA7CiAJdWludDMyX3QgcGRlOwpAQCAtODg3LDcgKzkxNSw3 IEBAIHN0YXRpYyBpbnQgZ2VuOF9wcGd0dF9hbGxvY19wYWdldGFicyhzdHJ1Y3QgaTkxNV9od19w cGd0dCAqcHBndHQsCiAJCWlmIChJU19FUlIocHQpKQogCQkJZ290byB1bndpbmRfb3V0OwogCi0J CWdlbjhfaW5pdGlhbGl6ZV9wdCgmcHBndHQtPmJhc2UsIHB0KTsKKwkJZ2VuOF9pbml0aWFsaXpl X3B0KHZtLCBwdCk7CiAJCXBkLT5wYWdlX3RhYmxlW3BkZV0gPSBwdDsKIAkJX19zZXRfYml0KHBk ZSwgbmV3X3B0cyk7CiAJfQpAQCAtOTAzLDcgKzkzMSw3IEBAIHVud2luZF9vdXQ6CiAKIC8qKgog ICogZ2VuOF9wcGd0dF9hbGxvY19wYWdlX2RpcmVjdG9yaWVzKCkgLSBBbGxvY2F0ZSBwYWdlIGRp cmVjdG9yaWVzIGZvciBWQSByYW5nZS4KLSAqIEBwcGd0dDoJTWFzdGVyIHBwZ3R0IHN0cnVjdHVy ZS4KKyAqIEB2bToJCU1hc3RlciB2bSBzdHJ1Y3R1cmUuCiAgKiBAcGRwOglQYWdlIGRpcmVjdG9y eSBwb2ludGVyIGZvciB0aGlzIGFkZHJlc3MgcmFuZ2UuCiAgKiBAc3RhcnQ6CVN0YXJ0aW5nIHZp cnR1YWwgYWRkcmVzcyB0byBiZWdpbiBhbGxvY2F0aW9ucy4KICAqIEBsZW5ndGgJU2l6ZSBvZiB0 aGUgYWxsb2NhdGlvbnMuCkBAIC05MjQsMTcgKzk1MiwxOCBAQCB1bndpbmRfb3V0OgogICoKICAq IFJldHVybjogMCBpZiBzdWNjZXNzOyBuZWdhdGl2ZSBlcnJvciBjb2RlIG90aGVyd2lzZS4KICAq Lwotc3RhdGljIGludCBnZW44X3BwZ3R0X2FsbG9jX3BhZ2VfZGlyZWN0b3JpZXMoc3RydWN0IGk5 MTVfaHdfcHBndHQgKnBwZ3R0LAotCQkJCSAgICAgc3RydWN0IGk5MTVfcGFnZV9kaXJlY3Rvcnlf cG9pbnRlciAqcGRwLAotCQkJCSAgICAgdWludDY0X3Qgc3RhcnQsCi0JCQkJICAgICB1aW50NjRf dCBsZW5ndGgsCi0JCQkJICAgICB1bnNpZ25lZCBsb25nICpuZXdfcGRzKQorc3RhdGljIGludAor Z2VuOF9wcGd0dF9hbGxvY19wYWdlX2RpcmVjdG9yaWVzKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3Bh Y2UgKnZtLAorCQkJCSAgc3RydWN0IGk5MTVfcGFnZV9kaXJlY3RvcnlfcG9pbnRlciAqcGRwLAor CQkJCSAgdWludDY0X3Qgc3RhcnQsCisJCQkJICB1aW50NjRfdCBsZW5ndGgsCisJCQkJICB1bnNp Z25lZCBsb25nICpuZXdfcGRzKQogewotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBwcGd0dC0+ YmFzZS5kZXY7CisJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IHZtLT5kZXY7CiAJc3RydWN0IGk5 MTVfcGFnZV9kaXJlY3RvcnkgKnBkOwogCXVpbnQ2NF90IHRlbXA7CiAJdWludDMyX3QgcGRwZTsK LQl1aW50MzJfdCBwZHBlcyA9ICBJOTE1X1BEUEVTX1BFUl9QRFAocHBndHQtPmJhc2UuZGV2KTsK Kwl1aW50MzJfdCBwZHBlcyA9ICBJOTE1X1BEUEVTX1BFUl9QRFAodm0tPmRldik7CiAKIAlXQVJO X09OKCFiaXRtYXBfZW1wdHkobmV3X3BkcywgcGRwZXMpKTsKIApAQCAtOTQ2LDcgKzk3NSw3IEBA IHN0YXRpYyBpbnQgZ2VuOF9wcGd0dF9hbGxvY19wYWdlX2RpcmVjdG9yaWVzKHN0cnVjdCBpOTE1 X2h3X3BwZ3R0ICpwcGd0dCwKIAkJaWYgKElTX0VSUihwZCkpCiAJCQlnb3RvIHVud2luZF9vdXQ7 CiAKLQkJZ2VuOF9pbml0aWFsaXplX3BkKCZwcGd0dC0+YmFzZSwgcGQpOworCQlnZW44X2luaXRp YWxpemVfcGQodm0sIHBkKTsKIAkJcGRwLT5wYWdlX2RpcmVjdG9yeVtwZHBlXSA9IHBkOwogCQlf X3NldF9iaXQocGRwZSwgbmV3X3Bkcyk7CiAJfQpAQCAtMTAyMCwxMyArMTA0OSwxNSBAQCBzdGF0 aWMgdm9pZCBtYXJrX3RsYnNfZGlydHkoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0KQogCXBw Z3R0LT5wZF9kaXJ0eV9yaW5ncyA9IElOVEVMX0lORk8ocHBndHQtPmJhc2UuZGV2KS0+cmluZ19t YXNrOwogfQogCi1zdGF0aWMgaW50IGdlbjhfYWxsb2NfdmFfcmFuZ2Uoc3RydWN0IGk5MTVfYWRk cmVzc19zcGFjZSAqdm0sCi0JCQkgICAgICAgdWludDY0X3Qgc3RhcnQsCi0JCQkgICAgICAgdWlu dDY0X3QgbGVuZ3RoKQorc3RhdGljIGludCBnZW44X2FsbG9jX3ZhX3JhbmdlXzNsdmwoc3RydWN0 IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCisJCQkJICAgIHN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0 b3J5X3BvaW50ZXIgKnBkcCwKKwkJCQkgICAgdWludDY0X3Qgc3RhcnQsCisJCQkJICAgIHVpbnQ2 NF90IGxlbmd0aCkKIHsKIAlzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQgPQogCQljb250YWlu ZXJfb2Yodm0sIHN0cnVjdCBpOTE1X2h3X3BwZ3R0LCBiYXNlKTsKIAl1bnNpZ25lZCBsb25nICpu ZXdfcGFnZV9kaXJzLCAqKm5ld19wYWdlX3RhYmxlczsKKwlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 ID0gdm0tPmRldjsKIAlzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeSAqcGQ7CiAJY29uc3QgdWlu dDY0X3Qgb3JpZ19zdGFydCA9IHN0YXJ0OwogCWNvbnN0IHVpbnQ2NF90IG9yaWdfbGVuZ3RoID0g bGVuZ3RoOwpAQCAtMTA0OSwxNiArMTA4MCwxNSBAQCBzdGF0aWMgaW50IGdlbjhfYWxsb2NfdmFf cmFuZ2Uoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCiAJCXJldHVybiByZXQ7CiAKIAkv KiBEbyB0aGUgYWxsb2NhdGlvbnMgZmlyc3Qgc28gd2UgY2FuIGVhc2lseSBiYWlsIG91dCAqLwot CXJldCA9IGdlbjhfcHBndHRfYWxsb2NfcGFnZV9kaXJlY3RvcmllcyhwcGd0dCwgJnBwZ3R0LT5w ZHAsIHN0YXJ0LCBsZW5ndGgsCi0JCQkJCW5ld19wYWdlX2RpcnMpOworCXJldCA9IGdlbjhfcHBn dHRfYWxsb2NfcGFnZV9kaXJlY3Rvcmllcyh2bSwgcGRwLCBzdGFydCwgbGVuZ3RoLAorCQkJCQkJ bmV3X3BhZ2VfZGlycyk7CiAJaWYgKHJldCkgewogCQlmcmVlX2dlbjhfdGVtcF9iaXRtYXBzKG5l d19wYWdlX2RpcnMsIG5ld19wYWdlX3RhYmxlcywgcGRwZXMpOwogCQlyZXR1cm4gcmV0OwogCX0K IAotCS8qIEZvciBldmVyeSBwYWdlIGRpcmVjdG9yeSByZWZlcmVuY2VkLCBhbGxvY2F0ZSBwYWdl IHRhYmxlcyAqLwotCWdlbjhfZm9yX2VhY2hfcGRwZShwZCwgJnBwZ3R0LT5wZHAsIHN0YXJ0LCBs ZW5ndGgsIHRlbXAsIHBkcGUpIHsKLQkJcmV0ID0gZ2VuOF9wcGd0dF9hbGxvY19wYWdldGFicyhw cGd0dCwgcGQsIHN0YXJ0LCBsZW5ndGgsCisJZ2VuOF9mb3JfZWFjaF9wZHBlKHBkLCBwZHAsIHN0 YXJ0LCBsZW5ndGgsIHRlbXAsIHBkcGUpIHsKKwkJcmV0ID0gZ2VuOF9wcGd0dF9hbGxvY19wYWdl dGFicyh2bSwgcGQsIHN0YXJ0LCBsZW5ndGgsCiAJCQkJCQluZXdfcGFnZV90YWJsZXNbcGRwZV0p OwogCQlpZiAocmV0KQogCQkJZ290byBlcnJfb3V0OwpAQCAtMTA2NywxMCArMTA5Nyw3IEBAIHN0 YXRpYyBpbnQgZ2VuOF9hbGxvY192YV9yYW5nZShzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2 bSwKIAlzdGFydCA9IG9yaWdfc3RhcnQ7CiAJbGVuZ3RoID0gb3JpZ19sZW5ndGg7CiAKLQkvKiBB bGxvY2F0aW9ucyBoYXZlIGNvbXBsZXRlZCBzdWNjZXNzZnVsbHksIHNvIHNldCB0aGUgYml0bWFw cywgYW5kIGRvCi0JICogdGhlIG1hcHBpbmdzLiAqLwotCWdlbjhfZm9yX2VhY2hfcGRwZShwZCwg JnBwZ3R0LT5wZHAsIHN0YXJ0LCBsZW5ndGgsIHRlbXAsIHBkcGUpIHsKLQkJZ2VuOF9wZGVfdCAq Y29uc3QgcGFnZV9kaXJlY3RvcnkgPSBrbWFwX3B4KHBkKTsKKwlnZW44X2Zvcl9lYWNoX3BkcGUo cGQsIHBkcCwgc3RhcnQsIGxlbmd0aCwgdGVtcCwgcGRwZSkgewogCQlzdHJ1Y3QgaTkxNV9wYWdl X3RhYmxlICpwdDsKIAkJdWludDY0X3QgcGRfbGVuID0gbGVuZ3RoOwogCQl1aW50NjRfdCBwZF9z dGFydCA9IHN0YXJ0OwpAQCAtMTA5MiwxOCArMTExOSwxMCBAQCBzdGF0aWMgaW50IGdlbjhfYWxs b2NfdmFfcmFuZ2Uoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCiAKIAkJCS8qIE91ciBw ZGUgaXMgbm93IHBvaW50aW5nIHRvIHRoZSBwYWdldGFibGUsIHB0ICovCiAJCQlfX3NldF9iaXQo cGRlLCBwZC0+dXNlZF9wZGVzKTsKLQotCQkJLyogTWFwIHRoZSBQREUgdG8gdGhlIHBhZ2UgdGFi bGUgKi8KLQkJCXBhZ2VfZGlyZWN0b3J5W3BkZV0gPSBnZW44X3BkZV9lbmNvZGUocHhfZG1hKHB0 KSwKLQkJCQkJCQkgICAgICBJOTE1X0NBQ0hFX0xMQyk7Ci0KLQkJCS8qIE5COiBXZSBoYXZlbid0 IHlldCBtYXBwZWQgcHRlcyB0byBwYWdlcy4gQXQgdGhpcwotCQkJICogcG9pbnQgd2UncmUgc3Rp bGwgcmVseWluZyBvbiBpbnNlcnRfZW50cmllcygpICovCiAJCX0KIAotCQlrdW5tYXBfcHgocHBn dHQsIHBhZ2VfZGlyZWN0b3J5KTsKLQotCQlfX3NldF9iaXQocGRwZSwgcHBndHQtPnBkcC51c2Vk X3BkcGVzKTsKKwkJX19zZXRfYml0KHBkcGUsIHBkcC0+dXNlZF9wZHBlcyk7CisJCWdlbjhfbWFw X3BhZ2V0YWJsZV9yYW5nZShwcGd0dCwgcGQsIHN0YXJ0LCBsZW5ndGgpOwogCX0KIAogCWZyZWVf Z2VuOF90ZW1wX2JpdG1hcHMobmV3X3BhZ2VfZGlycywgbmV3X3BhZ2VfdGFibGVzLCBwZHBlcyk7 CkBAIC0xMTEzLDE3ICsxMTMyLDM4IEBAIHN0YXRpYyBpbnQgZ2VuOF9hbGxvY192YV9yYW5nZShz dHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIGVycl9vdXQ6CiAJd2hpbGUgKHBkcGUtLSkg ewogCQlmb3JfZWFjaF9zZXRfYml0KHRlbXAsIG5ld19wYWdlX3RhYmxlc1twZHBlXSwgSTkxNV9Q REVTKQotCQkJZnJlZV9wdCh2bS0+ZGV2LCBwcGd0dC0+cGRwLnBhZ2VfZGlyZWN0b3J5W3BkcGVd LT5wYWdlX3RhYmxlW3RlbXBdKTsKKwkJCWZyZWVfcHQoZGV2LCBwZHAtPnBhZ2VfZGlyZWN0b3J5 W3BkcGVdLT5wYWdlX3RhYmxlW3RlbXBdKTsKIAl9CiAKIAlmb3JfZWFjaF9zZXRfYml0KHBkcGUs IG5ld19wYWdlX2RpcnMsIHBkcGVzKQotCQlmcmVlX3BkKHZtLT5kZXYsIHBwZ3R0LT5wZHAucGFn ZV9kaXJlY3RvcnlbcGRwZV0pOworCQlmcmVlX3BkKGRldiwgcGRwLT5wYWdlX2RpcmVjdG9yeVtw ZHBlXSk7CiAKIAlmcmVlX2dlbjhfdGVtcF9iaXRtYXBzKG5ld19wYWdlX2RpcnMsIG5ld19wYWdl X3RhYmxlcywgcGRwZXMpOwogCW1hcmtfdGxic19kaXJ0eShwcGd0dCk7CiAJcmV0dXJuIHJldDsK IH0KIAorc3RhdGljIGludCBnZW44X2FsbG9jX3ZhX3JhbmdlXzRsdmwoc3RydWN0IGk5MTVfYWRk cmVzc19zcGFjZSAqdm0sCisJCQkJICAgIHN0cnVjdCBpOTE1X3BtbDQgKnBtbDQsCisJCQkJICAg IHVpbnQ2NF90IHN0YXJ0LAorCQkJCSAgICB1aW50NjRfdCBsZW5ndGgpCit7CisJV0FSTl9PTigx KTsgLyogdG8gYmUgaW1wbGVtZW50ZWQgbGF0ZXIgKi8KKwlyZXR1cm4gMDsKK30KKworc3RhdGlj IGludCBnZW44X2FsbG9jX3ZhX3JhbmdlKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAor CQkJICAgICAgIHVpbnQ2NF90IHN0YXJ0LCB1aW50NjRfdCBsZW5ndGgpCit7CisJc3RydWN0IGk5 MTVfaHdfcHBndHQgKnBwZ3R0ID0KKwkJY29udGFpbmVyX29mKHZtLCBzdHJ1Y3QgaTkxNV9od19w cGd0dCwgYmFzZSk7CisKKwlpZiAoIVVTRVNfRlVMTF80OEJJVF9QUEdUVCh2bS0+ZGV2KSkKKwkJ cmV0dXJuIGdlbjhfYWxsb2NfdmFfcmFuZ2VfM2x2bCh2bSwgJnBwZ3R0LT5wZHAsIHN0YXJ0LCBs ZW5ndGgpOworCWVsc2UKKwkJcmV0dXJuIGdlbjhfYWxsb2NfdmFfcmFuZ2VfNGx2bCh2bSwgJnBw Z3R0LT5wbWw0LCBzdGFydCwgbGVuZ3RoKTsKK30KKwogLyogV2l0aCBzb21lIGFyY2hpdGVjdHVy ZXMgYW5kIDMyYml0IGxlZ2FjeSBtb2RlLCBoYXJkd2FyZSBwcmUtbG9hZHMgdGhlCiAgKiB0b3Ag bGV2ZWwgcGRwcyBidXQgdGhlIHRsYiBpbnZhbGlkYXRpb24gb25seSBpbnZhbGlkYXRlcyB0aGUg bG93ZXIgbGV2ZWxzLgogICogVGhpcyBtaWdodCBsZWFkIHRvIGh3IGZldGNoaW5nIHdpdGggc3Rh bGUgcGRwIGVudHJpZXMgaWYgdG9wIGxldmVsCkBAIC0xMTU4LDcgKzExOTgsNyBAQCBzdGF0aWMg aW50IGdlbjhfcHJlYWxsb2NhdGVfdG9wX2xldmVsX3BkcHMoc3RydWN0IGk5MTVfaHdfcHBndHQg KnBwZ3R0KQogCS8qIEFsbG9jYXRlIGZvciBhbGwgcGRwcyByZWdhcmRsZXNzIG9mIGhvdyB0aGUg cHBndHQKIAkgKiB3YXMgZGVmaW5lZC4KIAkgKi8KLQlyZXQgPSBnZW44X3BwZ3R0X2FsbG9jX3Bh Z2VfZGlyZWN0b3JpZXMocHBndHQsICZwcGd0dC0+cGRwLAorCXJldCA9IGdlbjhfcHBndHRfYWxs b2NfcGFnZV9kaXJlY3RvcmllcygmcHBndHQtPmJhc2UsICZwcGd0dC0+cGRwLAogCQkJCQkJMCwg MVVMTCA8PCAzMiwKIAkJCQkJCW5ld19wYWdlX2RpcnMpOwogCi0tIAoyLjQuMAoKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcg bGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVz a3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK