From: Harry Wentland Subject: [PATCH 044/120] drm/amd/display: Clean up some DCN1 guards Date: Wed, 9 Aug 2017 11:01:30 -0400 Message-ID: <20170809150246.8835-45-harry.wentland@amd.com> References: <20170809150246.8835-1-harry.wentland@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170809150246.8835-1-harry.wentland-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: Zeyu Fan RnJvbTogWmV5dSBGYW4gPFpleXUuRmFuQGFtZC5jb20+CgpDaGFuZ2UtSWQ6IEk3ZmI1Y2U3N2Ew Yjc2ZWY3OGY1YjQ3YjYxYWVjOTI4ZDNhYjI2ZjlkClNpZ25lZC1vZmYtYnk6IFpleXUgRmFuIDxa ZXl1LkZhbkBhbWQuY29tPgpSZXZpZXdlZC1ieTogQ2hhcmxlbmUgTGl1IDxDaGFybGVuZS5MaXVA YW1kLmNvbT4KQWNrZWQtYnk6IEhhcnJ5IFdlbnRsYW5kIDxIYXJyeS5XZW50bGFuZEBhbWQuY29t PgotLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9iaW9zL2NvbW1hbmRfdGFibGVf aGVscGVyMi5jIHwgMSArCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvY29yZS9kYy5j ICAgICAgICAgICAgICAgICAgICB8IDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9k Yy9jb3JlL2RjX3Jlc291cmNlLmMgICAgICAgICAgIHwgMiArKwogZHJpdmVycy9ncHUvZHJtL2Ft ZC9kaXNwbGF5L2RjL2RjZS9kY2VfY2xvY2tfc291cmNlLmMgICAgICAgfCAyICsrCiBkcml2ZXJz L2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNlL2RjZV9jbG9ja3MuYyAgICAgICAgICAgICB8IDIg Ky0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY2UxMTAvZGNlMTEwX2h3X3NlcXVl bmNlci5jIHwgNiArKystLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9ncGlvL2h3 X2ZhY3RvcnkuYyAgICAgICAgICAgIHwgMSArCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkv ZGMvZ3Bpby9od190cmFuc2xhdGUuYyAgICAgICAgICB8IDEgKwogZHJpdmVycy9ncHUvZHJtL2Ft ZC9kaXNwbGF5L2RjL2kyY2F1eC9pMmNhdXguYyAgICAgICAgICAgICAgfCA1ICsrKy0tCiA5IGZp bGVzIGNoYW5nZWQsIDE1IGluc2VydGlvbnMoKyksIDcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2Jpb3MvY29tbWFuZF90YWJsZV9oZWxw ZXIyLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvYmlvcy9jb21tYW5kX3RhYmxl X2hlbHBlcjIuYwppbmRleCA4NGIxZjUxNWFhNDcuLjkwODRhMzJhYWI3OSAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2Jpb3MvY29tbWFuZF90YWJsZV9oZWxwZXIy LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2Jpb3MvY29tbWFuZF90YWJs ZV9oZWxwZXIyLmMKQEAgLTU4LDYgKzU4LDcgQEAgYm9vbCBkYWxfYmlvc19wYXJzZXJfaW5pdF9j bWRfdGJsX2hlbHBlcjIoCiAJCSpoID0gZGFsX2NtZF90YmxfaGVscGVyX2RjZTExMl9nZXRfdGFi bGUyKCk7CiAJCXJldHVybiB0cnVlOwogI2VuZGlmCisKIAljYXNlIERDRV9WRVJTSU9OXzEyXzA6 CiAJCSpoID0gZGFsX2NtZF90YmxfaGVscGVyX2RjZTExMl9nZXRfdGFibGUyKCk7CiAJCXJldHVy biB0cnVlOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2NvcmUv ZGMuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9jb3JlL2RjLmMKaW5kZXggOWMy ZmFmOGU0YjE0Li5iYWIwN2Y4ZDQ4ODAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQv ZGlzcGxheS9kYy9jb3JlL2RjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2Rj L2NvcmUvZGMuYwpAQCAtMTEwOSw3ICsxMTA5LDcgQEAgYm9vbCBkY19wb3N0X3VwZGF0ZV9zdXJm YWNlc190b19zdHJlYW0oc3RydWN0IGRjICpkYykKIAogCS8qIDNyZCBwYXJhbSBzaG91bGQgYmUg dHJ1ZSwgdGVtcCB3L2EgZm9yIFJWKi8KICNpZiBkZWZpbmVkKENPTkZJR19EUk1fQU1EX0RDX0RD TjFfMCkKLQljb3JlX2RjLT5od3NzLnNldF9iYW5kd2lkdGgoY29yZV9kYywgY29udGV4dCwgY29y ZV9kYy0+Y3R4LT5kY2VfdmVyc2lvbiAhPSBEQ05fVkVSU0lPTl8xXzApOworCWNvcmVfZGMtPmh3 c3Muc2V0X2JhbmR3aWR0aChjb3JlX2RjLCBjb250ZXh0LCBjb3JlX2RjLT5jdHgtPmRjZV92ZXJz aW9uIDwgRENOX1ZFUlNJT05fMV8wKTsKICNlbHNlCiAJY29yZV9kYy0+aHdzcy5zZXRfYmFuZHdp ZHRoKGNvcmVfZGMsIGNvbnRleHQsIHRydWUpOwogI2VuZGlmCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvY29yZS9kY19yZXNvdXJjZS5jIGIvZHJpdmVycy9ncHUv ZHJtL2FtZC9kaXNwbGF5L2RjL2NvcmUvZGNfcmVzb3VyY2UuYwppbmRleCA0MzY4NTAxNjdhY2Eu LmIzZjdiNDRkNTY1NiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2Rj L2NvcmUvZGNfcmVzb3VyY2UuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMv Y29yZS9kY19yZXNvdXJjZS5jCkBAIC0xMjAsNiArMTIwLDggQEAgc3RydWN0IHJlc291cmNlX3Bv b2wgKmRjX2NyZWF0ZV9yZXNvdXJjZV9wb29sKAogCQkJbnVtX3ZpcnR1YWxfbGlua3MsIGRjKTsK IAkJYnJlYWs7CiAjZW5kaWYKKworCiAJZGVmYXVsdDoKIAkJYnJlYWs7CiAJfQpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjZS9kY2VfY2xvY2tfc291cmNlLmMg Yi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNlL2RjZV9jbG9ja19zb3VyY2UuYwpp bmRleCAxNDJiM2EwMWMyMDQuLjIyMDU0OTFjODNlOSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2FtZC9kaXNwbGF5L2RjL2RjZS9kY2VfY2xvY2tfc291cmNlLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjZS9kY2VfY2xvY2tfc291cmNlLmMKQEAgLTU4OSw2ICs1 ODksNyBAQCBzdGF0aWMgdWludDMyX3QgZGNlMTEwX2dldF9waXhfY2xrX2RpdmlkZXJzKAogI2lm IGRlZmluZWQoQ09ORklHX0RSTV9BTURfRENfRENOMV8wKQogCWNhc2UgRENOX1ZFUlNJT05fMV8w OgogI2VuZGlmCisKIAkJZGNlMTEyX2dldF9waXhfY2xrX2RpdmlkZXJzX2hlbHBlcihjbGtfc3Jj LAogCQkJCXBsbF9zZXR0aW5ncywgcGl4X2Nsa19wYXJhbXMpOwogCQlicmVhazsKQEAgLTkwMSw2 ICs5MDIsNyBAQCBzdGF0aWMgYm9vbCBkY2UxMTBfcHJvZ3JhbV9waXhfY2xrKAogI2lmIGRlZmlu ZWQoQ09ORklHX0RSTV9BTURfRENfRENOMV8wKQogCWNhc2UgRENOX1ZFUlNJT05fMV8wOgogI2Vu ZGlmCisKIAkJaWYgKGNsb2NrX3NvdXJjZS0+aWQgIT0gQ0xPQ0tfU09VUkNFX0lEX0RQX0RUTykg ewogCQkJYnBfcGNfcGFyYW1zLmZsYWdzLlNFVF9HRU5MT0NLX1JFRl9ESVZfU1JDID0KIAkJCQkJ CQlwbGxfc2V0dGluZ3MtPnVzZV9leHRlcm5hbF9jbGs7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNlL2RjZV9jbG9ja3MuYyBiL2RyaXZlcnMvZ3B1L2RybS9h bWQvZGlzcGxheS9kYy9kY2UvZGNlX2Nsb2Nrcy5jCmluZGV4IGYzMGNkNGRmZjU1NC4uMzdkMDc0 ZjU5NWZiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNlL2Rj ZV9jbG9ja3MuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNlL2RjZV9j bG9ja3MuYwpAQCAtNjE0LDcgKzYxNCw3IEBAIHN0YXRpYyBib29sIGRjZV9hcHBseV9jbG9ja192 b2x0YWdlX3JlcXVlc3QoCiAJfQogCWlmIChzZW5kX3JlcXVlc3QpIHsKICNpZiBkZWZpbmVkKENP TkZJR19EUk1fQU1EX0RDX0RDTjFfMCkKLQkJaWYgKGNsay0+Y3R4LT5kY2VfdmVyc2lvbiA9PSBE Q05fVkVSU0lPTl8xXzApIHsKKwkJaWYgKGNsay0+Y3R4LT5kY2VfdmVyc2lvbiA+PSBEQ05fVkVS U0lPTl8xXzApIHsKIAkJCXN0cnVjdCBjb3JlX2RjICpjb3JlX2RjID0gRENfVE9fQ09SRShjbGst PmN0eC0+ZGMpOwogCQkJLyp1c2UgZGNmY2xrIHJlcXVlc3Qgdm9sdGFnZSovCiAJCQljbG9ja192 b2x0YWdlX3JlcS5jbGtfdHlwZSA9IERNX1BQX0NMT0NLX1RZUEVfRENGQ0xLOwpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjZTExMC9kY2UxMTBfaHdfc2VxdWVu Y2VyLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNlMTEwL2RjZTExMF9od19z ZXF1ZW5jZXIuYwppbmRleCBhYTQ3NzdhOGVjMzYuLjExOTM2NTk2MGNkMCAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjZTExMC9kY2UxMTBfaHdfc2VxdWVuY2Vy LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjZTExMC9kY2UxMTBfaHdf c2VxdWVuY2VyLmMKQEAgLTExMDQsMTEgKzExMDQsMTEgQEAgc3RhdGljIGVudW0gZGNfc3RhdHVz IGFwcGx5X3NpbmdsZV9jb250cm9sbGVyX2N0eF90b19odygKIAkJCXRydWUgOiBmYWxzZSk7CiAK IAlyZXNvdXJjZV9idWlsZF9pbmZvX2ZyYW1lKHBpcGVfY3R4KTsKLQorCWRjZTExMF91cGRhdGVf aW5mb19mcmFtZShwaXBlX2N0eCk7CiAJaWYgKCFwaXBlX2N0eF9vbGQtPnN0cmVhbSkgewogCQlj b3JlX2xpbmtfZW5hYmxlX3N0cmVhbShwaXBlX2N0eCk7CiAKLQlkY2UxMTBfdXBkYXRlX2luZm9f ZnJhbWUocGlwZV9jdHgpOworCiAJCWlmIChkY19pc19kcF9zaWduYWwocGlwZV9jdHgtPnN0cmVh bS0+c2lnbmFsKSkKIAkJCWRjZTExMF91bmJsYW5rX3N0cmVhbShwaXBlX2N0eCwKIAkJCQkmc3Ry ZWFtLT5zaW5rLT5saW5rLT5jdXJfbGlua19zZXR0aW5ncyk7CkBAIC0xNjY0LDcgKzE2NjQsNyBA QCBlbnVtIGRjX3N0YXR1cyBkY2UxMTBfYXBwbHlfY3R4X3RvX2h3KAogCWFwcGx5X21pbl9jbG9j a3MoZGMsIGNvbnRleHQsICZjbG9ja3Nfc3RhdGUsIHRydWUpOwogCiAjaWYgZGVmaW5lZChDT05G SUdfRFJNX0FNRF9EQ19EQ04xXzApCi0JaWYgKGRjLT5jdHgtPmRjZV92ZXJzaW9uID09IERDTl9W RVJTSU9OXzFfMCkgeworCWlmIChkYy0+Y3R4LT5kY2VfdmVyc2lvbiA+PSBEQ05fVkVSU0lPTl8x XzApIHsKIAkJaWYgKGNvbnRleHQtPmJ3LmRjbi5jYWxjX2Nsay5mY2xrX2toegogCQkJCT4gZGMt PmN1cnJlbnRfY29udGV4dC0+YncuZGNuLmN1cl9jbGsuZmNsa19raHopIHsKIAkJCXN0cnVjdCBk bV9wcF9jbG9ja19mb3Jfdm9sdGFnZV9yZXEgY2xvY2s7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vYW1kL2Rpc3BsYXkvZGMvZ3Bpby9od19mYWN0b3J5LmMgYi9kcml2ZXJzL2dwdS9kcm0v YW1kL2Rpc3BsYXkvZGMvZ3Bpby9od19mYWN0b3J5LmMKaW5kZXggOGE4YjYxOWE2MGE4Li40MjVm MWM0ZmE4OTEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9ncGlv L2h3X2ZhY3RvcnkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZ3Bpby9o d19mYWN0b3J5LmMKQEAgLTg0LDYgKzg0LDcgQEAgYm9vbCBkYWxfaHdfZmFjdG9yeV9pbml0KAog CQlkYWxfaHdfZmFjdG9yeV9kY24xMF9pbml0KGZhY3RvcnkpOwogCQlyZXR1cm4gdHJ1ZTsKICNl bmRpZgorCiAJZGVmYXVsdDoKIAkJQVNTRVJUX0NSSVRJQ0FMKGZhbHNlKTsKIAkJcmV0dXJuIGZh bHNlOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2dwaW8vaHdf dHJhbnNsYXRlLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZ3Bpby9od190cmFu c2xhdGUuYwppbmRleCAzNmMwODJiZGE0YWUuLjNiNTVkNDViNjc3NSAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2dwaW8vaHdfdHJhbnNsYXRlLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2dwaW8vaHdfdHJhbnNsYXRlLmMKQEAgLTgwLDYg KzgwLDcgQEAgYm9vbCBkYWxfaHdfdHJhbnNsYXRlX2luaXQoCiAJCWRhbF9od190cmFuc2xhdGVf ZGNuMTBfaW5pdCh0cmFuc2xhdGUpOwogCQlyZXR1cm4gdHJ1ZTsKICNlbmRpZgorCiAJZGVmYXVs dDoKIAkJQlJFQUtfVE9fREVCVUdHRVIoKTsKIAkJcmV0dXJuIGZhbHNlOwpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2kyY2F1eC9pMmNhdXguYyBiL2RyaXZlcnMv Z3B1L2RybS9hbWQvZGlzcGxheS9kYy9pMmNhdXgvaTJjYXV4LmMKaW5kZXggNDVlNzY2ZWE3OWUz Li4xMDA2MWNjNGJhMzEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9k Yy9pMmNhdXgvaTJjYXV4LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2ky Y2F1eC9pMmNhdXguYwpAQCAtODgsMTAgKzg4LDExIEBAIHN0cnVjdCBpMmNhdXggKmRhbF9pMmNh dXhfY3JlYXRlKAogCQlyZXR1cm4gZGFsX2kyY2F1eF9kY2UxMDBfY3JlYXRlKGN0eCk7CiAJY2Fz ZSBEQ0VfVkVSU0lPTl8xMl8wOgogCQlyZXR1cm4gZGFsX2kyY2F1eF9kY2UxMjBfY3JlYXRlKGN0 eCk7Ci0JI2lmIGRlZmluZWQoQ09ORklHX0RSTV9BTURfRENfRENOMV8wKQorI2lmIGRlZmluZWQo Q09ORklHX0RSTV9BTURfRENfRENOMV8wKQogCWNhc2UgRENOX1ZFUlNJT05fMV8wOgogCQlyZXR1 cm4gZGFsX2kyY2F1eF9kY24xMF9jcmVhdGUoY3R4KTsKLQkjZW5kaWYKKyNlbmRpZgorCiAJZGVm YXVsdDoKIAkJQlJFQUtfVE9fREVCVUdHRVIoKTsKIAkJcmV0dXJuIE5VTEw7Ci0tIAoyLjExLjAK Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmFtZC1nZngg bWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMu ZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vYW1kLWdmeAo=