From: Dave Gordon Subject: [PATCH v3] drm/i915: introduce & use i915_gem_object_{set, clear, is}_dirty() Date: Wed, 14 Sep 2016 15:48:42 +0100 Message-ID: <1473864522-6797-1-git-send-email-david.s.gordon@intel.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2D7856E754 for ; Wed, 14 Sep 2016 14:48:53 +0000 (UTC) In-Reply-To: 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 VGhpcyBqdXN0IGhpZGVzIHRoZSBleGlzdGluZyBvYmotPmRpcnR5IGZsYWcgaW5zaWRlIGEgdHJp dmlhbCBpbmxpbmUKc2V0dGVyLCB0byBkaXNjb3VyYWdlIG5vbi1HRU0gY29kZSBmcm9tIGxvb2tp bmcgdG9vIGNsb3NlbHkuIFRoZQpmbGFnIGlzIHJlbmFtZWQgdG8gZW1waGFzaXNlIHRoYXQgaXQg aXMgcHJpdmF0ZSB0byB0aGUgR0VNIG1lbW9yeS0KbWFuYWdlbWVudCBjb2RlIGFuZCBlbnN1cmUg dGhhdCBubyBsZWdhY3kgY29kZSBjb250aW51ZXMgdG8gdXNlIGl0CmRpcmVjdGx5LgoKdjI6ClVz ZSBDaHJpcyBXaWxzb24ncyBwcmVmZXJyZWQgbmFtZXMgZm9yIGZsYWctcmVsYXRlZCBmdW5jdGlv bnMKCnYzOgpSZW1vdmUgYSBjb3VwbGUgb2YgY2hhbmdlcyBsZWZ0IG92ZXIgZnJvbSBhIHByb3Rv dHlwZSB2ZXJzaW9uCgpJbnNwaXJlZC1ieTogaHR0cDovL3d3dy5zcGluaWNzLm5ldC9saXN0cy9p bnRlbC1nZngvbXNnOTIzOTAuaHRtbApDYzogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxz b24uY28udWs+CkNjOiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AbGludXguaW50ZWwu Y29tPgpTaWduZWQtb2ZmLWJ5OiBEYXZlIEdvcmRvbiA8ZGF2aWQucy5nb3Jkb25AaW50ZWwuY29t PgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jICAgICAgICB8ICAyICst CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICAgICAgICAgfCAyMiArKysrKysr KysrKysrKysrKysrKystCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jICAgICAgICAg ICAgfCAyMyArKysrKysrKysrKystLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9nZW1fY29udGV4dC5jICAgIHwgIDYgKysrKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbV9leGVjYnVmZmVyLmMgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1f dXNlcnB0ci5jICAgIHwgMTIgKysrKysrKy0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dwdV9lcnJvci5jICAgICAgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJj LmMgICAgICAgICAgIHwgMjkgKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0KIDggZmlsZXMg Y2hhbmdlZCwgNjMgaW5zZXJ0aW9ucygrKSwgMzUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2RlYnVnZnMuYwppbmRleCA2NDcwMmNjLi44YWNmMjgxIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2RlYnVnZnMuYwpAQCAtMTYwLDcgKzE2MCw3IEBAIHN0YXRpYyB1NjQgaTkxNV9nZW1f b2JqX3RvdGFsX2dndHRfc2l6ZShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqKQogCQkg ICBpOTE1X2dlbV9hY3RpdmVfZ2V0X3NlcW5vKCZvYmotPmxhc3Rfd3JpdGUsCiAJCQkJCSAgICAg Jm9iai0+YmFzZS5kZXYtPnN0cnVjdF9tdXRleCksCiAJCSAgIGk5MTVfY2FjaGVfbGV2ZWxfc3Ry KGRldl9wcml2LCBvYmotPmNhY2hlX2xldmVsKSwKLQkJICAgb2JqLT5kaXJ0eSA/ICIgZGlydHki IDogIiIsCisJCSAgIGk5MTVfZ2VtX29iamVjdF9pc19kaXJ0eShvYmopID8gIiBkaXJ0eSIgOiAi IiwKIAkJICAgb2JqLT5tYWR2ID09IEk5MTVfTUFEVl9ET05UTkVFRCA/ICIgcHVyZ2VhYmxlIiA6 ICIiKTsKIAlpZiAob2JqLT5iYXNlLm5hbWUpCiAJCXNlcV9wcmludGYobSwgIiAobmFtZTogJWQp Iiwgb2JqLT5iYXNlLm5hbWUpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggMWUyZGRhOC4u M2ZlZDAwNCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC0yMjEyLDcgKzIyMTIsNyBAQCBz dHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCB7CiAJICogVGhpcyBpcyBzZXQgaWYgdGhlIG9iamVj dCBoYXMgYmVlbiB3cml0dGVuIHRvIHNpbmNlIGxhc3QgYm91bmQKIAkgKiB0byB0aGUgR1RUCiAJ ICovCi0JdW5zaWduZWQgaW50IGRpcnR5OjE7CisJdW5zaWduZWQgaW50IF9fZGlydHk6MTsKIAog CS8qKgogCSAqIEFkdmljZTogYXJlIHRoZSBiYWNraW5nIHBhZ2VzIHB1cmdlYWJsZT8KQEAgLTMx NTksNiArMzE1OSwyNiBAQCBzdGF0aWMgaW5saW5lIHZvaWQgaTkxNV9nZW1fb2JqZWN0X3Bpbl9w YWdlcyhzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqKQogCW9iai0+cGFnZXNfcGluX2Nv dW50Kys7CiB9CiAKKy8qCisgKiBGbGFnIHRoZSBvYmplY3QgY29udGVudCBhcyBoYXZpbmcgY2hh bmdlZCBzaW5jZSB0aGUgbGFzdCBjYWxsIHRvCisgKiBpOTE1X2dlbV9vYmplY3RfcGluX3BhZ2Vz KCkgYWJvdmUsIHNvIHRoYXQgdGhlIG5ldyBjb250ZW50IGlzIG5vdAorICogbG9zdCBhZnRlciB0 aGUgbmV4dCBjYWxsIHRvIGk5MTVfZ2VtX29iamVjdF91bnBpbl9wYWdlcygpIGJlbG93CisgKi8K K3N0YXRpYyBpbmxpbmUgdm9pZCBpOTE1X2dlbV9vYmplY3Rfc2V0X2RpcnR5KHN0cnVjdCBkcm1f aTkxNV9nZW1fb2JqZWN0ICpvYmopCit7CisJb2JqLT5fX2RpcnR5ID0gdHJ1ZTsKK30KKworc3Rh dGljIGlubGluZSB2b2lkIGk5MTVfZ2VtX29iamVjdF9jbGVhcl9kaXJ0eShzdHJ1Y3QgZHJtX2k5 MTVfZ2VtX29iamVjdCAqb2JqKQoreworCW9iai0+X19kaXJ0eSA9IGZhbHNlOworfQorCitzdGF0 aWMgaW5saW5lIGJvb2wgaTkxNV9nZW1fb2JqZWN0X2lzX2RpcnR5KHN0cnVjdCBkcm1faTkxNV9n ZW1fb2JqZWN0ICpvYmopCit7CisJcmV0dXJuIG9iai0+X19kaXJ0eTsKK30KKwogc3RhdGljIGlu bGluZSB2b2lkIGk5MTVfZ2VtX29iamVjdF91bnBpbl9wYWdlcyhzdHJ1Y3QgZHJtX2k5MTVfZ2Vt X29iamVjdCAqb2JqKQogewogCUJVR19PTihvYmotPnBhZ2VzX3Bpbl9jb3VudCA9PSAwKTsKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IGM4YmQwMjIuLjA4YzhmNmIgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9nZW0uYwpAQCAtMjM0LDkgKzIzNCw4IEBAIGludCBpOTE1X211dGV4X2xvY2tfaW50ZXJy dXB0aWJsZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCX0KIAogCWlmIChvYmotPm1hZHYgPT0g STkxNV9NQURWX0RPTlRORUVEKQotCQlvYmotPmRpcnR5ID0gMDsKLQotCWlmIChvYmotPmRpcnR5 KSB7CisJCWk5MTVfZ2VtX29iamVjdF9jbGVhcl9kaXJ0eShvYmopOworCWVsc2UgaWYgKGk5MTVf Z2VtX29iamVjdF9pc19kaXJ0eShvYmopKSB7CiAJCXN0cnVjdCBhZGRyZXNzX3NwYWNlICptYXBw aW5nID0gb2JqLT5iYXNlLmZpbHAtPmZfbWFwcGluZzsKIAkJY2hhciAqdmFkZHIgPSBvYmotPnBo eXNfaGFuZGxlLT52YWRkcjsKIAkJaW50IGk7CkBAIC0yNjAsNyArMjU5LDcgQEAgaW50IGk5MTVf bXV0ZXhfbG9ja19pbnRlcnJ1cHRpYmxlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCQlwdXRf cGFnZShwYWdlKTsKIAkJCXZhZGRyICs9IFBBR0VfU0laRTsKIAkJfQotCQlvYmotPmRpcnR5ID0g MDsKKwkJaTkxNV9nZW1fb2JqZWN0X2NsZWFyX2RpcnR5KG9iaik7CiAJfQogCiAJc2dfZnJlZV90 YWJsZShvYmotPnBhZ2VzKTsKQEAgLTcwNCw3ICs3MDMsNyBAQCBpbnQgaTkxNV9nZW1fb2JqX3By ZXBhcmVfc2htZW1fd3JpdGUoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwKIAkJb2Jq LT5jYWNoZV9kaXJ0eSA9IHRydWU7CiAKIAlpbnRlbF9mYl9vYmpfaW52YWxpZGF0ZShvYmosIE9S SUdJTl9DUFUpOwotCW9iai0+ZGlydHkgPSAxOworCWk5MTVfZ2VtX29iamVjdF9zZXRfZGlydHko b2JqKTsKIAkvKiByZXR1cm4gd2l0aCB0aGUgcGFnZXMgcGlubmVkICovCiAJcmV0dXJuIDA7CiAK QEAgLTExNTcsNyArMTE1Niw3IEBAIGludCBpOTE1X2dlbV9vYmpfcHJlcGFyZV9zaG1lbV93cml0 ZShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAogCQlnb3RvIG91dF91bnBpbjsKIAog CWludGVsX2ZiX29ial9pbnZhbGlkYXRlKG9iaiwgT1JJR0lOX0NQVSk7Ci0Jb2JqLT5kaXJ0eSA9 IHRydWU7CisJaTkxNV9nZW1fb2JqZWN0X3NldF9kaXJ0eShvYmopOwogCiAJdXNlcl9kYXRhID0g dTY0X3RvX3VzZXJfcHRyKGFyZ3MtPmRhdGFfcHRyKTsKIAlvZmZzZXQgPSBhcmdzLT5vZmZzZXQ7 CkBAIC0yMTM0LDYgKzIxMzMsNyBAQCBzdGF0aWMgdm9pZCBpOTE1X2dlbV9vYmplY3RfZnJlZV9t bWFwX29mZnNldChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqKQogewogCXN0cnVjdCBz Z3RfaXRlciBzZ3RfaXRlcjsKIAlzdHJ1Y3QgcGFnZSAqcGFnZTsKKwlib29sIGRpcnR5OwogCWlu dCByZXQ7CiAKIAlCVUdfT04ob2JqLT5tYWR2ID09IF9fSTkxNV9NQURWX1BVUkdFRCk7CkBAIC0y MTUzLDEwICsyMTUzLDExIEBAIHN0YXRpYyB2b2lkIGk5MTVfZ2VtX29iamVjdF9mcmVlX21tYXBf b2Zmc2V0KHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmopCiAJCWk5MTVfZ2VtX29iamVj dF9zYXZlX2JpdF8xN19zd2l6emxlKG9iaik7CiAKIAlpZiAob2JqLT5tYWR2ID09IEk5MTVfTUFE Vl9ET05UTkVFRCkKLQkJb2JqLT5kaXJ0eSA9IDA7CisJCWk5MTVfZ2VtX29iamVjdF9jbGVhcl9k aXJ0eShvYmopOwogCisJZGlydHkgPSBpOTE1X2dlbV9vYmplY3RfaXNfZGlydHkob2JqKTsKIAlm b3JfZWFjaF9zZ3RfcGFnZShwYWdlLCBzZ3RfaXRlciwgb2JqLT5wYWdlcykgewotCQlpZiAob2Jq LT5kaXJ0eSkKKwkJaWYgKGRpcnR5KQogCQkJc2V0X3BhZ2VfZGlydHkocGFnZSk7CiAKIAkJaWYg KG9iai0+bWFkdiA9PSBJOTE1X01BRFZfV0lMTE5FRUQpCkBAIC0yMTY0LDcgKzIxNjUsNyBAQCBz dGF0aWMgdm9pZCBpOTE1X2dlbV9vYmplY3RfZnJlZV9tbWFwX29mZnNldChzdHJ1Y3QgZHJtX2k5 MTVfZ2VtX29iamVjdCAqb2JqKQogCiAJCXB1dF9wYWdlKHBhZ2UpOwogCX0KLQlvYmotPmRpcnR5 ID0gMDsKKwlpOTE1X2dlbV9vYmplY3RfY2xlYXJfZGlydHkob2JqKTsKIAogCXNnX2ZyZWVfdGFi bGUob2JqLT5wYWdlcyk7CiAJa2ZyZWUob2JqLT5wYWdlcyk7CkBAIC0zMjY1LDcgKzMyNjYsNyBA QCBzdGF0aWMgdm9pZCBpOTE1X2dlbV9vYmplY3RfYnVtcF9pbmFjdGl2ZV9nZ3R0KHN0cnVjdCBk cm1faTkxNV9nZW1fb2JqZWN0ICpvYmopCiAJaWYgKHdyaXRlKSB7CiAJCW9iai0+YmFzZS5yZWFk X2RvbWFpbnMgPSBJOTE1X0dFTV9ET01BSU5fR1RUOwogCQlvYmotPmJhc2Uud3JpdGVfZG9tYWlu ID0gSTkxNV9HRU1fRE9NQUlOX0dUVDsKLQkJb2JqLT5kaXJ0eSA9IDE7CisJCWk5MTVfZ2VtX29i amVjdF9zZXRfZGlydHkob2JqKTsKIAl9CiAKIAl0cmFjZV9pOTE1X2dlbV9vYmplY3RfY2hhbmdl X2RvbWFpbihvYmosCkBAIC00NzQzLDcgKzQ3NDQsNyBAQCBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29i amVjdCAqCiAJaTkxNV9nZW1fb2JqZWN0X3Bpbl9wYWdlcyhvYmopOwogCXNnID0gb2JqLT5wYWdl czsKIAlieXRlcyA9IHNnX2NvcHlfZnJvbV9idWZmZXIoc2ctPnNnbCwgc2ctPm5lbnRzLCAodm9p ZCAqKWRhdGEsIHNpemUpOwotCW9iai0+ZGlydHkgPSAxOwkJLyogQmFja2luZyBzdG9yZSBpcyBu b3cgb3V0IG9mIGRhdGUgKi8KKwlpOTE1X2dlbV9vYmplY3Rfc2V0X2RpcnR5KG9iaik7IC8qIEJh Y2tpbmcgc3RvcmUgaXMgbm93IG91dCBvZiBkYXRlICovCiAJaTkxNV9nZW1fb2JqZWN0X3VucGlu X3BhZ2VzKG9iaik7CiAKIAlpZiAoV0FSTl9PTihieXRlcyAhPSBzaXplKSkgewpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jCmluZGV4IGRmMTBmNGU5Li40YjljOWVmIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jCkBAIC04MTgsNiArODE4LDggQEAg c3RhdGljIGludCBkb19yY3Nfc3dpdGNoKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVx KQogCSAqIE1JX1NFVF9DT05URVhUIGluc3RlYWQgb2Ygd2hlbiB0aGUgbmV4dCBzZXFubyBoYXMg Y29tcGxldGVkLgogCSAqLwogCWlmIChmcm9tICE9IE5VTEwpIHsKKwkJc3RydWN0IGk5MTVfdm1h ICpmcm9tX3ZtYSA9IGZyb20tPmVuZ2luZVtSQ1NdLnN0YXRlOworCiAJCS8qIEFzIGxvbmcgYXMg TUlfU0VUX0NPTlRFWFQgaXMgc2VyaWFsaXppbmcsIGllLiBpdCBmbHVzaGVzIHRoZQogCQkgKiB3 aG9sZSBkYW1uIHBpcGVsaW5lLCB3ZSBkb24ndCBuZWVkIHRvIGV4cGxpY2l0bHkgbWFyayB0aGUK IAkJICogb2JqZWN0IGRpcnR5LiBUaGUgb25seSBleGNlcHRpb24gaXMgdGhhdCB0aGUgY29udGV4 dCBtdXN0IGJlCkBAIC04MjUsOSArODI3LDkgQEAgc3RhdGljIGludCBkb19yY3Nfc3dpdGNoKHN0 cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxKQogCQkgKiBhYmxlIHRvIGRlZmVyIGRvaW5n IHRoaXMgdW50aWwgd2Uga25vdyB0aGUgb2JqZWN0IHdvdWxkIGJlCiAJCSAqIHN3YXBwZWQsIGJ1 dCB0aGVyZSBpcyBubyB3YXkgdG8gZG8gdGhhdCB5ZXQuCiAJCSAqLwotCQlpOTE1X3ZtYV9tb3Zl X3RvX2FjdGl2ZShmcm9tLT5lbmdpbmVbUkNTXS5zdGF0ZSwgcmVxLCAwKTsKKwkJaTkxNV92bWFf bW92ZV90b19hY3RpdmUoZnJvbV92bWEsIHJlcSwgMCk7CiAJCS8qIHN0YXRlIGlzIGtlcHQgYWxp dmUgdW50aWwgdGhlIG5leHQgcmVxdWVzdCAqLwotCQlpOTE1X3ZtYV91bnBpbihmcm9tLT5lbmdp bmVbUkNTXS5zdGF0ZSk7CisJCWk5MTVfdm1hX3VucGluKGZyb21fdm1hKTsKIAkJaTkxNV9nZW1f Y29udGV4dF9wdXQoZnJvbSk7CiAJfQogCWVuZ2luZS0+bGFzdF9jb250ZXh0ID0gaTkxNV9nZW1f Y29udGV4dF9nZXQodG8pOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW1fZXhlY2J1ZmZlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZl ci5jCmluZGV4IDMzYzg1MjIuLjIzOWI0MzAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbV9leGVjYnVmZmVyLmMKQEAgLTEyOTAsNyArMTI5MCw3IEBAIHZvaWQgaTkxNV92bWFfbW92 ZV90b19hY3RpdmUoc3RydWN0IGk5MTVfdm1hICp2bWEsCiAKIAlHRU1fQlVHX09OKCFkcm1fbW1f bm9kZV9hbGxvY2F0ZWQoJnZtYS0+bm9kZSkpOwogCi0Jb2JqLT5kaXJ0eSA9IDE7IC8qIGJlIHBh cmFub2lkICAqLworCWk5MTVfZ2VtX29iamVjdF9zZXRfZGlydHkob2JqKTsgLyogYmUgcGFyYW5v aWQgICovCiAKIAkvKiBBZGQgYSByZWZlcmVuY2UgaWYgd2UncmUgbmV3bHkgZW50ZXJpbmcgdGhl IGFjdGl2ZSBsaXN0LgogCSAqIFRoZSBvcmRlciBpbiB3aGljaCB3ZSBhZGQgb3BlcmF0aW9ucyB0 byB0aGUgcmV0aXJlbWVudCBxdWV1ZSBpcwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9nZW1fdXNlcnB0ci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fdXNl cnB0ci5jCmluZGV4IGU1Mzc5MzAuLjE3MDdhYWYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtX3VzZXJwdHIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbV91c2VycHRyLmMKQEAgLTY3NCwyMyArNjc0LDI1IEBAIHN0cnVjdCBnZXRfcGFnZXNfd29y ayB7CiB7CiAJc3RydWN0IHNndF9pdGVyIHNndF9pdGVyOwogCXN0cnVjdCBwYWdlICpwYWdlOwor CWJvb2wgZGlydHk7CiAKIAlCVUdfT04ob2JqLT51c2VycHRyLndvcmsgIT0gTlVMTCk7CiAJX19p OTE1X2dlbV91c2VycHRyX3NldF9hY3RpdmUob2JqLCBmYWxzZSk7CiAKLQlpZiAob2JqLT5tYWR2 ICE9IEk5MTVfTUFEVl9XSUxMTkVFRCkKLQkJb2JqLT5kaXJ0eSA9IDA7Ci0KIAlpOTE1X2dlbV9n dHRfZmluaXNoX29iamVjdChvYmopOwogCisJaWYgKG9iai0+bWFkdiAhPSBJOTE1X01BRFZfV0lM TE5FRUQpCisJCWk5MTVfZ2VtX29iamVjdF9jbGVhcl9kaXJ0eShvYmopOworCisJZGlydHkgPSBp OTE1X2dlbV9vYmplY3RfaXNfZGlydHkob2JqKTsKIAlmb3JfZWFjaF9zZ3RfcGFnZShwYWdlLCBz Z3RfaXRlciwgb2JqLT5wYWdlcykgewotCQlpZiAob2JqLT5kaXJ0eSkKKwkJaWYgKGRpcnR5KQog CQkJc2V0X3BhZ2VfZGlydHkocGFnZSk7CiAKIAkJbWFya19wYWdlX2FjY2Vzc2VkKHBhZ2UpOwog CQlwdXRfcGFnZShwYWdlKTsKIAl9Ci0Jb2JqLT5kaXJ0eSA9IDA7CisJaTkxNV9nZW1fb2JqZWN0 X2NsZWFyX2RpcnR5KG9iaik7CiAKIAlzZ19mcmVlX3RhYmxlKG9iai0+cGFnZXMpOwogCWtmcmVl KG9iai0+cGFnZXMpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVf ZXJyb3IuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMKaW5kZXggMzM0 ZjE1ZC4uMjU3ZGRlMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVf ZXJyb3IuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jCkBAIC04 MDQsNyArODA0LDcgQEAgc3RhdGljIHZvaWQgY2FwdHVyZV9ibyhzdHJ1Y3QgZHJtX2k5MTVfZXJy b3JfYnVmZmVyICplcnIsCiAJZXJyLT53cml0ZV9kb21haW4gPSBvYmotPmJhc2Uud3JpdGVfZG9t YWluOwogCWVyci0+ZmVuY2VfcmVnID0gdm1hLT5mZW5jZSA/IHZtYS0+ZmVuY2UtPmlkIDogLTE7 CiAJZXJyLT50aWxpbmcgPSBpOTE1X2dlbV9vYmplY3RfZ2V0X3RpbGluZyhvYmopOwotCWVyci0+ ZGlydHkgPSBvYmotPmRpcnR5OworCWVyci0+ZGlydHkgPSBpOTE1X2dlbV9vYmplY3RfaXNfZGly dHkob2JqKTsKIAllcnItPnB1cmdlYWJsZSA9IG9iai0+bWFkdiAhPSBJOTE1X01BRFZfV0lMTE5F RUQ7CiAJZXJyLT51c2VycHRyID0gb2JqLT51c2VycHRyLm1tICE9IE5VTEw7CiAJZXJyLT5jYWNo ZV9sZXZlbCA9IG9iai0+Y2FjaGVfbGV2ZWw7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9scmMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCmluZGV4 IDE2ZDdjZGQuLmNiOTE1YWYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2xyYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCkBAIC03MDcsNiAr NzA3LDggQEAgc3RhdGljIGludCBpbnRlbF9scl9jb250ZXh0X3BpbihzdHJ1Y3QgaTkxNV9nZW1f Y29udGV4dCAqY3R4LAogCQkJCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIHsKIAlz dHJ1Y3QgaW50ZWxfY29udGV4dCAqY2UgPSAmY3R4LT5lbmdpbmVbZW5naW5lLT5pZF07CisJc3Ry dWN0IGludGVsX3JpbmcgKnJpbmcgPSBjZS0+cmluZzsKKwlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29i amVjdCAqY3R4X29iajsKIAl2b2lkICp2YWRkcjsKIAl1MzIgKmxyY19yZWdfc3RhdGU7CiAJaW50 IHJldDsKQEAgLTcyMSwyNCArNzIzLDI0IEBAIHN0YXRpYyBpbnQgaW50ZWxfbHJfY29udGV4dF9w aW4oc3RydWN0IGk5MTVfZ2VtX2NvbnRleHQgKmN0eCwKIAlpZiAocmV0KQogCQlnb3RvIGVycjsK IAotCXZhZGRyID0gaTkxNV9nZW1fb2JqZWN0X3Bpbl9tYXAoY2UtPnN0YXRlLT5vYmosIEk5MTVf TUFQX1dCKTsKKwljdHhfb2JqID0gY2UtPnN0YXRlLT5vYmo7CisJdmFkZHIgPSBpOTE1X2dlbV9v YmplY3RfcGluX21hcChjdHhfb2JqLCBJOTE1X01BUF9XQik7CiAJaWYgKElTX0VSUih2YWRkcikp IHsKIAkJcmV0ID0gUFRSX0VSUih2YWRkcik7CiAJCWdvdG8gdW5waW5fdm1hOwogCX0KIAotCWxy Y19yZWdfc3RhdGUgPSB2YWRkciArIExSQ19TVEFURV9QTiAqIFBBR0VfU0laRTsKLQotCXJldCA9 IGludGVsX3JpbmdfcGluKGNlLT5yaW5nKTsKKwlyZXQgPSBpbnRlbF9yaW5nX3BpbihyaW5nKTsK IAlpZiAocmV0KQogCQlnb3RvIHVucGluX21hcDsKIAotCWludGVsX2xyX2NvbnRleHRfZGVzY3Jp cHRvcl91cGRhdGUoY3R4LCBlbmdpbmUpOworCWk5MTVfZ2VtX29iamVjdF9zZXRfZGlydHkoY3R4 X29iaik7CiAKLQlscmNfcmVnX3N0YXRlW0NUWF9SSU5HX0JVRkZFUl9TVEFSVCsxXSA9Ci0JCWk5 MTVfZ2d0dF9vZmZzZXQoY2UtPnJpbmctPnZtYSk7CisJbHJjX3JlZ19zdGF0ZSA9IHZhZGRyICsg TFJDX1NUQVRFX1BOICogUEFHRV9TSVpFOworCWxyY19yZWdfc3RhdGVbQ1RYX1JJTkdfQlVGRkVS X1NUQVJUKzFdID0gaTkxNV9nZ3R0X29mZnNldChyaW5nLT52bWEpOwogCWNlLT5scmNfcmVnX3N0 YXRlID0gbHJjX3JlZ19zdGF0ZTsKLQljZS0+c3RhdGUtPm9iai0+ZGlydHkgPSB0cnVlOworCisJ aW50ZWxfbHJfY29udGV4dF9kZXNjcmlwdG9yX3VwZGF0ZShjdHgsIGVuZ2luZSk7CiAKIAkvKiBJ bnZhbGlkYXRlIEd1QyBUTEIuICovCiAJaWYgKGk5MTUuZW5hYmxlX2d1Y19zdWJtaXNzaW9uKSB7 CkBAIC0xOTIxLDcgKzE5MjMsNyBAQCBzdGF0aWMgdTMyIGludGVsX2xyX2luZGlyZWN0X2N0eF9v ZmZzZXQoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogCQlEUk1fREVCVUdfRFJJVkVS KCJDb3VsZCBub3QgbWFwIG9iamVjdCBwYWdlcyEgKCVkKVxuIiwgcmV0KTsKIAkJcmV0dXJuIHJl dDsKIAl9Ci0JY3R4X29iai0+ZGlydHkgPSB0cnVlOworCWk5MTVfZ2VtX29iamVjdF9zZXRfZGly dHkoY3R4X29iaik7CiAKIAkvKiBUaGUgc2Vjb25kIHBhZ2Ugb2YgdGhlIGNvbnRleHQgb2JqZWN0 IGNvbnRhaW5zIHNvbWUgZmllbGRzIHdoaWNoIG11c3QKIAkgKiBiZSBzZXQgdXAgcHJpb3IgdG8g dGhlIGZpcnN0IGV4ZWN1dGlvbi4gKi8KQEAgLTIxMzQsMjMgKzIxMzYsMjQgQEAgdm9pZCBpbnRl bF9scl9jb250ZXh0X3Jlc3VtZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAK IAlmb3JfZWFjaF9lbmdpbmUoZW5naW5lLCBkZXZfcHJpdikgewogCQlzdHJ1Y3QgaW50ZWxfY29u dGV4dCAqY2UgPSAmY3R4LT5lbmdpbmVbZW5naW5lLT5pZF07CisJCXN0cnVjdCBkcm1faTkxNV9n ZW1fb2JqZWN0ICpjdHhfb2JqOwogCQl2b2lkICp2YWRkcjsKIAkJdWludDMyX3QgKnJlZ19zdGF0 ZTsKIAogCQlpZiAoIWNlLT5zdGF0ZSkKIAkJCWNvbnRpbnVlOwogCi0JCXZhZGRyID0gaTkxNV9n ZW1fb2JqZWN0X3Bpbl9tYXAoY2UtPnN0YXRlLT5vYmosIEk5MTVfTUFQX1dCKTsKKwkJY3R4X29i aiA9IGNlLT5zdGF0ZS0+b2JqOworCQl2YWRkciA9IGk5MTVfZ2VtX29iamVjdF9waW5fbWFwKGN0 eF9vYmosIEk5MTVfTUFQX1dCKTsKIAkJaWYgKFdBUk5fT04oSVNfRVJSKHZhZGRyKSkpCiAJCQlj b250aW51ZTsKIAogCQlyZWdfc3RhdGUgPSB2YWRkciArIExSQ19TVEFURV9QTiAqIFBBR0VfU0la RTsKLQogCQlyZWdfc3RhdGVbQ1RYX1JJTkdfSEVBRCsxXSA9IDA7CiAJCXJlZ19zdGF0ZVtDVFhf UklOR19UQUlMKzFdID0gMDsKIAotCQljZS0+c3RhdGUtPm9iai0+ZGlydHkgPSB0cnVlOwotCQlp OTE1X2dlbV9vYmplY3RfdW5waW5fbWFwKGNlLT5zdGF0ZS0+b2JqKTsKKwkJaTkxNV9nZW1fb2Jq ZWN0X3NldF9kaXJ0eShjdHhfb2JqKTsKKwkJaTkxNV9nZW1fb2JqZWN0X3VucGluX21hcChjdHhf b2JqKTsKIAogCQljZS0+cmluZy0+aGVhZCA9IDA7CiAJCWNlLT5yaW5nLT50YWlsID0gMDsKLS0g CjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJ bnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0 cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK