From: =?UTF-8?q?Christian=20K=C3=B6nig?= Subject: [PATCH 2/3] drm/amdgpu: move adjust adjust_mc_addr into the GFX9 vm_flush functions Date: Fri, 12 May 2017 15:47:59 +0200 Message-ID: <1494596880-3968-2-git-send-email-deathsimple@vodafone.de> References: <1494596880-3968-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: <1494596880-3968-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 RnJvbTogQ2hyaXN0aWFuIEvDtm5pZyA8Y2hyaXN0aWFuLmtvZW5pZ0BhbWQuY29tPgoKVGhhdCBH Rlg5IG5lZWRzIGEgUERFIGluIHRoZSByZWdpc3RlcnMgaXMgZW50aXJlbHkgR0ZYOSBzcGVjaWZp Yy4KClNpZ25lZC1vZmYtYnk6IENocmlzdGlhbiBLw7ZuaWcgPGNocmlzdGlhbi5rb2VuaWdAYW1k LmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfdm0uYyB8IDUgKyst LS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92OV8wLmMgIHwgMSArCiBkcml2ZXJz L2dwdS9kcm0vYW1kL2FtZGdwdS9zZG1hX3Y0XzAuYyB8IDEgKwogZHJpdmVycy9ncHUvZHJtL2Ft ZC9hbWRncHUvdXZkX3Y3XzAuYyAgfCAyICsrCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS92 Y2VfdjRfMC5jICB8IDEgKwogNSBmaWxlcyBjaGFuZ2VkLCA3IGluc2VydGlvbnMoKyksIDMgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1 X3ZtLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfdm0uYwppbmRleCAzZTk3 MDA0Li44ODQyMGRjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRn cHVfdm0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfdm0uYwpAQCAt NzYwLDExICs3NjAsMTAgQEAgaW50IGFtZGdwdV92bV9mbHVzaChzdHJ1Y3QgYW1kZ3B1X3Jpbmcg KnJpbmcsIHN0cnVjdCBhbWRncHVfam9iICpqb2IpCiAJCXBhdGNoX29mZnNldCA9IGFtZGdwdV9y aW5nX2luaXRfY29uZF9leGVjKHJpbmcpOwogCiAJaWYgKHJpbmctPmZ1bmNzLT5lbWl0X3ZtX2Zs dXNoICYmIHZtX2ZsdXNoX25lZWRlZCkgewotCQl1NjQgcGRfYWRkciA9IGFtZGdwdV92bV9hZGp1 c3RfbWNfYWRkcihhZGV2LCBqb2ItPnZtX3BkX2FkZHIpOwogCQlzdHJ1Y3QgZmVuY2UgKmZlbmNl OwogCi0JCXRyYWNlX2FtZGdwdV92bV9mbHVzaChyaW5nLCBqb2ItPnZtX2lkLCBwZF9hZGRyKTsK LQkJYW1kZ3B1X3JpbmdfZW1pdF92bV9mbHVzaChyaW5nLCBqb2ItPnZtX2lkLCBwZF9hZGRyKTsK KwkJdHJhY2VfYW1kZ3B1X3ZtX2ZsdXNoKHJpbmcsIGpvYi0+dm1faWQsIGpvYi0+dm1fcGRfYWRk cik7CisJCWFtZGdwdV9yaW5nX2VtaXRfdm1fZmx1c2gocmluZywgam9iLT52bV9pZCwgam9iLT52 bV9wZF9hZGRyKTsKIAogCQlyID0gYW1kZ3B1X2ZlbmNlX2VtaXQocmluZywgJmZlbmNlKTsKIAkJ aWYgKHIpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjlfMC5j IGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4X3Y5XzAuYwppbmRleCBmMzFmMmE3Li42 ZGM3NWQyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjlfMC5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92OV8wLmMKQEAgLTM3NTksNiAr Mzc1OSw3IEBAIHN0YXRpYyB2b2lkIGdmeF92OV8wX3JpbmdfZW1pdF92bV9mbHVzaChzdHJ1Y3Qg YW1kZ3B1X3JpbmcgKnJpbmcsCiAJdWludDMyX3QgcmVxID0gcmluZy0+YWRldi0+Z2FydC5nYXJ0 X2Z1bmNzLT5nZXRfaW52YWxpZGF0ZV9yZXEodm1faWQpOwogCXVuc2lnbmVkIGVuZyA9IHJpbmct PnZtX2ludl9lbmc7CiAKKwlwZF9hZGRyID0gcmluZy0+YWRldi0+Z2FydC5nYXJ0X2Z1bmNzLT5h ZGp1c3RfbWNfYWRkcihyaW5nLT5hZGV2LCBwZF9hZGRyKTsKIAlwZF9hZGRyID0gcGRfYWRkciB8 IDB4MTsgLyogdmFsaWQgYml0ICovCiAJLyogbm93IG9ubHkgdXNlIHBoeXNpY2FsIGJhc2UgYWRk cmVzcyBvZiBQREUgYW5kIHZhbGlkICovCiAJQlVHX09OKHBkX2FkZHIgJiAweEZGRkYwMDAwMDAw MDAwM0VVTEwpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvc2RtYV92 NF8wLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9zZG1hX3Y0XzAuYwppbmRleCBjM2Vl NzQ2Li45MWNmN2U2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9zZG1h X3Y0XzAuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9zZG1hX3Y0XzAuYwpAQCAt MTE0Myw2ICsxMTQzLDcgQEAgc3RhdGljIHZvaWQgc2RtYV92NF8wX3JpbmdfZW1pdF92bV9mbHVz aChzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcsCiAJdWludDMyX3QgcmVxID0gcmluZy0+YWRldi0+ Z2FydC5nYXJ0X2Z1bmNzLT5nZXRfaW52YWxpZGF0ZV9yZXEodm1faWQpOwogCXVuc2lnbmVkIGVu ZyA9IHJpbmctPnZtX2ludl9lbmc7CiAKKwlwZF9hZGRyID0gcmluZy0+YWRldi0+Z2FydC5nYXJ0 X2Z1bmNzLT5hZGp1c3RfbWNfYWRkcihyaW5nLT5hZGV2LCBwZF9hZGRyKTsKIAlwZF9hZGRyID0g cGRfYWRkciB8IDB4MTsgLyogdmFsaWQgYml0ICovCiAJLyogbm93IG9ubHkgdXNlIHBoeXNpY2Fs IGJhc2UgYWRkcmVzcyBvZiBQREUgYW5kIHZhbGlkICovCiAJQlVHX09OKHBkX2FkZHIgJiAweEZG RkYwMDAwMDAwMDAwM0VVTEwpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRn cHUvdXZkX3Y3XzAuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3V2ZF92N18wLmMKaW5k ZXggNDk5ZWFkMy4uMjJmNDJmMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRn cHUvdXZkX3Y3XzAuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS91dmRfdjdfMC5j CkBAIC0xMzE2LDYgKzEzMTYsNyBAQCBzdGF0aWMgdm9pZCB1dmRfdjdfMF9yaW5nX2VtaXRfdm1f Zmx1c2goc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nLAogCXVpbnQzMl90IGRhdGEwLCBkYXRhMSwg bWFzazsKIAl1bnNpZ25lZCBlbmcgPSByaW5nLT52bV9pbnZfZW5nOwogCisJcGRfYWRkciA9IHJp bmctPmFkZXYtPmdhcnQuZ2FydF9mdW5jcy0+YWRqdXN0X21jX2FkZHIocmluZy0+YWRldiwgcGRf YWRkcik7CiAJcGRfYWRkciA9IHBkX2FkZHIgfCAweDE7IC8qIHZhbGlkIGJpdCAqLwogCS8qIG5v dyBvbmx5IHVzZSBwaHlzaWNhbCBiYXNlIGFkZHJlc3Mgb2YgUERFIGFuZCB2YWxpZCAqLwogCUJV R19PTihwZF9hZGRyICYgMHhGRkZGMDAwMDAwMDAwMDNFVUxMKTsKQEAgLTEzNTcsNiArMTM1OCw3 IEBAIHN0YXRpYyB2b2lkIHV2ZF92N18wX2VuY19yaW5nX2VtaXRfdm1fZmx1c2goc3RydWN0IGFt ZGdwdV9yaW5nICpyaW5nLAogCXVpbnQzMl90IHJlcSA9IHJpbmctPmFkZXYtPmdhcnQuZ2FydF9m dW5jcy0+Z2V0X2ludmFsaWRhdGVfcmVxKHZtX2lkKTsKIAl1bnNpZ25lZCBlbmcgPSByaW5nLT52 bV9pbnZfZW5nOwogCisJcGRfYWRkciA9IHJpbmctPmFkZXYtPmdhcnQuZ2FydF9mdW5jcy0+YWRq dXN0X21jX2FkZHIocmluZy0+YWRldiwgcGRfYWRkcik7CiAJcGRfYWRkciA9IHBkX2FkZHIgfCAw eDE7IC8qIHZhbGlkIGJpdCAqLwogCS8qIG5vdyBvbmx5IHVzZSBwaHlzaWNhbCBiYXNlIGFkZHJl c3Mgb2YgUERFIGFuZCB2YWxpZCAqLwogCUJVR19PTihwZF9hZGRyICYgMHhGRkZGMDAwMDAwMDAw MDNFVUxMKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3ZjZV92NF8w LmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS92Y2VfdjRfMC5jCmluZGV4IGFkYTJkMGEu LjA3YjJhYzcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3ZjZV92NF8w LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvdmNlX3Y0XzAuYwpAQCAtOTI2LDYg KzkyNiw3IEBAIHN0YXRpYyB2b2lkIHZjZV92NF8wX2VtaXRfdm1fZmx1c2goc3RydWN0IGFtZGdw dV9yaW5nICpyaW5nLAogCXVpbnQzMl90IHJlcSA9IHJpbmctPmFkZXYtPmdhcnQuZ2FydF9mdW5j cy0+Z2V0X2ludmFsaWRhdGVfcmVxKHZtX2lkKTsKIAl1bnNpZ25lZCBlbmcgPSByaW5nLT52bV9p bnZfZW5nOwogCisJcGRfYWRkciA9IHJpbmctPmFkZXYtPmdhcnQuZ2FydF9mdW5jcy0+YWRqdXN0 X21jX2FkZHIocmluZy0+YWRldiwgcGRfYWRkcik7CiAJcGRfYWRkciA9IHBkX2FkZHIgfCAweDE7 IC8qIHZhbGlkIGJpdCAqLwogCS8qIG5vdyBvbmx5IHVzZSBwaHlzaWNhbCBiYXNlIGFkZHJlc3Mg b2YgUERFIGFuZCB2YWxpZCAqLwogCUJVR19PTihwZF9hZGRyICYgMHhGRkZGMDAwMDAwMDAwMDNF VUxMKTsKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9y ZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2FtZC1nZngK