From: =?UTF-8?q?Christian=20K=C3=B6nig?= Subject: [PATCH 7/8] drm/amdgpu: move adjust_mc_addr into amdgpu_gart_funcs Date: Mon, 3 Apr 2017 14:39:58 +0200 Message-ID: <1491223199-28892-7-git-send-email-deathsimple@vodafone.de> References: <1491223199-28892-1-git-send-email-deathsimple@vodafone.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1491223199-28892-1-git-send-email-deathsimple-ANTagKRnAhcb1SvskN2V4Q@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 RnJvbTogQ2hyaXN0aWFuIEvDtm5pZyA8Y2hyaXN0aWFuLmtvZW5pZ0BhbWQuY29tPgoKV2Ugc2hv dWxkIHByb2JhYmx5IHJlbmFtZSBhbWRncHVfZ2FydF9mdW5jcyBzb29uZXIgb3IgbGF0ZXIuCgpT aWduZWQtb2ZmLWJ5OiBDaHJpc3RpYW4gS8O2bmlnIDxjaHJpc3RpYW4ua29lbmlnQGFtZC5jb20+ Ci0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1LmggICAgfCAgNSAtLS0tLQog ZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3ZtLmMgfCAgNCArKy0tCiBkcml2ZXJz L2dwdS9kcm0vYW1kL2FtZGdwdS9nbWNfdjlfMC5jICB8IDIzICsrKysrKystLS0tLS0tLS0tLS0t LS0tCiAzIGZpbGVzIGNoYW5nZWQsIDkgaW5zZXJ0aW9ucygrKSwgMjMgZGVsZXRpb25zKC0pCgpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1LmggYi9kcml2ZXJz L2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHUuaAppbmRleCA4NDQzZTMwLi5jYzQzZmVlIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHUuaAorKysgYi9kcml2ZXJz L2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHUuaApAQCAtMzA2LDEwICszMDYsNiBAQCBzdHJ1Y3Qg YW1kZ3B1X2dhcnRfZnVuY3MgewogCS8qIHNldCBwdGUgZmxhZ3MgYmFzZWQgcGVyIGFzaWMgKi8K IAl1aW50NjRfdCAoKmdldF92bV9wdGVfZmxhZ3MpKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2 LAogCQkJCSAgICAgdWludDMyX3QgZmxhZ3MpOwotfTsKLQotLyogcHJvdmlkZWQgYnkgdGhlIG1j IGJsb2NrICovCi1zdHJ1Y3QgYW1kZ3B1X21jX2Z1bmNzIHsKIAkvKiBhZGp1c3QgbWMgYWRkciBp biBmYiBmb3IgQVBVIGNhc2UgKi8KIAl1NjQgKCphZGp1c3RfbWNfYWRkcikoc3RydWN0IGFtZGdw dV9kZXZpY2UgKmFkZXYsIHU2NCBhZGRyKTsKIH07CkBAIC02MTUsNyArNjExLDYgQEAgc3RydWN0 IGFtZGdwdV9tYyB7CiAJdTY0CQkJCQlwcml2YXRlX2FwZXJ0dXJlX2VuZDsKIAkvKiBwcm90ZWN0 cyBjb25jdXJyZW50IGludmFsaWRhdGlvbiAqLwogCXNwaW5sb2NrX3QJCWludmFsaWRhdGVfbG9j azsKLQljb25zdCBzdHJ1Y3QgYW1kZ3B1X21jX2Z1bmNzICptY19mdW5jczsKIH07CiAKIC8qCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfdm0uYyBiL2RyaXZl cnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV92bS5jCmluZGV4IGNiYjViMjUuLmZjNWVlMTEg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV92bS5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV92bS5jCkBAIC01NzEsOCArNTcxLDgg QEAgc3RhdGljIHU2NCBhbWRncHVfdm1fYWRqdXN0X21jX2FkZHIoc3RydWN0IGFtZGdwdV9kZXZp Y2UgKmFkZXYsIHU2NCBtY19hZGRyKQogewogCXU2NCBhZGRyID0gbWNfYWRkcjsKIAotCWlmIChh ZGV2LT5tYy5tY19mdW5jcyAmJiBhZGV2LT5tYy5tY19mdW5jcy0+YWRqdXN0X21jX2FkZHIpCi0J CWFkZHIgPSBhZGV2LT5tYy5tY19mdW5jcy0+YWRqdXN0X21jX2FkZHIoYWRldiwgYWRkcik7CisJ aWYgKGFkZXYtPmdhcnQuZ2FydF9mdW5jcy0+YWRqdXN0X21jX2FkZHIpCisJCWFkZHIgPSBhZGV2 LT5nYXJ0LmdhcnRfZnVuY3MtPmFkanVzdF9tY19hZGRyKGFkZXYsIGFkZHIpOwogCiAJcmV0dXJu IGFkZHI7CiB9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nbWNfdjlf MC5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ21jX3Y5XzAuYwppbmRleCA4ZGQ5OWIy Li4yNjhjZWRiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nbWNfdjlf MC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dtY192OV8wLmMKQEAgLTMzMSwz MCArMzMxLDIyIEBAIHN0YXRpYyB1aW50NjRfdCBnbWNfdjlfMF9nZXRfdm1fcHRlX2ZsYWdzKHN0 cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LAogCXJldHVybiBwdGVfZmxhZzsKIH0KIAotc3RhdGlj IGNvbnN0IHN0cnVjdCBhbWRncHVfZ2FydF9mdW5jcyBnbWNfdjlfMF9nYXJ0X2Z1bmNzID0gewot CS5mbHVzaF9ncHVfdGxiID0gZ21jX3Y5XzBfZ2FydF9mbHVzaF9ncHVfdGxiLAotCS5zZXRfcHRl X3BkZSA9IGdtY192OV8wX2dhcnRfc2V0X3B0ZV9wZGUsCi0JLmdldF92bV9wdGVfZmxhZ3MgPSBn bWNfdjlfMF9nZXRfdm1fcHRlX2ZsYWdzCi19OwotCi1zdGF0aWMgdm9pZCBnbWNfdjlfMF9zZXRf Z2FydF9mdW5jcyhzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKLXsKLQlpZiAoYWRldi0+Z2Fy dC5nYXJ0X2Z1bmNzID09IE5VTEwpCi0JCWFkZXYtPmdhcnQuZ2FydF9mdW5jcyA9ICZnbWNfdjlf MF9nYXJ0X2Z1bmNzOwotfQotCiBzdGF0aWMgdTY0IGdtY192OV8wX2FkanVzdF9tY19hZGRyKHN0 cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LCB1NjQgbWNfYWRkcikKIHsKIAlyZXR1cm4gYWRldi0+ dm1fbWFuYWdlci52cmFtX2Jhc2Vfb2Zmc2V0ICsgbWNfYWRkciAtIGFkZXYtPm1jLnZyYW1fc3Rh cnQ7CiB9CiAKLXN0YXRpYyBjb25zdCBzdHJ1Y3QgYW1kZ3B1X21jX2Z1bmNzIGdtY192OV8wX21j X2Z1bmNzID0geworc3RhdGljIGNvbnN0IHN0cnVjdCBhbWRncHVfZ2FydF9mdW5jcyBnbWNfdjlf MF9nYXJ0X2Z1bmNzID0geworCS5mbHVzaF9ncHVfdGxiID0gZ21jX3Y5XzBfZ2FydF9mbHVzaF9n cHVfdGxiLAorCS5zZXRfcHRlX3BkZSA9IGdtY192OV8wX2dhcnRfc2V0X3B0ZV9wZGUsCisJLmdl dF92bV9wdGVfZmxhZ3MgPSBnbWNfdjlfMF9nZXRfdm1fcHRlX2ZsYWdzLAogCS5hZGp1c3RfbWNf YWRkciA9IGdtY192OV8wX2FkanVzdF9tY19hZGRyLAogfTsKIAotc3RhdGljIHZvaWQgZ21jX3Y5 XzBfc2V0X21jX2Z1bmNzKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQorc3RhdGljIHZvaWQg Z21jX3Y5XzBfc2V0X2dhcnRfZnVuY3Moc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiB7Ci0J YWRldi0+bWMubWNfZnVuY3MgPSAmZ21jX3Y5XzBfbWNfZnVuY3M7CisJaWYgKGFkZXYtPmdhcnQu Z2FydF9mdW5jcyA9PSBOVUxMKQorCQlhZGV2LT5nYXJ0LmdhcnRfZnVuY3MgPSAmZ21jX3Y5XzBf Z2FydF9mdW5jczsKIH0KIAogc3RhdGljIGludCBnbWNfdjlfMF9lYXJseV9pbml0KHZvaWQgKmhh bmRsZSkKQEAgLTM2Miw3ICszNTQsNiBAQCBzdGF0aWMgaW50IGdtY192OV8wX2Vhcmx5X2luaXQo dm9pZCAqaGFuZGxlKQogCXN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2ID0gKHN0cnVjdCBhbWRn cHVfZGV2aWNlICopaGFuZGxlOwogCiAJZ21jX3Y5XzBfc2V0X2dhcnRfZnVuY3MoYWRldik7Ci0J Z21jX3Y5XzBfc2V0X21jX2Z1bmNzKGFkZXYpOwogCWdtY192OV8wX3NldF9pcnFfZnVuY3MoYWRl dik7CiAKIAlyZXR1cm4gMDsKLS0gCjIuNS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZy ZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2FtZC1nZngK