From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Deucher Subject: [PATCH 2/3] drm/radeon: load different smc firmware on some SI variants Date: Wed, 1 Jun 2016 17:28:32 -0400 Message-ID: <1464816513-7651-2-git-send-email-alexander.deucher@amd.com> References: <1464816513-7651-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: Received: from mail-it0-x244.google.com (mail-it0-x244.google.com [IPv6:2607:f8b0:4001:c0b::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 058846E282 for ; Wed, 1 Jun 2016 21:28:42 +0000 (UTC) Received: by mail-it0-x244.google.com with SMTP id v125so450987itc.0 for ; Wed, 01 Jun 2016 14:28:41 -0700 (PDT) In-Reply-To: <1464816513-7651-1-git-send-email-alexander.deucher@amd.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: Alex Deucher List-Id: dri-devel@lists.freedesktop.org VGhlIHBvd2VyIHRhYmxlcyBvbiBzb21lIHZhcmlhbnRzIHJlcXVpcmUgZGlmZmVyZW50IGZpcm13 YXJlLgpUaGlzIG1heSBmaXggc3RhYmlsaXR5IGlzc3VlcyBvbiBzb21lIG5ld2VyIFNJIHBhcnRz LgoKU2lnbmVkLW9mZi1ieTogQWxleCBEZXVjaGVyIDxhbGV4YW5kZXIuZGV1Y2hlckBhbWQuY29t PgotLS0KIGRyaXZlcnMvZ3B1L2RybS9yYWRlb24vc2kuYyB8IDQ1ICsrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrLQogMSBmaWxlIGNoYW5nZWQsIDQ0IGluc2VydGlv bnMoKyksIDEgZGVsZXRpb24oLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vcmFkZW9u L3NpLmMgYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3NpLmMKaW5kZXggYjMwZTcxOS4uMjUyM2Nh OSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9zaS5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9yYWRlb24vc2kuYwpAQCAtNTAsNiArNTAsNyBAQCBNT0RVTEVfRklSTVdBUkUoInJh ZGVvbi90YWhpdGlfY2UuYmluIik7CiBNT0RVTEVfRklSTVdBUkUoInJhZGVvbi90YWhpdGlfbWMu YmluIik7CiBNT0RVTEVfRklSTVdBUkUoInJhZGVvbi90YWhpdGlfcmxjLmJpbiIpOwogTU9EVUxF X0ZJUk1XQVJFKCJyYWRlb24vdGFoaXRpX3NtYy5iaW4iKTsKK01PRFVMRV9GSVJNV0FSRSgicmFk ZW9uL3RhaGl0aV9rX3NtYy5iaW4iKTsKIAogTU9EVUxFX0ZJUk1XQVJFKCJyYWRlb24vUElUQ0FJ Uk5fcGZwLmJpbiIpOwogTU9EVUxFX0ZJUk1XQVJFKCJyYWRlb24vUElUQ0FJUk5fbWUuYmluIik7 CkBAIC02NSw2ICs2Niw3IEBAIE1PRFVMRV9GSVJNV0FSRSgicmFkZW9uL3BpdGNhaXJuX2NlLmJp biIpOwogTU9EVUxFX0ZJUk1XQVJFKCJyYWRlb24vcGl0Y2Fpcm5fbWMuYmluIik7CiBNT0RVTEVf RklSTVdBUkUoInJhZGVvbi9waXRjYWlybl9ybGMuYmluIik7CiBNT0RVTEVfRklSTVdBUkUoInJh ZGVvbi9waXRjYWlybl9zbWMuYmluIik7CitNT0RVTEVfRklSTVdBUkUoInJhZGVvbi9waXRjYWly bl9rX3NtYy5iaW4iKTsKIAogTU9EVUxFX0ZJUk1XQVJFKCJyYWRlb24vVkVSREVfcGZwLmJpbiIp OwogTU9EVUxFX0ZJUk1XQVJFKCJyYWRlb24vVkVSREVfbWUuYmluIik7CkBAIC04MCw2ICs4Miw3 IEBAIE1PRFVMRV9GSVJNV0FSRSgicmFkZW9uL3ZlcmRlX2NlLmJpbiIpOwogTU9EVUxFX0ZJUk1X QVJFKCJyYWRlb24vdmVyZGVfbWMuYmluIik7CiBNT0RVTEVfRklSTVdBUkUoInJhZGVvbi92ZXJk ZV9ybGMuYmluIik7CiBNT0RVTEVfRklSTVdBUkUoInJhZGVvbi92ZXJkZV9zbWMuYmluIik7CitN T0RVTEVfRklSTVdBUkUoInJhZGVvbi92ZXJkZV9rX3NtYy5iaW4iKTsKIAogTU9EVUxFX0ZJUk1X QVJFKCJyYWRlb24vT0xBTkRfcGZwLmJpbiIpOwogTU9EVUxFX0ZJUk1XQVJFKCJyYWRlb24vT0xB TkRfbWUuYmluIik7CkBAIC05NSw2ICs5OCw3IEBAIE1PRFVMRV9GSVJNV0FSRSgicmFkZW9uL29s YW5kX2NlLmJpbiIpOwogTU9EVUxFX0ZJUk1XQVJFKCJyYWRlb24vb2xhbmRfbWMuYmluIik7CiBN T0RVTEVfRklSTVdBUkUoInJhZGVvbi9vbGFuZF9ybGMuYmluIik7CiBNT0RVTEVfRklSTVdBUkUo InJhZGVvbi9vbGFuZF9zbWMuYmluIik7CitNT0RVTEVfRklSTVdBUkUoInJhZGVvbi9vbGFuZF9r X3NtYy5iaW4iKTsKIAogTU9EVUxFX0ZJUk1XQVJFKCJyYWRlb24vSEFJTkFOX3BmcC5iaW4iKTsK IE1PRFVMRV9GSVJNV0FSRSgicmFkZW9uL0hBSU5BTl9tZS5iaW4iKTsKQEAgLTExMCw2ICsxMTQs NyBAQCBNT0RVTEVfRklSTVdBUkUoInJhZGVvbi9oYWluYW5fY2UuYmluIik7CiBNT0RVTEVfRklS TVdBUkUoInJhZGVvbi9oYWluYW5fbWMuYmluIik7CiBNT0RVTEVfRklSTVdBUkUoInJhZGVvbi9o YWluYW5fcmxjLmJpbiIpOwogTU9EVUxFX0ZJUk1XQVJFKCJyYWRlb24vaGFpbmFuX3NtYy5iaW4i KTsKK01PRFVMRV9GSVJNV0FSRSgicmFkZW9uL2hhaW5hbl9rX3NtYy5iaW4iKTsKIAogc3RhdGlj IHUzMiBzaV9nZXRfY3VfYWN0aXZlX2JpdG1hcChzdHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldiwg dTMyIHNlLCB1MzIgc2gpOwogc3RhdGljIHZvaWQgc2lfcGNpZV9nZW4zX2VuYWJsZShzdHJ1Y3Qg cmFkZW9uX2RldmljZSAqcmRldik7CkBAIC0xNjUzLDEyICsxNjU4LDE2IEBAIHN0YXRpYyBpbnQg c2lfaW5pdF9taWNyb2NvZGUoc3RydWN0IHJhZGVvbl9kZXZpY2UgKnJkZXYpCiAJY2hhciBmd19u YW1lWzMwXTsKIAlpbnQgZXJyOwogCWludCBuZXdfZncgPSAwOworCWJvb2wgbmV3X3NtYyA9IGZh bHNlOwogCiAJRFJNX0RFQlVHKCJcbiIpOwogCiAJc3dpdGNoIChyZGV2LT5mYW1pbHkpIHsKIAlj YXNlIENISVBfVEFISVRJOgogCQljaGlwX25hbWUgPSAiVEFISVRJIjsKKwkJLyogWFhYOiBmaWd1 cmUgb3V0IHdoaWNoIFRhaGl0aXMgbmVlZCB0aGUgbmV3IHVjb2RlICovCisJCWlmICgwKQorCQkJ bmV3X3NtYyA9IHRydWU7CiAJCW5ld19jaGlwX25hbWUgPSAidGFoaXRpIjsKIAkJcGZwX3JlcV9z aXplID0gU0lfUEZQX1VDT0RFX1NJWkUgKiA0OwogCQltZV9yZXFfc2l6ZSA9IFNJX1BNNF9VQ09E RV9TSVpFICogNDsKQEAgLTE2NzAsNiArMTY3OSwxMyBAQCBzdGF0aWMgaW50IHNpX2luaXRfbWlj cm9jb2RlKHN0cnVjdCByYWRlb25fZGV2aWNlICpyZGV2KQogCQlicmVhazsKIAljYXNlIENISVBf UElUQ0FJUk46CiAJCWNoaXBfbmFtZSA9ICJQSVRDQUlSTiI7CisJCWlmICgocmRldi0+cGRldi0+ cmV2aXNpb24gPT0gMHg4MSkgfHwKKwkJICAgIChyZGV2LT5wZGV2LT5kZXZpY2UgPT0gMHg2ODEw KSB8fAorCQkgICAgKHJkZXYtPnBkZXYtPmRldmljZSA9PSAweDY4MTEpIHx8CisJCSAgICAocmRl di0+cGRldi0+ZGV2aWNlID09IDB4NjgxNikgfHwKKwkJICAgIChyZGV2LT5wZGV2LT5kZXZpY2Ug PT0gMHg2ODE3KSB8fAorCQkgICAgKHJkZXYtPnBkZXYtPmRldmljZSA9PSAweDY4MDYpKQorCQkJ bmV3X3NtYyA9IHRydWU7CiAJCW5ld19jaGlwX25hbWUgPSAicGl0Y2Fpcm4iOwogCQlwZnBfcmVx X3NpemUgPSBTSV9QRlBfVUNPREVfU0laRSAqIDQ7CiAJCW1lX3JlcV9zaXplID0gU0lfUE00X1VD T0RFX1NJWkUgKiA0OwpAQCAtMTY4MSw2ICsxNjk3LDE2IEBAIHN0YXRpYyBpbnQgc2lfaW5pdF9t aWNyb2NvZGUoc3RydWN0IHJhZGVvbl9kZXZpY2UgKnJkZXYpCiAJCWJyZWFrOwogCWNhc2UgQ0hJ UF9WRVJERToKIAkJY2hpcF9uYW1lID0gIlZFUkRFIjsKKwkJaWYgKChyZGV2LT5wZGV2LT5yZXZp c2lvbiA9PSAweDgxKSB8fAorCQkgICAgKHJkZXYtPnBkZXYtPnJldmlzaW9uID09IDB4ODMpIHx8 CisJCSAgICAocmRldi0+cGRldi0+cmV2aXNpb24gPT0gMHg4NykgfHwKKwkJICAgIChyZGV2LT5w ZGV2LT5kZXZpY2UgPT0gMHg2ODIwKSB8fAorCQkgICAgKHJkZXYtPnBkZXYtPmRldmljZSA9PSAw eDY4MjEpIHx8CisJCSAgICAocmRldi0+cGRldi0+ZGV2aWNlID09IDB4NjgyMikgfHwKKwkJICAg IChyZGV2LT5wZGV2LT5kZXZpY2UgPT0gMHg2ODIzKSB8fAorCQkgICAgKHJkZXYtPnBkZXYtPmRl dmljZSA9PSAweDY4MkEpIHx8CisJCSAgICAocmRldi0+cGRldi0+ZGV2aWNlID09IDB4NjgyQikp CisJCQluZXdfc21jID0gdHJ1ZTsKIAkJbmV3X2NoaXBfbmFtZSA9ICJ2ZXJkZSI7CiAJCXBmcF9y ZXFfc2l6ZSA9IFNJX1BGUF9VQ09ERV9TSVpFICogNDsKIAkJbWVfcmVxX3NpemUgPSBTSV9QTTRf VUNPREVfU0laRSAqIDQ7CkBAIC0xNjkyLDYgKzE3MTgsMTMgQEAgc3RhdGljIGludCBzaV9pbml0 X21pY3JvY29kZShzdHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldikKIAkJYnJlYWs7CiAJY2FzZSBD SElQX09MQU5EOgogCQljaGlwX25hbWUgPSAiT0xBTkQiOworCQlpZiAoKHJkZXYtPnBkZXYtPnJl dmlzaW9uID09IDB4QzcpIHx8CisJCSAgICAocmRldi0+cGRldi0+cmV2aXNpb24gPT0gMHg4MCkg fHwKKwkJICAgIChyZGV2LT5wZGV2LT5yZXZpc2lvbiA9PSAweDgxKSB8fAorCQkgICAgKHJkZXYt PnBkZXYtPnJldmlzaW9uID09IDB4ODMpIHx8CisJCSAgICAocmRldi0+cGRldi0+ZGV2aWNlID09 IDB4NjYwNCkgfHwKKwkJICAgIChyZGV2LT5wZGV2LT5kZXZpY2UgPT0gMHg2NjA1KSkKKwkJCW5l d19zbWMgPSB0cnVlOwogCQluZXdfY2hpcF9uYW1lID0gIm9sYW5kIjsKIAkJcGZwX3JlcV9zaXpl ID0gU0lfUEZQX1VDT0RFX1NJWkUgKiA0OwogCQltZV9yZXFfc2l6ZSA9IFNJX1BNNF9VQ09ERV9T SVpFICogNDsKQEAgLTE3MDIsNiArMTczNSwxMyBAQCBzdGF0aWMgaW50IHNpX2luaXRfbWljcm9j b2RlKHN0cnVjdCByYWRlb25fZGV2aWNlICpyZGV2KQogCQlicmVhazsKIAljYXNlIENISVBfSEFJ TkFOOgogCQljaGlwX25hbWUgPSAiSEFJTkFOIjsKKwkJaWYgKChyZGV2LT5wZGV2LT5yZXZpc2lv biA9PSAweDgxKSB8fAorCQkgICAgKHJkZXYtPnBkZXYtPnJldmlzaW9uID09IDB4ODMpIHx8CisJ CSAgICAocmRldi0+cGRldi0+cmV2aXNpb24gPT0gMHhDMykgfHwKKwkJICAgIChyZGV2LT5wZGV2 LT5kZXZpY2UgPT0gMHg2NjY0KSB8fAorCQkgICAgKHJkZXYtPnBkZXYtPmRldmljZSA9PSAweDY2 NjUpIHx8CisJCSAgICAocmRldi0+cGRldi0+ZGV2aWNlID09IDB4NjY2NykpCisJCQluZXdfc21j ID0gdHJ1ZTsKIAkJbmV3X2NoaXBfbmFtZSA9ICJoYWluYW4iOwogCQlwZnBfcmVxX3NpemUgPSBT SV9QRlBfVUNPREVfU0laRSAqIDQ7CiAJCW1lX3JlcV9zaXplID0gU0lfUE00X1VDT0RFX1NJWkUg KiA0OwpAQCAtMTg0Nyw3ICsxODg3LDEwIEBAIHN0YXRpYyBpbnQgc2lfaW5pdF9taWNyb2NvZGUo c3RydWN0IHJhZGVvbl9kZXZpY2UgKnJkZXYpCiAJCX0KIAl9CiAKLQlzbnByaW50Zihmd19uYW1l LCBzaXplb2YoZndfbmFtZSksICJyYWRlb24vJXNfc21jLmJpbiIsIG5ld19jaGlwX25hbWUpOwor CWlmIChuZXdfc21jKQorCQlzbnByaW50Zihmd19uYW1lLCBzaXplb2YoZndfbmFtZSksICJyYWRl b24vJXNfa19zbWMuYmluIiwgbmV3X2NoaXBfbmFtZSk7CisJZWxzZQorCQlzbnByaW50Zihmd19u YW1lLCBzaXplb2YoZndfbmFtZSksICJyYWRlb24vJXNfc21jLmJpbiIsIG5ld19jaGlwX25hbWUp OwogCWVyciA9IHJlcXVlc3RfZmlybXdhcmUoJnJkZXYtPnNtY19mdywgZndfbmFtZSwgcmRldi0+ ZGV2KTsKIAlpZiAoZXJyKSB7CiAJCXNucHJpbnRmKGZ3X25hbWUsIHNpemVvZihmd19uYW1lKSwg InJhZGVvbi8lc19zbWMuYmluIiwgY2hpcF9uYW1lKTsKLS0gCjIuNS41CgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0 CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3Rv cC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK