From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Deucher Subject: [PATCH 4/8] ASoC: AMD: added condition checks for CZ specific code Date: Fri, 23 Jun 2017 12:35:02 -0400 Message-ID: <1498235706-31111-5-git-send-email-alexander.deucher@amd.com> References: <1498235706-31111-1-git-send-email-alexander.deucher@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1498235706-31111-1-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw@public.gmane.org, airlied-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org, broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org, Vijendar.Mukunda-5C7GfCeVMHo@public.gmane.org, rajeevkumar.linux-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org Cc: tiwai-l3A5Bk7waGM@public.gmane.org, Alex Deucher , lgirdwood-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org, perex-/Fr2/VpizcU@public.gmane.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogVmlqZW5kYXIgTXVrdW5kYSA8VmlqZW5kYXIuTXVrdW5kYUBhbWQuY29tPgoKQWRkZWQg Y29uZGl0aW9uIGNoZWNrcyBmb3IgQ1ogc3BlY2lmaWMgY29kZSBiYXNlZCBvbiBhc2ljX3R5cGUu ClN0b25leSBzcGVjaWZpYyBjb2RlIHdpbGwgYmUgYWRkZWQgaW4gYSBmdXR1cmUgY29tbWl0LgoK UmV2aWV3ZWQtYnk6IEFsZXggRGV1Y2hlciA8YWxleGFuZGVyLmRldWNoZXJAYW1kLmNvbT4KU2ln bmVkLW9mZi1ieTogVmlqZW5kYXIgTXVrdW5kYSA8VmlqZW5kYXIuTXVrdW5kYUBhbWQuY29tPgpT aWduZWQtb2ZmLWJ5OiBBbGV4IERldWNoZXIgPGFsZXhhbmRlci5kZXVjaGVyQGFtZC5jb20+Ci0t LQogc291bmQvc29jL2FtZC9hY3AtcGNtLWRtYS5jIHwgNjIgKysrKysrKysrKysrKysrKysrKysr KysrKysrKy0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMzkgaW5zZXJ0aW9ucygr KSwgMjMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvc291bmQvc29jL2FtZC9hY3AtcGNtLWRt YS5jIGIvc291bmQvc29jL2FtZC9hY3AtcGNtLWRtYS5jCmluZGV4IGRjYmY5OTcuLmU0OGFlNWQg MTAwNjQ0Ci0tLSBhL3NvdW5kL3NvYy9hbWQvYWNwLXBjbS1kbWEuYworKysgYi9zb3VuZC9zb2Mv YW1kL2FjcC1wY20tZG1hLmMKQEAgLTM0LDYgKzM0LDggQEAKIAogI2RlZmluZSBNQVhfQlVGRkVS IChQTEFZQkFDS19NQVhfUEVSSU9EX1NJWkUgKiBQTEFZQkFDS19NQVhfTlVNX1BFUklPRFMpCiAj ZGVmaW5lIE1JTl9CVUZGRVIgTUFYX0JVRkZFUgorI2RlZmluZSBDSElQX1NUT05FWSAxNAorI2Rl ZmluZSBDSElQX0NBUlJJWk8gMTMKIAogc3RhdGljIGNvbnN0IHN0cnVjdCBzbmRfcGNtX2hhcmR3 YXJlIGFjcF9wY21faGFyZHdhcmVfcGxheWJhY2sgPSB7CiAJLmluZm8gPSBTTkRSVl9QQ01fSU5G T19JTlRFUkxFQVZFRCB8CkBAIC00MTksNyArNDIxLDcgQEAgc3RhdGljIHZvaWQgYWNwX3NldF9z cmFtX2Jhbmtfc3RhdGUodm9pZCBfX2lvbWVtICphY3BfbW1pbywgdTE2IGJhbmssCiB9CiAKIC8q IEluaXRpYWxpemUgYW5kIGJyaW5nIEFDUCBoYXJkd2FyZSB0byBkZWZhdWx0IHN0YXRlLiAqLwot c3RhdGljIGludCBhY3BfaW5pdCh2b2lkIF9faW9tZW0gKmFjcF9tbWlvKQorc3RhdGljIGludCBh Y3BfaW5pdCh2b2lkIF9faW9tZW0gKmFjcF9tbWlvLCB1MzIgYXNpY190eXBlKQogewogCXUxNiBi YW5rOwogCXUzMiB2YWwsIGNvdW50LCBzcmFtX3B0ZV9vZmZzZXQ7CkBAIC00OTQsOCArNDk2LDEw IEBAIHN0YXRpYyBpbnQgYWNwX2luaXQodm9pZCBfX2lvbWVtICphY3BfbW1pbykKIAkqIE5vdywg dHVybiBvZmYgYWxsIG9mIHRoZW0uIFRoaXMgY2FuJ3QgYmUgZG9uZSBpbiAncG93ZXJvbicgb2YK IAkqIEFDUCBwbSBkb21haW4sIGFzIHRoaXMgcmVxdWlyZXMgQUNQIHRvIGJlIGluaXRpYWxpemVk LgogCSovCi0JZm9yIChiYW5rID0gMTsgYmFuayA8IDQ4OyBiYW5rKyspCi0JCWFjcF9zZXRfc3Jh bV9iYW5rX3N0YXRlKGFjcF9tbWlvLCBiYW5rLCBmYWxzZSk7CisJaWYgKGFzaWNfdHlwZSA9PSBD SElQX0NBUlJJWk8pIHsKKwkJZm9yIChiYW5rID0gMTsgYmFuayA8IDQ4OyBiYW5rKyspCisJCQlh Y3Bfc2V0X3NyYW1fYmFua19zdGF0ZShhY3BfbW1pbywgYmFuaywgZmFsc2UpOworCX0KIAogCXJl dHVybiAwOwogfQpAQCAtNjQ2LDE0ICs2NTAsMTggQEAgc3RhdGljIGludCBhY3BfZG1hX29wZW4o c3RydWN0IHNuZF9wY21fc3Vic3RyZWFtICpzdWJzdHJlYW0pCiAKIAlpZiAoc3Vic3RyZWFtLT5z dHJlYW0gPT0gU05EUlZfUENNX1NUUkVBTV9QTEFZQkFDSykgewogCQlpbnRyX2RhdGEtPnBsYXlf c3RyZWFtID0gc3Vic3RyZWFtOwotCQlmb3IgKGJhbmsgPSAxOyBiYW5rIDw9IDQ7IGJhbmsrKykK LQkJCWFjcF9zZXRfc3JhbV9iYW5rX3N0YXRlKGludHJfZGF0YS0+YWNwX21taW8sIGJhbmssCi0J CQkJCQl0cnVlKTsKKwkJaWYgKGludHJfZGF0YS0+YXNpY190eXBlID09IENISVBfQ0FSUklaTykg eworCQkJZm9yIChiYW5rID0gMTsgYmFuayA8PSA0OyBiYW5rKyspCisJCQkJYWNwX3NldF9zcmFt X2Jhbmtfc3RhdGUoaW50cl9kYXRhLT5hY3BfbW1pbywKKwkJCQkJCQliYW5rLCB0cnVlKTsKKwkJ fQogCX0gZWxzZSB7CiAJCWludHJfZGF0YS0+Y2FwdHVyZV9zdHJlYW0gPSBzdWJzdHJlYW07Ci0J CWZvciAoYmFuayA9IDU7IGJhbmsgPD0gODsgYmFuaysrKQotCQkJYWNwX3NldF9zcmFtX2Jhbmtf c3RhdGUoaW50cl9kYXRhLT5hY3BfbW1pbywgYmFuaywKLQkJCQkJCXRydWUpOworCQlpZiAoaW50 cl9kYXRhLT5hc2ljX3R5cGUgPT0gQ0hJUF9DQVJSSVpPKSB7CisJCQlmb3IgKGJhbmsgPSA1OyBi YW5rIDw9IDg7IGJhbmsrKykKKwkJCQlhY3Bfc2V0X3NyYW1fYmFua19zdGF0ZShpbnRyX2RhdGEt PmFjcF9tbWlvLAorCQkJCQkJCWJhbmssIHRydWUpOworCQl9CiAJfQogCiAJcmV0dXJuIDA7CkBA IC04NjksMTQgKzg3NywxOCBAQCBzdGF0aWMgaW50IGFjcF9kbWFfY2xvc2Uoc3RydWN0IHNuZF9w Y21fc3Vic3RyZWFtICpzdWJzdHJlYW0pCiAKIAlpZiAoc3Vic3RyZWFtLT5zdHJlYW0gPT0gU05E UlZfUENNX1NUUkVBTV9QTEFZQkFDSykgewogCQlhZGF0YS0+cGxheV9zdHJlYW0gPSBOVUxMOwot CQlmb3IgKGJhbmsgPSAxOyBiYW5rIDw9IDQ7IGJhbmsrKykKLQkJCWFjcF9zZXRfc3JhbV9iYW5r X3N0YXRlKGFkYXRhLT5hY3BfbW1pbywgYmFuaywKLQkJCQkJCWZhbHNlKTsKLQl9IGVsc2Ugewor CQlpZiAoYWRhdGEtPmFzaWNfdHlwZSA9PSBDSElQX0NBUlJJWk8pIHsKKwkJCWZvciAoYmFuayA9 IDE7IGJhbmsgPD0gNDsgYmFuaysrKQorCQkJCWFjcF9zZXRfc3JhbV9iYW5rX3N0YXRlKGFkYXRh LT5hY3BfbW1pbywgYmFuaywKKwkJCQlmYWxzZSk7CisJCX0KKwl9IGVsc2UgIHsKIAkJYWRhdGEt PmNhcHR1cmVfc3RyZWFtID0gTlVMTDsKLQkJZm9yIChiYW5rID0gNTsgYmFuayA8PSA4OyBiYW5r KyspCi0JCQlhY3Bfc2V0X3NyYW1fYmFua19zdGF0ZShhZGF0YS0+YWNwX21taW8sIGJhbmssCi0J CQkJCQlmYWxzZSk7CisJCWlmIChhZGF0YS0+YXNpY190eXBlID09IENISVBfQ0FSUklaTykgewor CQkJZm9yIChiYW5rID0gNTsgYmFuayA8PSA4OyBiYW5rKyspCisJCQkJYWNwX3NldF9zcmFtX2Jh bmtfc3RhdGUoYWRhdGEtPmFjcF9tbWlvLCBiYW5rLAorCQkJCQkJICAgICBmYWxzZSk7CisJCX0K IAl9CiAKIAkvKiBEaXNhYmxlIEFDUCBpcnEsIHdoZW4gdGhlIGN1cnJlbnQgc3RyZWFtIGlzIGJl aW5nIGNsb3NlZCBhbmQKQEAgLTk0NSw3ICs5NTcsNyBAQCBzdGF0aWMgaW50IGFjcF9hdWRpb19w cm9iZShzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2KQogCWRldl9zZXRfZHJ2ZGF0YSgmcGRl di0+ZGV2LCBhdWRpb19kcnZfZGF0YSk7CiAKIAkvKiBJbml0aWFsaXplIHRoZSBBQ1AgKi8KLQlh Y3BfaW5pdChhdWRpb19kcnZfZGF0YS0+YWNwX21taW8pOworCWFjcF9pbml0KGF1ZGlvX2Rydl9k YXRhLT5hY3BfbW1pbywgYXVkaW9fZHJ2X2RhdGEtPmFzaWNfdHlwZSk7CiAKIAlzdGF0dXMgPSBz bmRfc29jX3JlZ2lzdGVyX3BsYXRmb3JtKCZwZGV2LT5kZXYsICZhY3BfYXNvY19wbGF0Zm9ybSk7 CiAJaWYgKHN0YXR1cyAhPSAwKSB7CkBAIC05NzYsMTkgKzk4OCwyMyBAQCBzdGF0aWMgaW50IGFj cF9wY21fcmVzdW1lKHN0cnVjdCBkZXZpY2UgKmRldikKIAl1MTYgYmFuazsKIAlzdHJ1Y3QgYXVk aW9fZHJ2X2RhdGEgKmFkYXRhID0gZGV2X2dldF9kcnZkYXRhKGRldik7CiAKLQlhY3BfaW5pdChh ZGF0YS0+YWNwX21taW8pOworCWFjcF9pbml0KGFkYXRhLT5hY3BfbW1pbywgYWRhdGEtPmFzaWNf dHlwZSk7CiAKIAlpZiAoYWRhdGEtPnBsYXlfc3RyZWFtICYmIGFkYXRhLT5wbGF5X3N0cmVhbS0+ cnVudGltZSkgewotCQlmb3IgKGJhbmsgPSAxOyBiYW5rIDw9IDQ7IGJhbmsrKykKLQkJCWFjcF9z ZXRfc3JhbV9iYW5rX3N0YXRlKGFkYXRhLT5hY3BfbW1pbywgYmFuaywKKwkJaWYgKGFkYXRhLT5h c2ljX3R5cGUgPT0gQ0hJUF9DQVJSSVpPKSB7CisJCQlmb3IgKGJhbmsgPSAxOyBiYW5rIDw9IDQ7 IGJhbmsrKykKKwkJCQlhY3Bfc2V0X3NyYW1fYmFua19zdGF0ZShhZGF0YS0+YWNwX21taW8sIGJh bmssCiAJCQkJCQl0cnVlKTsKKwkJfQogCQljb25maWdfYWNwX2RtYShhZGF0YS0+YWNwX21taW8s CiAJCQkJYWRhdGEtPnBsYXlfc3RyZWFtLT5ydW50aW1lLT5wcml2YXRlX2RhdGEpOwogCX0KIAlp ZiAoYWRhdGEtPmNhcHR1cmVfc3RyZWFtICYmIGFkYXRhLT5jYXB0dXJlX3N0cmVhbS0+cnVudGlt ZSkgewotCQlmb3IgKGJhbmsgPSA1OyBiYW5rIDw9IDg7IGJhbmsrKykKLQkJCWFjcF9zZXRfc3Jh bV9iYW5rX3N0YXRlKGFkYXRhLT5hY3BfbW1pbywgYmFuaywKKwkJaWYgKGFkYXRhLT5hc2ljX3R5 cGUgPT0gQ0hJUF9DQVJSSVpPKSB7CisJCQlmb3IgKGJhbmsgPSA1OyBiYW5rIDw9IDg7IGJhbmsr KykKKwkJCQlhY3Bfc2V0X3NyYW1fYmFua19zdGF0ZShhZGF0YS0+YWNwX21taW8sIGJhbmssCiAJ CQkJCQl0cnVlKTsKKwkJfQogCQljb25maWdfYWNwX2RtYShhZGF0YS0+YWNwX21taW8sCiAJCQkJ YWRhdGEtPmNhcHR1cmVfc3RyZWFtLT5ydW50aW1lLT5wcml2YXRlX2RhdGEpOwogCX0KQEAgLTEw MDksNyArMTAyNSw3IEBAIHN0YXRpYyBpbnQgYWNwX3BjbV9ydW50aW1lX3Jlc3VtZShzdHJ1Y3Qg ZGV2aWNlICpkZXYpCiB7CiAJc3RydWN0IGF1ZGlvX2Rydl9kYXRhICphZGF0YSA9IGRldl9nZXRf ZHJ2ZGF0YShkZXYpOwogCi0JYWNwX2luaXQoYWRhdGEtPmFjcF9tbWlvKTsKKwlhY3BfaW5pdChh ZGF0YS0+YWNwX21taW8sIGFkYXRhLT5hc2ljX3R5cGUpOwogCWFjcF9yZWdfd3JpdGUoMSwgYWRh dGEtPmFjcF9tbWlvLCBtbUFDUF9FWFRFUk5BTF9JTlRSX0VOQik7CiAJcmV0dXJuIDA7CiB9Ci0t IAoyLjUuNQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K YW1kLWdmeCBtYWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4Cg==