From: Matt Roper Subject: [PATCH 1/2] drm/i915: Use enabled value from crtc_state rather than crtc (v2) Date: Wed, 25 Feb 2015 13:12:16 -0800 Message-ID: <1424898736-16418-1-git-send-email-matthew.d.roper@intel.com> References: <20150225204855.GW24485@phenom.ffwll.local> 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 826296E6CA for ; Wed, 25 Feb 2015 13:12:39 -0800 (PST) In-Reply-To: <20150225204855.GW24485@phenom.ffwll.local> 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: Ander Conselvan de Oliveira List-Id: intel-gfx@lists.freedesktop.org QXMgdmVuZG9ycyB0cmFuc2l0aW9uIHRoZWlyIGRyaXZlcnMgZnJvbSBsZWdhY3kgdG8gYXRvbWlj IHRoZXJlJ3Mgc29tZQpkdXBsaWNhdGlvbiBvZiBkYXRhIGJldHdlZW4gZHJtX2NydGMgYW5kIGRy bV9jcnRjX3N0YXRlIChzaW5jZQp1bmNvbnZlcnRlZCBkcml2ZXJzIGxpa2VseSB3b24ndCBoYXZl IGEgc3RhdGUgc3RydWN0dXJlKS4KCmk5MTUgaXMgcGFydGlhbGx5IGNvbnZlcnRlZCBhbmQgZG9l cyBoYXZlIGEgY3J0Yy0+c3RhdGUgc3RydWN0dXJlLCBidXQKc3RpbGwgdXNlcyBkaXJlY3QgY3J0 YyBmaWVsZHMgaW50ZXJuYWxseSBpbiBtYW55IHBsYWNlcywgd2hpY2ggY2F1c2VzCnRoZSB0d28g c2V0cyBvZiBkYXRhIHRvIGdldCBvdXQgb2Ygc3luYy4gIEFzIG9mIGNvbW1pdAoKICAgICAgICBj b21taXQgMzFjOTQ2ZTg1Y2U2YjQ4Y2UwZjI1ZTNjZGNhODM2MmU0ZmU4YjMwMAogICAgICAgIEF1 dGhvcjogRGFuaWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBmZndsbC5jaD4KICAgICAgICBEYXRl OiAgIFN1biBGZWIgMjIgMTI6MjQ6MTcgMjAxNSArMDEwMAoKICAgICAgICAgICAgZHJtOiBJZiBh dmFpbGFibGUgdXNlIGF0b21pYyBzdGF0ZSBpbiBnZXRjcnRjIGlvY3RsCgogICAgICAgICAgICBU aGlzIHdheSBkcml2ZXJzIGZ1bGx5IGNvbnZlcnRlZCB0byBhdG9taWMgZG9uJ3QgbmVlZCB0byB1 cGRhdGUgdGhlc2UKICAgICAgICAgICAgbGVnYWN5IHN0YXRlIHZhcmlhYmxlcyBpbiB0aGVpciBt b2Rlc2V0IGNvZGUgYW55IG1vcmUuCgogICAgICAgICAgICBSZXZpZXdlZC1ieTogUm9iIENsYXJr IDxyb2JkY2xhcmtAZ21haWwuY29tPgogICAgICAgICAgICBTaWduZWQtb2ZmLWJ5OiBEYW5pZWwg VmV0dGVyIDxkYW5pZWwudmV0dGVyQGludGVsLmNvbT4KCnRoZSBEUk0gY29yZSBzdGFydHMgYXNz dW1pbmcgdGhhdCB0aGUgcHJlc2VuY2Ugb2YgYSAtPnN0YXRlIHN0cnVjdHVyZQppbXBsaWVzIHRo YXQgaXQgc2hvdWxkIG1ha2UgdXNlIG9mIHRoZSB2YWx1ZXMgc3RvcmVkIHRoZXJlIHdoaWNoLCBv bgppOTE1LCBsZWFkcyB0byB0aGUgY29yZSBjb2RlIHVzaW5nIHN0YWxlIHZhbHVlcyBmb3IgQ1JU QyAnZW5hYmxlZCcKc3RhdHVzLgoKTGV0J3Mgc3dpdGNoIG92ZXIgdG8gdXNpbmcgdGhlIHN0YXRl IHZhbHVlIG9mICdlbmFibGUnIGludGVybmFsbHkgcmF0aGVyCnRoYW4gdXNpbmcgdGhlIGRybV9j cnRjIGZpZWxkLiAgVGhpcyBlbnN1cmVzIHRoYXQgb3VyIGRyaXZlciBpbnRlcm5hbHMKYXJlIHdv cmtpbmcgZnJvbSB0aGUgc2FtZSBkYXRhIHRoYXQgdGhlIERSTSBjb3JlIGlzLCBhdm9pZGluZwpt aXNtYXRjaGVzLgoKVGhpcyBwYXRjaCB3YXMgZ2VuZXJhdGVkIHdpdGggQ29jY2luZWxsZSB1c2lu ZyB0aGUgZm9sbG93aW5nIHNlbWFudGljCnBhdGNoOgoKICAgICAgICA8c21wbD4KICAgICAgICBA QAogICAgICAgIHN0cnVjdCBkcm1fY3J0YyBDOwogICAgICAgIHN0cnVjdCBkcm1fY3J0YyAqQ1A7 CiAgICAgICAgQEAKICAgICAgICAoCiAgICAgICAgLSBDLmVuYWJsZWQKICAgICAgICArIEMuc3Rh dGUtPmVuYWJsZQogICAgICAgIHwKICAgICAgICAtIENQLT5lbmFibGVkCiAgICAgICAgKyBDUC0+ c3RhdGUtPmVuYWJsZQogICAgICAgICkKCiAgICAgICAgLy8gRm9yIGFzc2lnbm1lbnRzLCB3ZSBz dGlsbCB1cGRhdGUgdGhlIGxlZ2FjeSB2YWx1ZSBhcyB3ZWxsIGFzIHRoZSBzdGF0ZSB2YWx1ZQog ICAgICAgIC8vIHNvIGFkZCBhbiBleHRyYSBhc3NpZ25tZW50IHN0YXRlbWVudCBmb3IgdGhhdC4K ICAgICAgICBAQAogICAgICAgIHN0cnVjdCBkcm1fY3J0YyBDOwogICAgICAgIHN0cnVjdCBkcm1f Y3J0YyAqQ1A7CiAgICAgICAgZXhwcmVzc2lvbiBFOwogICAgICAgIEBACiAgICAgICAgKAogICAg ICAgICAgQy5zdGF0ZS0+ZW5hYmxlID0gRTsKICAgICAgICArIEMuZW5hYmxlZCA9IEU7CiAgICAg ICAgfAogICAgICAgICAgQ1AtPnN0YXRlLT5lbmFibGUgPSBFOwogICAgICAgICsgQ1AtPmVuYWJs ZWQgPSBFOwogICAgICAgICkKICAgICAgICA8L3NtcGw+CgpUaGUgY3J0Yy0+bW9kZSBhbmQgY3J0 Yy0+aHdtb2RlIGZpZWxkcyBzaG91bGQgcHJvYmFibHkgYmUgdHJhbnNpdGlvbmVkCm92ZXIgYXMg d2VsbCBldmVudHVhbGx5LCBidXQgd2Ugc2VlbSB0byBkbyBhbiBva2F5IGpvYiBvZiBrZWVwaW5n IHRob3NlCnVwLXRvLWRhdGUgYWxyZWFkeSBzbyBJIHdhbnQgdG8gbWluaW1pemUgdGhlIGNoYW5n ZXMgdGhhdCB3aWxsIGNsYXNoCndpdGggQW5kZXIncyBpbi1wcm9ncmVzcyBhdG9taWMgd29yay4K CnYyOiBEb24ndCByZW1vdmUgdGhlIGFzc2lnbm1lbnRzIHRvIHRoZSBsZWdhY3kgdmFsdWUgd2hl biB3ZSBhc3NpZ24gdG8KICAgIHRoZSBzdGF0ZSB2YWx1ZS4gIEEgc2Vjb25kIGNvY2NpIHN0YW56 YSB0YWtlcyBjYXJlIG9mIGFkZGluZyB0aGUKICAgIGxlZ2FjeSBhc3NpZ25tZW50IGJhY2sgd2hl cmUgYXBwcm9wcmlhdGUuICAoRGFuaWVsKQoKQ2M6IERhbmllbCBWZXR0ZXIgPGRhbmllbEBmZnds bC5jaD4KQ2M6IEFuZGVyIENvbnNlbHZhbiBkZSBPbGl2ZWlyYSA8YW5kZXIuY29uc2VsdmFuLmRl Lm9saXZlaXJhQGludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogTWF0dCBSb3BlciA8bWF0dGhldy5k LnJvcGVyQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jICAg ICAgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgNTggKysr KysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9sdmRzLmMgICAgfCAgMiArLQogMyBmaWxlcyBjaGFuZ2VkLCAzNCBpbnNlcnRpb25zKCsp LCAyOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2lycS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYwppbmRleCAwN2UyNTdjLi45 YmFlY2I3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMKQEAgLTc5MSw3ICs3OTEsNyBAQCBzdGF0 aWMgaW50IGk5MTVfZ2V0X3ZibGFua190aW1lc3RhbXAoc3RydWN0IGRybV9kZXZpY2UgKmRldiwg aW50IHBpcGUsCiAJCXJldHVybiAtRUlOVkFMOwogCX0KIAotCWlmICghY3J0Yy0+ZW5hYmxlZCkg eworCWlmICghY3J0Yy0+c3RhdGUtPmVuYWJsZSkgewogCQlEUk1fREVCVUdfS01TKCJjcnRjICVk IGlzIGRpc2FibGVkXG4iLCBwaXBlKTsKIAkJcmV0dXJuIC1FQlVTWTsKIAl9CmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggOWJjNTRjYy4uYWNiYjM2MiAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMzA3Nyw3ICszMDc3LDcgQEAgc3RhdGljIHZvaWQg aW50ZWxfZmRpX25vcm1hbF90cmFpbihzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAKIHN0YXRpYyBi b29sIHBpcGVfaGFzX2VuYWJsZWRfcGNoKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQogewotCXJl dHVybiBjcnRjLT5iYXNlLmVuYWJsZWQgJiYgY3J0Yy0+YWN0aXZlICYmCisJcmV0dXJuIGNydGMt PmJhc2Uuc3RhdGUtPmVuYWJsZSAmJiBjcnRjLT5hY3RpdmUgJiYKIAkJY3J0Yy0+Y29uZmlnLT5o YXNfcGNoX2VuY29kZXI7CiB9CiAKQEAgLTQyMTUsNyArNDIxNSw3IEBAIHN0YXRpYyB2b2lkIGlu dGVsX2NydGNfbG9hZF9sdXQoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCWJvb2wgcmVlbmFibGVf aXBzID0gZmFsc2U7CiAKIAkvKiBUaGUgY2xvY2tzIGhhdmUgdG8gYmUgb24gdG8gbG9hZCB0aGUg cGFsZXR0ZS4gKi8KLQlpZiAoIWNydGMtPmVuYWJsZWQgfHwgIWludGVsX2NydGMtPmFjdGl2ZSkK KwlpZiAoIWNydGMtPnN0YXRlLT5lbmFibGUgfHwgIWludGVsX2NydGMtPmFjdGl2ZSkKIAkJcmV0 dXJuOwogCiAJaWYgKCFIQVNfUENIX1NQTElUKGRldl9wcml2LT5kZXYpKSB7CkBAIC00MzI4LDcg KzQzMjgsNyBAQCBzdGF0aWMgdm9pZCBpcm9ubGFrZV9jcnRjX2VuYWJsZShzdHJ1Y3QgZHJtX2Ny dGMgKmNydGMpCiAJc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXI7CiAJaW50IHBpcGUgPSBp bnRlbF9jcnRjLT5waXBlOwogCi0JV0FSTl9PTighY3J0Yy0+ZW5hYmxlZCk7CisJV0FSTl9PTigh Y3J0Yy0+c3RhdGUtPmVuYWJsZSk7CiAKIAlpZiAoaW50ZWxfY3J0Yy0+YWN0aXZlKQogCQlyZXR1 cm47CkBAIC00NDM2LDcgKzQ0MzYsNyBAQCBzdGF0aWMgdm9pZCBoYXN3ZWxsX2NydGNfZW5hYmxl KHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAlzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlcjsK IAlpbnQgcGlwZSA9IGludGVsX2NydGMtPnBpcGU7CiAKLQlXQVJOX09OKCFjcnRjLT5lbmFibGVk KTsKKwlXQVJOX09OKCFjcnRjLT5zdGF0ZS0+ZW5hYmxlKTsKIAogCWlmIChpbnRlbF9jcnRjLT5h Y3RpdmUpCiAJCXJldHVybjsKQEAgLTQ3ODMsNyArNDc4Myw3IEBAIHN0YXRpYyB2b2lkIG1vZGVz ZXRfdXBkYXRlX2NydGNfcG93ZXJfZG9tYWlucyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWZv cl9lYWNoX2ludGVsX2NydGMoZGV2LCBjcnRjKSB7CiAJCWVudW0gaW50ZWxfZGlzcGxheV9wb3dl cl9kb21haW4gZG9tYWluOwogCi0JCWlmICghY3J0Yy0+YmFzZS5lbmFibGVkKQorCQlpZiAoIWNy dGMtPmJhc2Uuc3RhdGUtPmVuYWJsZSkKIAkJCWNvbnRpbnVlOwogCiAJCXBpcGVfZG9tYWluc1tj cnRjLT5waXBlXSA9IGdldF9jcnRjX3Bvd2VyX2RvbWFpbnMoJmNydGMtPmJhc2UpOwpAQCAtNTAw NCw3ICs1MDA0LDcgQEAgc3RhdGljIHZvaWQgdmFsbGV5dmlld19tb2Rlc2V0X2dsb2JhbF9waXBl cyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCiAJLyogZGlzYWJsZS9lbmFibGUgYWxsIGN1cnJl bnRseSBhY3RpdmUgcGlwZXMgd2hpbGUgd2UgY2hhbmdlIGNkY2xrICovCiAJZm9yX2VhY2hfaW50 ZWxfY3J0YyhkZXYsIGludGVsX2NydGMpCi0JCWlmIChpbnRlbF9jcnRjLT5iYXNlLmVuYWJsZWQp CisJCWlmIChpbnRlbF9jcnRjLT5iYXNlLnN0YXRlLT5lbmFibGUpCiAJCQkqcHJlcGFyZV9waXBl cyB8PSAoMSA8PCBpbnRlbF9jcnRjLT5waXBlKTsKIH0KIApAQCAtNTA0NCw3ICs1MDQ0LDcgQEAg c3RhdGljIHZvaWQgdmFsbGV5dmlld19jcnRjX2VuYWJsZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMp CiAJaW50IHBpcGUgPSBpbnRlbF9jcnRjLT5waXBlOwogCWJvb2wgaXNfZHNpOwogCi0JV0FSTl9P TighY3J0Yy0+ZW5hYmxlZCk7CisJV0FSTl9PTighY3J0Yy0+c3RhdGUtPmVuYWJsZSk7CiAKIAlp ZiAoaW50ZWxfY3J0Yy0+YWN0aXZlKQogCQlyZXR1cm47CkBAIC01MTI3LDcgKzUxMjcsNyBAQCBz dGF0aWMgdm9pZCBpOXh4X2NydGNfZW5hYmxlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAlzdHJ1 Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlcjsKIAlpbnQgcGlwZSA9IGludGVsX2NydGMtPnBpcGU7 CiAKLQlXQVJOX09OKCFjcnRjLT5lbmFibGVkKTsKKwlXQVJOX09OKCFjcnRjLT5zdGF0ZS0+ZW5h YmxlKTsKIAogCWlmIChpbnRlbF9jcnRjLT5hY3RpdmUpCiAJCXJldHVybjsKQEAgLTUzMjYsNyAr NTMyNiw3IEBAIHN0YXRpYyB2b2lkIGludGVsX2NydGNfZGlzYWJsZShzdHJ1Y3QgZHJtX2NydGMg KmNydGMpCiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJp dmF0ZTsKIAogCS8qIGNydGMgc2hvdWxkIHN0aWxsIGJlIGVuYWJsZWQgd2hlbiB3ZSBkaXNhYmxl IGl0LiAqLwotCVdBUk5fT04oIWNydGMtPmVuYWJsZWQpOworCVdBUk5fT04oIWNydGMtPnN0YXRl LT5lbmFibGUpOwogCiAJZGV2X3ByaXYtPmRpc3BsYXkuY3J0Y19kaXNhYmxlKGNydGMpOwogCWRl dl9wcml2LT5kaXNwbGF5Lm9mZihjcnRjKTsKQEAgLTU0MDQsNyArNTQwNCw4IEBAIHN0YXRpYyB2 b2lkIGludGVsX2Nvbm5lY3Rvcl9jaGVja19zdGF0ZShzdHJ1Y3QgaW50ZWxfY29ubmVjdG9yICpj b25uZWN0b3IpCiAKIAkJCWNydGMgPSBlbmNvZGVyLT5iYXNlLmNydGM7CiAKLQkJCUk5MTVfU1RB VEVfV0FSTighY3J0Yy0+ZW5hYmxlZCwgImNydGMgbm90IGVuYWJsZWRcbiIpOworCQkJSTkxNV9T VEFURV9XQVJOKCFjcnRjLT5zdGF0ZS0+ZW5hYmxlLAorCQkJCQkiY3J0YyBub3QgZW5hYmxlZFxu Iik7CiAJCQlJOTE1X1NUQVRFX1dBUk4oIXRvX2ludGVsX2NydGMoY3J0YyktPmFjdGl2ZSwgImNy dGMgbm90IGFjdGl2ZVxuIik7CiAJCQlJOTE1X1NUQVRFX1dBUk4ocGlwZSAhPSB0b19pbnRlbF9j cnRjKGNydGMpLT5waXBlLAogCQkJICAgICAiZW5jb2RlciBhY3RpdmUgb24gdGhlIHdyb25nIHBp cGVcbiIpOwpAQCAtODcxNyw3ICs4NzE4LDcgQEAgcmV0cnk6CiAJCWkrKzsKIAkJaWYgKCEoZW5j b2Rlci0+cG9zc2libGVfY3J0Y3MgJiAoMSA8PCBpKSkpCiAJCQljb250aW51ZTsKLQkJaWYgKHBv c3NpYmxlX2NydGMtPmVuYWJsZWQpCisJCWlmIChwb3NzaWJsZV9jcnRjLT5zdGF0ZS0+ZW5hYmxl KQogCQkJY29udGludWU7CiAJCS8qIFRoaXMgY2FuIG9jY3VyIHdoZW4gYXBwbHlpbmcgdGhlIHBp cGUgQSBxdWlyayBvbiByZXN1bWUuICovCiAJCWlmICh0b19pbnRlbF9jcnRjKHBvc3NpYmxlX2Ny dGMpLT5uZXdfZW5hYmxlZCkKQEAgLTg3ODUsNyArODc4Niw3IEBAIHJldHJ5OgogCXJldHVybiB0 cnVlOwogCiAgZmFpbDoKLQlpbnRlbF9jcnRjLT5uZXdfZW5hYmxlZCA9IGNydGMtPmVuYWJsZWQ7 CisJaW50ZWxfY3J0Yy0+bmV3X2VuYWJsZWQgPSBjcnRjLT5zdGF0ZS0+ZW5hYmxlOwogCWlmIChp bnRlbF9jcnRjLT5uZXdfZW5hYmxlZCkKIAkJaW50ZWxfY3J0Yy0+bmV3X2NvbmZpZyA9IGludGVs X2NydGMtPmNvbmZpZzsKIAllbHNlCkBAIC05OTQ1LDcgKzk5NDYsNyBAQCBzdGF0aWMgdm9pZCBp bnRlbF9tb2Rlc2V0X3VwZGF0ZV9zdGFnZWRfb3V0cHV0X3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYpCiAJfQogCiAJZm9yX2VhY2hfaW50ZWxfY3J0YyhkZXYsIGNydGMpIHsKLQkJY3J0Yy0+ bmV3X2VuYWJsZWQgPSBjcnRjLT5iYXNlLmVuYWJsZWQ7CisJCWNydGMtPm5ld19lbmFibGVkID0g Y3J0Yy0+YmFzZS5zdGF0ZS0+ZW5hYmxlOwogCiAJCWlmIChjcnRjLT5uZXdfZW5hYmxlZCkKIAkJ CWNydGMtPm5ld19jb25maWcgPSBjcnRjLT5jb25maWc7CkBAIC05OTc1LDYgKzk5NzYsNyBAQCBz dGF0aWMgdm9pZCBpbnRlbF9tb2Rlc2V0X2NvbW1pdF9vdXRwdXRfc3RhdGUoc3RydWN0IGRybV9k ZXZpY2UgKmRldikKIAl9CiAKIAlmb3JfZWFjaF9pbnRlbF9jcnRjKGRldiwgY3J0YykgeworCQlj cnRjLT5iYXNlLnN0YXRlLT5lbmFibGUgPSBjcnRjLT5uZXdfZW5hYmxlZDsKIAkJY3J0Yy0+YmFz ZS5lbmFibGVkID0gY3J0Yy0+bmV3X2VuYWJsZWQ7CiAJfQogfQpAQCAtMTAzODYsNyArMTAzODgs NyBAQCBpbnRlbF9tb2Rlc2V0X2FmZmVjdGVkX3BpcGVzKHN0cnVjdCBkcm1fY3J0YyAqY3J0Yywg dW5zaWduZWQgKm1vZGVzZXRfcGlwZXMsCiAKIAkvKiBDaGVjayBmb3IgcGlwZXMgdGhhdCB3aWxs IGJlIGVuYWJsZWQvZGlzYWJsZWQgLi4uICovCiAJZm9yX2VhY2hfaW50ZWxfY3J0YyhkZXYsIGlu dGVsX2NydGMpIHsKLQkJaWYgKGludGVsX2NydGMtPmJhc2UuZW5hYmxlZCA9PSBpbnRlbF9jcnRj LT5uZXdfZW5hYmxlZCkKKwkJaWYgKGludGVsX2NydGMtPmJhc2Uuc3RhdGUtPmVuYWJsZSA9PSBp bnRlbF9jcnRjLT5uZXdfZW5hYmxlZCkKIAkJCWNvbnRpbnVlOwogCiAJCWlmICghaW50ZWxfY3J0 Yy0+bmV3X2VuYWJsZWQpCkBAIC0xMDQ2MSwxMCArMTA0NjMsMTAgQEAgaW50ZWxfbW9kZXNldF91 cGRhdGVfc3RhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdW5zaWduZWQgcHJlcGFyZV9waXBl cykKIAogCS8qIERvdWJsZSBjaGVjayBzdGF0ZS4gKi8KIAlmb3JfZWFjaF9pbnRlbF9jcnRjKGRl diwgaW50ZWxfY3J0YykgewotCQlXQVJOX09OKGludGVsX2NydGMtPmJhc2UuZW5hYmxlZCAhPSBp bnRlbF9jcnRjX2luX3VzZSgmaW50ZWxfY3J0Yy0+YmFzZSkpOworCQlXQVJOX09OKGludGVsX2Ny dGMtPmJhc2Uuc3RhdGUtPmVuYWJsZSAhPSBpbnRlbF9jcnRjX2luX3VzZSgmaW50ZWxfY3J0Yy0+ YmFzZSkpOwogCQlXQVJOX09OKGludGVsX2NydGMtPm5ld19jb25maWcgJiYKIAkJCWludGVsX2Ny dGMtPm5ld19jb25maWcgIT0gaW50ZWxfY3J0Yy0+Y29uZmlnKTsKLQkJV0FSTl9PTihpbnRlbF9j cnRjLT5iYXNlLmVuYWJsZWQgIT0gISFpbnRlbF9jcnRjLT5uZXdfY29uZmlnKTsKKwkJV0FSTl9P TihpbnRlbF9jcnRjLT5iYXNlLnN0YXRlLT5lbmFibGUgIT0gISFpbnRlbF9jcnRjLT5uZXdfY29u ZmlnKTsKIAl9CiAKIAlsaXN0X2Zvcl9lYWNoX2VudHJ5KGNvbm5lY3RvciwgJmRldi0+bW9kZV9j b25maWcuY29ubmVjdG9yX2xpc3QsIGhlYWQpIHsKQEAgLTEwODUxLDcgKzEwODUzLDcgQEAgY2hl Y2tfY3J0Y19zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQlEUk1fREVCVUdfS01TKCJb Q1JUQzolZF1cbiIsCiAJCQkgICAgICBjcnRjLT5iYXNlLmJhc2UuaWQpOwogCi0JCUk5MTVfU1RB VEVfV0FSTihjcnRjLT5hY3RpdmUgJiYgIWNydGMtPmJhc2UuZW5hYmxlZCwKKwkJSTkxNV9TVEFU RV9XQVJOKGNydGMtPmFjdGl2ZSAmJiAhY3J0Yy0+YmFzZS5zdGF0ZS0+ZW5hYmxlLAogCQkgICAg ICJhY3RpdmUgY3J0YywgYnV0IG5vdCBlbmFibGVkIGluIHN3IHRyYWNraW5nXG4iKTsKIAogCQlm b3JfZWFjaF9pbnRlbF9lbmNvZGVyKGRldiwgZW5jb2RlcikgewpAQCAtMTA4NjUsOSArMTA4Njcs MTAgQEAgY2hlY2tfY3J0Y19zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQlJOTE1X1NU QVRFX1dBUk4oYWN0aXZlICE9IGNydGMtPmFjdGl2ZSwKIAkJICAgICAiY3J0YydzIGNvbXB1dGVk IGFjdGl2ZSBzdGF0ZSBkb2Vzbid0IG1hdGNoIHRyYWNrZWQgYWN0aXZlIHN0YXRlICIKIAkJICAg ICAiKGV4cGVjdGVkICVpLCBmb3VuZCAlaSlcbiIsIGFjdGl2ZSwgY3J0Yy0+YWN0aXZlKTsKLQkJ STkxNV9TVEFURV9XQVJOKGVuYWJsZWQgIT0gY3J0Yy0+YmFzZS5lbmFibGVkLAorCQlJOTE1X1NU QVRFX1dBUk4oZW5hYmxlZCAhPSBjcnRjLT5iYXNlLnN0YXRlLT5lbmFibGUsCiAJCSAgICAgImNy dGMncyBjb21wdXRlZCBlbmFibGVkIHN0YXRlIGRvZXNuJ3QgbWF0Y2ggdHJhY2tlZCBlbmFibGVk IHN0YXRlICIKLQkJICAgICAiKGV4cGVjdGVkICVpLCBmb3VuZCAlaSlcbiIsIGVuYWJsZWQsIGNy dGMtPmJhc2UuZW5hYmxlZCk7CisJCSAgICAgIihleHBlY3RlZCAlaSwgZm91bmQgJWkpXG4iLCBl bmFibGVkLAorCQkJCWNydGMtPmJhc2Uuc3RhdGUtPmVuYWJsZSk7CiAKIAkJYWN0aXZlID0gZGV2 X3ByaXYtPmRpc3BsYXkuZ2V0X3BpcGVfY29uZmlnKGNydGMsCiAJCQkJCQkJICAgJnBpcGVfY29u ZmlnKTsKQEAgLTEwOTMxLDcgKzEwOTM0LDcgQEAgY2hlY2tfc2hhcmVkX2RwbGxfc3RhdGUoc3Ry dWN0IGRybV9kZXZpY2UgKmRldikKIAkJICAgICBwbGwtPm9uLCBhY3RpdmUpOwogCiAJCWZvcl9l YWNoX2ludGVsX2NydGMoZGV2LCBjcnRjKSB7Ci0JCQlpZiAoY3J0Yy0+YmFzZS5lbmFibGVkICYm IGludGVsX2NydGNfdG9fc2hhcmVkX2RwbGwoY3J0YykgPT0gcGxsKQorCQkJaWYgKGNydGMtPmJh c2Uuc3RhdGUtPmVuYWJsZSAmJiBpbnRlbF9jcnRjX3RvX3NoYXJlZF9kcGxsKGNydGMpID09IHBs bCkKIAkJCQllbmFibGVkX2NydGNzKys7CiAJCQlpZiAoY3J0Yy0+YWN0aXZlICYmIGludGVsX2Ny dGNfdG9fc2hhcmVkX2RwbGwoY3J0YykgPT0gcGxsKQogCQkJCWFjdGl2ZV9jcnRjcysrOwpAQCAt MTExMTcsNyArMTExMjAsNyBAQCBzdGF0aWMgaW50IF9faW50ZWxfc2V0X21vZGUoc3RydWN0IGRy bV9jcnRjICpjcnRjLAogCQlpbnRlbF9jcnRjX2Rpc2FibGUoJmludGVsX2NydGMtPmJhc2UpOwog CiAJZm9yX2VhY2hfaW50ZWxfY3J0Y19tYXNrZWQoZGV2LCBwcmVwYXJlX3BpcGVzLCBpbnRlbF9j cnRjKSB7Ci0JCWlmIChpbnRlbF9jcnRjLT5iYXNlLmVuYWJsZWQpCisJCWlmIChpbnRlbF9jcnRj LT5iYXNlLnN0YXRlLT5lbmFibGUpCiAJCQlkZXZfcHJpdi0+ZGlzcGxheS5jcnRjX2Rpc2FibGUo JmludGVsX2NydGMtPmJhc2UpOwogCX0KIApAQCAtMTExNzMsNyArMTExNzYsNyBAQCBzdGF0aWMg aW50IF9faW50ZWxfc2V0X21vZGUoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCiAJLyogRklYTUU6 IGFkZCBzdWJwaXhlbCBvcmRlciAqLwogZG9uZToKLQlpZiAocmV0ICYmIGNydGMtPmVuYWJsZWQp CisJaWYgKHJldCAmJiBjcnRjLT5zdGF0ZS0+ZW5hYmxlKQogCQljcnRjLT5tb2RlID0gKnNhdmVk X21vZGU7CiAKIAlrZnJlZShzYXZlZF9tb2RlKTsKQEAgLTExMjY5LDcgKzExMjcyLDcgQEAgc3Rh dGljIGludCBpbnRlbF9zZXRfY29uZmlnX3NhdmVfc3RhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRl diwKIAkgKi8KIAljb3VudCA9IDA7CiAJZm9yX2VhY2hfY3J0YyhkZXYsIGNydGMpIHsKLQkJY29u ZmlnLT5zYXZlX2NydGNfZW5hYmxlZFtjb3VudCsrXSA9IGNydGMtPmVuYWJsZWQ7CisJCWNvbmZp Zy0+c2F2ZV9jcnRjX2VuYWJsZWRbY291bnQrK10gPSBjcnRjLT5zdGF0ZS0+ZW5hYmxlOwogCX0K IAogCWNvdW50ID0gMDsKQEAgLTExNTAzLDcgKzExNTA2LDcgQEAgaW50ZWxfbW9kZXNldF9zdGFn ZV9vdXRwdXRfc3RhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJCX0KIAkJfQogCi0JCWlm IChjcnRjLT5uZXdfZW5hYmxlZCAhPSBjcnRjLT5iYXNlLmVuYWJsZWQpIHsKKwkJaWYgKGNydGMt Pm5ld19lbmFibGVkICE9IGNydGMtPmJhc2Uuc3RhdGUtPmVuYWJsZSkgewogCQkJRFJNX0RFQlVH X0tNUygiY3J0YyAlc2FibGVkLCBmdWxsIG1vZGUgc3dpdGNoXG4iLAogCQkJCSAgICAgIGNydGMt Pm5ld19lbmFibGVkID8gImVuIiA6ICJkaXMiKTsKIAkJCWNvbmZpZy0+bW9kZV9jaGFuZ2VkID0g dHJ1ZTsKQEAgLTEzMzkyLDYgKzEzMzk1LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfc2FuaXRpemVf Y3J0YyhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIAkJCX0KIAogCQlXQVJOX09OKGNydGMtPmFj dGl2ZSk7CisJCWNydGMtPmJhc2Uuc3RhdGUtPmVuYWJsZSA9IGZhbHNlOwogCQljcnRjLT5iYXNl LmVuYWJsZWQgPSBmYWxzZTsKIAl9CiAKQEAgLTEzNDA4LDcgKzEzNDEyLDcgQEAgc3RhdGljIHZv aWQgaW50ZWxfc2FuaXRpemVfY3J0YyhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIAkgKiBoYXZl IGFjdGl2ZSBjb25uZWN0b3JzL2VuY29kZXJzLiAqLwogCWludGVsX2NydGNfdXBkYXRlX2RwbXMo JmNydGMtPmJhc2UpOwogCi0JaWYgKGNydGMtPmFjdGl2ZSAhPSBjcnRjLT5iYXNlLmVuYWJsZWQp IHsKKwlpZiAoY3J0Yy0+YWN0aXZlICE9IGNydGMtPmJhc2Uuc3RhdGUtPmVuYWJsZSkgewogCQlz dHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlcjsKIAogCQkvKiBUaGlzIGNhbiBoYXBwZW4gZWl0 aGVyIGR1ZSB0byBidWdzIGluIHRoZSBnZXRfaHdfc3RhdGUKQEAgLTEzNDE2LDkgKzEzNDIwLDEw IEBAIHN0YXRpYyB2b2lkIGludGVsX3Nhbml0aXplX2NydGMoc3RydWN0IGludGVsX2NydGMgKmNy dGMpCiAJCSAqIHBpcGUgQSBxdWlyay4gKi8KIAkJRFJNX0RFQlVHX0tNUygiW0NSVEM6JWRdIGh3 IHN0YXRlIGFkanVzdGVkLCB3YXMgJXMsIG5vdyAlc1xuIiwKIAkJCSAgICAgIGNydGMtPmJhc2Uu YmFzZS5pZCwKLQkJCSAgICAgIGNydGMtPmJhc2UuZW5hYmxlZCA/ICJlbmFibGVkIiA6ICJkaXNh YmxlZCIsCisJCQkgICAgICBjcnRjLT5iYXNlLnN0YXRlLT5lbmFibGUgPyAiZW5hYmxlZCIgOiAi ZGlzYWJsZWQiLAogCQkJICAgICAgY3J0Yy0+YWN0aXZlID8gImVuYWJsZWQiIDogImRpc2FibGVk Iik7CiAKKwkJY3J0Yy0+YmFzZS5zdGF0ZS0+ZW5hYmxlID0gY3J0Yy0+YWN0aXZlOwogCQljcnRj LT5iYXNlLmVuYWJsZWQgPSBjcnRjLT5hY3RpdmU7CiAKIAkJLyogQmVjYXVzZSB3ZSBvbmx5IGVz dGFibGlzaCB0aGUgY29ubmVjdG9yIC0+IGVuY29kZXIgLT4KQEAgLTEzNTU1LDYgKzEzNTYwLDcg QEAgc3RhdGljIHZvaWQgaW50ZWxfbW9kZXNldF9yZWFkb3V0X2h3X3N0YXRlKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYpCiAJCWNydGMtPmFjdGl2ZSA9IGRldl9wcml2LT5kaXNwbGF5LmdldF9waXBl X2NvbmZpZyhjcnRjLAogCQkJCQkJCQkgY3J0Yy0+Y29uZmlnKTsKIAorCQljcnRjLT5iYXNlLnN0 YXRlLT5lbmFibGUgPSBjcnRjLT5hY3RpdmU7CiAJCWNydGMtPmJhc2UuZW5hYmxlZCA9IGNydGMt PmFjdGl2ZTsKIAkJY3J0Yy0+cHJpbWFyeV9lbmFibGVkID0gcHJpbWFyeV9nZXRfaHdfc3RhdGUo Y3J0Yyk7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2x2ZHMuYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2x2ZHMuYwppbmRleCAwNzFiOTZkLi4yNGU4NzMw IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9sdmRzLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHZkcy5jCkBAIC01MDksNyArNTA5LDcgQEAgc3RhdGlj IGludCBpbnRlbF9sdmRzX3NldF9wcm9wZXJ0eShzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVj dG9yLAogCQlpbnRlbF9jb25uZWN0b3ItPnBhbmVsLmZpdHRpbmdfbW9kZSA9IHZhbHVlOwogCiAJ CWNydGMgPSBpbnRlbF9hdHRhY2hlZF9lbmNvZGVyKGNvbm5lY3RvciktPmJhc2UuY3J0YzsKLQkJ aWYgKGNydGMgJiYgY3J0Yy0+ZW5hYmxlZCkgeworCQlpZiAoY3J0YyAmJiBjcnRjLT5zdGF0ZS0+ ZW5hYmxlKSB7CiAJCQkvKgogCQkJICogSWYgdGhlIENSVEMgaXMgZW5hYmxlZCwgdGhlIGRpc3Bs YXkgd2lsbCBiZSBjaGFuZ2VkCiAJCQkgKiBhY2NvcmRpbmcgdG8gdGhlIG5ldyBwYW5lbCBmaXR0 aW5nIG1vZGUuCi0tIAoxLjguNS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVl ZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZv L2ludGVsLWdmeAo=