From: Rex Zhu Subject: [PATCH] drm/amd/powerplay: fix avfs state machine on fiji/polais. Date: Wed, 14 Jun 2017 17:43:45 +0800 Message-ID: <1497433425-7594-1-git-send-email-Rex.Zhu@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: 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: Rex Zhu Q2hhbmdlLUlkOiBJOTg3YTUzZTUxODU5MzRiZGY2OTI2ZjlkNjA2NWQyZWM2YWNhMDViYgpTaWdu ZWQtb2ZmLWJ5OiBSZXggWmh1IDxSZXguWmh1QGFtZC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJt L2FtZC9wb3dlcnBsYXkvc211bWdyL2Zpamlfc211bWdyLmMgfCAxMTQgKystLS0tLS0tLS0tLS0t LS0tLS0tCiAuLi4vZHJtL2FtZC9wb3dlcnBsYXkvc211bWdyL3BvbGFyaXMxMF9zbXVtZ3IuYyAg ICB8ICAgNSArLQogMiBmaWxlcyBjaGFuZ2VkLCAxMCBpbnNlcnRpb25zKCspLCAxMDkgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9wb3dlcnBsYXkvc211bWdy L2Zpamlfc211bWdyLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL3Bvd2VycGxheS9zbXVtZ3IvZmlq aV9zbXVtZ3IuYwppbmRleCBhMWNiNzg1Li42NmQzZmY4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vYW1kL3Bvd2VycGxheS9zbXVtZ3IvZmlqaV9zbXVtZ3IuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vYW1kL3Bvd2VycGxheS9zbXVtZ3IvZmlqaV9zbXVtZ3IuYwpAQCAtMTk0LDIyICsxOTQs MTAgQEAgc3RhdGljIGludCBmaWppX3N0YXJ0X2F2ZnNfYnRjKHN0cnVjdCBwcF9zbXVtZ3IgKnNt dW1ncikKIAlpbnQgcmVzdWx0ID0gMDsKIAlzdHJ1Y3QgZmlqaV9zbXVtZ3IgKnByaXYgPSAoc3Ry dWN0IGZpamlfc211bWdyICopKHNtdW1nci0+YmFja2VuZCk7CiAKLQlwcml2LT5hdmZzLkF2ZnNC dGNTdGF0dXMgPSBBVkZTX0JUQ19TVEFSVEVEOwogCWlmIChwcml2LT5hdmZzLkF2ZnNCdGNQYXJh bSkgewogCQlpZiAoIXNtdW1fc2VuZF9tc2dfdG9fc21jX3dpdGhfcGFyYW1ldGVyKHNtdW1nciwK IAkJCQlQUFNNQ19NU0dfUGVyZm9ybUJ0YywgcHJpdi0+YXZmcy5BdmZzQnRjUGFyYW0pKSB7Ci0J CQlpZiAoIXNtdW1fc2VuZF9tc2dfdG9fc21jKHNtdW1nciwgUFBTTUNfTVNHX0VuYWJsZUF2ZnMp KSB7Ci0JCQkJcHJpdi0+YXZmcy5BdmZzQnRjU3RhdHVzID0gQVZGU19CVENfQ09NUExFVEVEX1VO U0FWRUQ7Ci0JCQkJcmVzdWx0ID0gMDsKLQkJCX0gZWxzZSB7Ci0JCQkJcHJfZXJyKCJbQVZGU11b ZmlqaV9zdGFydF9hdmZzX2J0Y10gQXR0ZW1wdCIKLQkJCQkJCSIgdG8gRW5hYmxlIEFWRlMgRmFp bGVkISIpOwotCQkJCXNtdW1fc2VuZF9tc2dfdG9fc21jKHNtdW1nciwgUFBTTUNfTVNHX0Rpc2Fi bGVBdmZzKTsKLQkJCQlyZXN1bHQgPSAtMTsKLQkJCX0KLQkJfSBlbHNlIHsKLQkJCXByX2Vycigi W0FWRlNdW2Zpamlfc3RhcnRfYXZmc19idGNdICIKLQkJCQkJIlBlcmZvcm1CVEMgU01VIG1zZyBm YWlsZWQiKTsKKwkJCXByX2VycigiUGVyZm9ybUJUQyBTTVUgbXNnIGZhaWxlZCBcbiIpOwogCQkJ cmVzdWx0ID0gLTE7CiAJCX0KIAl9CkBAIC0yMjQsNDIgKzIxMiw2IEBAIHN0YXRpYyBpbnQgZmlq aV9zdGFydF9hdmZzX2J0YyhzdHJ1Y3QgcHBfc211bWdyICpzbXVtZ3IpCiAJcmV0dXJuIHJlc3Vs dDsKIH0KIAotc3RhdGljIGludCBmaWppX3NldHVwX3BtX2Z1c2VfZm9yX2F2ZnMoc3RydWN0IHBw X3NtdW1nciAqc211bWdyKQotewotCWludCByZXN1bHQgPSAwOwotCXVpbnQzMl90IHRhYmxlX3N0 YXJ0OwotCXVpbnQzMl90IGNoYXJ6X2ZyZXFfYWRkciwgaW52ZXJzaW9uX3ZvbHRhZ2VfYWRkciwg Y2hhcnpfZnJlcTsKLQl1aW50MTZfdCBpbnZlcnNpb25fdm9sdGFnZTsKLQotCWNoYXJ6X2ZyZXEg PSAweDMwNzUwMDAwOyAvKiBJbiAxMEtIeiB1bml0cyAweDAwMDA3NTMwIEFjdHVhbCB2YWx1ZSAq LwotCWludmVyc2lvbl92b2x0YWdlID0gMHgxQTA0OyAvKiBtViBRMTQuMiAweDQxQSBBY3R1YWwg dmFsdWUgKi8KLQotCVBQX0FTU0VSVF9XSVRIX0NPREUoMCA9PSBzbXU3X3JlYWRfc21jX3NyYW1f ZHdvcmQoc211bWdyLAotCQkJU01VN19GSVJNV0FSRV9IRUFERVJfTE9DQVRJT04gKyBvZmZzZXRv ZihTTVU3M19GaXJtd2FyZV9IZWFkZXIsCi0JCQkJCVBtRnVzZVRhYmxlKSwgJnRhYmxlX3N0YXJ0 LCAweDQwMDAwKSwKLQkJCSJbQVZGU11bRmlqaV9TZXR1cEdmeEx2bFN0cnVjdF0gU01VIGNvdWxk IG5vdCBjb21tdW5pY2F0ZSAiCi0JCQkic3RhcnRpbmcgYWRkcmVzcyBvZiBQbUZ1c2Ugc3RydWN0 dXJlIiwKLQkJCXJldHVybiAtMTspOwotCi0JY2hhcnpfZnJlcV9hZGRyID0gdGFibGVfc3RhcnQg KwotCQkJb2Zmc2V0b2Yoc3RydWN0IFNNVTczX0Rpc2NyZXRlX1BtRnVzZXMsIFBzbUNoYXJ6RnJl cSk7Ci0JaW52ZXJzaW9uX3ZvbHRhZ2VfYWRkciA9IHRhYmxlX3N0YXJ0ICsKLQkJCW9mZnNldG9m KHN0cnVjdCBTTVU3M19EaXNjcmV0ZV9QbUZ1c2VzLCBJbnZlcnNpb25Wb2x0YWdlKTsKLQotCXJl c3VsdCA9IHNtdTdfY29weV9ieXRlc190b19zbWMoc211bWdyLCBjaGFyel9mcmVxX2FkZHIsCi0J CQkodWludDhfdCAqKSgmY2hhcnpfZnJlcSksIHNpemVvZihjaGFyel9mcmVxKSwgMHg0MDAwMCk7 Ci0JUFBfQVNTRVJUX1dJVEhfQ09ERSgwID09IHJlc3VsdCwKLQkJCSJbQVZGU11bZmlqaV9zZXR1 cF9wbV9mdXNlX2Zvcl9hdmZzXSBjaGFyel9mcmVxIGNvdWxkIG5vdCAiCi0JCQkiYmUgcG9wdWxh dGVkLiIsIHJldHVybiAtMTspOwotCi0JcmVzdWx0ID0gc211N19jb3B5X2J5dGVzX3RvX3NtYyhz bXVtZ3IsIGludmVyc2lvbl92b2x0YWdlX2FkZHIsCi0JCQkodWludDhfdCAqKSgmaW52ZXJzaW9u X3ZvbHRhZ2UpLCBzaXplb2YoaW52ZXJzaW9uX3ZvbHRhZ2UpLCAweDQwMDAwKTsKLQlQUF9BU1NF UlRfV0lUSF9DT0RFKDAgPT0gcmVzdWx0LCAiW0FWRlNdW2Zpamlfc2V0dXBfcG1fZnVzZV9mb3Jf YXZmc10gIgotCQkJImNoYXJ6X2ZyZXEgY291bGQgbm90IGJlIHBvcHVsYXRlZC4iLCByZXR1cm4g LTE7KTsKLQotCXJldHVybiByZXN1bHQ7Ci19Ci0KIHN0YXRpYyBpbnQgZmlqaV9zZXR1cF9ncmFw aGljc19sZXZlbF9zdHJ1Y3R1cmUoc3RydWN0IHBwX3NtdW1nciAqc211bWdyKQogewogCWludDMy X3QgdnJfY29uZmlnOwpAQCAtMjk4LDY3ICsyNTAsMTggQEAgc3RhdGljIGludCBmaWppX3NldHVw X2dyYXBoaWNzX2xldmVsX3N0cnVjdHVyZShzdHJ1Y3QgcHBfc211bWdyICpzbXVtZ3IpCiAJcmV0 dXJuIDA7CiB9CiAKLS8qIFdvcmsgaW4gUHJvZ3Jlc3MgKi8KLXN0YXRpYyBpbnQgZmlqaV9yZXN0 b3JlX3ZmdF90YWJsZShzdHJ1Y3QgcHBfc211bWdyICpzbXVtZ3IpCi17Ci0Jc3RydWN0IGZpamlf c211bWdyICpwcml2ID0gKHN0cnVjdCBmaWppX3NtdW1nciAqKShzbXVtZ3ItPmJhY2tlbmQpOwot Ci0JaWYgKEFWRlNfQlRDX0NPTVBMRVRFRF9TQVZFRCA9PSBwcml2LT5hdmZzLkF2ZnNCdGNTdGF0 dXMpIHsKLQkJcHJpdi0+YXZmcy5BdmZzQnRjU3RhdHVzID0gQVZGU19CVENfQ09NUExFVEVEX1JF U1RPUkVEOwotCQlyZXR1cm4gMDsKLQl9IGVsc2UKLQkJcmV0dXJuIC1FSU5WQUw7Ci19Ci0KLS8q IFdvcmsgaW4gUHJvZ3Jlc3MgKi8KLXN0YXRpYyBpbnQgZmlqaV9zYXZlX3ZmdF90YWJsZShzdHJ1 Y3QgcHBfc211bWdyICpzbXVtZ3IpCi17Ci0Jc3RydWN0IGZpamlfc211bWdyICpwcml2ID0gKHN0 cnVjdCBmaWppX3NtdW1nciAqKShzbXVtZ3ItPmJhY2tlbmQpOwotCi0JaWYgKEFWRlNfQlRDX0NP TVBMRVRFRF9TQVZFRCA9PSBwcml2LT5hdmZzLkF2ZnNCdGNTdGF0dXMpIHsKLQkJcHJpdi0+YXZm cy5BdmZzQnRjU3RhdHVzID0gQVZGU19CVENfQ09NUExFVEVEX1JFU1RPUkVEOwotCQlyZXR1cm4g MDsKLQl9IGVsc2UKLQkJcmV0dXJuIC1FSU5WQUw7Ci19Ci0KIHN0YXRpYyBpbnQgZmlqaV9hdmZz X2V2ZW50X21ncihzdHJ1Y3QgcHBfc211bWdyICpzbXVtZ3IsIGJvb2wgc211X3N0YXJ0ZWQpCiB7 CiAJc3RydWN0IGZpamlfc211bWdyICpwcml2ID0gKHN0cnVjdCBmaWppX3NtdW1nciAqKShzbXVt Z3ItPmJhY2tlbmQpOwogCiAJc3dpdGNoIChwcml2LT5hdmZzLkF2ZnNCdGNTdGF0dXMpIHsKLQlj YXNlIEFWRlNfQlRDX0NPTVBMRVRFRF9TQVZFRDogLypTMyBTdGF0ZSAtIFByZSBTTVUgU3RhcnQg Ki8KLQkJcHJpdi0+YXZmcy5BdmZzQnRjU3RhdHVzID0gQVZGU19CVENfUkVTVE9SRVZGVF9GQUlM RUQ7Ci0JCVBQX0FTU0VSVF9XSVRIX0NPREUoMCA9PSBmaWppX3Jlc3RvcmVfdmZ0X3RhYmxlKHNt dW1nciksCi0JCQkJIltBVkZTXVtmaWppX2F2ZnNfZXZlbnRfbWdyXSBDb3VsZCBub3QgQ29weSBH cmFwaGljcyAiCi0JCQkJIkxldmVsIHRhYmxlIG92ZXIgdG8gU01VIiwKLQkJCQlyZXR1cm4gLTE7 KTsKLQkJcHJpdi0+YXZmcy5BdmZzQnRjU3RhdHVzID0gQVZGU19CVENfQ09NUExFVEVEX1JFU1RP UkVEOwotCQlicmVhazsKLQljYXNlIEFWRlNfQlRDX0NPTVBMRVRFRF9SRVNUT1JFRDogLypTMyBT dGF0ZSAtIFBvc3QgU01VIFN0YXJ0Ki8KLQkJcHJpdi0+YXZmcy5BdmZzQnRjU3RhdHVzID0gQVZG U19CVENfU01VTVNHX0VSUk9SOwotCQlQUF9BU1NFUlRfV0lUSF9DT0RFKDAgPT0gc211bV9zZW5k X21zZ190b19zbWMoc211bWdyLAotCQkJCTB4NjY2KSwKLQkJCQkiW0FWRlNdW2ZpamlfYXZmc19l dmVudF9tZ3JdIFNNVSBkaWQgbm90IHJlc3BvbmQgIgotCQkJCSJjb3JyZWN0bHkgdG8gVmZ0VGFi bGVJc1ZhbGlkIE1zZyIsCi0JCQkJcmV0dXJuIC0xOyk7Ci0JCXByaXYtPmF2ZnMuQXZmc0J0Y1N0 YXR1cyA9IEFWRlNfQlRDX1NNVU1TR19FUlJPUjsKLQkJUFBfQVNTRVJUX1dJVEhfQ09ERSgwID09 IHNtdW1fc2VuZF9tc2dfdG9fc21jKHNtdW1nciwKLQkJCQlQUFNNQ19NU0dfRW5hYmxlQXZmcyks Ci0JCQkJIltBVkZTXVtmaWppX2F2ZnNfZXZlbnRfbWdyXSBTTVUgZGlkIG5vdCByZXNwb25kICIK LQkJCQkiY29ycmVjdGx5IHRvIEVuYWJsZUF2ZnMgTWVzc2FnZSBNc2ciLAotCQkJCXJldHVybiAt MTspOwotCQlwcml2LT5hdmZzLkF2ZnNCdGNTdGF0dXMgPSBBVkZTX0JUQ19DT01QTEVURURfU0FW RUQ7CisJY2FzZSBBVkZTX0JUQ19DT01QTEVURURfUFJFVklPVVNMWToKIAkJYnJlYWs7CisKIAlj YXNlIEFWRlNfQlRDX0JPT1Q6IC8qQ29sZCBCb290IFN0YXRlIC0gUG9zdCBTTVUgU3RhcnQqLwog CQlpZiAoIXNtdV9zdGFydGVkKQogCQkJYnJlYWs7CiAJCXByaXYtPmF2ZnMuQXZmc0J0Y1N0YXR1 cyA9IEFWRlNfQlRDX0ZBSUxFRDsKLQkJUFBfQVNTRVJUX1dJVEhfQ09ERSgwID09IGZpamlfc2V0 dXBfcG1fZnVzZV9mb3JfYXZmcyhzbXVtZ3IpLAotCQkJCSJbQVZGU11bZmlqaV9hdmZzX2V2ZW50 X21ncl0gRmFpbHVyZSBhdCAiCi0JCQkJImZpamlfc2V0dXBfcG1fZnVzZV9mb3JfYXZmcyIsCi0J CQkJcmV0dXJuIC0xOyk7Ci0JCXByaXYtPmF2ZnMuQXZmc0J0Y1N0YXR1cyA9IEFWRlNfQlRDX0RQ TVRBQkxFU0VUVVBfRkFJTEVEOwogCQlQUF9BU1NFUlRfV0lUSF9DT0RFKDAgPT0gZmlqaV9zZXR1 cF9ncmFwaGljc19sZXZlbF9zdHJ1Y3R1cmUoc211bWdyKSwKIAkJCQkiW0FWRlNdW2ZpamlfYXZm c19ldmVudF9tZ3JdIENvdWxkIG5vdCBDb3B5IEdyYXBoaWNzIExldmVsIgogCQkJCSIgdGFibGUg b3ZlciB0byBTTVUiLApAQCAtMzczLDE4ICsyNzYsMTUgQEAgc3RhdGljIGludCBmaWppX2F2ZnNf ZXZlbnRfbWdyKHN0cnVjdCBwcF9zbXVtZ3IgKnNtdW1nciwgYm9vbCBzbXVfc3RhcnRlZCkKIAkJ CQkiW0FWRlNdW2ZpamlfYXZmc19ldmVudF9tZ3JdIEZhaWx1cmUgYXQgIgogCQkJCSJmaWppX3N0 YXJ0X2F2ZnNfYnRjLiBBVkZTIERpc2FibGVkIiwKIAkJCQlyZXR1cm4gLTE7KTsKLQkJcHJpdi0+ YXZmcy5BdmZzQnRjU3RhdHVzID0gQVZGU19CVENfU0FWRVZGVF9GQUlMRUQ7Ci0JCVBQX0FTU0VS VF9XSVRIX0NPREUoMCA9PSBmaWppX3NhdmVfdmZ0X3RhYmxlKHNtdW1nciksCi0JCQkJIltBVkZT XVtmaWppX2F2ZnNfZXZlbnRfbWdyXSBDb3VsZCBub3Qgc2F2ZSBWRlQgVGFibGUiLAotCQkJCXJl dHVybiAtMTspOwotCQlwcml2LT5hdmZzLkF2ZnNCdGNTdGF0dXMgPSBBVkZTX0JUQ19DT01QTEVU RURfU0FWRUQ7CisKKwkJcHJpdi0+YXZmcy5BdmZzQnRjU3RhdHVzID0gIEFWRlNfQlRDX0VOQUJM RUFWRlM7CiAJCWJyZWFrOwogCWNhc2UgQVZGU19CVENfRElTQUJMRUQ6IC8qIERvIG5vdGhpbmcg Ki8KLQkJYnJlYWs7CiAJY2FzZSBBVkZTX0JUQ19OT1RTVVBQT1JURUQ6IC8qIERvIG5vdGhpbmcg Ki8KKwljYXNlIEFWRlNfQlRDX0VOQUJMRUFWRlM6CiAJCWJyZWFrOwogCWRlZmF1bHQ6Ci0JCXBy X2VycigiW0FWRlNdIFNvbWV0aGluZyBpcyBicm9rZW4uIFNlZSBsb2chIik7CisJCXByX2Vycigi QVZGUyBmYWlsZWQgc3RhdHVzIGlzICV4ICFcbiIsIHByaXYtPmF2ZnMuQXZmc0J0Y1N0YXR1cyk7 CiAJCWJyZWFrOwogCX0KIAlyZXR1cm4gMDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9h bWQvcG93ZXJwbGF5L3NtdW1nci9wb2xhcmlzMTBfc211bWdyLmMgYi9kcml2ZXJzL2dwdS9kcm0v YW1kL3Bvd2VycGxheS9zbXVtZ3IvcG9sYXJpczEwX3NtdW1nci5jCmluZGV4IDk2MTZjZWQuLjdl MDM0NzAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvcG93ZXJwbGF5L3NtdW1nci9w b2xhcmlzMTBfc211bWdyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9wb3dlcnBsYXkvc211 bWdyL3BvbGFyaXMxMF9zbXVtZ3IuYwpAQCAtMjAwLDE1ICsyMDAsMTYgQEAgc3RhdGljIGludCBw b2xhcmlzMTBfc2V0dXBfZ3JhcGhpY3NfbGV2ZWxfc3RydWN0dXJlKHN0cnVjdCBwcF9zbXVtZ3Ig KnNtdW1ncikKIAkJUFBfQVNTRVJUX1dJVEhfQ09ERSgwID09IHBvbGFyaXMxMF9wZXJmb3JtX2J0 YyhzbXVtZ3IpLAogCQkJCQkiW0FWRlNdW1BvbGFyaXMxMF9BVkZTRXZlbnRNZ3JdIEZhaWx1cmUg YXQgU211UG9sYXJpczEwX1BlcmZvcm1CVEMuIEFWRlMgRGlzYWJsZWQiLAogCQkJCSByZXR1cm4g LTEpOwotCisJCXNtdV9kYXRhLT5hdmZzLmF2ZnNfYnRjX3N0YXR1cyA9IEFWRlNfQlRDX0VOQUJM RUFWRlM7CiAJCWJyZWFrOwogCiAJY2FzZSBBVkZTX0JUQ19ESVNBQkxFRDoKKwljYXNlIEFWRlNf QlRDX0VOQUJMRUFWRlM6CiAJY2FzZSBBVkZTX0JUQ19OT1RTVVBQT1JURUQ6CiAJCWJyZWFrOwog CiAJZGVmYXVsdDoKLQkJcHJfaW5mbygiW0FWRlNdIFNvbWV0aGluZyBpcyBicm9rZW4uIFNlZSBs b2chIik7CisJCXByX2VycigiQVZGUyBmYWlsZWQgc3RhdHVzIGlzICV4IVxuIiwgc211X2RhdGEt PmF2ZnMuYXZmc19idGNfc3RhdHVzKTsKIAkJYnJlYWs7CiAJfQogCi0tIAoxLjkuMQoKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KYW1kLWdmeCBtYWlsaW5n IGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVz a3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4Cg==