From: "Thai, Thong" Subject: [PATCH 1/2] Revert "drm/amdgpu: use direct loading on renoir vcn for the moment" Date: Thu, 15 Aug 2019 18:19:48 +0000 Message-ID: <20190815181940.4897-1-thong.thai@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Language: en-US 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: "Thai, Thong" VGhpcyByZXZlcnRzIGNvbW1pdCA2OWZjZDczNDdmNmZiMTFlZGM3ZWFlYTdjN2I5Y2ZmMDA0NGNl MTdlLgotLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV92Y24uYyB8IDkgKysr LS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS92Y25fdjJfMC5jICAgfCA5ICsrKy0t LS0tLQogMiBmaWxlcyBjaGFuZ2VkLCA2IGluc2VydGlvbnMoKyksIDEyIGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV92Y24uYyBiL2Ry aXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV92Y24uYwppbmRleCA4YjQzYzViMjFhZTku LjM1YTBhMTM5NmJlNyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1k Z3B1X3Zjbi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV92Y24uYwpA QCAtODQsOCArODQsNyBAQCBpbnQgYW1kZ3B1X3Zjbl9zd19pbml0KHN0cnVjdCBhbWRncHVfZGV2 aWNlICphZGV2KQogCWNhc2UgQ0hJUF9SRU5PSVI6CiAJCWZ3X25hbWUgPSBGSVJNV0FSRV9SRU5P SVI7CiAJCWlmICgoYWRldi0+ZmlybXdhcmUubG9hZF90eXBlID09IEFNREdQVV9GV19MT0FEX1BT UCkgJiYKLQkJICAgIChhZGV2LT5wZ19mbGFncyAmIEFNRF9QR19TVVBQT1JUX1ZDTl9EUEcpICYm Ci0JCSAgICBhZGV2LT5hc2ljX3R5cGUgIT0gQ0hJUF9SRU5PSVIpIC8qIHRvIGJlIHJlbW92ZWQg d2hpbGUgdmNuIHBzcCBsb2FkaW5nIHdvcmtzICovCisJCSAgICAoYWRldi0+cGdfZmxhZ3MgJiBB TURfUEdfU1VQUE9SVF9WQ05fRFBHKSkKIAkJCWFkZXYtPnZjbi5pbmRpcmVjdF9zcmFtID0gdHJ1 ZTsKIAkJYnJlYWs7CiAJZGVmYXVsdDoKQEAgLTEzOSw4ICsxMzgsNyBAQCBpbnQgYW1kZ3B1X3Zj bl9zd19pbml0KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCX0KIAogCWJvX3NpemUgPSBB TURHUFVfVkNOX1NUQUNLX1NJWkUgKyBBTURHUFVfVkNOX0NPTlRFWFRfU0laRTsKLQlpZiAoYWRl di0+ZmlybXdhcmUubG9hZF90eXBlICE9IEFNREdQVV9GV19MT0FEX1BTUCB8fAotCSAgICBhZGV2 LT5hc2ljX3R5cGUgPT0gQ0hJUF9SRU5PSVIpCisJaWYgKGFkZXYtPmZpcm13YXJlLmxvYWRfdHlw ZSAhPSBBTURHUFVfRldfTE9BRF9QU1ApCiAJCWJvX3NpemUgKz0gQU1ER1BVX0dQVV9QQUdFX0FM SUdOKGxlMzJfdG9fY3B1KGhkci0+dWNvZGVfc2l6ZV9ieXRlcykgKyA4KTsKIAlyID0gYW1kZ3B1 X2JvX2NyZWF0ZV9rZXJuZWwoYWRldiwgYm9fc2l6ZSwgUEFHRV9TSVpFLAogCQkJCSAgICBBTURH UFVfR0VNX0RPTUFJTl9WUkFNLCAmYWRldi0+dmNuLnZjcHVfYm8sCkBAIC0yMzMsOCArMjMxLDcg QEAgaW50IGFtZGdwdV92Y25fcmVzdW1lKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCQl1 bnNpZ25lZCBvZmZzZXQ7CiAKIAkJaGRyID0gKGNvbnN0IHN0cnVjdCBjb21tb25fZmlybXdhcmVf aGVhZGVyICopYWRldi0+dmNuLmZ3LT5kYXRhOwotCQlpZiAoYWRldi0+ZmlybXdhcmUubG9hZF90 eXBlICE9IEFNREdQVV9GV19MT0FEX1BTUCB8fAotCQkgICAgYWRldi0+YXNpY190eXBlID09IENI SVBfUkVOT0lSKSB7CisJCWlmIChhZGV2LT5maXJtd2FyZS5sb2FkX3R5cGUgIT0gQU1ER1BVX0ZX X0xPQURfUFNQKSB7CiAJCQlvZmZzZXQgPSBsZTMyX3RvX2NwdShoZHItPnVjb2RlX2FycmF5X29m ZnNldF9ieXRlcyk7CiAJCQltZW1jcHlfdG9pbyhhZGV2LT52Y24uY3B1X2FkZHIsIGFkZXYtPnZj bi5mdy0+ZGF0YSArIG9mZnNldCwKIAkJCQkgICAgbGUzMl90b19jcHUoaGRyLT51Y29kZV9zaXpl X2J5dGVzKSk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS92Y25fdjJf MC5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvdmNuX3YyXzAuYwppbmRleCA4NGFhNzc0 NzA4MDIuLmIxMmM1ZTU3ZjE4YiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRn cHUvdmNuX3YyXzAuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS92Y25fdjJfMC5j CkBAIC0xNDIsOCArMTQyLDcgQEAgc3RhdGljIGludCB2Y25fdjJfMF9zd19pbml0KHZvaWQgKmhh bmRsZSkKIAlpZiAocikKIAkJcmV0dXJuIHI7CiAKLQlpZiAoYWRldi0+ZmlybXdhcmUubG9hZF90 eXBlID09IEFNREdQVV9GV19MT0FEX1BTUCAmJgotCSAgICBhZGV2LT5hc2ljX3R5cGUgIT0gQ0hJ UF9SRU5PSVIpIHsKKwlpZiAoYWRldi0+ZmlybXdhcmUubG9hZF90eXBlID09IEFNREdQVV9GV19M T0FEX1BTUCkgewogCQljb25zdCBzdHJ1Y3QgY29tbW9uX2Zpcm13YXJlX2hlYWRlciAqaGRyOwog CQloZHIgPSAoY29uc3Qgc3RydWN0IGNvbW1vbl9maXJtd2FyZV9oZWFkZXIgKilhZGV2LT52Y24u ZnctPmRhdGE7CiAJCWFkZXYtPmZpcm13YXJlLnVjb2RlW0FNREdQVV9VQ09ERV9JRF9WQ05dLnVj b2RlX2lkID0gQU1ER1BVX1VDT0RFX0lEX1ZDTjsKQEAgLTM2MCw4ICszNTksNyBAQCBzdGF0aWMg dm9pZCB2Y25fdjJfMF9tY19yZXN1bWUoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAJdWlu dDMyX3Qgb2Zmc2V0OwogCiAJLyogY2FjaGUgd2luZG93IDA6IGZ3ICovCi0JaWYgKGFkZXYtPmZp cm13YXJlLmxvYWRfdHlwZSA9PSBBTURHUFVfRldfTE9BRF9QU1AgJiYKLQkgICAgYWRldi0+YXNp Y190eXBlICE9IENISVBfUkVOT0lSKSB7CisJaWYgKGFkZXYtPmZpcm13YXJlLmxvYWRfdHlwZSA9 PSBBTURHUFVfRldfTE9BRF9QU1ApIHsKIAkJV1JFRzMyX1NPQzE1KFVWRCwgMCwgbW1VVkRfTE1J X1ZDUFVfQ0FDSEVfNjRCSVRfQkFSX0xPVywKIAkJCShhZGV2LT5maXJtd2FyZS51Y29kZVtBTURH UFVfVUNPREVfSURfVkNOXS50bXJfbWNfYWRkcl9sbykpOwogCQlXUkVHMzJfU09DMTUoVVZELCAw LCBtbVVWRF9MTUlfVkNQVV9DQUNIRV82NEJJVF9CQVJfSElHSCwKQEAgLTQwNiw4ICs0MDQsNyBA QCBzdGF0aWMgdm9pZCB2Y25fdjJfMF9tY19yZXN1bWVfZHBnX21vZGUoc3RydWN0IGFtZGdwdV9k ZXZpY2UgKmFkZXYsIGJvb2wgaW5kaXJlYwogCXVpbnQzMl90IG9mZnNldDsKIAogCS8qIGNhY2hl IHdpbmRvdyAwOiBmdyAqLwotCWlmIChhZGV2LT5maXJtd2FyZS5sb2FkX3R5cGUgPT0gQU1ER1BV X0ZXX0xPQURfUFNQICYmCi0JICAgIGFkZXYtPmFzaWNfdHlwZSAhPSBDSElQX1JFTk9JUikgewor CWlmIChhZGV2LT5maXJtd2FyZS5sb2FkX3R5cGUgPT0gQU1ER1BVX0ZXX0xPQURfUFNQKSB7CiAJ CWlmICghaW5kaXJlY3QpIHsKIAkJCVdSRUczMl9TT0MxNV9EUEdfTU9ERV8yXzAoU09DMTVfRFBH X01PREVfT0ZGU0VUXzJfMCgKIAkJCQlVVkQsIDAsIG1tVVZEX0xNSV9WQ1BVX0NBQ0hFXzY0QklU X0JBUl9MT1cpLAotLSAKMi4xNy4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2Ft ZC1nZng=