From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH] drm/nouveau: dont switch vt on suspend Date: Tue, 13 Jan 2015 09:18:49 +0100 Message-ID: <54B4D4E9.1020904@canonical.com> References: <54AA80BD.6080004@canonical.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <54AA80BD.6080004@canonical.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: "nouveau@lists.freedesktop.org" Cc: "dri-devel@lists.freedesktop.org" List-Id: nouveau.vger.kernel.org UmVzdG9yZSB0aGUgbnY1MCBjdXJzb3IgYm8gb24gcmVzdW1lLCBhbmQgbG9hZCB0aGUgbHV0IGlu IG52NTBfZGlzcGxheV9kaXNwbGF5X2luaXQKc28gaXQgZ2V0cyBzZXQgb24gcmVzdW1lIHRvby4K ClRlc3RlZCBvbiBhIGZlcm1pIGFuZCBhIGN1cmllLgoKU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBM YW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QHVidW50dS5jb20+Ci0tLQpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL25vdXZlYXUvbm91dmVhdV9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9k cm0vbm91dmVhdS9ub3V2ZWF1X2Rpc3BsYXkuYwppbmRleCBmODA0MjQzMzc1MmIuLmY5NzJlOWMx YTIzYSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL25vdXZlYXUvbm91dmVhdV9kaXNwbGF5 LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL25vdXZlYXUvbm91dmVhdV9kaXNwbGF5LmMKQEAgLTU3 MCw3ICs1NzAsOCBAQCBub3V2ZWF1X2Rpc3BsYXlfc3VzcGVuZChzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2LCBib29sIHJ1bnRpbWUpCiAJbGlzdF9mb3JfZWFjaF9lbnRyeShjcnRjLCAmZGV2LT5tb2Rl X2NvbmZpZy5jcnRjX2xpc3QsIGhlYWQpIHsKIAkJc3RydWN0IG5vdXZlYXVfY3J0YyAqbnZfY3J0 YyA9IG5vdXZlYXVfY3J0YyhjcnRjKTsKIAkJaWYgKG52X2NydGMtPmN1cnNvci5udmJvKSB7Ci0J CQlub3V2ZWF1X2JvX3VubWFwKG52X2NydGMtPmN1cnNvci5udmJvKTsKKwkJCWlmIChudl9jcnRj LT5jdXJzb3Iuc2V0X29mZnNldCkKKwkJCQlub3V2ZWF1X2JvX3VubWFwKG52X2NydGMtPmN1cnNv ci5udmJvKTsKIAkJCW5vdXZlYXVfYm9fdW5waW4obnZfY3J0Yy0+Y3Vyc29yLm52Ym8pOwogCQl9 CiAJfQpAQCAtNjA0LDcgKzYwNSw3IEBAIG5vdXZlYXVfZGlzcGxheV9yZXN1bWUoc3RydWN0IGRy bV9kZXZpY2UgKmRldiwgYm9vbCBydW50aW1lKQogCQkJY29udGludWU7CiAKIAkJcmV0ID0gbm91 dmVhdV9ib19waW4obnZfY3J0Yy0+Y3Vyc29yLm52Ym8sIFRUTV9QTF9GTEFHX1ZSQU0sIHRydWUp OwotCQlpZiAoIXJldCkKKwkJaWYgKCFyZXQgJiYgbnZfY3J0Yy0+Y3Vyc29yLnNldF9vZmZzZXQp CiAJCQlyZXQgPSBub3V2ZWF1X2JvX21hcChudl9jcnRjLT5jdXJzb3IubnZibyk7CiAJCWlmIChy ZXQpCiAJCQlOVl9FUlJPUihkcm0sICJDb3VsZCBub3QgcGluL21hcCBjdXJzb3IuXG4iKTsKQEAg LTYzNyw3ICs2MzgsOSBAQCBub3V2ZWF1X2Rpc3BsYXlfcmVzdW1lKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYsIGJvb2wgcnVudGltZSkKIAogCQlpZiAoIW52X2NydGMtPmN1cnNvci5udmJvKQogCQkJ Y29udGludWU7Ci0JCW52X2NydGMtPmN1cnNvci5zZXRfb2Zmc2V0KG52X2NydGMsIG52X2NydGMt PmN1cnNvci5udmJvLT5iby5vZmZzZXQpOworCisJCWlmIChudl9jcnRjLT5jdXJzb3Iuc2V0X29m ZnNldCkKKwkJCW52X2NydGMtPmN1cnNvci5zZXRfb2Zmc2V0KG52X2NydGMsIG52X2NydGMtPmN1 cnNvci5udmJvLT5iby5vZmZzZXQpOwogCQludl9jcnRjLT5jdXJzb3Iuc2V0X3Bvcyhudl9jcnRj LCBudl9jcnRjLT5jdXJzb3Jfc2F2ZWRfeCwKIAkJCQkJCSBudl9jcnRjLT5jdXJzb3Jfc2F2ZWRf eSk7CiAJfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL25vdXZlYXUvbm91dmVhdV9mYmNv bi5jIGIvZHJpdmVycy9ncHUvZHJtL25vdXZlYXUvbm91dmVhdV9mYmNvbi5jCmluZGV4IDNlZDEy YThjZmM5MS4uZDZlNjk1OGJjNWY4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vbm91dmVh dS9ub3V2ZWF1X2ZiY29uLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL25vdXZlYXUvbm91dmVhdV9m YmNvbi5jCkBAIC0zNzAsNiArMzcwLDcgQEAgbm91dmVhdV9mYmNvbl9jcmVhdGUoc3RydWN0IGRy bV9mYl9oZWxwZXIgKmhlbHBlciwKIAkJcmV0ID0gLUVOT01FTTsKIAkJZ290byBvdXRfdW5sb2Nr OwogCX0KKwlpbmZvLT5za2lwX3Z0X3N3aXRjaCA9IDE7CiAKIAlyZXQgPSBmYl9hbGxvY19jbWFw KCZpbmZvLT5jbWFwLCAyNTYsIDApOwogCWlmIChyZXQpIHsKQEAgLTQ4NywzMCArNDg4LDE3IEBA IHN0YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX2ZiX2hlbHBlcl9mdW5jcyBub3V2ZWF1X2ZiY29uX2hl bHBlcl9mdW5jcyA9IHsKIAkuZmJfcHJvYmUgPSBub3V2ZWF1X2ZiY29uX2NyZWF0ZSwKIH07CiAK LXN0YXRpYyB2b2lkCi1ub3V2ZWF1X2ZiY29uX3NldF9zdXNwZW5kX3dvcmsoc3RydWN0IHdvcmtf c3RydWN0ICp3b3JrKQotewotCXN0cnVjdCBub3V2ZWF1X2ZiZGV2ICpmYmNvbiA9IGNvbnRhaW5l cl9vZih3b3JrLCB0eXBlb2YoKmZiY29uKSwgd29yayk7Ci0JY29uc29sZV9sb2NrKCk7Ci0Jbm91 dmVhdV9mYmNvbl9hY2NlbF9yZXN0b3JlKGZiY29uLT5kZXYpOwotCW5vdXZlYXVfZmJjb25femZp bGwoZmJjb24tPmRldiwgZmJjb24pOwotCWZiX3NldF9zdXNwZW5kKGZiY29uLT5oZWxwZXIuZmJk ZXYsIEZCSU5GT19TVEFURV9SVU5OSU5HKTsKLQljb25zb2xlX3VubG9jaygpOwotfQotCiB2b2lk CiBub3V2ZWF1X2ZiY29uX3NldF9zdXNwZW5kKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGludCBz dGF0ZSkKIHsKIAlzdHJ1Y3Qgbm91dmVhdV9kcm0gKmRybSA9IG5vdXZlYXVfZHJtKGRldik7CiAJ aWYgKGRybS0+ZmJjb24pIHsKLQkJaWYgKHN0YXRlID09IEZCSU5GT19TVEFURV9SVU5OSU5HKSB7 Ci0JCQlzY2hlZHVsZV93b3JrKCZkcm0tPmZiY29uLT53b3JrKTsKLQkJCXJldHVybjsKLQkJfQot CQlmbHVzaF93b3JrKCZkcm0tPmZiY29uLT53b3JrKTsKIAkJY29uc29sZV9sb2NrKCk7CisJCWlm IChzdGF0ZSA9PSBGQklORk9fU1RBVEVfUlVOTklORykKKwkJCW5vdXZlYXVfZmJjb25fYWNjZWxf cmVzdG9yZShkZXYpOwogCQlmYl9zZXRfc3VzcGVuZChkcm0tPmZiY29uLT5oZWxwZXIuZmJkZXYs IHN0YXRlKTsKLQkJbm91dmVhdV9mYmNvbl9hY2NlbF9zYXZlX2Rpc2FibGUoZGV2KTsKKwkJaWYg KHN0YXRlICE9IEZCSU5GT19TVEFURV9SVU5OSU5HKQorCQkJbm91dmVhdV9mYmNvbl9hY2NlbF9z YXZlX2Rpc2FibGUoZGV2KTsKIAkJY29uc29sZV91bmxvY2soKTsKIAl9CiB9CkBAIC01MzEsNyAr NTE5LDYgQEAgbm91dmVhdV9mYmNvbl9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJaWYg KCFmYmNvbikKIAkJcmV0dXJuIC1FTk9NRU07CiAKLQlJTklUX1dPUksoJmZiY29uLT53b3JrLCBu b3V2ZWF1X2ZiY29uX3NldF9zdXNwZW5kX3dvcmspOwogCWZiY29uLT5kZXYgPSBkZXY7CiAJZHJt LT5mYmNvbiA9IGZiY29uOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9u b3V2ZWF1X2ZiY29uLmggYi9kcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9ub3V2ZWF1X2ZiY29uLmgK aW5kZXggNjIwOGU3MGU0YTFjLi4xZTJlOWUyN2EwM2IgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9ub3V2ZWF1L25vdXZlYXVfZmJjb24uaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vbm91dmVh dS9ub3V2ZWF1X2ZiY29uLmgKQEAgLTM2LDcgKzM2LDYgQEAgc3RydWN0IG5vdXZlYXVfZmJkZXYg ewogCXN0cnVjdCBub3V2ZWF1X2ZyYW1lYnVmZmVyIG5vdXZlYXVfZmI7CiAJc3RydWN0IGxpc3Rf aGVhZCBmYmRldl9saXN0OwogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXY7Ci0Jc3RydWN0IHdvcmtf c3RydWN0IHdvcms7CiAJdW5zaWduZWQgaW50IHNhdmVkX2ZsYWdzOwogCXN0cnVjdCBudmlmX29i amVjdCBzdXJmMmQ7CiAJc3RydWN0IG52aWZfb2JqZWN0IGNsaXA7CmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vbm91dmVhdS9udjUwX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9ub3V2 ZWF1L252NTBfZGlzcGxheS5jCmluZGV4IDQ5MGI5MDg2NmJhZi4uMDM4YjBmZTA2ZGI4IDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9udjUwX2Rpc3BsYXkuYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vbm91dmVhdS9udjUwX2Rpc3BsYXkuYwpAQCAtMTI1LDcgKzEyNSw2IEBAIG52 NTBfcGlvY19jcmVhdGUoc3RydWN0IG52aWZfb2JqZWN0ICpkaXNwLCBjb25zdCB1MzIgKm9jbGFz cywgdTggaGVhZCwKIAogc3RydWN0IG52NTBfY3VycyB7CiAJc3RydWN0IG52NTBfcGlvYyBiYXNl OwotCXN0cnVjdCBub3V2ZWF1X2JvICppbWFnZTsKIH07CiAKIHN0YXRpYyBpbnQKQEAgLTkxNywy OSArOTE2LDI5IEBAIHN0YXRpYyB2b2lkCiBudjUwX2NydGNfY3Vyc29yX3Nob3coc3RydWN0IG5v dXZlYXVfY3J0YyAqbnZfY3J0YykKIHsKIAlzdHJ1Y3QgbnY1MF9tYXN0ICptYXN0ID0gbnY1MF9t YXN0KG52X2NydGMtPmJhc2UuZGV2KTsKLQlzdHJ1Y3QgbnY1MF9jdXJzICpjdXJzID0gbnY1MF9j dXJzKCZudl9jcnRjLT5iYXNlKTsKIAl1MzIgKnB1c2ggPSBldm9fd2FpdChtYXN0LCAxNik7CiAJ aWYgKHB1c2gpIHsKIAkJaWYgKG52NTBfdmVycyhtYXN0KSA8IEc4Ml9ESVNQX0NPUkVfQ0hBTk5F TF9ETUEpIHsKIAkJCWV2b19tdGhkKHB1c2gsIDB4MDg4MCArIChudl9jcnRjLT5pbmRleCAqIDB4 NDAwKSwgMik7CiAJCQlldm9fZGF0YShwdXNoLCAweDg1MDAwMDAwKTsKLQkJCWV2b19kYXRhKHB1 c2gsIGN1cnMtPmltYWdlLT5iby5vZmZzZXQgPj4gOCk7CisJCQlldm9fZGF0YShwdXNoLCBudl9j cnRjLT5jdXJzb3IubnZiby0+Ym8ub2Zmc2V0ID4+IDgpOwogCQl9IGVsc2UKIAkJaWYgKG52NTBf dmVycyhtYXN0KSA8IEdGMTEwX0RJU1BfQ09SRV9DSEFOTkVMX0RNQSkgewogCQkJZXZvX210aGQo cHVzaCwgMHgwODgwICsgKG52X2NydGMtPmluZGV4ICogMHg0MDApLCAyKTsKIAkJCWV2b19kYXRh KHB1c2gsIDB4ODUwMDAwMDApOwotCQkJZXZvX2RhdGEocHVzaCwgY3Vycy0+aW1hZ2UtPmJvLm9m ZnNldCA+PiA4KTsKKwkJCWV2b19kYXRhKHB1c2gsIG52X2NydGMtPmN1cnNvci5udmJvLT5iby5v ZmZzZXQgPj4gOCk7CiAJCQlldm9fbXRoZChwdXNoLCAweDA4OWMgKyAobnZfY3J0Yy0+aW5kZXgg KiAweDQwMCksIDEpOwogCQkJZXZvX2RhdGEocHVzaCwgbWFzdC0+YmFzZS52cmFtLmhhbmRsZSk7 CiAJCX0gZWxzZSB7CiAJCQlldm9fbXRoZChwdXNoLCAweDA0ODAgKyAobnZfY3J0Yy0+aW5kZXgg KiAweDMwMCksIDIpOwogCQkJZXZvX2RhdGEocHVzaCwgMHg4NTAwMDAwMCk7Ci0JCQlldm9fZGF0 YShwdXNoLCBjdXJzLT5pbWFnZS0+Ym8ub2Zmc2V0ID4+IDgpOworCQkJZXZvX2RhdGEocHVzaCwg bnZfY3J0Yy0+Y3Vyc29yLm52Ym8tPmJvLm9mZnNldCA+PiA4KTsKIAkJCWV2b19tdGhkKHB1c2gs IDB4MDQ4YyArIChudl9jcnRjLT5pbmRleCAqIDB4MzAwKSwgMSk7CiAJCQlldm9fZGF0YShwdXNo LCBtYXN0LT5iYXNlLnZyYW0uaGFuZGxlKTsKIAkJfQogCQlldm9fa2ljayhwdXNoLCBtYXN0KTsK IAl9CisJbnZfY3J0Yy0+Y3Vyc29yLnZpc2libGUgPSB0cnVlOwogfQogCiBzdGF0aWMgdm9pZApA QCAtOTY1LDE1ICs5NjQsMTUgQEAgbnY1MF9jcnRjX2N1cnNvcl9oaWRlKHN0cnVjdCBub3V2ZWF1 X2NydGMgKm52X2NydGMpCiAJCX0KIAkJZXZvX2tpY2socHVzaCwgbWFzdCk7CiAJfQorCW52X2Ny dGMtPmN1cnNvci52aXNpYmxlID0gZmFsc2U7CiB9CiAKIHN0YXRpYyB2b2lkCiBudjUwX2NydGNf Y3Vyc29yX3Nob3dfaGlkZShzdHJ1Y3Qgbm91dmVhdV9jcnRjICpudl9jcnRjLCBib29sIHNob3cs IGJvb2wgdXBkYXRlKQogewogCXN0cnVjdCBudjUwX21hc3QgKm1hc3QgPSBudjUwX21hc3QobnZf Y3J0Yy0+YmFzZS5kZXYpOwotCXN0cnVjdCBudjUwX2N1cnMgKmN1cnMgPSBudjUwX2N1cnMoJm52 X2NydGMtPmJhc2UpOwogCi0JaWYgKHNob3cgJiYgY3Vycy0+aW1hZ2UpCisJaWYgKHNob3cgJiYg bnZfY3J0Yy0+Y3Vyc29yLm52Ym8pCiAJCW52NTBfY3J0Y19jdXJzb3Jfc2hvdyhudl9jcnRjKTsK IAllbHNlCiAJCW52NTBfY3J0Y19jdXJzb3JfaGlkZShudl9jcnRjKTsKQEAgLTEyNzMsNyArMTI3 Miw2IEBAIG52NTBfY3J0Y19jdXJzb3Jfc2V0KHN0cnVjdCBkcm1fY3J0YyAqY3J0Yywgc3RydWN0 IGRybV9maWxlICpmaWxlX3ByaXYsCiAJCSAgICAgdWludDMyX3QgaGFuZGxlLCB1aW50MzJfdCB3 aWR0aCwgdWludDMyX3QgaGVpZ2h0KQogewogCXN0cnVjdCBub3V2ZWF1X2NydGMgKm52X2NydGMg PSBub3V2ZWF1X2NydGMoY3J0Yyk7Ci0Jc3RydWN0IG52NTBfY3VycyAqY3VycyA9IG52NTBfY3Vy cyhjcnRjKTsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+ZGV2OwogCXN0cnVjdCBk cm1fZ2VtX29iamVjdCAqZ2VtID0gTlVMTDsKIAlzdHJ1Y3Qgbm91dmVhdV9ibyAqbnZibyA9IE5V TEw7CkBAIC0xMjkyLDkgKzEyOTAsOSBAQCBudjUwX2NydGNfY3Vyc29yX3NldChzdHJ1Y3QgZHJt X2NydGMgKmNydGMsIHN0cnVjdCBkcm1fZmlsZSAqZmlsZV9wcml2LAogCX0KIAogCWlmIChyZXQg PT0gMCkgewotCQlpZiAoY3Vycy0+aW1hZ2UpCi0JCQlub3V2ZWF1X2JvX3VucGluKGN1cnMtPmlt YWdlKTsKLQkJbm91dmVhdV9ib19yZWYobnZibywgJmN1cnMtPmltYWdlKTsKKwkJaWYgKG52X2Ny dGMtPmN1cnNvci5udmJvKQorCQkJbm91dmVhdV9ib191bnBpbihudl9jcnRjLT5jdXJzb3IubnZi byk7CisJCW5vdXZlYXVfYm9fcmVmKG52Ym8sICZudl9jcnRjLT5jdXJzb3IubnZibyk7CiAJfQog CWRybV9nZW1fb2JqZWN0X3VucmVmZXJlbmNlX3VubG9ja2VkKGdlbSk7CiAKQEAgLTEzMDUsMTAg KzEzMDMsMTQgQEAgbnY1MF9jcnRjX2N1cnNvcl9zZXQoc3RydWN0IGRybV9jcnRjICpjcnRjLCBz dHJ1Y3QgZHJtX2ZpbGUgKmZpbGVfcHJpdiwKIHN0YXRpYyBpbnQKIG52NTBfY3J0Y19jdXJzb3Jf bW92ZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMsIGludCB4LCBpbnQgeSkKIHsKKwlzdHJ1Y3Qgbm91 dmVhdV9jcnRjICpudl9jcnRjID0gbm91dmVhdV9jcnRjKGNydGMpOwogCXN0cnVjdCBudjUwX2N1 cnMgKmN1cnMgPSBudjUwX2N1cnMoY3J0Yyk7CiAJc3RydWN0IG52NTBfY2hhbiAqY2hhbiA9IG52 NTBfY2hhbihjdXJzKTsKIAludmlmX3dyMzIoJmNoYW4tPnVzZXIsIDB4MDA4NCwgKHkgPDwgMTYp IHwgKHggJiAweGZmZmYpKTsKIAludmlmX3dyMzIoJmNoYW4tPnVzZXIsIDB4MDA4MCwgMHgwMDAw MDAwMCk7CisKKwludl9jcnRjLT5jdXJzb3Jfc2F2ZWRfeCA9IHg7CisJbnZfY3J0Yy0+Y3Vyc29y X3NhdmVkX3kgPSB5OwogCXJldHVybiAwOwogfQogCkBAIC0xMzMwLDYgKzEzMzIsMTQgQEAgbnY1 MF9jcnRjX2dhbW1hX3NldChzdHJ1Y3QgZHJtX2NydGMgKmNydGMsIHUxNiAqciwgdTE2ICpnLCB1 MTYgKmIsCiB9CiAKIHN0YXRpYyB2b2lkCitudjUwX2NydGNfY3Vyc29yX3Jlc3RvcmUoc3RydWN0 IG5vdXZlYXVfY3J0YyAqbnZfY3J0YywgaW50IHgsIGludCB5KQoreworCW52NTBfY3J0Y19jdXJz b3JfbW92ZSgmbnZfY3J0Yy0+YmFzZSwgeCwgeSk7CisKKwludjUwX2NydGNfY3Vyc29yX3Nob3df aGlkZShudl9jcnRjLCB0cnVlLCB0cnVlKTsKK30KKworc3RhdGljIHZvaWQKIG52NTBfY3J0Y19k ZXN0cm95KHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIHsKIAlzdHJ1Y3Qgbm91dmVhdV9jcnRjICpu dl9jcnRjID0gbm91dmVhdV9jcnRjKGNydGMpOwpAQCAtMTM1NCw5ICsxMzY0LDkgQEAgbnY1MF9j cnRjX2Rlc3Ryb3koc3RydWN0IGRybV9jcnRjICpjcnRjKQogCW5vdXZlYXVfYm9fcmVmKE5VTEws ICZoZWFkLT5pbWFnZSk7CiAKIAkvKlhYWDogZGl0dG8gKi8KLQlpZiAoaGVhZC0+Y3Vycy5pbWFn ZSkKLQkJbm91dmVhdV9ib191bnBpbihoZWFkLT5jdXJzLmltYWdlKTsKLQlub3V2ZWF1X2JvX3Jl ZihOVUxMLCAmaGVhZC0+Y3Vycy5pbWFnZSk7CisJaWYgKG52X2NydGMtPmN1cnNvci5udmJvKQor CQlub3V2ZWF1X2JvX3VucGluKG52X2NydGMtPmN1cnNvci5udmJvKTsKKwlub3V2ZWF1X2JvX3Jl ZihOVUxMLCAmbnZfY3J0Yy0+Y3Vyc29yLm52Ym8pOwogCiAJbm91dmVhdV9ib191bm1hcChudl9j cnRjLT5sdXQubnZibyk7CiAJaWYgKG52X2NydGMtPmx1dC5udmJvKQpAQCAtMTQwNiw2ICsxNDE2 LDcgQEAgbnY1MF9jcnRjX2NyZWF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBpbnQgaW5kZXgp CiAJaGVhZC0+YmFzZS5zZXRfY29sb3JfdmlicmFuY2UgPSBudjUwX2NydGNfc2V0X2NvbG9yX3Zp YnJhbmNlOwogCWhlYWQtPmJhc2UuY29sb3JfdmlicmFuY2UgPSA1MDsKIAloZWFkLT5iYXNlLnZp YnJhbnRfaHVlID0gMDsKKwloZWFkLT5iYXNlLmN1cnNvci5zZXRfcG9zID0gbnY1MF9jcnRjX2N1 cnNvcl9yZXN0b3JlOwogCWZvciAoaSA9IDA7IGkgPCAyNTY7IGkrKykgewogCQloZWFkLT5iYXNl Lmx1dC5yW2ldID0gaSA8PCA4OwogCQloZWFkLT5iYXNlLmx1dC5nW2ldID0gaSA8PCA4OwpAQCAt MTQzMyw4ICsxNDQ0LDYgQEAgbnY1MF9jcnRjX2NyZWF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 LCBpbnQgaW5kZXgpCiAJaWYgKHJldCkKIAkJZ290byBvdXQ7CiAKLQludjUwX2NydGNfbHV0X2xv YWQoY3J0Yyk7Ci0KIAkvKiBhbGxvY2F0ZSBjdXJzb3IgcmVzb3VyY2VzICovCiAJcmV0ID0gbnY1 MF9jdXJzX2NyZWF0ZShkaXNwLT5kaXNwLCBpbmRleCwgJmhlYWQtPmN1cnMpOwogCWlmIChyZXQp CkBAIC0yNDI3LDYgKzI0MzYsOCBAQCBudjUwX2Rpc3BsYXlfaW5pdChzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2KQogCiAJbGlzdF9mb3JfZWFjaF9lbnRyeShjcnRjLCAmZGV2LT5tb2RlX2NvbmZpZy5j cnRjX2xpc3QsIGhlYWQpIHsKIAkJc3RydWN0IG52NTBfc3luYyAqc3luYyA9IG52NTBfc3luYyhj cnRjKTsKKworCQludjUwX2NydGNfbHV0X2xvYWQoY3J0Yyk7CiAJCW5vdXZlYXVfYm9fd3IzMihk aXNwLT5zeW5jLCBzeW5jLT5hZGRyIC8gNCwgc3luYy0+ZGF0YSk7CiAJfQogCgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBs aXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNr dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=