From: Rex Zhu Subject: [PATCH 1/3] drm/amdgpu: Fix vce initialize failed on Kaveri/Mullins Date: Fri, 24 Aug 2018 16:50:24 +0800 Message-ID: <1535100626-14880-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: alexander.deucher-5C7GfCeVMHo@public.gmane.org, michel.daenzer-5C7GfCeVMHo@public.gmane.org Cc: Rex Zhu , amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Rm9yZ290IHRvIGFkZCB2Y2UgcGcgc3VwcG9ydCB2aWEgc211IGZvciBLYXZlcmkvTXVsbGlucy4K CkZpeGVzOiA1NjFhNWM4M2VhZGQgKCJkcm0vYW1kL3BwOiBVbmlmeSBwb3dlcmdhdGVfdXZkL3Zj ZS9tbWh1YgogICAgICAgICAgICAgICAgICAgICAgIHRvIHNldF9wb3dlcmdhdGluZ19ieV9zbXUi KQoKdjI6IHJlZmluZSBwYXRjaCBkZXNjcmlwdGlvbnMgc3VnZ2VzdGVkIGJ5IE1pY2hlbAoKVGVz dGVkLWJ5OiBNaWNoZWwgRMOkbnplciA8bWljaGVsLmRhZW56ZXJAYW1kLmNvbT4KU2lnbmVkLW9m Zi1ieTogUmV4IFpodSA8UmV4LlpodUBhbWQuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQv YW1kZ3B1L2t2X2RwbS5jIHwgNDEgKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0t LQogMSBmaWxlIGNoYW5nZWQsIDI2IGluc2VydGlvbnMoKyksIDE1IGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2t2X2RwbS5jIGIvZHJpdmVycy9n cHUvZHJtL2FtZC9hbWRncHUva3ZfZHBtLmMKaW5kZXggM2Y1N2Y2NC4uYTcxM2M4YiAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUva3ZfZHBtLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2FtZC9hbWRncHUva3ZfZHBtLmMKQEAgLTY2LDcgKzY2LDYgQEAgc3RhdGljIGludCBr dl9zZXRfdGhlcm1hbF90ZW1wZXJhdHVyZV9yYW5nZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRl diwKIHN0YXRpYyBpbnQga3ZfaW5pdF9mcHNfbGltaXRzKHN0cnVjdCBhbWRncHVfZGV2aWNlICph ZGV2KTsKIAogc3RhdGljIHZvaWQga3ZfZHBtX3Bvd2VyZ2F0ZV91dmQodm9pZCAqaGFuZGxlLCBi b29sIGdhdGUpOwotc3RhdGljIHZvaWQga3ZfZHBtX3Bvd2VyZ2F0ZV92Y2Uoc3RydWN0IGFtZGdw dV9kZXZpY2UgKmFkZXYsIGJvb2wgZ2F0ZSk7CiBzdGF0aWMgdm9pZCBrdl9kcG1fcG93ZXJnYXRl X3NhbXUoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsIGJvb2wgZ2F0ZSk7CiBzdGF0aWMgdm9p ZCBrdl9kcG1fcG93ZXJnYXRlX2FjcChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwgYm9vbCBn YXRlKTsKIApAQCAtMTM3NCw2ICsxMzczLDggQEAgc3RhdGljIGludCBrdl9kcG1fZW5hYmxlKHN0 cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCiBzdGF0aWMgdm9pZCBrdl9kcG1fZGlzYWJsZShz dHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIHsKKwlzdHJ1Y3Qga3ZfcG93ZXJfaW5mbyAqcGkg PSBrdl9nZXRfcGkoYWRldik7CisKIAlhbWRncHVfaXJxX3B1dChhZGV2LCAmYWRldi0+cG0uZHBt LnRoZXJtYWwuaXJxLAogCQkgICAgICAgQU1ER1BVX1RIRVJNQUxfSVJRX0xPV19UT19ISUdIKTsK IAlhbWRncHVfaXJxX3B1dChhZGV2LCAmYWRldi0+cG0uZHBtLnRoZXJtYWwuaXJxLApAQCAtMTM4 Nyw3ICsxMzg4LDggQEAgc3RhdGljIHZvaWQga3ZfZHBtX2Rpc2FibGUoc3RydWN0IGFtZGdwdV9k ZXZpY2UgKmFkZXYpCiAJLyogcG93ZXJ1cCBibG9ja3MgKi8KIAlrdl9kcG1fcG93ZXJnYXRlX2Fj cChhZGV2LCBmYWxzZSk7CiAJa3ZfZHBtX3Bvd2VyZ2F0ZV9zYW11KGFkZXYsIGZhbHNlKTsKLQlr dl9kcG1fcG93ZXJnYXRlX3ZjZShhZGV2LCBmYWxzZSk7CisJaWYgKHBpLT5jYXBzX3ZjZV9wZykg LyogcG93ZXIgb24gdGhlIFZDRSBibG9jayAqLworCQlhbWRncHVfa3Zfbm90aWZ5X21lc3NhZ2Vf dG9fc211KGFkZXYsIFBQU01DX01TR19WQ0VQb3dlck9OKTsKIAlrdl9kcG1fcG93ZXJnYXRlX3V2 ZChhZGV2LCBmYWxzZSk7CiAKIAlrdl9lbmFibGVfc21jX2NhYyhhZGV2LCBmYWxzZSk7CkBAIC0x NTUxLDcgKzE1NTMsNiBAQCBzdGF0aWMgaW50IGt2X3VwZGF0ZV92Y2VfZHBtKHN0cnVjdCBhbWRn cHVfZGV2aWNlICphZGV2LAogCWludCByZXQ7CiAKIAlpZiAoYW1kZ3B1X25ld19zdGF0ZS0+ZXZj bGsgPiAwICYmIGFtZGdwdV9jdXJyZW50X3N0YXRlLT5ldmNsayA9PSAwKSB7Ci0JCWt2X2RwbV9w b3dlcmdhdGVfdmNlKGFkZXYsIGZhbHNlKTsKIAkJaWYgKHBpLT5jYXBzX3N0YWJsZV9wX3N0YXRl KQogCQkJcGktPnZjZV9ib290X2xldmVsID0gdGFibGUtPmNvdW50IC0gMTsKIAkJZWxzZQpAQCAt MTU3Myw3ICsxNTc0LDYgQEAgc3RhdGljIGludCBrdl91cGRhdGVfdmNlX2RwbShzdHJ1Y3QgYW1k Z3B1X2RldmljZSAqYWRldiwKIAkJa3ZfZW5hYmxlX3ZjZV9kcG0oYWRldiwgdHJ1ZSk7CiAJfSBl bHNlIGlmIChhbWRncHVfbmV3X3N0YXRlLT5ldmNsayA9PSAwICYmIGFtZGdwdV9jdXJyZW50X3N0 YXRlLT5ldmNsayA+IDApIHsKIAkJa3ZfZW5hYmxlX3ZjZV9kcG0oYWRldiwgZmFsc2UpOwotCQlr dl9kcG1fcG93ZXJnYXRlX3ZjZShhZGV2LCB0cnVlKTsKIAl9CiAKIAlyZXR1cm4gMDsKQEAgLTE3 MDIsMjQgKzE3MDIsMzIgQEAgc3RhdGljIHZvaWQga3ZfZHBtX3Bvd2VyZ2F0ZV91dmQodm9pZCAq aGFuZGxlLCBib29sIGdhdGUpCiAJfQogfQogCi1zdGF0aWMgdm9pZCBrdl9kcG1fcG93ZXJnYXRl X3ZjZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwgYm9vbCBnYXRlKQorc3RhdGljIHZvaWQg a3ZfZHBtX3Bvd2VyZ2F0ZV92Y2Uodm9pZCAqaGFuZGxlLCBib29sIGdhdGUpCiB7CisJc3RydWN0 IGFtZGdwdV9kZXZpY2UgKmFkZXYgPSAoc3RydWN0IGFtZGdwdV9kZXZpY2UgKiloYW5kbGU7CiAJ c3RydWN0IGt2X3Bvd2VyX2luZm8gKnBpID0ga3ZfZ2V0X3BpKGFkZXYpOwotCi0JaWYgKHBpLT52 Y2VfcG93ZXJfZ2F0ZWQgPT0gZ2F0ZSkKLQkJcmV0dXJuOworCWludCByZXQ7CiAKIAlwaS0+dmNl X3Bvd2VyX2dhdGVkID0gZ2F0ZTsKIAotCWlmICghcGktPmNhcHNfdmNlX3BnKQotCQlyZXR1cm47 Ci0KLQlpZiAoZ2F0ZSkKLQkJYW1kZ3B1X2t2X25vdGlmeV9tZXNzYWdlX3RvX3NtdShhZGV2LCBQ UFNNQ19NU0dfVkNFUG93ZXJPRkYpOwotCWVsc2UKLQkJYW1kZ3B1X2t2X25vdGlmeV9tZXNzYWdl X3RvX3NtdShhZGV2LCBQUFNNQ19NU0dfVkNFUG93ZXJPTik7CisJaWYgKGdhdGUpIHsKKwkJLyog c3RvcCB0aGUgVkNFIGJsb2NrICovCisJCXJldCA9IGFtZGdwdV9kZXZpY2VfaXBfc2V0X3Bvd2Vy Z2F0aW5nX3N0YXRlKGFkZXYsIEFNRF9JUF9CTE9DS19UWVBFX1ZDRSwKKwkJCQkJCQkgICAgIEFN RF9QR19TVEFURV9HQVRFKTsKKwkJa3ZfZW5hYmxlX3ZjZV9kcG0oYWRldiwgZmFsc2UpOworCQlp ZiAocGktPmNhcHNfdmNlX3BnKSAvKiBwb3dlciBvZmYgdGhlIFZDRSBibG9jayAqLworCQkJYW1k Z3B1X2t2X25vdGlmeV9tZXNzYWdlX3RvX3NtdShhZGV2LCBQUFNNQ19NU0dfVkNFUG93ZXJPRkYp OworCX0gZWxzZSB7CisJCWlmIChwaS0+Y2Fwc192Y2VfcGcpIC8qIHBvd2VyIG9uIHRoZSBWQ0Ug YmxvY2sgKi8KKwkJCWFtZGdwdV9rdl9ub3RpZnlfbWVzc2FnZV90b19zbXUoYWRldiwgUFBTTUNf TVNHX1ZDRVBvd2VyT04pOworCQlrdl9lbmFibGVfdmNlX2RwbShhZGV2LCB0cnVlKTsKKwkJLyog cmUtaW5pdCB0aGUgVkNFIGJsb2NrICovCisJCXJldCA9IGFtZGdwdV9kZXZpY2VfaXBfc2V0X3Bv d2VyZ2F0aW5nX3N0YXRlKGFkZXYsIEFNRF9JUF9CTE9DS19UWVBFX1ZDRSwKKwkJCQkJCQkgICAg IEFNRF9QR19TVEFURV9VTkdBVEUpOworCX0KIH0KIAorCiBzdGF0aWMgdm9pZCBrdl9kcG1fcG93 ZXJnYXRlX3NhbXUoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsIGJvb2wgZ2F0ZSkKIHsKIAlz dHJ1Y3Qga3ZfcG93ZXJfaW5mbyAqcGkgPSBrdl9nZXRfcGkoYWRldik7CkBAIC0zMzEzLDYgKzMz MjEsOSBAQCBzdGF0aWMgaW50IGt2X3NldF9wb3dlcmdhdGluZ19ieV9zbXUodm9pZCAqaGFuZGxl LAogCWNhc2UgQU1EX0lQX0JMT0NLX1RZUEVfVVZEOgogCQlrdl9kcG1fcG93ZXJnYXRlX3V2ZCho YW5kbGUsIGdhdGUpOwogCQlicmVhazsKKwljYXNlIEFNRF9JUF9CTE9DS19UWVBFX1ZDRToKKwkJ a3ZfZHBtX3Bvd2VyZ2F0ZV92Y2UoaGFuZGxlLCBnYXRlKTsKKwkJYnJlYWs7CiAJZGVmYXVsdDoK IAkJYnJlYWs7CiAJfQotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCmFtZC1nZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJlZWRl c2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8v YW1kLWdmeAo=