From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Gordon Subject: [PATCH v3 2/3] drm/i915: abolish separate per-ring default_context pointers Date: Thu, 7 Jan 2016 10:20:51 +0000 Message-ID: <1452162052-22573-3-git-send-email-david.s.gordon@intel.com> References: <1452162052-22573-1-git-send-email-david.s.gordon@intel.com> 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 ESMTP id B73166E667 for ; Thu, 7 Jan 2016 02:21:00 -0800 (PST) In-Reply-To: <1452162052-22573-1-git-send-email-david.s.gordon@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 Tm93IHRoYXQgd2UndmUgZWxpbWluYXRlZCBhIGxvdCBvZiB1c2VzIG9mIHJpbmctPmRlZmF1bHRf Y29udGV4dCwKd2UgY2FuIGVsaW1pbmF0ZSB0aGUgcG9pbnRlciBpdHNlbGYuCgpBbGwgdGhlIGVu Z2luZXMgc2hhcmUgdGhlIHNhbWUgZGVmYXVsdCBpbnRlbF9jb250ZXh0LCBzbyB3ZSBjYW4ganVz dAprZWVwIGEgc2luZ2xlIHJlZmVyZW5jZSB0byBpdCBpbiB0aGUgZGV2X3ByaXYgc3RydWN0dXJl IHJhdGhlciB0aGFuIG9uZQppbiBlYWNoIG9mIHRoZSBlbmdpbmVbXSBlbGVtZW50cy4gVGhpcyBt YWtlIHJlZmNvdW50aW5nIG1vcmUgc2Vuc2libGUKdG9vLCBhcyB3ZSBub3cgaGF2ZSBhIHJlZmNv dW50IG9mIG9uZSBmb3IgdGhlIG9uZSBwb2ludGVyLCByYXRoZXIgdGhhbgphIHJlZmNvdW50IG9m IG9uZSBidXQgbXVsdGlwbGUgcG9pbnRlcnMuCgpGcm9tIGFuIGlkZWEgYnkgQ2hyaXMgV2lsc29u LgoKU2lnbmVkLW9mZi1ieTogRGF2ZSBHb3Jkb24gPGRhdmlkLnMuZ29yZG9uQGludGVsLmNvbT4K LS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyAgICAgICAgfCAgNCArKy0t CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICAgICAgICAgfCAgMiArKwogZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyAgICAgICAgICAgIHwgIDYgKysrLS0tCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMgICAgfCAyMiArKysrKysrKy0tLS0t LS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jICAgICAgfCAg MiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jIHwgIDYgKysr LS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyAgICAgICAgICAgfCAyNCArKysr KysrKysrKysrLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZm ZXIuaCAgICB8ICAxIC0KIDggZmlsZXMgY2hhbmdlZCwgMzIgaW5zZXJ0aW9ucygrKSwgMzUgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2Zz LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwppbmRleCAwZmMzOGJiLi4y NjEzNzA4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwpAQCAtMTk0Myw3ICsxOTQz LDcgQEAgc3RhdGljIGludCBpOTE1X2NvbnRleHRfc3RhdHVzKHN0cnVjdCBzZXFfZmlsZSAqbSwg dm9pZCAqdW51c2VkKQogCQlzZXFfcHV0cyhtLCAiSFcgY29udGV4dCAiKTsKIAkJZGVzY3JpYmVf Y3R4KG0sIGN0eCk7CiAJCWZvcl9lYWNoX3JpbmcocmluZywgZGV2X3ByaXYsIGkpIHsKLQkJCWlm IChyaW5nLT5kZWZhdWx0X2NvbnRleHQgPT0gY3R4KQorCQkJaWYgKGRldl9wcml2LT5rZXJuZWxf Y29udGV4dCA9PSBjdHgpCiAJCQkJc2VxX3ByaW50ZihtLCAiKGRlZmF1bHQgY29udGV4dCAlcykg IiwKIAkJCQkJICAgcmluZy0+bmFtZSk7CiAJCX0KQEAgLTIwMzksNyArMjAzOSw3IEBAIHN0YXRp YyBpbnQgaTkxNV9kdW1wX2xyYyhzdHJ1Y3Qgc2VxX2ZpbGUgKm0sIHZvaWQgKnVudXNlZCkKIAog CWxpc3RfZm9yX2VhY2hfZW50cnkoY3R4LCAmZGV2X3ByaXYtPmNvbnRleHRfbGlzdCwgbGluaykg ewogCQlmb3JfZWFjaF9yaW5nKHJpbmcsIGRldl9wcml2LCBpKSB7Ci0JCQlpZiAocmluZy0+ZGVm YXVsdF9jb250ZXh0ICE9IGN0eCkKKwkJCWlmIChkZXZfcHJpdi0+a2VybmVsX2NvbnRleHQgIT0g Y3R4KQogCQkJCWk5MTVfZHVtcF9scmNfb2JqKG0sIHJpbmcsCiAJCQkJCQkgIGN0eC0+ZW5naW5l W2ldLnN0YXRlKTsKIAkJfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k cnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggYzJiMDAwYS4uYWVm ODZhOCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC0xOTQwLDYgKzE5NDAsOCBAQCBzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSB7CiAJCXZvaWQgKCpzdG9wX3JpbmcpKHN0cnVjdCBpbnRlbF9l bmdpbmVfY3MgKnJpbmcpOwogCX0gZ3Q7CiAKKwlzdHJ1Y3QgaW50ZWxfY29udGV4dCAqa2VybmVs X2NvbnRleHQ7CisKIAlib29sIGVkcF9sb3dfdnN3aW5nOwogCiAJLyogcGVyZm9ybSBQSFkgc3Rh dGUgc2FuaXR5IGNoZWNrcz8gKi8KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IGM5MDhlZDEu LjhmMTAxMTIxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKQEAgLTI2NzgsNyArMjY3OCw3IEBA IHZvaWQgaTkxNV9nZW1fcmVxdWVzdF9mcmVlKHN0cnVjdCBrcmVmICpyZXFfcmVmKQogCiAJaWYg KGN0eCkgewogCQlpZiAoaTkxNS5lbmFibGVfZXhlY2xpc3RzKSB7Ci0JCQlpZiAoY3R4ICE9IHJl cS0+cmluZy0+ZGVmYXVsdF9jb250ZXh0KQorCQkJaWYgKGN0eCAhPSByZXEtPmk5MTUtPmtlcm5l bF9jb250ZXh0KQogCQkJCWludGVsX2xyX2NvbnRleHRfdW5waW4ocmVxKTsKIAkJfQogCkBAIC0y Nzc0LDcgKzI3NzQsNyBAQCBpOTE1X2dlbV9yZXF1ZXN0X2FsbG9jKHN0cnVjdCBpbnRlbF9lbmdp bmVfY3MgKmVuZ2luZSwKIAlpbnQgZXJyOwogCiAJaWYgKGN0eCA9PSBOVUxMKQotCQljdHggPSBl bmdpbmUtPmRlZmF1bHRfY29udGV4dDsKKwkJY3R4ID0gdG9faTkxNShlbmdpbmUtPmRldiktPmtl cm5lbF9jb250ZXh0OwogCWVyciA9IF9faTkxNV9nZW1fcmVxdWVzdF9hbGxvYyhlbmdpbmUsIGN0 eCwgJnJlcSk7CiAJcmV0dXJuIGVyciA/IEVSUl9QVFIoZXJyKSA6IHJlcTsKIH0KQEAgLTQ4NjIs NyArNDg2Miw3IEBAIGk5MTVfZ2VtX2luaXRfaHcoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkg Ki8KIAlpbml0X3VudXNlZF9yaW5ncyhkZXYpOwogCi0JQlVHX09OKCFkZXZfcHJpdi0+cmluZ1tS Q1NdLmRlZmF1bHRfY29udGV4dCk7CisJQlVHX09OKCFkZXZfcHJpdi0+a2VybmVsX2NvbnRleHQp OwogCiAJcmV0ID0gaTkxNV9wcGd0dF9pbml0X2h3KGRldik7CiAJaWYgKHJldCkgewpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jCmluZGV4IDkwMGZmZDAuLmUxZDc2N2UgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMKQEAgLTM1NCwxMSArMzU0LDEw IEBAIGludCBpOTE1X2dlbV9jb250ZXh0X2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIHsK IAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwog CXN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHg7Ci0JaW50IGk7CiAKIAkvKiBJbml0IHNob3VsZCBv bmx5IGJlIGNhbGxlZCBvbmNlIHBlciBtb2R1bGUgbG9hZC4gRXZlbnR1YWxseSB0aGUKIAkgKiBy ZXN0cmljdGlvbiBvbiB0aGUgY29udGV4dF9kaXNhYmxlZCBjaGVjayBjYW4gYmUgbG9vc2VuZWQu ICovCi0JaWYgKFdBUk5fT04oZGV2X3ByaXYtPnJpbmdbUkNTXS5kZWZhdWx0X2NvbnRleHQpKQor CWlmIChXQVJOX09OKGRldl9wcml2LT5rZXJuZWxfY29udGV4dCkpCiAJCXJldHVybiAwOwogCiAJ aWYgKGludGVsX3ZncHVfYWN0aXZlKGRldikgJiYgSEFTX0xPR0lDQUxfUklOR19DT05URVhUUyhk ZXYpKSB7CkBAIC0zODgsMTIgKzM4Nyw3IEBAIGludCBpOTE1X2dlbV9jb250ZXh0X2luaXQoc3Ry dWN0IGRybV9kZXZpY2UgKmRldikKIAkJcmV0dXJuIFBUUl9FUlIoY3R4KTsKIAl9CiAKLQlmb3Ig KGkgPSAwOyBpIDwgSTkxNV9OVU1fUklOR1M7IGkrKykgewotCQlzdHJ1Y3QgaW50ZWxfZW5naW5l X2NzICpyaW5nID0gJmRldl9wcml2LT5yaW5nW2ldOwotCi0JCS8qIE5COiBSQ1Mgd2lsbCBob2xk IGEgcmVmIGZvciBhbGwgcmluZ3MgKi8KLQkJcmluZy0+ZGVmYXVsdF9jb250ZXh0ID0gY3R4Owot CX0KKwlkZXZfcHJpdi0+a2VybmVsX2NvbnRleHQgPSBjdHg7CiAKIAlEUk1fREVCVUdfRFJJVkVS KCIlcyBjb250ZXh0IHN1cHBvcnQgaW5pdGlhbGl6ZWRcbiIsCiAJCQlpOTE1LmVuYWJsZV9leGVj bGlzdHMgPyAiTFIiIDoKQEAgLTQwNCw3ICszOTgsNyBAQCBpbnQgaTkxNV9nZW1fY29udGV4dF9p bml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB2b2lkIGk5MTVfZ2VtX2NvbnRleHRfZmluaShz dHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7Ci0Jc3RydWN0IGludGVsX2NvbnRleHQgKmRjdHggPSBk ZXZfcHJpdi0+cmluZ1tSQ1NdLmRlZmF1bHRfY29udGV4dDsKKwlzdHJ1Y3QgaW50ZWxfY29udGV4 dCAqZGN0eCA9IGRldl9wcml2LT5rZXJuZWxfY29udGV4dDsKIAlpbnQgaTsKIAogCWlmIChkY3R4 LT5sZWdhY3lfaHdfY3R4LnJjc19zdGF0ZSkgewpAQCAtNDMxLDE3ICs0MjUsMTcgQEAgdm9pZCBp OTE1X2dlbV9jb250ZXh0X2Zpbmkoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJaTkxNV9nZW1f b2JqZWN0X2dndHRfdW5waW4oZGN0eC0+bGVnYWN5X2h3X2N0eC5yY3Nfc3RhdGUpOwogCX0KIAot CWZvciAoaSA9IDA7IGkgPCBJOTE1X05VTV9SSU5HUzsgaSsrKSB7CisJZm9yIChpID0gSTkxNV9O VU1fUklOR1M7IC0taSA+PSAwOykgewogCQlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nID0g JmRldl9wcml2LT5yaW5nW2ldOwogCi0JCWlmIChyaW5nLT5sYXN0X2NvbnRleHQpCisJCWlmIChy aW5nLT5sYXN0X2NvbnRleHQpIHsKIAkJCWk5MTVfZ2VtX2NvbnRleHRfdW5yZWZlcmVuY2Uocmlu Zy0+bGFzdF9jb250ZXh0KTsKLQotCQlyaW5nLT5kZWZhdWx0X2NvbnRleHQgPSBOVUxMOwotCQly aW5nLT5sYXN0X2NvbnRleHQgPSBOVUxMOworCQkJcmluZy0+bGFzdF9jb250ZXh0ID0gTlVMTDsK KwkJfQogCX0KIAogCWk5MTVfZ2VtX2NvbnRleHRfdW5yZWZlcmVuY2UoZGN0eCk7CisJZGV2X3By aXYtPmtlcm5lbF9jb250ZXh0ID0gTlVMTDsKIH0KIAogaW50IGk5MTVfZ2VtX2NvbnRleHRfZW5h YmxlKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxKQpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ3B1X2Vycm9yLmMKaW5kZXggMDZjYTQwOC4uN2VlYjI0NCAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2dwdV9lcnJvci5jCkBAIC0xMDUwLDcgKzEwNTAsNyBAQCBzdGF0aWMgdm9pZCBpOTE1 X2dlbV9yZWNvcmRfcmluZ3Moc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJCWlmIChyZXF1ZXN0 KQogCQkJCXJidWYgPSByZXF1ZXN0LT5jdHgtPmVuZ2luZVtyaW5nLT5pZF0ucmluZ2J1ZjsKIAkJ CWVsc2UKLQkJCQlyYnVmID0gcmluZy0+ZGVmYXVsdF9jb250ZXh0LT5lbmdpbmVbcmluZy0+aWRd LnJpbmdidWY7CisJCQkJcmJ1ZiA9IGRldl9wcml2LT5rZXJuZWxfY29udGV4dC0+ZW5naW5lW3Jp bmctPmlkXS5yaW5nYnVmOwogCQl9IGVsc2UKIAkJCXJidWYgPSByaW5nLT5idWZmZXI7CiAKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYwppbmRleCA5YzI0NDI0Li41 MWFlNWMxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNz aW9uLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jCkBA IC05NjQsNyArOTY0LDcgQEAgaW50IGk5MTVfZ3VjX3N1Ym1pc3Npb25fZW5hYmxlKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0g ZGV2LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3QgaW50ZWxfZ3VjICpndWMgPSAmZGV2X3ByaXYtPmd1 YzsKLQlzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4ID0gZGV2X3ByaXYtPnJpbmdbUkNTXS5kZWZh dWx0X2NvbnRleHQ7CisJc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCA9IGRldl9wcml2LT5rZXJu ZWxfY29udGV4dDsKIAlzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpjbGllbnQ7CiAKIAkvKiBjbGll bnQgZm9yIGV4ZWNidWYgc3VibWlzc2lvbiAqLwpAQCAtMTAyMSw3ICsxMDIxLDcgQEAgaW50IGlu dGVsX2d1Y19zdXNwZW5kKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJaWYgKCFpOTE1LmVuYWJs ZV9ndWNfc3VibWlzc2lvbikKIAkJcmV0dXJuIDA7CiAKLQljdHggPSBkZXZfcHJpdi0+cmluZ1tS Q1NdLmRlZmF1bHRfY29udGV4dDsKKwljdHggPSBkZXZfcHJpdi0+a2VybmVsX2NvbnRleHQ7CiAK IAlkYXRhWzBdID0gSE9TVDJHVUNfQUNUSU9OX0VOVEVSX1NfU1RBVEU7CiAJLyogYW55IHZhbHVl IGdyZWF0ZXIgdGhhbiBHVUNfUE9XRVJfRDAgKi8KQEAgLTEwNDcsNyArMTA0Nyw3IEBAIGludCBp bnRlbF9ndWNfcmVzdW1lKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJaWYgKCFpOTE1LmVuYWJs ZV9ndWNfc3VibWlzc2lvbikKIAkJcmV0dXJuIDA7CiAKLQljdHggPSBkZXZfcHJpdi0+cmluZ1tS Q1NdLmRlZmF1bHRfY29udGV4dDsKKwljdHggPSBkZXZfcHJpdi0+a2VybmVsX2NvbnRleHQ7CiAK IAlkYXRhWzBdID0gSE9TVDJHVUNfQUNUSU9OX0VYSVRfU19TVEFURTsKIAlkYXRhWzFdID0gR1VD X1BPV0VSX0QwOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwppbmRleCA4YjY1NDJkLi5hYWFhNWEz IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwpAQCAtNTcxLDcgKzU3MSw3IEBAIHN0YXRpYyBp bnQgZXhlY2xpc3RzX2NvbnRleHRfcXVldWUoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpy ZXF1ZXN0KQogCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqY3Vyc29yOwogCWludCBudW1f ZWxlbWVudHMgPSAwOwogCi0JaWYgKHJlcXVlc3QtPmN0eCAhPSByaW5nLT5kZWZhdWx0X2NvbnRl eHQpCisJaWYgKHJlcXVlc3QtPmN0eCAhPSByZXF1ZXN0LT5pOTE1LT5rZXJuZWxfY29udGV4dCkK IAkJaW50ZWxfbHJfY29udGV4dF9waW4ocmVxdWVzdCk7CiAKIAlpOTE1X2dlbV9yZXF1ZXN0X3Jl ZmVyZW5jZShyZXF1ZXN0KTsKQEAgLTY2NCw3ICs2NjQsNyBAQCBpbnQgaW50ZWxfbG9naWNhbF9y aW5nX2FsbG9jX3JlcXVlc3RfZXh0cmFzKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVx dWVzdAogCiAJcmVxdWVzdC0+cmluZ2J1ZiA9IHJlcXVlc3QtPmN0eC0+ZW5naW5lW3JlcXVlc3Qt PnJpbmctPmlkXS5yaW5nYnVmOwogCi0JaWYgKHJlcXVlc3QtPmN0eCAhPSByZXF1ZXN0LT5yaW5n LT5kZWZhdWx0X2NvbnRleHQpIHsKKwlpZiAocmVxdWVzdC0+Y3R4ICE9IHJlcXVlc3QtPmk5MTUt Pmtlcm5lbF9jb250ZXh0KSB7CiAJCXJldCA9IGludGVsX2xyX2NvbnRleHRfcGluKHJlcXVlc3Qp OwogCQlpZiAocmV0KQogCQkJcmV0dXJuIHJldDsKQEAgLTk4MCw3ICs5ODAsNyBAQCB2b2lkIGlu dGVsX2V4ZWNsaXN0c19yZXRpcmVfcmVxdWVzdHMoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmlu ZykKIAkJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKmN0eF9vYmogPQogCQkJCWN0eC0+ZW5n aW5lW3JpbmctPmlkXS5zdGF0ZTsKIAotCQlpZiAoY3R4X29iaiAmJiAoY3R4ICE9IHJpbmctPmRl ZmF1bHRfY29udGV4dCkpCisJCWlmIChjdHhfb2JqICYmIChjdHggIT0gcmVxLT5pOTE1LT5rZXJu ZWxfY29udGV4dCkpCiAJCQlpbnRlbF9scl9jb250ZXh0X3VucGluKHJlcSk7CiAJCWxpc3RfZGVs KCZyZXEtPmV4ZWNsaXN0X2xpbmspOwogCQlpOTE1X2dlbV9yZXF1ZXN0X3VucmVmZXJlbmNlKHJl cSk7CkBAIC0xNDg3LDcgKzE0ODcsNyBAQCBzdGF0aWMgaW50IGdlbjhfaW5pdF9jb21tb25fcmlu ZyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQogCXU4IG5leHRfY29udGV4dF9zdGF0dXNf YnVmZmVyX2h3OwogCiAJbHJjX3NldHVwX2hhcmR3YXJlX3N0YXR1c19wYWdlKHJpbmcsCi0JCQkJ cmluZy0+ZGVmYXVsdF9jb250ZXh0LT5lbmdpbmVbcmluZy0+aWRdLnN0YXRlKTsKKwkJCQlkZXZf cHJpdi0+a2VybmVsX2NvbnRleHQtPmVuZ2luZVtyaW5nLT5pZF0uc3RhdGUpOwogCiAJSTkxNV9X UklURV9JTVIocmluZywgfihyaW5nLT5pcnFfZW5hYmxlX21hc2sgfCByaW5nLT5pcnFfa2VlcF9t YXNrKSk7CiAJSTkxNV9XUklURShSSU5HX0hXU1RBTShyaW5nLT5tbWlvX2Jhc2UpLCAweGZmZmZm ZmZmKTsKQEAgLTE5MjksNiArMTkyOSw5IEBAIHZvaWQgaW50ZWxfbG9naWNhbF9yaW5nX2NsZWFu dXAoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKIAogc3RhdGljIGludCBsb2dpY2FsX3Jp bmdfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpy aW5nKQogeworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2 KTsKKwlzdHJ1Y3QgaW50ZWxfY29udGV4dCAqZGN0eCA9IGRldl9wcml2LT5rZXJuZWxfY29udGV4 dDsKKwlpbnQgcmluZ19pZCA9IHJpbmctPmlkOwogCWludCByZXQ7CiAKIAkvKiBJbnRlbnRpb25h bGx5IGxlZnQgYmxhbmsuICovCkBAIC0xOTQ5LDE1ICsxOTUyLDE0IEBAIHN0YXRpYyBpbnQgbG9n aWNhbF9yaW5nX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGludGVsX2VuZ2lu ZV9jcyAqcmluCiAJaWYgKHJldCkKIAkJZ290byBlcnJvcjsKIAotCXJldCA9IGludGVsX2xyX2Nv bnRleHRfZGVmZXJyZWRfYWxsb2MocmluZy0+ZGVmYXVsdF9jb250ZXh0LCByaW5nKTsKKwlyZXQg PSBpbnRlbF9scl9jb250ZXh0X2RlZmVycmVkX2FsbG9jKGRjdHgsIHJpbmcpOwogCWlmIChyZXQp CiAJCWdvdG8gZXJyb3I7CiAKIAkvKiBBcyB0aGlzIGlzIHRoZSBkZWZhdWx0IGNvbnRleHQsIGFs d2F5cyBwaW4gaXQgKi8KLQlyZXQgPSBpbnRlbF9scl9jb250ZXh0X2RvX3BpbigKLQkJCXJpbmcs Ci0JCQlyaW5nLT5kZWZhdWx0X2NvbnRleHQtPmVuZ2luZVtyaW5nLT5pZF0uc3RhdGUsCi0JCQly aW5nLT5kZWZhdWx0X2NvbnRleHQtPmVuZ2luZVtyaW5nLT5pZF0ucmluZ2J1Zik7CisJcmV0ID0g aW50ZWxfbHJfY29udGV4dF9kb19waW4ocmluZywKKwkJCQkgICAgICBkY3R4LT5lbmdpbmVbcmlu Z19pZF0uc3RhdGUsCisJCQkJICAgICAgZGN0eC0+ZW5naW5lW3JpbmdfaWRdLnJpbmdidWYpOwog CWlmIChyZXQpIHsKIAkJRFJNX0VSUk9SKAogCQkJIkZhaWxlZCB0byBwaW4gYW5kIG1hcCByaW5n YnVmZmVyICVzOiAlZFxuIiwKQEAgLTIzODgsNyArMjM5MCw3IEBAIHZvaWQgaW50ZWxfbHJfY29u dGV4dF9mcmVlKHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgpCiAJCQkJCWN0eC0+ZW5naW5lW2ld LnJpbmdidWY7CiAJCQlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nID0gcmluZ2J1Zi0+cmlu ZzsKIAotCQkJaWYgKGN0eCA9PSByaW5nLT5kZWZhdWx0X2NvbnRleHQpIHsKKwkJCWlmIChjdHgg PT0gY3R4LT5pOTE1LT5rZXJuZWxfY29udGV4dCkgewogCQkJCWludGVsX3VucGluX3JpbmdidWZm ZXJfb2JqKHJpbmdidWYpOwogCQkJCWk5MTVfZ2VtX29iamVjdF9nZ3R0X3VucGluKGN0eF9vYmop OwogCQkJfQpAQCAtMjUwNyw3ICsyNTA5LDcgQEAgaW50IGludGVsX2xyX2NvbnRleHRfZGVmZXJy ZWRfYWxsb2Moc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCwKIAljdHgtPmVuZ2luZVtyaW5nLT5p ZF0ucmluZ2J1ZiA9IHJpbmdidWY7CiAJY3R4LT5lbmdpbmVbcmluZy0+aWRdLnN0YXRlID0gY3R4 X29iajsKIAotCWlmIChjdHggIT0gcmluZy0+ZGVmYXVsdF9jb250ZXh0ICYmIHJpbmctPmluaXRf Y29udGV4dCkgeworCWlmIChjdHggIT0gY3R4LT5pOTE1LT5rZXJuZWxfY29udGV4dCAmJiByaW5n LT5pbml0X2NvbnRleHQpIHsKIAkJc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXE7CiAK IAkJcmVxID0gaTkxNV9nZW1fcmVxdWVzdF9hbGxvYyhyaW5nLCBjdHgpOwpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCmluZGV4IDQ5NTc0ZmYuLmU5NTBmNmMgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaAorKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKQEAgLTMwNSw3ICszMDUsNiBAQCBzdHJ1 Y3QgIGludGVsX2VuZ2luZV9jcyB7CiAKIAl3YWl0X3F1ZXVlX2hlYWRfdCBpcnFfcXVldWU7CiAK LQlzdHJ1Y3QgaW50ZWxfY29udGV4dCAqZGVmYXVsdF9jb250ZXh0OwogCXN0cnVjdCBpbnRlbF9j b250ZXh0ICpsYXN0X2NvbnRleHQ7CiAKIAlzdHJ1Y3QgaW50ZWxfcmluZ19oYW5nY2hlY2sgaGFu Z2NoZWNrOwotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50 ZWwtZ2Z4Cg==