From mboxrd@z Thu Jan  1 00:00:00 1970
From: ville.syrjala@linux.intel.com
Subject: [PATCH 2/7] drm/i915: Work around DISPLAY_PHY_CONTROL
	register corruption on CHV
Date: Fri, 10 Apr 2015 18:21:28 +0300
Message-ID: <1428679293-6208-3-git-send-email-ville.syrjala@linux.intel.com>
References: <1428679293-6208-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 mga11.intel.com (mga11.intel.com [192.55.52.93])
 by gabe.freedesktop.org (Postfix) with ESMTP id 361936E993
 for <intel-gfx@lists.freedesktop.org>; Fri, 10 Apr 2015 08:21:44 -0700 (PDT)
In-Reply-To: <1428679293-6208-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

RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClNv
bWV0aW1lcyAoZXhhY3RseSB3aGVuIGlzIGEgYml0IHVuY2xlYXIpIERJU1BMQVlfUEhZX0NPTlRS
T0wgYXBwZWFycyB0bwpnZXQgY29ycnVwdGVkLiBUaGUgdmFsdWVzIEkndmUgbWFuYWdlZCB0byBy
ZWFkIGZyb20gaXQgc2VlbSB0byBoYXZlIHNvbWUKcGF0dGVybiBidXQgdmFyeSBxdWl0ZSBhIGxv
dC4gVGhlIGNvcnJ1cHRpb24gZG9lc24ndCBzZWVtIHRvIGp1c3QgaGFwcGVuCndoZW4gdGhlIHJl
Z2lzdGVyIGlzIGFjY2Vzc2VkLCBidXQgY2FuIGFsc28gaGFwcGVuIHNwb250YW5lb3NseSBkdXJp
bmcKbW9kZXNldC4gV2hlbiB0aGlzIGhhcHBlbnMgZHVyaW5nIGEgbW9kZXNldCB0aGluZ3MgZ28g
c291dGggYW5kIHRoZQpkaXNwbGF5IGRvZXNuJ3QgbGlnaHQgdXAuCgpJJ3ZlIG1hbmFnZWQgdG8g
aGl0IHRoZSBwcm9ibGVtbiB3aGVuIHRvZ2dsaW5nIEhETUkgb24gcG9ydCBEIG9uIGFuZApvZmYu
IFdoZW4gdGhpbmdzIGdldCBjb3JydXB0ZWQgdGhlIGRpc3BsYXkgZG9lc24ndCBsaWdodCB1cCwg
YnV0IGFzIHNvb24KYXMgSSBtYW51YWxseSB3cml0ZSB0aGUgY29ycmVjdCB2YWx1ZSB0byB0aGUg
cmVnaXN0ZXIgdGhlIGRpc3BsYXkgY29tZXMKdXAuCgpGaXJzdCBJIHdhcyBzdXNwaWNpb3VzIHRo
YXQgd2Ugb3Vyc2VsdmVzIGFjY2lkZW50YWxseSBvdmVyd3JpdGUgaXQgd2l0aApnYXJiYWdlLCBi
dXQgZGlkbid0IGNhdGNoIGFueXRoaW5nIHdpdGggdGhlIHJlZ19ydyB0cmFjZXBvaW50LiBBbHNv
IEkKc3ByaW5rbGVkIGNoZWNrIGFsbCBvdmVyIHRoZSBtb2Rlc2V0IHBhdGggdG8gc2VlIGV4YWN0
bHkgd2hlbiB0aGUKY29ycnVwdGlvbiBoYXBwZW5zLCBhbmQgZWcuIHRoZSByZWFkIGJhY2sgdmFs
dWUgd2FzIGZpbmUganVzdCBiZWZvcmUKaW50ZWxfZHBfc2V0X20oKSwgYW5kIGNvcnJ1cHRlZCBp
bW1lZGlhdGVseSBhZnRlciBpdC4gSSBhbHNvIG1hZGUgbXkKY2hlY2sgZnVuY3Rpb24gcmVwYWly
IHRoZSByZWdpc3RlciB2YWx1ZSB3aGVuZXZlciBpdCB3YXMgd3JvbmcsIGFuZCB3aXRoCnRoaXMg
YXBwcm9hY2ggdGhlIGNvcnJ1cHRpb24gcmVwZWF0ZWQgc2V2ZXJhbCB0aW1lcyBkdXJpbmcgdGhl
IG1vZGVzZXQKb3BlcmF0aW9uLCBhbHdheXMgc2VlbWluZyB0byB0cmlnZ2VyIGluIHRoZSBzYW1l
IGV4YWN0IGNhbGxzIHRvIHRoZQpjaGVjayBmdW5jdGlvbiwgd2hpbGUgb3RoZXIgY2FsbHMgdG8g
dGhlIGZ1bmN0aW9uIG5ldmVyIGNhdWdodCBhbnl0aGluZy4KClNvIGZhciBJJ3ZlIG5vdCBzZWVu
IHRoaXMgcHJvYmxlbSBvY2N1cnJpbmcgd2hlbiBjYXJlZnVsbHkgYXZvaWRpbmcgYWxsCnJlYWQg
YWNjZXNzZXMgdG8gRElTUExBWV9QSFlfQ09OVFJPTC4gTm90IHN1cmUgaWYgdGhhdCdzIGp1c3Qg
cHVyZSBsdWNrCm9yIGFuIGFjdHVhbCB3b3JrYXJvdW5kLCBidXQgd2UgY2FuIGhvcGUgaXQgd29y
a3MuIFNvIGxldCdzIGF2b2lkIHJlYWRpbmcKdGhlIHJlZ2lzdGVyIGFuZCBpbnN0ZWFkIHRyYWNr
IHRoZSBkZXNpcmVkIHZhbHVlIG9mIHRoZSByZWdpc3RlciBpbiBkZXZfcHJpdi4KCnYyOiBSZWFk
IG91dCB0aGUgcG93ZXIgd2VsbCBzdGF0ZSB0byBkZXRlcm1pbmUgaW5pdGlhbCByZWdpc3RlciB2
YWx1ZQp2MzogVXNlIERQSU9fQ0h4IG5hbWVzIGluc3RlYWQgb2YgcmF3IG51bWJlcnMKClNpZ25l
ZC1vZmYtYnk6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+
Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgICAgIHwgIDIgKysKIGRy
aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmggICAgICAgICB8ICA1ICsrKystCiBkcml2ZXJz
L2dwdS9kcm0vaTkxNS9pbnRlbF9ydW50aW1lX3BtLmMgfCAzNiArKysrKysrKysrKysrKysrKysr
KysrKysrKysrLS0tLS0KIDMgZmlsZXMgY2hhbmdlZCwgMzcgaW5zZXJ0aW9ucygrKSwgNiBkZWxl
dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIv
ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCA4MjJmMjU5Li4yODhjM2ZjIDEw
MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMv
Z3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTE3NTQsNiArMTc1NCw4IEBAIHN0cnVjdCBkcm1f
aTkxNV9wcml2YXRlIHsKIAogCXUzMiBmZGlfcnhfY29uZmlnOwogCisJdTMyIGNodl9waHlfY29u
dHJvbDsKKwogCXUzMiBzdXNwZW5kX2NvdW50OwogCXN0cnVjdCBpOTE1X3N1c3BlbmRfc2F2ZWRf
cmVnaXN0ZXJzIHJlZ2ZpbGU7CiAJc3RydWN0IHZsdl9zMGl4X3N0YXRlIHZsdl9zMGl4X3N0YXRl
OwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaCBiL2RyaXZlcnMv
Z3B1L2RybS9pOTE1L2k5MTVfcmVnLmgKaW5kZXggY2ZiZDVhNi4uOTg1ODhkNSAxMDA2NDQKLS0t
IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0v
aTkxNS9pOTE1X3JlZy5oCkBAIC0xODg3LDcgKzE4ODcsMTAgQEAgZW51bSBza2xfZGlzcF9wb3dl
cl93ZWxscyB7CiAjZGVmaW5lIERQSU9fUEhZX1NUQVRVUwkJCShWTFZfRElTUExBWV9CQVNFICsg
MHg2MjQwKQogI2RlZmluZSAgIERQTExfUE9SVERfUkVBRFlfTUFTSwkJKDB4ZikKICNkZWZpbmUg
RElTUExBWV9QSFlfQ09OVFJPTCAoVkxWX0RJU1BMQVlfQkFTRSArIDB4NjAxMDApCi0jZGVmaW5l
ICAgUEhZX0NPTV9MQU5FX1JFU0VUX0RFQVNTRVJUKHBoeSkgKDEgPDwgKHBoeSkpCisjZGVmaW5l
ICAgUEhZX0NIX1NVX1BTUgkJCQkweDEKKyNkZWZpbmUgICBQSFlfQ0hfREVFUF9QU1IJCQkweDcK
KyNkZWZpbmUgICBQSFlfQ0hfUE9XRVJfTU9ERShtb2RlLCBwaHksIGNoKQkoKG1vZGUpIDw8ICg2
KihwaHkpKzMqKGNoKSsyKSkKKyNkZWZpbmUgICBQSFlfQ09NX0xBTkVfUkVTRVRfREVBU1NFUlQo
cGh5KQkoMSA8PCAocGh5KSkKICNkZWZpbmUgRElTUExBWV9QSFlfU1RBVFVTIChWTFZfRElTUExB
WV9CQVNFICsgMHg2MDEwNCkKICNkZWZpbmUgICBQSFlfUE9XRVJHT09EKHBoeSkJKCgocGh5KSA9
PSBEUElPX1BIWTApID8gKDE8PDMxKSA6ICgxPDwzMCkpCiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMv
Z3B1L2RybS9pOTE1L2ludGVsX3J1bnRpbWVfcG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu
dGVsX3J1bnRpbWVfcG0uYwppbmRleCBjZTAwZTY5Li5iNzM2NzFmIDEwMDY0NAotLS0gYS9kcml2
ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ydW50aW1lX3BtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJt
L2k5MTUvaW50ZWxfcnVudGltZV9wbS5jCkBAIC02NjYsOCArNjY2LDggQEAgc3RhdGljIHZvaWQg
Y2h2X2RwaW9fY21uX3Bvd2VyX3dlbGxfZW5hYmxlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk
ZXZfcHJpdiwKIAlpZiAod2FpdF9mb3IoSTkxNV9SRUFEKERJU1BMQVlfUEhZX1NUQVRVUykgJiBQ
SFlfUE9XRVJHT09EKHBoeSksIDEpKQogCQlEUk1fRVJST1IoIkRpc3BsYXkgUEhZICVkIGlzIG5v
dCBwb3dlciB1cFxuIiwgcGh5KTsKIAotCUk5MTVfV1JJVEUoRElTUExBWV9QSFlfQ09OVFJPTCwg
STkxNV9SRUFEKERJU1BMQVlfUEhZX0NPTlRST0wpIHwKLQkJICAgUEhZX0NPTV9MQU5FX1JFU0VU
X0RFQVNTRVJUKHBoeSkpOworCWRldl9wcml2LT5jaHZfcGh5X2NvbnRyb2wgfD0gUEhZX0NPTV9M
QU5FX1JFU0VUX0RFQVNTRVJUKHBoeSk7CisJSTkxNV9XUklURShESVNQTEFZX1BIWV9DT05UUk9M
LCBkZXZfcHJpdi0+Y2h2X3BoeV9jb250cm9sKTsKIH0KIAogc3RhdGljIHZvaWQgY2h2X2RwaW9f
Y21uX3Bvd2VyX3dlbGxfZGlzYWJsZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYs
CkBAIC02ODcsOCArNjg3LDggQEAgc3RhdGljIHZvaWQgY2h2X2RwaW9fY21uX3Bvd2VyX3dlbGxf
ZGlzYWJsZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCWFzc2VydF9wbGxf
ZGlzYWJsZWQoZGV2X3ByaXYsIFBJUEVfQyk7CiAJfQogCi0JSTkxNV9XUklURShESVNQTEFZX1BI
WV9DT05UUk9MLCBJOTE1X1JFQUQoRElTUExBWV9QSFlfQ09OVFJPTCkgJgotCQkgICB+UEhZX0NP
TV9MQU5FX1JFU0VUX0RFQVNTRVJUKHBoeSkpOworCWRldl9wcml2LT5jaHZfcGh5X2NvbnRyb2wg
Jj0gflBIWV9DT01fTEFORV9SRVNFVF9ERUFTU0VSVChwaHkpOworCUk5MTVfV1JJVEUoRElTUExB
WV9QSFlfQ09OVFJPTCwgZGV2X3ByaXYtPmNodl9waHlfY29udHJvbCk7CiAKIAl2bHZfc2V0X3Bv
d2VyX3dlbGwoZGV2X3ByaXYsIHBvd2VyX3dlbGwsIGZhbHNlKTsKIH0KQEAgLTE0MDEsNiArMTQw
MSwzMCBAQCBzdGF0aWMgdm9pZCBpbnRlbF9wb3dlcl9kb21haW5zX3Jlc3VtZShzdHJ1Y3QgZHJt
X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJbXV0ZXhfdW5sb2NrKCZwb3dlcl9kb21haW5zLT5s
b2NrKTsKIH0KIAorc3RhdGljIHZvaWQgY2h2X3BoeV9jb250cm9sX2luaXQoc3RydWN0IGRybV9p
OTE1X3ByaXZhdGUgKmRldl9wcml2KQoreworCXN0cnVjdCBpOTE1X3Bvd2VyX3dlbGwgKmNtbl9i
YyA9CisJCWxvb2t1cF9wb3dlcl93ZWxsKGRldl9wcml2LCBQVU5JVF9QT1dFUl9XRUxMX0RQSU9f
Q01OX0JDKTsKKwlzdHJ1Y3QgaTkxNV9wb3dlcl93ZWxsICpjbW5fZCA9CisJCWxvb2t1cF9wb3dl
cl93ZWxsKGRldl9wcml2LCBQVU5JVF9QT1dFUl9XRUxMX0RQSU9fQ01OX0QpOworCisJLyoKKwkg
KiBESVNQTEFZX1BIWV9DT05UUk9MIGNhbiBnZXQgY29ycnVwdGVkIGlmIHJlYWQuIEFzIGEKKwkg
KiB3b3JrYXJvdW5kIG5ldmVyIGV2ZXIgcmVhZCBESVNQTEFZX1BIWV9DT05UUk9MLCBhbmQKKwkg
KiBpbnN0ZWFkIG1haW50YWluIGEgc2hhZG93IGNvcHkgb3Vyc2VsdmVzLiBVc2UgdGhlIGFjdHVh
bAorCSAqIHBvd2VyIHdlbGwgc3RhdGUgdG8gcmVjb25zdHJ1Y3QgdGhlIGV4cGVjdGVkIGluaXRp
YWwKKwkgKiB2YWx1ZS4KKwkgKi8KKwlkZXZfcHJpdi0+Y2h2X3BoeV9jb250cm9sID0KKwkJUEhZ
X0NIX1BPV0VSX01PREUoUEhZX0NIX1NVX1BTUiwgRFBJT19QSFkwLCBEUElPX0NIMCkgfAorCQlQ
SFlfQ0hfUE9XRVJfTU9ERShQSFlfQ0hfU1VfUFNSLCBEUElPX1BIWTAsIERQSU9fQ0gxKSB8CisJ
CVBIWV9DSF9QT1dFUl9NT0RFKFBIWV9DSF9TVV9QU1IsIERQSU9fUEhZMSwgRFBJT19DSDApOwor
CWlmIChjbW5fYmMtPm9wcy0+aXNfZW5hYmxlZChkZXZfcHJpdiwgY21uX2JjKSkKKwkJZGV2X3By
aXYtPmNodl9waHlfY29udHJvbCB8PSBQSFlfQ09NX0xBTkVfUkVTRVRfREVBU1NFUlQoRFBJT19Q
SFkwKTsKKwlpZiAoY21uX2QtPm9wcy0+aXNfZW5hYmxlZChkZXZfcHJpdiwgY21uX2QpKQorCQlk
ZXZfcHJpdi0+Y2h2X3BoeV9jb250cm9sIHw9IFBIWV9DT01fTEFORV9SRVNFVF9ERUFTU0VSVChE
UElPX1BIWTEpOworfQorCiBzdGF0aWMgdm9pZCB2bHZfY21ubGFuZV93YShzdHJ1Y3QgZHJtX2k5
MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7CiAJc3RydWN0IGk5MTVfcG93ZXJfd2VsbCAqY21uID0K
QEAgLTE0NDMsNyArMTQ2Nyw5IEBAIHZvaWQgaW50ZWxfcG93ZXJfZG9tYWluc19pbml0X2h3KHN0
cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAogCXBvd2VyX2RvbWFpbnMtPmluaXRp
YWxpemluZyA9IHRydWU7CiAKLQlpZiAoSVNfVkFMTEVZVklFVyhkZXYpICYmICFJU19DSEVSUllW
SUVXKGRldikpIHsKKwlpZiAoSVNfQ0hFUlJZVklFVyhkZXYpKSB7CisJCWNodl9waHlfY29udHJv
bF9pbml0KGRldl9wcml2KTsKKwl9IGVsc2UgaWYgKElTX1ZBTExFWVZJRVcoZGV2KSkgewogCQlt
dXRleF9sb2NrKCZwb3dlcl9kb21haW5zLT5sb2NrKTsKIAkJdmx2X2NtbmxhbmVfd2EoZGV2X3By
aXYpOwogCQltdXRleF91bmxvY2soJnBvd2VyX2RvbWFpbnMtPmxvY2spOwotLSAKMi4wLjUKCl9f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBt
YWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMu
ZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==