From: Huang Rui Subject: [PATCH v2] drm/amdgpu: enable gfxoff again on raven series (v2) Date: Thu, 14 Mar 2019 13:56:11 +0800 Message-ID: <1552542971-16562-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: 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: Alex Deucher , Likun Gao , Huang Rui VGhpcyBwYXRjaCBlbmFibGVzIGdmeG9mZiBhbmQgc3R1dHRlciBtb2RlIGFnYWluLCBzaW5jZSB3 ZSB0YWtlIG1vcmUgdGVzdGluZyBvbgpyYXZlbiBzZXJpZXMuIEZvciByYXZlbjIgYW5kIHBpY2Fz c28sIHdlIGNhbiBlbmFibGUgaXQgZGlyZWN0bHkuIEFuZCBmb3IgcmF2ZW4sCndlIG5lZWQgY2hl Y2sgdGhlIFJMQy9TTUMgdWNvZGUgdmVyc2lvbiBjYW5ub3QgYmUgbGVzcyB0aGFuICM1MzEvMHgx ZTQ1LgoKdjI6IGFkZCBzbWMgdmVyc2lvbiBjaGVja2luZyBmb3IgcmF2ZW4uCgpTaWduZWQtb2Zm LWJ5OiBIdWFuZyBSdWkgPHJheS5odWFuZ0BhbWQuY29tPgpSZXZpZXdlZC1ieTogQWxleCBEZXVj aGVyIDxhbGV4YW5kZXIuZGV1Y2hlckBhbWQuY29tPiAodjEpCi0tLQogZHJpdmVycy9ncHUvZHJt L2FtZC9hbWRncHUvYW1kZ3B1X2RldmljZS5jICAgICAgICAgIHwgIDIgKysKIGRyaXZlcnMvZ3B1 L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9kcnYuYyAgICAgICAgICAgICB8ICA0ICsrLS0KIGRyaXZl cnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92OV8wLmMgICAgICAgICAgICAgICB8IDIxICsrKysr KysrKysrKysrKysrKysrKwogZHJpdmVycy9ncHUvZHJtL2FtZC9wb3dlcnBsYXkvaHdtZ3Ivc211 MTBfaHdtZ3IuYyAgIHwgMTMgKysrKy0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9wb3dl cnBsYXkvc211bWdyL3NtdTEwX3NtdW1nci5jIHwgIDQgKysrKwogNSBmaWxlcyBjaGFuZ2VkLCAz MyBpbnNlcnRpb25zKCspLCAxMSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZGV2aWNlLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Ft ZGdwdS9hbWRncHVfZGV2aWNlLmMKaW5kZXggOTVjZDNiNy4uMDJjMTEyNSAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2RldmljZS5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9kZXZpY2UuYwpAQCAtMTUwOCw2ICsxNTA4LDggQEAg c3RhdGljIGludCBhbWRncHVfZGV2aWNlX2lwX2Vhcmx5X2luaXQoc3RydWN0IGFtZGdwdV9kZXZp Y2UgKmFkZXYpCiAJfQogCiAJYWRldi0+cG0ucHBfZmVhdHVyZSA9IGFtZGdwdV9wcF9mZWF0dXJl X21hc2s7CisJaWYgKGFtZGdwdV9zcmlvdl92ZihhZGV2KSkKKwkJYWRldi0+cG0ucHBfZmVhdHVy ZSAmPSB+UFBfR0ZYT0ZGX01BU0s7CiAKIAlmb3IgKGkgPSAwOyBpIDwgYWRldi0+bnVtX2lwX2Js b2NrczsgaSsrKSB7CiAJCWlmICgoYW1kZ3B1X2lwX2Jsb2NrX21hc2sgJiAoMSA8PCBpKSkgPT0g MCkgewpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2Rydi5j IGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2Rydi5jCmluZGV4IDRhOGM0MjIu LjU2ODFhNDEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9k cnYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZHJ2LmMKQEAgLTEx OCw4ICsxMTgsOCBAQCB1aW50IGFtZGdwdV9wZ19tYXNrID0gMHhmZmZmZmZmZjsKIHVpbnQgYW1k Z3B1X3NkbWFfcGhhc2VfcXVhbnR1bSA9IDMyOwogY2hhciAqYW1kZ3B1X2Rpc2FibGVfY3UgPSBO VUxMOwogY2hhciAqYW1kZ3B1X3ZpcnR1YWxfZGlzcGxheSA9IE5VTEw7Ci0vKiBPdmVyRHJpdmUo Yml0IDE0KSxnZnhvZmYoYml0IDE1KSxzdHV0dGVyIG1vZGUoYml0IDE3KSBkaXNhYmxlZCBieSBk ZWZhdWx0Ki8KLXVpbnQgYW1kZ3B1X3BwX2ZlYXR1cmVfbWFzayA9IDB4ZmZmZDNmZmY7CisvKiBP dmVyRHJpdmUoYml0IDE0KSBkaXNhYmxlZCBieSBkZWZhdWx0Ki8KK3VpbnQgYW1kZ3B1X3BwX2Zl YXR1cmVfbWFzayA9IDB4ZmZmZmJmZmY7CiBpbnQgYW1kZ3B1X25nZyA9IDA7CiBpbnQgYW1kZ3B1 X3ByaW1fYnVmX3Blcl9zZSA9IDA7CiBpbnQgYW1kZ3B1X3Bvc19idWZfcGVyX3NlID0gMDsKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92OV8wLmMgYi9kcml2ZXJz L2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjlfMC5jCmluZGV4IDYwYzU4MmMuLjZiNDhkNGMgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92OV8wLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4X3Y5XzAuYwpAQCAtNTc4LDYgKzU3OCwyNiBAQCBz dGF0aWMgdm9pZCBnZnhfdjlfMF9jaGVja19md193cml0ZV93YWl0KHN0cnVjdCBhbWRncHVfZGV2 aWNlICphZGV2KQogCX0KIH0KIAorc3RhdGljIHZvaWQgZ2Z4X3Y5XzBfY2hlY2tfaWZfbmVlZF9n ZnhvZmYoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCit7CisJc3dpdGNoIChhZGV2LT5hc2lj X3R5cGUpIHsKKwljYXNlIENISVBfVkVHQTEwOgorCWNhc2UgQ0hJUF9WRUdBMTI6CisJY2FzZSBD SElQX1ZFR0EyMDoKKwkJYnJlYWs7CisJY2FzZSBDSElQX1JBVkVOOgorCQlpZiAoYWRldi0+cmV2 X2lkID49IDB4OCB8fCBhZGV2LT5wZGV2LT5kZXZpY2UgPT0gMHgxNWQ4KQorCQkJYnJlYWs7CisJ CWlmICgoYWRldi0+Z2Z4LnJsY19md192ZXJzaW9uIDwgNTMxKSB8fAorCQkgICAgKGFkZXYtPmdm eC5ybGNfZmVhdHVyZV92ZXJzaW9uIDwgMSkgfHwKKwkJICAgICFhZGV2LT5nZngucmxjLmlzX3Js Y192Ml8xKQorCQkJYWRldi0+cG0ucHBfZmVhdHVyZSAmPSB+UFBfR0ZYT0ZGX01BU0s7CisJCWJy ZWFrOworCWRlZmF1bHQ6CisJCWJyZWFrOworCX0KK30KKwogc3RhdGljIGludCBnZnhfdjlfMF9p bml0X21pY3JvY29kZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIHsKIAljb25zdCBjaGFy ICpjaGlwX25hbWU7CkBAIC04MzAsNiArODUwLDcgQEAgc3RhdGljIGludCBnZnhfdjlfMF9pbml0 X21pY3JvY29kZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIAl9CiAKIG91dDoKKwlnZnhf djlfMF9jaGVja19pZl9uZWVkX2dmeG9mZihhZGV2KTsKIAlnZnhfdjlfMF9jaGVja19md193cml0 ZV93YWl0KGFkZXYpOwogCWlmIChlcnIpIHsKIAkJZGV2X2VycihhZGV2LT5kZXYsCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL3Bvd2VycGxheS9od21nci9zbXUxMF9od21nci5jIGIv ZHJpdmVycy9ncHUvZHJtL2FtZC9wb3dlcnBsYXkvaHdtZ3Ivc211MTBfaHdtZ3IuYwppbmRleCAw YWQ4ZmU0Li5mMzJlM2QwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL3Bvd2VycGxh eS9od21nci9zbXUxMF9od21nci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvcG93ZXJwbGF5 L2h3bWdyL3NtdTEwX2h3bWdyLmMKQEAgLTExNCwxMSArMTE0LDYgQEAgc3RhdGljIGludCBzbXUx MF9pbml0aWFsaXplX2RwbV9kZWZhdWx0cyhzdHJ1Y3QgcHBfaHdtZ3IgKmh3bWdyKQogCXNtdTEw X2RhdGEtPm51bV9hY3RpdmVfZGlzcGxheSA9IDA7CiAJc211MTBfZGF0YS0+ZGVlcF9zbGVlcF9k Y2VmY2xrID0gMDsKIAotCWlmIChod21nci0+ZmVhdHVyZV9tYXNrICYgUFBfR0ZYT0ZGX01BU0sp Ci0JCXNtdTEwX2RhdGEtPmdmeF9vZmZfY29udHJvbGVkX2J5X2RyaXZlciA9IHRydWU7Ci0JZWxz ZQotCQlzbXUxMF9kYXRhLT5nZnhfb2ZmX2NvbnRyb2xlZF9ieV9kcml2ZXIgPSBmYWxzZTsKLQog CXBobV9jYXBfdW5zZXQoaHdtZ3ItPnBsYXRmb3JtX2Rlc2NyaXB0b3IucGxhdGZvcm1DYXBzLAog CQkJCQlQSE1fUGxhdGZvcm1DYXBzX1NjbGtEZWVwU2xlZXApOwogCkBAIC0zMzAsOSArMzI1LDkg QEAgc3RhdGljIGJvb2wgc211MTBfaXNfZ2Z4X29uKHN0cnVjdCBwcF9od21nciAqaHdtZ3IpCiAK IHN0YXRpYyBpbnQgc211MTBfZGlzYWJsZV9nZnhfb2ZmKHN0cnVjdCBwcF9od21nciAqaHdtZ3Ip CiB7Ci0Jc3RydWN0IHNtdTEwX2h3bWdyICpzbXUxMF9kYXRhID0gKHN0cnVjdCBzbXUxMF9od21n ciAqKShod21nci0+YmFja2VuZCk7CisJc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYgPSBod21n ci0+YWRldjsKIAotCWlmIChzbXUxMF9kYXRhLT5nZnhfb2ZmX2NvbnRyb2xlZF9ieV9kcml2ZXIp IHsKKwlpZiAoYWRldi0+cG0ucHBfZmVhdHVyZSAmIFBQX0dGWE9GRl9NQVNLKSB7CiAJCXNtdW1f c2VuZF9tc2dfdG9fc21jKGh3bWdyLCBQUFNNQ19NU0dfRGlzYWJsZUdmeE9mZik7CiAKIAkJLyog Y29uZmlybSBnZnggaXMgYmFjayB0byAib24iIHN0YXRlICovCkBAIC0zNTAsOSArMzQ1LDkgQEAg c3RhdGljIGludCBzbXUxMF9kaXNhYmxlX2RwbV90YXNrcyhzdHJ1Y3QgcHBfaHdtZ3IgKmh3bWdy KQogCiBzdGF0aWMgaW50IHNtdTEwX2VuYWJsZV9nZnhfb2ZmKHN0cnVjdCBwcF9od21nciAqaHdt Z3IpCiB7Ci0Jc3RydWN0IHNtdTEwX2h3bWdyICpzbXUxMF9kYXRhID0gKHN0cnVjdCBzbXUxMF9o d21nciAqKShod21nci0+YmFja2VuZCk7CisJc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYgPSBo d21nci0+YWRldjsKIAotCWlmIChzbXUxMF9kYXRhLT5nZnhfb2ZmX2NvbnRyb2xlZF9ieV9kcml2 ZXIpCisJaWYgKGFkZXYtPnBtLnBwX2ZlYXR1cmUgJiBQUF9HRlhPRkZfTUFTSykKIAkJc211bV9z ZW5kX21zZ190b19zbWMoaHdtZ3IsIFBQU01DX01TR19FbmFibGVHZnhPZmYpOwogCiAJcmV0dXJu IDA7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL3Bvd2VycGxheS9zbXVtZ3Ivc211 MTBfc211bWdyLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL3Bvd2VycGxheS9zbXVtZ3Ivc211MTBf c211bWdyLmMKaW5kZXggZDExMWRkNC4uNmQxMTA3NmEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9hbWQvcG93ZXJwbGF5L3NtdW1nci9zbXUxMF9zbXVtZ3IuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vYW1kL3Bvd2VycGxheS9zbXVtZ3Ivc211MTBfc211bWdyLmMKQEAgLTIxMiw2ICsyMTIs MTAgQEAgc3RhdGljIGludCBzbXUxMF9zdGFydF9zbXUoc3RydWN0IHBwX2h3bWdyICpod21ncikK IAlod21nci0+c211X3ZlcnNpb24gPSBzbXUxMF9yZWFkX2FyZ19mcm9tX3NtYyhod21ncik7CiAJ YWRldi0+cG0uZndfdmVyc2lvbiA9IGh3bWdyLT5zbXVfdmVyc2lvbiA+PiA4OwogCisJaWYgKGFk ZXYtPnJldl9pZCA8IDB4OCAmJiBhZGV2LT5wZGV2LT5kZXZpY2UgIT0gMHgxNWQ4ICYmCisJICAg IGFkZXYtPnBtLmZ3X3ZlcnNpb24gPCAweDFlNDUpCisJCWFkZXYtPnBtLnBwX2ZlYXR1cmUgJj0g flBQX0dGWE9GRl9NQVNLOworCiAJaWYgKHNtdTEwX3ZlcmlmeV9zbWNfaW50ZXJmYWNlKGh3bWdy KSkKIAkJcmV0dXJuIC1FSU5WQUw7CiAKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxp c3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2FtZC1nZng=