From: Alex Deucher Subject: [PATCH 2/2] drm/amdgpu: switch firmware path for SI parts Date: Mon, 2 Jul 2018 14:36:29 -0500 Message-ID: <20180702193629.2604-2-alexander.deucher@amd.com> References: <20180702193629.2604-1-alexander.deucher@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180702193629.2604-1-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 VXNlIHNlcGFyYXRlIGZpcm13YXJlIHBhdGggZm9yIGFtZGdwdSB0byBhdm9pZCBjb25mbGljdHMK d2l0aCByYWRlb24gb24gU0kgcGFydHMuCgpTaWduZWQtb2ZmLWJ5OiBBbGV4IERldWNoZXIgPGFs ZXhhbmRlci5kZXVjaGVyQGFtZC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUv Z2Z4X3Y2XzAuYyB8IDU2ICsrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tCiBkcml2 ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nbWNfdjZfMC5jIHwgMTQgKysrKy0tLS0tCiBkcml2ZXJz L2dwdS9kcm0vYW1kL2FtZGdwdS9zaV9kcG0uYyAgIHwgMjIgKysrKysrKy0tLS0tLS0KIDMgZmls ZXMgY2hhbmdlZCwgNDYgaW5zZXJ0aW9ucygrKSwgNDYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4X3Y2XzAuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9hbWQvYW1kZ3B1L2dmeF92Nl8wLmMKaW5kZXggY2Q2YmYyOTFhODUzLi5kZTE4NGE4ODYwNTcg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92Nl8wLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4X3Y2XzAuYwpAQCAtNDQsMzAgKzQ0LDMwIEBA IHN0YXRpYyB2b2lkIGdmeF92Nl8wX3NldF9yaW5nX2Z1bmNzKHN0cnVjdCBhbWRncHVfZGV2aWNl ICphZGV2KTsKIHN0YXRpYyB2b2lkIGdmeF92Nl8wX3NldF9pcnFfZnVuY3Moc3RydWN0IGFtZGdw dV9kZXZpY2UgKmFkZXYpOwogc3RhdGljIHZvaWQgZ2Z4X3Y2XzBfZ2V0X2N1X2luZm8oc3RydWN0 IGFtZGdwdV9kZXZpY2UgKmFkZXYpOwogCi1NT0RVTEVfRklSTVdBUkUoInJhZGVvbi90YWhpdGlf cGZwLmJpbiIpOwotTU9EVUxFX0ZJUk1XQVJFKCJyYWRlb24vdGFoaXRpX21lLmJpbiIpOwotTU9E VUxFX0ZJUk1XQVJFKCJyYWRlb24vdGFoaXRpX2NlLmJpbiIpOwotTU9EVUxFX0ZJUk1XQVJFKCJy YWRlb24vdGFoaXRpX3JsYy5iaW4iKTsKLQotTU9EVUxFX0ZJUk1XQVJFKCJyYWRlb24vcGl0Y2Fp cm5fcGZwLmJpbiIpOwotTU9EVUxFX0ZJUk1XQVJFKCJyYWRlb24vcGl0Y2Fpcm5fbWUuYmluIik7 Ci1NT0RVTEVfRklSTVdBUkUoInJhZGVvbi9waXRjYWlybl9jZS5iaW4iKTsKLU1PRFVMRV9GSVJN V0FSRSgicmFkZW9uL3BpdGNhaXJuX3JsYy5iaW4iKTsKLQotTU9EVUxFX0ZJUk1XQVJFKCJyYWRl b24vdmVyZGVfcGZwLmJpbiIpOwotTU9EVUxFX0ZJUk1XQVJFKCJyYWRlb24vdmVyZGVfbWUuYmlu Iik7Ci1NT0RVTEVfRklSTVdBUkUoInJhZGVvbi92ZXJkZV9jZS5iaW4iKTsKLU1PRFVMRV9GSVJN V0FSRSgicmFkZW9uL3ZlcmRlX3JsYy5iaW4iKTsKLQotTU9EVUxFX0ZJUk1XQVJFKCJyYWRlb24v b2xhbmRfcGZwLmJpbiIpOwotTU9EVUxFX0ZJUk1XQVJFKCJyYWRlb24vb2xhbmRfbWUuYmluIik7 Ci1NT0RVTEVfRklSTVdBUkUoInJhZGVvbi9vbGFuZF9jZS5iaW4iKTsKLU1PRFVMRV9GSVJNV0FS RSgicmFkZW9uL29sYW5kX3JsYy5iaW4iKTsKLQotTU9EVUxFX0ZJUk1XQVJFKCJyYWRlb24vaGFp bmFuX3BmcC5iaW4iKTsKLU1PRFVMRV9GSVJNV0FSRSgicmFkZW9uL2hhaW5hbl9tZS5iaW4iKTsK LU1PRFVMRV9GSVJNV0FSRSgicmFkZW9uL2hhaW5hbl9jZS5iaW4iKTsKLU1PRFVMRV9GSVJNV0FS RSgicmFkZW9uL2hhaW5hbl9ybGMuYmluIik7CitNT0RVTEVfRklSTVdBUkUoImFtZGdwdS90YWhp dGlfcGZwLmJpbiIpOworTU9EVUxFX0ZJUk1XQVJFKCJhbWRncHUvdGFoaXRpX21lLmJpbiIpOwor TU9EVUxFX0ZJUk1XQVJFKCJhbWRncHUvdGFoaXRpX2NlLmJpbiIpOworTU9EVUxFX0ZJUk1XQVJF KCJhbWRncHUvdGFoaXRpX3JsYy5iaW4iKTsKKworTU9EVUxFX0ZJUk1XQVJFKCJhbWRncHUvcGl0 Y2Fpcm5fcGZwLmJpbiIpOworTU9EVUxFX0ZJUk1XQVJFKCJhbWRncHUvcGl0Y2Fpcm5fbWUuYmlu Iik7CitNT0RVTEVfRklSTVdBUkUoImFtZGdwdS9waXRjYWlybl9jZS5iaW4iKTsKK01PRFVMRV9G SVJNV0FSRSgiYW1kZ3B1L3BpdGNhaXJuX3JsYy5iaW4iKTsKKworTU9EVUxFX0ZJUk1XQVJFKCJh bWRncHUvdmVyZGVfcGZwLmJpbiIpOworTU9EVUxFX0ZJUk1XQVJFKCJhbWRncHUvdmVyZGVfbWUu YmluIik7CitNT0RVTEVfRklSTVdBUkUoImFtZGdwdS92ZXJkZV9jZS5iaW4iKTsKK01PRFVMRV9G SVJNV0FSRSgiYW1kZ3B1L3ZlcmRlX3JsYy5iaW4iKTsKKworTU9EVUxFX0ZJUk1XQVJFKCJhbWRn cHUvb2xhbmRfcGZwLmJpbiIpOworTU9EVUxFX0ZJUk1XQVJFKCJhbWRncHUvb2xhbmRfbWUuYmlu Iik7CitNT0RVTEVfRklSTVdBUkUoImFtZGdwdS9vbGFuZF9jZS5iaW4iKTsKK01PRFVMRV9GSVJN V0FSRSgiYW1kZ3B1L29sYW5kX3JsYy5iaW4iKTsKKworTU9EVUxFX0ZJUk1XQVJFKCJhbWRncHUv aGFpbmFuX3BmcC5iaW4iKTsKK01PRFVMRV9GSVJNV0FSRSgiYW1kZ3B1L2hhaW5hbl9tZS5iaW4i KTsKK01PRFVMRV9GSVJNV0FSRSgiYW1kZ3B1L2hhaW5hbl9jZS5iaW4iKTsKK01PRFVMRV9GSVJN V0FSRSgiYW1kZ3B1L2hhaW5hbl9ybGMuYmluIik7CiAKIHN0YXRpYyB1MzIgZ2Z4X3Y2XzBfZ2V0 X2NzYl9zaXplKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KTsKIHN0YXRpYyB2b2lkIGdmeF92 Nl8wX2dldF9jc2JfYnVmZmVyKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LCB2b2xhdGlsZSB1 MzIgKmJ1ZmZlcik7CkBAIC0zMzUsNyArMzM1LDcgQEAgc3RhdGljIGludCBnZnhfdjZfMF9pbml0 X21pY3JvY29kZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIAlkZWZhdWx0OiBCVUcoKTsK IAl9CiAKLQlzbnByaW50Zihmd19uYW1lLCBzaXplb2YoZndfbmFtZSksICJyYWRlb24vJXNfcGZw LmJpbiIsIGNoaXBfbmFtZSk7CisJc25wcmludGYoZndfbmFtZSwgc2l6ZW9mKGZ3X25hbWUpLCAi YW1kZ3B1LyVzX3BmcC5iaW4iLCBjaGlwX25hbWUpOwogCWVyciA9IHJlcXVlc3RfZmlybXdhcmUo JmFkZXYtPmdmeC5wZnBfZncsIGZ3X25hbWUsIGFkZXYtPmRldik7CiAJaWYgKGVycikKIAkJZ290 byBvdXQ7CkBAIC0zNDYsNyArMzQ2LDcgQEAgc3RhdGljIGludCBnZnhfdjZfMF9pbml0X21pY3Jv Y29kZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIAlhZGV2LT5nZngucGZwX2Z3X3ZlcnNp b24gPSBsZTMyX3RvX2NwdShjcF9oZHItPmhlYWRlci51Y29kZV92ZXJzaW9uKTsKIAlhZGV2LT5n ZngucGZwX2ZlYXR1cmVfdmVyc2lvbiA9IGxlMzJfdG9fY3B1KGNwX2hkci0+dWNvZGVfZmVhdHVy ZV92ZXJzaW9uKTsKIAotCXNucHJpbnRmKGZ3X25hbWUsIHNpemVvZihmd19uYW1lKSwgInJhZGVv bi8lc19tZS5iaW4iLCBjaGlwX25hbWUpOworCXNucHJpbnRmKGZ3X25hbWUsIHNpemVvZihmd19u YW1lKSwgImFtZGdwdS8lc19tZS5iaW4iLCBjaGlwX25hbWUpOwogCWVyciA9IHJlcXVlc3RfZmly bXdhcmUoJmFkZXYtPmdmeC5tZV9mdywgZndfbmFtZSwgYWRldi0+ZGV2KTsKIAlpZiAoZXJyKQog CQlnb3RvIG91dDsKQEAgLTM1Nyw3ICszNTcsNyBAQCBzdGF0aWMgaW50IGdmeF92Nl8wX2luaXRf bWljcm9jb2RlKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCWFkZXYtPmdmeC5tZV9md192 ZXJzaW9uID0gbGUzMl90b19jcHUoY3BfaGRyLT5oZWFkZXIudWNvZGVfdmVyc2lvbik7CiAJYWRl di0+Z2Z4Lm1lX2ZlYXR1cmVfdmVyc2lvbiA9IGxlMzJfdG9fY3B1KGNwX2hkci0+dWNvZGVfZmVh dHVyZV92ZXJzaW9uKTsKIAotCXNucHJpbnRmKGZ3X25hbWUsIHNpemVvZihmd19uYW1lKSwgInJh ZGVvbi8lc19jZS5iaW4iLCBjaGlwX25hbWUpOworCXNucHJpbnRmKGZ3X25hbWUsIHNpemVvZihm d19uYW1lKSwgImFtZGdwdS8lc19jZS5iaW4iLCBjaGlwX25hbWUpOwogCWVyciA9IHJlcXVlc3Rf ZmlybXdhcmUoJmFkZXYtPmdmeC5jZV9mdywgZndfbmFtZSwgYWRldi0+ZGV2KTsKIAlpZiAoZXJy KQogCQlnb3RvIG91dDsKQEAgLTM2OCw3ICszNjgsNyBAQCBzdGF0aWMgaW50IGdmeF92Nl8wX2lu aXRfbWljcm9jb2RlKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCWFkZXYtPmdmeC5jZV9m d192ZXJzaW9uID0gbGUzMl90b19jcHUoY3BfaGRyLT5oZWFkZXIudWNvZGVfdmVyc2lvbik7CiAJ YWRldi0+Z2Z4LmNlX2ZlYXR1cmVfdmVyc2lvbiA9IGxlMzJfdG9fY3B1KGNwX2hkci0+dWNvZGVf ZmVhdHVyZV92ZXJzaW9uKTsKIAotCXNucHJpbnRmKGZ3X25hbWUsIHNpemVvZihmd19uYW1lKSwg InJhZGVvbi8lc19ybGMuYmluIiwgY2hpcF9uYW1lKTsKKwlzbnByaW50Zihmd19uYW1lLCBzaXpl b2YoZndfbmFtZSksICJhbWRncHUvJXNfcmxjLmJpbiIsIGNoaXBfbmFtZSk7CiAJZXJyID0gcmVx dWVzdF9maXJtd2FyZSgmYWRldi0+Z2Z4LnJsY19mdywgZndfbmFtZSwgYWRldi0+ZGV2KTsKIAlp ZiAoZXJyKQogCQlnb3RvIG91dDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1k Z3B1L2dtY192Nl8wLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nbWNfdjZfMC5jCmlu ZGV4IDc5ZjlhYzI5MDE5Yi4uNzUzMTdmMjgzYzY5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vYW1kL2FtZGdwdS9nbWNfdjZfMC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1 L2dtY192Nl8wLmMKQEAgLTQxLDExICs0MSwxMSBAQCBzdGF0aWMgdm9pZCBnbWNfdjZfMF9zZXRf Z21jX2Z1bmNzKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KTsKIHN0YXRpYyB2b2lkIGdtY192 Nl8wX3NldF9pcnFfZnVuY3Moc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpOwogc3RhdGljIGlu dCBnbWNfdjZfMF93YWl0X2Zvcl9pZGxlKHZvaWQgKmhhbmRsZSk7CiAKLU1PRFVMRV9GSVJNV0FS RSgicmFkZW9uL3RhaGl0aV9tYy5iaW4iKTsKLU1PRFVMRV9GSVJNV0FSRSgicmFkZW9uL3BpdGNh aXJuX21jLmJpbiIpOwotTU9EVUxFX0ZJUk1XQVJFKCJyYWRlb24vdmVyZGVfbWMuYmluIik7Ci1N T0RVTEVfRklSTVdBUkUoInJhZGVvbi9vbGFuZF9tYy5iaW4iKTsKLU1PRFVMRV9GSVJNV0FSRSgi cmFkZW9uL3NpNThfbWMuYmluIik7CitNT0RVTEVfRklSTVdBUkUoImFtZGdwdS90YWhpdGlfbWMu YmluIik7CitNT0RVTEVfRklSTVdBUkUoImFtZGdwdS9waXRjYWlybl9tYy5iaW4iKTsKK01PRFVM RV9GSVJNV0FSRSgiYW1kZ3B1L3ZlcmRlX21jLmJpbiIpOworTU9EVUxFX0ZJUk1XQVJFKCJhbWRn cHUvb2xhbmRfbWMuYmluIik7CitNT0RVTEVfRklSTVdBUkUoImFtZGdwdS9zaTU4X21jLmJpbiIp OwogCiAjZGVmaW5lIE1DX1NFUV9NSVNDMF9fTVRfX01BU0sgICAweGYwMDAwMDAwCiAjZGVmaW5l IE1DX1NFUV9NSVNDMF9fTVRfX0dERFIxICAweDEwMDAwMDAwCkBAIC0xMzQsOSArMTM0LDkgQEAg c3RhdGljIGludCBnbWNfdjZfMF9pbml0X21pY3JvY29kZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAq YWRldikKIAkJaXNfNThfZncgPSB0cnVlOwogCiAJaWYgKGlzXzU4X2Z3KQotCQlzbnByaW50Zihm d19uYW1lLCBzaXplb2YoZndfbmFtZSksICJyYWRlb24vc2k1OF9tYy5iaW4iKTsKKwkJc25wcmlu dGYoZndfbmFtZSwgc2l6ZW9mKGZ3X25hbWUpLCAiYW1kZ3B1L3NpNThfbWMuYmluIik7CiAJZWxz ZQotCQlzbnByaW50Zihmd19uYW1lLCBzaXplb2YoZndfbmFtZSksICJyYWRlb24vJXNfbWMuYmlu IiwgY2hpcF9uYW1lKTsKKwkJc25wcmludGYoZndfbmFtZSwgc2l6ZW9mKGZ3X25hbWUpLCAiYW1k Z3B1LyVzX21jLmJpbiIsIGNoaXBfbmFtZSk7CiAJZXJyID0gcmVxdWVzdF9maXJtd2FyZSgmYWRl di0+Z21jLmZ3LCBmd19uYW1lLCBhZGV2LT5kZXYpOwogCWlmIChlcnIpCiAJCWdvdG8gb3V0Owpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvc2lfZHBtLmMgYi9kcml2ZXJz L2dwdS9kcm0vYW1kL2FtZGdwdS9zaV9kcG0uYwppbmRleCBiMjU4NTYyMmFhNmEuLmRiMzI3YjQx MjU2MiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvc2lfZHBtLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvc2lfZHBtLmMKQEAgLTU2LDE2ICs1NiwxNiBA QAogCiAjZGVmaW5lIEJJT1NfU0NSQVRDSF80ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgMHg1Y2QKIAotTU9EVUxFX0ZJUk1XQVJFKCJyYWRlb24vdGFoaXRpX3NtYy5iaW4iKTsK LU1PRFVMRV9GSVJNV0FSRSgicmFkZW9uL3BpdGNhaXJuX3NtYy5iaW4iKTsKLU1PRFVMRV9GSVJN V0FSRSgicmFkZW9uL3BpdGNhaXJuX2tfc21jLmJpbiIpOwotTU9EVUxFX0ZJUk1XQVJFKCJyYWRl b24vdmVyZGVfc21jLmJpbiIpOwotTU9EVUxFX0ZJUk1XQVJFKCJyYWRlb24vdmVyZGVfa19zbWMu YmluIik7Ci1NT0RVTEVfRklSTVdBUkUoInJhZGVvbi9vbGFuZF9zbWMuYmluIik7Ci1NT0RVTEVf RklSTVdBUkUoInJhZGVvbi9vbGFuZF9rX3NtYy5iaW4iKTsKLU1PRFVMRV9GSVJNV0FSRSgicmFk ZW9uL2hhaW5hbl9zbWMuYmluIik7Ci1NT0RVTEVfRklSTVdBUkUoInJhZGVvbi9oYWluYW5fa19z bWMuYmluIik7Ci1NT0RVTEVfRklSTVdBUkUoInJhZGVvbi9iYW5rc19rXzJfc21jLmJpbiIpOwor TU9EVUxFX0ZJUk1XQVJFKCJhbWRncHUvdGFoaXRpX3NtYy5iaW4iKTsKK01PRFVMRV9GSVJNV0FS RSgiYW1kZ3B1L3BpdGNhaXJuX3NtYy5iaW4iKTsKK01PRFVMRV9GSVJNV0FSRSgiYW1kZ3B1L3Bp dGNhaXJuX2tfc21jLmJpbiIpOworTU9EVUxFX0ZJUk1XQVJFKCJhbWRncHUvdmVyZGVfc21jLmJp biIpOworTU9EVUxFX0ZJUk1XQVJFKCJhbWRncHUvdmVyZGVfa19zbWMuYmluIik7CitNT0RVTEVf RklSTVdBUkUoImFtZGdwdS9vbGFuZF9zbWMuYmluIik7CitNT0RVTEVfRklSTVdBUkUoImFtZGdw dS9vbGFuZF9rX3NtYy5iaW4iKTsKK01PRFVMRV9GSVJNV0FSRSgiYW1kZ3B1L2hhaW5hbl9zbWMu YmluIik7CitNT0RVTEVfRklSTVdBUkUoImFtZGdwdS9oYWluYW5fa19zbWMuYmluIik7CitNT0RV TEVfRklSTVdBUkUoImFtZGdwdS9iYW5rc19rXzJfc21jLmJpbiIpOwogCiBzdGF0aWMgY29uc3Qg c3RydWN0IGFtZF9wbV9mdW5jcyBzaV9kcG1fZnVuY3M7CiAKQEAgLTc2NjYsNyArNzY2Niw3IEBA IHN0YXRpYyBpbnQgc2lfZHBtX2luaXRfbWljcm9jb2RlKHN0cnVjdCBhbWRncHVfZGV2aWNlICph ZGV2KQogCWRlZmF1bHQ6IEJVRygpOwogCX0KIAotCXNucHJpbnRmKGZ3X25hbWUsIHNpemVvZihm d19uYW1lKSwgInJhZGVvbi8lc19zbWMuYmluIiwgY2hpcF9uYW1lKTsKKwlzbnByaW50Zihmd19u YW1lLCBzaXplb2YoZndfbmFtZSksICJhbWRncHUvJXNfc21jLmJpbiIsIGNoaXBfbmFtZSk7CiAJ ZXJyID0gcmVxdWVzdF9maXJtd2FyZSgmYWRldi0+cG0uZncsIGZ3X25hbWUsIGFkZXYtPmRldik7 CiAJaWYgKGVycikKIAkJZ290byBvdXQ7Ci0tIAoyLjEzLjYKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCmFtZC1nZnggbWFpbGluZyBsaXN0CmFtZC1nZnhA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vYW1kLWdmeAo=