From: Evan Quan Subject: [PATCH 7/9] drm/amdgpu: check PSP support before adding the ip block Date: Wed, 2 Jan 2019 17:21:39 +0800 Message-ID: <20190102092141.2196-8-evan.quan@amd.com> References: <20190102092141.2196-1-evan.quan@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190102092141.2196-1-evan.quan-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: alexander.deucher-5C7GfCeVMHo@public.gmane.org, feifei.xu-5C7GfCeVMHo@public.gmane.org, ray.huang-5C7GfCeVMHo@public.gmane.org, Evan Quan , hawking.zhang-5C7GfCeVMHo@public.gmane.org U28gdGhhdCB3ZSBkbyBub3QgbmVlZCB0byBjaGVjayB0aGlzIGluIGV2ZXJ5IGludGVybmFsIGZ1 bmN0aW9uLgoKQ2hhbmdlLUlkOiBJNWYyNjY1Y2Y2MGE1N2I2YWU4ZDA0YTY0NWY2MzNkYWYzNzdh ZTI4YwpTaWduZWQtb2ZmLWJ5OiBFdmFuIFF1YW4gPGV2YW4ucXVhbkBhbWQuY29tPgotLS0KIGRy aXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9wc3AuYyB8IDI0IC0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvc29jMTUuYyAgICAgIHwgMTMg KysrKysrKystLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCA4IGluc2VydGlvbnMoKyksIDI5IGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9w c3AuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9wc3AuYwppbmRleCBmMWZm ZTA0YjhjMGYuLmJmNTE2ODZiZGQwZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9h bWRncHUvYW1kZ3B1X3BzcC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdw dV9wc3AuYwpAQCAtODYsOSArODYsNiBAQCBzdGF0aWMgaW50IHBzcF9zd19pbml0KHZvaWQgKmhh bmRsZSkKIAogCXBzcC0+YWRldiA9IGFkZXY7CiAKLQlpZiAoYWRldi0+ZmlybXdhcmUubG9hZF90 eXBlICE9IEFNREdQVV9GV19MT0FEX1BTUCkKLQkJcmV0dXJuIDA7Ci0KIAlyZXQgPSBwc3BfaW5p dF9taWNyb2NvZGUocHNwKTsKIAlpZiAocmV0KSB7CiAJCURSTV9FUlJPUigiRmFpbGVkIHRvIGxv YWQgcHNwIGZpcm13YXJlIVxuIik7CkBAIC0xMDIsOSArOTksNiBAQCBzdGF0aWMgaW50IHBzcF9z d19maW5pKHZvaWQgKmhhbmRsZSkKIHsKIAlzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiA9IChz dHJ1Y3QgYW1kZ3B1X2RldmljZSAqKWhhbmRsZTsKIAotCWlmIChhZGV2LT5maXJtd2FyZS5sb2Fk X3R5cGUgIT0gQU1ER1BVX0ZXX0xPQURfUFNQKQotCQlyZXR1cm4gMDsKLQogCXJlbGVhc2VfZmly bXdhcmUoYWRldi0+cHNwLnNvc19mdyk7CiAJYWRldi0+cHNwLnNvc19mdyA9IE5VTEw7CiAJcmVs ZWFzZV9maXJtd2FyZShhZGV2LT5wc3AuYXNkX2Z3KTsKQEAgLTE1OCwxMSArMTUyLDYgQEAgc3Rh dGljIGJvb2wgcHNwX2NoZWNrX2Z3X2xvYWRpbmdfc3RhdHVzKHN0cnVjdCBhbWRncHVfZGV2aWNl ICphZGV2LAogewogCXN0cnVjdCBhbWRncHVfZmlybXdhcmVfaW5mbyAqdWNvZGUgPSBOVUxMOwog Ci0JaWYgKGFkZXYtPmZpcm13YXJlLmxvYWRfdHlwZSAhPSBBTURHUFVfRldfTE9BRF9QU1ApIHsK LQkJRFJNX0lORk8oImZpcm13YXJlIGlzIG5vdCBsb2FkZWQgYnkgUFNQXG4iKTsKLQkJcmV0dXJu IHRydWU7Ci0JfQotCiAJaWYgKCFhZGV2LT5maXJtd2FyZS5md19zaXplKQogCQlyZXR1cm4gZmFs c2U7CiAKQEAgLTI5NiwxMCArMjg1LDYgQEAgc3RhdGljIGludCBwc3BfaHdfaW5pdCh2b2lkICpo YW5kbGUpCiAJaW50IHJldDsKIAlzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiA9IChzdHJ1Y3Qg YW1kZ3B1X2RldmljZSAqKWhhbmRsZTsKIAotCi0JaWYgKGFkZXYtPmZpcm13YXJlLmxvYWRfdHlw ZSAhPSBBTURHUFVfRldfTE9BRF9QU1ApCi0JCXJldHVybiAwOwotCiAJbXV0ZXhfbG9jaygmYWRl di0+ZmlybXdhcmUubXV0ZXgpOwogCS8qCiAJICogVGhpcyBzZXF1ZW5jZSBpcyBqdXN0IHVzZWQg b24gaHdfaW5pdCBvbmx5IG9uY2UsIG5vIG5lZWQgb24KQEAgLTMyOSw5ICszMTQsNiBAQCBzdGF0 aWMgaW50IHBzcF9od19maW5pKHZvaWQgKmhhbmRsZSkKIAlzdHJ1Y3QgYW1kZ3B1X2RldmljZSAq YWRldiA9IChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqKWhhbmRsZTsKIAlzdHJ1Y3QgcHNwX2NvbnRl eHQgKnBzcCA9ICZhZGV2LT5wc3A7CiAKLQlpZiAoYWRldi0+ZmlybXdhcmUubG9hZF90eXBlICE9 IEFNREdQVV9GV19MT0FEX1BTUCkKLQkJcmV0dXJuIDA7Ci0KIAlpZiAoYWRldi0+Z21jLnhnbWku bnVtX3BoeXNpY2FsX25vZGVzID4gMSAmJgogCSAgICBwc3AtPnhnbWlfY29udGV4dC5pbml0aWFs aXplZCA9PSAxKQogICAgICAgICAgICAgICAgIHBzcF94Z21pX3Rlcm1pbmF0ZShwc3ApOwpAQCAt MzYwLDkgKzM0Miw2IEBAIHN0YXRpYyBpbnQgcHNwX3N1c3BlbmQodm9pZCAqaGFuZGxlKQogCXN0 cnVjdCBhbWRncHVfZGV2aWNlICphZGV2ID0gKHN0cnVjdCBhbWRncHVfZGV2aWNlICopaGFuZGxl OwogCXN0cnVjdCBwc3BfY29udGV4dCAqcHNwID0gJmFkZXYtPnBzcDsKIAotCWlmIChhZGV2LT5m aXJtd2FyZS5sb2FkX3R5cGUgIT0gQU1ER1BVX0ZXX0xPQURfUFNQKQotCQlyZXR1cm4gMDsKLQog CWlmIChhZGV2LT5nbWMueGdtaS5udW1fcGh5c2ljYWxfbm9kZXMgPiAxICYmCiAJICAgIHBzcC0+ eGdtaV9jb250ZXh0LmluaXRpYWxpemVkID09IDEpIHsKIAkJcmV0ID0gcHNwX3hnbWlfdGVybWlu YXRlKHBzcCk7CkBAIC0zODcsOSArMzY2LDYgQEAgc3RhdGljIGludCBwc3BfcmVzdW1lKHZvaWQg KmhhbmRsZSkKIAlzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiA9IChzdHJ1Y3QgYW1kZ3B1X2Rl dmljZSAqKWhhbmRsZTsKIAlzdHJ1Y3QgcHNwX2NvbnRleHQgKnBzcCA9ICZhZGV2LT5wc3A7CiAK LQlpZiAoYWRldi0+ZmlybXdhcmUubG9hZF90eXBlICE9IEFNREdQVV9GV19MT0FEX1BTUCkKLQkJ cmV0dXJuIDA7Ci0KIAlEUk1fSU5GTygiUFNQIGlzIHJlc3VtaW5nLi4uXG4iKTsKIAogCW11dGV4 X2xvY2soJmFkZXYtPmZpcm13YXJlLm11dGV4KTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9hbWQvYW1kZ3B1L3NvYzE1LmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9zb2MxNS5j CmluZGV4IGQ1YjNmODIxYjhmMC4uOWYxNjJhOGE3ZDliIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vYW1kL2FtZGdwdS9zb2MxNS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1 L3NvYzE1LmMKQEAgLTUzNSwxMCArNTM1LDEyIEBAIGludCBzb2MxNV9zZXRfaXBfYmxvY2tzKHN0 cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCQlhbWRncHVfZGV2aWNlX2lwX2Jsb2NrX2FkZChh ZGV2LCAmdmVnYTEwX2NvbW1vbl9pcF9ibG9jayk7CiAJCWFtZGdwdV9kZXZpY2VfaXBfYmxvY2tf YWRkKGFkZXYsICZnbWNfdjlfMF9pcF9ibG9jayk7CiAJCWFtZGdwdV9kZXZpY2VfaXBfYmxvY2tf YWRkKGFkZXYsICZ2ZWdhMTBfaWhfaXBfYmxvY2spOwotCQlpZiAoYWRldi0+YXNpY190eXBlID09 IENISVBfVkVHQTIwKQotCQkJYW1kZ3B1X2RldmljZV9pcF9ibG9ja19hZGQoYWRldiwgJnBzcF92 MTFfMF9pcF9ibG9jayk7Ci0JCWVsc2UKLQkJCWFtZGdwdV9kZXZpY2VfaXBfYmxvY2tfYWRkKGFk ZXYsICZwc3BfdjNfMV9pcF9ibG9jayk7CisJCWlmIChsaWtlbHkoYWRldi0+ZmlybXdhcmUubG9h ZF90eXBlID09IEFNREdQVV9GV19MT0FEX1BTUCkpIHsKKwkJCWlmIChhZGV2LT5hc2ljX3R5cGUg PT0gQ0hJUF9WRUdBMjApCisJCQkJYW1kZ3B1X2RldmljZV9pcF9ibG9ja19hZGQoYWRldiwgJnBz cF92MTFfMF9pcF9ibG9jayk7CisJCQllbHNlCisJCQkJYW1kZ3B1X2RldmljZV9pcF9ibG9ja19h ZGQoYWRldiwgJnBzcF92M18xX2lwX2Jsb2NrKTsKKwkJfQogCQlhbWRncHVfZGV2aWNlX2lwX2Js b2NrX2FkZChhZGV2LCAmZ2Z4X3Y5XzBfaXBfYmxvY2spOwogCQlhbWRncHVfZGV2aWNlX2lwX2Js b2NrX2FkZChhZGV2LCAmc2RtYV92NF8wX2lwX2Jsb2NrKTsKIAkJaWYgKCFhbWRncHVfc3Jpb3Zf dmYoYWRldikpCkBAIC01NjAsNyArNTYyLDggQEAgaW50IHNvYzE1X3NldF9pcF9ibG9ja3Moc3Ry dWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAJCWFtZGdwdV9kZXZpY2VfaXBfYmxvY2tfYWRkKGFk ZXYsICZ2ZWdhMTBfY29tbW9uX2lwX2Jsb2NrKTsKIAkJYW1kZ3B1X2RldmljZV9pcF9ibG9ja19h ZGQoYWRldiwgJmdtY192OV8wX2lwX2Jsb2NrKTsKIAkJYW1kZ3B1X2RldmljZV9pcF9ibG9ja19h ZGQoYWRldiwgJnZlZ2ExMF9paF9pcF9ibG9jayk7Ci0JCWFtZGdwdV9kZXZpY2VfaXBfYmxvY2tf YWRkKGFkZXYsICZwc3BfdjEwXzBfaXBfYmxvY2spOworCQlpZiAobGlrZWx5KGFkZXYtPmZpcm13 YXJlLmxvYWRfdHlwZSA9PSBBTURHUFVfRldfTE9BRF9QU1ApKQorCQkJYW1kZ3B1X2RldmljZV9p cF9ibG9ja19hZGQoYWRldiwgJnBzcF92MTBfMF9pcF9ibG9jayk7CiAJCWFtZGdwdV9kZXZpY2Vf aXBfYmxvY2tfYWRkKGFkZXYsICZnZnhfdjlfMF9pcF9ibG9jayk7CiAJCWFtZGdwdV9kZXZpY2Vf aXBfYmxvY2tfYWRkKGFkZXYsICZzZG1hX3Y0XzBfaXBfYmxvY2spOwogCQlhbWRncHVfZGV2aWNl X2lwX2Jsb2NrX2FkZChhZGV2LCAmcHBfc211X2lwX2Jsb2NrKTsKLS0gCjIuMjAuMQoKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KYW1kLWdmeCBtYWlsaW5n IGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVz a3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4Cg==