From: Rex Zhu Subject: [PATCH 1/3] drm/amdgpu: Fix vce initialize failed on Kaveri/Mullins Date: Thu, 23 Aug 2018 17:24:54 +0800 Message-ID: <1535016296-16215-1-git-send-email-Rex.Zhu@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 Cc: Rex Zhu Rm9yZ290IHRvIGFkZCB2Y2UgcGcgc3VwcG9ydCB2aWEgc211IGZvciBLYXZlcmkvTXVsbGlucy4K ClJlZ3Jlc3N0aW9uIGlzc3VlIGNhdXNlZCBieQonY29tbWl0IDU2MWE1YzgzZWFkZCAoImRybS9h bWQvcHA6IFVuaWZ5IHBvd2VyZ2F0ZV91dmQvdmNlL21taHViCnRvIHNldF9wb3dlcmdhdGluZ19i eV9zbXUiKScKClNpZ25lZC1vZmYtYnk6IFJleCBaaHUgPFJleC5aaHVAYW1kLmNvbT4KLS0tCiBk cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9rdl9kcG0uYyB8IDQxICsrKysrKysrKysrKysrKysr KysrKysrLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAyNiBpbnNlcnRpb25zKCspLCAx NSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9r dl9kcG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2t2X2RwbS5jCmluZGV4IDNmNTdm NjQuLmE3MTNjOGIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2t2X2Rw bS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2t2X2RwbS5jCkBAIC02Niw3ICs2 Niw2IEBAIHN0YXRpYyBpbnQga3Zfc2V0X3RoZXJtYWxfdGVtcGVyYXR1cmVfcmFuZ2Uoc3RydWN0 IGFtZGdwdV9kZXZpY2UgKmFkZXYsCiBzdGF0aWMgaW50IGt2X2luaXRfZnBzX2xpbWl0cyhzdHJ1 Y3QgYW1kZ3B1X2RldmljZSAqYWRldik7CiAKIHN0YXRpYyB2b2lkIGt2X2RwbV9wb3dlcmdhdGVf dXZkKHZvaWQgKmhhbmRsZSwgYm9vbCBnYXRlKTsKLXN0YXRpYyB2b2lkIGt2X2RwbV9wb3dlcmdh dGVfdmNlKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LCBib29sIGdhdGUpOwogc3RhdGljIHZv aWQga3ZfZHBtX3Bvd2VyZ2F0ZV9zYW11KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LCBib29s IGdhdGUpOwogc3RhdGljIHZvaWQga3ZfZHBtX3Bvd2VyZ2F0ZV9hY3Aoc3RydWN0IGFtZGdwdV9k ZXZpY2UgKmFkZXYsIGJvb2wgZ2F0ZSk7CiAKQEAgLTEzNzQsNiArMTM3Myw4IEBAIHN0YXRpYyBp bnQga3ZfZHBtX2VuYWJsZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIAogc3RhdGljIHZv aWQga3ZfZHBtX2Rpc2FibGUoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiB7CisJc3RydWN0 IGt2X3Bvd2VyX2luZm8gKnBpID0ga3ZfZ2V0X3BpKGFkZXYpOworCiAJYW1kZ3B1X2lycV9wdXQo YWRldiwgJmFkZXYtPnBtLmRwbS50aGVybWFsLmlycSwKIAkJICAgICAgIEFNREdQVV9USEVSTUFM X0lSUV9MT1dfVE9fSElHSCk7CiAJYW1kZ3B1X2lycV9wdXQoYWRldiwgJmFkZXYtPnBtLmRwbS50 aGVybWFsLmlycSwKQEAgLTEzODcsNyArMTM4OCw4IEBAIHN0YXRpYyB2b2lkIGt2X2RwbV9kaXNh YmxlKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCS8qIHBvd2VydXAgYmxvY2tzICovCiAJ a3ZfZHBtX3Bvd2VyZ2F0ZV9hY3AoYWRldiwgZmFsc2UpOwogCWt2X2RwbV9wb3dlcmdhdGVfc2Ft dShhZGV2LCBmYWxzZSk7Ci0Ja3ZfZHBtX3Bvd2VyZ2F0ZV92Y2UoYWRldiwgZmFsc2UpOworCWlm IChwaS0+Y2Fwc192Y2VfcGcpIC8qIHBvd2VyIG9uIHRoZSBWQ0UgYmxvY2sgKi8KKwkJYW1kZ3B1 X2t2X25vdGlmeV9tZXNzYWdlX3RvX3NtdShhZGV2LCBQUFNNQ19NU0dfVkNFUG93ZXJPTik7CiAJ a3ZfZHBtX3Bvd2VyZ2F0ZV91dmQoYWRldiwgZmFsc2UpOwogCiAJa3ZfZW5hYmxlX3NtY19jYWMo YWRldiwgZmFsc2UpOwpAQCAtMTU1MSw3ICsxNTUzLDYgQEAgc3RhdGljIGludCBrdl91cGRhdGVf dmNlX2RwbShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwKIAlpbnQgcmV0OwogCiAJaWYgKGFt ZGdwdV9uZXdfc3RhdGUtPmV2Y2xrID4gMCAmJiBhbWRncHVfY3VycmVudF9zdGF0ZS0+ZXZjbGsg PT0gMCkgewotCQlrdl9kcG1fcG93ZXJnYXRlX3ZjZShhZGV2LCBmYWxzZSk7CiAJCWlmIChwaS0+ Y2Fwc19zdGFibGVfcF9zdGF0ZSkKIAkJCXBpLT52Y2VfYm9vdF9sZXZlbCA9IHRhYmxlLT5jb3Vu dCAtIDE7CiAJCWVsc2UKQEAgLTE1NzMsNyArMTU3NCw2IEBAIHN0YXRpYyBpbnQga3ZfdXBkYXRl X3ZjZV9kcG0oc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsCiAJCWt2X2VuYWJsZV92Y2VfZHBt KGFkZXYsIHRydWUpOwogCX0gZWxzZSBpZiAoYW1kZ3B1X25ld19zdGF0ZS0+ZXZjbGsgPT0gMCAm JiBhbWRncHVfY3VycmVudF9zdGF0ZS0+ZXZjbGsgPiAwKSB7CiAJCWt2X2VuYWJsZV92Y2VfZHBt KGFkZXYsIGZhbHNlKTsKLQkJa3ZfZHBtX3Bvd2VyZ2F0ZV92Y2UoYWRldiwgdHJ1ZSk7CiAJfQog CiAJcmV0dXJuIDA7CkBAIC0xNzAyLDI0ICsxNzAyLDMyIEBAIHN0YXRpYyB2b2lkIGt2X2RwbV9w b3dlcmdhdGVfdXZkKHZvaWQgKmhhbmRsZSwgYm9vbCBnYXRlKQogCX0KIH0KIAotc3RhdGljIHZv aWQga3ZfZHBtX3Bvd2VyZ2F0ZV92Y2Uoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsIGJvb2wg Z2F0ZSkKK3N0YXRpYyB2b2lkIGt2X2RwbV9wb3dlcmdhdGVfdmNlKHZvaWQgKmhhbmRsZSwgYm9v bCBnYXRlKQogeworCXN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2ID0gKHN0cnVjdCBhbWRncHVf ZGV2aWNlICopaGFuZGxlOwogCXN0cnVjdCBrdl9wb3dlcl9pbmZvICpwaSA9IGt2X2dldF9waShh ZGV2KTsKLQotCWlmIChwaS0+dmNlX3Bvd2VyX2dhdGVkID09IGdhdGUpCi0JCXJldHVybjsKKwlp bnQgcmV0OwogCiAJcGktPnZjZV9wb3dlcl9nYXRlZCA9IGdhdGU7CiAKLQlpZiAoIXBpLT5jYXBz X3ZjZV9wZykKLQkJcmV0dXJuOwotCi0JaWYgKGdhdGUpCi0JCWFtZGdwdV9rdl9ub3RpZnlfbWVz c2FnZV90b19zbXUoYWRldiwgUFBTTUNfTVNHX1ZDRVBvd2VyT0ZGKTsKLQllbHNlCi0JCWFtZGdw dV9rdl9ub3RpZnlfbWVzc2FnZV90b19zbXUoYWRldiwgUFBTTUNfTVNHX1ZDRVBvd2VyT04pOwor CWlmIChnYXRlKSB7CisJCS8qIHN0b3AgdGhlIFZDRSBibG9jayAqLworCQlyZXQgPSBhbWRncHVf ZGV2aWNlX2lwX3NldF9wb3dlcmdhdGluZ19zdGF0ZShhZGV2LCBBTURfSVBfQkxPQ0tfVFlQRV9W Q0UsCisJCQkJCQkJICAgICBBTURfUEdfU1RBVEVfR0FURSk7CisJCWt2X2VuYWJsZV92Y2VfZHBt KGFkZXYsIGZhbHNlKTsKKwkJaWYgKHBpLT5jYXBzX3ZjZV9wZykgLyogcG93ZXIgb2ZmIHRoZSBW Q0UgYmxvY2sgKi8KKwkJCWFtZGdwdV9rdl9ub3RpZnlfbWVzc2FnZV90b19zbXUoYWRldiwgUFBT TUNfTVNHX1ZDRVBvd2VyT0ZGKTsKKwl9IGVsc2UgeworCQlpZiAocGktPmNhcHNfdmNlX3BnKSAv KiBwb3dlciBvbiB0aGUgVkNFIGJsb2NrICovCisJCQlhbWRncHVfa3Zfbm90aWZ5X21lc3NhZ2Vf dG9fc211KGFkZXYsIFBQU01DX01TR19WQ0VQb3dlck9OKTsKKwkJa3ZfZW5hYmxlX3ZjZV9kcG0o YWRldiwgdHJ1ZSk7CisJCS8qIHJlLWluaXQgdGhlIFZDRSBibG9jayAqLworCQlyZXQgPSBhbWRn cHVfZGV2aWNlX2lwX3NldF9wb3dlcmdhdGluZ19zdGF0ZShhZGV2LCBBTURfSVBfQkxPQ0tfVFlQ RV9WQ0UsCisJCQkJCQkJICAgICBBTURfUEdfU1RBVEVfVU5HQVRFKTsKKwl9CiB9CiAKKwogc3Rh dGljIHZvaWQga3ZfZHBtX3Bvd2VyZ2F0ZV9zYW11KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2 LCBib29sIGdhdGUpCiB7CiAJc3RydWN0IGt2X3Bvd2VyX2luZm8gKnBpID0ga3ZfZ2V0X3BpKGFk ZXYpOwpAQCAtMzMxMyw2ICszMzIxLDkgQEAgc3RhdGljIGludCBrdl9zZXRfcG93ZXJnYXRpbmdf Ynlfc211KHZvaWQgKmhhbmRsZSwKIAljYXNlIEFNRF9JUF9CTE9DS19UWVBFX1VWRDoKIAkJa3Zf ZHBtX3Bvd2VyZ2F0ZV91dmQoaGFuZGxlLCBnYXRlKTsKIAkJYnJlYWs7CisJY2FzZSBBTURfSVBf QkxPQ0tfVFlQRV9WQ0U6CisJCWt2X2RwbV9wb3dlcmdhdGVfdmNlKGhhbmRsZSwgZ2F0ZSk7CisJ CWJyZWFrOwogCWRlZmF1bHQ6CiAJCWJyZWFrOwogCX0KLS0gCjEuOS4xCgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAph bWQtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2FtZC1nZngK