From: Matt Roper Subject: [PATCH 1/4] drm/i915: Roll intel_crtc->atomic into intel_crtc_state Date: Wed, 9 Sep 2015 18:57:52 -0700 Message-ID: <1441850275-20353-2-git-send-email-matthew.d.roper@intel.com> References: <1441850275-20353-1-git-send-email-matthew.d.roper@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 3F660721A3 for ; Wed, 9 Sep 2015 18:58:40 -0700 (PDT) In-Reply-To: <1441850275-20353-1-git-send-email-matthew.d.roper@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 V2F5IGJhY2sgYXQgdGhlIGJlZ2lubmluZyBvZiBpOTE1J3MgYXRvbWljIGNvbnZlcnNpb24gSSBh ZGRlZAppbnRlbF9jcnRjLT5hdG9taWMgYXMgYSB0ZW1wb3JhcnkgZHVtcGluZyBncm91bmQgZm9y ICJzdHVmZiB0byBkbwpvdXRzaWRlIHZibGFuayBldmFzaW9uIiBmbGFncyBzaW5jZSBDUlRDIHN0 YXRlcyB3ZXJlbid0IHByb3Blcmx5IHdpcmVkCnVwIGFuZCB0cmFja2VkIGF0IHRoYXQgdGltZS4g IFdlJ3ZlIGhhZCBwcm9wZXIgQ1JUQyBzdGF0ZSB0cmFja2luZyBmb3IgYQp3aGlsZSBub3csIHNv IHRoZXJlJ3MgcmVhbGx5IG5vIHJlYXNvbiBmb3IgdGhpcyBoYWNrIHRvIGNvbnRpbnVlIHRvCmV4 aXN0LiAgTW92aW5nIGZvcndhcmQgd2Ugd2FudCB0byBzdG9yZSBpbnRlcm1lZGlhdGUgY3J0Yy9w bGFuZSBzdGF0ZQpkYXRhIGZvciBtb2Rlc2V0cyBpbiBhZGRpdGlvbiB0byB0aGUgZmluYWwgc3Rh dGUsIHNvIG1vdmluZyB0aGVzZSBmaWVsZHMKaW50byB0aGUgcHJvcGVyIHN0YXRlIG9iamVjdCBh bGxvd3MgdXMgdG8gcHJvcGVybHkgY29tcHV0ZSB0aGVtIGZvciBib3RoCnRoZSBpbnRlcm1lZGlh dGUgYW5kIGZpbmFsIHN0YXRlLgoKU2lnbmVkLW9mZi1ieTogTWF0dCBSb3BlciA8bWF0dGhldy5k LnJvcGVyQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWMu YyAgfCAxNiArKysrKystCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCA4 MyArKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rydi5oICAgICB8IDQyICsrKysrKystLS0tLS0tLS0tLQogMyBmaWxlcyBjaGFu Z2VkLCA3MyBpbnNlcnRpb25zKCspLCA2OCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2F0b21pYy5jCmluZGV4IDkzMzZlODAuLjNmZmMzODUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2F0b21pYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2F0b21pYy5jCkBAIC0xMDEsNiArMTAxLDIwIEBAIGludGVsX2NydGNfZHVwbGljYXRlX3N0 YXRlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAogCWNydGNfc3RhdGUtPmJhc2UuY3J0YyA9IGNy dGM7CiAKKwljcnRjX3N0YXRlLT53YWl0X2Zvcl9mbGlwcyA9IGZhbHNlOworCWNydGNfc3RhdGUt PmRpc2FibGVfZmJjID0gZmFsc2U7CisJY3J0Y19zdGF0ZS0+ZGlzYWJsZV9pcHMgPSBmYWxzZTsK KwljcnRjX3N0YXRlLT5kaXNhYmxlX2N4c3IgPSBmYWxzZTsKKwljcnRjX3N0YXRlLT5wcmVfZGlz YWJsZV9wcmltYXJ5ID0gZmFsc2U7CisJY3J0Y19zdGF0ZS0+dXBkYXRlX3dtX3ByZSA9IGZhbHNl OworCWNydGNfc3RhdGUtPnVwZGF0ZV93bV9wb3N0ID0gZmFsc2U7CisJY3J0Y19zdGF0ZS0+ZGlz YWJsZWRfcGxhbmVzID0gMDsKKwljcnRjX3N0YXRlLT5mYl9iaXRzID0gMDsKKwljcnRjX3N0YXRl LT53YWl0X3ZibGFuayA9IGZhbHNlOworCWNydGNfc3RhdGUtPnVwZGF0ZV9mYmMgPSBmYWxzZTsK KwljcnRjX3N0YXRlLT5wb3N0X2VuYWJsZV9wcmltYXJ5ID0gZmFsc2U7CisJY3J0Y19zdGF0ZS0+ dXBkYXRlX3Nwcml0ZV93YXRlcm1hcmtzID0gMDsKKwogCXJldHVybiAmY3J0Y19zdGF0ZS0+YmFz ZTsKIH0KIApAQCAtMjEyLDcgKzIyNiw3IEBAIGludCBpbnRlbF9hdG9taWNfc2V0dXBfc2NhbGVy cyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQkJCSAqIG1pbmltdW0gcmVxdWlyZWQgdmFsaWRh dGlvbi4KIAkJCQkgKi8KIAkJCQlpZiAocGxhbmUtPnR5cGUgPT0gRFJNX1BMQU5FX1RZUEVfUFJJ TUFSWSkKLQkJCQkJaW50ZWxfY3J0Yy0+YXRvbWljLndhaXRfZm9yX2ZsaXBzID0gdHJ1ZTsKKwkJ CQkJY3J0Y19zdGF0ZS0+d2FpdF9mb3JfZmxpcHMgPSB0cnVlOwogCQkJCWNydGNfc3RhdGUtPmJh c2UucGxhbmVzX2NoYW5nZWQgPSB0cnVlOwogCQkJfQogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k aXNwbGF5LmMKaW5kZXggYWY0OGMxZS4uNDY5MzFmOSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2Rpc3BsYXkuYwpAQCAtNDcxMCw0NCArNDcxMCw0MiBAQCBpbnRlbF9wcmVfZGlzYWJsZV9wcmlt YXJ5KHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAogc3RhdGljIHZvaWQgaW50ZWxfcG9zdF9wbGFu ZV91cGRhdGUoc3RydWN0IGludGVsX2NydGMgKmNydGMpCiB7Ci0Jc3RydWN0IGludGVsX2NydGNf YXRvbWljX2NvbW1pdCAqYXRvbWljID0gJmNydGMtPmF0b21pYzsKKwlzdHJ1Y3QgaW50ZWxfY3J0 Y19zdGF0ZSAqY3N0YXRlID0gdG9faW50ZWxfY3J0Y19zdGF0ZShjcnRjLT5iYXNlLnN0YXRlKTsK IAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+YmFzZS5kZXY7CiAJc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3QgZHJtX3Bs YW5lICpwbGFuZTsKIAotCWlmIChhdG9taWMtPndhaXRfdmJsYW5rKQorCWlmIChjc3RhdGUtPndh aXRfdmJsYW5rKQogCQlpbnRlbF93YWl0X2Zvcl92YmxhbmsoZGV2LCBjcnRjLT5waXBlKTsKIAot CWludGVsX2Zyb250YnVmZmVyX2ZsaXAoZGV2LCBhdG9taWMtPmZiX2JpdHMpOworCWludGVsX2Zy b250YnVmZmVyX2ZsaXAoZGV2LCBjc3RhdGUtPmZiX2JpdHMpOwogCi0JaWYgKGF0b21pYy0+ZGlz YWJsZV9jeHNyKQorCWlmIChjc3RhdGUtPmRpc2FibGVfY3hzcikKIAkJY3J0Yy0+d20uY3hzcl9h bGxvd2VkID0gdHJ1ZTsKIAotCWlmIChjcnRjLT5hdG9taWMudXBkYXRlX3dtX3Bvc3QpCisJaWYg KGNzdGF0ZS0+dXBkYXRlX3dtX3Bvc3QpCiAJCWludGVsX3VwZGF0ZV93YXRlcm1hcmtzKCZjcnRj LT5iYXNlKTsKIAotCWlmIChhdG9taWMtPnVwZGF0ZV9mYmMpCisJaWYgKGNzdGF0ZS0+dXBkYXRl X2ZiYykKIAkJaW50ZWxfZmJjX3VwZGF0ZShkZXZfcHJpdik7CiAKLQlpZiAoYXRvbWljLT5wb3N0 X2VuYWJsZV9wcmltYXJ5KQorCWlmIChjc3RhdGUtPnBvc3RfZW5hYmxlX3ByaW1hcnkpCiAJCWlu dGVsX3Bvc3RfZW5hYmxlX3ByaW1hcnkoJmNydGMtPmJhc2UpOwogCi0JZHJtX2Zvcl9lYWNoX3Bs YW5lX21hc2socGxhbmUsIGRldiwgYXRvbWljLT51cGRhdGVfc3ByaXRlX3dhdGVybWFya3MpCisJ ZHJtX2Zvcl9lYWNoX3BsYW5lX21hc2socGxhbmUsIGRldiwgY3N0YXRlLT51cGRhdGVfc3ByaXRl X3dhdGVybWFya3MpCiAJCWludGVsX3VwZGF0ZV9zcHJpdGVfd2F0ZXJtYXJrcyhwbGFuZSwgJmNy dGMtPmJhc2UsCiAJCQkJCSAgICAgICAwLCAwLCAwLCBmYWxzZSwgZmFsc2UpOwotCi0JbWVtc2V0 KGF0b21pYywgMCwgc2l6ZW9mKCphdG9taWMpKTsKIH0KIAogc3RhdGljIHZvaWQgaW50ZWxfcHJl X3BsYW5lX3VwZGF0ZShzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIHsKKwlzdHJ1Y3QgaW50ZWxf Y3J0Y19zdGF0ZSAqY3N0YXRlID0gdG9faW50ZWxfY3J0Y19zdGF0ZShjcnRjLT5iYXNlLnN0YXRl KTsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+YmFzZS5kZXY7CiAJc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKLQlzdHJ1Y3QgaW50 ZWxfY3J0Y19hdG9taWNfY29tbWl0ICphdG9taWMgPSAmY3J0Yy0+YXRvbWljOwogCXN0cnVjdCBk cm1fcGxhbmUgKnA7CiAKIAkvKiBUcmFjayBmYidzIGZvciBhbnkgcGxhbmVzIGJlaW5nIGRpc2Fi bGVkICovCi0JZHJtX2Zvcl9lYWNoX3BsYW5lX21hc2socCwgZGV2LCBhdG9taWMtPmRpc2FibGVk X3BsYW5lcykgeworCWRybV9mb3JfZWFjaF9wbGFuZV9tYXNrKHAsIGRldiwgY3N0YXRlLT5kaXNh YmxlZF9wbGFuZXMpIHsKIAkJc3RydWN0IGludGVsX3BsYW5lICpwbGFuZSA9IHRvX2ludGVsX3Bs YW5lKHApOwogCiAJCW11dGV4X2xvY2soJmRldi0+c3RydWN0X211dGV4KTsKQEAgLTQ3NTYsMTkg KzQ3NTQsMTkgQEAgc3RhdGljIHZvaWQgaW50ZWxfcHJlX3BsYW5lX3VwZGF0ZShzdHJ1Y3QgaW50 ZWxfY3J0YyAqY3J0YykKIAkJbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7CiAJfQog Ci0JaWYgKGF0b21pYy0+d2FpdF9mb3JfZmxpcHMpCisJaWYgKGNzdGF0ZS0+d2FpdF9mb3JfZmxp cHMpCiAJCWludGVsX2NydGNfd2FpdF9mb3JfcGVuZGluZ19mbGlwcygmY3J0Yy0+YmFzZSk7CiAK LQlpZiAoYXRvbWljLT5kaXNhYmxlX2ZiYykKKwlpZiAoY3N0YXRlLT5kaXNhYmxlX2ZiYykKIAkJ aW50ZWxfZmJjX2Rpc2FibGVfY3J0YyhjcnRjKTsKIAotCWlmIChjcnRjLT5hdG9taWMuZGlzYWJs ZV9pcHMpCisJaWYgKGNzdGF0ZS0+ZGlzYWJsZV9pcHMpCiAJCWhzd19kaXNhYmxlX2lwcyhjcnRj KTsKIAotCWlmIChhdG9taWMtPnByZV9kaXNhYmxlX3ByaW1hcnkpCisJaWYgKGNzdGF0ZS0+cHJl X2Rpc2FibGVfcHJpbWFyeSkKIAkJaW50ZWxfcHJlX2Rpc2FibGVfcHJpbWFyeSgmY3J0Yy0+YmFz ZSk7CiAKLQlpZiAoYXRvbWljLT5kaXNhYmxlX2N4c3IpIHsKKwlpZiAoY3N0YXRlLT5kaXNhYmxl X2N4c3IpIHsKIAkJY3J0Yy0+d20uY3hzcl9hbGxvd2VkID0gZmFsc2U7CiAJCWludGVsX3NldF9t ZW1vcnlfY3hzcihkZXZfcHJpdiwgZmFsc2UpOwogCX0KQEAgLTExNTI5LDYgKzExNTI3LDggQEAg aW50IGludGVsX3BsYW5lX2F0b21pY19jYWxjX2NoYW5nZXMoc3RydWN0IGRybV9jcnRjX3N0YXRl ICpjcnRjX3N0YXRlLAogewogCXN0cnVjdCBkcm1fY3J0YyAqY3J0YyA9IGNydGNfc3RhdGUtPmNy dGM7CiAJc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGMp OworCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICppbnRlbF9jcnRjX3N0YXRlID0KKwkJdG9faW50 ZWxfY3J0Y19zdGF0ZShjcnRjX3N0YXRlKTsKIAlzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSA9IHBs YW5lX3N0YXRlLT5wbGFuZTsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+ZGV2Owog CXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CkBA IC0xMTU0MywxMCArMTE1NDMsMTAgQEAgaW50IGludGVsX3BsYW5lX2F0b21pY19jYWxjX2NoYW5n ZXMoc3RydWN0IGRybV9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAogCWJvb2wgdHVybl9vZmYsIHR1 cm5fb24sIHZpc2libGUsIHdhc192aXNpYmxlOwogCXN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZi ID0gcGxhbmVfc3RhdGUtPmZiOwogCi0JaWYgKGNydGNfc3RhdGUgJiYgSU5URUxfSU5GTyhkZXYp LT5nZW4gPj0gOSAmJgorCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA+PSA5ICYmCiAJICAgIHBs YW5lLT50eXBlICE9IERSTV9QTEFORV9UWVBFX0NVUlNPUikgewogCQlyZXQgPSBza2xfdXBkYXRl X3NjYWxlcl9wbGFuZSgKLQkJCXRvX2ludGVsX2NydGNfc3RhdGUoY3J0Y19zdGF0ZSksCisJCQlp bnRlbF9jcnRjX3N0YXRlLAogCQkJdG9faW50ZWxfcGxhbmVfc3RhdGUocGxhbmVfc3RhdGUpKTsK IAkJaWYgKHJldCkKIAkJCXJldHVybiByZXQ7CkBAIC0xMTU1OCw3ICsxMTU1OCw3IEBAIGludCBp bnRlbF9wbGFuZV9hdG9taWNfY2FsY19jaGFuZ2VzKHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3J0 Y19zdGF0ZSwKIAkgKiBnZXQgY2FsbGVkIGJ5IHRoZSBwbGFuZSBoZWxwZXJzLgogCSAqLwogCWlm IChvbGRfcGxhbmVfc3RhdGUtPmJhc2UuZmIgJiYgIWZiKQotCQlpbnRlbF9jcnRjLT5hdG9taWMu ZGlzYWJsZWRfcGxhbmVzIHw9IDEgPDwgaTsKKwkJaW50ZWxfY3J0Y19zdGF0ZS0+ZGlzYWJsZWRf cGxhbmVzIHw9IDEgPDwgaTsKIAogCXdhc192aXNpYmxlID0gb2xkX3BsYW5lX3N0YXRlLT52aXNp YmxlOwogCXZpc2libGUgPSB0b19pbnRlbF9wbGFuZV9zdGF0ZShwbGFuZV9zdGF0ZSktPnZpc2li bGU7CkBAIC0xMTU4MywzNSArMTE1ODMsMzUgQEAgaW50IGludGVsX3BsYW5lX2F0b21pY19jYWxj X2NoYW5nZXMoc3RydWN0IGRybV9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAogCQkJIHR1cm5fb2Zm LCB0dXJuX29uLCBtb2RlX2NoYW5nZWQpOwogCiAJaWYgKHR1cm5fb24pIHsKLQkJaW50ZWxfY3J0 Yy0+YXRvbWljLnVwZGF0ZV93bV9wcmUgPSB0cnVlOworCQlpbnRlbF9jcnRjX3N0YXRlLT51cGRh dGVfd21fcHJlID0gdHJ1ZTsKIAkJLyogbXVzdCBkaXNhYmxlIGN4c3IgYXJvdW5kIHBsYW5lIGVu YWJsZS9kaXNhYmxlICovCiAJCWlmIChwbGFuZS0+dHlwZSAhPSBEUk1fUExBTkVfVFlQRV9DVVJT T1IpIHsKLQkJCWludGVsX2NydGMtPmF0b21pYy5kaXNhYmxlX2N4c3IgPSB0cnVlOworCQkJaW50 ZWxfY3J0Y19zdGF0ZS0+ZGlzYWJsZV9jeHNyID0gdHJ1ZTsKIAkJCS8qIHRvIHBvdGVudGlhbGx5 IHJlLWVuYWJsZSBjeHNyICovCi0JCQlpbnRlbF9jcnRjLT5hdG9taWMud2FpdF92YmxhbmsgPSB0 cnVlOwotCQkJaW50ZWxfY3J0Yy0+YXRvbWljLnVwZGF0ZV93bV9wb3N0ID0gdHJ1ZTsKKwkJCWlu dGVsX2NydGNfc3RhdGUtPndhaXRfdmJsYW5rID0gdHJ1ZTsKKwkJCWludGVsX2NydGNfc3RhdGUt PnVwZGF0ZV93bV9wb3N0ID0gdHJ1ZTsKIAkJfQogCX0gZWxzZSBpZiAodHVybl9vZmYpIHsKLQkJ aW50ZWxfY3J0Yy0+YXRvbWljLnVwZGF0ZV93bV9wb3N0ID0gdHJ1ZTsKKwkJaW50ZWxfY3J0Y19z dGF0ZS0+dXBkYXRlX3dtX3Bvc3QgPSB0cnVlOwogCQkvKiBtdXN0IGRpc2FibGUgY3hzciBhcm91 bmQgcGxhbmUgZW5hYmxlL2Rpc2FibGUgKi8KIAkJaWYgKHBsYW5lLT50eXBlICE9IERSTV9QTEFO RV9UWVBFX0NVUlNPUikgewogCQkJaWYgKGlzX2NydGNfZW5hYmxlZCkKLQkJCQlpbnRlbF9jcnRj LT5hdG9taWMud2FpdF92YmxhbmsgPSB0cnVlOwotCQkJaW50ZWxfY3J0Yy0+YXRvbWljLmRpc2Fi bGVfY3hzciA9IHRydWU7CisJCQkJaW50ZWxfY3J0Y19zdGF0ZS0+d2FpdF92YmxhbmsgPSB0cnVl OworCQkJaW50ZWxfY3J0Y19zdGF0ZS0+ZGlzYWJsZV9jeHNyID0gdHJ1ZTsKIAkJfQogCX0gZWxz ZSBpZiAoaW50ZWxfd21fbmVlZF91cGRhdGUocGxhbmUsIHBsYW5lX3N0YXRlKSkgewotCQlpbnRl bF9jcnRjLT5hdG9taWMudXBkYXRlX3dtX3ByZSA9IHRydWU7CisJCWludGVsX2NydGNfc3RhdGUt PnVwZGF0ZV93bV9wcmUgPSB0cnVlOwogCX0KIAogCWlmICh2aXNpYmxlIHx8IHdhc192aXNpYmxl KQotCQlpbnRlbF9jcnRjLT5hdG9taWMuZmJfYml0cyB8PQorCQlpbnRlbF9jcnRjX3N0YXRlLT5m Yl9iaXRzIHw9CiAJCQl0b19pbnRlbF9wbGFuZShwbGFuZSktPmZyb250YnVmZmVyX2JpdDsKIAog CXN3aXRjaCAocGxhbmUtPnR5cGUpIHsKIAljYXNlIERSTV9QTEFORV9UWVBFX1BSSU1BUlk6Ci0J CWludGVsX2NydGMtPmF0b21pYy53YWl0X2Zvcl9mbGlwcyA9IHRydWU7Ci0JCWludGVsX2NydGMt PmF0b21pYy5wcmVfZGlzYWJsZV9wcmltYXJ5ID0gdHVybl9vZmY7Ci0JCWludGVsX2NydGMtPmF0 b21pYy5wb3N0X2VuYWJsZV9wcmltYXJ5ID0gdHVybl9vbjsKKwkJaW50ZWxfY3J0Y19zdGF0ZS0+ d2FpdF9mb3JfZmxpcHMgPSB0cnVlOworCQlpbnRlbF9jcnRjX3N0YXRlLT5wcmVfZGlzYWJsZV9w cmltYXJ5ID0gdHVybl9vZmY7CisJCWludGVsX2NydGNfc3RhdGUtPnBvc3RfZW5hYmxlX3ByaW1h cnkgPSB0dXJuX29uOwogCiAJCWlmICh0dXJuX29mZikgewogCQkJLyoKQEAgLTExNjIyLDkgKzEx NjIyLDkgQEAgaW50IGludGVsX3BsYW5lX2F0b21pY19jYWxjX2NoYW5nZXMoc3RydWN0IGRybV9j cnRjX3N0YXRlICpjcnRjX3N0YXRlLAogCQkJICogdXBkYXRlX3ByaW1hcnlfcGxhbmUgZnVuY3Rp b24gSVBTIG5lZWRzIHRvIGJlCiAJCQkgKiBkaXNhYmxlLgogCQkJICovCi0JCQlpbnRlbF9jcnRj LT5hdG9taWMuZGlzYWJsZV9pcHMgPSB0cnVlOworCQkJaW50ZWxfY3J0Y19zdGF0ZS0+ZGlzYWJs ZV9pcHMgPSB0cnVlOwogCi0JCQlpbnRlbF9jcnRjLT5hdG9taWMuZGlzYWJsZV9mYmMgPSB0cnVl OworCQkJaW50ZWxfY3J0Y19zdGF0ZS0+ZGlzYWJsZV9mYmMgPSB0cnVlOwogCQl9CiAKIAkJLyoK QEAgLTExNjQyLDcgKzExNjQyLDcgQEAgaW50IGludGVsX3BsYW5lX2F0b21pY19jYWxjX2NoYW5n ZXMoc3RydWN0IGRybV9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAogCQkgICAgSU5URUxfSU5GTyhk ZXYpLT5nZW4gPD0gNCAmJiAhSVNfRzRYKGRldikgJiYKIAkJICAgIGRldl9wcml2LT5mYmMuY3J0 YyA9PSBpbnRlbF9jcnRjICYmCiAJCSAgICBwbGFuZV9zdGF0ZS0+cm90YXRpb24gIT0gQklUKERS TV9ST1RBVEVfMCkpCi0JCQlpbnRlbF9jcnRjLT5hdG9taWMuZGlzYWJsZV9mYmMgPSB0cnVlOwor CQkJaW50ZWxfY3J0Y19zdGF0ZS0+ZGlzYWJsZV9mYmMgPSB0cnVlOwogCiAJCS8qCiAJCSAqIEJE VyBzaWduYWxzIGZsaXAgZG9uZSBpbW1lZGlhdGVseSBpZiB0aGUgcGxhbmUKQEAgLTExNjUwLDE2 ICsxMTY1MCwxNiBAQCBpbnQgaW50ZWxfcGxhbmVfYXRvbWljX2NhbGNfY2hhbmdlcyhzdHJ1Y3Qg ZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCiAJCSAqIGFybWVkIHRvIG9jY3VyIGF0IHRoZSBu ZXh0IHZibGFuayA6KAogCQkgKi8KIAkJaWYgKHR1cm5fb24gJiYgSVNfQlJPQURXRUxMKGRldikp Ci0JCQlpbnRlbF9jcnRjLT5hdG9taWMud2FpdF92YmxhbmsgPSB0cnVlOworCQkJaW50ZWxfY3J0 Y19zdGF0ZS0+d2FpdF92YmxhbmsgPSB0cnVlOwogCi0JCWludGVsX2NydGMtPmF0b21pYy51cGRh dGVfZmJjIHw9IHZpc2libGUgfHwgbW9kZV9jaGFuZ2VkOworCQlpbnRlbF9jcnRjX3N0YXRlLT51 cGRhdGVfZmJjIHw9IHZpc2libGUgfHwgbW9kZV9jaGFuZ2VkOwogCQlicmVhazsKIAljYXNlIERS TV9QTEFORV9UWVBFX0NVUlNPUjoKIAkJYnJlYWs7CiAJY2FzZSBEUk1fUExBTkVfVFlQRV9PVkVS TEFZOgogCQlpZiAodHVybl9vZmYgJiYgIW1vZGVfY2hhbmdlZCkgewotCQkJaW50ZWxfY3J0Yy0+ YXRvbWljLndhaXRfdmJsYW5rID0gdHJ1ZTsKLQkJCWludGVsX2NydGMtPmF0b21pYy51cGRhdGVf c3ByaXRlX3dhdGVybWFya3MgfD0KKwkJCWludGVsX2NydGNfc3RhdGUtPndhaXRfdmJsYW5rID0g dHJ1ZTsKKwkJCWludGVsX2NydGNfc3RhdGUtPnVwZGF0ZV9zcHJpdGVfd2F0ZXJtYXJrcyB8PQog CQkJCTEgPDwgaTsKIAkJfQogCX0KQEAgLTExNzM0LDcgKzExNzM0LDcgQEAgc3RhdGljIGludCBp bnRlbF9jcnRjX2F0b21pY19jaGVjayhzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJfQogCiAJaWYg KG1vZGVfY2hhbmdlZCAmJiAhY3J0Y19zdGF0ZS0+YWN0aXZlKQotCQlpbnRlbF9jcnRjLT5hdG9t aWMudXBkYXRlX3dtX3Bvc3QgPSB0cnVlOworCQlwaXBlX2NvbmZpZy0+dXBkYXRlX3dtX3Bvc3Qg PSB0cnVlOwogCiAJaWYgKG1vZGVfY2hhbmdlZCAmJiBjcnRjX3N0YXRlLT5lbmFibGUgJiYKIAkg ICAgZGV2X3ByaXYtPmRpc3BsYXkuY3J0Y19jb21wdXRlX2Nsb2NrICYmCkBAIC0xMzQ0NCw4ICsx MzQ0NCw5IEBAIHN0YXRpYyB2b2lkIGludGVsX2JlZ2luX2NydGNfY29tbWl0KHN0cnVjdCBkcm1f Y3J0YyAqY3J0YywKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+ZGV2OwogCXN0 cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKKwlzdHJ1 Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlID0gdG9faW50ZWxfY3J0Y19zdGF0ZShjcnRjLT5z dGF0ZSk7CiAKLQlpZiAoaW50ZWxfY3J0Yy0+YXRvbWljLnVwZGF0ZV93bV9wcmUpCisJaWYgKGNz dGF0ZS0+dXBkYXRlX3dtX3ByZSkKIAkJaW50ZWxfdXBkYXRlX3dhdGVybWFya3MoY3J0Yyk7CiAK IAkvKiBQZXJmb3JtIHZibGFuayBldmFzaW9uIGFyb3VuZCBjb21taXQgb3BlcmF0aW9uICovCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rydi5oCmluZGV4IDQ2NDg0ZTQuLjhiN2UzZDkgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rydi5oCkBAIC00NTYsNiArNDU2LDIyIEBAIHN0cnVjdCBpbnRlbF9jcnRjX3N0 YXRlIHsKIAogCS8qIHcvYSBmb3Igd2FpdGluZyAyIHZibGFua3MgZHVyaW5nIGNydGMgZW5hYmxl ICovCiAJZW51bSBwaXBlIGhzd193b3JrYXJvdW5kX3BpcGU7CisKKwkvKiBTbGVlcGFibGUgb3Bl cmF0aW9ucyB0byBwZXJmb3JtIGJlZm9yZSBjb21taXQgKi8KKwlib29sIHdhaXRfZm9yX2ZsaXBz OworCWJvb2wgZGlzYWJsZV9mYmM7CisJYm9vbCBkaXNhYmxlX2lwczsKKwlib29sIGRpc2FibGVf Y3hzcjsKKwlib29sIHByZV9kaXNhYmxlX3ByaW1hcnk7CisJYm9vbCB1cGRhdGVfd21fcHJlLCB1 cGRhdGVfd21fcG9zdDsKKwl1bnNpZ25lZCBkaXNhYmxlZF9wbGFuZXM7CisKKwkvKiBTbGVlcGFi bGUgb3BlcmF0aW9ucyB0byBwZXJmb3JtIGFmdGVyIGNvbW1pdCAqLworCXVuc2lnbmVkIGZiX2Jp dHM7CisJYm9vbCB3YWl0X3ZibGFuazsKKwlib29sIHVwZGF0ZV9mYmM7CisJYm9vbCBwb3N0X2Vu YWJsZV9wcmltYXJ5OworCXVuc2lnbmVkIHVwZGF0ZV9zcHJpdGVfd2F0ZXJtYXJrczsKIH07CiAK IHN0cnVjdCB2bHZfd21fc3RhdGUgewpAQCAtNDg5LDMwICs1MDUsNiBAQCBzdHJ1Y3Qgc2tsX3Bp cGVfd20gewogCXVpbnQzMl90IGxpbmV0aW1lOwogfTsKIAotLyoKLSAqIFRyYWNraW5nIG9mIG9w ZXJhdGlvbnMgdGhhdCBuZWVkIHRvIGJlIHBlcmZvcm1lZCBhdCB0aGUgYmVnaW5uaW5nL2VuZCBv ZiBhbgotICogYXRvbWljIGNvbW1pdCwgb3V0c2lkZSB0aGUgYXRvbWljIHNlY3Rpb24gd2hlcmUg aW50ZXJydXB0cyBhcmUgZGlzYWJsZWQuCi0gKiBUaGVzZSBhcmUgZ2VuZXJhbGx5IG9wZXJhdGlv bnMgdGhhdCBncmFiIG11dGV4ZXMgb3IgbWlnaHQgb3RoZXJ3aXNlIHNsZWVwCi0gKiBhbmQgdGh1 cyBjYW4ndCBiZSBydW4gd2l0aCBpbnRlcnJ1cHRzIGRpc2FibGVkLgotICovCi1zdHJ1Y3QgaW50 ZWxfY3J0Y19hdG9taWNfY29tbWl0IHsKLQkvKiBTbGVlcGFibGUgb3BlcmF0aW9ucyB0byBwZXJm b3JtIGJlZm9yZSBjb21taXQgKi8KLQlib29sIHdhaXRfZm9yX2ZsaXBzOwotCWJvb2wgZGlzYWJs ZV9mYmM7Ci0JYm9vbCBkaXNhYmxlX2lwczsKLQlib29sIGRpc2FibGVfY3hzcjsKLQlib29sIHBy ZV9kaXNhYmxlX3ByaW1hcnk7Ci0JYm9vbCB1cGRhdGVfd21fcHJlLCB1cGRhdGVfd21fcG9zdDsK LQl1bnNpZ25lZCBkaXNhYmxlZF9wbGFuZXM7Ci0KLQkvKiBTbGVlcGFibGUgb3BlcmF0aW9ucyB0 byBwZXJmb3JtIGFmdGVyIGNvbW1pdCAqLwotCXVuc2lnbmVkIGZiX2JpdHM7Ci0JYm9vbCB3YWl0 X3ZibGFuazsKLQlib29sIHVwZGF0ZV9mYmM7Ci0JYm9vbCBwb3N0X2VuYWJsZV9wcmltYXJ5Owot CXVuc2lnbmVkIHVwZGF0ZV9zcHJpdGVfd2F0ZXJtYXJrczsKLX07Ci0KIHN0cnVjdCBpbnRlbF9j cnRjIHsKIAlzdHJ1Y3QgZHJtX2NydGMgYmFzZTsKIAllbnVtIHBpcGUgcGlwZTsKQEAgLTU2Niw4 ICs1NTgsNiBAQCBzdHJ1Y3QgaW50ZWxfY3J0YyB7CiAJdW5zaWduZWQgc3RhcnRfdmJsX2NvdW50 OwogCWt0aW1lX3Qgc3RhcnRfdmJsX3RpbWU7CiAKLQlzdHJ1Y3QgaW50ZWxfY3J0Y19hdG9taWNf Y29tbWl0IGF0b21pYzsKLQogCS8qIHNjYWxlcnMgYXZhaWxhYmxlIG9uIHRoaXMgY3J0YyAqLwog CWludCBudW1fc2NhbGVyczsKIAotLSAKMi4xLjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxp c3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v bGlzdGluZm8vaW50ZWwtZ2Z4Cg==