From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 32/64] drm/i915: Remove obsolete engine->gpu_caches_dirty Date: Thu, 7 Jul 2016 09:41:38 +0100 Message-ID: <1467880930-23082-32-git-send-email-chris@chris-wilson.co.uk> References: <1467880930-23082-1-git-send-email-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id B049C6E753 for ; Thu, 7 Jul 2016 08:43:04 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id n127so1266248wme.0 for ; Thu, 07 Jul 2016 01:43:04 -0700 (PDT) In-Reply-To: <1467880930-23082-1-git-send-email-chris@chris-wilson.co.uk> 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 U3BhY2UgZm9yIGZsdXNoaW5nIHRoZSBHUFUgY2FjaGUgcHJpb3IgdG8gY29tcGxldGluZyB0aGUg cmVxdWVzdCBpcwpwcmVhbGxvY2F0ZWQgYW5kIHNvIGNhbm5vdCBmYWlsLgoKU2lnbmVkLW9mZi1i eTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+Ci0tLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYyB8ICA5ICstLS0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtX2d0dC5jICAgICAgICB8IDE4ICsrKystLS0tCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbV9yZXF1ZXN0LmMgICAgfCAgNyArKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2xyYy5jICAgICAgICAgICB8IDQ3ICsrKy0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2xyYy5oICAgICAgICAgICB8ICAyIC0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYyAgICB8IDcyICsrKysrKystLS0tLS0tLS0tLS0tLS0t LS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oICAgIHwgIDcg LS0tCiA4IGZpbGVzIGNoYW5nZWQsIDM5IGluc2VydGlvbnMoKyksIDEyNSBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMKaW5kZXggZDBjZTAxZDM2ODRj Li4zMjA1MWE2ODI0NmYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt X2NvbnRleHQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMK QEAgLTU2Nyw3ICs1NjcsNyBAQCBtaV9zZXRfY29udGV4dChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3Jl cXVlc3QgKnJlcSwgdTMyIGh3X2ZsYWdzKQogCSAqIGl0bGJfYmVmb3JlX2N0eF9zd2l0Y2guCiAJ ICovCiAJaWYgKElTX0dFTjYoZGV2X3ByaXYpKSB7Ci0JCXJldCA9IHJlcS0+ZW5naW5lLT5mbHVz aChyZXEsIEk5MTVfR0VNX0dQVV9ET01BSU5TLCAwKTsKKwkJcmV0ID0gcmVxLT5lbmdpbmUtPmVt aXRfZmx1c2gocmVxLCBJOTE1X0dFTV9HUFVfRE9NQUlOUywgMCk7CiAJCWlmIChyZXQpCiAJCQly ZXR1cm4gcmV0OwogCX0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt X2V4ZWNidWZmZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIu YwppbmRleCBlMDVjMjA1ZjJlMTkuLjNiNWQwM2EwNjNlYiAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYwpAQCAtOTcyLDEwICs5NzIsOCBAQCBpOTE1X2dlbV9l eGVjYnVmZmVyX21vdmVfdG9fZ3B1KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLAog CWlmIChmbHVzaF9kb21haW5zICYgSTkxNV9HRU1fRE9NQUlOX0dUVCkKIAkJd21iKCk7CiAKLQkv KiBVbmNvbmRpdGlvbmFsbHkgaW52YWxpZGF0ZSBncHUgY2FjaGVzIGFuZCBlbnN1cmUgdGhhdCB3 ZSBkbyBmbHVzaAotCSAqIGFueSByZXNpZHVhbCB3cml0ZXMgZnJvbSB0aGUgcHJldmlvdXMgYmF0 Y2guCi0JICovCi0JcmV0dXJuIGludGVsX2VuZ2luZV9pbnZhbGlkYXRlX2FsbF9jYWNoZXMocmVx KTsKKwkvKiBVbmNvbmRpdGlvbmFsbHkgaW52YWxpZGF0ZSBncHUgY2FjaGVzIGFuZCBUTEJzLiAq LworCXJldHVybiByZXEtPmVuZ2luZS0+ZW1pdF9mbHVzaChyZXEsIEk5MTVfR0VNX0dQVV9ET01B SU5TLCAwKTsKIH0KIAogc3RhdGljIGJvb2wKQEAgLTExNTYsOSArMTE1NCw2IEBAIGk5MTVfZ2Vt X2V4ZWNidWZmZXJfbW92ZV90b19hY3RpdmUoc3RydWN0IGxpc3RfaGVhZCAqdm1hcywKIHN0YXRp YyB2b2lkCiBpOTE1X2dlbV9leGVjYnVmZmVyX3JldGlyZV9jb21tYW5kcyhzdHJ1Y3QgaTkxNV9l eGVjYnVmZmVyX3BhcmFtcyAqcGFyYW1zKQogewotCS8qIFVuY29uZGl0aW9uYWxseSBmb3JjZSBh ZGRfcmVxdWVzdCB0byBlbWl0IGEgZnVsbCBmbHVzaC4gKi8KLQlwYXJhbXMtPmVuZ2luZS0+Z3B1 X2NhY2hlc19kaXJ0eSA9IHRydWU7Ci0KIAkvKiBBZGQgYSBicmVhZGNydW1iIGZvciB0aGUgY29t cGxldGlvbiBvZiB0aGUgYmF0Y2ggYnVmZmVyICovCiAJX19pOTE1X2FkZF9yZXF1ZXN0KHBhcmFt cy0+cmVxdWVzdCwgcGFyYW1zLT5iYXRjaF9vYmosIHRydWUpOwogfQpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbV9ndHQuYwppbmRleCBjNTM1NzgwMjE3MWIuLmEzZDljNzIzZGQwMiAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKQEAgLTE2NjQsOSArMTY2NCw5IEBAIHN0YXRpYyBpbnQg aHN3X21tX3N3aXRjaChzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQsCiAJaW50IHJldDsKIAog CS8qIE5COiBUTEJzIG11c3QgYmUgZmx1c2hlZCBhbmQgaW52YWxpZGF0ZWQgYmVmb3JlIGEgc3dp dGNoICovCi0JcmV0ID0gcmVxLT5lbmdpbmUtPmZsdXNoKHJlcSwKLQkJCQkgSTkxNV9HRU1fR1BV X0RPTUFJTlMsCi0JCQkJIEk5MTVfR0VNX0dQVV9ET01BSU5TKTsKKwlyZXQgPSByZXEtPmVuZ2lu ZS0+ZW1pdF9mbHVzaChyZXEsCisJCQkJICAgICAgSTkxNV9HRU1fR1BVX0RPTUFJTlMsCisJCQkJ ICAgICAgSTkxNV9HRU1fR1BVX0RPTUFJTlMpOwogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAK QEAgLTE2OTIsOSArMTY5Miw5IEBAIHN0YXRpYyBpbnQgZ2VuN19tbV9zd2l0Y2goc3RydWN0IGk5 MTVfaHdfcHBndHQgKnBwZ3R0LAogCWludCByZXQ7CiAKIAkvKiBOQjogVExCcyBtdXN0IGJlIGZs dXNoZWQgYW5kIGludmFsaWRhdGVkIGJlZm9yZSBhIHN3aXRjaCAqLwotCXJldCA9IHJlcS0+ZW5n aW5lLT5mbHVzaChyZXEsCi0JCQkJIEk5MTVfR0VNX0dQVV9ET01BSU5TLAotCQkJCSBJOTE1X0dF TV9HUFVfRE9NQUlOUyk7CisJcmV0ID0gcmVxLT5lbmdpbmUtPmVtaXRfZmx1c2gocmVxLAorCQkJ CSAgICAgIEk5MTVfR0VNX0dQVV9ET01BSU5TLAorCQkJCSAgICAgIEk5MTVfR0VNX0dQVV9ET01B SU5TKTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCkBAIC0xNzEyLDkgKzE3MTIsOSBAQCBz dGF0aWMgaW50IGdlbjdfbW1fc3dpdGNoKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwKIAog CS8qIFhYWDogUkNTIGlzIHRoZSBvbmx5IG9uZSB0byBhdXRvIGludmFsaWRhdGUgdGhlIFRMQnM/ ICovCiAJaWYgKHJlcS0+ZW5naW5lLT5pZCAhPSBSQ1MpIHsKLQkJcmV0ID0gcmVxLT5lbmdpbmUt PmZsdXNoKHJlcSwKLQkJCQkJIEk5MTVfR0VNX0dQVV9ET01BSU5TLAotCQkJCQkgSTkxNV9HRU1f R1BVX0RPTUFJTlMpOworCQlyZXQgPSByZXEtPmVuZ2luZS0+ZW1pdF9mbHVzaChyZXEsCisJCQkJ CSAgICAgIEk5MTVfR0VNX0dQVV9ET01BSU5TLAorCQkJCQkgICAgICBJOTE1X0dFTV9HUFVfRE9N QUlOUyk7CiAJCWlmIChyZXQpCiAJCQlyZXR1cm4gcmV0OwogCX0KZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlcXVlc3QuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtX3JlcXVlc3QuYwppbmRleCA0ZGM1MWUxOTkyNjkuLmY5ZmNhOGM3MWYyNCAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVxdWVzdC5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlcXVlc3QuYwpAQCAtNDUyLDEwICs0NTIsOSBA QCB2b2lkIF9faTkxNV9hZGRfcmVxdWVzdChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJl cXVlc3QsCiAJICogd2hhdC4KIAkgKi8KIAlpZiAoZmx1c2hfY2FjaGVzKSB7Ci0JCWlmIChpOTE1 LmVuYWJsZV9leGVjbGlzdHMpCi0JCQlyZXQgPSBsb2dpY2FsX3JpbmdfZmx1c2hfYWxsX2NhY2hl cyhyZXF1ZXN0KTsKLQkJZWxzZQotCQkJcmV0ID0gaW50ZWxfZW5naW5lX2ZsdXNoX2FsbF9jYWNo ZXMocmVxdWVzdCk7CisJCXJldCA9IHJlcXVlc3QtPmVuZ2luZS0+ZW1pdF9mbHVzaChyZXF1ZXN0 LAorCQkJCQkJICAwLCBJOTE1X0dFTV9HUFVfRE9NQUlOUyk7CisKIAkJLyogTm90IGFsbG93ZWQg dG8gZmFpbCEgKi8KIAkJV0FSTihyZXQsICIqX3JpbmdfZmx1c2hfYWxsX2NhY2hlcyBmYWlsZWQ6 ICVkIVxuIiwgcmV0KTsKIAl9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9scmMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCmluZGV4IGQ1ZmQ1ZmZm N2VjYS4uMDI1ZDgxOTYxNGJlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9scmMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwpAQCAtNjQ1LDI0 ICs2NDUsNiBAQCBzdGF0aWMgdm9pZCBleGVjbGlzdHNfY29udGV4dF9xdWV1ZShzdHJ1Y3QgZHJt X2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QpCiAJc3Bpbl91bmxvY2tfYmgoJmVuZ2luZS0+ZXhl Y2xpc3RfbG9jayk7CiB9CiAKLXN0YXRpYyBpbnQgbG9naWNhbF9yaW5nX2ludmFsaWRhdGVfYWxs X2NhY2hlcyhzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSkKLXsKLQlzdHJ1Y3QgaW50 ZWxfZW5naW5lX2NzICplbmdpbmUgPSByZXEtPmVuZ2luZTsKLQl1aW50MzJfdCBmbHVzaF9kb21h aW5zOwotCWludCByZXQ7Ci0KLQlmbHVzaF9kb21haW5zID0gMDsKLQlpZiAoZW5naW5lLT5ncHVf Y2FjaGVzX2RpcnR5KQotCQlmbHVzaF9kb21haW5zID0gSTkxNV9HRU1fR1BVX0RPTUFJTlM7Ci0K LQlyZXQgPSBlbmdpbmUtPmVtaXRfZmx1c2gocmVxLCBJOTE1X0dFTV9HUFVfRE9NQUlOUywgZmx1 c2hfZG9tYWlucyk7Ci0JaWYgKHJldCkKLQkJcmV0dXJuIHJldDsKLQotCWVuZ2luZS0+Z3B1X2Nh Y2hlc19kaXJ0eSA9IGZhbHNlOwotCXJldHVybiAwOwotfQotCiBzdGF0aWMgaW50IGV4ZWNsaXN0 c19tb3ZlX3RvX2dwdShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwKIAkJCQkgc3Ry dWN0IGxpc3RfaGVhZCAqdm1hcykKIHsKQEAgLTY5Myw3ICs2NzUsNyBAQCBzdGF0aWMgaW50IGV4 ZWNsaXN0c19tb3ZlX3RvX2dwdShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwKIAkv KiBVbmNvbmRpdGlvbmFsbHkgaW52YWxpZGF0ZSBncHUgY2FjaGVzIGFuZCBlbnN1cmUgdGhhdCB3 ZSBkbyBmbHVzaAogCSAqIGFueSByZXNpZHVhbCB3cml0ZXMgZnJvbSB0aGUgcHJldmlvdXMgYmF0 Y2guCiAJICovCi0JcmV0dXJuIGxvZ2ljYWxfcmluZ19pbnZhbGlkYXRlX2FsbF9jYWNoZXMocmVx KTsKKwlyZXR1cm4gcmVxLT5lbmdpbmUtPmVtaXRfZmx1c2gocmVxLCBJOTE1X0dFTV9HUFVfRE9N QUlOUywgMCk7CiB9CiAKIGludCBpbnRlbF9sb2dpY2FsX3JpbmdfYWxsb2NfcmVxdWVzdF9leHRy YXMoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0KQpAQCAtOTMzLDIyICs5MTUs NiBAQCB2b2lkIGludGVsX2xvZ2ljYWxfcmluZ19zdG9wKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg KmVuZ2luZSkKIAlJOTE1X1dSSVRFX01PREUoZW5naW5lLCBfTUFTS0VEX0JJVF9ESVNBQkxFKFNU T1BfUklORykpOwogfQogCi1pbnQgbG9naWNhbF9yaW5nX2ZsdXNoX2FsbF9jYWNoZXMoc3RydWN0 IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpCi17Ci0Jc3RydWN0IGludGVsX2VuZ2luZV9jcyAq ZW5naW5lID0gcmVxLT5lbmdpbmU7Ci0JaW50IHJldDsKLQotCWlmICghZW5naW5lLT5ncHVfY2Fj aGVzX2RpcnR5KQotCQlyZXR1cm4gMDsKLQotCXJldCA9IGVuZ2luZS0+ZW1pdF9mbHVzaChyZXEs IDAsIEk5MTVfR0VNX0dQVV9ET01BSU5TKTsKLQlpZiAocmV0KQotCQlyZXR1cm4gcmV0OwotCi0J ZW5naW5lLT5ncHVfY2FjaGVzX2RpcnR5ID0gZmFsc2U7Ci0JcmV0dXJuIDA7Ci19Ci0KIHN0YXRp YyBpbnQgaW50ZWxfbHJfY29udGV4dF9waW4oc3RydWN0IGk5MTVfZ2VtX2NvbnRleHQgKmN0eCwK IAkJCQlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiB7CkBAIC0xMDI5LDE1ICs5OTUs MTUgQEAgdm9pZCBpbnRlbF9scl9jb250ZXh0X3VucGluKHN0cnVjdCBpOTE1X2dlbV9jb250ZXh0 ICpjdHgsCiBzdGF0aWMgaW50IGludGVsX2xvZ2ljYWxfcmluZ193b3JrYXJvdW5kc19lbWl0KHN0 cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxKQogewogCWludCByZXQsIGk7Ci0Jc3RydWN0 IGludGVsX2VuZ2luZV9jcyAqZW5naW5lID0gcmVxLT5lbmdpbmU7CiAJc3RydWN0IGludGVsX3Jp bmcgKnJpbmcgPSByZXEtPnJpbmc7CiAJc3RydWN0IGk5MTVfd29ya2Fyb3VuZHMgKncgPSAmcmVx LT5pOTE1LT53b3JrYXJvdW5kczsKIAogCWlmICh3LT5jb3VudCA9PSAwKQogCQlyZXR1cm4gMDsK IAotCWVuZ2luZS0+Z3B1X2NhY2hlc19kaXJ0eSA9IHRydWU7Ci0JcmV0ID0gbG9naWNhbF9yaW5n X2ZsdXNoX2FsbF9jYWNoZXMocmVxKTsKKwlyZXQgPSByZXEtPmVuZ2luZS0+ZW1pdF9mbHVzaChy ZXEsCisJCQkJICAgICAgSTkxNV9HRU1fR1BVX0RPTUFJTlMsCisJCQkJICAgICAgSTkxNV9HRU1f R1BVX0RPTUFJTlMpOwogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKQEAgLTEwNTQsOCArMTAy MCw5IEBAIHN0YXRpYyBpbnQgaW50ZWxfbG9naWNhbF9yaW5nX3dvcmthcm91bmRzX2VtaXQoc3Ry dWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpCiAKIAlpbnRlbF9yaW5nX2FkdmFuY2Uocmlu Zyk7CiAKLQllbmdpbmUtPmdwdV9jYWNoZXNfZGlydHkgPSB0cnVlOwotCXJldCA9IGxvZ2ljYWxf cmluZ19mbHVzaF9hbGxfY2FjaGVzKHJlcSk7CisJcmV0ID0gcmVxLT5lbmdpbmUtPmVtaXRfZmx1 c2gocmVxLAorCQkJCSAgICAgIEk5MTVfR0VNX0dQVV9ET01BSU5TLAorCQkJCSAgICAgIEk5MTVf R0VNX0dQVV9ET01BSU5TKTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2xyYy5oCmluZGV4IDYzZDZhNDlhMGRlZC4uNWRhZTViYzUwNDZlIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9scmMuaApAQCAtNjksOCArNjksNiBAQCB2b2lkIGludGVsX2xvZ2ljYWxfcmlu Z19zdG9wKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSk7CiB2b2lkIGludGVsX2xvZ2lj YWxfcmluZ19jbGVhbnVwKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSk7CiBpbnQgaW50 ZWxfbG9naWNhbF9yaW5nc19pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogCi1pbnQgbG9n aWNhbF9yaW5nX2ZsdXNoX2FsbF9jYWNoZXMoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpy ZXEpOwotCiAvKiBMb2dpY2FsIFJpbmcgQ29udGV4dHMgKi8KIAogLyogT25lIGV4dHJhIHBhZ2Ug aXMgYWRkZWQgYmVmb3JlIExSQyBmb3IgR3VDIGFzIHNoYXJlZCBkYXRhICovCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKaW5kZXggOGQ5MzE1NTJlOWUwLi41Y2Y5ZDNlM2Qx MmEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKQEAgLTY5Myw4ICs2 OTMsOSBAQCBzdGF0aWMgaW50IGludGVsX3Jpbmdfd29ya2Fyb3VuZHNfZW1pdChzdHJ1Y3QgZHJt X2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSkKIAlpZiAody0+Y291bnQgPT0gMCkKIAkJcmV0dXJuIDA7 CiAKLQlyZXEtPmVuZ2luZS0+Z3B1X2NhY2hlc19kaXJ0eSA9IHRydWU7Ci0JcmV0ID0gaW50ZWxf ZW5naW5lX2ZsdXNoX2FsbF9jYWNoZXMocmVxKTsKKwlyZXQgPSByZXEtPmVuZ2luZS0+ZW1pdF9m bHVzaChyZXEsCisJCQkJICAgICAgSTkxNV9HRU1fR1BVX0RPTUFJTlMsCisJCQkJICAgICAgSTkx NV9HRU1fR1BVX0RPTUFJTlMpOwogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKQEAgLTcxMSw4 ICs3MTIsOSBAQCBzdGF0aWMgaW50IGludGVsX3Jpbmdfd29ya2Fyb3VuZHNfZW1pdChzdHJ1Y3Qg ZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSkKIAogCWludGVsX3JpbmdfYWR2YW5jZShyaW5nKTsK IAotCXJlcS0+ZW5naW5lLT5ncHVfY2FjaGVzX2RpcnR5ID0gdHJ1ZTsKLQlyZXQgPSBpbnRlbF9l bmdpbmVfZmx1c2hfYWxsX2NhY2hlcyhyZXEpOworCXJldCA9IHJlcS0+ZW5naW5lLT5lbWl0X2Zs dXNoKHJlcSwKKwkJCQkgICAgICBJOTE1X0dFTV9HUFVfRE9NQUlOUywKKwkJCQkgICAgICBJOTE1 X0dFTV9HUFVfRE9NQUlOUyk7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIApAQCAtMjg2NCwy MSArMjg2NiwyMSBAQCBpbnQgaW50ZWxfaW5pdF9yZW5kZXJfcmluZ19idWZmZXIoc3RydWN0IGRy bV9kZXZpY2UgKmRldikKIAlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA4KSB7CiAJCWVuZ2lu ZS0+aW5pdF9jb250ZXh0ID0gaW50ZWxfcmNzX2N0eF9pbml0OwogCQllbmdpbmUtPmFkZF9yZXF1 ZXN0ID0gZ2VuOF9yZW5kZXJfYWRkX3JlcXVlc3Q7Ci0JCWVuZ2luZS0+Zmx1c2ggPSBnZW44X3Jl bmRlcl9yaW5nX2ZsdXNoOworCQllbmdpbmUtPmVtaXRfZmx1c2ggPSBnZW44X3JlbmRlcl9yaW5n X2ZsdXNoOwogCQlpZiAoaTkxNS5zZW1hcGhvcmVzKQogCQkJZW5naW5lLT5zZW1hcGhvcmUuc2ln bmFsID0gZ2VuOF9yY3Nfc2lnbmFsOwogCX0gZWxzZSBpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+ PSA2KSB7CiAJCWVuZ2luZS0+aW5pdF9jb250ZXh0ID0gaW50ZWxfcmNzX2N0eF9pbml0OwotCQll bmdpbmUtPmZsdXNoID0gZ2VuN19yZW5kZXJfcmluZ19mbHVzaDsKKwkJZW5naW5lLT5lbWl0X2Zs dXNoID0gZ2VuN19yZW5kZXJfcmluZ19mbHVzaDsKIAkJaWYgKElTX0dFTjYoZGV2X3ByaXYpKQot CQkJZW5naW5lLT5mbHVzaCA9IGdlbjZfcmVuZGVyX3JpbmdfZmx1c2g7CisJCQllbmdpbmUtPmVt aXRfZmx1c2ggPSBnZW42X3JlbmRlcl9yaW5nX2ZsdXNoOwogCX0gZWxzZSBpZiAoSVNfR0VONShk ZXZfcHJpdikpIHsKLQkJZW5naW5lLT5mbHVzaCA9IGdlbjRfcmVuZGVyX3JpbmdfZmx1c2g7CisJ CWVuZ2luZS0+ZW1pdF9mbHVzaCA9IGdlbjRfcmVuZGVyX3JpbmdfZmx1c2g7CiAJfSBlbHNlIHsK IAkJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPCA0KQotCQkJZW5naW5lLT5mbHVzaCA9IGdlbjJf cmVuZGVyX3JpbmdfZmx1c2g7CisJCQllbmdpbmUtPmVtaXRfZmx1c2ggPSBnZW4yX3JlbmRlcl9y aW5nX2ZsdXNoOwogCQllbHNlCi0JCQllbmdpbmUtPmZsdXNoID0gZ2VuNF9yZW5kZXJfcmluZ19m bHVzaDsKKwkJCWVuZ2luZS0+ZW1pdF9mbHVzaCA9IGdlbjRfcmVuZGVyX3JpbmdfZmx1c2g7CiAJ CWVuZ2luZS0+aXJxX2VuYWJsZV9tYXNrID0gSTkxNV9VU0VSX0lOVEVSUlVQVDsKIAl9CiAKQEAg LTI5MjIsNyArMjkyNCw3IEBAIGludCBpbnRlbF9pbml0X2JzZF9yaW5nX2J1ZmZlcihzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2KQogCQkvKiBnZW42IGJzZCBuZWVkcyBhIHNwZWNpYWwgd2EgZm9yIHRh aWwgdXBkYXRlcyAqLwogCQlpZiAoSVNfR0VONihkZXZfcHJpdikpCiAJCQllbmdpbmUtPndyaXRl X3RhaWwgPSBnZW42X2JzZF9yaW5nX3dyaXRlX3RhaWw7Ci0JCWVuZ2luZS0+Zmx1c2ggPSBnZW42 X2JzZF9yaW5nX2ZsdXNoOworCQllbmdpbmUtPmVtaXRfZmx1c2ggPSBnZW42X2JzZF9yaW5nX2Zs dXNoOwogCQlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA4KQogCQkJZW5naW5lLT5pcnFfZW5h YmxlX21hc2sgPQogCQkJCUdUX1JFTkRFUl9VU0VSX0lOVEVSUlVQVCA8PCBHRU44X1ZDUzFfSVJR X1NISUZUOwpAQCAtMjkzMCw3ICsyOTMyLDcgQEAgaW50IGludGVsX2luaXRfYnNkX3JpbmdfYnVm ZmVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCQllbmdpbmUtPmlycV9lbmFibGVfbWFzayA9 IEdUX0JTRF9VU0VSX0lOVEVSUlVQVDsKIAl9IGVsc2UgewogCQllbmdpbmUtPm1taW9fYmFzZSA9 IEJTRF9SSU5HX0JBU0U7Ci0JCWVuZ2luZS0+Zmx1c2ggPSBic2RfcmluZ19mbHVzaDsKKwkJZW5n aW5lLT5lbWl0X2ZsdXNoID0gYnNkX3JpbmdfZmx1c2g7CiAJCWlmIChJU19HRU41KGRldl9wcml2 KSkKIAkJCWVuZ2luZS0+aXJxX2VuYWJsZV9tYXNrID0gSUxLX0JTRF9VU0VSX0lOVEVSUlVQVDsK IAkJZWxzZQpAQCAtMjk1Niw3ICsyOTU4LDcgQEAgaW50IGludGVsX2luaXRfYnNkMl9yaW5nX2J1 ZmZlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCiAJaW50ZWxfcmluZ19kZWZhdWx0X3ZmdW5j cyhkZXZfcHJpdiwgZW5naW5lKTsKIAotCWVuZ2luZS0+Zmx1c2ggPSBnZW42X2JzZF9yaW5nX2Zs dXNoOworCWVuZ2luZS0+ZW1pdF9mbHVzaCA9IGdlbjZfYnNkX3JpbmdfZmx1c2g7CiAJZW5naW5l LT5pcnFfZW5hYmxlX21hc2sgPQogCQkJR1RfUkVOREVSX1VTRVJfSU5URVJSVVBUIDw8IEdFTjhf VkNTMl9JUlFfU0hJRlQ7CiAKQEAgLTI5NzYsNyArMjk3OCw3IEBAIGludCBpbnRlbF9pbml0X2Js dF9yaW5nX2J1ZmZlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCiAJaW50ZWxfcmluZ19kZWZh dWx0X3ZmdW5jcyhkZXZfcHJpdiwgZW5naW5lKTsKIAotCWVuZ2luZS0+Zmx1c2ggPSBnZW42X3Jp bmdfZmx1c2g7CisJZW5naW5lLT5lbWl0X2ZsdXNoID0gZ2VuNl9yaW5nX2ZsdXNoOwogCWlmIChJ TlRFTF9HRU4oZGV2X3ByaXYpID49IDgpCiAJCWVuZ2luZS0+aXJxX2VuYWJsZV9tYXNrID0KIAkJ CUdUX1JFTkRFUl9VU0VSX0lOVEVSUlVQVCA8PCBHRU44X0JDU19JUlFfU0hJRlQ7CkBAIC0yOTk5 LDcgKzMwMDEsNyBAQCBpbnQgaW50ZWxfaW5pdF92ZWJveF9yaW5nX2J1ZmZlcihzdHJ1Y3QgZHJt X2RldmljZSAqZGV2KQogCiAJaW50ZWxfcmluZ19kZWZhdWx0X3ZmdW5jcyhkZXZfcHJpdiwgZW5n aW5lKTsKIAotCWVuZ2luZS0+Zmx1c2ggPSBnZW42X3JpbmdfZmx1c2g7CisJZW5naW5lLT5lbWl0 X2ZsdXNoID0gZ2VuNl9yaW5nX2ZsdXNoOwogCiAJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0g OCkgewogCQllbmdpbmUtPmlycV9lbmFibGVfbWFzayA9CkBAIC0zMDEzLDQ2ICszMDE1LDYgQEAg aW50IGludGVsX2luaXRfdmVib3hfcmluZ19idWZmZXIoc3RydWN0IGRybV9kZXZpY2UgKmRldikK IAlyZXR1cm4gaW50ZWxfaW5pdF9lbmdpbmUoZGV2LCBlbmdpbmUpOwogfQogCi1pbnQKLWludGVs X2VuZ2luZV9mbHVzaF9hbGxfY2FjaGVzKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVx KQotewotCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSA9IHJlcS0+ZW5naW5lOwotCWlu dCByZXQ7Ci0KLQlpZiAoIWVuZ2luZS0+Z3B1X2NhY2hlc19kaXJ0eSkKLQkJcmV0dXJuIDA7Ci0K LQlyZXQgPSBlbmdpbmUtPmZsdXNoKHJlcSwgMCwgSTkxNV9HRU1fR1BVX0RPTUFJTlMpOwotCWlm IChyZXQpCi0JCXJldHVybiByZXQ7Ci0KLQl0cmFjZV9pOTE1X2dlbV9yaW5nX2ZsdXNoKHJlcSwg MCwgSTkxNV9HRU1fR1BVX0RPTUFJTlMpOwotCi0JZW5naW5lLT5ncHVfY2FjaGVzX2RpcnR5ID0g ZmFsc2U7Ci0JcmV0dXJuIDA7Ci19Ci0KLWludAotaW50ZWxfZW5naW5lX2ludmFsaWRhdGVfYWxs X2NhY2hlcyhzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSkKLXsKLQlzdHJ1Y3QgaW50 ZWxfZW5naW5lX2NzICplbmdpbmUgPSByZXEtPmVuZ2luZTsKLQl1aW50MzJfdCBmbHVzaF9kb21h aW5zOwotCWludCByZXQ7Ci0KLQlmbHVzaF9kb21haW5zID0gMDsKLQlpZiAoZW5naW5lLT5ncHVf Y2FjaGVzX2RpcnR5KQotCQlmbHVzaF9kb21haW5zID0gSTkxNV9HRU1fR1BVX0RPTUFJTlM7Ci0K LQlyZXQgPSBlbmdpbmUtPmZsdXNoKHJlcSwgSTkxNV9HRU1fR1BVX0RPTUFJTlMsIGZsdXNoX2Rv bWFpbnMpOwotCWlmIChyZXQpCi0JCXJldHVybiByZXQ7Ci0KLQl0cmFjZV9pOTE1X2dlbV9yaW5n X2ZsdXNoKHJlcSwgSTkxNV9HRU1fR1BVX0RPTUFJTlMsIGZsdXNoX2RvbWFpbnMpOwotCi0JZW5n aW5lLT5ncHVfY2FjaGVzX2RpcnR5ID0gZmFsc2U7Ci0JcmV0dXJuIDA7Ci19Ci0KIHZvaWQgaW50 ZWxfZW5naW5lX3N0b3Aoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogewogCWludCBy ZXQ7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKaW5kZXggZGJjMTdjNGFj OThiLi43OWZhYWQ5NDYyZDIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3JpbmdidWZmZXIuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVy LmgKQEAgLTIwNSw5ICsyMDUsNiBAQCBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzIHsKIAogCXZvaWQJ CSgqd3JpdGVfdGFpbCkoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKIAkJCQkgICAgICB1 MzIgdmFsdWUpOwotCWludCBfX211c3RfY2hlY2sgKCpmbHVzaCkoc3RydWN0IGRybV9pOTE1X2dl bV9yZXF1ZXN0ICpyZXEsCi0JCQkJICB1MzIJaW52YWxpZGF0ZV9kb21haW5zLAotCQkJCSAgdTMy CWZsdXNoX2RvbWFpbnMpOwogCWludAkJKCphZGRfcmVxdWVzdCkoc3RydWN0IGRybV9pOTE1X2dl bV9yZXF1ZXN0ICpyZXEpOwogCS8qIFNvbWUgY2hpcHNldHMgYXJlIG5vdCBxdWl0ZSBhcyBjb2hl cmVudCBhcyBhZHZlcnRpc2VkIGFuZCBuZWVkCiAJICogYW4gZXhwZW5zaXZlIGtpY2sgdG8gZm9y Y2UgYSB0cnVlIHJlYWQgb2YgdGhlIHVwLXRvLWRhdGUgc2Vxbm8uCkBAIC0zMjQsOCArMzIxLDYg QEAgc3RydWN0IGludGVsX2VuZ2luZV9jcyB7CiAJICovCiAJdTMyIGxhc3Rfc3VibWl0dGVkX3Nl cW5vOwogCi0JYm9vbCBncHVfY2FjaGVzX2RpcnR5OwotCiAJc3RydWN0IGk5MTVfZ2VtX2NvbnRl eHQgKmxhc3RfY29udGV4dDsKIAogCXN0cnVjdCBpbnRlbF9lbmdpbmVfaGFuZ2NoZWNrIGhhbmdj aGVjazsKQEAgLTQ3Myw4ICs0NjgsNiBAQCB2b2lkIGludGVsX3JpbmdfdXBkYXRlX3NwYWNlKHN0 cnVjdCBpbnRlbF9yaW5nICpyaW5nKTsKIAogaW50IF9fbXVzdF9jaGVjayBpbnRlbF9lbmdpbmVf aWRsZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpOwogdm9pZCBpbnRlbF9lbmdpbmVf aW5pdF9zZXFubyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsIHUzMiBzZXFubyk7Ci1p bnQgaW50ZWxfZW5naW5lX2ZsdXNoX2FsbF9jYWNoZXMoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1 ZXN0ICpyZXEpOwotaW50IGludGVsX2VuZ2luZV9pbnZhbGlkYXRlX2FsbF9jYWNoZXMoc3RydWN0 IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpOwogCiBpbnQgaW50ZWxfaW5pdF9waXBlX2NvbnRy b2woc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLCBpbnQgc2l6ZSk7CiB2b2lkIGludGVs X2ZpbmlfcGlwZV9jb250cm9sKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSk7Ci0tIAoy LjguMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50 ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBz Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==