From: Huang Rui Subject: [PATCH] drm/amdgpu: fix missed gpu info firmware when cache firmware during S3 Date: Tue, 6 Jun 2017 14:24:29 +0800 Message-ID: <1496730269-27140-1-git-send-email-ray.huang@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, Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= Cc: Ken Wang , Huang Rui , Alvin Huan Z3B1X2luZm8gZmlybXdhcmUgaXMgcmVsZWFzZWQgYWZ0ZXIgZGF0YSBpcyB1c2VkLiBCdXQgd2hl biBzeXN0ZW0gZW50ZXJzIGludG8Kc3VzcGVuZCwgdXBwZXIgY2xhc3MgZHJpdmVyIHdpbGwgY2Fj aGUgYWxsIGZpcm13YXJlIG5hbWVzLiBBdCB0aGF0IHRpbWUsCmdwdV9pbmZvIHdpbGwgYmUgZmFp bGluZyB0byBsb2FkLiBJdCBzZWVtcyBhbiB1cHBlciBjbGFzcyBpc3N1ZSwgdGhhdCB3ZSBzaG91 bGQKbm90IHJlbGVhc2UgZ3B1X2luZm8gZmlybXdhcmUgdW50aWwgZGV2aWNlIGZpbmlzaGVkLgoK WyAgOTAzLjIzNjU4OV0gY2FjaGVfZmlybXdhcmU6IGFtZGdwdS92ZWdhMTBfc2RtYTEuYmluClsg IDkwMy4yMzY1OTBdIGZ3X3NldF9wYWdlX2RhdGE6IGZ3LWFtZGdwdS92ZWdhMTBfc2RtYTEuYmlu IGJ1Zj1mZmZmODgwNDFlZWUxMGMwIGRhdGE9ZmZmZmM5MDAwMjU2MTAwMCBzaXplPTE3NDA4Clsg IDkwMy4yMzY1OTFdIGNhY2hlX2Zpcm13YXJlOiBhbWRncHUvdmVnYTEwX3NkbWExLmJpbiByZXQ9 MApbICA5MDMuNDY0MTYwXSBfX2FsbG9jYXRlX2Z3X2J1ZjogZnctYW1kZ3B1L3ZlZ2ExMF9ncHVf aW5mby5iaW4gYnVmPWZmZmY4ODA0MWVlZTJjMDAKWyAgOTAzLjQ3MTgxNV0gKE5VTEwgZGV2aWNl ICopOiBsb2FkaW5nIC9saWIvZmlybXdhcmUvdXBkYXRlcy80LjExLjAtY3VzdG9tL2FtZGdwdS92 ZWdhMTBfZ3B1X2luZm8uYmluIGZhaWxlZCB3aXRoIGVycm9yIC0yClsgIDkwMy40ODI4NzBdIChO VUxMIGRldmljZSAqKTogbG9hZGluZyAvbGliL2Zpcm13YXJlL3VwZGF0ZXMvYW1kZ3B1L3ZlZ2Ex MF9ncHVfaW5mby5iaW4gZmFpbGVkIHdpdGggZXJyb3IgLTIKWyAgOTAzLjQ5MjcxNl0gKE5VTEwg ZGV2aWNlICopOiBsb2FkaW5nIC9saWIvZmlybXdhcmUvNC4xMS4wLWN1c3RvbS9hbWRncHUvdmVn YTEwX2dwdV9pbmZvLmJpbiBmYWlsZWQgd2l0aCBlcnJvciAtMgpbICA5MDMuNTAzMTU2XSAoTlVM TCBkZXZpY2UgKik6IGRpcmVjdC1sb2FkaW5nIGFtZGdwdS92ZWdhMTBfZ3B1X2luZm8uYmluCgpT aWduZWQtb2ZmLWJ5OiBIdWFuZyBSdWkgPHJheS5odWFuZ0BhbWQuY29tPgotLS0KIGRyaXZlcnMv Z3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdS5oICAgICAgICB8ICAzICsrKwogZHJpdmVycy9ncHUv ZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2RldmljZS5jIHwgMTggKysrKysrKysrKy0tLS0tLS0tCiAy IGZpbGVzIGNoYW5nZWQsIDEzIGluc2VydGlvbnMoKyksIDggZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1LmggYi9kcml2ZXJzL2dwdS9k cm0vYW1kL2FtZGdwdS9hbWRncHUuaAppbmRleCA4NjU4NjQzLi41NGVlMDUwIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHUuaAorKysgYi9kcml2ZXJzL2dwdS9k cm0vYW1kL2FtZGdwdS9hbWRncHUuaApAQCAtMTI3Miw2ICsxMjcyLDkgQEAgc3RydWN0IGFtZGdw dV9maXJtd2FyZSB7CiAJY29uc3Qgc3RydWN0IGFtZGdwdV9wc3BfZnVuY3MgKmZ1bmNzOwogCXN0 cnVjdCBhbWRncHVfYm8gKnJidWY7CiAJc3RydWN0IG11dGV4IG11dGV4OworCisJLyogZ3B1IGlu Zm8gZmlybXdhcmUgZGF0YSBwb2ludGVyICovCisJY29uc3Qgc3RydWN0IGZpcm13YXJlICpmdzsK IH07CiAKIC8qCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVf ZGV2aWNlLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZGV2aWNlLmMKaW5k ZXggNjg4M2ZlMS4uYWY4ZjhiMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRn cHUvYW1kZ3B1X2RldmljZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdw dV9kZXZpY2UuYwpAQCAtMTQyNiwxMiArMTQyNiwxMyBAQCBzdGF0aWMgdm9pZCBhbWRncHVfZGV2 aWNlX2VuYWJsZV92aXJ0dWFsX2Rpc3BsYXkoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAK IHN0YXRpYyBpbnQgYW1kZ3B1X2RldmljZV9wYXJzZV9ncHVfaW5mb19mdyhzdHJ1Y3QgYW1kZ3B1 X2RldmljZSAqYWRldikKIHsKLQljb25zdCBzdHJ1Y3QgZmlybXdhcmUgKmZ3OwogCWNvbnN0IGNo YXIgKmNoaXBfbmFtZTsKIAljaGFyIGZ3X25hbWVbMzBdOwogCWludCBlcnI7CiAJY29uc3Qgc3Ry dWN0IGdwdV9pbmZvX2Zpcm13YXJlX2hlYWRlcl92MV8wICpoZHI7CiAKKwlhZGV2LT5maXJtd2Fy ZS5mdyA9IE5VTEw7CisKIAlzd2l0Y2ggKGFkZXYtPmFzaWNfdHlwZSkgewogCWNhc2UgQ0hJUF9U T1BBWjoKIAljYXNlIENISVBfVE9OR0E6CkBAIC0xNDY2LDE0ICsxNDY3LDE0IEBAIHN0YXRpYyBp bnQgYW1kZ3B1X2RldmljZV9wYXJzZV9ncHVfaW5mb19mdyhzdHJ1Y3QgYW1kZ3B1X2RldmljZSAq YWRldikKIAl9CiAKIAlzbnByaW50Zihmd19uYW1lLCBzaXplb2YoZndfbmFtZSksICJhbWRncHUv JXNfZ3B1X2luZm8uYmluIiwgY2hpcF9uYW1lKTsKLQllcnIgPSByZXF1ZXN0X2Zpcm13YXJlKCZm dywgZndfbmFtZSwgYWRldi0+ZGV2KTsKKwllcnIgPSByZXF1ZXN0X2Zpcm13YXJlKCZhZGV2LT5m aXJtd2FyZS5mdywgZndfbmFtZSwgYWRldi0+ZGV2KTsKIAlpZiAoZXJyKSB7CiAJCWRldl9lcnIo YWRldi0+ZGV2LAogCQkJIkZhaWxlZCB0byBsb2FkIGdwdV9pbmZvIGZpcm13YXJlIFwiJXNcIlxu IiwKIAkJCWZ3X25hbWUpOwogCQlnb3RvIG91dDsKIAl9Ci0JZXJyID0gYW1kZ3B1X3Vjb2RlX3Zh bGlkYXRlKGZ3KTsKKwllcnIgPSBhbWRncHVfdWNvZGVfdmFsaWRhdGUoYWRldi0+ZmlybXdhcmUu ZncpOwogCWlmIChlcnIpIHsKIAkJZGV2X2VycihhZGV2LT5kZXYsCiAJCQkiRmFpbGVkIHRvIHZh bGlkYXRlIGdwdV9pbmZvIGZpcm13YXJlIFwiJXNcIlxuIiwKQEAgLTE0ODEsMTQgKzE0ODIsMTQg QEAgc3RhdGljIGludCBhbWRncHVfZGV2aWNlX3BhcnNlX2dwdV9pbmZvX2Z3KHN0cnVjdCBhbWRn cHVfZGV2aWNlICphZGV2KQogCQlnb3RvIG91dDsKIAl9CiAKLQloZHIgPSAoY29uc3Qgc3RydWN0 IGdwdV9pbmZvX2Zpcm13YXJlX2hlYWRlcl92MV8wICopZnctPmRhdGE7CisJaGRyID0gKGNvbnN0 IHN0cnVjdCBncHVfaW5mb19maXJtd2FyZV9oZWFkZXJfdjFfMCAqKWFkZXYtPmZpcm13YXJlLmZ3 LT5kYXRhOwogCWFtZGdwdV91Y29kZV9wcmludF9ncHVfaW5mb19oZHIoJmhkci0+aGVhZGVyKTsK IAogCXN3aXRjaCAoaGRyLT52ZXJzaW9uX21ham9yKSB7CiAJY2FzZSAxOgogCXsKIAkJY29uc3Qg c3RydWN0IGdwdV9pbmZvX2Zpcm13YXJlX3YxXzAgKmdwdV9pbmZvX2Z3ID0KLQkJCShjb25zdCBz dHJ1Y3QgZ3B1X2luZm9fZmlybXdhcmVfdjFfMCAqKShmdy0+ZGF0YSArCisJCQkoY29uc3Qgc3Ry dWN0IGdwdV9pbmZvX2Zpcm13YXJlX3YxXzAgKikoYWRldi0+ZmlybXdhcmUuZnctPmRhdGEgKwog CQkJCQkJCQlsZTMyX3RvX2NwdShoZHItPmhlYWRlci51Y29kZV9hcnJheV9vZmZzZXRfYnl0ZXMp KTsKIAogCQlhZGV2LT5nZnguY29uZmlnLm1heF9zaGFkZXJfZW5naW5lcyA9IGdwdV9pbmZvX2Z3 LT5nY19udW1fc2U7CkBAIC0xNTEzLDkgKzE1MTQsNiBAQCBzdGF0aWMgaW50IGFtZGdwdV9kZXZp Y2VfcGFyc2VfZ3B1X2luZm9fZncoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAJCWdvdG8g b3V0OwogCX0KIG91dDoKLQlyZWxlYXNlX2Zpcm13YXJlKGZ3KTsKLQlmdyA9IE5VTEw7Ci0KIAly ZXR1cm4gZXJyOwogfQogCkBAIC0yMzEzLDYgKzIzMTEsMTAgQEAgdm9pZCBhbWRncHVfZGV2aWNl X2Zpbmkoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAJYW1kZ3B1X2ZlbmNlX2RyaXZlcl9m aW5pKGFkZXYpOwogCWFtZGdwdV9mYmRldl9maW5pKGFkZXYpOwogCXIgPSBhbWRncHVfZmluaShh ZGV2KTsKKwlpZiAoYWRldi0+ZmlybXdhcmUuZncpIHsKKwkJcmVsZWFzZV9maXJtd2FyZShhZGV2 LT5maXJtd2FyZS5mdyk7CisJCWFkZXYtPmZpcm13YXJlLmZ3ID0gTlVMTDsKKwl9CiAJYWRldi0+ YWNjZWxfd29ya2luZyA9IGZhbHNlOwogCS8qIGZyZWUgaTJjIGJ1c2VzICovCiAJaWYgKCFhbWRn cHVfZGV2aWNlX2hhc19kY19zdXBwb3J0KGFkZXYpKQotLSAKMi43LjQKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmFtZC1nZnggbWFpbGluZyBsaXN0CmFt ZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3Jn L21haWxtYW4vbGlzdGluZm8vYW1kLWdmeAo=