From: Tom St Denis Subject: [PATCH 2/2] drm/amd/powerplay: Fix powerplay bugs Date: Mon, 2 Oct 2017 10:27:38 -0400 Message-ID: <20171002142738.20682-3-tom.stdenis@amd.com> References: <20171002142738.20682-1-tom.stdenis@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20171002142738.20682-1-tom.stdenis-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: Tom St Denis SW50cm9kdWNlZCBieSBjb21taXRzOgpjZjUyMzU2ODRmOTczNjI3OGYzOTVkMTY2ODg3NjAwMDQ5 MDEyMGQyCjc0MDFkNDcxODVkZWFhNjNmMjM1NTNjNjY4MGFlNGE0YzA4MjQ1OTUKZjE3NDM5NDQ4 NmUxYjU3NTkzMzg1NmNmYzJiNjA1MjZkMWFjNTc4OAoKU2lnbmVkLW9mZi1ieTogVG9tIFN0IERl bmlzIDx0b20uc3RkZW5pc0BhbWQuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvcG93ZXJw bGF5L2h3bWdyL3J2X2h3bWdyLmMgfCAyNCArKysrKysrKysrKystLS0tLS0tLS0tLS0KIDEgZmls ZSBjaGFuZ2VkLCAxMiBpbnNlcnRpb25zKCspLCAxMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vYW1kL3Bvd2VycGxheS9od21nci9ydl9od21nci5jIGIvZHJpdmVy cy9ncHUvZHJtL2FtZC9wb3dlcnBsYXkvaHdtZ3IvcnZfaHdtZ3IuYwppbmRleCA1MTM1MzI4MTk1 MTcuLjkzODAxMDg0MmM3ZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9wb3dlcnBs YXkvaHdtZ3IvcnZfaHdtZ3IuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL3Bvd2VycGxheS9o d21nci9ydl9od21nci5jCkBAIC00MjEsMjEgKzQyMSwyMSBAQCBzdGF0aWMgaW50IHJ2X3BvcHVs YXRlX2Nsb2NrX3RhYmxlKHN0cnVjdCBwcF9od21nciAqaHdtZ3IpCiAJcnZfZ2V0X2Nsb2NrX3Zv bHRhZ2VfZGVwZW5kZW5jeV90YWJsZShod21nciwgJnBpbmZvLT52ZGRfZGVwX29uX3BoeWNsaywK IAkJCQkJQVJSQVlfU0laRShWZGRQaHlDbGspLCAmVmRkUGh5Q2xrWzBdKTsKIAotCVBQX0FTU0VS VF9XSVRIX0NPREUoIXNtdW1fc2VuZF9tc2dfdG9fc21jKGh3bWdyLT5zbXVtZ3IsCisJUFBfQVNT RVJUX1dJVEhfQ09ERSghc211bV9zZW5kX21zZ190b19zbWMoaHdtZ3IsCiAJCQlQUFNNQ19NU0df R2V0TWluR2Z4Y2xrRnJlcXVlbmN5KSwKIAkJCSJBdHRlbXB0IHRvIGdldCBtaW4gR0ZYQ0xLIEZh aWxlZCEiLAogCQkJcmV0dXJuIC0xKTsKLQlQUF9BU1NFUlRfV0lUSF9DT0RFKCFydl9yZWFkX2Fy Z19mcm9tX3NtYyhod21nci0+c211bWdyLAorCVBQX0FTU0VSVF9XSVRIX0NPREUoIXJ2X3JlYWRf YXJnX2Zyb21fc21jKGh3bWdyLAogCQkJJnJlc3VsdCksCiAJCQkiQXR0ZW1wdCB0byBnZXQgbWlu IEdGWENMSyBGYWlsZWQhIiwKIAkJCXJldHVybiAtMSk7CiAJcnZfZGF0YS0+Z2Z4X21pbl9mcmVx X2xpbWl0ID0gcmVzdWx0ICogMTAwOwogCi0JUFBfQVNTRVJUX1dJVEhfQ09ERSghc211bV9zZW5k X21zZ190b19zbWMoaHdtZ3ItPnNtdW1nciwKKwlQUF9BU1NFUlRfV0lUSF9DT0RFKCFzbXVtX3Nl bmRfbXNnX3RvX3NtYyhod21nciwKIAkJCVBQU01DX01TR19HZXRNYXhHZnhjbGtGcmVxdWVuY3kp LAogCQkJIkF0dGVtcHQgdG8gZ2V0IG1heCBHRlhDTEsgRmFpbGVkISIsCiAJCQlyZXR1cm4gLTEp OwotCVBQX0FTU0VSVF9XSVRIX0NPREUoIXJ2X3JlYWRfYXJnX2Zyb21fc21jKGh3bWdyLT5zbXVt Z3IsCisJUFBfQVNTRVJUX1dJVEhfQ09ERSghcnZfcmVhZF9hcmdfZnJvbV9zbWMoaHdtZ3IsCiAJ CQkmcmVzdWx0KSwKIAkJCSJBdHRlbXB0IHRvIGdldCBtYXggR0ZYQ0xLIEZhaWxlZCEiLAogCQkJ cmV0dXJuIC0xKTsKQEAgLTYyNiwxMSArNjI2LDExIEBAIHN0YXRpYyBpbnQgcnZfcHJpbnRfY2xv Y2tfbGV2ZWxzKHN0cnVjdCBwcF9od21nciAqaHdtZ3IsCiAKIAlzd2l0Y2ggKHR5cGUpIHsKIAlj YXNlIFBQX1NDTEs6Ci0JCVBQX0FTU0VSVF9XSVRIX0NPREUoIXNtdW1fc2VuZF9tc2dfdG9fc21j KGh3bWdyLT5zbXVtZ3IsCisJCVBQX0FTU0VSVF9XSVRIX0NPREUoIXNtdW1fc2VuZF9tc2dfdG9f c21jKGh3bWdyLAogCQkJCVBQU01DX01TR19HZXRHZnhjbGtGcmVxdWVuY3kpLAogCQkJCSJBdHRl bXB0IHRvIGdldCBjdXJyZW50IEdGWENMSyBGYWlsZWQhIiwKIAkJCQlyZXR1cm4gLTEpOwotCQlQ UF9BU1NFUlRfV0lUSF9DT0RFKCFydl9yZWFkX2FyZ19mcm9tX3NtYyhod21nci0+c211bWdyLAor CQlQUF9BU1NFUlRfV0lUSF9DT0RFKCFydl9yZWFkX2FyZ19mcm9tX3NtYyhod21nciwKIAkJCQkm bm93KSwKIAkJCQkiQXR0ZW1wdCB0byBnZXQgY3VycmVudCBHRlhDTEsgRmFpbGVkISIsCiAJCQkJ cmV0dXJuIC0xKTsKQEAgLTY0NSwxMSArNjQ1LDExIEBAIHN0YXRpYyBpbnQgcnZfcHJpbnRfY2xv Y2tfbGV2ZWxzKHN0cnVjdCBwcF9od21nciAqaHdtZ3IsCiAJCQkJID09IG5vdykgPyAiKiIgOiAi Iik7CiAJCWJyZWFrOwogCWNhc2UgUFBfTUNMSzoKLQkJUFBfQVNTRVJUX1dJVEhfQ09ERSghc211 bV9zZW5kX21zZ190b19zbWMoaHdtZ3ItPnNtdW1nciwKKwkJUFBfQVNTRVJUX1dJVEhfQ09ERSgh c211bV9zZW5kX21zZ190b19zbWMoaHdtZ3IsCiAJCQkJUFBTTUNfTVNHX0dldEZjbGtGcmVxdWVu Y3kpLAogCQkJCSJBdHRlbXB0IHRvIGdldCBjdXJyZW50IE1FTUNMSyBGYWlsZWQhIiwKIAkJCQly ZXR1cm4gLTEpOwotCQlQUF9BU1NFUlRfV0lUSF9DT0RFKCFydl9yZWFkX2FyZ19mcm9tX3NtYyho d21nci0+c211bWdyLAorCQlQUF9BU1NFUlRfV0lUSF9DT0RFKCFydl9yZWFkX2FyZ19mcm9tX3Nt Yyhod21nciwKIAkJCQkmbm93KSwKIAkJCQkiQXR0ZW1wdCB0byBnZXQgY3VycmVudCBNRU1DTEsg RmFpbGVkISIsCiAJCQkJcmV0dXJuIC0xKTsKQEAgLTkwMSwxOCArOTAxLDE4IEBAIHN0YXRpYyBp bnQgcnZfcmVhZF9zZW5zb3Ioc3RydWN0IHBwX2h3bWdyICpod21nciwgaW50IGlkeCwKIAogCXN3 aXRjaCAoaWR4KSB7CiAJY2FzZSBBTURHUFVfUFBfU0VOU09SX0dGWF9TQ0xLOgotCQlyZXQgPSBz bXVtX3NlbmRfbXNnX3RvX3NtYyhod21nci0+c211bWdyLCBQUFNNQ19NU0dfR2V0R2Z4Y2xrRnJl cXVlbmN5KTsKKwkJcmV0ID0gc211bV9zZW5kX21zZ190b19zbWMoaHdtZ3IsIFBQU01DX01TR19H ZXRHZnhjbGtGcmVxdWVuY3kpOwogCQlpZiAoIXJldCkgewotCQkJcnZfcmVhZF9hcmdfZnJvbV9z bWMoaHdtZ3ItPnNtdW1nciwgJnNjbGspOworCQkJcnZfcmVhZF9hcmdfZnJvbV9zbWMoaHdtZ3Is ICZzY2xrKTsKIAkJCS8qIGluIHVuaXRzIG9mIDEwS0haICovCiAJCQkqKCh1aW50MzJfdCAqKXZh bHVlKSA9IHNjbGsgKiAxMDA7CiAJCQkqc2l6ZSA9IDQ7CiAJCX0KIAkJYnJlYWs7CiAJY2FzZSBB TURHUFVfUFBfU0VOU09SX0dGWF9NQ0xLOgotCQlyZXQgPSBzbXVtX3NlbmRfbXNnX3RvX3NtYyho d21nci0+c211bWdyLCBQUFNNQ19NU0dfR2V0RmNsa0ZyZXF1ZW5jeSk7CisJCXJldCA9IHNtdW1f c2VuZF9tc2dfdG9fc21jKGh3bWdyLCBQUFNNQ19NU0dfR2V0RmNsa0ZyZXF1ZW5jeSk7CiAJCWlm ICghcmV0KSB7Ci0JCQlydl9yZWFkX2FyZ19mcm9tX3NtYyhod21nci0+c211bWdyLCAmbWNsayk7 CisJCQlydl9yZWFkX2FyZ19mcm9tX3NtYyhod21nciwgJm1jbGspOwogCQkJLyogaW4gdW5pdHMg b2YgMTBLSFogKi8KIAkJCSooKHVpbnQzMl90ICopdmFsdWUpID0gbWNsayAqIDEwMDsKIAkJCSpz aXplID0gNDsKLS0gCjIuMTIuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KYW1kLWdmeCBtYWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQt Z2Z4Cg==