From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Subject: [PATCH] drm/radeon/kms: simplify storing current and requested PM mode Date: Wed, 17 Feb 2010 22:42:58 +0100 Message-ID: <1266442978-3754-1-git-send-email-zajec5@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.sourceforge.net To: dri-devel@lists.sourceforge.net, Dave Airlie , Alex Deucher List-Id: dri-devel@lists.freedesktop.org V2Uga2VwdCByZXF1ZXN0ZWQgYW5kIGN1cnJlbnQgbW9kZXMgaW4gbWFueSBwbGFjZXMsIGRlcGVu ZGluZyBvbiBjdXJyZW50IHN0YXRlLgpUaGF0IHdhcyB1c2VsZXNzLCBvbmUgcGxhY2UgZm9yIGhv bGRpbmcgdGhhdCBpcyBlbm91Z2guCgpTaWduZWQtb2ZmLWJ5OiBSYWZhxYIgTWnFgmVja2kgPHph amVjNUBnbWFpbC5jb20+Ci0tLQpUZXN0ZWQgb24gbXkgUlY2MjAsIG5vIHByb2JsZW1zLiBBbGV4 OiBjYW4geW91IHJldmlldyB0aGlzIHBhdGNoPyBJdCdzIHlvdXIKY29kZSBJIG1vZGlmeS9yZW1v dmUgaW4gaXQuCi0tLQogZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb24uaCAgICAgICAgICB8 ICAgMTMgKysrLS0tCiBkcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9hdG9tYmlvcy5jIHwg ICAyMiArKystLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9jb21iaW9zLmMg IHwgICAgOSArKystCiBkcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9wbS5jICAgICAgIHwg ICA2NiArKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0KIDQgZmlsZXMgY2hhbmdlZCwgNTYg aW5zZXJ0aW9ucygrKSwgNTQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL3JhZGVvbi9yYWRlb24uaCBiL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uLmgKaW5k ZXggOTkzY2RmMi4uYjUzMzQxMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9y YWRlb24uaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbi5oCkBAIC02NTIsOSAr NjUyLDYgQEAgc3RydWN0IHJhZGVvbl9wb3dlcl9zdGF0ZSB7CiAJc3RydWN0IHJhZGVvbl9wbV9j bG9ja19pbmZvIGNsb2NrX2luZm9bOF07CiAJLyogbnVtYmVyIG9mIHZhbGlkIGNsb2NrIG1vZGVz IGluIHRoaXMgcG93ZXIgc3RhdGUgKi8KIAlpbnQgbnVtX2Nsb2NrX21vZGVzOwotCS8qIGN1cnJl bnRseSBzZWxlY3RlZCBjbG9jayBtb2RlICovCi0Jc3RydWN0IHJhZGVvbl9wbV9jbG9ja19pbmZv ICpjdXJyZW50X2Nsb2NrX21vZGU7Ci0Jc3RydWN0IHJhZGVvbl9wbV9jbG9ja19pbmZvICpyZXF1 ZXN0ZWRfY2xvY2tfbW9kZTsKIAlzdHJ1Y3QgcmFkZW9uX3BtX2Nsb2NrX2luZm8gKmRlZmF1bHRf Y2xvY2tfbW9kZTsKIAkvKiBub24gY2xvY2sgaW5mbyBhYm91dCB0aGlzIHN0YXRlICovCiAJc3Ry dWN0IHJhZGVvbl9wbV9ub25fY2xvY2tfaW5mbyBub25fY2xvY2tfaW5mbzsKQEAgLTY4NCwxMCAr NjgxLDEyIEBAIHN0cnVjdCByYWRlb25fcG0gewogCS8qIFhYWDogdXNlIGEgZGVmaW5lIGZvciBu dW0gcG93ZXIgbW9kZXMgKi8KIAlzdHJ1Y3QgcmFkZW9uX3Bvd2VyX3N0YXRlIHBvd2VyX3N0YXRl WzhdOwogCS8qIG51bWJlciBvZiB2YWxpZCBwb3dlciBzdGF0ZXMgKi8KLQlpbnQgICAgICAgICAg ICAgICAgICAgICBudW1fcG93ZXJfc3RhdGVzOwotCXN0cnVjdCByYWRlb25fcG93ZXJfc3RhdGUg KmN1cnJlbnRfcG93ZXJfc3RhdGU7Ci0Jc3RydWN0IHJhZGVvbl9wb3dlcl9zdGF0ZSAqcmVxdWVz dGVkX3Bvd2VyX3N0YXRlOwotCXN0cnVjdCByYWRlb25fcG93ZXJfc3RhdGUgKmRlZmF1bHRfcG93 ZXJfc3RhdGU7CisJaW50CQkJbnVtX3Bvd2VyX3N0YXRlczsKKwlzdHJ1Y3QgcmFkZW9uX3BtX2Ns b2NrX2luZm8JY3VycmVudF9jbG9ja19tb2RlOworCWludAkJCQljdXJyZW50X3BjaWVfbGFuZXM7 CisJc3RydWN0IHJhZGVvbl9wbV9jbG9ja19pbmZvCXJlcXVlc3RlZF9jbG9ja19tb2RlOworCWlu dAkJCQlyZXF1ZXN0ZWRfcGNpZV9sYW5lczsKKwlzdHJ1Y3QgcmFkZW9uX3Bvd2VyX3N0YXRlCSpk ZWZhdWx0X3Bvd2VyX3N0YXRlOwogfTsKIAogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v cmFkZW9uL3JhZGVvbl9hdG9tYmlvcy5jIGIvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25f YXRvbWJpb3MuYwppbmRleCA0ZjdkYmNlLi5iOGU3ZTgxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vcmFkZW9uL3JhZGVvbl9hdG9tYmlvcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9yYWRl b24vcmFkZW9uX2F0b21iaW9zLmMKQEAgLTE0NDEsNyArMTQ0MSw2IEBAIHZvaWQgcmFkZW9uX2F0 b21iaW9zX2dldF9wb3dlcl9tb2RlcyhzdHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldikKIAlwb3dl cl9pbmZvID0gKHVuaW9uIHBvd2VyX2luZm8gKikobW9kZV9pbmZvLT5hdG9tX2NvbnRleHQtPmJp b3MgKyBkYXRhX29mZnNldCk7CiAKIAlyZGV2LT5wbS5kZWZhdWx0X3Bvd2VyX3N0YXRlID0gTlVM TDsKLQlyZGV2LT5wbS5jdXJyZW50X3Bvd2VyX3N0YXRlID0gTlVMTDsKIAogCWlmIChwb3dlcl9p bmZvKSB7CiAJCWlmIChmcmV2IDwgNCkgewpAQCAtMTUwOCwxMSArMTUwNyw4IEBAIHZvaWQgcmFk ZW9uX2F0b21iaW9zX2dldF9wb3dlcl9tb2RlcyhzdHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldikK IAkJCQkJCXJkZXYtPnBtLnBvd2VyX3N0YXRlW3N0YXRlX2luZGV4XS50eXBlID0KIAkJCQkJCQlQ T1dFUl9TVEFURV9UWVBFX0RFRkFVTFQ7CiAJCQkJCQlyZGV2LT5wbS5kZWZhdWx0X3Bvd2VyX3N0 YXRlID0gJnJkZXYtPnBtLnBvd2VyX3N0YXRlW3N0YXRlX2luZGV4XTsKLQkJCQkJCXJkZXYtPnBt LmN1cnJlbnRfcG93ZXJfc3RhdGUgPSAmcmRldi0+cG0ucG93ZXJfc3RhdGVbc3RhdGVfaW5kZXhd OwogCQkJCQkJcmRldi0+cG0ucG93ZXJfc3RhdGVbc3RhdGVfaW5kZXhdLmRlZmF1bHRfY2xvY2tf bW9kZSA9CiAJCQkJCQkJJnJkZXYtPnBtLnBvd2VyX3N0YXRlW3N0YXRlX2luZGV4XS5jbG9ja19p bmZvWzBdOwotCQkJCQkJcmRldi0+cG0ucG93ZXJfc3RhdGVbc3RhdGVfaW5kZXhdLmN1cnJlbnRf Y2xvY2tfbW9kZSA9Ci0JCQkJCQkJJnJkZXYtPnBtLnBvd2VyX3N0YXRlW3N0YXRlX2luZGV4XS5j bG9ja19pbmZvWzBdOwogCQkJCQl9CiAJCQkJCXN0YXRlX2luZGV4Kys7CiAJCQkJCWJyZWFrOwpA QCAtMTU3NywxMSArMTU3Myw4IEBAIHZvaWQgcmFkZW9uX2F0b21iaW9zX2dldF9wb3dlcl9tb2Rl cyhzdHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldikKIAkJCQkJCXJkZXYtPnBtLnBvd2VyX3N0YXRl W3N0YXRlX2luZGV4XS50eXBlID0KIAkJCQkJCQlQT1dFUl9TVEFURV9UWVBFX0RFRkFVTFQ7CiAJ CQkJCQlyZGV2LT5wbS5kZWZhdWx0X3Bvd2VyX3N0YXRlID0gJnJkZXYtPnBtLnBvd2VyX3N0YXRl W3N0YXRlX2luZGV4XTsKLQkJCQkJCXJkZXYtPnBtLmN1cnJlbnRfcG93ZXJfc3RhdGUgPSAmcmRl di0+cG0ucG93ZXJfc3RhdGVbc3RhdGVfaW5kZXhdOwogCQkJCQkJcmRldi0+cG0ucG93ZXJfc3Rh dGVbc3RhdGVfaW5kZXhdLmRlZmF1bHRfY2xvY2tfbW9kZSA9CiAJCQkJCQkJJnJkZXYtPnBtLnBv d2VyX3N0YXRlW3N0YXRlX2luZGV4XS5jbG9ja19pbmZvWzBdOwotCQkJCQkJcmRldi0+cG0ucG93 ZXJfc3RhdGVbc3RhdGVfaW5kZXhdLmN1cnJlbnRfY2xvY2tfbW9kZSA9Ci0JCQkJCQkJJnJkZXYt PnBtLnBvd2VyX3N0YXRlW3N0YXRlX2luZGV4XS5jbG9ja19pbmZvWzBdOwogCQkJCQl9CiAJCQkJ CXN0YXRlX2luZGV4Kys7CiAJCQkJCWJyZWFrOwpAQCAtMTY1MiwxMSArMTY0NSw4IEBAIHZvaWQg cmFkZW9uX2F0b21iaW9zX2dldF9wb3dlcl9tb2RlcyhzdHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRl dikKIAkJCQkJCXJkZXYtPnBtLnBvd2VyX3N0YXRlW3N0YXRlX2luZGV4XS50eXBlID0KIAkJCQkJ CQlQT1dFUl9TVEFURV9UWVBFX0RFRkFVTFQ7CiAJCQkJCQlyZGV2LT5wbS5kZWZhdWx0X3Bvd2Vy X3N0YXRlID0gJnJkZXYtPnBtLnBvd2VyX3N0YXRlW3N0YXRlX2luZGV4XTsKLQkJCQkJCXJkZXYt PnBtLmN1cnJlbnRfcG93ZXJfc3RhdGUgPSAmcmRldi0+cG0ucG93ZXJfc3RhdGVbc3RhdGVfaW5k ZXhdOwogCQkJCQkJcmRldi0+cG0ucG93ZXJfc3RhdGVbc3RhdGVfaW5kZXhdLmRlZmF1bHRfY2xv Y2tfbW9kZSA9CiAJCQkJCQkJJnJkZXYtPnBtLnBvd2VyX3N0YXRlW3N0YXRlX2luZGV4XS5jbG9j a19pbmZvWzBdOwotCQkJCQkJcmRldi0+cG0ucG93ZXJfc3RhdGVbc3RhdGVfaW5kZXhdLmN1cnJl bnRfY2xvY2tfbW9kZSA9Ci0JCQkJCQkJJnJkZXYtPnBtLnBvd2VyX3N0YXRlW3N0YXRlX2luZGV4 XS5jbG9ja19pbmZvWzBdOwogCQkJCQl9CiAJCQkJCXN0YXRlX2luZGV4Kys7CiAJCQkJCWJyZWFr OwpAQCAtMTc1NiwxMSArMTc0Niw4IEBAIHZvaWQgcmFkZW9uX2F0b21iaW9zX2dldF9wb3dlcl9t b2RlcyhzdHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldikKIAkJCQkJCXJkZXYtPnBtLnBvd2VyX3N0 YXRlW3N0YXRlX2luZGV4XS50eXBlID0KIAkJCQkJCQlQT1dFUl9TVEFURV9UWVBFX0RFRkFVTFQ7 CiAJCQkJCQlyZGV2LT5wbS5kZWZhdWx0X3Bvd2VyX3N0YXRlID0gJnJkZXYtPnBtLnBvd2VyX3N0 YXRlW3N0YXRlX2luZGV4XTsKLQkJCQkJCXJkZXYtPnBtLmN1cnJlbnRfcG93ZXJfc3RhdGUgPSAm cmRldi0+cG0ucG93ZXJfc3RhdGVbc3RhdGVfaW5kZXhdOwogCQkJCQkJcmRldi0+cG0ucG93ZXJf c3RhdGVbc3RhdGVfaW5kZXhdLmRlZmF1bHRfY2xvY2tfbW9kZSA9CiAJCQkJCQkJJnJkZXYtPnBt LnBvd2VyX3N0YXRlW3N0YXRlX2luZGV4XS5jbG9ja19pbmZvW21vZGVfaW5kZXggLSAxXTsKLQkJ CQkJCXJkZXYtPnBtLnBvd2VyX3N0YXRlW3N0YXRlX2luZGV4XS5jdXJyZW50X2Nsb2NrX21vZGUg PQotCQkJCQkJCSZyZGV2LT5wbS5wb3dlcl9zdGF0ZVtzdGF0ZV9pbmRleF0uY2xvY2tfaW5mb1tt b2RlX2luZGV4IC0gMV07CiAJCQkJCX0KIAkJCQkJc3RhdGVfaW5kZXgrKzsKIAkJCQl9CkBAIC0x Nzc5LDE4ICsxNzY2LDIxIEBAIHZvaWQgcmFkZW9uX2F0b21iaW9zX2dldF9wb3dlcl9tb2Rlcyhz dHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldikKIAkJcmRldi0+cG0ucG93ZXJfc3RhdGVbc3RhdGVf aW5kZXhdLmNsb2NrX2luZm9bMF0uc2NsayA9IHJkZXYtPmNsb2NrLmRlZmF1bHRfc2NsazsKIAkJ cmRldi0+cG0ucG93ZXJfc3RhdGVbc3RhdGVfaW5kZXhdLmRlZmF1bHRfY2xvY2tfbW9kZSA9CiAJ CQkmcmRldi0+cG0ucG93ZXJfc3RhdGVbc3RhdGVfaW5kZXhdLmNsb2NrX2luZm9bMF07Ci0JCXJk ZXYtPnBtLnBvd2VyX3N0YXRlW3N0YXRlX2luZGV4XS5jdXJyZW50X2Nsb2NrX21vZGUgPQotCQkJ JnJkZXYtPnBtLnBvd2VyX3N0YXRlW3N0YXRlX2luZGV4XS5jbG9ja19pbmZvWzBdOwogCQlyZGV2 LT5wbS5wb3dlcl9zdGF0ZVtzdGF0ZV9pbmRleF0uY2xvY2tfaW5mb1swXS52b2x0YWdlLnR5cGUg PSBWT0xUQUdFX05PTkU7CiAJCWlmIChyZGV2LT5hc2ljLT5nZXRfcGNpZV9sYW5lcykKIAkJCXJk ZXYtPnBtLnBvd2VyX3N0YXRlW3N0YXRlX2luZGV4XS5ub25fY2xvY2tfaW5mby5wY2llX2xhbmVz ID0gcmFkZW9uX2dldF9wY2llX2xhbmVzKHJkZXYpOwogCQllbHNlCiAJCQlyZGV2LT5wbS5wb3dl cl9zdGF0ZVtzdGF0ZV9pbmRleF0ubm9uX2Nsb2NrX2luZm8ucGNpZV9sYW5lcyA9IDE2OwogCQly ZGV2LT5wbS5kZWZhdWx0X3Bvd2VyX3N0YXRlID0gJnJkZXYtPnBtLnBvd2VyX3N0YXRlW3N0YXRl X2luZGV4XTsKLQkJcmRldi0+cG0uY3VycmVudF9wb3dlcl9zdGF0ZSA9ICZyZGV2LT5wbS5wb3dl cl9zdGF0ZVtzdGF0ZV9pbmRleF07CiAJCXN0YXRlX2luZGV4Kys7CiAJfQogCXJkZXYtPnBtLm51 bV9wb3dlcl9zdGF0ZXMgPSBzdGF0ZV9pbmRleDsKKworCW1lbWNweSgodW5zaWduZWQgY2hhciAq KSZyZGV2LT5wbS5jdXJyZW50X2Nsb2NrX21vZGUsCisJCSh1bnNpZ25lZCBjaGFyICopcmRldi0+ cG0uZGVmYXVsdF9wb3dlcl9zdGF0ZS0+ZGVmYXVsdF9jbG9ja19tb2RlLAorCQlzaXplb2Yoc3Ry dWN0IHJhZGVvbl9wbV9jbG9ja19pbmZvKSk7CisJcmRldi0+cG0uY3VycmVudF9wY2llX2xhbmVz ID0KKwkJcmRldi0+cG0uZGVmYXVsdF9wb3dlcl9zdGF0ZS0+bm9uX2Nsb2NrX2luZm8ucGNpZV9s YW5lczsKIH0KIAogdm9pZCByYWRlb25fYXRvbV9zZXRfY2xvY2tfZ2F0aW5nKHN0cnVjdCByYWRl b25fZGV2aWNlICpyZGV2LCBpbnQgZW5hYmxlKQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L3JhZGVvbi9yYWRlb25fY29tYmlvcy5jIGIvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25f Y29tYmlvcy5jCmluZGV4IDk5ODlkMjIuLmVmYzE5MGUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9yYWRlb24vcmFkZW9uX2NvbWJpb3MuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9u L3JhZGVvbl9jb21iaW9zLmMKQEAgLTIzNTgsNyArMjM1OCw2IEBAIHZvaWQgcmFkZW9uX2NvbWJp b3NfZ2V0X3Bvd2VyX21vZGVzKHN0cnVjdCByYWRlb25fZGV2aWNlICpyZGV2KQogCWludCBzdGF0 ZV9pbmRleCA9IDA7CiAKIAlyZGV2LT5wbS5kZWZhdWx0X3Bvd2VyX3N0YXRlID0gTlVMTDsKLQly ZGV2LT5wbS5jdXJyZW50X3Bvd2VyX3N0YXRlID0gTlVMTDsKIAogCWlmIChyZGV2LT5mbGFncyAm IFJBREVPTl9JU19NT0JJTElUWSkgewogCQlvZmZzZXQgPSBjb21iaW9zX2dldF90YWJsZV9vZmZz ZXQoZGV2LCBDT01CSU9TX1BPV0VSUExBWV9JTkZPX1RBQkxFKTsKQEAgLTI0NDcsMTUgKzI0NDYs MTkgQEAgZGVmYXVsdF9tb2RlOgogCXJkZXYtPnBtLnBvd2VyX3N0YXRlW3N0YXRlX2luZGV4XS5j bG9ja19pbmZvWzBdLm1jbGsgPSByZGV2LT5jbG9jay5kZWZhdWx0X21jbGs7CiAJcmRldi0+cG0u cG93ZXJfc3RhdGVbc3RhdGVfaW5kZXhdLmNsb2NrX2luZm9bMF0uc2NsayA9IHJkZXYtPmNsb2Nr LmRlZmF1bHRfc2NsazsKIAlyZGV2LT5wbS5wb3dlcl9zdGF0ZVtzdGF0ZV9pbmRleF0uZGVmYXVs dF9jbG9ja19tb2RlID0gJnJkZXYtPnBtLnBvd2VyX3N0YXRlW3N0YXRlX2luZGV4XS5jbG9ja19p bmZvWzBdOwotCXJkZXYtPnBtLnBvd2VyX3N0YXRlW3N0YXRlX2luZGV4XS5jdXJyZW50X2Nsb2Nr X21vZGUgPSAmcmRldi0+cG0ucG93ZXJfc3RhdGVbc3RhdGVfaW5kZXhdLmNsb2NrX2luZm9bMF07 CiAJcmRldi0+cG0ucG93ZXJfc3RhdGVbc3RhdGVfaW5kZXhdLmNsb2NrX2luZm9bMF0udm9sdGFn ZS50eXBlID0gVk9MVEFHRV9OT05FOwogCWlmIChyZGV2LT5hc2ljLT5nZXRfcGNpZV9sYW5lcykK IAkJcmRldi0+cG0ucG93ZXJfc3RhdGVbc3RhdGVfaW5kZXhdLm5vbl9jbG9ja19pbmZvLnBjaWVf bGFuZXMgPSByYWRlb25fZ2V0X3BjaWVfbGFuZXMocmRldik7CiAJZWxzZQogCQlyZGV2LT5wbS5w b3dlcl9zdGF0ZVtzdGF0ZV9pbmRleF0ubm9uX2Nsb2NrX2luZm8ucGNpZV9sYW5lcyA9IDE2Owog CXJkZXYtPnBtLmRlZmF1bHRfcG93ZXJfc3RhdGUgPSAmcmRldi0+cG0ucG93ZXJfc3RhdGVbc3Rh dGVfaW5kZXhdOwotCXJkZXYtPnBtLmN1cnJlbnRfcG93ZXJfc3RhdGUgPSAmcmRldi0+cG0ucG93 ZXJfc3RhdGVbc3RhdGVfaW5kZXhdOwogCXJkZXYtPnBtLm51bV9wb3dlcl9zdGF0ZXMgPSBzdGF0 ZV9pbmRleCArIDE7CisKKwltZW1jcHkoKHVuc2lnbmVkIGNoYXIgKikmcmRldi0+cG0uY3VycmVu dF9jbG9ja19tb2RlLAorCQkodW5zaWduZWQgY2hhciAqKXJkZXYtPnBtLmRlZmF1bHRfcG93ZXJf c3RhdGUtPmRlZmF1bHRfY2xvY2tfbW9kZSwKKwkJc2l6ZW9mKHN0cnVjdCByYWRlb25fcG1fY2xv Y2tfaW5mbykpOworCXJkZXYtPnBtLmN1cnJlbnRfcGNpZV9sYW5lcyA9CisJCXJkZXYtPnBtLmRl ZmF1bHRfcG93ZXJfc3RhdGUtPm5vbl9jbG9ja19pbmZvLnBjaWVfbGFuZXM7CiB9CiAKIHZvaWQg cmFkZW9uX2V4dGVybmFsX3RtZHNfc2V0dXAoc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyKQpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fcG0uYyBiL2RyaXZlcnMv Z3B1L2RybS9yYWRlb24vcmFkZW9uX3BtLmMKaW5kZXggNTIwMTk3Zi4uODQyNmFmZiAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fcG0uYworKysgYi9kcml2ZXJzL2dw dS9kcm0vcmFkZW9uL3JhZGVvbl9wbS5jCkBAIC0xNjIsNTEgKzE2Miw2MSBAQCBzdGF0aWMgc3Ry dWN0IHJhZGVvbl9wbV9jbG9ja19pbmZvICogcmFkZW9uX3BpY2tfY2xvY2tfbW9kZShzdHJ1Y3Qg cmFkZW9uX2RldmljZQogc3RhdGljIHZvaWQgcmFkZW9uX2dldF9wb3dlcl9zdGF0ZShzdHJ1Y3Qg cmFkZW9uX2RldmljZSAqcmRldiwKIAkJCQkgICBlbnVtIHJhZGVvbl9wbV9hY3Rpb24gYWN0aW9u KQogeworCXN0cnVjdCByYWRlb25fcG93ZXJfc3RhdGUgKnJlcXVlc3RlZF9wb3dlcl9zdGF0ZTsK KwlzdHJ1Y3QgcmFkZW9uX3BtX2Nsb2NrX2luZm8gKnJlcXVlc3RlZF9jbG9ja19tb2RlOworCiAJ c3dpdGNoIChhY3Rpb24pIHsKLQljYXNlIFBNX0FDVElPTl9OT05FOgotCWRlZmF1bHQ6Ci0JCXJk ZXYtPnBtLnJlcXVlc3RlZF9wb3dlcl9zdGF0ZSA9IHJkZXYtPnBtLmN1cnJlbnRfcG93ZXJfc3Rh dGU7Ci0JCXJkZXYtPnBtLnJlcXVlc3RlZF9wb3dlcl9zdGF0ZS0+cmVxdWVzdGVkX2Nsb2NrX21v ZGUgPQotCQkJcmRldi0+cG0ucmVxdWVzdGVkX3Bvd2VyX3N0YXRlLT5jdXJyZW50X2Nsb2NrX21v ZGU7Ci0JCWJyZWFrOwogCWNhc2UgUE1fQUNUSU9OX01JTklNVU06Ci0JCXJkZXYtPnBtLnJlcXVl c3RlZF9wb3dlcl9zdGF0ZSA9IHJhZGVvbl9waWNrX3Bvd2VyX3N0YXRlKHJkZXYsIFBPV0VSX1NU QVRFX1RZUEVfQkFUVEVSWSk7Ci0JCXJkZXYtPnBtLnJlcXVlc3RlZF9wb3dlcl9zdGF0ZS0+cmVx dWVzdGVkX2Nsb2NrX21vZGUgPQotCQkJcmFkZW9uX3BpY2tfY2xvY2tfbW9kZShyZGV2LCByZGV2 LT5wbS5yZXF1ZXN0ZWRfcG93ZXJfc3RhdGUsIFBPV0VSX01PREVfVFlQRV9MT1cpOworCQlyZXF1 ZXN0ZWRfcG93ZXJfc3RhdGUgPSByYWRlb25fcGlja19wb3dlcl9zdGF0ZShyZGV2LCBQT1dFUl9T VEFURV9UWVBFX0JBVFRFUlkpOworCQlyZXF1ZXN0ZWRfY2xvY2tfbW9kZSA9IHJhZGVvbl9waWNr X2Nsb2NrX21vZGUocmRldiwgcmVxdWVzdGVkX3Bvd2VyX3N0YXRlLCBQT1dFUl9NT0RFX1RZUEVf TE9XKTsKIAkJYnJlYWs7CiAJY2FzZSBQTV9BQ1RJT05fRE9XTkNMT0NLOgotCQlyZGV2LT5wbS5y ZXF1ZXN0ZWRfcG93ZXJfc3RhdGUgPSByYWRlb25fcGlja19wb3dlcl9zdGF0ZShyZGV2LCBQT1dF Ul9TVEFURV9UWVBFX1BPV0VSU0FWRSk7Ci0JCXJkZXYtPnBtLnJlcXVlc3RlZF9wb3dlcl9zdGF0 ZS0+cmVxdWVzdGVkX2Nsb2NrX21vZGUgPQotCQkJcmFkZW9uX3BpY2tfY2xvY2tfbW9kZShyZGV2 LCByZGV2LT5wbS5yZXF1ZXN0ZWRfcG93ZXJfc3RhdGUsIFBPV0VSX01PREVfVFlQRV9NSUQpOwor CQlyZXF1ZXN0ZWRfcG93ZXJfc3RhdGUgPSByYWRlb25fcGlja19wb3dlcl9zdGF0ZShyZGV2LCBQ T1dFUl9TVEFURV9UWVBFX1BPV0VSU0FWRSk7CisJCXJlcXVlc3RlZF9jbG9ja19tb2RlID0gcmFk ZW9uX3BpY2tfY2xvY2tfbW9kZShyZGV2LCByZXF1ZXN0ZWRfcG93ZXJfc3RhdGUsIFBPV0VSX01P REVfVFlQRV9NSUQpOwogCQlicmVhazsKIAljYXNlIFBNX0FDVElPTl9VUENMT0NLOgotCQlyZGV2 LT5wbS5yZXF1ZXN0ZWRfcG93ZXJfc3RhdGUgPSByYWRlb25fcGlja19wb3dlcl9zdGF0ZShyZGV2 LCBQT1dFUl9TVEFURV9UWVBFX0RFRkFVTFQpOwotCQlyZGV2LT5wbS5yZXF1ZXN0ZWRfcG93ZXJf c3RhdGUtPnJlcXVlc3RlZF9jbG9ja19tb2RlID0KLQkJCXJhZGVvbl9waWNrX2Nsb2NrX21vZGUo cmRldiwgcmRldi0+cG0ucmVxdWVzdGVkX3Bvd2VyX3N0YXRlLCBQT1dFUl9NT0RFX1RZUEVfSElH SCk7CisJCXJlcXVlc3RlZF9wb3dlcl9zdGF0ZSA9IHJhZGVvbl9waWNrX3Bvd2VyX3N0YXRlKHJk ZXYsIFBPV0VSX1NUQVRFX1RZUEVfREVGQVVMVCk7CisJCXJlcXVlc3RlZF9jbG9ja19tb2RlID0g cmFkZW9uX3BpY2tfY2xvY2tfbW9kZShyZGV2LCByZXF1ZXN0ZWRfcG93ZXJfc3RhdGUsIFBPV0VS X01PREVfVFlQRV9ISUdIKTsKIAkJYnJlYWs7CisJY2FzZSBQTV9BQ1RJT05fTk9ORToKKwlkZWZh dWx0OgorCQlEUk1fRVJST1IoIlRyeWluZyB0byBnZXQgcG93ZXIgc3RhdGUgZm9yIG5vdCBkZWZp bmVkIGFjdGlvbiFcbiIpOworCQlyZXR1cm47CiAJfQotCURSTV9JTkZPKCJSZXF1ZXN0ZWQ6IGU6 ICVkIG06ICVkIHA6ICVkXG4iLAotCQkgcmRldi0+cG0ucmVxdWVzdGVkX3Bvd2VyX3N0YXRlLT5y ZXF1ZXN0ZWRfY2xvY2tfbW9kZS0+c2NsaywKLQkJIHJkZXYtPnBtLnJlcXVlc3RlZF9wb3dlcl9z dGF0ZS0+cmVxdWVzdGVkX2Nsb2NrX21vZGUtPm1jbGssCi0JCSByZGV2LT5wbS5yZXF1ZXN0ZWRf cG93ZXJfc3RhdGUtPm5vbl9jbG9ja19pbmZvLnBjaWVfbGFuZXMpOworCisJbWVtY3B5KCh1bnNp Z25lZCBjaGFyICopJnJkZXYtPnBtLnJlcXVlc3RlZF9jbG9ja19tb2RlLAorCQkodW5zaWduZWQg Y2hhciAqKXJlcXVlc3RlZF9jbG9ja19tb2RlLAorCQlzaXplb2Yoc3RydWN0IHJhZGVvbl9wbV9j bG9ja19pbmZvKSk7CisJcmRldi0+cG0ucmVxdWVzdGVkX3BjaWVfbGFuZXMgPQorCQlyZXF1ZXN0 ZWRfcG93ZXJfc3RhdGUtPm5vbl9jbG9ja19pbmZvLnBjaWVfbGFuZXM7CisKKwlEUk1fSU5GTygi UmVxdWVzdGVkOiBlbmc6ICVkOyBtZW06ICVkOyBsYW5lczogJWRcbiIsCisJCSByZGV2LT5wbS5y ZXF1ZXN0ZWRfY2xvY2tfbW9kZS5zY2xrLAorCQkgcmRldi0+cG0ucmVxdWVzdGVkX2Nsb2NrX21v ZGUubWNsaywKKwkJIHJkZXYtPnBtLnJlcXVlc3RlZF9wY2llX2xhbmVzKTsKIH0KIAogc3RhdGlj IHZvaWQgcmFkZW9uX3NldF9wb3dlcl9zdGF0ZShzdHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldikK IHsKLQlpZiAocmRldi0+cG0ucmVxdWVzdGVkX3Bvd2VyX3N0YXRlID09IHJkZXYtPnBtLmN1cnJl bnRfcG93ZXJfc3RhdGUpCi0JCXJldHVybjsKKwlzdHJ1Y3QgcmFkZW9uX3BtX2Nsb2NrX2luZm8g KnJlcSA9ICZyZGV2LT5wbS5yZXF1ZXN0ZWRfY2xvY2tfbW9kZTsKKwlzdHJ1Y3QgcmFkZW9uX3Bt X2Nsb2NrX2luZm8gKmN1cnIgPSAmcmRldi0+cG0uY3VycmVudF9jbG9ja19tb2RlOworCisJLypE Uk1fSU5GTygiQ3VycmVudDogZW5nOiAlZDsgbWVtOiAlZDsgbGFuZXM6ICVkXG4iLAorCQkgY3Vy ci0+c2NsaywgY3Vyci0+bWNsaywgcmRldi0+cG0uY3VycmVudF9wY2llX2xhbmVzKTsqLworCisJ RFJNX0lORk8oIlNldHRpbmc6IGVuZzogJWQ7IG1lbTogJWQ7IGxhbmVzOiAlZFxuIiwKKwkJIHJl cS0+c2NsaywgcmVxLT5tY2xrLCByZGV2LT5wbS5yZXF1ZXN0ZWRfcGNpZV9sYW5lcyk7CiAKLQlE Uk1fSU5GTygiU2V0dGluZzogZTogJWQgbTogJWQgcDogJWRcbiIsCi0JCSByZGV2LT5wbS5yZXF1 ZXN0ZWRfcG93ZXJfc3RhdGUtPnJlcXVlc3RlZF9jbG9ja19tb2RlLT5zY2xrLAotCQkgcmRldi0+ cG0ucmVxdWVzdGVkX3Bvd2VyX3N0YXRlLT5yZXF1ZXN0ZWRfY2xvY2tfbW9kZS0+bWNsaywKLQkJ IHJkZXYtPnBtLnJlcXVlc3RlZF9wb3dlcl9zdGF0ZS0+bm9uX2Nsb2NrX2luZm8ucGNpZV9sYW5l cyk7CiAJLyogc2V0IHBjaWUgbGFuZXMgKi8KIAkvKiBzZXQgdm9sdGFnZSAqLworCiAJLyogc2V0 IGVuZ2luZSBjbG9jayAqLwotCXJhZGVvbl9zZXRfZW5naW5lX2Nsb2NrKHJkZXYsIHJkZXYtPnBt LnJlcXVlc3RlZF9wb3dlcl9zdGF0ZS0+cmVxdWVzdGVkX2Nsb2NrX21vZGUtPnNjbGspOwotCS8q IHNldCBtZW1vcnkgY2xvY2sgKi8KKwlpZiAocmVxLT5zY2xrICE9IGN1cnItPnNjbGspIHsKKwkJ cmFkZW9uX3NldF9lbmdpbmVfY2xvY2socmRldiwgcmVxLT5zY2xrKTsKKwkJY3Vyci0+c2NsayA9 IHJlcS0+c2NsazsKKwl9CiAKLQlyZGV2LT5wbS5jdXJyZW50X3Bvd2VyX3N0YXRlID0gcmRldi0+ cG0ucmVxdWVzdGVkX3Bvd2VyX3N0YXRlOworCS8qIHNldCBtZW1vcnkgY2xvY2sgKi8KIH0KIAog aW50IHJhZGVvbl9wbV9pbml0KHN0cnVjdCByYWRlb25fZGV2aWNlICpyZGV2KQotLSAKMS42LjQu MgoKCi0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQpTT0xBUklTIDEwIGlzIHRoZSBPUyBmb3IgRGF0YSBD ZW50ZXJzIC0gcHJvdmlkZXMgZmVhdHVyZXMgc3VjaCBhcyBEVHJhY2UsClByZWRpY3RpdmUgU2Vs ZiBIZWFsaW5nIGFuZCBBd2FyZCBXaW5uaW5nIFpGUy4gR2V0IFNvbGFyaXMgMTAgTk9XCmh0dHA6 Ly9wLnNmLm5ldC9zZnUvc29sYXJpcy1kZXYyZGV2Ci0tCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCkRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKRHJpLWRldmVs QGxpc3RzLnNvdXJjZWZvcmdlLm5ldApodHRwczovL2xpc3RzLnNvdXJjZWZvcmdlLm5ldC9saXN0 cy9saXN0aW5mby9kcmktZGV2ZWwK