From: Huang Rui Subject: [PATCH 5/6] drm/amdgpu: split psp ring init function Date: Sat, 1 Apr 2017 17:00:47 +0800 Message-ID: <1491037248-16146-6-git-send-email-ray.huang@amd.com> References: <1491037248-16146-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: <1491037248-16146-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, Alex Deucher Cc: Huang Rui U2lnbmVkLW9mZi1ieTogSHVhbmcgUnVpIDxyYXkuaHVhbmdAYW1kLmNvbT4KUmV2aWV3ZWQtYnk6 IEFsZXggRGV1Y2hlciA8YWxleGFuZGVyLmRldWNoZXJAYW1kLmNvbT4KLS0tCiBkcml2ZXJzL2dw dS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfcHNwLmMgfCAxMTUgKysrKysrKysrKysrKysrKysrKyst LS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9wc3AuaCB8ICAg MyArCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9wc3BfdjNfMS5jICAgfCAgMTEgKystCiBk cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9wc3BfdjNfMS5oICAgfCAgIDIgKwogNCBmaWxlcyBj aGFuZ2VkLCA4NyBpbnNlcnRpb25zKCspLCA0NCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfcHNwLmMgYi9kcml2ZXJzL2dwdS9kcm0v YW1kL2FtZGdwdS9hbWRncHVfcHNwLmMKaW5kZXggNDA2YWJkOC4uODczZDJmNyAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3BzcC5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9wc3AuYwpAQCAtNTUsNiArNTUsNyBAQCBzdGF0aWMg aW50IHBzcF9zd19pbml0KHZvaWQgKmhhbmRsZSkKIAkJcHNwLT5ib290bG9hZGVyX2xvYWRfc29z ID0gcHNwX3YzXzFfYm9vdGxvYWRlcl9sb2FkX3NvczsKIAkJcHNwLT5wcmVwX2NtZF9idWYgPSBw c3BfdjNfMV9wcmVwX2NtZF9idWY7CiAJCXBzcC0+cmluZ19pbml0ID0gcHNwX3YzXzFfcmluZ19p bml0OworCQlwc3AtPnJpbmdfY3JlYXRlID0gcHNwX3YzXzFfcmluZ19jcmVhdGU7CiAJCXBzcC0+ Y21kX3N1Ym1pdCA9IHBzcF92M18xX2NtZF9zdWJtaXQ7CiAJCXBzcC0+Y29tcGFyZV9zcmFtX2Rh dGEgPSBwc3BfdjNfMV9jb21wYXJlX3NyYW1fZGF0YTsKIAkJcHNwLT5zbXVfcmVsb2FkX3F1aXJr ID0gcHNwX3YzXzFfc211X3JlbG9hZF9xdWlyazsKQEAgLTI0NiwxOCArMjQ3LDc5IEBAIHN0YXRp YyBpbnQgcHNwX2FzZF9sb2FkKHN0cnVjdCBwc3BfY29udGV4dCAqcHNwKQogCXJldHVybiByZXQ7 CiB9CiAKLXN0YXRpYyBpbnQgcHNwX2xvYWRfZncoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYp CitzdGF0aWMgaW50IHBzcF9od19zdGFydChzdHJ1Y3QgcHNwX2NvbnRleHQgKnBzcCkKIHsKIAlp bnQgcmV0OwotCXN0cnVjdCBwc3BfZ2Z4X2NtZF9yZXNwICpjbWQ7Ci0JaW50IGk7CisKKwlyZXQg PSBwc3BfYm9vdGxvYWRlcl9sb2FkX3N5c2Rydihwc3ApOworCWlmIChyZXQpCisJCXJldHVybiBy ZXQ7CisKKwlyZXQgPSBwc3BfYm9vdGxvYWRlcl9sb2FkX3Nvcyhwc3ApOworCWlmIChyZXQpCisJ CXJldHVybiByZXQ7CisKKwlyZXQgPSBwc3BfcmluZ19jcmVhdGUocHNwLCBQU1BfUklOR19UWVBF X19LTSk7CisJaWYgKHJldCkKKwkJcmV0dXJuIHJldDsKKworCXJldCA9IHBzcF90bXJfbG9hZChw c3ApOworCWlmIChyZXQpCisJCXJldHVybiByZXQ7CisKKwlyZXQgPSBwc3BfYXNkX2xvYWQocHNw KTsKKwlpZiAocmV0KQorCQlyZXR1cm4gcmV0OworCisJcmV0dXJuIDA7Cit9CisKK3N0YXRpYyBp bnQgcHNwX25wX2Z3X2xvYWQoc3RydWN0IHBzcF9jb250ZXh0ICpwc3ApCit7CisJaW50IGksIHJl dDsKIAlzdHJ1Y3QgYW1kZ3B1X2Zpcm13YXJlX2luZm8gKnVjb2RlOworCXN0cnVjdCBhbWRncHVf ZGV2aWNlKiBhZGV2ID0gcHNwLT5hZGV2OworCisJZm9yIChpID0gMDsgaSA8IGFkZXYtPmZpcm13 YXJlLm1heF91Y29kZXM7IGkrKykgeworCQl1Y29kZSA9ICZhZGV2LT5maXJtd2FyZS51Y29kZVtp XTsKKwkJaWYgKCF1Y29kZS0+ZncpCisJCQljb250aW51ZTsKKworCQlpZiAodWNvZGUtPnVjb2Rl X2lkID09IEFNREdQVV9VQ09ERV9JRF9TTUMgJiYKKwkJICAgIHBzcF9zbXVfcmVsb2FkX3F1aXJr KHBzcCkpCisJCQljb250aW51ZTsKKworCQlyZXQgPSBwc3BfcHJlcF9jbWRfYnVmKHVjb2RlLCBw c3AtPmNtZCk7CisJCWlmIChyZXQpCisJCQlyZXR1cm4gcmV0OworCisJCXJldCA9IHBzcF9jbWRf c3VibWl0X2J1Zihwc3AsIHVjb2RlLCBwc3AtPmNtZCwKKwkJCQkJIHBzcC0+ZmVuY2VfYnVmX21j X2FkZHIsIGkgKyAzKTsKKwkJaWYgKHJldCkKKwkJCXJldHVybiByZXQ7CisKKyNpZiAwCisJCS8q IGNoZWNrIGlmIGZpcm13YXJlIGxvYWRlZCBzdWNlc3NmdWxseSAqLworCQlpZiAoIWFtZGdwdV9w c3BfY2hlY2tfZndfbG9hZGluZ19zdGF0dXMoYWRldiwgaSkpCisJCQlyZXR1cm4gLUVJTlZBTDsK KyNlbmRpZgorCX0KKworCXJldHVybiAwOworfQorCitzdGF0aWMgaW50IHBzcF9sb2FkX2Z3KHN0 cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQoreworCWludCByZXQ7CiAJc3RydWN0IHBzcF9jb250 ZXh0ICpwc3AgPSAmYWRldi0+cHNwOworCXN0cnVjdCBwc3BfZ2Z4X2NtZF9yZXNwICpjbWQ7CiAK IAljbWQgPSBremFsbG9jKHNpemVvZihzdHJ1Y3QgcHNwX2dmeF9jbWRfcmVzcCksIEdGUF9LRVJO RUwpOwogCWlmICghY21kKQogCQlyZXR1cm4gLUVOT01FTTsKIAorCXBzcC0+Y21kID0gY21kOwor CiAJcmV0ID0gYW1kZ3B1X2JvX2NyZWF0ZV9rZXJuZWwoYWRldiwgUFNQXzFfTUVHLCBQU1BfMV9N RUcsCiAJCQkJICAgICAgQU1ER1BVX0dFTV9ET01BSU5fR1RULAogCQkJCSAgICAgICZwc3AtPmZ3 X3ByaV9ibywKQEAgLTI2NiwxOCArMzI4LDYgQEAgc3RhdGljIGludCBwc3BfbG9hZF9mdyhzdHJ1 Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIAlpZiAocmV0KQogCQlnb3RvIGZhaWxlZDsKIAotCXJl dCA9IHBzcF9ib290bG9hZGVyX2xvYWRfc3lzZHJ2KHBzcCk7Ci0JaWYgKHJldCkKLQkJZ290byBm YWlsZWRfbWVtMTsKLQotCXJldCA9IHBzcF9ib290bG9hZGVyX2xvYWRfc29zKHBzcCk7Ci0JaWYg KHJldCkKLQkJZ290byBmYWlsZWRfbWVtMTsKLQotCXJldCA9IHBzcF9yaW5nX2luaXQocHNwLCBQ U1BfUklOR19UWVBFX19LTSk7Ci0JaWYgKHJldCkKLQkJZ290byBmYWlsZWRfbWVtMTsKLQogCXJl dCA9IGFtZGdwdV9ib19jcmVhdGVfa2VybmVsKGFkZXYsIFBTUF9GRU5DRV9CVUZGRVJfU0laRSwg UEFHRV9TSVpFLAogCQkJCSAgICAgIEFNREdQVV9HRU1fRE9NQUlOX1ZSQU0sCiAJCQkJICAgICAg JnBzcC0+ZmVuY2VfYnVmX2JvLApAQCAtMjg4LDExICszMzgsMTEgQEAgc3RhdGljIGludCBwc3Bf bG9hZF9mdyhzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIAogCW1lbXNldChwc3AtPmZlbmNl X2J1ZiwgMCwgUFNQX0ZFTkNFX0JVRkZFUl9TSVpFKTsKIAotCXJldCA9IHBzcF90bXJfaW5pdChw c3ApOworCXJldCA9IHBzcF9yaW5nX2luaXQocHNwLCBQU1BfUklOR19UWVBFX19LTSk7CiAJaWYg KHJldCkKLQkJZ290byBmYWlsZWRfbWVtOworCQlnb3RvIGZhaWxlZF9tZW0xOwogCi0JcmV0ID0g cHNwX3Rtcl9sb2FkKHBzcCk7CisJcmV0ID0gcHNwX3Rtcl9pbml0KHBzcCk7CiAJaWYgKHJldCkK IAkJZ290byBmYWlsZWRfbWVtOwogCkBAIC0zMDAsMzQgKzM1MCwxMyBAQCBzdGF0aWMgaW50IHBz cF9sb2FkX2Z3KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCWlmIChyZXQpCiAJCWdvdG8g ZmFpbGVkX21lbTsKIAotCXJldCA9IHBzcF9hc2RfbG9hZChwc3ApOworCXJldCA9IHBzcF9od19z dGFydChwc3ApOwogCWlmIChyZXQpCiAJCWdvdG8gZmFpbGVkX21lbTsKIAotCWZvciAoaSA9IDA7 IGkgPCBhZGV2LT5maXJtd2FyZS5tYXhfdWNvZGVzOyBpKyspIHsKLQkJdWNvZGUgPSAmYWRldi0+ ZmlybXdhcmUudWNvZGVbaV07Ci0JCWlmICghdWNvZGUtPmZ3KQotCQkJY29udGludWU7Ci0KLQkJ aWYgKHVjb2RlLT51Y29kZV9pZCA9PSBBTURHUFVfVUNPREVfSURfU01DICYmCi0JCSAgICBwc3Bf c211X3JlbG9hZF9xdWlyayhwc3ApKQotCQkJY29udGludWU7Ci0KLQkJcmV0ID0gcHNwX3ByZXBf Y21kX2J1Zih1Y29kZSwgY21kKTsKLQkJaWYgKHJldCkKLQkJCWdvdG8gZmFpbGVkX21lbTsKLQot CQlyZXQgPSBwc3BfY21kX3N1Ym1pdF9idWYocHNwLCB1Y29kZSwgY21kLAotCQkJCQkgcHNwLT5m ZW5jZV9idWZfbWNfYWRkciwgaSArIDMpOwotCQlpZiAocmV0KQotCQkJZ290byBmYWlsZWRfbWVt OwotCi0jaWYgMAotCQkvKiBjaGVjayBpZiBmaXJtd2FyZSBsb2FkZWQgc3VjZXNzZnVsbHkgKi8K LQkJaWYgKCFhbWRncHVfcHNwX2NoZWNrX2Z3X2xvYWRpbmdfc3RhdHVzKGFkZXYsIGkpKQotCQkJ cmV0dXJuIC1FSU5WQUw7Ci0jZW5kaWYKLQl9CisJcmV0ID0gcHNwX25wX2Z3X2xvYWQocHNwKTsK KwlpZiAocmV0KQorCQlnb3RvIGZhaWxlZF9tZW07CiAKIAlhbWRncHVfYm9fZnJlZV9rZXJuZWwo JnBzcC0+ZmVuY2VfYnVmX2JvLAogCQkJICAgICAgJnBzcC0+ZmVuY2VfYnVmX21jX2FkZHIsICZw c3AtPmZlbmNlX2J1Zik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9h bWRncHVfcHNwLmggYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfcHNwLmgKaW5k ZXggMWYxZjA1Ny4uMjhmYWJhNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRn cHUvYW1kZ3B1X3BzcC5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9w c3AuaApAQCAtNTcsNiArNTcsNyBAQCBzdHJ1Y3QgcHNwX2NvbnRleHQKIHsKIAlzdHJ1Y3QgYW1k Z3B1X2RldmljZSAgICAgICAgICAgICphZGV2OwogCXN0cnVjdCBwc3BfcmluZyAgICAgICAgICAg ICAgICAga21fcmluZzsKKwlzdHJ1Y3QgcHNwX2dmeF9jbWRfcmVzcAkJKmNtZDsKIAogCWludCAo KmluaXRfbWljcm9jb2RlKShzdHJ1Y3QgcHNwX2NvbnRleHQgKnBzcCk7CiAJaW50ICgqYm9vdGxv YWRlcl9sb2FkX3N5c2Rydikoc3RydWN0IHBzcF9jb250ZXh0ICpwc3ApOwpAQCAtNjQsNiArNjUs NyBAQCBzdHJ1Y3QgcHNwX2NvbnRleHQKIAlpbnQgKCpwcmVwX2NtZF9idWYpKHN0cnVjdCBhbWRn cHVfZmlybXdhcmVfaW5mbyAqdWNvZGUsCiAJCQkgICAgc3RydWN0IHBzcF9nZnhfY21kX3Jlc3Ag KmNtZCk7CiAJaW50ICgqcmluZ19pbml0KShzdHJ1Y3QgcHNwX2NvbnRleHQgKnBzcCwgZW51bSBw c3BfcmluZ190eXBlIHJpbmdfdHlwZSk7CisJaW50ICgqcmluZ19jcmVhdGUpKHN0cnVjdCBwc3Bf Y29udGV4dCAqcHNwLCBlbnVtIHBzcF9yaW5nX3R5cGUgcmluZ190eXBlKTsKIAlpbnQgKCpjbWRf c3VibWl0KShzdHJ1Y3QgcHNwX2NvbnRleHQgKnBzcCwgc3RydWN0IGFtZGdwdV9maXJtd2FyZV9p bmZvICp1Y29kZSwKIAkJCSAgdWludDY0X3QgY21kX2J1Zl9tY19hZGRyLCB1aW50NjRfdCBmZW5j ZV9tY19hZGRyLCBpbnQgaW5kZXgpOwogCWJvb2wgKCpjb21wYXJlX3NyYW1fZGF0YSkoc3RydWN0 IHBzcF9jb250ZXh0ICpwc3AsCkBAIC0xMTMsNiArMTE1LDcgQEAgc3RydWN0IGFtZGdwdV9wc3Bf ZnVuY3MgewogCiAjZGVmaW5lIHBzcF9wcmVwX2NtZF9idWYodWNvZGUsIHR5cGUpIChwc3ApLT5w cmVwX2NtZF9idWYoKHVjb2RlKSwgKHR5cGUpKQogI2RlZmluZSBwc3BfcmluZ19pbml0KHBzcCwg dHlwZSkgKHBzcCktPnJpbmdfaW5pdCgocHNwKSwgKHR5cGUpKQorI2RlZmluZSBwc3BfcmluZ19j cmVhdGUocHNwLCB0eXBlKSAocHNwKS0+cmluZ19jcmVhdGUoKHBzcCksICh0eXBlKSkKICNkZWZp bmUgcHNwX2NtZF9zdWJtaXQocHNwLCB1Y29kZSwgY21kX21jLCBmZW5jZV9tYywgaW5kZXgpIFwK IAkJKHBzcCktPmNtZF9zdWJtaXQoKHBzcCksICh1Y29kZSksIChjbWRfbWMpLCAoZmVuY2VfbWMp LCAoaW5kZXgpKQogI2RlZmluZSBwc3BfY29tcGFyZV9zcmFtX2RhdGEocHNwLCB1Y29kZSwgdHlw ZSkgXApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvcHNwX3YzXzEuYyBi L2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3BzcF92M18xLmMKaW5kZXggNzU2ODFmNC4uMTNh ODAxZjAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3BzcF92M18xLmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvcHNwX3YzXzEuYwpAQCAtMjY4LDcgKzI2 OCw2IEBAIGludCBwc3BfdjNfMV9wcmVwX2NtZF9idWYoc3RydWN0IGFtZGdwdV9maXJtd2FyZV9p bmZvICp1Y29kZSwgc3RydWN0IHBzcF9nZnhfY21kCiBpbnQgcHNwX3YzXzFfcmluZ19pbml0KHN0 cnVjdCBwc3BfY29udGV4dCAqcHNwLCBlbnVtIHBzcF9yaW5nX3R5cGUgcmluZ190eXBlKQogewog CWludCByZXQgPSAwOwotCXVuc2lnbmVkIGludCBwc3BfcmluZ19yZWcgPSAwOwogCXN0cnVjdCBw c3BfcmluZyAqcmluZzsKIAlzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiA9IHBzcC0+YWRldjsK IApAQCAtMjg4LDYgKzI4NywxNiBAQCBpbnQgcHNwX3YzXzFfcmluZ19pbml0KHN0cnVjdCBwc3Bf Y29udGV4dCAqcHNwLCBlbnVtIHBzcF9yaW5nX3R5cGUgcmluZ190eXBlKQogCQlyZXR1cm4gcmV0 OwogCX0KIAorCXJldHVybiAwOworfQorCitpbnQgcHNwX3YzXzFfcmluZ19jcmVhdGUoc3RydWN0 IHBzcF9jb250ZXh0ICpwc3AsIGVudW0gcHNwX3JpbmdfdHlwZSByaW5nX3R5cGUpCit7CisJaW50 IHJldCA9IDA7CisJdW5zaWduZWQgaW50IHBzcF9yaW5nX3JlZyA9IDA7CisJc3RydWN0IHBzcF9y aW5nICpyaW5nID0gJnBzcC0+a21fcmluZzsKKwlzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiA9 IHBzcC0+YWRldjsKKwogCS8qIFdyaXRlIGxvdyBhZGRyZXNzIG9mIHRoZSByaW5nIHRvIEMyUE1T R182OSAqLwogCXBzcF9yaW5nX3JlZyA9IGxvd2VyXzMyX2JpdHMocmluZy0+cmluZ19tZW1fbWNf YWRkcik7CiAJV1JFRzMyKFNPQzE1X1JFR19PRkZTRVQoTVAwLCAwLCBtbU1QMF9TTU5fQzJQTVNH XzY5KSwgcHNwX3JpbmdfcmVnKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1k Z3B1L3BzcF92M18xLmggYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9wc3BfdjNfMS5oCmlu ZGV4IGU4MmVmZjcuLjUyMzBkMjc4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Ft ZGdwdS9wc3BfdjNfMS5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3BzcF92M18x LmgKQEAgLTM5LDYgKzM5LDggQEAgZXh0ZXJuIGludCBwc3BfdjNfMV9wcmVwX2NtZF9idWYoc3Ry dWN0IGFtZGdwdV9maXJtd2FyZV9pbmZvICp1Y29kZSwKIAkJCQkgc3RydWN0IHBzcF9nZnhfY21k X3Jlc3AgKmNtZCk7CiBleHRlcm4gaW50IHBzcF92M18xX3JpbmdfaW5pdChzdHJ1Y3QgcHNwX2Nv bnRleHQgKnBzcCwKIAkJCSAgICAgIGVudW0gcHNwX3JpbmdfdHlwZSByaW5nX3R5cGUpOworZXh0 ZXJuIGludCBwc3BfdjNfMV9yaW5nX2NyZWF0ZShzdHJ1Y3QgcHNwX2NvbnRleHQgKnBzcCwKKwkJ CQllbnVtIHBzcF9yaW5nX3R5cGUgcmluZ190eXBlKTsKIGV4dGVybiBpbnQgcHNwX3YzXzFfY21k X3N1Ym1pdChzdHJ1Y3QgcHNwX2NvbnRleHQgKnBzcCwKIAkJCSAgICAgICBzdHJ1Y3QgYW1kZ3B1 X2Zpcm13YXJlX2luZm8gKnVjb2RlLAogCQkJICAgICAgIHVpbnQ2NF90IGNtZF9idWZfbWNfYWRk ciwgdWludDY0X3QgZmVuY2VfbWNfYWRkciwKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4 QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWls bWFuL2xpc3RpbmZvL2FtZC1nZngK