From mboxrd@z Thu Jan  1 00:00:00 1970
From: ville.syrjala@linux.intel.com
Subject: [PATCH 10/11] drm/i915: Move VLV cmnlane workaround to
	intel_power_domains_init_hw()
Date: Fri, 13 Jun 2014 13:37:56 +0300
Message-ID: <1402655877-6460-11-git-send-email-ville.syrjala@linux.intel.com>
References: <1402655877-6460-1-git-send-email-ville.syrjala@linux.intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga03.intel.com (mga03.intel.com [143.182.124.21])
 by gabe.freedesktop.org (Postfix) with ESMTP id 6E7226E31E
 for <intel-gfx@lists.freedesktop.org>; Fri, 13 Jun 2014 03:38:32 -0700 (PDT)
In-Reply-To: <1402655877-6460-1-git-send-email-ville.syrjala@linux.intel.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCk5v
dyB0aGF0IHRoZSBDTU5SRVNFVCBkZWFzc2VydCBpcyBwYXJ0IG9mIHRoZSBjbW5sYW5lIHBvd2Vy
IHdlbGwsCmludGVsX3Jlc2V0X2RwaW8oKSBpcyBjYWxsZWQgdG9vIGxhdGUgdG8gbWFrZSBhbnkg
ZGlmZmVyZW5jZS4gV2UndmUKZGVhc3NlcnRlZCBDTU5SRVNFVCBieSB0aGF0IHRpbWUsIGFuZCBz
byB0aGUgb2ZmK29uIHRvZ2dsZSB3L2Egd2lsbApuZXZlciBraWNrIGluLgoKTW92ZSB0aGUgd29y
a2Fyb3VuZCB0byBpbnRlbF9wb3dlcl9kb21haW5zX2luaXRfaHcoKSB3aGVyZSBpdCBnZXRzCmNh
bGxlZCBiZWZvcmUgd2UgZW5hYmxlIHRoZSBpbml0IHBvd2VyIGRvbWFpbi4KClNpZ25lZC1vZmYt
Ynk6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Ci0tLQog
ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgMjMgLS0tLS0tLS0tLS0tLQog
ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggICAgIHwgIDMgKy0KIGRyaXZlcnMvZ3B1
L2RybS9pOTE1L2ludGVsX3BtLmMgICAgICB8IDY3ICsrKysrKysrKysrKysrKysrKysrKysrKysr
KysrKy0tLS0tLQogMyBmaWxlcyBjaGFuZ2VkLCA1OCBpbnNlcnRpb25zKCspLCAzNSBkZWxldGlv
bnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMg
Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggMzNjYzIxMy4uYmNk
MzIzMjIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwor
KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTE1MDgsOSArMTUw
OCw2IEBAIHN0YXRpYyB2b2lkIGludGVsX3Jlc2V0X2RwaW8oc3RydWN0IGRybV9kZXZpY2UgKmRl
dikKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2
YXRlOwogCi0JaWYgKCFJU19WQUxMRVlWSUVXKGRldikpCi0JCXJldHVybjsKLQogCWlmIChJU19D
SEVSUllWSUVXKGRldikpIHsKIAkJZW51bSBkcGlvX3BoeSBwaHk7CiAJCXUzMiB2YWw7CkBAIC0x
NTMyLDI2ICsxNTI5LDYgQEAgc3RhdGljIHZvaWQgaW50ZWxfcmVzZXRfZHBpbyhzdHJ1Y3QgZHJt
X2RldmljZSAqZGV2KQogCQkJSTkxNV9XUklURShESVNQTEFZX1BIWV9DT05UUk9MLAogCQkJCVBI
WV9DT01fTEFORV9SRVNFVF9ERUFTU0VSVChwaHksIHZhbCkpOwogCQl9Ci0KLQl9IGVsc2Ugewot
CQkvKgotCQkgKiBJZiBEUElPIGhhcyBhbHJlYWR5IGJlZW4gcmVzZXQsIGUuZy4gYnkgQklPUywg
anVzdCBza2lwIGFsbAotCQkgKiB0aGlzLgotCQkgKi8KLQkJaWYgKEk5MTVfUkVBRChEUElPX0NU
TCkgJiBEUElPX0NNTlJTVCkKLQkJCXJldHVybjsKLQotCQkvKgotCQkgKiBGcm9tIFZMVjJBMF9E
UF9lRFBfSERNSV9EUElPX2RyaXZlcl92Ymlvc19ub3Rlc18xMS5kb2N4OgotCQkgKiBOZWVkIHRv
IGFzc2VydCBhbmQgZGUtYXNzZXJ0IFBIWSBTQiByZXNldCBieSBnYXRpbmcgdGhlCi0JCSAqIGNv
bW1vbiBsYW5lIHBvd2VyLCB0aGVuIHVuLWdhdGluZyBpdC4KLQkJICogU2ltcGx5IHVuZ2F0aW5n
IGlzbid0IGVub3VnaCB0byByZXNldCB0aGUgUEhZIGVub3VnaCB0byBnZXQKLQkJICogcG9ydHMg
YW5kIGxhbmVzIHJ1bm5pbmcuCi0JCSAqLwotCQlfX3Zsdl9zZXRfcG93ZXJfd2VsbChkZXZfcHJp
diwgUFVOSVRfUE9XRVJfV0VMTF9EUElPX0NNTl9CQywKLQkJCQkgICAgIGZhbHNlKTsKLQkJX192
bHZfc2V0X3Bvd2VyX3dlbGwoZGV2X3ByaXYsIFBVTklUX1BPV0VSX1dFTExfRFBJT19DTU5fQkMs
Ci0JCQkJICAgICB0cnVlKTsKIAl9CiB9CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p
OTE1L2ludGVsX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXgg
NTc0MGJlMC4uZTU2NTkwNiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf
ZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAgLTk3MCw4ICs5
NzAsNyBAQCB2b2lkIGludGVsX3J1bnRpbWVfcG1fcHV0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRl
ICpkZXZfcHJpdik7CiB2b2lkIGludGVsX2luaXRfcnVudGltZV9wbShzdHJ1Y3QgZHJtX2k5MTVf
cHJpdmF0ZSAqZGV2X3ByaXYpOwogdm9pZCBpbnRlbF9maW5pX3J1bnRpbWVfcG0oc3RydWN0IGRy
bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKIHZvaWQgaWxrX3dtX2dldF9od19zdGF0ZShzdHJ1
Y3QgZHJtX2RldmljZSAqZGV2KTsKLXZvaWQgX192bHZfc2V0X3Bvd2VyX3dlbGwoc3RydWN0IGRy
bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAotCQkJICBlbnVtIHB1bml0X3Bvd2VyX3dlbGwgcG93
ZXJfd2VsbF9pZCwgYm9vbCBlbmFibGUpOworCiAKIC8qIGludGVsX3Nkdm8uYyAqLwogYm9vbCBp
bnRlbF9zZHZvX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdWludDMyX3Qgc2R2b19yZWcs
IGJvb2wgaXNfc2R2b2IpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf
cG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKaW5kZXggZTlhODU2NS4uZDhl
MjBkMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYworKysgYi9k
cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCkBAIC01OTYyLDkgKzU5NjIsMTAgQEAgc3Rh
dGljIGJvb2wgaTl4eF9hbHdheXNfb25fcG93ZXJfd2VsbF9lbmFibGVkKHN0cnVjdCBkcm1faTkx
NV9wcml2YXRlICpkZXZfcHJpdiwKIAlyZXR1cm4gdHJ1ZTsKIH0KIAotdm9pZCBfX3Zsdl9zZXRf
cG93ZXJfd2VsbChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCi0JCQkgIGVudW0g
cHVuaXRfcG93ZXJfd2VsbCBwb3dlcl93ZWxsX2lkLCBib29sIGVuYWJsZSkKK3N0YXRpYyB2b2lk
IHZsdl9zZXRfcG93ZXJfd2VsbChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCisJ
CQkgICAgICAgc3RydWN0IGk5MTVfcG93ZXJfd2VsbCAqcG93ZXJfd2VsbCwgYm9vbCBlbmFibGUp
CiB7CisJZW51bSBwdW5pdF9wb3dlcl93ZWxsIHBvd2VyX3dlbGxfaWQgPSBwb3dlcl93ZWxsLT5k
YXRhOwogCXUzMiBtYXNrOwogCXUzMiBzdGF0ZTsKIAl1MzIgY3RybDsKQEAgLTU5OTcsMTQgKzU5
OTgsNiBAQCBvdXQ6CiAJbXV0ZXhfdW5sb2NrKCZkZXZfcHJpdi0+cnBzLmh3X2xvY2spOwogfQog
Ci1zdGF0aWMgdm9pZCB2bHZfc2V0X3Bvd2VyX3dlbGwoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg
KmRldl9wcml2LAotCQkJICAgICAgIHN0cnVjdCBpOTE1X3Bvd2VyX3dlbGwgKnBvd2VyX3dlbGws
IGJvb2wgZW5hYmxlKQotewotCWVudW0gcHVuaXRfcG93ZXJfd2VsbCBwb3dlcl93ZWxsX2lkID0g
cG93ZXJfd2VsbC0+ZGF0YTsKLQotCV9fdmx2X3NldF9wb3dlcl93ZWxsKGRldl9wcml2LCBwb3dl
cl93ZWxsX2lkLCBlbmFibGUpOwotfQotCiBzdGF0aWMgdm9pZCB2bHZfcG93ZXJfd2VsbF9zeW5j
X2h3KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCQkgICBzdHJ1Y3QgaTkx
NV9wb3dlcl93ZWxsICpwb3dlcl93ZWxsKQogewpAQCAtNjQzNSw2ICs2NDI4LDIxIEBAIHN0YXRp
YyBzdHJ1Y3QgaTkxNV9wb3dlcl93ZWxsIHZsdl9wb3dlcl93ZWxsc1tdID0gewogCX0sCiB9Owog
CitzdGF0aWMgc3RydWN0IGk5MTVfcG93ZXJfd2VsbCAqbG9va3VwX3Bvd2VyX3dlbGwoc3RydWN0
IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAorCQkJCQkJIGVudW0gcHVuaXRfcG93ZXJfd2Vs
bCBwb3dlcl93ZWxsX2lkKQoreworCXN0cnVjdCBpOTE1X3Bvd2VyX2RvbWFpbnMgKnBvd2VyX2Rv
bWFpbnMgPSAmZGV2X3ByaXYtPnBvd2VyX2RvbWFpbnM7CisJc3RydWN0IGk5MTVfcG93ZXJfd2Vs
bCAqcG93ZXJfd2VsbDsKKwlpbnQgaTsKKworCWZvcl9lYWNoX3Bvd2VyX3dlbGwoaSwgcG93ZXJf
d2VsbCwgUE9XRVJfRE9NQUlOX01BU0ssIHBvd2VyX2RvbWFpbnMpIHsKKwkJaWYgKHBvd2VyX3dl
bGwtPmRhdGEgPT0gcG93ZXJfd2VsbF9pZCkKKwkJCXJldHVybiBwb3dlcl93ZWxsOworCX0KKwor
CXJldHVybiBOVUxMOworfQorCiAjZGVmaW5lIHNldF9wb3dlcl93ZWxscyhwb3dlcl9kb21haW5z
LCBfX3Bvd2VyX3dlbGxzKSAoewkJXAogCShwb3dlcl9kb21haW5zKS0+cG93ZXJfd2VsbHMgPSAo
X19wb3dlcl93ZWxscyk7CQkJXAogCShwb3dlcl9kb21haW5zKS0+cG93ZXJfd2VsbF9jb3VudCA9
IEFSUkFZX1NJWkUoX19wb3dlcl93ZWxscyk7CVwKQEAgLTY0ODIsMTEgKzY0OTAsNTAgQEAgc3Rh
dGljIHZvaWQgaW50ZWxfcG93ZXJfZG9tYWluc19yZXN1bWUoc3RydWN0IGRybV9pOTE1X3ByaXZh
dGUgKmRldl9wcml2KQogCW11dGV4X3VubG9jaygmcG93ZXJfZG9tYWlucy0+bG9jayk7CiB9CiAK
K3N0YXRpYyB2b2lkIHZsdl9jbW5sYW5lX3dhKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf
cHJpdikKK3sKKwlzdHJ1Y3QgaTkxNV9wb3dlcl93ZWxsICpjbW4gPQorCQlsb29rdXBfcG93ZXJf
d2VsbChkZXZfcHJpdiwgUFVOSVRfUE9XRVJfV0VMTF9EUElPX0NNTl9CQyk7CisJc3RydWN0IGk5
MTVfcG93ZXJfd2VsbCAqZGlzcDJkID0KKwkJbG9va3VwX3Bvd2VyX3dlbGwoZGV2X3ByaXYsIFBV
TklUX1BPV0VSX1dFTExfRElTUDJEKTsKKworCS8qIG5vdGhpbmcgdG8gZG8gaWYgY29tbW9uIGxh
bmUgaXMgYWxyZWFkeSBvZmYgKi8KKwlpZiAoIWNtbi0+b3BzLT5pc19lbmFibGVkKGRldl9wcml2
LCBjbW4pKQorCQlyZXR1cm47CisKKwkvKiBJZiB0aGUgZGlzcGxheSBtaWdodCBiZSBhbHJlYWR5
IGFjdGl2ZSBza2lwIHRoaXMgKi8KKwlpZiAoZGlzcDJkLT5vcHMtPmlzX2VuYWJsZWQoZGV2X3By
aXYsIGRpc3AyZCkgJiYKKwkgICAgSTkxNV9SRUFEKERQSU9fQ1RMKSAmIERQSU9fQ01OUlNUKQor
CQlyZXR1cm47CisKKwlEUk1fREVCVUdfS01TKCJ0b2dnbGluZyBkaXNwbGF5IFBIWSBzaWRlIHJl
c2V0XG4iKTsKKworCS8qIGNtbmxhbmUgbmVlZHMgRFBMTCByZWdpc3RlcnMgKi8KKwlkaXNwMmQt
Pm9wcy0+ZW5hYmxlKGRldl9wcml2LCBkaXNwMmQpOworCisJLyoKKwkgKiBGcm9tIFZMVjJBMF9E
UF9lRFBfSERNSV9EUElPX2RyaXZlcl92Ymlvc19ub3Rlc18xMS5kb2N4OgorCSAqIE5lZWQgdG8g
YXNzZXJ0IGFuZCBkZS1hc3NlcnQgUEhZIFNCIHJlc2V0IGJ5IGdhdGluZyB0aGUKKwkgKiBjb21t
b24gbGFuZSBwb3dlciwgdGhlbiB1bi1nYXRpbmcgaXQuCisJICogU2ltcGx5IHVuZ2F0aW5nIGlz
bid0IGVub3VnaCB0byByZXNldCB0aGUgUEhZIGVub3VnaCB0byBnZXQKKwkgKiBwb3J0cyBhbmQg
bGFuZXMgcnVubmluZy4KKwkgKi8KKwljbW4tPm9wcy0+ZGlzYWJsZShkZXZfcHJpdiwgY21uKTsK
K30KKwogdm9pZCBpbnRlbF9wb3dlcl9kb21haW5zX2luaXRfaHcoc3RydWN0IGRybV9pOTE1X3By
aXZhdGUgKmRldl9wcml2KQogeworCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBkZXZfcHJpdi0+
ZGV2OwogCXN0cnVjdCBpOTE1X3Bvd2VyX2RvbWFpbnMgKnBvd2VyX2RvbWFpbnMgPSAmZGV2X3By
aXYtPnBvd2VyX2RvbWFpbnM7CiAKIAlwb3dlcl9kb21haW5zLT5pbml0aWFsaXppbmcgPSB0cnVl
OworCisJaWYgKElTX1ZBTExFWVZJRVcoZGV2KSAmJiAhSVNfQ0hFUlJZVklFVyhkZXYpKSB7CisJ
CW11dGV4X2xvY2soJnBvd2VyX2RvbWFpbnMtPmxvY2spOworCQl2bHZfY21ubGFuZV93YShkZXZf
cHJpdik7CisJCW11dGV4X3VubG9jaygmcG93ZXJfZG9tYWlucy0+bG9jayk7CisJfQorCiAJLyog
Rm9yIG5vdywgd2UgbmVlZCB0aGUgcG93ZXIgd2VsbCB0byBiZSBhbHdheXMgZW5hYmxlZC4gKi8K
IAlpbnRlbF9kaXNwbGF5X3NldF9pbml0X3Bvd2VyKGRldl9wcml2LCB0cnVlKTsKIAlpbnRlbF9w
b3dlcl9kb21haW5zX3Jlc3VtZShkZXZfcHJpdik7Ci0tIAoxLjguNS41CgpfX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0
CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9w
Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=