From: Tom St Denis Subject: [PATCH 04/16] drm/amd/powerplay: Port vega10_didt_set_mask() to new macros Date: Fri, 8 Sep 2017 12:01:37 -0400 Message-ID: <20170908160149.9349-5-tom.stdenis@amd.com> References: <20170908160149.9349-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: <20170908160149.9349-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 U3RhcnQgdXNpbmcgbmV3IENHUyBiaXRtYXNrIG1hY3Jvcy4KClNpZ25lZC1vZmYtYnk6IFRvbSBT dCBEZW5pcyA8dG9tLnN0ZGVuaXNAYW1kLmNvbT4KLS0tCiAuLi4vZ3B1L2RybS9hbWQvcG93ZXJw bGF5L2h3bWdyL3ZlZ2ExMF9wb3dlcnR1bmUuYyB8IDYwICsrKysrKysrLS0tLS0tLS0tLS0tLS0K IDEgZmlsZSBjaGFuZ2VkLCAyMCBpbnNlcnRpb25zKCspLCA0MCBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL3Bvd2VycGxheS9od21nci92ZWdhMTBfcG93ZXJ0 dW5lLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL3Bvd2VycGxheS9od21nci92ZWdhMTBfcG93ZXJ0 dW5lLmMKaW5kZXggZTdmYTY3MDYzY2RjLi5jNWZmOTRmNGZkMGYgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9hbWQvcG93ZXJwbGF5L2h3bWdyL3ZlZ2ExMF9wb3dlcnR1bmUuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vYW1kL3Bvd2VycGxheS9od21nci92ZWdhMTBfcG93ZXJ0dW5lLmMKQEAg LTg1NSw5MSArODU1LDcxIEBAIHN0YXRpYyB2b2lkIHZlZ2ExMF9kaWR0X3NldF9tYXNrKHN0cnVj dCBwcF9od21nciAqaHdtZ3IsIGNvbnN0IGJvb2wgZW5hYmxlKQogCXVpbnQzMl90IGRpZHRfYmxv Y2tfaW5mbyA9IFNRX0lSX01BU0sgfCBUQ1BfSVJfTUFTSyB8IFREX1BDQ19NQVNLOwogCiAJaWYg KHBobV9jYXBfZW5hYmxlZChod21nci0+cGxhdGZvcm1fZGVzY3JpcHRvci5wbGF0Zm9ybUNhcHMs IFBITV9QbGF0Zm9ybUNhcHNfU1FSYW1waW5nKSkgewotCQlkYXRhID0gY2dzX3JlYWRfaW5kX3Jl Z2lzdGVyKGh3bWdyLT5kZXZpY2UsIENHU19JTkRfUkVHX19ESURULCBpeERJRFRfU1FfQ1RSTDAp OwotCQlkYXRhICY9IH5ESURUX1NRX0NUUkwwX19ESURUX0NUUkxfRU5fTUFTSzsKLQkJZGF0YSB8 PSAoKGVuIDw8IERJRFRfU1FfQ1RSTDBfX0RJRFRfQ1RSTF9FTl9fU0hJRlQpICYgRElEVF9TUV9D VFJMMF9fRElEVF9DVFJMX0VOX01BU0spOwotCQljZ3Nfd3JpdGVfaW5kX3JlZ2lzdGVyKGh3bWdy LT5kZXZpY2UsIENHU19JTkRfUkVHX19ESURULCBpeERJRFRfU1FfQ1RSTDAsIGRhdGEpOworCQlD R1NfV1JFRzMyX0ZJRUxEX0lORChod21nci0+ZGV2aWNlLCBDR1NfSU5EX1JFR19fRElEVCwKKwkJ CQkgICAgIERJRFRfU1FfQ1RSTDAsIERJRFRfQ1RSTF9FTiwgZW4pOwogCQlkaWR0X2Jsb2NrX2lu Zm8gJj0gflNRX0VuYWJsZV9NQVNLOwogCQlkaWR0X2Jsb2NrX2luZm8gfD0gZW4gPDwgU1FfRW5h YmxlX1NISUZUOwogCX0KIAogCWlmIChwaG1fY2FwX2VuYWJsZWQoaHdtZ3ItPnBsYXRmb3JtX2Rl c2NyaXB0b3IucGxhdGZvcm1DYXBzLCBQSE1fUGxhdGZvcm1DYXBzX0RCUmFtcGluZykpIHsKLQkJ ZGF0YSA9IGNnc19yZWFkX2luZF9yZWdpc3Rlcihod21nci0+ZGV2aWNlLCBDR1NfSU5EX1JFR19f RElEVCwgaXhESURUX0RCX0NUUkwwKTsKLQkJZGF0YSAmPSB+RElEVF9EQl9DVFJMMF9fRElEVF9D VFJMX0VOX01BU0s7Ci0JCWRhdGEgfD0gKChlbiA8PCBESURUX0RCX0NUUkwwX19ESURUX0NUUkxf RU5fX1NISUZUKSAmIERJRFRfREJfQ1RSTDBfX0RJRFRfQ1RSTF9FTl9NQVNLKTsKLQkJY2dzX3dy aXRlX2luZF9yZWdpc3Rlcihod21nci0+ZGV2aWNlLCBDR1NfSU5EX1JFR19fRElEVCwgaXhESURU X0RCX0NUUkwwLCBkYXRhKTsKKwkJQ0dTX1dSRUczMl9GSUVMRF9JTkQoaHdtZ3ItPmRldmljZSwg Q0dTX0lORF9SRUdfX0RJRFQsCisJCQkJICAgICBESURUX0RCX0NUUkwwLCBESURUX0NUUkxfRU4s IGVuKTsKIAkJZGlkdF9ibG9ja19pbmZvICY9IH5EQl9FbmFibGVfTUFTSzsKIAkJZGlkdF9ibG9j a19pbmZvIHw9IGVuIDw8IERCX0VuYWJsZV9TSElGVDsKIAl9CiAKIAlpZiAocGhtX2NhcF9lbmFi bGVkKGh3bWdyLT5wbGF0Zm9ybV9kZXNjcmlwdG9yLnBsYXRmb3JtQ2FwcywgUEhNX1BsYXRmb3Jt Q2Fwc19URFJhbXBpbmcpKSB7Ci0JCWRhdGEgPSBjZ3NfcmVhZF9pbmRfcmVnaXN0ZXIoaHdtZ3It PmRldmljZSwgQ0dTX0lORF9SRUdfX0RJRFQsIGl4RElEVF9URF9DVFJMMCk7Ci0JCWRhdGEgJj0g fkRJRFRfVERfQ1RSTDBfX0RJRFRfQ1RSTF9FTl9NQVNLOwotCQlkYXRhIHw9ICgoZW4gPDwgRElE VF9URF9DVFJMMF9fRElEVF9DVFJMX0VOX19TSElGVCkgJiBESURUX1REX0NUUkwwX19ESURUX0NU UkxfRU5fTUFTSyk7Ci0JCWNnc193cml0ZV9pbmRfcmVnaXN0ZXIoaHdtZ3ItPmRldmljZSwgQ0dT X0lORF9SRUdfX0RJRFQsIGl4RElEVF9URF9DVFJMMCwgZGF0YSk7CisJCUNHU19XUkVHMzJfRklF TERfSU5EKGh3bWdyLT5kZXZpY2UsIENHU19JTkRfUkVHX19ESURULAorCQkJCSAgICAgRElEVF9U RF9DVFJMMCwgRElEVF9DVFJMX0VOLCBlbik7CiAJCWRpZHRfYmxvY2tfaW5mbyAmPSB+VERfRW5h YmxlX01BU0s7CiAJCWRpZHRfYmxvY2tfaW5mbyB8PSBlbiA8PCBURF9FbmFibGVfU0hJRlQ7CiAJ fQogCiAJaWYgKHBobV9jYXBfZW5hYmxlZChod21nci0+cGxhdGZvcm1fZGVzY3JpcHRvci5wbGF0 Zm9ybUNhcHMsIFBITV9QbGF0Zm9ybUNhcHNfVENQUmFtcGluZykpIHsKLQkJZGF0YSA9IGNnc19y ZWFkX2luZF9yZWdpc3Rlcihod21nci0+ZGV2aWNlLCBDR1NfSU5EX1JFR19fRElEVCwgaXhESURU X1RDUF9DVFJMMCk7Ci0JCWRhdGEgJj0gfkRJRFRfVENQX0NUUkwwX19ESURUX0NUUkxfRU5fTUFT SzsKLQkJZGF0YSB8PSAoKGVuIDw8IERJRFRfVENQX0NUUkwwX19ESURUX0NUUkxfRU5fX1NISUZU KSAmIERJRFRfVENQX0NUUkwwX19ESURUX0NUUkxfRU5fTUFTSyk7Ci0JCWNnc193cml0ZV9pbmRf cmVnaXN0ZXIoaHdtZ3ItPmRldmljZSwgQ0dTX0lORF9SRUdfX0RJRFQsIGl4RElEVF9UQ1BfQ1RS TDAsIGRhdGEpOworCQlDR1NfV1JFRzMyX0ZJRUxEX0lORChod21nci0+ZGV2aWNlLCBDR1NfSU5E X1JFR19fRElEVCwKKwkJCQkgICAgIERJRFRfVENQX0NUUkwwLCBESURUX0NUUkxfRU4sIGVuKTsK IAkJZGlkdF9ibG9ja19pbmZvICY9IH5UQ1BfRW5hYmxlX01BU0s7CiAJCWRpZHRfYmxvY2tfaW5m byB8PSBlbiA8PCBUQ1BfRW5hYmxlX1NISUZUOwogCX0KIAogCWlmIChwaG1fY2FwX2VuYWJsZWQo aHdtZ3ItPnBsYXRmb3JtX2Rlc2NyaXB0b3IucGxhdGZvcm1DYXBzLCBQSE1fUGxhdGZvcm1DYXBz X0RCUlJhbXBpbmcpKSB7Ci0JCWRhdGEgPSBjZ3NfcmVhZF9pbmRfcmVnaXN0ZXIoaHdtZ3ItPmRl dmljZSwgQ0dTX0lORF9SRUdfX0RJRFQsIGl4RElEVF9EQlJfQ1RSTDApOwotCQlkYXRhICY9IH5E SURUX0RCUl9DVFJMMF9fRElEVF9DVFJMX0VOX01BU0s7Ci0JCWRhdGEgfD0gKChlbiA8PCBESURU X0RCUl9DVFJMMF9fRElEVF9DVFJMX0VOX19TSElGVCkgJiBESURUX0RCUl9DVFJMMF9fRElEVF9D VFJMX0VOX01BU0spOwotCQljZ3Nfd3JpdGVfaW5kX3JlZ2lzdGVyKGh3bWdyLT5kZXZpY2UsIENH U19JTkRfUkVHX19ESURULCBpeERJRFRfREJSX0NUUkwwLCBkYXRhKTsKKwkJQ0dTX1dSRUczMl9G SUVMRF9JTkQoaHdtZ3ItPmRldmljZSwgQ0dTX0lORF9SRUdfX0RJRFQsCisJCQkJICAgICBESURU X0RCUl9DVFJMMCwgRElEVF9DVFJMX0VOLCBlbik7CiAJfQogCiAJaWYgKHBobV9jYXBfZW5hYmxl ZChod21nci0+cGxhdGZvcm1fZGVzY3JpcHRvci5wbGF0Zm9ybUNhcHMsIFBITV9QbGF0Zm9ybUNh cHNfRGlEdEVEQ0VuYWJsZSkpIHsKIAkJaWYgKHBobV9jYXBfZW5hYmxlZChod21nci0+cGxhdGZv cm1fZGVzY3JpcHRvci5wbGF0Zm9ybUNhcHMsIFBITV9QbGF0Zm9ybUNhcHNfU1FSYW1waW5nKSkg ewogCQkJZGF0YSA9IGNnc19yZWFkX2luZF9yZWdpc3Rlcihod21nci0+ZGV2aWNlLCBDR1NfSU5E X1JFR19fRElEVCwgaXhESURUX1NRX0VEQ19DVFJMKTsKLQkJCWRhdGEgJj0gfkRJRFRfU1FfRURD X0NUUkxfX0VEQ19FTl9NQVNLOwotCQkJZGF0YSB8PSAoKGVuIDw8IERJRFRfU1FfRURDX0NUUkxf X0VEQ19FTl9fU0hJRlQpICYgRElEVF9TUV9FRENfQ1RSTF9fRURDX0VOX01BU0spOwotCQkJZGF0 YSAmPSB+RElEVF9TUV9FRENfQ1RSTF9fRURDX1NXX1JTVF9NQVNLOwotCQkJZGF0YSB8PSAoKH5l biA8PCBESURUX1NRX0VEQ19DVFJMX19FRENfU1dfUlNUX19TSElGVCkgJiBESURUX1NRX0VEQ19D VFJMX19FRENfU1dfUlNUX01BU0spOworCQkJZGF0YSA9IENHU19SRUdfU0VUX0ZJRUxEKGRhdGEs IERJRFRfU1FfRURDX0NUUkwsIEVEQ19FTiwgZW4pOworCQkJZGF0YSA9IENHU19SRUdfU0VUX0ZJ RUxEKGRhdGEsIERJRFRfU1FfRURDX0NUUkwsIEVEQ19TV19SU1QsIH5lbik7CiAJCQljZ3Nfd3Jp dGVfaW5kX3JlZ2lzdGVyKGh3bWdyLT5kZXZpY2UsIENHU19JTkRfUkVHX19ESURULCBpeERJRFRf U1FfRURDX0NUUkwsIGRhdGEpOwogCQl9CiAKIAkJaWYgKHBobV9jYXBfZW5hYmxlZChod21nci0+ cGxhdGZvcm1fZGVzY3JpcHRvci5wbGF0Zm9ybUNhcHMsIFBITV9QbGF0Zm9ybUNhcHNfREJSYW1w aW5nKSkgewogCQkJZGF0YSA9IGNnc19yZWFkX2luZF9yZWdpc3Rlcihod21nci0+ZGV2aWNlLCBD R1NfSU5EX1JFR19fRElEVCwgaXhESURUX0RCX0VEQ19DVFJMKTsKLQkJCWRhdGEgJj0gfkRJRFRf REJfRURDX0NUUkxfX0VEQ19FTl9NQVNLOwotCQkJZGF0YSB8PSAoKGVuIDw8IERJRFRfREJfRURD X0NUUkxfX0VEQ19FTl9fU0hJRlQpICYgRElEVF9EQl9FRENfQ1RSTF9fRURDX0VOX01BU0spOwot CQkJZGF0YSAmPSB+RElEVF9EQl9FRENfQ1RSTF9fRURDX1NXX1JTVF9NQVNLOwotCQkJZGF0YSB8 PSAoKH5lbiA8PCBESURUX0RCX0VEQ19DVFJMX19FRENfU1dfUlNUX19TSElGVCkgJiBESURUX0RC X0VEQ19DVFJMX19FRENfU1dfUlNUX01BU0spOworCQkJZGF0YSA9IENHU19SRUdfU0VUX0ZJRUxE KGRhdGEsIERJRFRfREJfRURDX0NUUkwsIEVEQ19FTiwgZW4pOworCQkJZGF0YSA9IENHU19SRUdf U0VUX0ZJRUxEKGRhdGEsIERJRFRfREJfRURDX0NUUkwsIEVEQ19TV19SU1QsIH5lbik7CiAJCQlj Z3Nfd3JpdGVfaW5kX3JlZ2lzdGVyKGh3bWdyLT5kZXZpY2UsIENHU19JTkRfUkVHX19ESURULCBp eERJRFRfREJfRURDX0NUUkwsIGRhdGEpOwogCQl9CiAKIAkJaWYgKHBobV9jYXBfZW5hYmxlZCho d21nci0+cGxhdGZvcm1fZGVzY3JpcHRvci5wbGF0Zm9ybUNhcHMsIFBITV9QbGF0Zm9ybUNhcHNf VERSYW1waW5nKSkgewogCQkJZGF0YSA9IGNnc19yZWFkX2luZF9yZWdpc3Rlcihod21nci0+ZGV2 aWNlLCBDR1NfSU5EX1JFR19fRElEVCwgaXhESURUX1REX0VEQ19DVFJMKTsKLQkJCWRhdGEgJj0g fkRJRFRfVERfRURDX0NUUkxfX0VEQ19FTl9NQVNLOwotCQkJZGF0YSB8PSAoKGVuIDw8IERJRFRf VERfRURDX0NUUkxfX0VEQ19FTl9fU0hJRlQpICYgRElEVF9URF9FRENfQ1RSTF9fRURDX0VOX01B U0spOwotCQkJZGF0YSAmPSB+RElEVF9URF9FRENfQ1RSTF9fRURDX1NXX1JTVF9NQVNLOwotCQkJ ZGF0YSB8PSAoKH5lbiA8PCBESURUX1REX0VEQ19DVFJMX19FRENfU1dfUlNUX19TSElGVCkgJiBE SURUX1REX0VEQ19DVFJMX19FRENfU1dfUlNUX01BU0spOworCQkJZGF0YSA9IENHU19SRUdfU0VU X0ZJRUxEKGRhdGEsIERJRFRfVERfRURDX0NUUkwsIEVEQ19FTiwgZW4pOworCQkJZGF0YSA9IENH U19SRUdfU0VUX0ZJRUxEKGRhdGEsIERJRFRfVERfRURDX0NUUkwsIEVEQ19TV19SU1QsIH5lbik7 CiAJCQljZ3Nfd3JpdGVfaW5kX3JlZ2lzdGVyKGh3bWdyLT5kZXZpY2UsIENHU19JTkRfUkVHX19E SURULCBpeERJRFRfVERfRURDX0NUUkwsIGRhdGEpOwogCQl9CiAKIAkJaWYgKHBobV9jYXBfZW5h YmxlZChod21nci0+cGxhdGZvcm1fZGVzY3JpcHRvci5wbGF0Zm9ybUNhcHMsIFBITV9QbGF0Zm9y bUNhcHNfVENQUmFtcGluZykpIHsKIAkJCWRhdGEgPSBjZ3NfcmVhZF9pbmRfcmVnaXN0ZXIoaHdt Z3ItPmRldmljZSwgQ0dTX0lORF9SRUdfX0RJRFQsIGl4RElEVF9UQ1BfRURDX0NUUkwpOwotCQkJ ZGF0YSAmPSB+RElEVF9UQ1BfRURDX0NUUkxfX0VEQ19FTl9NQVNLOwotCQkJZGF0YSB8PSAoKGVu IDw8IERJRFRfVENQX0VEQ19DVFJMX19FRENfRU5fX1NISUZUKSAmIERJRFRfVENQX0VEQ19DVFJM X19FRENfRU5fTUFTSyk7Ci0JCQlkYXRhICY9IH5ESURUX1RDUF9FRENfQ1RSTF9fRURDX1NXX1JT VF9NQVNLOwotCQkJZGF0YSB8PSAoKH5lbiA8PCBESURUX1RDUF9FRENfQ1RSTF9fRURDX1NXX1JT VF9fU0hJRlQpICYgRElEVF9UQ1BfRURDX0NUUkxfX0VEQ19TV19SU1RfTUFTSyk7CisJCQlkYXRh ID0gQ0dTX1JFR19TRVRfRklFTEQoZGF0YSwgRElEVF9UQ1BfRURDX0NUUkwsIEVEQ19FTiwgZW4p OworCQkJZGF0YSA9IENHU19SRUdfU0VUX0ZJRUxEKGRhdGEsIERJRFRfVENQX0VEQ19DVFJMLCBF RENfU1dfUlNULCB+ZW4pOwogCQkJY2dzX3dyaXRlX2luZF9yZWdpc3Rlcihod21nci0+ZGV2aWNl LCBDR1NfSU5EX1JFR19fRElEVCwgaXhESURUX1RDUF9FRENfQ1RSTCwgZGF0YSk7CiAJCX0KIAog CQlpZiAocGhtX2NhcF9lbmFibGVkKGh3bWdyLT5wbGF0Zm9ybV9kZXNjcmlwdG9yLnBsYXRmb3Jt Q2FwcywgUEhNX1BsYXRmb3JtQ2Fwc19EQlJSYW1waW5nKSkgewogCQkJZGF0YSA9IGNnc19yZWFk X2luZF9yZWdpc3Rlcihod21nci0+ZGV2aWNlLCBDR1NfSU5EX1JFR19fRElEVCwgaXhESURUX0RC Ul9FRENfQ1RSTCk7Ci0JCQlkYXRhICY9IH5ESURUX0RCUl9FRENfQ1RSTF9fRURDX0VOX01BU0s7 Ci0JCQlkYXRhIHw9ICgoZW4gPDwgRElEVF9EQlJfRURDX0NUUkxfX0VEQ19FTl9fU0hJRlQpICYg RElEVF9EQlJfRURDX0NUUkxfX0VEQ19FTl9NQVNLKTsKLQkJCWRhdGEgJj0gfkRJRFRfREJSX0VE Q19DVFJMX19FRENfU1dfUlNUX01BU0s7Ci0JCQlkYXRhIHw9ICgofmVuIDw8IERJRFRfREJSX0VE Q19DVFJMX19FRENfU1dfUlNUX19TSElGVCkgJiBESURUX0RCUl9FRENfQ1RSTF9fRURDX1NXX1JT VF9NQVNLKTsKKwkJCWRhdGEgPSBDR1NfUkVHX1NFVF9GSUVMRChkYXRhLCBESURUX0RCUl9FRENf Q1RSTCwgRURDX0VOLCBlbik7CisJCQlkYXRhID0gQ0dTX1JFR19TRVRfRklFTEQoZGF0YSwgRElE VF9EQlJfRURDX0NUUkwsIEVEQ19TV19SU1QsIH5lbik7CiAJCQljZ3Nfd3JpdGVfaW5kX3JlZ2lz dGVyKGh3bWdyLT5kZXZpY2UsIENHU19JTkRfUkVHX19ESURULCBpeERJRFRfREJSX0VEQ19DVFJM LCBkYXRhKTsKIAkJfQogCX0KLS0gCjIuMTIuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KYW1kLWdmeCBtYWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5m cmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9hbWQtZ2Z4Cg==