From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Francis Subject: [PATCH v3 1/3] drm/amdgpu: Stop dividing watermarks by 1000 in powerplay Date: Fri, 2 Nov 2018 09:26:01 -0400 Message-ID: <20181102132603.16412-1-David.Francis@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: David Francis V2F0ZXJtYXJrcyB3ZXJlIGJlaW5nIG11bHRpcGxpZWQgYnkgMTAwMCBpbiBhbWRncHVfZG0KYW5k IGRpdmlkZWQgYnkgMTAwMCBpbiBwb3dlcnBsYXkuICBDaGFuZ2Ugd2F0ZXJtYXJrcwp0byB1bml0 cyBvZiBNSHogdG8gc3RvcCBkb2luZyB0aGF0LgoKU2lnbmVkLW9mZi1ieTogRGF2aWQgRnJhbmNp cyA8RGF2aWQuRnJhbmNpc0BhbWQuY29tPgotLS0KIC4uLi9hbWQvZGlzcGxheS9hbWRncHVfZG0v YW1kZ3B1X2RtX3BwX3NtdS5jICB8IDI0ICsrKysrLS0tLS0tLS0tCiAuLi4vZHJtL2FtZC9kaXNw bGF5L2RjL2RtX3NlcnZpY2VzX3R5cGVzLmggICAgfCAxNiArKysrKy0tLS0tCiAuLi4vZ3B1L2Ry bS9hbWQvcG93ZXJwbGF5L2h3bWdyL3NtdV9oZWxwZXIuYyAgfCAzMiArKysrKy0tLS0tLS0tLS0t LS0tCiAzIGZpbGVzIGNoYW5nZWQsIDI0IGluc2VydGlvbnMoKyksIDQ4IGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9hbWRncHVfZG0vYW1kZ3B1 X2RtX3BwX3NtdS5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2FtZGdwdV9kbS9hbWRn cHVfZG1fcHBfc211LmMKaW5kZXggOWQyZDY5ODZiOTgzLi5kOWRhYTAzOGZkYjIgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9hbWRncHVfZG0vYW1kZ3B1X2RtX3BwX3Nt dS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9hbWRncHVfZG0vYW1kZ3B1X2Rt X3BwX3NtdS5jCkBAIC01MTcsMTQgKzUxNywxMCBAQCB2b2lkIHBwX3J2X3NldF93bV9yYW5nZXMo c3RydWN0IHBwX3NtdSAqcHAsCiAJCWVsc2UKIAkJCXdtX2RjZV9jbG9ja3NbaV0ud21fc2V0X2lk ID0KIAkJCQkJcmFuZ2VzLT5yZWFkZXJfd21fc2V0c1tpXS53bV9pbnN0OwotCQl3bV9kY2VfY2xv Y2tzW2ldLndtX21heF9kY2ZjbGtfY2xrX2luX2toeiA9Ci0JCQkJcmFuZ2VzLT5yZWFkZXJfd21f c2V0c1tpXS5tYXhfZHJhaW5fY2xrX21oeiAqIDEwMDA7Ci0JCXdtX2RjZV9jbG9ja3NbaV0ud21f bWluX2RjZmNsa19jbGtfaW5fa2h6ID0KLQkJCQlyYW5nZXMtPnJlYWRlcl93bV9zZXRzW2ldLm1p bl9kcmFpbl9jbGtfbWh6ICogMTAwMDsKLQkJd21fZGNlX2Nsb2Nrc1tpXS53bV9tYXhfbWVtX2Ns a19pbl9raHogPQotCQkJCXJhbmdlcy0+cmVhZGVyX3dtX3NldHNbaV0ubWF4X2ZpbGxfY2xrX21o eiAqIDEwMDA7Ci0JCXdtX2RjZV9jbG9ja3NbaV0ud21fbWluX21lbV9jbGtfaW5fa2h6ID0KLQkJ CQlyYW5nZXMtPnJlYWRlcl93bV9zZXRzW2ldLm1pbl9maWxsX2Nsa19taHogKiAxMDAwOworCQl3 bV9kY2VfY2xvY2tzW2ldLndtX21heF9kY2ZjbGtfY2xrX2luX21oeiA9IHJhbmdlcy0+cmVhZGVy X3dtX3NldHNbaV0ubWF4X2RyYWluX2Nsa19taHo7CisJCXdtX2RjZV9jbG9ja3NbaV0ud21fbWlu X2RjZmNsa19jbGtfaW5fbWh6ID0gcmFuZ2VzLT5yZWFkZXJfd21fc2V0c1tpXS5taW5fZHJhaW5f Y2xrX21oejsKKwkJd21fZGNlX2Nsb2Nrc1tpXS53bV9tYXhfbWVtX2Nsa19pbl9taHogPSByYW5n ZXMtPnJlYWRlcl93bV9zZXRzW2ldLm1heF9maWxsX2Nsa19taHo7CisJCXdtX2RjZV9jbG9ja3Nb aV0ud21fbWluX21lbV9jbGtfaW5fbWh6ID0gcmFuZ2VzLT5yZWFkZXJfd21fc2V0c1tpXS5taW5f ZmlsbF9jbGtfbWh6OwogCX0KIAogCWZvciAoaSA9IDA7IGkgPCB3bV93aXRoX2Nsb2NrX3Jhbmdl cy5udW1fd21fbWNpZl9zZXRzOyBpKyspIHsKQEAgLTUzMywxNCArNTI5LDEwIEBAIHZvaWQgcHBf cnZfc2V0X3dtX3JhbmdlcyhzdHJ1Y3QgcHBfc211ICpwcCwKIAkJZWxzZQogCQkJd21fc29jX2Ns b2Nrc1tpXS53bV9zZXRfaWQgPQogCQkJCQlyYW5nZXMtPndyaXRlcl93bV9zZXRzW2ldLndtX2lu c3Q7Ci0JCXdtX3NvY19jbG9ja3NbaV0ud21fbWF4X3NvY2Nsa19jbGtfaW5fa2h6ID0KLQkJCQly YW5nZXMtPndyaXRlcl93bV9zZXRzW2ldLm1heF9maWxsX2Nsa19taHogKiAxMDAwOwotCQl3bV9z b2NfY2xvY2tzW2ldLndtX21pbl9zb2NjbGtfY2xrX2luX2toeiA9Ci0JCQkJcmFuZ2VzLT53cml0 ZXJfd21fc2V0c1tpXS5taW5fZmlsbF9jbGtfbWh6ICogMTAwMDsKLQkJd21fc29jX2Nsb2Nrc1tp XS53bV9tYXhfbWVtX2Nsa19pbl9raHogPQotCQkJCXJhbmdlcy0+d3JpdGVyX3dtX3NldHNbaV0u bWF4X2RyYWluX2Nsa19taHogKiAxMDAwOwotCQl3bV9zb2NfY2xvY2tzW2ldLndtX21pbl9tZW1f Y2xrX2luX2toeiA9Ci0JCQkJcmFuZ2VzLT53cml0ZXJfd21fc2V0c1tpXS5taW5fZHJhaW5fY2xr X21oeiAqIDEwMDA7CisJCXdtX3NvY19jbG9ja3NbaV0ud21fbWF4X3NvY2Nsa19jbGtfaW5fbWh6 ID0gcmFuZ2VzLT53cml0ZXJfd21fc2V0c1tpXS5tYXhfZmlsbF9jbGtfbWh6OworCQl3bV9zb2Nf Y2xvY2tzW2ldLndtX21pbl9zb2NjbGtfY2xrX2luX21oeiA9IHJhbmdlcy0+d3JpdGVyX3dtX3Nl dHNbaV0ubWluX2ZpbGxfY2xrX21oejsKKwkJd21fc29jX2Nsb2Nrc1tpXS53bV9tYXhfbWVtX2Ns a19pbl9taHogPSByYW5nZXMtPndyaXRlcl93bV9zZXRzW2ldLm1heF9kcmFpbl9jbGtfbWh6Owor CQl3bV9zb2NfY2xvY2tzW2ldLndtX21pbl9tZW1fY2xrX2luX21oeiA9IHJhbmdlcy0+d3JpdGVy X3dtX3NldHNbaV0ubWluX2RyYWluX2Nsa19taHo7CiAJfQogCiAJcHBfZnVuY3MtPnNldF93YXRl cm1hcmtzX2Zvcl9jbG9ja3NfcmFuZ2VzKHBwX2hhbmRsZSwgJndtX3dpdGhfY2xvY2tfcmFuZ2Vz KTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kbV9zZXJ2aWNl c190eXBlcy5oIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RtX3NlcnZpY2VzX3R5 cGVzLmgKaW5kZXggMWFmOGM3NzdiM2FjLi5jZTZmZWRkOTdkZjkgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kbV9zZXJ2aWNlc190eXBlcy5oCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kbV9zZXJ2aWNlc190eXBlcy5oCkBAIC0xNDgsMTgg KzE0OCwxOCBAQCBzdHJ1Y3QgZG1fcHBfd21fc2V0c193aXRoX2Nsb2NrX3JhbmdlcyB7CiAKIHN0 cnVjdCBkbV9wcF9jbG9ja19yYW5nZV9mb3JfZG1pZl93bV9zZXRfc29jMTUgewogCWVudW0gZG1f cHBfd21fc2V0X2lkIHdtX3NldF9pZDsKLQl1aW50MzJfdCB3bV9taW5fZGNmY2xrX2Nsa19pbl9r aHo7Ci0JdWludDMyX3Qgd21fbWF4X2RjZmNsa19jbGtfaW5fa2h6OwotCXVpbnQzMl90IHdtX21p bl9tZW1fY2xrX2luX2toejsKLQl1aW50MzJfdCB3bV9tYXhfbWVtX2Nsa19pbl9raHo7CisJdWlu dDMyX3Qgd21fbWluX2RjZmNsa19jbGtfaW5fbWh6OworCXVpbnQzMl90IHdtX21heF9kY2ZjbGtf Y2xrX2luX21oejsKKwl1aW50MzJfdCB3bV9taW5fbWVtX2Nsa19pbl9taHo7CisJdWludDMyX3Qg d21fbWF4X21lbV9jbGtfaW5fbWh6OwogfTsKIAogc3RydWN0IGRtX3BwX2Nsb2NrX3JhbmdlX2Zv cl9tY2lmX3dtX3NldF9zb2MxNSB7CiAJZW51bSBkbV9wcF93bV9zZXRfaWQgd21fc2V0X2lkOwot CXVpbnQzMl90IHdtX21pbl9zb2NjbGtfY2xrX2luX2toejsKLQl1aW50MzJfdCB3bV9tYXhfc29j Y2xrX2Nsa19pbl9raHo7Ci0JdWludDMyX3Qgd21fbWluX21lbV9jbGtfaW5fa2h6OwotCXVpbnQz Ml90IHdtX21heF9tZW1fY2xrX2luX2toejsKKwl1aW50MzJfdCB3bV9taW5fc29jY2xrX2Nsa19p bl9taHo7CisJdWludDMyX3Qgd21fbWF4X3NvY2Nsa19jbGtfaW5fbWh6OworCXVpbnQzMl90IHdt X21pbl9tZW1fY2xrX2luX21oejsKKwl1aW50MzJfdCB3bV9tYXhfbWVtX2Nsa19pbl9taHo7CiB9 OwogCiBzdHJ1Y3QgZG1fcHBfd21fc2V0c193aXRoX2Nsb2NrX3Jhbmdlc19zb2MxNSB7CmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL3Bvd2VycGxheS9od21nci9zbXVfaGVscGVyLmMg Yi9kcml2ZXJzL2dwdS9kcm0vYW1kL3Bvd2VycGxheS9od21nci9zbXVfaGVscGVyLmMKaW5kZXgg OTlhMzNjMzNhMzJjLi4wZmFlMzg4MjIwZmUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9h bWQvcG93ZXJwbGF5L2h3bWdyL3NtdV9oZWxwZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1k L3Bvd2VycGxheS9od21nci9zbXVfaGVscGVyLmMKQEAgLTcxMiw0MiArNzEyLDI2IEBAIGludCBz bXVfc2V0X3dhdGVybWFya3NfZm9yX2Nsb2Nrc19yYW5nZXModm9pZCAqd3RfdGFibGUsCiAKIAlm b3IgKGkgPSAwOyBpIDwgd21fd2l0aF9jbG9ja19yYW5nZXMtPm51bV93bV9kbWlmX3NldHM7IGkr KykgewogCQl0YWJsZS0+V2F0ZXJtYXJrUm93WzFdW2ldLk1pbkNsb2NrID0KLQkJCWNwdV90b19s ZTE2KCh1aW50MTZfdCkKLQkJCSh3bV93aXRoX2Nsb2NrX3Jhbmdlcy0+d21fZG1pZl9jbG9ja3Nf cmFuZ2VzW2ldLndtX21pbl9kY2ZjbGtfY2xrX2luX2toeikgLwotCQkJMTAwMCk7CisJCQljcHVf dG9fbGUxNigodWludDE2X3Qpd21fd2l0aF9jbG9ja19yYW5nZXMtPndtX2RtaWZfY2xvY2tzX3Jh bmdlc1tpXS53bV9taW5fZGNmY2xrX2Nsa19pbl9taHopOwogCQl0YWJsZS0+V2F0ZXJtYXJrUm93 WzFdW2ldLk1heENsb2NrID0KLQkJCWNwdV90b19sZTE2KCh1aW50MTZfdCkKLQkJCSh3bV93aXRo X2Nsb2NrX3Jhbmdlcy0+d21fZG1pZl9jbG9ja3NfcmFuZ2VzW2ldLndtX21heF9kY2ZjbGtfY2xr X2luX2toeikgLwotCQkJMTAwMCk7CisJCQljcHVfdG9fbGUxNigodWludDE2X3Qpd21fd2l0aF9j bG9ja19yYW5nZXMtPndtX2RtaWZfY2xvY2tzX3Jhbmdlc1tpXS53bV9tYXhfZGNmY2xrX2Nsa19p bl9taHopOwogCQl0YWJsZS0+V2F0ZXJtYXJrUm93WzFdW2ldLk1pblVjbGsgPQotCQkJY3B1X3Rv X2xlMTYoKHVpbnQxNl90KQotCQkJKHdtX3dpdGhfY2xvY2tfcmFuZ2VzLT53bV9kbWlmX2Nsb2Nr c19yYW5nZXNbaV0ud21fbWluX21lbV9jbGtfaW5fa2h6KSAvCi0JCQkxMDAwKTsKKwkJCWNwdV90 b19sZTE2KCh1aW50MTZfdCl3bV93aXRoX2Nsb2NrX3Jhbmdlcy0+d21fZG1pZl9jbG9ja3NfcmFu Z2VzW2ldLndtX21pbl9tZW1fY2xrX2luX21oeik7CiAJCXRhYmxlLT5XYXRlcm1hcmtSb3dbMV1b aV0uTWF4VWNsayA9Ci0JCQljcHVfdG9fbGUxNigodWludDE2X3QpCi0JCQkod21fd2l0aF9jbG9j a19yYW5nZXMtPndtX2RtaWZfY2xvY2tzX3Jhbmdlc1tpXS53bV9tYXhfbWVtX2Nsa19pbl9raHop IC8KLQkJCTEwMDApOworCQkJY3B1X3RvX2xlMTYoKHVpbnQxNl90KXdtX3dpdGhfY2xvY2tfcmFu Z2VzLT53bV9kbWlmX2Nsb2Nrc19yYW5nZXNbaV0ud21fbWF4X21lbV9jbGtfaW5fbWh6KTsKIAkJ dGFibGUtPldhdGVybWFya1Jvd1sxXVtpXS5XbVNldHRpbmcgPSAodWludDhfdCkKIAkJCQl3bV93 aXRoX2Nsb2NrX3Jhbmdlcy0+d21fZG1pZl9jbG9ja3NfcmFuZ2VzW2ldLndtX3NldF9pZDsKIAl9 CiAKIAlmb3IgKGkgPSAwOyBpIDwgd21fd2l0aF9jbG9ja19yYW5nZXMtPm51bV93bV9tY2lmX3Nl dHM7IGkrKykgewogCQl0YWJsZS0+V2F0ZXJtYXJrUm93WzBdW2ldLk1pbkNsb2NrID0KLQkJCWNw dV90b19sZTE2KCh1aW50MTZfdCkKLQkJCSh3bV93aXRoX2Nsb2NrX3Jhbmdlcy0+d21fbWNpZl9j bG9ja3NfcmFuZ2VzW2ldLndtX21pbl9zb2NjbGtfY2xrX2luX2toeikgLwotCQkJMTAwMCk7CisJ CQljcHVfdG9fbGUxNigodWludDE2X3Qpd21fd2l0aF9jbG9ja19yYW5nZXMtPndtX21jaWZfY2xv Y2tzX3Jhbmdlc1tpXS53bV9taW5fc29jY2xrX2Nsa19pbl9taHopOwogCQl0YWJsZS0+V2F0ZXJt YXJrUm93WzBdW2ldLk1heENsb2NrID0KLQkJCWNwdV90b19sZTE2KCh1aW50MTZfdCkKLQkJCSh3 bV93aXRoX2Nsb2NrX3Jhbmdlcy0+d21fbWNpZl9jbG9ja3NfcmFuZ2VzW2ldLndtX21heF9zb2Nj bGtfY2xrX2luX2toeikgLwotCQkJMTAwMCk7CisJCQljcHVfdG9fbGUxNigodWludDE2X3Qpd21f d2l0aF9jbG9ja19yYW5nZXMtPndtX21jaWZfY2xvY2tzX3Jhbmdlc1tpXS53bV9tYXhfc29jY2xr X2Nsa19pbl9taHopOwogCQl0YWJsZS0+V2F0ZXJtYXJrUm93WzBdW2ldLk1pblVjbGsgPQotCQkJ Y3B1X3RvX2xlMTYoKHVpbnQxNl90KQotCQkJKHdtX3dpdGhfY2xvY2tfcmFuZ2VzLT53bV9tY2lm X2Nsb2Nrc19yYW5nZXNbaV0ud21fbWluX21lbV9jbGtfaW5fa2h6KSAvCi0JCQkxMDAwKTsKKwkJ CWNwdV90b19sZTE2KCh1aW50MTZfdCl3bV93aXRoX2Nsb2NrX3Jhbmdlcy0+d21fbWNpZl9jbG9j a3NfcmFuZ2VzW2ldLndtX21pbl9tZW1fY2xrX2luX21oeik7CiAJCXRhYmxlLT5XYXRlcm1hcmtS b3dbMF1baV0uTWF4VWNsayA9Ci0JCQljcHVfdG9fbGUxNigodWludDE2X3QpCi0JCQkod21fd2l0 aF9jbG9ja19yYW5nZXMtPndtX21jaWZfY2xvY2tzX3Jhbmdlc1tpXS53bV9tYXhfbWVtX2Nsa19p bl9raHopIC8KLQkJCTEwMDApOworCQkJY3B1X3RvX2xlMTYoKHVpbnQxNl90KXdtX3dpdGhfY2xv Y2tfcmFuZ2VzLT53bV9tY2lmX2Nsb2Nrc19yYW5nZXNbaV0ud21fbWF4X21lbV9jbGtfaW5fbWh6 KTsKIAkJdGFibGUtPldhdGVybWFya1Jvd1swXVtpXS5XbVNldHRpbmcgPSAodWludDhfdCkKIAkJ CQl3bV93aXRoX2Nsb2NrX3Jhbmdlcy0+d21fbWNpZl9jbG9ja3NfcmFuZ2VzW2ldLndtX3NldF9p ZDsKIAl9Ci0tIAoyLjE3LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCmFtZC1nZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vYW1kLWdm eAo=