From: Ander Conselvan de Oliveira Subject: [PATCH 4/4] drm/i915: Simplify pll state commit by swapping new and old state Date: Thu, 29 Jan 2015 16:55:11 +0200 Message-ID: <1422543311-5107-4-git-send-email-ander.conselvan.de.oliveira@intel.com> References: <1422543311-5107-1-git-send-email-ander.conselvan.de.oliveira@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 3DDFF6E797 for ; Thu, 29 Jan 2015 06:56:10 -0800 (PST) In-Reply-To: <1422543311-5107-1-git-send-email-ander.conselvan.de.oliveira@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: Ander Conselvan de Oliveira List-Id: intel-gfx@lists.freedesktop.org VGhpcyBkZWxldGVzIHNvbWUgY29kZSBhbmQgaXMgY2xvc2VyIHRvIHdoYXQgdGhlIGxvZ2ljIHdp bGwgbG9vayBsaWtlCndpdGggYXRvbWljIG1vZGUgc2V0dGluZy4KClNpZ25lZC1vZmYtYnk6IEFu ZGVyIENvbnNlbHZhbiBkZSBPbGl2ZWlyYSA8YW5kZXIuY29uc2VsdmFuLmRlLm9saXZlaXJhQGlu dGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCA1OCAr KysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxMiBp bnNlcnRpb25zKCspLCA0NiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNw bGF5LmMKaW5kZXggZmVjZmZiYi4uOTYxNzZjMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rp c3BsYXkuYwpAQCAtMzk2Myw0NiArMzk2MywxMSBAQCBmb3VuZDoKIAlyZXR1cm4gcGxsOwogfQog Ci0vKioKLSAqIGludGVsX3NoYXJlZF9kcGxsX3N0YXJ0X2NvbmZpZyAtIHN0YXJ0IGEgbmV3IFBM TCBzdGFnZWQgY29uZmlnCi0gKiBAZGV2X3ByaXY6IERSTSBkZXZpY2UKLSAqIEBjbGVhcl9waXBl czogbWFzayBvZiBwaXBlcyB0aGF0IHdpbGwgaGF2ZSB0aGVpciBQTExzIGZyZWVkCi0gKgotICog U3RhcnRzIGEgbmV3IFBMTCBzdGFnZWQgY29uZmlnLCBjb3B5aW5nIHRoZSBjdXJyZW50IGNvbmZp ZyBidXQKLSAqIHJlbGVhc2luZyB0aGUgcmVmZXJlbmNlcyBvZiBwaXBlcyBzcGVjaWZpZWQgaW4g Y2xlYXJfcGlwZXMuCi0gKi8KLXN0YXRpYyBpbnQgaW50ZWxfc2hhcmVkX2RwbGxfc3RhcnRfY29u ZmlnKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKLQkJCQkJICBzdHJ1Y3QgaW50 ZWxfYXRvbWljX3N0YXRlICpzdGF0ZSwKLQkJCQkJICB1bnNpZ25lZCBjbGVhcl9waXBlcykKLXsK LQlzdHJ1Y3QgaW50ZWxfc2hhcmVkX2RwbGxfY29uZmlnICpwbGxfY29uZmlnOwotCWVudW0gaW50 ZWxfZHBsbF9pZCBpOwotCi0JLyogRklYTUU6IGNvbnZlcnQgdGhpcyB0byBhIHNpbXBsZSBtZW1k dXAgKi8KLQotCWZvciAoaSA9IDA7IGkgPCBkZXZfcHJpdi0+bnVtX3NoYXJlZF9kcGxsOyBpKysp IHsKLQkJcGxsX2NvbmZpZyA9ICZkZXZfcHJpdi0+ZGlzcGxheV9zdGF0ZS0+c2hhcmVkX2RwbGxb aV07Ci0KLQkJbWVtY3B5KCZzdGF0ZS0+c2hhcmVkX2RwbGxbaV0sIHBsbF9jb25maWcsCi0JCSAg ICAgICBzaXplb2YgKnBsbF9jb25maWcpOwotCQlzdGF0ZS0+c2hhcmVkX2RwbGxbaV0uY3J0Y19t YXNrICY9IH5jbGVhcl9waXBlczsKLQl9Ci0KLQlyZXR1cm4gMDsKLX0KLQotc3RhdGljIHZvaWQg aW50ZWxfc2hhcmVkX2RwbGxfY29tbWl0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diwKLQkJCQkgICAgIHN0cnVjdCBpbnRlbF9hdG9taWNfc3RhdGUgKnN0YXRlKQorc3RhdGljIHN0 cnVjdCBpbnRlbF9hdG9taWNfc3RhdGUgKgoraW50ZWxfYXRvbWljX3N0YXRlX2R1cGxpY2F0ZShz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7Ci0Jc3RydWN0IGludGVsX3NoYXJl ZF9kcGxsX2NvbmZpZyAqcGxsX2NvbmZpZzsKLQllbnVtIGludGVsX2RwbGxfaWQgaTsKLQotCS8q IEZJWE1FOiBjb252ZXJ0IHRoaXMgdG8gYSBwb2luZXIgc3dhcCAqLwotCi0JZm9yIChpID0gMDsg aSA8IGRldl9wcml2LT5udW1fc2hhcmVkX2RwbGw7IGkrKykgewotCQlwbGxfY29uZmlnID0gJmRl dl9wcml2LT5kaXNwbGF5X3N0YXRlLT5zaGFyZWRfZHBsbFtpXTsKLQkJKnBsbF9jb25maWcgPSBz dGF0ZS0+c2hhcmVkX2RwbGxbaV07Ci0JfQorCXJldHVybiBrbWVtZHVwKGRldl9wcml2LT5kaXNw bGF5X3N0YXRlLAorCQkgICAgICAgc2l6ZW9mICpkZXZfcHJpdi0+ZGlzcGxheV9zdGF0ZSwgR0ZQ X0tFUk5FTCk7CiB9CiAKIHN0YXRpYyB2b2lkIGNwdF92ZXJpZnlfbW9kZXNldChzdHJ1Y3QgZHJt X2RldmljZSAqZGV2LCBpbnQgcGlwZSkKQEAgLTEwNDA1LDE0ICsxMDM3MCwxNSBAQCBzdGF0aWMg Ym9vbCBpbnRlbF9jcnRjX2luX3VzZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAKIHN0YXRpYyB2 b2lkCiBpbnRlbF9tb2Rlc2V0X3VwZGF0ZV9zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1 bnNpZ25lZCBwcmVwYXJlX3BpcGVzLAotCQkJICAgc3RydWN0IGludGVsX2F0b21pY19zdGF0ZSAq c3RhdGUpCisJCQkgICBzdHJ1Y3QgaW50ZWxfYXRvbWljX3N0YXRlICoqc3RhdGUpCiB7CiAJc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1 Y3QgaW50ZWxfZW5jb2RlciAqaW50ZWxfZW5jb2RlcjsKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50 ZWxfY3J0YzsKIAlzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yOwogCi0JaW50ZWxfc2hh cmVkX2RwbGxfY29tbWl0KGRldl9wcml2LCBzdGF0ZSk7CisJLyogQ29tbWl0IFBMTCBhbmQgb3Ro ZXIgZ2xvYmFsIHN0YXRlICovCisJc3dhcChkZXZfcHJpdi0+ZGlzcGxheV9zdGF0ZSwgKnN0YXRl KTsKIAogCWZvcl9lYWNoX2ludGVsX2VuY29kZXIoZGV2LCBpbnRlbF9lbmNvZGVyKSB7CiAJCWlm ICghaW50ZWxfZW5jb2Rlci0+YmFzZS5jcnRjKQpAQCAtMTEwMjAsMTMgKzEwOTg2LDEzIEBAIHN0 YXRpYyBpbnQgX19pbnRlbF9zZXRfbW9kZV9zZXR1cF9wbGxzKHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYsCiAJdW5zaWduZWQgY2xlYXJfcGlwZXMgPSBtb2Rlc2V0X3BpcGVzIHwgZGlzYWJsZV9waXBl czsKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YzsKIAlpbnQgcmV0ID0gMDsKKwlpbnQg aTsKIAogCWlmICghZGV2X3ByaXYtPmRpc3BsYXkuY3J0Y19jb21wdXRlX2Nsb2NrKQogCQlyZXR1 cm4gMDsKIAotCXJldCA9IGludGVsX3NoYXJlZF9kcGxsX3N0YXJ0X2NvbmZpZyhkZXZfcHJpdiwg c3RhdGUsIGNsZWFyX3BpcGVzKTsKLQlpZiAocmV0KQotCQlyZXR1cm4gcmV0OworCWZvciAoaSA9 IDA7IGkgPCBkZXZfcHJpdi0+bnVtX3NoYXJlZF9kcGxsOyBpKyspCisJCXN0YXRlLT5zaGFyZWRf ZHBsbFtpXS5jcnRjX21hc2sgJj0gfmNsZWFyX3BpcGVzOwogCiAJZm9yX2VhY2hfaW50ZWxfY3J0 Y19tYXNrZWQoZGV2LCBtb2Rlc2V0X3BpcGVzLCBpbnRlbF9jcnRjKSB7CiAJCXN0cnVjdCBpbnRl bF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlID0gaW50ZWxfY3J0Yy0+bmV3X2NvbmZpZzsKQEAgLTEx MDc3LDcgKzExMDQzLDcgQEAgc3RhdGljIGludCBfX2ludGVsX3NldF9tb2RlKHN0cnVjdCBkcm1f Y3J0YyAqY3J0YywKIAkJcHJlcGFyZV9waXBlcyAmPSB+ZGlzYWJsZV9waXBlczsKIAl9CiAKLQlz dGF0ZSA9IGt6YWxsb2Moc2l6ZW9mICpzdGF0ZSwgR0ZQX0tFUk5FTCk7CisJc3RhdGUgPSBpbnRl bF9hdG9taWNfc3RhdGVfZHVwbGljYXRlKGRldl9wcml2KTsKIAlpZiAoIXN0YXRlKSB7CiAJCXJl dCA9IC1FTk9NRU07CiAJCWdvdG8gZG9uZTsKQEAgLTExMTIwLDcgKzExMDg2LDcgQEAgc3RhdGlj IGludCBfX2ludGVsX3NldF9tb2RlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAogCS8qIE9ubHkg YWZ0ZXIgZGlzYWJsaW5nIGFsbCBvdXRwdXQgcGlwZWxpbmVzIHRoYXQgd2lsbCBiZSBjaGFuZ2Vk IGNhbiB3ZQogCSAqIHVwZGF0ZSB0aGUgdGhlIG91dHB1dCBjb25maWd1cmF0aW9uLiAqLwotCWlu dGVsX21vZGVzZXRfdXBkYXRlX3N0YXRlKGRldiwgcHJlcGFyZV9waXBlcywgc3RhdGUpOworCWlu dGVsX21vZGVzZXRfdXBkYXRlX3N0YXRlKGRldiwgcHJlcGFyZV9waXBlcywgJnN0YXRlKTsKIAog CW1vZGVzZXRfdXBkYXRlX2NydGNfcG93ZXJfZG9tYWlucyhkZXYpOwogCi0tIAoyLjEuMAoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1h aWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK