From: Alex Deucher Subject: [PATCH 1/2] drm/amdgpu/gfx: fix MEC interrupt enablement for pipes != 0 Date: Fri, 9 Jun 2017 08:49:29 -0400 Message-ID: <1497012570-24173-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: 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: Alex Deucher VGhlIGludGVycnVwdCByZWdpc3RlcnMgYXJlIG5vdCBpbmRleGVkLgoKRml4ZXM6IDc2M2E0N2I4 ZSAoZHJtL2FtZGdwdTogdGVhY2ggYW1kZ3B1IGhvdyB0byBlbmFibGUgaW50ZXJydXB0cyBmb3Ig YW55IHBpcGUgdjMpClNpZ25lZC1vZmYtYnk6IEFsZXggRGV1Y2hlciA8YWxleGFuZGVyLmRldWNo ZXJAYW1kLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjdfMC5jIHwg NTcgKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1k L2FtZGdwdS9nZnhfdjhfMC5jIHwgNTcgKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0t CiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjlfMC5jIHwgNTkgKysrKysrKysrKysr KysrKysrKysrKysrKy0tLS0tLS0tLS0KIDMgZmlsZXMgY2hhbmdlZCwgMTI0IGluc2VydGlvbnMo KyksIDQ5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1k Z3B1L2dmeF92N18wLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjdfMC5jCmlu ZGV4IGUzMGM3ZDAuLmZiMGE5NGMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1k Z3B1L2dmeF92N18wLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4X3Y3XzAu YwpAQCAtNTAxNSwyOCArNTAxNSw1MSBAQCBzdGF0aWMgdm9pZCBnZnhfdjdfMF9zZXRfY29tcHV0 ZV9lb3BfaW50ZXJydXB0X3N0YXRlKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LAogCQkJCQkJ ICAgICBpbnQgbWUsIGludCBwaXBlLAogCQkJCQkJICAgICBlbnVtIGFtZGdwdV9pbnRlcnJ1cHRf c3RhdGUgc3RhdGUpCiB7Ci0JLyogTWUgMCBpcyBmb3IgZ3JhcGhpY3MgYW5kIE1lIDIgaXMgcmVz ZXJ2ZWQgZm9yIEhXIHNjaGVkdWxpbmcKLQkgKiBTbyB3ZSBzaG91bGQgb25seSByZWFsbHkgYmUg Y29uZmlndXJpbmcgTUUgMSBpLmUuIE1FQzAKKwl1MzIgbWVjX2ludF9jbnRsLCBtZWNfaW50X2Nu dGxfcmVnOworCisJLyoKKwkgKiBhbWRncHUgY29udHJvbHMgb25seSB0aGUgZmlyc3QgTUVDLiBU aGF0J3Mgd2h5IHRoaXMgZnVuY3Rpb24gb25seQorCSAqIGhhbmRsZXMgdGhlIHNldHRpbmcgb2Yg aW50ZXJydXB0cyBmb3IgdGhpcyBzcGVjaWZpYyBNRUMuIEFsbCBvdGhlcgorCSAqIHBpcGVzJyBp bnRlcnJ1cHRzIGFyZSBzZXQgYnkgYW1ka2ZkLgogCSAqLwotCWlmIChtZSAhPSAxKSB7Ci0JCURS TV9FUlJPUigiSWdub3JpbmcgcmVxdWVzdCB0byBlbmFibGUgaW50ZXJydXB0cyBmb3IgaW52YWxp ZCBtZTolZFxuIiwgbWUpOwotCQlyZXR1cm47Ci0JfQogCi0JaWYgKHBpcGUgPj0gYWRldi0+Z2Z4 Lm1lYy5udW1fcGlwZV9wZXJfbWVjKSB7Ci0JCURSTV9FUlJPUigiSWdub3JpbmcgcmVxdWVzdCB0 byBlbmFibGUgaW50ZXJydXB0cyBmb3IgaW52YWxpZCAiCi0JCQkJIm1lOiVkIHBpcGU6JWRcbiIs IHBpcGUsIG1lKTsKKwlpZiAobWUgPT0gMSkgeworCQlzd2l0Y2ggKHBpcGUpIHsKKwkJY2FzZSAw OgorCQkJbWVjX2ludF9jbnRsX3JlZyA9IG1tQ1BfTUUxX1BJUEUwX0lOVF9DTlRMOworCQkJYnJl YWs7CisJCWNhc2UgMToKKwkJCW1lY19pbnRfY250bF9yZWcgPSBtbUNQX01FMV9QSVBFMV9JTlRf Q05UTDsKKwkJCWJyZWFrOworCQljYXNlIDI6CisJCQltZWNfaW50X2NudGxfcmVnID0gbW1DUF9N RTFfUElQRTJfSU5UX0NOVEw7CisJCQlicmVhazsKKwkJY2FzZSAzOgorCQkJbWVjX2ludF9jbnRs X3JlZyA9IG1tQ1BfTUUxX1BJUEUzX0lOVF9DTlRMOworCQkJYnJlYWs7CisJCWRlZmF1bHQ6CisJ CQlEUk1fREVCVUcoImludmFsaWQgcGlwZSAlZFxuIiwgcGlwZSk7CisJCQlyZXR1cm47CisJCX0K Kwl9IGVsc2UgeworCQlEUk1fREVCVUcoImludmFsaWQgbWUgJWRcbiIsIG1lKTsKIAkJcmV0dXJu OwogCX0KIAotCW11dGV4X2xvY2soJmFkZXYtPnNyYm1fbXV0ZXgpOwotCWNpa19zcmJtX3NlbGVj dChhZGV2LCBtZSwgcGlwZSwgMCwgMCk7Ci0KLQlXUkVHMzJfRklFTEQoQ1BDX0lOVF9DTlRMLCBU SU1FX1NUQU1QX0lOVF9FTkFCTEUsCi0JCQlzdGF0ZSA9PSBBTURHUFVfSVJRX1NUQVRFX0RJU0FC TEUgPyAwIDogMSk7Ci0KLQljaWtfc3JibV9zZWxlY3QoYWRldiwgMCwgMCwgMCwgMCk7Ci0JbXV0 ZXhfdW5sb2NrKCZhZGV2LT5zcmJtX211dGV4KTsKKwlzd2l0Y2ggKHN0YXRlKSB7CisJY2FzZSBB TURHUFVfSVJRX1NUQVRFX0RJU0FCTEU6CisJCW1lY19pbnRfY250bCA9IFJSRUczMihtZWNfaW50 X2NudGxfcmVnKTsKKwkJbWVjX2ludF9jbnRsICY9IH5DUF9JTlRfQ05UTF9SSU5HMF9fVElNRV9T VEFNUF9JTlRfRU5BQkxFX01BU0s7CisJCVdSRUczMihtZWNfaW50X2NudGxfcmVnLCBtZWNfaW50 X2NudGwpOworCQlicmVhazsKKwljYXNlIEFNREdQVV9JUlFfU1RBVEVfRU5BQkxFOgorCQltZWNf aW50X2NudGwgPSBSUkVHMzIobWVjX2ludF9jbnRsX3JlZyk7CisJCW1lY19pbnRfY250bCB8PSBD UF9JTlRfQ05UTF9SSU5HMF9fVElNRV9TVEFNUF9JTlRfRU5BQkxFX01BU0s7CisJCVdSRUczMiht ZWNfaW50X2NudGxfcmVnLCBtZWNfaW50X2NudGwpOworCQlicmVhazsKKwlkZWZhdWx0OgorCQli cmVhazsKKwl9CiB9CiAKIHN0YXRpYyBpbnQgZ2Z4X3Y3XzBfc2V0X3ByaXZfcmVnX2ZhdWx0X3N0 YXRlKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2FtZC9hbWRncHUvZ2Z4X3Y4XzAuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dm eF92OF8wLmMKaW5kZXggNmU1NDFhZi4uMWE3NWFiMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2FtZC9hbWRncHUvZ2Z4X3Y4XzAuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdw dS9nZnhfdjhfMC5jCkBAIC02NjEwLDI2ICs2NjEwLDUxIEBAIHN0YXRpYyB2b2lkIGdmeF92OF8w X3NldF9jb21wdXRlX2VvcF9pbnRlcnJ1cHRfc3RhdGUoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFk ZXYsCiAJCQkJCQkgICAgIGludCBtZSwgaW50IHBpcGUsCiAJCQkJCQkgICAgIGVudW0gYW1kZ3B1 X2ludGVycnVwdF9zdGF0ZSBzdGF0ZSkKIHsKLQkvKiBNZSAwIGlzIHJlc2VydmVkIGZvciBncmFw aGljcyAqLwotCWlmIChtZSA8IDEgfHwgbWUgPiBhZGV2LT5nZngubWVjLm51bV9tZWMpIHsKLQkJ RFJNX0VSUk9SKCJJZ25vcmluZyByZXF1ZXN0IHRvIGVuYWJsZSBpbnRlcnJ1cHRzIGZvciBpbnZh bGlkIG1lOiVkXG4iLCBtZSk7Ci0JCXJldHVybjsKLQl9CisJdTMyIG1lY19pbnRfY250bCwgbWVj X2ludF9jbnRsX3JlZzsKIAotCWlmIChwaXBlID49IGFkZXYtPmdmeC5tZWMubnVtX3BpcGVfcGVy X21lYykgewotCQlEUk1fRVJST1IoIklnbm9yaW5nIHJlcXVlc3QgdG8gZW5hYmxlIGludGVycnVw dHMgZm9yIGludmFsaWQgIgotCQkJCSJtZTolZCBwaXBlOiVkXG4iLCBwaXBlLCBtZSk7CisJLyoK KwkgKiBhbWRncHUgY29udHJvbHMgb25seSB0aGUgZmlyc3QgTUVDLiBUaGF0J3Mgd2h5IHRoaXMg ZnVuY3Rpb24gb25seQorCSAqIGhhbmRsZXMgdGhlIHNldHRpbmcgb2YgaW50ZXJydXB0cyBmb3Ig dGhpcyBzcGVjaWZpYyBNRUMuIEFsbCBvdGhlcgorCSAqIHBpcGVzJyBpbnRlcnJ1cHRzIGFyZSBz ZXQgYnkgYW1ka2ZkLgorCSAqLworCisJaWYgKG1lID09IDEpIHsKKwkJc3dpdGNoIChwaXBlKSB7 CisJCWNhc2UgMDoKKwkJCW1lY19pbnRfY250bF9yZWcgPSBtbUNQX01FMV9QSVBFMF9JTlRfQ05U TDsKKwkJCWJyZWFrOworCQljYXNlIDE6CisJCQltZWNfaW50X2NudGxfcmVnID0gbW1DUF9NRTFf UElQRTFfSU5UX0NOVEw7CisJCQlicmVhazsKKwkJY2FzZSAyOgorCQkJbWVjX2ludF9jbnRsX3Jl ZyA9IG1tQ1BfTUUxX1BJUEUyX0lOVF9DTlRMOworCQkJYnJlYWs7CisJCWNhc2UgMzoKKwkJCW1l Y19pbnRfY250bF9yZWcgPSBtbUNQX01FMV9QSVBFM19JTlRfQ05UTDsKKwkJCWJyZWFrOworCQlk ZWZhdWx0OgorCQkJRFJNX0RFQlVHKCJpbnZhbGlkIHBpcGUgJWRcbiIsIHBpcGUpOworCQkJcmV0 dXJuOworCQl9CisJfSBlbHNlIHsKKwkJRFJNX0RFQlVHKCJpbnZhbGlkIG1lICVkXG4iLCBtZSk7 CiAJCXJldHVybjsKIAl9CiAKLQltdXRleF9sb2NrKCZhZGV2LT5zcmJtX211dGV4KTsKLQl2aV9z cmJtX3NlbGVjdChhZGV2LCBtZSwgcGlwZSwgMCwgMCk7Ci0KLQlXUkVHMzJfRklFTEQoQ1BDX0lO VF9DTlRMLCBUSU1FX1NUQU1QX0lOVF9FTkFCTEUsCi0JCQlzdGF0ZSA9PSBBTURHUFVfSVJRX1NU QVRFX0RJU0FCTEUgPyAwIDogMSk7Ci0KLQl2aV9zcmJtX3NlbGVjdChhZGV2LCAwLCAwLCAwLCAw KTsKLQltdXRleF91bmxvY2soJmFkZXYtPnNyYm1fbXV0ZXgpOworCXN3aXRjaCAoc3RhdGUpIHsK KwljYXNlIEFNREdQVV9JUlFfU1RBVEVfRElTQUJMRToKKwkJbWVjX2ludF9jbnRsID0gUlJFRzMy KG1lY19pbnRfY250bF9yZWcpOworCQltZWNfaW50X2NudGwgJj0gfkNQX0lOVF9DTlRMX1JJTkcw X19USU1FX1NUQU1QX0lOVF9FTkFCTEVfTUFTSzsKKwkJV1JFRzMyKG1lY19pbnRfY250bF9yZWcs IG1lY19pbnRfY250bCk7CisJCWJyZWFrOworCWNhc2UgQU1ER1BVX0lSUV9TVEFURV9FTkFCTEU6 CisJCW1lY19pbnRfY250bCA9IFJSRUczMihtZWNfaW50X2NudGxfcmVnKTsKKwkJbWVjX2ludF9j bnRsIHw9IENQX0lOVF9DTlRMX1JJTkcwX19USU1FX1NUQU1QX0lOVF9FTkFCTEVfTUFTSzsKKwkJ V1JFRzMyKG1lY19pbnRfY250bF9yZWcsIG1lY19pbnRfY250bCk7CisJCWJyZWFrOworCWRlZmF1 bHQ6CisJCWJyZWFrOworCX0KIH0KIAogc3RhdGljIGludCBnZnhfdjhfMF9zZXRfcHJpdl9yZWdf ZmF1bHRfc3RhdGUoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjlfMC5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9h bWRncHUvZ2Z4X3Y5XzAuYwppbmRleCAzNzU2MjBhLi5lOWRkMmMxIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjlfMC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9h bWQvYW1kZ3B1L2dmeF92OV8wLmMKQEAgLTM5ODIsMjYgKzM5ODIsNTMgQEAgc3RhdGljIHZvaWQg Z2Z4X3Y5XzBfc2V0X2NvbXB1dGVfZW9wX2ludGVycnVwdF9zdGF0ZShzdHJ1Y3QgYW1kZ3B1X2Rl dmljZSAqYWRldiwKIAkJCQkJCSAgICAgaW50IG1lLCBpbnQgcGlwZSwKIAkJCQkJCSAgICAgZW51 bSBhbWRncHVfaW50ZXJydXB0X3N0YXRlIHN0YXRlKQogewotCS8qIE1lIDAgaXMgcmVzZXJ2ZWQg Zm9yIGdyYXBoaWNzICovCi0JaWYgKG1lIDwgMSB8fCBtZSA+IGFkZXYtPmdmeC5tZWMubnVtX21l YykgewotCQlEUk1fRVJST1IoIklnbm9yaW5nIHJlcXVlc3QgdG8gZW5hYmxlIGludGVycnVwdHMg Zm9yIGludmFsaWQgbWU6JWRcbiIsIG1lKTsKLQkJcmV0dXJuOwotCX0KKwl1MzIgbWVjX2ludF9j bnRsLCBtZWNfaW50X2NudGxfcmVnOwogCi0JaWYgKHBpcGUgPj0gYWRldi0+Z2Z4Lm1lYy5udW1f cGlwZV9wZXJfbWVjKSB7Ci0JCURSTV9FUlJPUigiSWdub3JpbmcgcmVxdWVzdCB0byBlbmFibGUg aW50ZXJydXB0cyBmb3IgaW52YWxpZCAiCi0JCQkJIm1lOiVkIHBpcGU6JWRcbiIsIHBpcGUsIG1l KTsKKwkvKgorCSAqIGFtZGdwdSBjb250cm9scyBvbmx5IHRoZSBmaXJzdCBNRUMuIFRoYXQncyB3 aHkgdGhpcyBmdW5jdGlvbiBvbmx5CisJICogaGFuZGxlcyB0aGUgc2V0dGluZyBvZiBpbnRlcnJ1 cHRzIGZvciB0aGlzIHNwZWNpZmljIE1FQy4gQWxsIG90aGVyCisJICogcGlwZXMnIGludGVycnVw dHMgYXJlIHNldCBieSBhbWRrZmQuCisJICovCisKKwlpZiAobWUgPT0gMSkgeworCQlzd2l0Y2gg KHBpcGUpIHsKKwkJY2FzZSAwOgorCQkJbWVjX2ludF9jbnRsX3JlZyA9IFNPQzE1X1JFR19PRkZT RVQoR0MsIDAsIG1tQ1BfTUUxX1BJUEUwX0lOVF9DTlRMKTsKKwkJCWJyZWFrOworCQljYXNlIDE6 CisJCQltZWNfaW50X2NudGxfcmVnID0gU09DMTVfUkVHX09GRlNFVChHQywgMCwgbW1DUF9NRTFf UElQRTFfSU5UX0NOVEwpOworCQkJYnJlYWs7CisJCWNhc2UgMjoKKwkJCW1lY19pbnRfY250bF9y ZWcgPSBTT0MxNV9SRUdfT0ZGU0VUKEdDLCAwLCBtbUNQX01FMV9QSVBFMl9JTlRfQ05UTCk7CisJ CQlicmVhazsKKwkJY2FzZSAzOgorCQkJbWVjX2ludF9jbnRsX3JlZyA9IFNPQzE1X1JFR19PRkZT RVQoR0MsIDAsIG1tQ1BfTUUxX1BJUEUzX0lOVF9DTlRMKTsKKwkJCWJyZWFrOworCQlkZWZhdWx0 OgorCQkJRFJNX0RFQlVHKCJpbnZhbGlkIHBpcGUgJWRcbiIsIHBpcGUpOworCQkJcmV0dXJuOwor CQl9CisJfSBlbHNlIHsKKwkJRFJNX0RFQlVHKCJpbnZhbGlkIG1lICVkXG4iLCBtZSk7CiAJCXJl dHVybjsKIAl9CiAKLQltdXRleF9sb2NrKCZhZGV2LT5zcmJtX211dGV4KTsKLQlzb2MxNV9ncmJt X3NlbGVjdChhZGV2LCBtZSwgcGlwZSwgMCwgMCk7Ci0KLQlXUkVHMzJfRklFTEQoQ1BDX0lOVF9D TlRMLCBUSU1FX1NUQU1QX0lOVF9FTkFCTEUsCi0JCQlzdGF0ZSA9PSBBTURHUFVfSVJRX1NUQVRF X0RJU0FCTEUgPyAwIDogMSk7Ci0KLQlzb2MxNV9ncmJtX3NlbGVjdChhZGV2LCAwLCAwLCAwLCAw KTsKLQltdXRleF91bmxvY2soJmFkZXYtPnNyYm1fbXV0ZXgpOworCXN3aXRjaCAoc3RhdGUpIHsK KwljYXNlIEFNREdQVV9JUlFfU1RBVEVfRElTQUJMRToKKwkJbWVjX2ludF9jbnRsID0gUlJFRzMy KG1lY19pbnRfY250bF9yZWcpOworCQltZWNfaW50X2NudGwgPSBSRUdfU0VUX0ZJRUxEKG1lY19p bnRfY250bCwgQ1BfTUUxX1BJUEUwX0lOVF9DTlRMLAorCQkJCQkgICAgIFRJTUVfU1RBTVBfSU5U X0VOQUJMRSwgMCk7CisJCVdSRUczMihtZWNfaW50X2NudGxfcmVnLCBtZWNfaW50X2NudGwpOwor CQlicmVhazsKKwljYXNlIEFNREdQVV9JUlFfU1RBVEVfRU5BQkxFOgorCQltZWNfaW50X2NudGwg PSBSUkVHMzIobWVjX2ludF9jbnRsX3JlZyk7CisJCW1lY19pbnRfY250bCA9IFJFR19TRVRfRklF TEQobWVjX2ludF9jbnRsLCBDUF9NRTFfUElQRTBfSU5UX0NOVEwsCisJCQkJCSAgICAgVElNRV9T VEFNUF9JTlRfRU5BQkxFLCAxKTsKKwkJV1JFRzMyKG1lY19pbnRfY250bF9yZWcsIG1lY19pbnRf Y250bCk7CisJCWJyZWFrOworCWRlZmF1bHQ6CisJCWJyZWFrOworCX0KIH0KIAogc3RhdGljIGlu dCBnZnhfdjlfMF9zZXRfcHJpdl9yZWdfZmF1bHRfc3RhdGUoc3RydWN0IGFtZGdwdV9kZXZpY2Ug KmFkZXYsCi0tIAoyLjUuNQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KYW1kLWdmeCBtYWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5v cmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4 Cg==