From: Alex Deucher Subject: [PATCH 2/5] drm/amdgpu: unify some atombios/atomfirmware scratch reg functions Date: Fri, 30 Jun 2017 17:32:36 -0400 Message-ID: <1498858359-11352-2-git-send-email-alexander.deucher@amd.com> References: <1498858359-11352-1-git-send-email-alexander.deucher@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1498858359-11352-1-git-send-email-alexander.deucher-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 Cc: Alex Deucher Tm93IHRoYXQgd2UgdXNlIGEgcG9pbnRlciB0byB0aGUgc2NyYXRjaCByZWcgc3RhcnQgb2Zmc2V0 LAptb3N0IG9mIHRoZSBmdW5jdGlvbnMgd2VyZSBkdXBsaWNhdGVkLgoKU2lnbmVkLW9mZi1ieTog QWxleCBEZXVjaGVyIDxhbGV4YW5kZXIuZGV1Y2hlckBhbWQuY29tPgotLS0KIGRyaXZlcnMvZ3B1 L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9hdG9tZmlybXdhcmUuYyB8IDM1IC0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2F0b21maXJtd2Fy ZS5oIHwgIDQgLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZGV2aWNlLmMg ICAgICAgfCAyMCArKystLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvc29j MTUuYyAgICAgICAgICAgICAgIHwgIDYgKystLQogNCBmaWxlcyBjaGFuZ2VkLCA3IGluc2VydGlv bnMoKyksIDU4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQv YW1kZ3B1L2FtZGdwdV9hdG9tZmlybXdhcmUuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1 L2FtZGdwdV9hdG9tZmlybXdhcmUuYwppbmRleCA0YmRkYTU2Li45ZGRmZTM0IDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfYXRvbWZpcm13YXJlLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2F0b21maXJtd2FyZS5jCkBAIC02Niw0 MSArNjYsNiBAQCB2b2lkIGFtZGdwdV9hdG9tZmlybXdhcmVfc2NyYXRjaF9yZWdzX2luaXQoc3Ry dWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAJfQogfQogCi12b2lkIGFtZGdwdV9hdG9tZmlybXdh cmVfc2NyYXRjaF9yZWdzX3NhdmUoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCi17Ci0JaW50 IGk7Ci0KLQlmb3IgKGkgPSAwOyBpIDwgQU1ER1BVX0JJT1NfTlVNX1NDUkFUQ0g7IGkrKykKLQkJ YWRldi0+Ymlvc19zY3JhdGNoW2ldID0gUlJFRzMyKGFkZXYtPmJpb3Nfc2NyYXRjaF9yZWdfb2Zm c2V0ICsgaSk7Ci19Ci0KLXZvaWQgYW1kZ3B1X2F0b21maXJtd2FyZV9zY3JhdGNoX3JlZ3NfcmVz dG9yZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKLXsKLQlpbnQgaTsKLQotCS8qCi0JICog VkJJT1Mgd2lsbCBjaGVjayBBU0lDX0lOSVRfQ09NUExFVEUgYml0IHRvIGRlY2lkZSBpZgotCSAq IGV4ZWN1dGUgQVNJQ19Jbml0IHBvc3RpbmcgdmlhIGRyaXZlcgotCSAqLwotCWFkZXYtPmJpb3Nf c2NyYXRjaFs3XSAmPSB+QVRPTV9TN19BU0lDX0lOSVRfQ09NUExFVEVfTUFTSzsKLQotCWZvciAo aSA9IDA7IGkgPCBBTURHUFVfQklPU19OVU1fU0NSQVRDSDsgaSsrKQotCQlXUkVHMzIoYWRldi0+ Ymlvc19zY3JhdGNoX3JlZ19vZmZzZXQgKyBpLCBhZGV2LT5iaW9zX3NjcmF0Y2hbaV0pOwotfQot Ci12b2lkIGFtZGdwdV9hdG9tZmlybXdhcmVfc2NyYXRjaF9yZWdzX2VuZ2luZV9odW5nKHN0cnVj dCBhbWRncHVfZGV2aWNlICphZGV2LAotCQkJCQkJICBib29sIGh1bmcpCi17Ci0JdTMyIHRtcCA9 IFJSRUczMihhZGV2LT5iaW9zX3NjcmF0Y2hfcmVnX29mZnNldCArIDMpOwotCi0JaWYgKGh1bmcp Ci0JCXRtcCB8PSBBVE9NX1MzX0FTSUNfR1VJX0VOR0lORV9IVU5HOwotCWVsc2UKLQkJdG1wICY9 IH5BVE9NX1MzX0FTSUNfR1VJX0VOR0lORV9IVU5HOwotCi0JV1JFRzMyKGFkZXYtPmJpb3Nfc2Ny YXRjaF9yZWdfb2Zmc2V0ICsgMywgdG1wKTsKLX0KLQogaW50IGFtZGdwdV9hdG9tZmlybXdhcmVf YWxsb2NhdGVfZmJfc2NyYXRjaChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIHsKIAlzdHJ1 Y3QgYXRvbV9jb250ZXh0ICpjdHggPSBhZGV2LT5tb2RlX2luZm8uYXRvbV9jb250ZXh0OwpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2F0b21maXJtd2FyZS5o IGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2F0b21maXJtd2FyZS5oCmluZGV4 IGEyYzNlYmUuLjkwN2U0OGY2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdw dS9hbWRncHVfYXRvbWZpcm13YXJlLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUv YW1kZ3B1X2F0b21maXJtd2FyZS5oCkBAIC0yNiwxMCArMjYsNiBAQAogCiBib29sIGFtZGdwdV9h dG9tZmlybXdhcmVfZ3B1X3N1cHBvcnRzX3ZpcnR1YWxpemF0aW9uKHN0cnVjdCBhbWRncHVfZGV2 aWNlICphZGV2KTsKIHZvaWQgYW1kZ3B1X2F0b21maXJtd2FyZV9zY3JhdGNoX3JlZ3NfaW5pdChz dHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldik7Ci12b2lkIGFtZGdwdV9hdG9tZmlybXdhcmVfc2Ny YXRjaF9yZWdzX3NhdmUoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpOwotdm9pZCBhbWRncHVf YXRvbWZpcm13YXJlX3NjcmF0Y2hfcmVnc19yZXN0b3JlKHN0cnVjdCBhbWRncHVfZGV2aWNlICph ZGV2KTsKLXZvaWQgYW1kZ3B1X2F0b21maXJtd2FyZV9zY3JhdGNoX3JlZ3NfZW5naW5lX2h1bmco c3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsCi0JCQkJCQkgIGJvb2wgaHVuZyk7CiBpbnQgYW1k Z3B1X2F0b21maXJtd2FyZV9hbGxvY2F0ZV9mYl9zY3JhdGNoKHN0cnVjdCBhbWRncHVfZGV2aWNl ICphZGV2KTsKIAogI2VuZGlmCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdw dS9hbWRncHVfZGV2aWNlLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZGV2 aWNlLmMKaW5kZXggNWIxMjIwZi4uNjNmNGJlZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2FtZC9hbWRncHUvYW1kZ3B1X2RldmljZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1k Z3B1L2FtZGdwdV9kZXZpY2UuYwpAQCAtMjQzOCwxMCArMjQzOCw3IEBAIGludCBhbWRncHVfZGV2 aWNlX3N1c3BlbmQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgYm9vbCBzdXNwZW5kLCBib29sIGZi Y29uKQogCSAqLwogCWFtZGdwdV9ib19ldmljdF92cmFtKGFkZXYpOwogCi0JaWYgKGFkZXYtPmlz X2F0b21fZncpCi0JCWFtZGdwdV9hdG9tZmlybXdhcmVfc2NyYXRjaF9yZWdzX3NhdmUoYWRldik7 Ci0JZWxzZQotCQlhbWRncHVfYXRvbWJpb3Nfc2NyYXRjaF9yZWdzX3NhdmUoYWRldik7CisJYW1k Z3B1X2F0b21iaW9zX3NjcmF0Y2hfcmVnc19zYXZlKGFkZXYpOwogCXBjaV9zYXZlX3N0YXRlKGRl di0+cGRldik7CiAJaWYgKHN1c3BlbmQpIHsKIAkJLyogU2h1dCBkb3duIHRoZSBkZXZpY2UgKi8K QEAgLTI0OTAsMTAgKzI0ODcsNyBAQCBpbnQgYW1kZ3B1X2RldmljZV9yZXN1bWUoc3RydWN0IGRy bV9kZXZpY2UgKmRldiwgYm9vbCByZXN1bWUsIGJvb2wgZmJjb24pCiAJCWlmIChyKQogCQkJZ290 byB1bmxvY2s7CiAJfQotCWlmIChhZGV2LT5pc19hdG9tX2Z3KQotCQlhbWRncHVfYXRvbWZpcm13 YXJlX3NjcmF0Y2hfcmVnc19yZXN0b3JlKGFkZXYpOwotCWVsc2UKLQkJYW1kZ3B1X2F0b21iaW9z X3NjcmF0Y2hfcmVnc19yZXN0b3JlKGFkZXYpOworCWFtZGdwdV9hdG9tYmlvc19zY3JhdGNoX3Jl Z3NfcmVzdG9yZShhZGV2KTsKIAogCS8qIHBvc3QgY2FyZCAqLwogCWlmIChhbWRncHVfbmVlZF9w b3N0KGFkZXYpKSB7CkBAIC0yOTI2LDE1ICsyOTIwLDkgQEAgaW50IGFtZGdwdV9ncHVfcmVzZXQo c3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAJCXIgPSBhbWRncHVfc3VzcGVuZChhZGV2KTsK IAogcmV0cnk6Ci0JCWlmIChhZGV2LT5pc19hdG9tX2Z3KQotCQkJYW1kZ3B1X2F0b21maXJtd2Fy ZV9zY3JhdGNoX3JlZ3Nfc2F2ZShhZGV2KTsKLQkJZWxzZQotCQkJYW1kZ3B1X2F0b21iaW9zX3Nj cmF0Y2hfcmVnc19zYXZlKGFkZXYpOworCQlhbWRncHVfYXRvbWJpb3Nfc2NyYXRjaF9yZWdzX3Nh dmUoYWRldik7CiAJCXIgPSBhbWRncHVfYXNpY19yZXNldChhZGV2KTsKLQkJaWYgKGFkZXYtPmlz X2F0b21fZncpCi0JCQlhbWRncHVfYXRvbWZpcm13YXJlX3NjcmF0Y2hfcmVnc19yZXN0b3JlKGFk ZXYpOwotCQllbHNlCi0JCQlhbWRncHVfYXRvbWJpb3Nfc2NyYXRjaF9yZWdzX3Jlc3RvcmUoYWRl dik7CisJCWFtZGdwdV9hdG9tYmlvc19zY3JhdGNoX3JlZ3NfcmVzdG9yZShhZGV2KTsKIAkJLyog cG9zdCBjYXJkICovCiAJCWFtZGdwdV9hdG9tX2FzaWNfaW5pdChhZGV2LT5tb2RlX2luZm8uYXRv bV9jb250ZXh0KTsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvc29j MTUuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3NvYzE1LmMKaW5kZXggOTIxMDEyNi4u OGE0Yjc2ZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvc29jMTUuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9zb2MxNS5jCkBAIC0yNSw3ICsyNSw3IEBA CiAjaW5jbHVkZSA8bGludXgvbW9kdWxlLmg+CiAjaW5jbHVkZSAiZHJtUC5oIgogI2luY2x1ZGUg ImFtZGdwdS5oIgotI2luY2x1ZGUgImFtZGdwdV9hdG9tZmlybXdhcmUuaCIKKyNpbmNsdWRlICJh bWRncHVfYXRvbWJpb3MuaCIKICNpbmNsdWRlICJhbWRncHVfaWguaCIKICNpbmNsdWRlICJhbWRn cHVfdXZkLmgiCiAjaW5jbHVkZSAiYW1kZ3B1X3ZjZS5oIgpAQCAtMzkyLDExICszOTIsMTEgQEAg c3RhdGljIHZvaWQgc29jMTVfZ3B1X3BjaV9jb25maWdfcmVzZXQoc3RydWN0IGFtZGdwdV9kZXZp Y2UgKmFkZXYpCiAKIHN0YXRpYyBpbnQgc29jMTVfYXNpY19yZXNldChzdHJ1Y3QgYW1kZ3B1X2Rl dmljZSAqYWRldikKIHsKLQlhbWRncHVfYXRvbWZpcm13YXJlX3NjcmF0Y2hfcmVnc19lbmdpbmVf aHVuZyhhZGV2LCB0cnVlKTsKKwlhbWRncHVfYXRvbWJpb3Nfc2NyYXRjaF9yZWdzX2VuZ2luZV9o dW5nKGFkZXYsIHRydWUpOwogCiAJc29jMTVfZ3B1X3BjaV9jb25maWdfcmVzZXQoYWRldik7CiAK LQlhbWRncHVfYXRvbWZpcm13YXJlX3NjcmF0Y2hfcmVnc19lbmdpbmVfaHVuZyhhZGV2LCBmYWxz ZSk7CisJYW1kZ3B1X2F0b21iaW9zX3NjcmF0Y2hfcmVnc19lbmdpbmVfaHVuZyhhZGV2LCBmYWxz ZSk7CiAKIAlyZXR1cm4gMDsKIH0KLS0gCjIuNS41CgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3Rz LmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xp c3RpbmZvL2FtZC1nZngK