From: Subject: [PATCH 78/81] drm/amd/display: revert order change of HUBP and MPC disable Date: Tue, 25 Jul 2017 09:54:38 -0400 Message-ID: <1500990881-6100-79-git-send-email-sunpeng.li@amd.com> References: <1500990881-6100-1-git-send-email-sunpeng.li@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1500990881-6100-1-git-send-email-sunpeng.li-5C7GfCeVMHo@public.gmane.org> List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: Tony Cheng RnJvbTogVG9ueSBDaGVuZyA8dG9ueS5jaGVuZ0BhbWQuY29tPgoKLSByb290IGNhdXNlIHdhcyB3 ZSBkaXNhYmxlIG9wcCBjbGsgaW4gTVBDIGRpc2Nvbm5lY3QKLSBodWJwX2JsYW5rIGlzIG5vdCBk b3VibGUgYnVmZmVyZWQsIHNvIHdlIGNhbid0IGJsYW5rIHVudGlsIE1QQyBkaXNjb25uZWN0IG9y IHdlIGhhdmUgcmlzayBvZiB1bmRlcmZsb3cKCkNoYW5nZS1JZDogSWM3NjdlNGNmYmRlYzVkNjhj MTE4YzNlZDgxOGMxMDU0M2M3NzE5NjcKU2lnbmVkLW9mZi1ieTogVG9ueSBDaGVuZyA8dG9ueS5j aGVuZ0BhbWQuY29tPgpSZXZpZXdlZC1ieTogRXJpYyBZYW5nIDxlcmljLnlhbmcyQGFtZC5jb20+ CkFja2VkLWJ5OiBIYXJyeSBXZW50bGFuZCA8SGFycnkuV2VudGxhbmRAYW1kLmNvbT4KLS0tCiBk cml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNlL2RjZV9od3NlcS5oICAgICB8ICAyIC0t CiAuLi4vZHJtL2FtZC9kaXNwbGF5L2RjL2RjbjEwL2RjbjEwX2h3X3NlcXVlbmNlci5jICB8IDQx ICsrKysrKysrKysrKystLS0tLS0tLS0KIC4uLi9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjbjEw L2RjbjEwX21lbV9pbnB1dC5jIHwgIDUgKysrCiAuLi4vZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9k Y24xMC9kY24xMF9tZW1faW5wdXQuaCB8ICAyICsrCiA0IGZpbGVzIGNoYW5nZWQsIDMyIGluc2Vy dGlvbnMoKyksIDE4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9h bWQvZGlzcGxheS9kYy9kY2UvZGNlX2h3c2VxLmggYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3Bs YXkvZGMvZGNlL2RjZV9od3NlcS5oCmluZGV4IDdlMWQ0NmYuLjk0ZDEyYjUgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY2UvZGNlX2h3c2VxLmgKKysrIGIvZHJp dmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjZS9kY2VfaHdzZXEuaApAQCAtMjg4LDcgKzI4 OCw2IEBAIHN0cnVjdCBkY2VfaHdzZXFfcmVnaXN0ZXJzIHsKIAlIV1NfU0YxKE9URzBfLCBQSFlQ TExfUElYRUxfUkFURV9DTlRMLCBQSFlQTExfUElYRUxfUkFURV9TT1VSQ0UsIG1hc2tfc2gpLCBc CiAJSFdTX1NGKE9URzBfLCBPVEdfR0xPQkFMX1NZTkNfU1RBVFVTLCBWVVBEQVRFX05PX0xPQ0tf RVZFTlRfQ0xFQVIsIG1hc2tfc2gpLCBcCiAJSFdTX1NGKE9URzBfLCBPVEdfR0xPQkFMX1NZTkNf U1RBVFVTLCBWVVBEQVRFX05PX0xPQ0tfRVZFTlRfT0NDVVJSRUQsIG1hc2tfc2gpLCBcCi0JSFdT X1NGKEhVQlAwXywgRENIVUJQX0NOVEwsIEhVQlBfTk9fT1VUU1RBTkRJTkdfUkVRLCBtYXNrX3No KSwgXAogCUhXU19TRihIVUJQMF8sIERDSFVCUF9DTlRMLCBIVUJQX1ZUR19TRUwsIG1hc2tfc2gp LCBcCiAJSFdTX1NGKEhVQlAwXywgSFVCUF9DTEtfQ05UTCwgSFVCUF9DTE9DS19FTkFCTEUsIG1h c2tfc2gpLCBcCiAJSFdTX1NGKERQUF9UT1AwXywgRFBQX0NPTlRST0wsIERQUF9DTE9DS19FTkFC TEUsIG1hc2tfc2gpLCBcCkBAIC0zNTEsNyArMzUwLDYgQEAgc3RydWN0IGRjZV9od3NlcV9yZWdp c3RlcnMgewogI2RlZmluZSBIV1NFUV9EQ05fUkVHX0ZJRUxEX0xJU1QodHlwZSkgXAogCXR5cGUg VlVQREFURV9OT19MT0NLX0VWRU5UX0NMRUFSOyBcCiAJdHlwZSBWVVBEQVRFX05PX0xPQ0tfRVZF TlRfT0NDVVJSRUQ7IFwKLQl0eXBlIEhVQlBfTk9fT1VUU1RBTkRJTkdfUkVROyBcCiAJdHlwZSBI VUJQX1ZUR19TRUw7IFwKIAl0eXBlIEhVQlBfQ0xPQ0tfRU5BQkxFOyBcCiAJdHlwZSBEUFBfQ0xP Q0tfRU5BQkxFOyBcCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMv ZGNuMTAvZGNuMTBfaHdfc2VxdWVuY2VyLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkv ZGMvZGNuMTAvZGNuMTBfaHdfc2VxdWVuY2VyLmMKaW5kZXggODI4NDgzNy4uYWRmM2QyOSAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjbjEwL2RjbjEwX2h3X3Nl cXVlbmNlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY24xMC9kY24x MF9od19zZXF1ZW5jZXIuYwpAQCAtNDM2LDI5ICs0MzYsMTcgQEAgc3RhdGljIHZvaWQgcmVzZXRf YmFja19lbmRfZm9yX3BpcGUoCiAJCQkJCXBpcGVfY3R4LT5waXBlX2lkeCwgcGlwZV9jdHgtPnRn LT5pbnN0KTsKIH0KIAotc3RhdGljIHZvaWQgcmVzZXRfZnJvbnRfZW5kKAorc3RhdGljIHZvaWQg cGxhbmVfYXRvbWljX3N0b3AoCiAJCXN0cnVjdCBjb3JlX2RjICpkYywKIAkJaW50IGZlX2lkeCkK IHsKLQlzdHJ1Y3QgZGNlX2h3c2VxICpod3MgPSBkYy0+aHdzZXE7CiAJc3RydWN0IG1wY2NfY2Zn IG1wY2NfY2ZnOwogCXN0cnVjdCBtZW1faW5wdXQgKm1pID0gZGMtPnJlc19wb29sLT5taXNbZmVf aWR4XTsKIAlzdHJ1Y3QgdHJhbnNmb3JtICp4Zm0gPSBkYy0+cmVzX3Bvb2wtPnRyYW5zZm9ybXNb ZmVfaWR4XTsKIAlzdHJ1Y3QgbXBjYyAqbXBjYyA9IGRjLT5yZXNfcG9vbC0+bXBjY1tmZV9pZHhd OwogCXN0cnVjdCB0aW1pbmdfZ2VuZXJhdG9yICp0ZyA9IGRjLT5yZXNfcG9vbC0+dGltaW5nX2dl bmVyYXRvcnNbbXBjYy0+b3BwX2lkXTsKLQl1bnNpZ25lZCBpbnQgb3BwX2lkID0gbXBjYy0+b3Bw X2lkOwotCi0JLypBbHJlYWR5IHJlc2V0Ki8KLQlpZiAob3BwX2lkID09IDB4ZikKLQkJcmV0dXJu OwotCi0JdGctPmZ1bmNzLT5sb2NrKHRnKTsKIAogCW1pLT5mdW5jcy0+ZGNjX2NvbnRyb2wobWks IGZhbHNlLCBmYWxzZSk7Ci0JbWktPmZ1bmNzLT5zZXRfYmxhbmsobWksIHRydWUpOwotCVJFR19X QUlUKERDSFVCUF9DTlRMW2ZlX2lkeF0sCi0JCQlIVUJQX05PX09VVFNUQU5ESU5HX1JFUSwgMSwK LQkJCTEsIDIwMCk7CiAKIAltcGNjX2NmZy5vcHBfaWQgPSAweGY7CiAJbXBjY19jZmcudG9wX2Rw cF9pZCA9IDB4ZjsKQEAgLTQ2NiwyMyArNDU0LDQ0IEBAIHN0YXRpYyB2b2lkIHJlc2V0X2Zyb250 X2VuZCgKIAltcGNjX2NmZy50b3Bfb2ZfdHJlZSA9IHRnLT5pbnN0ID09IG1wY2MtPmluc3Q7CiAJ bXBjYy0+ZnVuY3MtPnNldChtcGNjLCAmbXBjY19jZmcpOwogCisJeGZtLT5mdW5jcy0+dHJhbnNm b3JtX3Jlc2V0KHhmbSk7Cit9CisKK3N0YXRpYyB2b2lkIHJlc2V0X2Zyb250X2VuZCgKKwkJc3Ry dWN0IGNvcmVfZGMgKmRjLAorCQlpbnQgZmVfaWR4KQoreworCXN0cnVjdCBkY2VfaHdzZXEgKmh3 cyA9IGRjLT5od3NlcTsKKwlzdHJ1Y3QgbWVtX2lucHV0ICptaSA9IGRjLT5yZXNfcG9vbC0+bWlz W2ZlX2lkeF07CisJc3RydWN0IG1wY2MgKm1wY2MgPSBkYy0+cmVzX3Bvb2wtPm1wY2NbZmVfaWR4 XTsKKwlzdHJ1Y3QgdGltaW5nX2dlbmVyYXRvciAqdGcgPSBkYy0+cmVzX3Bvb2wtPnRpbWluZ19n ZW5lcmF0b3JzW21wY2MtPm9wcF9pZF07CisJdW5zaWduZWQgaW50IG9wcF9pZCA9IG1wY2MtPm9w cF9pZDsKKworCS8qQWxyZWFkeSByZXNldCovCisJaWYgKG9wcF9pZCA9PSAweGYpCisJCXJldHVy bjsKKworCXRnLT5mdW5jcy0+bG9jayh0Zyk7CisKKwlwbGFuZV9hdG9taWNfc3RvcChkYywgZmVf aWR4KTsKKwogCVJFR19VUERBVEUoT1RHX0dMT0JBTF9TWU5DX1NUQVRVU1t0Zy0+aW5zdF0sIFZV UERBVEVfTk9fTE9DS19FVkVOVF9DTEVBUiwgMSk7CiAJdGctPmZ1bmNzLT51bmxvY2sodGcpOwog CVJFR19XQUlUKE9UR19HTE9CQUxfU1lOQ19TVEFUVVNbdGctPmluc3RdLCBWVVBEQVRFX05PX0xP Q0tfRVZFTlRfT0NDVVJSRUQsIDEsIDIwMDAwLCAyMDAwMDApOwogCiAJbXBjYy0+ZnVuY3MtPndh aXRfZm9yX2lkbGUobXBjYyk7CiAKKwltaS0+ZnVuY3MtPnNldF9ibGFuayhtaSwgdHJ1ZSk7CisK IAlSRUdfVVBEQVRFKEhVQlBfQ0xLX0NOVExbZmVfaWR4XSwKIAkJCUhVQlBfQ0xPQ0tfRU5BQkxF LCAwKTsKIAlSRUdfVVBEQVRFKERQUF9DT05UUk9MW2ZlX2lkeF0sCiAJCQlEUFBfQ0xPQ0tfRU5B QkxFLCAwKTsKIAotCWlmIChtcGNjX2NmZy50b3Bfb2ZfdHJlZSkKKwlpZiAodGctPmluc3QgPT0g bXBjYy0+aW5zdCkKIAkJUkVHX1VQREFURShPUFBfUElQRV9DT05UUk9MW29wcF9pZF0sCiAJCQkJ T1BQX1BJUEVfQ0xPQ0tfRU4sIDApOwogCi0JeGZtLT5mdW5jcy0+dHJhbnNmb3JtX3Jlc2V0KHhm bSk7Ci0KIAlkbV9sb2dnZXJfd3JpdGUoZGMtPmN0eC0+bG9nZ2VyLCBMT0dfREMsCiAJCQkJCSJS ZXNldCBmcm9udCBlbmQgJWRcbiIsCiAJCQkJCWZlX2lkeCk7CmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNuMTAvZGNuMTBfbWVtX2lucHV0LmMgYi9kcml2ZXJz L2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNuMTAvZGNuMTBfbWVtX2lucHV0LmMKaW5kZXggZWZh MDJkMS4uODA1NDc5NCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2Rj L2RjbjEwL2RjbjEwX21lbV9pbnB1dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxh eS9kYy9kY24xMC9kY24xMF9tZW1faW5wdXQuYwpAQCAtNDYsNiArNDYsMTEgQEAgc3RhdGljIHZv aWQgbWluMTBfc2V0X2JsYW5rKHN0cnVjdCBtZW1faW5wdXQgKm1lbV9pbnB1dCwgYm9vbCBibGFu aykKIAlSRUdfVVBEQVRFXzIoRENIVUJQX0NOVEwsCiAJCQlIVUJQX0JMQU5LX0VOLCBibGFua19l biwKIAkJCUhVQlBfVFRVX0RJU0FCTEUsIGJsYW5rX2VuKTsKKworCWlmIChibGFuaykKKwkJUkVH X1dBSVQoRENIVUJQX0NOVEwsCisJCQkJSFVCUF9OT19PVVRTVEFORElOR19SRVEsIDEsCisJCQkJ MSwgMjAwKTsKIH0KIAogc3RhdGljIHZvaWQgbWluMTBfdnJlYWR5X3dvcmthcm91bmQoc3RydWN0 IG1lbV9pbnB1dCAqbWVtX2lucHV0LApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9k aXNwbGF5L2RjL2RjbjEwL2RjbjEwX21lbV9pbnB1dC5oIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9k aXNwbGF5L2RjL2RjbjEwL2RjbjEwX21lbV9pbnB1dC5oCmluZGV4IDdlZmE4NTcuLmEwYTFjZWYg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY24xMC9kY24xMF9t ZW1faW5wdXQuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNuMTAvZGNu MTBfbWVtX2lucHV0LmgKQEAgLTMwNCw2ICszMDQsNyBAQCBzdHJ1Y3QgZGNuX21pX3JlZ2lzdGVy cyB7CiAjZGVmaW5lIE1JX01BU0tfU0hfTElTVF9EQ04obWFza19zaClcCiAJTUlfU0YoSFVCUDBf RENIVUJQX0NOVEwsIEhVQlBfQkxBTktfRU4sIG1hc2tfc2gpLFwKIAlNSV9TRihIVUJQMF9EQ0hV QlBfQ05UTCwgSFVCUF9UVFVfRElTQUJMRSwgbWFza19zaCksXAorCU1JX1NGKEhVQlAwX0RDSFVC UF9DTlRMLCBIVUJQX05PX09VVFNUQU5ESU5HX1JFUSwgbWFza19zaCksXAogCU1JX1NGKEhVQlAw X0RDU1VSRl9BRERSX0NPTkZJRywgTlVNX1BJUEVTLCBtYXNrX3NoKSxcCiAJTUlfU0YoSFVCUDBf RENTVVJGX0FERFJfQ09ORklHLCBOVU1fQkFOS1MsIG1hc2tfc2gpLFwKIAlNSV9TRihIVUJQMF9E Q1NVUkZfQUREUl9DT05GSUcsIFBJUEVfSU5URVJMRUFWRSwgbWFza19zaCksXApAQCAtNDYzLDYg KzQ2NCw3IEBAIHN0cnVjdCBkY25fbWlfcmVnaXN0ZXJzIHsKICNkZWZpbmUgRENOX01JX1JFR19G SUVMRF9MSVNUKHR5cGUpIFwKIAl0eXBlIEhVQlBfQkxBTktfRU47XAogCXR5cGUgSFVCUF9UVFVf RElTQUJMRTtcCisJdHlwZSBIVUJQX05PX09VVFNUQU5ESU5HX1JFUTtcCiAJdHlwZSBOVU1fUElQ RVM7XAogCXR5cGUgTlVNX0JBTktTO1wKIAl0eXBlIFBJUEVfSU5URVJMRUFWRTtcCi0tIAoyLjcu NAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KYW1kLWdm eCBtYWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4Cg==