From: Huang Rui Subject: [PATCH 5/6] drm/amdgpu: move psp macro into amdgpu_ucode into amdgpu_psp header Date: Thu, 2 Aug 2018 19:08:14 +0800 Message-ID: <1533208095-15055-5-git-send-email-ray.huang@amd.com> References: <1533208095-15055-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: In-Reply-To: <1533208095-15055-1-git-send-email-ray.huang-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: Huang Rui RGVtYW5nbGUgYW1kZ3B1LmguCgpTaWduZWQtb2ZmLWJ5OiBIdWFuZyBSdWkgPHJheS5odWFuZ0Bh bWQuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdS5oICAgICB8ICAx IC0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9wc3AuaCB8IDI5ICsrKysrKysr KysrKysrKysrLS0tLS0tLS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDE3IGluc2VydGlvbnMoKyks IDEzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1 L2FtZGdwdS5oIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1LmgKaW5kZXggYWZi Nzc2MS4uYmY3NjMzYSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1k Z3B1LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1LmgKQEAgLTEzNTYs NyArMTM1Niw2IEBAIGludCBlbXVfc29jX2FzaWNfaW5pdChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAq YWRldik7CiAjZGVmaW5lIGFtZGdwdV9kaXNwbGF5X2FkZF9lbmNvZGVyKGFkZXYsIGUsIHMsIGMp IChhZGV2KS0+bW9kZV9pbmZvLmZ1bmNzLT5hZGRfZW5jb2RlcigoYWRldiksIChlKSwgKHMpLCAo YykpCiAjZGVmaW5lIGFtZGdwdV9kaXNwbGF5X2FkZF9jb25uZWN0b3IoYWRldiwgY2ksIHNkLCBj dCwgaWIsIGNvaSwgaCwgcikgKGFkZXYpLT5tb2RlX2luZm8uZnVuY3MtPmFkZF9jb25uZWN0b3Io KGFkZXYpLCAoY2kpLCAoc2QpLCAoY3QpLCAoaWIpLCAoY29pKSwgKGgpLCAocikpCiAjZGVmaW5l IGFtZGdwdV9nZHNfc3dpdGNoKGFkZXYsIHIsIHYsIGQsIHcsIGEpIChhZGV2KS0+Z2RzLmZ1bmNz LT5wYXRjaF9nZHNfc3dpdGNoKChyKSwgKHYpLCAoZCksICh3KSwgKGEpKQotI2RlZmluZSBhbWRn cHVfcHNwX2NoZWNrX2Z3X2xvYWRpbmdfc3RhdHVzKGFkZXYsIGkpIChhZGV2KS0+ZmlybXdhcmUu ZnVuY3MtPmNoZWNrX2Z3X2xvYWRpbmdfc3RhdHVzKChhZGV2KSwgKGkpKQogCiAvKiBDb21tb24g ZnVuY3Rpb25zICovCiBpbnQgYW1kZ3B1X2RldmljZV9ncHVfcmVjb3ZlcihzdHJ1Y3QgYW1kZ3B1 X2RldmljZSAqYWRldiwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2Ft ZGdwdV9wc3AuaCBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9wc3AuaAppbmRl eCAxMjkyMDk2Li45Njc3MTJmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdw dS9hbWRncHVfcHNwLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3Bz cC5oCkBAIC02MywxMyArNjMsMTYgQEAgc3RydWN0IHBzcF9mdW5jcwogCWludCAoKnByZXBfY21k X2J1Zikoc3RydWN0IGFtZGdwdV9maXJtd2FyZV9pbmZvICp1Y29kZSwKIAkJCSAgICBzdHJ1Y3Qg cHNwX2dmeF9jbWRfcmVzcCAqY21kKTsKIAlpbnQgKCpyaW5nX2luaXQpKHN0cnVjdCBwc3BfY29u dGV4dCAqcHNwLCBlbnVtIHBzcF9yaW5nX3R5cGUgcmluZ190eXBlKTsKLQlpbnQgKCpyaW5nX2Ny ZWF0ZSkoc3RydWN0IHBzcF9jb250ZXh0ICpwc3AsIGVudW0gcHNwX3JpbmdfdHlwZSByaW5nX3R5 cGUpOworCWludCAoKnJpbmdfY3JlYXRlKShzdHJ1Y3QgcHNwX2NvbnRleHQgKnBzcCwKKwkJCSAg IGVudW0gcHNwX3JpbmdfdHlwZSByaW5nX3R5cGUpOwogCWludCAoKnJpbmdfc3RvcCkoc3RydWN0 IHBzcF9jb250ZXh0ICpwc3AsCiAJCQkgICAgZW51bSBwc3BfcmluZ190eXBlIHJpbmdfdHlwZSk7 CiAJaW50ICgqcmluZ19kZXN0cm95KShzdHJ1Y3QgcHNwX2NvbnRleHQgKnBzcCwKIAkJCSAgICBl bnVtIHBzcF9yaW5nX3R5cGUgcmluZ190eXBlKTsKLQlpbnQgKCpjbWRfc3VibWl0KShzdHJ1Y3Qg cHNwX2NvbnRleHQgKnBzcCwgc3RydWN0IGFtZGdwdV9maXJtd2FyZV9pbmZvICp1Y29kZSwKLQkJ CSAgdWludDY0X3QgY21kX2J1Zl9tY19hZGRyLCB1aW50NjRfdCBmZW5jZV9tY19hZGRyLCBpbnQg aW5kZXgpOworCWludCAoKmNtZF9zdWJtaXQpKHN0cnVjdCBwc3BfY29udGV4dCAqcHNwLAorCQkJ ICBzdHJ1Y3QgYW1kZ3B1X2Zpcm13YXJlX2luZm8gKnVjb2RlLAorCQkJICB1aW50NjRfdCBjbWRf YnVmX21jX2FkZHIsIHVpbnQ2NF90IGZlbmNlX21jX2FkZHIsCisJCQkgIGludCBpbmRleCk7CiAJ Ym9vbCAoKmNvbXBhcmVfc3JhbV9kYXRhKShzdHJ1Y3QgcHNwX2NvbnRleHQgKnBzcCwKIAkJCQkg IHN0cnVjdCBhbWRncHVfZmlybXdhcmVfaW5mbyAqdWNvZGUsCiAJCQkJICBlbnVtIEFNREdQVV9V Q09ERV9JRCB1Y29kZV90eXBlKTsKQEAgLTgzLDExICs4NiwxMSBAQCBzdHJ1Y3QgcHNwX2NvbnRl eHQKIAlzdHJ1Y3QgcHNwX3JpbmcgICAgICAgICAgICAgICAgIGttX3Jpbmc7CiAJc3RydWN0IHBz cF9nZnhfY21kX3Jlc3AJCSpjbWQ7CiAKLQljb25zdCBzdHJ1Y3QgcHNwX2Z1bmNzIAkJKmZ1bmNz OworCWNvbnN0IHN0cnVjdCBwc3BfZnVuY3MJCSpmdW5jczsKIAogCS8qIGZlbmNlIGJ1ZmZlciAq LwotCXN0cnVjdCBhbWRncHVfYm8gCQkqZndfcHJpX2JvOwotCXVpbnQ2NF90IAkJCWZ3X3ByaV9t Y19hZGRyOworCXN0cnVjdCBhbWRncHVfYm8JCSpmd19wcmlfYm87CisJdWludDY0X3QJCQlmd19w cmlfbWNfYWRkcjsKIAl2b2lkCQkJCSpmd19wcmlfYnVmOwogCiAJLyogc29zIGZpcm13YXJlICov CkBAIC0xMDAsOCArMTAzLDggQEAgc3RydWN0IHBzcF9jb250ZXh0CiAJdWludDhfdAkJCQkqc29z X3N0YXJ0X2FkZHI7CiAKIAkvKiB0bXIgYnVmZmVyICovCi0Jc3RydWN0IGFtZGdwdV9ibyAJCSp0 bXJfYm87Ci0JdWludDY0X3QgCQkJdG1yX21jX2FkZHI7CisJc3RydWN0IGFtZGdwdV9ibwkJKnRt cl9ibzsKKwl1aW50NjRfdAkJCXRtcl9tY19hZGRyOwogCXZvaWQJCQkJKnRtcl9idWY7CiAKIAkv KiBhc2QgZmlybXdhcmUgYW5kIGJ1ZmZlciAqLwpAQCAtMTEwLDEzICsxMTMsMTMgQEAgc3RydWN0 IHBzcF9jb250ZXh0CiAJdWludDMyX3QJCQlhc2RfZmVhdHVyZV92ZXJzaW9uOwogCXVpbnQzMl90 CQkJYXNkX3Vjb2RlX3NpemU7CiAJdWludDhfdAkJCQkqYXNkX3N0YXJ0X2FkZHI7Ci0Jc3RydWN0 IGFtZGdwdV9ibyAJCSphc2Rfc2hhcmVkX2JvOwotCXVpbnQ2NF90IAkJCWFzZF9zaGFyZWRfbWNf YWRkcjsKKwlzdHJ1Y3QgYW1kZ3B1X2JvCQkqYXNkX3NoYXJlZF9ibzsKKwl1aW50NjRfdAkJCWFz ZF9zaGFyZWRfbWNfYWRkcjsKIAl2b2lkCQkJCSphc2Rfc2hhcmVkX2J1ZjsKIAogCS8qIGZlbmNl IGJ1ZmZlciAqLwotCXN0cnVjdCBhbWRncHVfYm8gCQkqZmVuY2VfYnVmX2JvOwotCXVpbnQ2NF90 IAkJCWZlbmNlX2J1Zl9tY19hZGRyOworCXN0cnVjdCBhbWRncHVfYm8JCSpmZW5jZV9idWZfYm87 CisJdWludDY0X3QJCQlmZW5jZV9idWZfbWNfYWRkcjsKIAl2b2lkCQkJCSpmZW5jZV9idWY7CiAK IAkvKiBjbWQgYnVmZmVyICovCkBAIC0xNTAsNiArMTUzLDggQEAgc3RydWN0IGFtZGdwdV9wc3Bf ZnVuY3MgewogI2RlZmluZSBwc3BfbW9kZTFfcmVzZXQocHNwKSBcCiAJCSgocHNwKS0+ZnVuY3Mt Pm1vZGUxX3Jlc2V0ID8gKHBzcCktPmZ1bmNzLT5tb2RlMV9yZXNldCgocHNwKSkgOiBmYWxzZSkK IAorI2RlZmluZSBhbWRncHVfcHNwX2NoZWNrX2Z3X2xvYWRpbmdfc3RhdHVzKGFkZXYsIGkpIChh ZGV2KS0+ZmlybXdhcmUuZnVuY3MtPmNoZWNrX2Z3X2xvYWRpbmdfc3RhdHVzKChhZGV2KSwgKGkp KQorCiBleHRlcm4gY29uc3Qgc3RydWN0IGFtZF9pcF9mdW5jcyBwc3BfaXBfZnVuY3M7CiAKIGV4 dGVybiBjb25zdCBzdHJ1Y3QgYW1kZ3B1X2lwX2Jsb2NrX3ZlcnNpb24gcHNwX3YzXzFfaXBfYmxv Y2s7Ci0tIAoyLjcuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KYW1kLWdmeCBtYWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4Cg==