From: Alex Deucher Subject: [PATCH 039/100] drm/amdgpu: rework common ucode handling for vega10 Date: Mon, 20 Mar 2017 16:29:34 -0400 Message-ID: <1490041835-11255-25-git-send-email-alexander.deucher@amd.com> References: <1490041835-11255-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: In-Reply-To: <1490041835-11255-1-git-send-email-alexander.deucher-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: Alex Deucher , Huang Rui RnJvbTogSHVhbmcgUnVpIDxyYXkuaHVhbmdAYW1kLmNvbT4KCkhhbmRsZSB1Y29kZSBkaWZmZXJl bmNlcyBpbiB2ZWdhMTAuCgpTaWduZWQtb2ZmLWJ5OiBIdWFuZyBSdWkgPHJheS5odWFuZ0BhbWQu Y29tPgpSZXZpZXdlZC1ieTogQWxleCBEZXVjaGVyIDxhbGV4YW5kZXIuZGV1Y2hlckBhbWQuY29t PgpTaWduZWQtb2ZmLWJ5OiBBbGV4IERldWNoZXIgPGFsZXhhbmRlci5kZXVjaGVyQGFtZC5jb20+ Ci0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1LmggICAgICAgfCAgMSArCiBk cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfdWNvZGUuYyB8IDcwICsrKysrKysrKysr KysrKysrKysrKy0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV91 Y29kZS5oIHwgIDUgKysrCiAzIGZpbGVzIGNoYW5nZWQsIDUzIGluc2VydGlvbnMoKyksIDIzIGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdw dS5oIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1LmgKaW5kZXggYWQwZTIyNC4u YWFkZWQ4ZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1LmgK KysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1LmgKQEAgLTExODMsNiArMTE4 Myw3IEBAIHN0cnVjdCBhbWRncHVfZmlybXdhcmUgewogCWVudW0gYW1kZ3B1X2Zpcm13YXJlX2xv YWRfdHlwZSBsb2FkX3R5cGU7CiAJc3RydWN0IGFtZGdwdV9ibyAqZndfYnVmOwogCXVuc2lnbmVk IGludCBmd19zaXplOworCXVuc2lnbmVkIGludCBtYXhfdWNvZGVzOwogfTsKIAogLyoKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV91Y29kZS5jIGIvZHJpdmVy cy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3Vjb2RlLmMKaW5kZXggNzNjM2U2Ni4uYTE4OTFj OSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3Vjb2RlLmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3Vjb2RlLmMKQEAgLTI2MCwx MCArMjYwLDEyIEBAIGFtZGdwdV91Y29kZV9nZXRfbG9hZF90eXBlKHN0cnVjdCBhbWRncHVfZGV2 aWNlICphZGV2LCBpbnQgbG9hZF90eXBlKQogCXJldHVybiBBTURHUFVfRldfTE9BRF9ESVJFQ1Q7 CiB9CiAKLXN0YXRpYyBpbnQgYW1kZ3B1X3Vjb2RlX2luaXRfc2luZ2xlX2Z3KHN0cnVjdCBhbWRn cHVfZmlybXdhcmVfaW5mbyAqdWNvZGUsCi0JCQkJdWludDY0X3QgbWNfYWRkciwgdm9pZCAqa3B0 cikKK3N0YXRpYyBpbnQgYW1kZ3B1X3Vjb2RlX2luaXRfc2luZ2xlX2Z3KHN0cnVjdCBhbWRncHVf ZGV2aWNlICphZGV2LAorCQkJCSAgICAgICBzdHJ1Y3QgYW1kZ3B1X2Zpcm13YXJlX2luZm8gKnVj b2RlLAorCQkJCSAgICAgICB1aW50NjRfdCBtY19hZGRyLCB2b2lkICprcHRyKQogewogCWNvbnN0 IHN0cnVjdCBjb21tb25fZmlybXdhcmVfaGVhZGVyICpoZWFkZXIgPSBOVUxMOworCWNvbnN0IHN0 cnVjdCBnZnhfZmlybXdhcmVfaGVhZGVyX3YxXzAgKmNwX2hkciA9IE5VTEw7CiAKIAlpZiAoTlVM TCA9PSB1Y29kZS0+ZncpCiAJCXJldHVybiAwOwpAQCAtMjc2LDExICsyNzgsMzUgQEAgc3RhdGlj IGludCBhbWRncHVfdWNvZGVfaW5pdF9zaW5nbGVfZncoc3RydWN0IGFtZGdwdV9maXJtd2FyZV9p bmZvICp1Y29kZSwKIAogCWhlYWRlciA9IChjb25zdCBzdHJ1Y3QgY29tbW9uX2Zpcm13YXJlX2hl YWRlciAqKXVjb2RlLT5mdy0+ZGF0YTsKIAotCXVjb2RlLT51Y29kZV9zaXplID0gbGUzMl90b19j cHUoaGVhZGVyLT51Y29kZV9zaXplX2J5dGVzKTsKLQotCW1lbWNweSh1Y29kZS0+a2FkZHIsICh2 b2lkICopKCh1aW50OF90ICopdWNvZGUtPmZ3LT5kYXRhICsKLQkgICAgICAgbGUzMl90b19jcHUo aGVhZGVyLT51Y29kZV9hcnJheV9vZmZzZXRfYnl0ZXMpKSwKLQkgICAgICAgdWNvZGUtPnVjb2Rl X3NpemUpOworCWNwX2hkciA9IChjb25zdCBzdHJ1Y3QgZ2Z4X2Zpcm13YXJlX2hlYWRlcl92MV8w ICopdWNvZGUtPmZ3LT5kYXRhOworCisJaWYgKGFkZXYtPmZpcm13YXJlLmxvYWRfdHlwZSAhPSBB TURHUFVfRldfTE9BRF9QU1AgfHwKKwkgICAgKHVjb2RlLT51Y29kZV9pZCAhPSBBTURHUFVfVUNP REVfSURfQ1BfTUVDMSAmJgorCSAgICAgdWNvZGUtPnVjb2RlX2lkICE9IEFNREdQVV9VQ09ERV9J RF9DUF9NRUMyICYmCisJICAgICB1Y29kZS0+dWNvZGVfaWQgIT0gQU1ER1BVX1VDT0RFX0lEX0NQ X01FQzFfSlQgJiYKKwkgICAgIHVjb2RlLT51Y29kZV9pZCAhPSBBTURHUFVfVUNPREVfSURfQ1Bf TUVDMl9KVCkpIHsKKwkJdWNvZGUtPnVjb2RlX3NpemUgPSBsZTMyX3RvX2NwdShoZWFkZXItPnVj b2RlX3NpemVfYnl0ZXMpOworCisJCW1lbWNweSh1Y29kZS0+a2FkZHIsICh2b2lkICopKCh1aW50 OF90ICopdWNvZGUtPmZ3LT5kYXRhICsKKwkJCQkJICAgICAgbGUzMl90b19jcHUoaGVhZGVyLT51 Y29kZV9hcnJheV9vZmZzZXRfYnl0ZXMpKSwKKwkJICAgICAgIHVjb2RlLT51Y29kZV9zaXplKTsK Kwl9IGVsc2UgaWYgKHVjb2RlLT51Y29kZV9pZCA9PSBBTURHUFVfVUNPREVfSURfQ1BfTUVDMSB8 fAorCQkgICB1Y29kZS0+dWNvZGVfaWQgPT0gQU1ER1BVX1VDT0RFX0lEX0NQX01FQzIpIHsKKwkJ dWNvZGUtPnVjb2RlX3NpemUgPSBsZTMyX3RvX2NwdShoZWFkZXItPnVjb2RlX3NpemVfYnl0ZXMp IC0KKwkJCWxlMzJfdG9fY3B1KGNwX2hkci0+anRfc2l6ZSkgKiA0OworCisJCW1lbWNweSh1Y29k ZS0+a2FkZHIsICh2b2lkICopKCh1aW50OF90ICopdWNvZGUtPmZ3LT5kYXRhICsKKwkJCQkJICAg ICAgbGUzMl90b19jcHUoaGVhZGVyLT51Y29kZV9hcnJheV9vZmZzZXRfYnl0ZXMpKSwKKwkJICAg ICAgIHVjb2RlLT51Y29kZV9zaXplKTsKKwl9IGVsc2UgaWYgKHVjb2RlLT51Y29kZV9pZCA9PSBB TURHUFVfVUNPREVfSURfQ1BfTUVDMV9KVCB8fAorCQkgICB1Y29kZS0+dWNvZGVfaWQgPT0gQU1E R1BVX1VDT0RFX0lEX0NQX01FQzJfSlQpIHsKKwkJdWNvZGUtPnVjb2RlX3NpemUgPSBsZTMyX3Rv X2NwdShjcF9oZHItPmp0X3NpemUpICogNDsKKworCQltZW1jcHkodWNvZGUtPmthZGRyLCAodm9p ZCAqKSgodWludDhfdCAqKXVjb2RlLT5mdy0+ZGF0YSArCisJCQkJCSAgICAgIGxlMzJfdG9fY3B1 KGhlYWRlci0+dWNvZGVfYXJyYXlfb2Zmc2V0X2J5dGVzKSArCisJCQkJCSAgICAgIGxlMzJfdG9f Y3B1KGNwX2hkci0+anRfb2Zmc2V0KSAqIDQpLAorCQkgICAgICAgdWNvZGUtPnVjb2RlX3NpemUp OworCX0KIAogCXJldHVybiAwOwogfQpAQCAtMzA2LDE3ICszMzIsMTggQEAgc3RhdGljIGludCBh bWRncHVfdWNvZGVfcGF0Y2hfanQoc3RydWN0IGFtZGdwdV9maXJtd2FyZV9pbmZvICp1Y29kZSwK IAkJCSAgIChsZTMyX3RvX2NwdShoZWFkZXItPmp0X29mZnNldCkgKiA0KTsKIAltZW1jcHkoZHN0 X2FkZHIsIHNyY19hZGRyLCBsZTMyX3RvX2NwdShoZWFkZXItPmp0X3NpemUpICogNCk7CiAKKwl1 Y29kZS0+dWNvZGVfc2l6ZSArPSBsZTMyX3RvX2NwdShoZWFkZXItPmp0X3NpemUpICogNDsKKwog CXJldHVybiAwOwogfQogCi0KIGludCBhbWRncHVfdWNvZGVfaW5pdF9ibyhzdHJ1Y3QgYW1kZ3B1 X2RldmljZSAqYWRldikKIHsKIAlzdHJ1Y3QgYW1kZ3B1X2JvICoqYm8gPSAmYWRldi0+ZmlybXdh cmUuZndfYnVmOwogCXVpbnQ2NF90IGZ3X21jX2FkZHI7CiAJdm9pZCAqZndfYnVmX3B0ciA9IE5V TEw7CiAJdWludDY0X3QgZndfb2Zmc2V0ID0gMDsKLQlpbnQgaSwgZXJyLCBtYXg7CisJaW50IGks IGVycjsKIAlzdHJ1Y3QgYW1kZ3B1X2Zpcm13YXJlX2luZm8gKnVjb2RlID0gTlVMTDsKIAljb25z dCBzdHJ1Y3QgY29tbW9uX2Zpcm13YXJlX2hlYWRlciAqaGVhZGVyID0gTlVMTDsKIApAQCAtMzQ5 LDI5ICszNzYsMzIgQEAgaW50IGFtZGdwdV91Y29kZV9pbml0X2JvKHN0cnVjdCBhbWRncHVfZGV2 aWNlICphZGV2KQogCiAJYW1kZ3B1X2JvX3VucmVzZXJ2ZSgqYm8pOwogCisJbWVtc2V0KGZ3X2J1 Zl9wdHIsIDAsIGFkZXYtPmZpcm13YXJlLmZ3X3NpemUpOworCiAJLyoKIAkgKiBpZiBTTVUgbG9h ZGVkIGZpcm13YXJlLCBpdCBuZWVkbid0IGFkZCBTTUMsIFVWRCwgYW5kIFZDRQogCSAqIHVjb2Rl IGluZm8gaGVyZQogCSAqLwogCWlmIChhZGV2LT5maXJtd2FyZS5sb2FkX3R5cGUgIT0gQU1ER1BV X0ZXX0xPQURfUFNQKQotCQltYXggPSBBTURHUFVfVUNPREVfSURfTUFYSU1VTSAtIDM7CisJCWFk ZXYtPmZpcm13YXJlLm1heF91Y29kZXMgPSBBTURHUFVfVUNPREVfSURfTUFYSU1VTSAtIDQ7CiAJ ZWxzZQotCQltYXggPSBBTURHUFVfVUNPREVfSURfTUFYSU1VTTsKKwkJYWRldi0+ZmlybXdhcmUu bWF4X3Vjb2RlcyA9IEFNREdQVV9VQ09ERV9JRF9NQVhJTVVNOwogCi0JZm9yIChpID0gMDsgaSA8 IG1heDsgaSsrKSB7CisJZm9yIChpID0gMDsgaSA8IGFkZXYtPmZpcm13YXJlLm1heF91Y29kZXM7 IGkrKykgewogCQl1Y29kZSA9ICZhZGV2LT5maXJtd2FyZS51Y29kZVtpXTsKIAkJaWYgKHVjb2Rl LT5mdykgewogCQkJaGVhZGVyID0gKGNvbnN0IHN0cnVjdCBjb21tb25fZmlybXdhcmVfaGVhZGVy ICopdWNvZGUtPmZ3LT5kYXRhOwotCQkJYW1kZ3B1X3Vjb2RlX2luaXRfc2luZ2xlX2Z3KHVjb2Rl LCBmd19tY19hZGRyICsgZndfb2Zmc2V0LAotCQkJCQkJICAgIGZ3X2J1Zl9wdHIgKyBmd19vZmZz ZXQpOwotCQkJaWYgKGkgPT0gQU1ER1BVX1VDT0RFX0lEX0NQX01FQzEpIHsKKwkJCWFtZGdwdV91 Y29kZV9pbml0X3NpbmdsZV9mdyhhZGV2LCB1Y29kZSwgZndfbWNfYWRkciArIGZ3X29mZnNldCwK KwkJCQkJCSAgICAodm9pZCAqKSgodWludDhfdCAqKWZ3X2J1Zl9wdHIgKyBmd19vZmZzZXQpKTsK KwkJCWlmIChpID09IEFNREdQVV9VQ09ERV9JRF9DUF9NRUMxICYmCisJCQkgICAgYWRldi0+Zmly bXdhcmUubG9hZF90eXBlICE9IEFNREdQVV9GV19MT0FEX1BTUCkgewogCQkJCWNvbnN0IHN0cnVj dCBnZnhfZmlybXdhcmVfaGVhZGVyX3YxXzAgKmNwX2hkcjsKIAkJCQljcF9oZHIgPSAoY29uc3Qg c3RydWN0IGdmeF9maXJtd2FyZV9oZWFkZXJfdjFfMCAqKXVjb2RlLT5mdy0+ZGF0YTsKIAkJCQlh bWRncHVfdWNvZGVfcGF0Y2hfanQodWNvZGUsIGZ3X21jX2FkZHIgKyBmd19vZmZzZXQsCiAJCQkJ CQkgICAgZndfYnVmX3B0ciArIGZ3X29mZnNldCk7CiAJCQkJZndfb2Zmc2V0ICs9IEFMSUdOKGxl MzJfdG9fY3B1KGNwX2hkci0+anRfc2l6ZSkgPDwgMiwgUEFHRV9TSVpFKTsKIAkJCX0KLQkJCWZ3 X29mZnNldCArPSBBTElHTihsZTMyX3RvX2NwdShoZWFkZXItPnVjb2RlX3NpemVfYnl0ZXMpLCBQ QUdFX1NJWkUpOworCQkJZndfb2Zmc2V0ICs9IEFMSUdOKHVjb2RlLT51Y29kZV9zaXplLCBQQUdF X1NJWkUpOwogCQl9CiAJfQogCXJldHVybiAwOwpAQCAtMzkzLDE0ICs0MjMsOCBAQCBpbnQgYW1k Z3B1X3Vjb2RlX2ZpbmlfYm8oc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiB7CiAJaW50IGk7 CiAJc3RydWN0IGFtZGdwdV9maXJtd2FyZV9pbmZvICp1Y29kZSA9IE5VTEw7Ci0JaW50IG1heDsK LQotCWlmIChhZGV2LT5maXJtd2FyZS5sb2FkX3R5cGUgIT0gQU1ER1BVX0ZXX0xPQURfUFNQKQot CQltYXggPSBBTURHUFVfVUNPREVfSURfTUFYSU1VTSAtIDM7Ci0JZWxzZQotCQltYXggPSBBTURH UFVfVUNPREVfSURfTUFYSU1VTTsKIAotCWZvciAoaSA9IDA7IGkgPCBtYXg7IGkrKykgeworCWZv ciAoaSA9IDA7IGkgPCBhZGV2LT5maXJtd2FyZS5tYXhfdWNvZGVzOyBpKyspIHsKIAkJdWNvZGUg PSAmYWRldi0+ZmlybXdhcmUudWNvZGVbaV07CiAJCWlmICh1Y29kZS0+ZncpIHsKIAkJCXVjb2Rl LT5tY19hZGRyID0gMDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2Ft ZGdwdV91Y29kZS5oIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3Vjb2RlLmgK aW5kZXggMmIyMTJiMC4uMzlhMDc0OSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9h bWRncHUvYW1kZ3B1X3Vjb2RlLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1k Z3B1X3Vjb2RlLmgKQEAgLTEyOCw5ICsxMjgsMTQgQEAgZW51bSBBTURHUFVfVUNPREVfSUQgewog CUFNREdQVV9VQ09ERV9JRF9DUF9QRlAsCiAJQU1ER1BVX1VDT0RFX0lEX0NQX01FLAogCUFNREdQ VV9VQ09ERV9JRF9DUF9NRUMxLAorCUFNREdQVV9VQ09ERV9JRF9DUF9NRUMxX0pULAogCUFNREdQ VV9VQ09ERV9JRF9DUF9NRUMyLAorCUFNREdQVV9VQ09ERV9JRF9DUF9NRUMyX0pULAogCUFNREdQ VV9VQ09ERV9JRF9STENfRywKIAlBTURHUFVfVUNPREVfSURfU1RPUkFHRSwKKwlBTURHUFVfVUNP REVfSURfU01DLAorCUFNREdQVV9VQ09ERV9JRF9VVkQsCisJQU1ER1BVX1VDT0RFX0lEX1ZDRSwK IAlBTURHUFVfVUNPREVfSURfTUFYSU1VTSwKIH07CiAKLS0gCjIuNS41CgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAph bWQtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2FtZC1nZngK