From mboxrd@z Thu Jan  1 00:00:00 1970
From: "=?UTF-8?q?Christian=20K=C3=B6nig?=" <ckoenig.leichtzumerken-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Subject: [PATCH 2/3] drm/amdgpu: fix and cleanup cpu visible VRAM handling
Date: Mon,  9 Apr 2018 12:18:59 +0200
Message-ID: <20180409101900.2790-2-christian.koenig@amd.com>
References: <20180409101900.2790-1-christian.koenig@amd.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org>
In-Reply-To: <20180409101900.2790-1-christian.koenig-5C7GfCeVMHo@public.gmane.org>
List-Id: Discussion list for AMD gfx <amd-gfx.lists.freedesktop.org>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/amd-gfx>,
 <mailto:amd-gfx-request-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/amd-gfx>
List-Post: <mailto:amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org>
List-Help: <mailto:amd-gfx-request-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/amd-gfx>,
 <mailto:amd-gfx-request-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org?subject=subscribe>
Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
Sender: "amd-gfx" <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org>
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org

VGhlIGRldGVjdGlvbiBpZiBhIEJPIHdhcyBwbGFjZWQgaW4gQ1BVIHZpc2libGUgVlJBTSB3YXMg
aW5jb3JyZWN0LgoKRml4IGl0IGFuZCBtZXJnZSBpdCB3aXRoIHRoZSBjb3JyZWN0IGRldGVjdGlv
biBpbiBhbWRncHVfdHRtLmMKClNpZ25lZC1vZmYtYnk6IENocmlzdGlhbiBLw7ZuaWcgPGNocmlz
dGlhbi5rb2VuaWdAYW1kLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRn
cHVfY3MuYyAgICAgfCAgNiArKy0tLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdw
dV9vYmplY3QuaCB8IDIxICsrKysrKysrKysrKysrKysrKysrKwogZHJpdmVycy9ncHUvZHJtL2Ft
ZC9hbWRncHUvYW1kZ3B1X3R0bS5jICAgIHwgMTkgKysrLS0tLS0tLS0tLS0tLS0tLQogMyBmaWxl
cyBjaGFuZ2VkLCAyNiBpbnNlcnRpb25zKCspLCAyMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg
YS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfY3MuYyBiL2RyaXZlcnMvZ3B1L2Ry
bS9hbWQvYW1kZ3B1L2FtZGdwdV9jcy5jCmluZGV4IGRlNjlhYjEyYmI1NS4uNjhhZjJmODc4YmM5
IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfY3MuYworKysg
Yi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfY3MuYwpAQCAtMzgyLDggKzM4Miw3
IEBAIHN0YXRpYyBpbnQgYW1kZ3B1X2NzX2JvX3ZhbGlkYXRlKHN0cnVjdCBhbWRncHVfY3NfcGFy
c2VyICpwLAogCiAJcC0+Ynl0ZXNfbW92ZWQgKz0gY3R4LmJ5dGVzX21vdmVkOwogCWlmIChhZGV2
LT5nbWMudmlzaWJsZV92cmFtX3NpemUgPCBhZGV2LT5nbWMucmVhbF92cmFtX3NpemUgJiYKLQkg
ICAgYm8tPnRiby5tZW0ubWVtX3R5cGUgPT0gVFRNX1BMX1ZSQU0gJiYKLQkgICAgYm8tPnRiby5t
ZW0uc3RhcnQgPCBhZGV2LT5nbWMudmlzaWJsZV92cmFtX3NpemUgPj4gUEFHRV9TSElGVCkKKwkg
ICAgYW1kZ3B1X2JvX2luX2NwdV92aXNpYmxlX3ZyYW0oYm8pKQogCQlwLT5ieXRlc19tb3ZlZF92
aXMgKz0gY3R4LmJ5dGVzX21vdmVkOwogCiAJaWYgKHVubGlrZWx5KHIgPT0gLUVOT01FTSkgJiYg
ZG9tYWluICE9IGJvLT5hbGxvd2VkX2RvbWFpbnMgJiYKQEAgLTQzNyw4ICs0MzYsNyBAQCBzdGF0
aWMgYm9vbCBhbWRncHVfY3NfdHJ5X2V2aWN0KHN0cnVjdCBhbWRncHVfY3NfcGFyc2VyICpwLAog
CQkvKiBHb29kIHdlIGNhbiB0cnkgdG8gbW92ZSB0aGlzIEJPIHNvbWV3aGVyZSBlbHNlICovCiAJ
CXVwZGF0ZV9ieXRlc19tb3ZlZF92aXMgPQogCQkJYWRldi0+Z21jLnZpc2libGVfdnJhbV9zaXpl
IDwgYWRldi0+Z21jLnJlYWxfdnJhbV9zaXplICYmCi0JCQliby0+dGJvLm1lbS5tZW1fdHlwZSA9
PSBUVE1fUExfVlJBTSAmJgotCQkJYm8tPnRiby5tZW0uc3RhcnQgPCBhZGV2LT5nbWMudmlzaWJs
ZV92cmFtX3NpemUgPj4gUEFHRV9TSElGVDsKKwkJCWFtZGdwdV9ib19pbl9jcHVfdmlzaWJsZV92
cmFtKGJvKTsKIAkJYW1kZ3B1X3R0bV9wbGFjZW1lbnRfZnJvbV9kb21haW4oYm8sIG90aGVyKTsK
IAkJciA9IHR0bV9ib192YWxpZGF0ZSgmYm8tPnRibywgJmJvLT5wbGFjZW1lbnQsICZjdHgpOwog
CQlwLT5ieXRlc19tb3ZlZCArPSBjdHguYnl0ZXNfbW92ZWQ7CmRpZmYgLS1naXQgYS9kcml2ZXJz
L2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfb2JqZWN0LmggYi9kcml2ZXJzL2dwdS9kcm0vYW1k
L2FtZGdwdS9hbWRncHVfb2JqZWN0LmgKaW5kZXggZGViMTBlY2Q4OWExLi4wZTk1NTU1MjY5NTAg
MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9vYmplY3QuaAor
KysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfb2JqZWN0LmgKQEAgLTE5Myw2
ICsxOTMsMjcgQEAgc3RhdGljIGlubGluZSBib29sIGFtZGdwdV9ib19ncHVfYWNjZXNzaWJsZShz
dHJ1Y3QgYW1kZ3B1X2JvICpibykKIAl9CiB9CiAKKy8qKgorICogYW1kZ3B1X2JvX2luX2NwdV92
aXNpYmxlX3ZyYW0gLSBjaGVjayBpZiBCTyBpcyAocGFydGx5KSBpbiB2aXNpYmxlIFZSQU0KKyAq
Lworc3RhdGljIGlubGluZSBib29sIGFtZGdwdV9ib19pbl9jcHVfdmlzaWJsZV92cmFtKHN0cnVj
dCBhbWRncHVfYm8gKmJvKQoreworCXN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2ID0gYW1kZ3B1
X3R0bV9hZGV2KGJvLT50Ym8uYmRldik7CisJdW5zaWduZWQgZnBmbiA9IGFkZXYtPmdtYy52aXNp
YmxlX3ZyYW1fc2l6ZSA+PiBQQUdFX1NISUZUOworCXN0cnVjdCBkcm1fbW1fbm9kZSAqbm9kZSA9
IGJvLT50Ym8ubWVtLm1tX25vZGU7CisJdW5zaWduZWQgbG9uZyBwYWdlc19sZWZ0OworCisJaWYg
KGJvLT50Ym8ubWVtLm1lbV90eXBlICE9IFRUTV9QTF9WUkFNKQorCQlyZXR1cm4gZmFsc2U7CisK
Kwlmb3IgKHBhZ2VzX2xlZnQgPSBiby0+dGJvLm1lbS5udW1fcGFnZXM7IHBhZ2VzX2xlZnQ7CisJ
ICAgICBwYWdlc19sZWZ0IC09IG5vZGUtPnNpemUsIG5vZGUrKykKKwkJaWYgKG5vZGUtPnN0YXJ0
IDwgZnBmbikKKwkJCXJldHVybiB0cnVlOworCisJcmV0dXJuIGZhbHNlOworfQorCiAvKioKICAq
IGFtZGdwdV9ib19leHBsaWNpdF9zeW5jIC0gcmV0dXJuIHdoZXRoZXIgdGhlIGJvIGlzIGV4cGxp
Y2l0bHkgc3luY2VkCiAgKi8KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1
L2FtZGdwdV90dG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV90dG0uYwpp
bmRleCBkMmFiNDA0OTRhNGMuLmFiODI5ZmIzZTg0MCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv
ZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3R0bS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1k
Z3B1L2FtZGdwdV90dG0uYwpAQCAtMjIyLDIwICsyMjIsOCBAQCBzdGF0aWMgdm9pZCBhbWRncHVf
ZXZpY3RfZmxhZ3Moc3RydWN0IHR0bV9idWZmZXJfb2JqZWN0ICpibywKIAkJaWYgKCFhZGV2LT5t
bWFuLmJ1ZmZlcl9mdW5jc19lbmFibGVkKSB7CiAJCQlhbWRncHVfdHRtX3BsYWNlbWVudF9mcm9t
X2RvbWFpbihhYm8sIEFNREdQVV9HRU1fRE9NQUlOX0NQVSk7CiAJCX0gZWxzZSBpZiAoYWRldi0+
Z21jLnZpc2libGVfdnJhbV9zaXplIDwgYWRldi0+Z21jLnJlYWxfdnJhbV9zaXplICYmCi0JCQkg
ICAhKGFiby0+ZmxhZ3MgJiBBTURHUFVfR0VNX0NSRUFURV9DUFVfQUNDRVNTX1JFUVVJUkVEKSkg
ewotCQkJdW5zaWduZWQgZnBmbiA9IGFkZXYtPmdtYy52aXNpYmxlX3ZyYW1fc2l6ZSA+PiBQQUdF
X1NISUZUOwotCQkJc3RydWN0IGRybV9tbV9ub2RlICpub2RlID0gYm8tPm1lbS5tbV9ub2RlOwot
CQkJdW5zaWduZWQgbG9uZyBwYWdlc19sZWZ0OwotCi0JCQlmb3IgKHBhZ2VzX2xlZnQgPSBiby0+
bWVtLm51bV9wYWdlczsKLQkJCSAgICAgcGFnZXNfbGVmdDsKLQkJCSAgICAgcGFnZXNfbGVmdCAt
PSBub2RlLT5zaXplLCBub2RlKyspIHsKLQkJCQlpZiAobm9kZS0+c3RhcnQgPCBmcGZuKQotCQkJ
CQlicmVhazsKLQkJCX0KLQotCQkJaWYgKCFwYWdlc19sZWZ0KQotCQkJCWdvdG8gZ3R0OworCQkJ
ICAgIShhYm8tPmZsYWdzICYgQU1ER1BVX0dFTV9DUkVBVEVfQ1BVX0FDQ0VTU19SRVFVSVJFRCkg
JiYKKwkJCSAgIGFtZGdwdV9ib19pbl9jcHVfdmlzaWJsZV92cmFtKGFibykpIHsKIAogCQkJLyog
VHJ5IGV2aWN0aW5nIHRvIHRoZSBDUFUgaW5hY2Nlc3NpYmxlIHBhcnQgb2YgVlJBTQogCQkJICog
Zmlyc3QsIGJ1dCBvbmx5IHNldCBHVFQgYXMgYnVzeSBwbGFjZW1lbnQsIHNvIHRoaXMKQEAgLTI0
NCwxMiArMjMyLDExIEBAIHN0YXRpYyB2b2lkIGFtZGdwdV9ldmljdF9mbGFncyhzdHJ1Y3QgdHRt
X2J1ZmZlcl9vYmplY3QgKmJvLAogCQkJICovCiAJCQlhbWRncHVfdHRtX3BsYWNlbWVudF9mcm9t
X2RvbWFpbihhYm8sIEFNREdQVV9HRU1fRE9NQUlOX1ZSQU0gfAogCQkJCQkJCSBBTURHUFVfR0VN
X0RPTUFJTl9HVFQpOwotCQkJYWJvLT5wbGFjZW1lbnRzWzBdLmZwZm4gPSBmcGZuOworCQkJYWJv
LT5wbGFjZW1lbnRzWzBdLmZwZm4gPSBhZGV2LT5nbWMudmlzaWJsZV92cmFtX3NpemUgPj4gUEFH
RV9TSElGVDsKIAkJCWFiby0+cGxhY2VtZW50c1swXS5scGZuID0gMDsKIAkJCWFiby0+cGxhY2Vt
ZW50LmJ1c3lfcGxhY2VtZW50ID0gJmFiby0+cGxhY2VtZW50c1sxXTsKIAkJCWFiby0+cGxhY2Vt
ZW50Lm51bV9idXN5X3BsYWNlbWVudCA9IDE7CiAJCX0gZWxzZSB7Ci1ndHQ6CiAJCQlhbWRncHVf
dHRtX3BsYWNlbWVudF9mcm9tX2RvbWFpbihhYm8sIEFNREdQVV9HRU1fRE9NQUlOX0dUVCk7CiAJ
CX0KIAkJYnJlYWs7Ci0tIAoyLjE0LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fCmFtZC1nZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJlZWRl
c2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8v
YW1kLWdmeAo=