From: Jani Nikula Subject: [PATCH] drm/i915: abstract display suspend/resume operations Date: Tue, 6 Aug 2019 15:22:08 +0300 Message-ID: <20190806122208.16786-2-jani.nikula@intel.com> References: <20190806122208.16786-1-jani.nikula@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id BD6246E36D for ; Tue, 6 Aug 2019 12:17:58 +0000 (UTC) In-Reply-To: <20190806122208.16786-1-jani.nikula@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 Cc: jani.nikula@intel.com List-Id: intel-gfx@lists.freedesktop.org RnJvbTogUm9kcmlnbyBWaXZpIDxyb2RyaWdvLnZpdmlAaW50ZWwuY29tPgoKSW5jcmVhc2UgYWJz dHJhY3Rpb24gb2YgZGlzcGxheSBzdXNwZW5kL3Jlc3VtZSBvcGVyYXRpb25zIGJ5IHByb3ZpZGlu ZwpoaWdoZXIgbGV2ZWwgZnVuY3Rpb25zLCBhbmQgaGlkaW5nIHRoZSBkZXRhaWxzIGluc2lkZQpp bnRlbF9kaXNwbGF5X3Bvd2VyLmMuCgp2MjogTWFrZSBjaGVja3BhdGNoIGhhcHB5OgogICAgLSBi cmFjZXMge30gYXJlIG5vdCBuZWNlc3NhcnkgZm9yIHNpbmdsZSBzdGF0ZW1lbnQgYmxvY2tzCnYz OiBBbHNvIG1vdmUgaHN3L2JkdyBQQzggc2VxdWVuY2VzIHNpbmNlIHRoZXkgYXJlIHJlbGF0ZWQg dG8KICAgIGRpc3BsYXkgUE0gYW55d2F5cy4gKFZpbGxlKQp2NDogUmViYXNlIGFmdGVyIGEgbG9u ZyB0aW1lLCBwbHVzIE1vdmUgZnVuY3Rpb25zIHRvIHRoZSBuZXcKICAgIGludGVsX2Rpc3BsYXlf cG93ZXIgc28gd2UgY2FuIHN0b3AgZXhwb3J0aW5nIHBsYXRmb3JtIHNwZWNpZmljCiAgICBmdW5j dGlvbnMgYXMgcG9pbnRlZCBieSBKYW5pLgp2NTogUmVtb3ZlIHVubmVjZXNzYXJ5IGJyYWNlcy4K djYgYnkgSmFuaTogbWFrZSB0aGlzIHB1cmVseSBub24tZnVuY3Rpb25hbCBjbGVhbnVwLCBtYWtl IGZ1bmN0aW9ucyBzdGF0aWMKCkNjOiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5j by51az4KQ2M6IEpvc8OpIFJvYmVydG8gZGUgU291emEgPGpvc2Uuc291emFAaW50ZWwuY29tPgpD YzogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KU2lnbmVk LW9mZi1ieTogUm9kcmlnbyBWaXZpIDxyb2RyaWdvLnZpdmlAaW50ZWwuY29tPgpTaWduZWQtb2Zm LWJ5OiBKYW5pIE5pa3VsYSA8amFuaS5uaWt1bGFAaW50ZWwuY29tPgotLS0KIC4uLi9kcm0vaTkx NS9kaXNwbGF5L2ludGVsX2Rpc3BsYXlfcG93ZXIuYyAgICB8IDgwICsrKysrKysrKysrKysrKyst LS0KIC4uLi9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rpc3BsYXlfcG93ZXIuaCAgICB8IDE3ICsr LS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMgICAgICAgICAgICAgICB8IDU4ICsr Ky0tLS0tLS0tLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDg0IGluc2VydGlvbnMoKyksIDcxIGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxf ZGlzcGxheV9wb3dlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kaXNw bGF5X3Bvd2VyLmMKaW5kZXggZGQyYTUwYjhiYTBhLi4zY2Q5NzUyZmQzMjggMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheV9wb3dlci5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheV9wb3dlci5jCkBAIC03 MjcsNyArNzI3LDcgQEAgc3RhdGljIHUzMiBnZW45X2RjX21hc2soc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2KQogCXJldHVybiBtYXNrOwogfQogCi12b2lkIGdlbjlfc2FuaXRpemVf ZGNfc3RhdGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQorc3RhdGljIHZvaWQg Z2VuOV9zYW5pdGl6ZV9kY19zdGF0ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYp CiB7CiAJdTMyIHZhbDsKIApAQCAtNzg3LDcgKzc4Nyw3IEBAIHN0YXRpYyB2b2lkIGdlbjlfc2V0 X2RjX3N0YXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgdTMyIHN0YXRlKQog CWRldl9wcml2LT5jc3IuZGNfc3RhdGUgPSB2YWwgJiBtYXNrOwogfQogCi12b2lkIGJ4dF9lbmFi bGVfZGM5KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKK3N0YXRpYyB2b2lkIGJ4 dF9lbmFibGVfZGM5KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKIAlhc3Nl cnRfY2FuX2VuYWJsZV9kYzkoZGV2X3ByaXYpOwogCkBAIC04MDIsNyArODAyLDcgQEAgdm9pZCBi eHRfZW5hYmxlX2RjOShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJZ2VuOV9z ZXRfZGNfc3RhdGUoZGV2X3ByaXYsIERDX1NUQVRFX0VOX0RDOSk7CiB9CiAKLXZvaWQgYnh0X2Rp c2FibGVfZGM5KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKK3N0YXRpYyB2b2lk IGJ4dF9kaXNhYmxlX2RjOShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7CiAJ YXNzZXJ0X2Nhbl9kaXNhYmxlX2RjOShkZXZfcHJpdik7CiAKQEAgLTg1Niw3ICs4NTYsNyBAQCBz dGF0aWMgdm9pZCBhc3NlcnRfY2FuX2VuYWJsZV9kYzUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2KQogCWFzc2VydF9jc3JfbG9hZGVkKGRldl9wcml2KTsKIH0KIAotdm9pZCBnZW45 X2VuYWJsZV9kYzUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQorc3RhdGljIHZv aWQgZ2VuOV9lbmFibGVfZGM1KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsK IAlhc3NlcnRfY2FuX2VuYWJsZV9kYzUoZGV2X3ByaXYpOwogCkBAIC04ODAsNyArODgwLDcgQEAg c3RhdGljIHZvaWQgYXNzZXJ0X2Nhbl9lbmFibGVfZGM2KHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdikKIAlhc3NlcnRfY3NyX2xvYWRlZChkZXZfcHJpdik7CiB9CiAKLXZvaWQgc2ts X2VuYWJsZV9kYzYoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQorc3RhdGljIHZv aWQgc2tsX2VuYWJsZV9kYzYoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewog CWFzc2VydF9jYW5fZW5hYmxlX2RjNihkZXZfcHJpdik7CiAKQEAgLTQ0NDEsNyArNDQ0MSw3IEBA IHN0YXRpYyB2b2lkIGhzd19yZXN0b3JlX2xjcGxsKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdikKICAqIEZvciBtb3JlLCByZWFkICJEaXNwbGF5IFNlcXVlbmNlcyBmb3IgUGFja2Fn ZSBDOCIgb24gdGhlIGhhcmR3YXJlCiAgKiBkb2N1bWVudGF0aW9uLgogICovCi12b2lkIGhzd19l bmFibGVfcGM4KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKK3N0YXRpYyB2b2lk IGhzd19lbmFibGVfcGM4KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKIAl1 MzIgdmFsOwogCkBAIC00NDU3LDcgKzQ0NTcsNyBAQCB2b2lkIGhzd19lbmFibGVfcGM4KHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAloc3dfZGlzYWJsZV9sY3BsbChkZXZfcHJp diwgdHJ1ZSwgdHJ1ZSk7CiB9CiAKLXZvaWQgaHN3X2Rpc2FibGVfcGM4KHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdikKK3N0YXRpYyB2b2lkIGhzd19kaXNhYmxlX3BjOChzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7CiAJdTMyIHZhbDsKIApAQCAtNDU1Nyw4ICs0 NTU3LDcgQEAgc3RhdGljIHZvaWQgc2tsX2Rpc3BsYXlfY29yZV91bmluaXQoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2KQogCXVzbGVlcF9yYW5nZSgxMCwgMzApOwkJLyogMTAgdXMg ZGVsYXkgcGVyIEJzcGVjICovCiB9CiAKLXZvaWQgYnh0X2Rpc3BsYXlfY29yZV9pbml0KHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKLQkJCSAgIGJvb2wgcmVzdW1lKQorc3RhdGlj IHZvaWQgYnh0X2Rpc3BsYXlfY29yZV9pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiwgYm9vbCByZXN1bWUpCiB7CiAJc3RydWN0IGk5MTVfcG93ZXJfZG9tYWlucyAqcG93ZXJf ZG9tYWlucyA9ICZkZXZfcHJpdi0+cG93ZXJfZG9tYWluczsKIAlzdHJ1Y3QgaTkxNV9wb3dlcl93 ZWxsICp3ZWxsOwpAQCAtNDU4OSw3ICs0NTg4LDcgQEAgdm9pZCBieHRfZGlzcGxheV9jb3JlX2lu aXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQlpbnRlbF9jc3JfbG9hZF9w cm9ncmFtKGRldl9wcml2KTsKIH0KIAotdm9pZCBieHRfZGlzcGxheV9jb3JlX3VuaW5pdChzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCitzdGF0aWMgdm9pZCBieHRfZGlzcGxheV9j b3JlX3VuaW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7CiAJc3RydWN0 IGk5MTVfcG93ZXJfZG9tYWlucyAqcG93ZXJfZG9tYWlucyA9ICZkZXZfcHJpdi0+cG93ZXJfZG9t YWluczsKIAlzdHJ1Y3QgaTkxNV9wb3dlcl93ZWxsICp3ZWxsOwpAQCAtNDY4MCw4ICs0Njc5LDgg QEAgc3RhdGljIHZvaWQgY25sX2Rpc3BsYXlfY29yZV91bmluaXQoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2KQogCWludGVsX2NvbWJvX3BoeV91bmluaXQoZGV2X3ByaXYpOwogfQog Ci12b2lkIGljbF9kaXNwbGF5X2NvcmVfaW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYsCi0JCQkgICBib29sIHJlc3VtZSkKK3N0YXRpYyB2b2lkIGljbF9kaXNwbGF5X2NvcmVf aW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCisJCQkJICBib29sIHJlc3Vt ZSkKIHsKIAlzdHJ1Y3QgaTkxNV9wb3dlcl9kb21haW5zICpwb3dlcl9kb21haW5zID0gJmRldl9w cml2LT5wb3dlcl9kb21haW5zOwogCXN0cnVjdCBpOTE1X3Bvd2VyX3dlbGwgKndlbGw7CkBAIC00 NzE2LDcgKzQ3MTUsNyBAQCB2b2lkIGljbF9kaXNwbGF5X2NvcmVfaW5pdChzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCWludGVsX2Nzcl9sb2FkX3Byb2dyYW0oZGV2X3ByaXYp OwogfQogCi12b2lkIGljbF9kaXNwbGF5X2NvcmVfdW5pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdikKK3N0YXRpYyB2b2lkIGljbF9kaXNwbGF5X2NvcmVfdW5pbml0KHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKIAlzdHJ1Y3QgaTkxNV9wb3dlcl9kb21h aW5zICpwb3dlcl9kb21haW5zID0gJmRldl9wcml2LT5wb3dlcl9kb21haW5zOwogCXN0cnVjdCBp OTE1X3Bvd2VyX3dlbGwgKndlbGw7CkBAIC01MTkzLDMgKzUxOTIsNTggQEAgc3RhdGljIHZvaWQg aW50ZWxfcG93ZXJfZG9tYWluc192ZXJpZnlfc3RhdGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg Kmk5MTUpCiB9CiAKICNlbmRpZgorCit2b2lkIGludGVsX2Rpc3BsYXlfcG93ZXJfc3VzcGVuZF9s YXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1KQoreworCWlmIChJTlRFTF9HRU4oaTkx NSkgPj0gMTEgfHwgSVNfR0VOOV9MUChpOTE1KSkKKwkJYnh0X2VuYWJsZV9kYzkoaTkxNSk7CisJ ZWxzZSBpZiAoSVNfSEFTV0VMTChpOTE1KSB8fCBJU19CUk9BRFdFTEwoaTkxNSkpCisJCWhzd19l bmFibGVfcGM4KGk5MTUpOworfQorCit2b2lkIGludGVsX2Rpc3BsYXlfcG93ZXJfcmVzdW1lX2Vh cmx5KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1KQoreworCWlmIChJTlRFTF9HRU4oaTkx NSkgPj0gMTEgfHwgSVNfR0VOOV9MUChpOTE1KSkgeworCQlnZW45X3Nhbml0aXplX2RjX3N0YXRl KGk5MTUpOworCQlieHRfZGlzYWJsZV9kYzkoaTkxNSk7CisJfSBlbHNlIGlmIChJU19IQVNXRUxM KGk5MTUpIHx8IElTX0JST0FEV0VMTChpOTE1KSkgeworCQloc3dfZGlzYWJsZV9wYzgoaTkxNSk7 CisJfQorfQorCit2b2lkIGludGVsX2Rpc3BsYXlfcG93ZXJfc3VzcGVuZChzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqaTkxNSkKK3sKKwlpZiAoSU5URUxfR0VOKGk5MTUpID49IDExKSB7CisJCWlj bF9kaXNwbGF5X2NvcmVfdW5pbml0KGk5MTUpOworCQlieHRfZW5hYmxlX2RjOShpOTE1KTsKKwl9 IGVsc2UgaWYgKElTX0dFTjlfTFAoaTkxNSkpIHsKKwkJYnh0X2Rpc3BsYXlfY29yZV91bmluaXQo aTkxNSk7CisJCWJ4dF9lbmFibGVfZGM5KGk5MTUpOworCX0gZWxzZSBpZiAoSVNfSEFTV0VMTChp OTE1KSB8fCBJU19CUk9BRFdFTEwoaTkxNSkpIHsKKwkJaHN3X2VuYWJsZV9wYzgoaTkxNSk7CisJ fQorfQorCit2b2lkIGludGVsX2Rpc3BsYXlfcG93ZXJfcmVzdW1lKHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICppOTE1KQoreworCWlmIChJTlRFTF9HRU4oaTkxNSkgPj0gMTEpIHsKKwkJYnh0X2Rp c2FibGVfZGM5KGk5MTUpOworCQlpY2xfZGlzcGxheV9jb3JlX2luaXQoaTkxNSwgdHJ1ZSk7CisJ CWlmIChpOTE1LT5jc3IuZG1jX3BheWxvYWQpIHsKKwkJCWlmIChpOTE1LT5jc3IuYWxsb3dlZF9k Y19tYXNrICYKKwkJCSAgICBEQ19TVEFURV9FTl9VUFRPX0RDNikKKwkJCQlza2xfZW5hYmxlX2Rj NihpOTE1KTsKKwkJCWVsc2UgaWYgKGk5MTUtPmNzci5hbGxvd2VkX2RjX21hc2sgJgorCQkJCSBE Q19TVEFURV9FTl9VUFRPX0RDNSkKKwkJCQlnZW45X2VuYWJsZV9kYzUoaTkxNSk7CisJCX0KKwl9 IGVsc2UgaWYgKElTX0dFTjlfTFAoaTkxNSkpIHsKKwkJYnh0X2Rpc2FibGVfZGM5KGk5MTUpOwor CQlieHRfZGlzcGxheV9jb3JlX2luaXQoaTkxNSwgdHJ1ZSk7CisJCWlmIChpOTE1LT5jc3IuZG1j X3BheWxvYWQgJiYKKwkJICAgIChpOTE1LT5jc3IuYWxsb3dlZF9kY19tYXNrICYgRENfU1RBVEVf RU5fVVBUT19EQzUpKQorCQkJZ2VuOV9lbmFibGVfZGM1KGk5MTUpOworCX0gZWxzZSBpZiAoSVNf SEFTV0VMTChpOTE1KSB8fCBJU19CUk9BRFdFTEwoaTkxNSkpIHsKKwkJaHN3X2Rpc2FibGVfcGM4 KGk5MTUpOworCX0KK30KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkv aW50ZWxfZGlzcGxheV9wb3dlci5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRl bF9kaXNwbGF5X3Bvd2VyLmgKaW5kZXggZTRkMmMxYmEyNGIwLi45N2YyNTYyZmM1ZDMgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheV9wb3dlci5o CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheV9wb3dlci5o CkBAIC0yMzIsMjcgKzIzMiwyMCBAQCBzdHJ1Y3QgaTkxNV9wb3dlcl9kb21haW5zIHsKIAlmb3Jf ZWFjaF9wb3dlcl93ZWxsX3JldmVyc2UoX19kZXZfcHJpdiwgX19wb3dlcl93ZWxsKQkJICAgICAg ICBcCiAJCWZvcl9lYWNoX2lmKChfX3Bvd2VyX3dlbGwpLT5kZXNjLT5kb21haW5zICYgKF9fZG9t YWluX21hc2spKQogCi12b2lkIHNrbF9lbmFibGVfZGM2KHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdik7Ci12b2lkIGdlbjlfc2FuaXRpemVfZGNfc3RhdGUoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2KTsKLXZvaWQgYnh0X2VuYWJsZV9kYzkoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2KTsKLXZvaWQgYnh0X2Rpc2FibGVfZGM5KHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdik7Ci12b2lkIGdlbjlfZW5hYmxlX2RjNShzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwotCiBpbnQgaW50ZWxfcG93ZXJfZG9tYWluc19pbml0KHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CiB2b2lkIGludGVsX3Bvd2VyX2RvbWFp bnNfY2xlYW51cChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogdm9pZCBpbnRl bF9wb3dlcl9kb21haW5zX2luaXRfaHcoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 LCBib29sIHJlc3VtZSk7CiB2b2lkIGludGVsX3Bvd2VyX2RvbWFpbnNfZHJpdmVyX3JlbW92ZShz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwotdm9pZCBpY2xfZGlzcGxheV9jb3Jl X2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCBib29sIHJlc3VtZSk7Ci12 b2lkIGljbF9kaXNwbGF5X2NvcmVfdW5pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdik7CiB2b2lkIGludGVsX3Bvd2VyX2RvbWFpbnNfZW5hYmxlKHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdik7CiB2b2lkIGludGVsX3Bvd2VyX2RvbWFpbnNfZGlzYWJsZShzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogdm9pZCBpbnRlbF9wb3dlcl9kb21haW5z X3N1c3BlbmQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQkJCSBlbnVtIGk5 MTVfZHJtX3N1c3BlbmRfbW9kZSk7CiB2b2lkIGludGVsX3Bvd2VyX2RvbWFpbnNfcmVzdW1lKHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7Ci12b2lkIGhzd19lbmFibGVfcGM4KHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7Ci12b2lkIGhzd19kaXNhYmxlX3BjOChz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwotdm9pZCBieHRfZGlzcGxheV9jb3Jl X2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCBib29sIHJlc3VtZSk7Ci12 b2lkIGJ4dF9kaXNwbGF5X2NvcmVfdW5pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdik7CisKK3ZvaWQgaW50ZWxfZGlzcGxheV9wb3dlcl9zdXNwZW5kX2xhdGUoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmk5MTUpOwordm9pZCBpbnRlbF9kaXNwbGF5X3Bvd2VyX3Jlc3VtZV9l YXJseShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSk7Cit2b2lkIGludGVsX2Rpc3BsYXlf cG93ZXJfc3VzcGVuZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSk7Cit2b2lkIGludGVs X2Rpc3BsYXlfcG93ZXJfcmVzdW1lKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1KTsKIAog Y29uc3QgY2hhciAqCiBpbnRlbF9kaXNwbGF5X3Bvd2VyX2RvbWFpbl9zdHIoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmk5MTUsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2Rydi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwppbmRleCBkMzQ4ZDIyYmYw Y2YuLmEwZjg2N2ZlNTFlYyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k cnYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCkBAIC0yMTY1LDcgKzIx NjUsNyBAQCBzdGF0aWMgaW50IGk5MTVfZHJtX3N1c3BlbmRfbGF0ZShzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2LCBib29sIGhpYmVybmF0aW9uKQogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiA9IHRvX2k5MTUoZGV2KTsKIAlzdHJ1Y3QgcGNpX2RldiAqcGRldiA9IGRldl9wcml2LT5k cm0ucGRldjsKIAlzdHJ1Y3QgaW50ZWxfcnVudGltZV9wbSAqcnBtID0gJmRldl9wcml2LT5ydW50 aW1lX3BtOwotCWludCByZXQ7CisJaW50IHJldCA9IDA7CiAKIAlkaXNhYmxlX3JwbV93YWtlcmVm X2Fzc2VydHMocnBtKTsKIApAQCAtMjE3NiwxMiArMjE3Niw5IEBAIHN0YXRpYyBpbnQgaTkxNV9k cm1fc3VzcGVuZF9sYXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGJvb2wgaGliZXJuYXRpb24p CiAJaW50ZWxfcG93ZXJfZG9tYWluc19zdXNwZW5kKGRldl9wcml2LAogCQkJCSAgICBnZXRfc3Vz cGVuZF9tb2RlKGRldl9wcml2LCBoaWJlcm5hdGlvbikpOwogCi0JcmV0ID0gMDsKLQlpZiAoSU5U RUxfR0VOKGRldl9wcml2KSA+PSAxMSB8fCBJU19HRU45X0xQKGRldl9wcml2KSkKLQkJYnh0X2Vu YWJsZV9kYzkoZGV2X3ByaXYpOwotCWVsc2UgaWYgKElTX0hBU1dFTEwoZGV2X3ByaXYpIHx8IElT X0JST0FEV0VMTChkZXZfcHJpdikpCi0JCWhzd19lbmFibGVfcGM4KGRldl9wcml2KTsKLQllbHNl IGlmIChJU19WQUxMRVlWSUVXKGRldl9wcml2KSB8fCBJU19DSEVSUllWSUVXKGRldl9wcml2KSkK KwlpbnRlbF9kaXNwbGF5X3Bvd2VyX3N1c3BlbmRfbGF0ZShkZXZfcHJpdik7CisKKwlpZiAoSVNf VkFMTEVZVklFVyhkZXZfcHJpdikgfHwgSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpCiAJCXJldCA9 IHZsdl9zdXNwZW5kX2NvbXBsZXRlKGRldl9wcml2KTsKIAogCWlmIChyZXQpIHsKQEAgLTIzNjYs MTIgKzIzNjMsNyBAQCBzdGF0aWMgaW50IGk5MTVfZHJtX3Jlc3VtZV9lYXJseShzdHJ1Y3QgZHJt X2RldmljZSAqZGV2KQogCiAJaW50ZWxfZ3RfY2hlY2tfYW5kX2NsZWFyX2ZhdWx0cygmZGV2X3By aXYtPmd0KTsKIAotCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDExIHx8IElTX0dFTjlfTFAo ZGV2X3ByaXYpKSB7Ci0JCWdlbjlfc2FuaXRpemVfZGNfc3RhdGUoZGV2X3ByaXYpOwotCQlieHRf ZGlzYWJsZV9kYzkoZGV2X3ByaXYpOwotCX0gZWxzZSBpZiAoSVNfSEFTV0VMTChkZXZfcHJpdikg fHwgSVNfQlJPQURXRUxMKGRldl9wcml2KSkgewotCQloc3dfZGlzYWJsZV9wYzgoZGV2X3ByaXYp OwotCX0KKwlpbnRlbF9kaXNwbGF5X3Bvd2VyX3Jlc3VtZV9lYXJseShkZXZfcHJpdik7CiAKIAlp bnRlbF9zYW5pdGl6ZV9ndF9wb3dlcnNhdmUoZGV2X3ByaXYpOwogCkBAIC0yOTExLDcgKzI5MDMs NyBAQCBzdGF0aWMgaW50IGludGVsX3J1bnRpbWVfc3VzcGVuZChzdHJ1Y3QgZGV2aWNlICprZGV2 KQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGtkZXZfdG9faTkxNShr ZGV2KTsKIAlzdHJ1Y3QgaW50ZWxfcnVudGltZV9wbSAqcnBtID0gJmRldl9wcml2LT5ydW50aW1l X3BtOwotCWludCByZXQ7CisJaW50IHJldCA9IDA7CiAKIAlpZiAoV0FSTl9PTl9PTkNFKCEoZGV2 X3ByaXYtPmd0X3BtLnJjNi5lbmFibGVkICYmIEhBU19SQzYoZGV2X3ByaXYpKSkpCiAJCXJldHVy biAtRU5PREVWOwpAQCAtMjkzNSwxOCArMjkyNywxMCBAQCBzdGF0aWMgaW50IGludGVsX3J1bnRp bWVfc3VzcGVuZChzdHJ1Y3QgZGV2aWNlICprZGV2KQogCiAJaW50ZWxfdW5jb3JlX3N1c3BlbmQo JmRldl9wcml2LT51bmNvcmUpOwogCi0JcmV0ID0gMDsKLQlpZiAoSU5URUxfR0VOKGRldl9wcml2 KSA+PSAxMSkgewotCQlpY2xfZGlzcGxheV9jb3JlX3VuaW5pdChkZXZfcHJpdik7Ci0JCWJ4dF9l bmFibGVfZGM5KGRldl9wcml2KTsKLQl9IGVsc2UgaWYgKElTX0dFTjlfTFAoZGV2X3ByaXYpKSB7 Ci0JCWJ4dF9kaXNwbGF5X2NvcmVfdW5pbml0KGRldl9wcml2KTsKLQkJYnh0X2VuYWJsZV9kYzko ZGV2X3ByaXYpOwotCX0gZWxzZSBpZiAoSVNfSEFTV0VMTChkZXZfcHJpdikgfHwgSVNfQlJPQURX RUxMKGRldl9wcml2KSkgewotCQloc3dfZW5hYmxlX3BjOChkZXZfcHJpdik7Ci0JfSBlbHNlIGlm IChJU19WQUxMRVlWSUVXKGRldl9wcml2KSB8fCBJU19DSEVSUllWSUVXKGRldl9wcml2KSkgewor CWludGVsX2Rpc3BsYXlfcG93ZXJfc3VzcGVuZChkZXZfcHJpdik7CisKKwlpZiAoSVNfVkFMTEVZ VklFVyhkZXZfcHJpdikgfHwgSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpCiAJCXJldCA9IHZsdl9z dXNwZW5kX2NvbXBsZXRlKGRldl9wcml2KTsKLQl9CiAKIAlpZiAocmV0KSB7CiAJCURSTV9FUlJP UigiUnVudGltZSBzdXNwZW5kIGZhaWxlZCwgZGlzYWJsaW5nIGl0ICglZClcbiIsIHJldCk7CkBA IC0zMDIyLDI4ICszMDA2LDEwIEBAIHN0YXRpYyBpbnQgaW50ZWxfcnVudGltZV9yZXN1bWUoc3Ry dWN0IGRldmljZSAqa2RldikKIAlpZiAoaW50ZWxfdW5jb3JlX3VuY2xhaW1lZF9tbWlvKCZkZXZf cHJpdi0+dW5jb3JlKSkKIAkJRFJNX0RFQlVHX0RSSVZFUigiVW5jbGFpbWVkIGFjY2VzcyBkdXJp bmcgc3VzcGVuZCwgYmlvcz9cbiIpOwogCi0JaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gMTEp IHsKLQkJYnh0X2Rpc2FibGVfZGM5KGRldl9wcml2KTsKLQkJaWNsX2Rpc3BsYXlfY29yZV9pbml0 KGRldl9wcml2LCB0cnVlKTsKLQkJaWYgKGRldl9wcml2LT5jc3IuZG1jX3BheWxvYWQpIHsKLQkJ CWlmIChkZXZfcHJpdi0+Y3NyLmFsbG93ZWRfZGNfbWFzayAmCi0JCQkgICAgRENfU1RBVEVfRU5f VVBUT19EQzYpCi0JCQkJc2tsX2VuYWJsZV9kYzYoZGV2X3ByaXYpOwotCQkJZWxzZSBpZiAoZGV2 X3ByaXYtPmNzci5hbGxvd2VkX2RjX21hc2sgJgotCQkJCSBEQ19TVEFURV9FTl9VUFRPX0RDNSkK LQkJCQlnZW45X2VuYWJsZV9kYzUoZGV2X3ByaXYpOwotCQl9Ci0JfSBlbHNlIGlmIChJU19HRU45 X0xQKGRldl9wcml2KSkgewotCQlieHRfZGlzYWJsZV9kYzkoZGV2X3ByaXYpOwotCQlieHRfZGlz cGxheV9jb3JlX2luaXQoZGV2X3ByaXYsIHRydWUpOwotCQlpZiAoZGV2X3ByaXYtPmNzci5kbWNf cGF5bG9hZCAmJgotCQkgICAgKGRldl9wcml2LT5jc3IuYWxsb3dlZF9kY19tYXNrICYgRENfU1RB VEVfRU5fVVBUT19EQzUpKQotCQkJZ2VuOV9lbmFibGVfZGM1KGRldl9wcml2KTsKLQl9IGVsc2Ug aWYgKElTX0hBU1dFTEwoZGV2X3ByaXYpIHx8IElTX0JST0FEV0VMTChkZXZfcHJpdikpIHsKLQkJ aHN3X2Rpc2FibGVfcGM4KGRldl9wcml2KTsKLQl9IGVsc2UgaWYgKElTX1ZBTExFWVZJRVcoZGV2 X3ByaXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKSB7CisJaW50ZWxfZGlzcGxheV9wb3dl cl9yZXN1bWUoZGV2X3ByaXYpOworCisJaWYgKElTX1ZBTExFWVZJRVcoZGV2X3ByaXYpIHx8IElT X0NIRVJSWVZJRVcoZGV2X3ByaXYpKQogCQlyZXQgPSB2bHZfcmVzdW1lX3ByZXBhcmUoZGV2X3By aXYsIHRydWUpOwotCX0KIAogCWludGVsX3VuY29yZV9ydW50aW1lX3Jlc3VtZSgmZGV2X3ByaXYt PnVuY29yZSk7CiAKLS0gCjIuMjAuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGlu Zm8vaW50ZWwtZ2Z4