From: Matt Roper Subject: [PATCH 02/10] drm/i915: Move rotation from intel_plane to drm_plane_state Date: Wed, 21 Jan 2015 16:35:41 -0800 Message-ID: <1421886949-26704-3-git-send-email-matthew.d.roper@intel.com> References: <1421886949-26704-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 mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id B58486E279 for ; Wed, 21 Jan 2015 16:36:31 -0800 (PST) In-Reply-To: <1421886949-26704-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 UnVudGltZSBzdGF0ZSB0aGF0IGNhbiBiZSBtYW5pcHVsYXRlZCB2aWEgcHJvcGVydGllcyBzaG91 bGQgbm93IGdvIGluCmludGVsX3BsYW5lX3N0YXRlL2RybV9wbGFuZV9zdGF0ZSBzbyB0aGF0IGl0 IGNhbiBiZSB0cmFja2VkIGFzIHBhcnQgb2YKYW4gYXRvbWljIHRyYW5zYWN0aW9uLgoKV2UgYWRk IGEgbmV3ICdpbnRlbF9jcmVhdGVfcGxhbmVfc3RhdGUnIGZ1bmN0aW9uIHNvIHRoYXQgdGhlIHBy b3Blcgppbml0aWFsIHZhbHVlIGZvciB0aGlzIHByb3BlcnR5IChhbmQgZnV0dXJlIHByb3BlcnRp ZXMpIGRvZXNuJ3QgaGF2ZSB0bwpiZSByZXBlYXRlZCBhdCBlYWNoIHBsYW5lIGluaXRpYWxpemF0 aW9uIHNpdGUuCgp2MjoKIC0gU3RpY2sgcm90YXRpb24gaW4gY29tbW9uIGRybV9wbGFuZV9zdGF0 ZSByYXRoZXIgdGhhbgogICBpbnRlbF9wbGFuZV9zdGF0ZS4gKERhbmllbCkKIC0gQWRkIGludGVs X2NyZWF0ZV9wbGFuZV9zdGF0ZSgpIHRvIGNvbnNvbGlkYXRlIHRoZSBwbGFjZXMgd2hlcmUgd2UK ICAgaGF2ZSB0byBzZXQgaW5pdGlhbCBzdGF0ZSB2YWx1ZXMuICAoQW5kZXIpCgpTaWduZWQtb2Zm LWJ5OiBNYXR0IFJvcGVyIDxtYXR0aGV3LmQucm9wZXJAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2F0b21pY19wbGFuZS5jIHwgNDUgKysrKysrKysrKysrKysrKysr KysrKysrLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jICAgICAg fCAzMSArKysrKysrKysrLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Ry di5oICAgICAgICAgIHwgIDggKysrKystCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmMu YyAgICAgICAgICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYyAg ICAgICB8IDMxICsrKysrKysrKysrLS0tLS0tLS0tLQogNSBmaWxlcyBjaGFuZ2VkLCA3NSBpbnNl cnRpb25zKCspLCA0MiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9hdG9taWNfcGxhbmUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F0 b21pY19wbGFuZS5jCmluZGV4IDQwMjdmYzAuLmQ5ZDQzMDYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2F0b21pY19wbGFuZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2F0b21pY19wbGFuZS5jCkBAIC0zNywzMSArMzcsNTggQEAKICNpbmNsdWRlICJp bnRlbF9kcnYuaCIKIAogLyoqCisgKiBpbnRlbF9jcmVhdGVfcGxhbmVfc3RhdGUgLSBjcmVhdGUg cGxhbmUgc3RhdGUgb2JqZWN0CisgKiBAcGxhbmU6IGRybSBwbGFuZQorICoKKyAqIEFsbG9jYXRl cyBhIGZyZXNoIHBsYW5lIHN0YXRlIGZvciB0aGUgZ2l2ZW4gcGxhbmUgYW5kIHNldHMgc29tZSBv ZgorICogdGhlIHN0YXRlIHZhbHVlcyB0byBzZW5zaWJsZSBpbml0aWFsIHZhbHVlcy4KKyAqCisg KiBSZXR1cm5zOiBBIG5ld2x5IGFsbG9jYXRlZCBwbGFuZSBzdGF0ZSwgb3IgTlVMTCBvbiBmYWls dXJlCisgKi8KK3N0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqCitpbnRlbF9jcmVhdGVfcGxhbmVf c3RhdGUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUpCit7CisJc3RydWN0IGludGVsX3BsYW5lX3N0 YXRlICpzdGF0ZTsKKworCXN0YXRlID0ga3phbGxvYyhzaXplb2YoKnN0YXRlKSwgR0ZQX0tFUk5F TCk7CisJaWYgKCFzdGF0ZSkKKwkJcmV0dXJuIE5VTEw7CisKKwlzdGF0ZS0+YmFzZS5wbGFuZSA9 IHBsYW5lOworCXN0YXRlLT5iYXNlLnJvdGF0aW9uID0gQklUKERSTV9ST1RBVEVfMCk7CisKKwly ZXR1cm4gc3RhdGU7Cit9CisKKy8qKgogICogaW50ZWxfcGxhbmVfZHVwbGljYXRlX3N0YXRlIC0g ZHVwbGljYXRlIHBsYW5lIHN0YXRlCiAgKiBAcGxhbmU6IGRybSBwbGFuZQogICoKICAqIEFsbG9j YXRlcyBhbmQgcmV0dXJucyBhIGNvcHkgb2YgdGhlIHBsYW5lIHN0YXRlIChib3RoIGNvbW1vbiBh bmQKICAqIEludGVsLXNwZWNpZmljKSBmb3IgdGhlIHNwZWNpZmllZCBwbGFuZS4KICAqCi0gKiBS ZXR1cm5zOiBUaGUgbmV3bHkgYWxsb2NhdGVkIHBsYW5lIHN0YXRlLCBvciBOVUxMIG9yIGZhaWx1 cmUuCisgKiBSZXR1cm5zOiBUaGUgbmV3bHkgYWxsb2NhdGVkIHBsYW5lIHN0YXRlLCBvciBOVUxM IG9uIGZhaWx1cmUuCiAgKi8KIHN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKgogaW50ZWxfcGxhbmVf ZHVwbGljYXRlX3N0YXRlKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lKQogewotCXN0cnVjdCBpbnRl bF9wbGFuZV9zdGF0ZSAqc3RhdGU7CisJc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqc3RhdGU7CisJ c3RydWN0IGludGVsX3BsYW5lX3N0YXRlICppbnRlbF9zdGF0ZTsKIAotCWlmIChwbGFuZS0+c3Rh dGUpCi0JCXN0YXRlID0ga21lbWR1cChwbGFuZS0+c3RhdGUsIHNpemVvZigqc3RhdGUpLCBHRlBf S0VSTkVMKTsKKwlpZiAoV0FSTl9PTighcGxhbmUtPnN0YXRlKSkKKwkJaW50ZWxfc3RhdGUgPSBp bnRlbF9jcmVhdGVfcGxhbmVfc3RhdGUocGxhbmUpOwogCWVsc2UKLQkJc3RhdGUgPSBremFsbG9j KHNpemVvZigqc3RhdGUpLCBHRlBfS0VSTkVMKTsKKwkJaW50ZWxfc3RhdGUgPSBrbWVtZHVwKHBs YW5lLT5zdGF0ZSwgc2l6ZW9mKCppbnRlbF9zdGF0ZSksCisJCQkJICAgICAgR0ZQX0tFUk5FTCk7 CiAKLQlpZiAoIXN0YXRlKQorCWlmICghaW50ZWxfc3RhdGUpCiAJCXJldHVybiBOVUxMOwogCi0J aWYgKHN0YXRlLT5iYXNlLmZiKQotCQlkcm1fZnJhbWVidWZmZXJfcmVmZXJlbmNlKHN0YXRlLT5i YXNlLmZiKTsKKwlzdGF0ZSA9ICZpbnRlbF9zdGF0ZS0+YmFzZTsKKwlpZiAoc3RhdGUtPmZiKQor CQlkcm1fZnJhbWVidWZmZXJfcmVmZXJlbmNlKHN0YXRlLT5mYik7CiAKLQlyZXR1cm4gJnN0YXRl LT5iYXNlOworCXJldHVybiBzdGF0ZTsKIH0KIAogLyoqCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k aXNwbGF5LmMKaW5kZXggMDFkYzgwYi4uZGI0MjgyNCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2Rpc3BsYXkuYwpAQCAtMjU2MCw3ICsyNTYwLDcgQEAgc3RhdGljIHZvaWQgaTl4eF91cGRhdGVf cHJpbWFyeV9wbGFuZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJCWludGVsX2NydGMtPmRzcGFk ZHJfb2Zmc2V0ID0gbGluZWFyX29mZnNldDsKIAl9CiAKLQlpZiAodG9faW50ZWxfcGxhbmUoY3J0 Yy0+cHJpbWFyeSktPnJvdGF0aW9uID09IEJJVChEUk1fUk9UQVRFXzE4MCkpIHsKKwlpZiAoY3J0 Yy0+cHJpbWFyeS0+c3RhdGUtPnJvdGF0aW9uID09IEJJVChEUk1fUk9UQVRFXzE4MCkpIHsKIAkJ ZHNwY250ciB8PSBESVNQUExBTkVfUk9UQVRFXzE4MDsKIAogCQl4ICs9IChpbnRlbF9jcnRjLT5j b25maWctPnBpcGVfc3JjX3cgLSAxKTsKQEAgLTI2NjIsNyArMjY2Miw3IEBAIHN0YXRpYyB2b2lk IGlyb25sYWtlX3VwZGF0ZV9wcmltYXJ5X3BsYW5lKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkJ CQkJICAgICAgIHBpeGVsX3NpemUsCiAJCQkJCSAgICAgICBmYi0+cGl0Y2hlc1swXSk7CiAJbGlu ZWFyX29mZnNldCAtPSBpbnRlbF9jcnRjLT5kc3BhZGRyX29mZnNldDsKLQlpZiAodG9faW50ZWxf cGxhbmUoY3J0Yy0+cHJpbWFyeSktPnJvdGF0aW9uID09IEJJVChEUk1fUk9UQVRFXzE4MCkpIHsK KwlpZiAoY3J0Yy0+cHJpbWFyeS0+c3RhdGUtPnJvdGF0aW9uID09IEJJVChEUk1fUk9UQVRFXzE4 MCkpIHsKIAkJZHNwY250ciB8PSBESVNQUExBTkVfUk9UQVRFXzE4MDsKIAogCQlpZiAoIUlTX0hB U1dFTEwoZGV2KSAmJiAhSVNfQlJPQURXRUxMKGRldikpIHsKQEAgLTI3NTksNyArMjc1OSw3IEBA IHN0YXRpYyB2b2lkIHNreWxha2VfdXBkYXRlX3ByaW1hcnlfcGxhbmUoc3RydWN0IGRybV9jcnRj ICpjcnRjLAogCX0KIAogCXBsYW5lX2N0bCB8PSBQTEFORV9DVExfUExBTkVfR0FNTUFfRElTQUJM RTsKLQlpZiAodG9faW50ZWxfcGxhbmUoY3J0Yy0+cHJpbWFyeSktPnJvdGF0aW9uID09IEJJVChE Uk1fUk9UQVRFXzE4MCkpCisJaWYgKGNydGMtPnByaW1hcnktPnN0YXRlLT5yb3RhdGlvbiA9PSBC SVQoRFJNX1JPVEFURV8xODApKQogCQlwbGFuZV9jdGwgfD0gUExBTkVfQ1RMX1JPVEFURV8xODA7 CiAKIAlJOTE1X1dSSVRFKFBMQU5FX0NUTChwaXBlLCAwKSwgcGxhbmVfY3RsKTsKQEAgLTgzMzIs NyArODMzMiw3IEBAIHN0YXRpYyB2b2lkIGk5eHhfdXBkYXRlX2N1cnNvcihzdHJ1Y3QgZHJtX2Ny dGMgKmNydGMsIHUzMiBiYXNlKQogCQkJY250bCB8PSBDVVJTT1JfUElQRV9DU0NfRU5BQkxFOwog CX0KIAotCWlmICh0b19pbnRlbF9wbGFuZShjcnRjLT5jdXJzb3IpLT5yb3RhdGlvbiA9PSBCSVQo RFJNX1JPVEFURV8xODApKQorCWlmIChjcnRjLT5jdXJzb3ItPnN0YXRlLT5yb3RhdGlvbiA9PSBC SVQoRFJNX1JPVEFURV8xODApKQogCQljbnRsIHw9IENVUlNPUl9ST1RBVEVfMTgwOwogCiAJaWYg KGludGVsX2NydGMtPmN1cnNvcl9jbnRsICE9IGNudGwpIHsKQEAgLTgzOTQsNyArODM5NCw3IEBA IHN0YXRpYyB2b2lkIGludGVsX2NydGNfdXBkYXRlX2N1cnNvcihzdHJ1Y3QgZHJtX2NydGMgKmNy dGMsCiAKIAkvKiBJTEsrIGRvIHRoaXMgYXV0b21hZ2ljYWxseSAqLwogCWlmIChIQVNfR01DSF9E SVNQTEFZKGRldikgJiYKLQkJdG9faW50ZWxfcGxhbmUoY3J0Yy0+Y3Vyc29yKS0+cm90YXRpb24g PT0gQklUKERSTV9ST1RBVEVfMTgwKSkgeworCSAgICBjcnRjLT5jdXJzb3ItPnN0YXRlLT5yb3Rh dGlvbiA9PSBCSVQoRFJNX1JPVEFURV8xODApKSB7CiAJCWJhc2UgKz0gKGludGVsX2NydGMtPmN1 cnNvcl9oZWlnaHQgKgogCQkJaW50ZWxfY3J0Yy0+Y3Vyc29yX3dpZHRoIC0gMSkgKiA0OwogCX0K QEAgLTExODQ2LDcgKzExODQ2LDYgQEAgaW50ZWxfY2hlY2tfcHJpbWFyeV9wbGFuZShzdHJ1Y3Qg ZHJtX3BsYW5lICpwbGFuZSwKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBk ZXYtPmRldl9wcml2YXRlOwogCXN0cnVjdCBkcm1fY3J0YyAqY3J0YyA9IHN0YXRlLT5iYXNlLmNy dGM7CiAJc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGM7Ci0Jc3RydWN0IGludGVsX3BsYW5l ICppbnRlbF9wbGFuZSA9IHRvX2ludGVsX3BsYW5lKHBsYW5lKTsKIAlzdHJ1Y3QgZHJtX2ZyYW1l YnVmZmVyICpmYiA9IHN0YXRlLT5iYXNlLmZiOwogCXN0cnVjdCBkcm1fcmVjdCAqZGVzdCA9ICZz dGF0ZS0+ZHN0OwogCXN0cnVjdCBkcm1fcmVjdCAqc3JjID0gJnN0YXRlLT5zcmM7CkBAIC0xMTg4 MCw3ICsxMTg3OSw3IEBAIGludGVsX2NoZWNrX3ByaW1hcnlfcGxhbmUoc3RydWN0IGRybV9wbGFu ZSAqcGxhbmUsCiAJCWlmIChpbnRlbF9jcnRjLT5wcmltYXJ5X2VuYWJsZWQgJiYKIAkJICAgIElO VEVMX0lORk8oZGV2KS0+Z2VuIDw9IDQgJiYgIUlTX0c0WChkZXYpICYmCiAJCSAgICBkZXZfcHJp di0+ZmJjLnBsYW5lID09IGludGVsX2NydGMtPnBsYW5lICYmCi0JCSAgICBpbnRlbF9wbGFuZS0+ cm90YXRpb24gIT0gQklUKERSTV9ST1RBVEVfMCkpIHsKKwkJICAgIHN0YXRlLT5iYXNlLnJvdGF0 aW9uICE9IEJJVChEUk1fUk9UQVRFXzApKSB7CiAJCQlpbnRlbF9jcnRjLT5hdG9taWMuZGlzYWJs ZV9mYmMgPSB0cnVlOwogCQl9CiAKQEAgLTEyMDY0LDYgKzEyMDYzLDcgQEAgc3RhdGljIHN0cnVj dCBkcm1fcGxhbmUgKmludGVsX3ByaW1hcnlfcGxhbmVfY3JlYXRlKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYsCiAJCQkJCQkgICAgaW50IHBpcGUpCiB7CiAJc3RydWN0IGludGVsX3BsYW5lICpwcmlt YXJ5OworCXN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqc3RhdGU7CiAJY29uc3QgdWludDMyX3Qg KmludGVsX3ByaW1hcnlfZm9ybWF0czsKIAlpbnQgbnVtX2Zvcm1hdHM7CiAKQEAgLTEyMDcxLDE3 ICsxMjA3MSwxNyBAQCBzdGF0aWMgc3RydWN0IGRybV9wbGFuZSAqaW50ZWxfcHJpbWFyeV9wbGFu ZV9jcmVhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAlpZiAocHJpbWFyeSA9PSBOVUxMKQog CQlyZXR1cm4gTlVMTDsKIAotCXByaW1hcnktPmJhc2Uuc3RhdGUgPSBpbnRlbF9wbGFuZV9kdXBs aWNhdGVfc3RhdGUoJnByaW1hcnktPmJhc2UpOwotCWlmIChwcmltYXJ5LT5iYXNlLnN0YXRlID09 IE5VTEwpIHsKKwlzdGF0ZSA9IGludGVsX2NyZWF0ZV9wbGFuZV9zdGF0ZSgmcHJpbWFyeS0+YmFz ZSk7CisJaWYgKCFzdGF0ZSkgewogCQlrZnJlZShwcmltYXJ5KTsKIAkJcmV0dXJuIE5VTEw7CiAJ fQorCXByaW1hcnktPmJhc2Uuc3RhdGUgPSAmc3RhdGUtPmJhc2U7CiAKIAlwcmltYXJ5LT5jYW5f c2NhbGUgPSBmYWxzZTsKIAlwcmltYXJ5LT5tYXhfZG93bnNjYWxlID0gMTsKIAlwcmltYXJ5LT5w aXBlID0gcGlwZTsKIAlwcmltYXJ5LT5wbGFuZSA9IHBpcGU7Ci0JcHJpbWFyeS0+cm90YXRpb24g PSBCSVQoRFJNX1JPVEFURV8wKTsKIAlwcmltYXJ5LT5jaGVja19wbGFuZSA9IGludGVsX2NoZWNr X3ByaW1hcnlfcGxhbmU7CiAJcHJpbWFyeS0+Y29tbWl0X3BsYW5lID0gaW50ZWxfY29tbWl0X3By aW1hcnlfcGxhbmU7CiAJaWYgKEhBU19GQkMoZGV2KSAmJiBJTlRFTF9JTkZPKGRldiktPmdlbiA8 IDQpCkBAIC0xMjEwOSw3ICsxMjEwOSw3IEBAIHN0YXRpYyBzdHJ1Y3QgZHJtX3BsYW5lICppbnRl bF9wcmltYXJ5X3BsYW5lX2NyZWF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQlpZiAoZGV2 LT5tb2RlX2NvbmZpZy5yb3RhdGlvbl9wcm9wZXJ0eSkKIAkJCWRybV9vYmplY3RfYXR0YWNoX3By b3BlcnR5KCZwcmltYXJ5LT5iYXNlLmJhc2UsCiAJCQkJZGV2LT5tb2RlX2NvbmZpZy5yb3RhdGlv bl9wcm9wZXJ0eSwKLQkJCQlwcmltYXJ5LT5yb3RhdGlvbik7CisJCQkJc3RhdGUtPmJhc2Uucm90 YXRpb24pOwogCX0KIAogCWRybV9wbGFuZV9oZWxwZXJfYWRkKCZwcmltYXJ5LT5iYXNlLCAmaW50 ZWxfcGxhbmVfaGVscGVyX2Z1bmNzKTsKQEAgLTEyMjM3LDIyICsxMjIzNywyMyBAQCBzdGF0aWMg c3RydWN0IGRybV9wbGFuZSAqaW50ZWxfY3Vyc29yX3BsYW5lX2NyZWF0ZShzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2LAogCQkJCQkJICAgaW50IHBpcGUpCiB7CiAJc3RydWN0IGludGVsX3BsYW5lICpj dXJzb3I7CisJc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpzdGF0ZTsKIAogCWN1cnNvciA9IGt6 YWxsb2Moc2l6ZW9mKCpjdXJzb3IpLCBHRlBfS0VSTkVMKTsKIAlpZiAoY3Vyc29yID09IE5VTEwp CiAJCXJldHVybiBOVUxMOwogCi0JY3Vyc29yLT5iYXNlLnN0YXRlID0gaW50ZWxfcGxhbmVfZHVw bGljYXRlX3N0YXRlKCZjdXJzb3ItPmJhc2UpOwotCWlmIChjdXJzb3ItPmJhc2Uuc3RhdGUgPT0g TlVMTCkgeworCXN0YXRlID0gaW50ZWxfY3JlYXRlX3BsYW5lX3N0YXRlKCZjdXJzb3ItPmJhc2Up OworCWlmICghc3RhdGUpIHsKIAkJa2ZyZWUoY3Vyc29yKTsKIAkJcmV0dXJuIE5VTEw7CiAJfQor CWN1cnNvci0+YmFzZS5zdGF0ZSA9ICZzdGF0ZS0+YmFzZTsKIAogCWN1cnNvci0+Y2FuX3NjYWxl ID0gZmFsc2U7CiAJY3Vyc29yLT5tYXhfZG93bnNjYWxlID0gMTsKIAljdXJzb3ItPnBpcGUgPSBw aXBlOwogCWN1cnNvci0+cGxhbmUgPSBwaXBlOwotCWN1cnNvci0+cm90YXRpb24gPSBCSVQoRFJN X1JPVEFURV8wKTsKIAljdXJzb3ItPmNoZWNrX3BsYW5lID0gaW50ZWxfY2hlY2tfY3Vyc29yX3Bs YW5lOwogCWN1cnNvci0+Y29tbWl0X3BsYW5lID0gaW50ZWxfY29tbWl0X2N1cnNvcl9wbGFuZTsK IApAQCAtMTIyNzEsNyArMTIyNzIsNyBAQCBzdGF0aWMgc3RydWN0IGRybV9wbGFuZSAqaW50ZWxf Y3Vyc29yX3BsYW5lX2NyZWF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQlpZiAoZGV2LT5t b2RlX2NvbmZpZy5yb3RhdGlvbl9wcm9wZXJ0eSkKIAkJCWRybV9vYmplY3RfYXR0YWNoX3Byb3Bl cnR5KCZjdXJzb3ItPmJhc2UuYmFzZSwKIAkJCQlkZXYtPm1vZGVfY29uZmlnLnJvdGF0aW9uX3By b3BlcnR5LAotCQkJCWN1cnNvci0+cm90YXRpb24pOworCQkJCXN0YXRlLT5iYXNlLnJvdGF0aW9u KTsKIAl9CiAKIAlkcm1fcGxhbmVfaGVscGVyX2FkZCgmY3Vyc29yLT5iYXNlLCAmaW50ZWxfcGxh bmVfaGVscGVyX2Z1bmNzKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXggZTk1N2Q0ZC4u YjA1NjJlNCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAgLTUwOSw3ICs1MDksNiBAQCBz dHJ1Y3QgaW50ZWxfcGxhbmUgewogCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmo7CiAJ Ym9vbCBjYW5fc2NhbGU7CiAJaW50IG1heF9kb3duc2NhbGU7Ci0JdW5zaWduZWQgaW50IHJvdGF0 aW9uOwogCiAJLyogU2luY2Ugd2UgbmVlZCB0byBjaGFuZ2UgdGhlIHdhdGVybWFya3MgYmVmb3Jl L2FmdGVyCiAJICogZW5hYmxpbmcvZGlzYWJsaW5nIHRoZSBwbGFuZXMsIHdlIG5lZWQgdG8gc3Rv cmUgdGhlIHBhcmFtZXRlcnMgaGVyZQpAQCAtNTE4LDYgKzUxNywxMiBAQCBzdHJ1Y3QgaW50ZWxf cGxhbmUgewogCSAqLwogCXN0cnVjdCBpbnRlbF9wbGFuZV93bV9wYXJhbWV0ZXJzIHdtOwogCisJ LyoKKwkgKiBOT1RFOiBEbyBub3QgcGxhY2UgbmV3IHBsYW5lIHN0YXRlIGZpZWxkcyBoZXJlIChl LmcuLCB3aGVuIGFkZGluZworCSAqIG5ldyBwbGFuZSBwcm9wZXJ0aWVzKS4gIE5ldyBydW50aW1l IHN0YXRlIHNob3VsZCBub3cgYmUgcGxhY2VkIGluCisJICogdGhlIGludGVsX3BsYW5lX3N0YXRl IHN0cnVjdHVyZSBhbmQgYWNjZXNzZWQgdmlhIGRybV9wbGFuZS0+c3RhdGUuCisJICovCisKIAl2 b2lkICgqdXBkYXRlX3BsYW5lKShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAkJCSAgICAgc3Ry dWN0IGRybV9jcnRjICpjcnRjLAogCQkJICAgICBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiwK QEAgLTEyMzAsNiArMTIzNSw3IEBAIHZvaWQgaW50ZWxfcHJlX2Rpc2FibGVfcHJpbWFyeShzdHJ1 Y3QgZHJtX2NydGMgKmNydGMpOwogdm9pZCBpbnRlbF90dl9pbml0KHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYpOwogCiAvKiBpbnRlbF9hdG9taWMuYyAqLworc3RydWN0IGludGVsX3BsYW5lX3N0YXRl ICppbnRlbF9jcmVhdGVfcGxhbmVfc3RhdGUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUpOwogc3Ry dWN0IGRybV9wbGFuZV9zdGF0ZSAqaW50ZWxfcGxhbmVfZHVwbGljYXRlX3N0YXRlKHN0cnVjdCBk cm1fcGxhbmUgKnBsYW5lKTsKIHZvaWQgaW50ZWxfcGxhbmVfZGVzdHJveV9zdGF0ZShzdHJ1Y3Qg ZHJtX3BsYW5lICpwbGFuZSwKIAkJCSAgICAgICBzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpzdGF0 ZSk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmMuYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiYy5jCmluZGV4IGVkOWEwMTIuLjYyNGQxZDkgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiYy5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2ZiYy5jCkBAIC01OTUsNyArNTk1LDcgQEAgdm9pZCBpbnRlbF9mYmNf dXBkYXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCWdvdG8gb3V0X2Rpc2FibGU7CiAJfQog CWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA8PSA0ICYmICFJU19HNFgoZGV2KSAmJgotCSAgICB0 b19pbnRlbF9wbGFuZShjcnRjLT5wcmltYXJ5KS0+cm90YXRpb24gIT0gQklUKERSTV9ST1RBVEVf MCkpIHsKKwkgICAgY3J0Yy0+cHJpbWFyeS0+c3RhdGUtPnJvdGF0aW9uICE9IEJJVChEUk1fUk9U QVRFXzApKSB7CiAJCWlmIChzZXRfbm9fZmJjX3JlYXNvbihkZXZfcHJpdiwgRkJDX1VOU1VQUE9S VEVEX01PREUpKQogCQkJRFJNX0RFQlVHX0tNUygiUm90YXRpb24gdW5zdXBwb3J0ZWQsIGRpc2Fi bGluZ1xuIik7CiAJCWdvdG8gb3V0X2Rpc2FibGU7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9zcHJpdGUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0 ZS5jCmluZGV4IDBhNjA5NGUuLmJhODU0MzkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3Nwcml0ZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0 ZS5jCkBAIC0yNTYsNyArMjU2LDcgQEAgc2tsX3VwZGF0ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5l ICpkcm1fcGxhbmUsIHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAlkZWZhdWx0OgogCQlCVUcoKTsK IAl9Ci0JaWYgKGludGVsX3BsYW5lLT5yb3RhdGlvbiA9PSBCSVQoRFJNX1JPVEFURV8xODApKQor CWlmIChkcm1fcGxhbmUtPnN0YXRlLT5yb3RhdGlvbiA9PSBCSVQoRFJNX1JPVEFURV8xODApKQog CQlwbGFuZV9jdGwgfD0gUExBTkVfQ1RMX1JPVEFURV8xODA7CiAKIAlwbGFuZV9jdGwgfD0gUExB TkVfQ1RMX0VOQUJMRTsKQEAgLTQ5Myw3ICs0OTMsNyBAQCB2bHZfdXBkYXRlX3BsYW5lKHN0cnVj dCBkcm1fcGxhbmUgKmRwbGFuZSwgc3RydWN0IGRybV9jcnRjICpjcnRjLAogCQkJCQkJCWZiLT5w aXRjaGVzWzBdKTsKIAlsaW5lYXJfb2Zmc2V0IC09IHNwcnN1cmZfb2Zmc2V0OwogCi0JaWYgKGlu dGVsX3BsYW5lLT5yb3RhdGlvbiA9PSBCSVQoRFJNX1JPVEFURV8xODApKSB7CisJaWYgKGRwbGFu ZS0+c3RhdGUtPnJvdGF0aW9uID09IEJJVChEUk1fUk9UQVRFXzE4MCkpIHsKIAkJc3ByY3RsIHw9 IFNQX1JPVEFURV8xODA7CiAKIAkJeCArPSBzcmNfdzsKQEAgLTY4NCw3ICs2ODQsNyBAQCBpdmJf dXBkYXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLCBzdHJ1Y3QgZHJtX2NydGMgKmNy dGMsCiAJCQkJCSAgICAgICBwaXhlbF9zaXplLCBmYi0+cGl0Y2hlc1swXSk7CiAJbGluZWFyX29m ZnNldCAtPSBzcHJzdXJmX29mZnNldDsKIAotCWlmIChpbnRlbF9wbGFuZS0+cm90YXRpb24gPT0g QklUKERSTV9ST1RBVEVfMTgwKSkgeworCWlmIChwbGFuZS0+c3RhdGUtPnJvdGF0aW9uID09IEJJ VChEUk1fUk9UQVRFXzE4MCkpIHsKIAkJc3ByY3RsIHw9IFNQUklURV9ST1RBVEVfMTgwOwogCiAJ CS8qIEhTVyBhbmQgQkRXIGRvZXMgdGhpcyBhdXRvbWFnaWNhbGx5IGluIGhhcmR3YXJlICovCkBA IC04ODQsNyArODg0LDcgQEAgaWxrX3VwZGF0ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFu ZSwgc3RydWN0IGRybV9jcnRjICpjcnRjLAogCQkJCQkgICAgICAgcGl4ZWxfc2l6ZSwgZmItPnBp dGNoZXNbMF0pOwogCWxpbmVhcl9vZmZzZXQgLT0gZHZzc3VyZl9vZmZzZXQ7CiAKLQlpZiAoaW50 ZWxfcGxhbmUtPnJvdGF0aW9uID09IEJJVChEUk1fUk9UQVRFXzE4MCkpIHsKKwlpZiAocGxhbmUt PnN0YXRlLT5yb3RhdGlvbiA9PSBCSVQoRFJNX1JPVEFURV8xODApKSB7CiAJCWR2c2NudHIgfD0g RFZTX1JPVEFURV8xODA7CiAKIAkJeCArPSBzcmNfdzsKQEAgLTExMjUsNyArMTEyNSw3IEBAIGlu dGVsX2NoZWNrX3Nwcml0ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAltaW5fc2Nh bGUgPSBpbnRlbF9wbGFuZS0+Y2FuX3NjYWxlID8gMSA6ICgxIDw8IDE2KTsKIAogCWRybV9yZWN0 X3JvdGF0ZShzcmMsIGZiLT53aWR0aCA8PCAxNiwgZmItPmhlaWdodCA8PCAxNiwKLQkJCWludGVs X3BsYW5lLT5yb3RhdGlvbik7CisJCQlzdGF0ZS0+YmFzZS5yb3RhdGlvbik7CiAKIAloc2NhbGUg PSBkcm1fcmVjdF9jYWxjX2hzY2FsZV9yZWxheGVkKHNyYywgZHN0LCBtaW5fc2NhbGUsIG1heF9z Y2FsZSk7CiAJQlVHX09OKGhzY2FsZSA8IDApOwpAQCAtMTE2Niw3ICsxMTY2LDcgQEAgaW50ZWxf Y2hlY2tfc3ByaXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCQkJCSAgICAgZHJt X3JlY3RfaGVpZ2h0KGRzdCkgKiB2c2NhbGUgLSBkcm1fcmVjdF9oZWlnaHQoc3JjKSk7CiAKIAkJ ZHJtX3JlY3Rfcm90YXRlX2ludihzcmMsIGZiLT53aWR0aCA8PCAxNiwgZmItPmhlaWdodCA8PCAx NiwKLQkJCQkgICAgaW50ZWxfcGxhbmUtPnJvdGF0aW9uKTsKKwkJCQkgICAgc3RhdGUtPmJhc2Uu cm90YXRpb24pOwogCiAJCS8qIHNhbml0eSBjaGVjayB0byBtYWtlIHN1cmUgdGhlIHNyYyB2aWV3 cG9ydCB3YXNuJ3QgZW5sYXJnZWQgKi8KIAkJV0FSTl9PTihzcmMtPngxIDwgKGludCkgc3RhdGUt PmJhc2Uuc3JjX3ggfHwKQEAgLTEzNjcsNyArMTM2Nyw2IEBAIGludCBpbnRlbF9wbGFuZV9zZXRf cHJvcGVydHkoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJCQkgICAgIHVpbnQ2NF90IHZhbCkK IHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gcGxhbmUtPmRldjsKLQlzdHJ1Y3QgaW50ZWxf cGxhbmUgKmludGVsX3BsYW5lID0gdG9faW50ZWxfcGxhbmUocGxhbmUpOwogCXVpbnQ2NF90IG9s ZF92YWw7CiAJaW50IHJldCA9IC1FTk9FTlQ7CiAKQEAgLTEzNzYsMTQgKzEzNzUsMTQgQEAgaW50 IGludGVsX3BsYW5lX3NldF9wcm9wZXJ0eShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAkJaWYg KGh3ZWlnaHQzMih2YWwgJiAweGYpICE9IDEpCiAJCQlyZXR1cm4gLUVJTlZBTDsKIAotCQlpZiAo aW50ZWxfcGxhbmUtPnJvdGF0aW9uID09IHZhbCkKKwkJaWYgKHBsYW5lLT5zdGF0ZS0+cm90YXRp b24gPT0gdmFsKQogCQkJcmV0dXJuIDA7CiAKLQkJb2xkX3ZhbCA9IGludGVsX3BsYW5lLT5yb3Rh dGlvbjsKLQkJaW50ZWxfcGxhbmUtPnJvdGF0aW9uID0gdmFsOworCQlvbGRfdmFsID0gcGxhbmUt PnN0YXRlLT5yb3RhdGlvbjsKKwkJcGxhbmUtPnN0YXRlLT5yb3RhdGlvbiA9IHZhbDsKIAkJcmV0 ID0gaW50ZWxfcGxhbmVfcmVzdG9yZShwbGFuZSk7CiAJCWlmIChyZXQpCi0JCQlpbnRlbF9wbGFu ZS0+cm90YXRpb24gPSBvbGRfdmFsOworCQkJcGxhbmUtPnN0YXRlLT5yb3RhdGlvbiA9IG9sZF92 YWw7CiAJfQogCiAJcmV0dXJuIHJldDsKQEAgLTE0NTcsNiArMTQ1Niw3IEBAIGludAogaW50ZWxf cGxhbmVfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBlbnVtIHBpcGUgcGlwZSwgaW50IHBs YW5lKQogewogCXN0cnVjdCBpbnRlbF9wbGFuZSAqaW50ZWxfcGxhbmU7CisJc3RydWN0IGludGVs X3BsYW5lX3N0YXRlICpzdGF0ZTsKIAl1bnNpZ25lZCBsb25nIHBvc3NpYmxlX2NydGNzOwogCWNv bnN0IHVpbnQzMl90ICpwbGFuZV9mb3JtYXRzOwogCWludCBudW1fcGxhbmVfZm9ybWF0czsKQEAg LTE0NjksMTIgKzE0NjksMTIgQEAgaW50ZWxfcGxhbmVfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2LCBlbnVtIHBpcGUgcGlwZSwgaW50IHBsYW5lKQogCWlmICghaW50ZWxfcGxhbmUpCiAJCXJl dHVybiAtRU5PTUVNOwogCi0JaW50ZWxfcGxhbmUtPmJhc2Uuc3RhdGUgPQotCQlpbnRlbF9wbGFu ZV9kdXBsaWNhdGVfc3RhdGUoJmludGVsX3BsYW5lLT5iYXNlKTsKLQlpZiAoaW50ZWxfcGxhbmUt PmJhc2Uuc3RhdGUgPT0gTlVMTCkgeworCXN0YXRlID0gaW50ZWxfY3JlYXRlX3BsYW5lX3N0YXRl KCZpbnRlbF9wbGFuZS0+YmFzZSk7CisJaWYgKCFzdGF0ZSkgewogCQlrZnJlZShpbnRlbF9wbGFu ZSk7CiAJCXJldHVybiAtRU5PTUVNOwogCX0KKwlpbnRlbF9wbGFuZS0+YmFzZS5zdGF0ZSA9ICZz dGF0ZS0+YmFzZTsKIAogCXN3aXRjaCAoSU5URUxfSU5GTyhkZXYpLT5nZW4pIHsKIAljYXNlIDU6 CkBAIC0xNTQ1LDcgKzE1NDUsNiBAQCBpbnRlbF9wbGFuZV9pbml0KHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYsIGVudW0gcGlwZSBwaXBlLCBpbnQgcGxhbmUpCiAKIAlpbnRlbF9wbGFuZS0+cGlwZSA9 IHBpcGU7CiAJaW50ZWxfcGxhbmUtPnBsYW5lID0gcGxhbmU7Ci0JaW50ZWxfcGxhbmUtPnJvdGF0 aW9uID0gQklUKERSTV9ST1RBVEVfMCk7CiAJaW50ZWxfcGxhbmUtPmNoZWNrX3BsYW5lID0gaW50 ZWxfY2hlY2tfc3ByaXRlX3BsYW5lOwogCWludGVsX3BsYW5lLT5jb21taXRfcGxhbmUgPSBpbnRl bF9jb21taXRfc3ByaXRlX3BsYW5lOwogCXBvc3NpYmxlX2NydGNzID0gKDEgPDwgcGlwZSk7CkBA IC0xNTY3LDcgKzE1NjYsNyBAQCBpbnRlbF9wbGFuZV9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYsIGVudW0gcGlwZSBwaXBlLCBpbnQgcGxhbmUpCiAJaWYgKGRldi0+bW9kZV9jb25maWcucm90 YXRpb25fcHJvcGVydHkpCiAJCWRybV9vYmplY3RfYXR0YWNoX3Byb3BlcnR5KCZpbnRlbF9wbGFu ZS0+YmFzZS5iYXNlLAogCQkJCQkgICBkZXYtPm1vZGVfY29uZmlnLnJvdGF0aW9uX3Byb3BlcnR5 LAotCQkJCQkgICBpbnRlbF9wbGFuZS0+cm90YXRpb24pOworCQkJCQkgICBzdGF0ZS0+YmFzZS5y b3RhdGlvbik7CiAKIAlkcm1fcGxhbmVfaGVscGVyX2FkZCgmaW50ZWxfcGxhbmUtPmJhc2UsICZp bnRlbF9wbGFuZV9oZWxwZXJfZnVuY3MpOwogCi0tIAoxLjguNS4xCgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0Cklu dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=