From: Felix Kuehling Subject: [PATCH 4/6] drm/amdgpu: separate BO from GEM object Date: Thu, 6 Jul 2017 16:16:25 -0400 Message-ID: <1499372187-18375-5-git-send-email-Felix.Kuehling@amd.com> References: <1499372187-18375-1-git-send-email-Felix.Kuehling@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1499372187-18375-1-git-send-email-Felix.Kuehling-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: =?UTF-8?q?Christian=20K=C3=B6nig?= RnJvbTogQ2hyaXN0aWFuIEvDtm5pZyA8Y2hyaXN0aWFuLmtvZW5pZ0BhbWQuY29tPgoKVGhpcyBh bGxvd3MgdXMgdG8gaGF2ZSBtdWx0aXBsZSBHRU0gb2JqZWN0cyBmb3Igb25lIEJPLgoKU2lnbmVk LW9mZi1ieTogQ2hyaXN0aWFuIEvDtm5pZyA8Y2hyaXN0aWFuLmtvZW5pZ0BhbWQuY29tPgpSZXZp ZXdlZC1ieTogRmVsaXggS3VlaGxpbmcgPEZlbGl4Lkt1ZWhsaW5nQGFtZC5jb20+Ci0tLQogZHJp dmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1LmggICAgICAgIHwgMTIgKysrKysrKy0tCiBk cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZ2VtLmMgICAgfCA0MSArKysrKysrKysr KysrKysrKysrKysrKy0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9v YmplY3QuYyB8ICA3ICstLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfcHJp bWUuYyAgfCAyMCArKysrKysrKysrKysrKy0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2Ft ZGdwdV90dG0uYyAgICB8IDE3ICsrKysrKysrKysrLS0KIDUgZmlsZXMgY2hhbmdlZCwgNzcgaW5z ZXJ0aW9ucygrKSwgMjAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2FtZC9hbWRncHUvYW1kZ3B1LmggYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHUu aAppbmRleCAyMTI5ZmJiLi5mM2Q5OWNiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1k L2FtZGdwdS9hbWRncHUuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHUu aApAQCAtNDE0LDYgKzQxNCwxMiBAQCBzdHJ1Y3QgYW1kZ3B1X2JvX3ZhIHsKIAogI2RlZmluZSBB TURHUFVfR0VNX0RPTUFJTl9NQVgJCTB4MwogCitzdHJ1Y3QgYW1kZ3B1X2dlbV9vYmplY3Qgewor CXN0cnVjdCBkcm1fZ2VtX29iamVjdAkJYmFzZTsKKwlzdHJ1Y3QgbGlzdF9oZWFkCQlsaXN0Owor CXN0cnVjdCBhbWRncHVfYm8JCSpibzsKK307CisKIHN0cnVjdCBhbWRncHVfYm8gewogCS8qIFBy b3RlY3RlZCBieSB0Ym8ucmVzZXJ2ZWQgKi8KIAl1MzIJCQkJcHJlZmVyZWRfZG9tYWluczsKQEAg LTQzMCwxMiArNDM2LDE0IEBAIHN0cnVjdCBhbWRncHVfYm8gewogCXZvaWQJCQkJKm1ldGFkYXRh OwogCXUzMgkJCQltZXRhZGF0YV9zaXplOwogCXVuc2lnbmVkCQkJcHJpbWVfc2hhcmVkX2NvdW50 OworCS8qIEdFTSBvYmplY3RzIHJlZmVyZWluZyB0byB0aGlzIEJPICovCisJc3RydWN0IGxpc3Rf aGVhZAlnZW1fb2JqZWN0czsKKwogCS8qIGxpc3Qgb2YgYWxsIHZpcnR1YWwgYWRkcmVzcyB0byB3 aGljaCB0aGlzIGJvCiAJICogaXMgYXNzb2NpYXRlZCB0bwogCSAqLwogCXN0cnVjdCBsaXN0X2hl YWQJCXZhOwogCS8qIENvbnN0YW50IGFmdGVyIGluaXRpYWxpemF0aW9uICovCi0Jc3RydWN0IGRy bV9nZW1fb2JqZWN0CQlnZW1fYmFzZTsKIAlzdHJ1Y3QgYW1kZ3B1X2JvCQkqcGFyZW50OwogCXN0 cnVjdCBhbWRncHVfYm8JCSpzaGFkb3c7CiAKQEAgLTQ0NCw3ICs0NTIsNyBAQCBzdHJ1Y3QgYW1k Z3B1X2JvIHsKIAlzdHJ1Y3QgbGlzdF9oZWFkCQltbl9saXN0OwogCXN0cnVjdCBsaXN0X2hlYWQJ CXNoYWRvd19saXN0OwogfTsKLSNkZWZpbmUgZ2VtX3RvX2FtZGdwdV9ibyhnb2JqKSBjb250YWlu ZXJfb2YoKGdvYmopLCBzdHJ1Y3QgYW1kZ3B1X2JvLCBnZW1fYmFzZSkKKyNkZWZpbmUgZ2VtX3Rv X2FtZGdwdV9ibyhnb2JqKSBjb250YWluZXJfb2YoKGdvYmopLCBzdHJ1Y3QgYW1kZ3B1X2dlbV9v YmplY3QsIGJhc2UpLT5ibwogCiB2b2lkIGFtZGdwdV9nZW1fb2JqZWN0X2ZyZWUoc3RydWN0IGRy bV9nZW1fb2JqZWN0ICpvYmopOwogaW50IGFtZGdwdV9nZW1fb2JqZWN0X29wZW4oc3RydWN0IGRy bV9nZW1fb2JqZWN0ICpvYmosCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdw dS9hbWRncHVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZ2VtLmMK aW5kZXggOTZjNDQ5My4uZjdlOWJkZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9h bWRncHUvYW1kZ3B1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdw dV9nZW0uYwpAQCAtMzMsMTQgKzMzLDIwIEBACiAKIHZvaWQgYW1kZ3B1X2dlbV9vYmplY3RfZnJl ZShzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKmdvYmopCiB7Ci0Jc3RydWN0IGFtZGdwdV9ibyAqcm9i aiA9IGdlbV90b19hbWRncHVfYm8oZ29iaik7CisJc3RydWN0IGFtZGdwdV9nZW1fb2JqZWN0ICph b2JqOwogCi0JaWYgKHJvYmopIHsKLQkJaWYgKHJvYmotPmdlbV9iYXNlLmltcG9ydF9hdHRhY2gp Ci0JCQlkcm1fcHJpbWVfZ2VtX2Rlc3Ryb3koJnJvYmotPmdlbV9iYXNlLCByb2JqLT50Ym8uc2cp OwotCQlhbWRncHVfbW5fdW5yZWdpc3Rlcihyb2JqKTsKLQkJYW1kZ3B1X2JvX3VucmVmKCZyb2Jq KTsKLQl9CisJYW9iaiA9IGNvbnRhaW5lcl9vZigoZ29iaiksIHN0cnVjdCBhbWRncHVfZ2VtX29i amVjdCwgYmFzZSk7CisJaWYgKGFvYmotPmJhc2UuaW1wb3J0X2F0dGFjaCkKKwkJZHJtX3ByaW1l X2dlbV9kZXN0cm95KCZhb2JqLT5iYXNlLCBhb2JqLT5iby0+dGJvLnNnKTsKKworCXd3X211dGV4 X2xvY2soJmFvYmotPmJvLT50Ym8ucmVzdi0+bG9jaywgTlVMTCk7CisJbGlzdF9kZWwoJmFvYmot Pmxpc3QpOworCXd3X211dGV4X3VubG9jaygmYW9iai0+Ym8tPnRiby5yZXN2LT5sb2NrKTsKKwor CWFtZGdwdV9tbl91bnJlZ2lzdGVyKGFvYmotPmJvKTsKKwlhbWRncHVfYm9fdW5yZWYoJmFvYmot PmJvKTsKKwlkcm1fZ2VtX29iamVjdF9yZWxlYXNlKCZhb2JqLT5iYXNlKTsKKwlrZnJlZShhb2Jq KTsKIH0KIAogaW50IGFtZGdwdV9nZW1fb2JqZWN0X2NyZWF0ZShzdHJ1Y3QgYW1kZ3B1X2Rldmlj ZSAqYWRldiwgdW5zaWduZWQgbG9uZyBzaXplLApAQCAtNDksNiArNTUsNyBAQCBpbnQgYW1kZ3B1 X2dlbV9vYmplY3RfY3JlYXRlKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LCB1bnNpZ25lZCBs b25nIHNpemUsCiAJCQkJc3RydWN0IGRybV9nZW1fb2JqZWN0ICoqb2JqKQogewogCXN0cnVjdCBh bWRncHVfYm8gKnJvYmo7CisJc3RydWN0IGFtZGdwdV9nZW1fb2JqZWN0ICpnb2JqOwogCXVuc2ln bmVkIGxvbmcgbWF4X3NpemU7CiAJaW50IHI7CiAKQEAgLTgzLDcgKzkwLDIzIEBAIGludCBhbWRn cHVfZ2VtX29iamVjdF9jcmVhdGUoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsIHVuc2lnbmVk IGxvbmcgc2l6ZSwKIAkJfQogCQlyZXR1cm4gcjsKIAl9Ci0JKm9iaiA9ICZyb2JqLT5nZW1fYmFz ZTsKKworCWdvYmogPSBremFsbG9jKHNpemVvZihzdHJ1Y3QgYW1kZ3B1X2dlbV9vYmplY3QpLCBH RlBfS0VSTkVMKTsKKwlpZiAodW5saWtlbHkoIWdvYmopKSB7CisJCWFtZGdwdV9ib191bnJlZigm cm9iaik7CisJCXJldHVybiAtRU5PTUVNOworCX0KKworCXIgPSBkcm1fZ2VtX29iamVjdF9pbml0 KGFkZXYtPmRkZXYsICZnb2JqLT5iYXNlLCBhbWRncHVfYm9fc2l6ZShyb2JqKSk7CisJaWYgKHVu bGlrZWx5KHIpKSB7CisJCWtmcmVlKGdvYmopOworCQlhbWRncHVfYm9fdW5yZWYoJnJvYmopOwor CQlyZXR1cm4gcjsKKwl9CisKKwlsaXN0X2FkZCgmZ29iai0+bGlzdCwgJnJvYmotPmdlbV9vYmpl Y3RzKTsKKwlnb2JqLT5ibyA9IHJvYmo7CisJKm9iaiA9ICZnb2JqLT5iYXNlOwogCiAJcmV0dXJu IDA7CiB9CkBAIC03MDMsNyArNzI2LDcgQEAgaW50IGFtZGdwdV9nZW1fb3BfaW9jdGwoc3RydWN0 IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKIAkJc3RydWN0IGRybV9hbWRncHVfZ2VtX2Ny ZWF0ZV9pbiBpbmZvOwogCQl2b2lkIF9fdXNlciAqb3V0ID0gKHZvaWQgX191c2VyICopKHVpbnRw dHJfdClhcmdzLT52YWx1ZTsKIAotCQlpbmZvLmJvX3NpemUgPSByb2JqLT5nZW1fYmFzZS5zaXpl OworCQlpbmZvLmJvX3NpemUgPSBhbWRncHVfYm9fc2l6ZShyb2JqKTsKIAkJaW5mby5hbGlnbm1l bnQgPSByb2JqLT50Ym8ubWVtLnBhZ2VfYWxpZ25tZW50IDw8IFBBR0VfU0hJRlQ7CiAJCWluZm8u ZG9tYWlucyA9IHJvYmotPnByZWZlcmVkX2RvbWFpbnM7CiAJCWluZm8uZG9tYWluX2ZsYWdzID0g cm9iai0+ZmxhZ3M7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRn cHVfb2JqZWN0LmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfb2JqZWN0LmMK aW5kZXggYzM0Y2YyYy4uNDRiN2U3MSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9h bWRncHUvYW1kZ3B1X29iamVjdC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2Ft ZGdwdV9vYmplY3QuYwpAQCAtOTUsNyArOTUsNiBAQCBzdGF0aWMgdm9pZCBhbWRncHVfdHRtX2Jv X2Rlc3Ryb3koc3RydWN0IHR0bV9idWZmZXJfb2JqZWN0ICp0Ym8pCiAKIAlhbWRncHVfdXBkYXRl X21lbW9yeV91c2FnZShhZGV2LCAmYm8tPnRiby5tZW0sIE5VTEwpOwogCi0JZHJtX2dlbV9vYmpl Y3RfcmVsZWFzZSgmYm8tPmdlbV9iYXNlKTsKIAlhbWRncHVfYm9fdW5yZWYoJmJvLT5wYXJlbnQp OwogCWlmICghbGlzdF9lbXB0eSgmYm8tPnNoYWRvd19saXN0KSkgewogCQltdXRleF9sb2NrKCZh ZGV2LT5zaGFkb3dfbGlzdF9sb2NrKTsKQEAgLTM0NCwxMyArMzQzLDkgQEAgaW50IGFtZGdwdV9i b19jcmVhdGVfcmVzdHJpY3RlZChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwKIAlibyA9IGt6 YWxsb2Moc2l6ZW9mKHN0cnVjdCBhbWRncHVfYm8pLCBHRlBfS0VSTkVMKTsKIAlpZiAoYm8gPT0g TlVMTCkKIAkJcmV0dXJuIC1FTk9NRU07Ci0JciA9IGRybV9nZW1fb2JqZWN0X2luaXQoYWRldi0+ ZGRldiwgJmJvLT5nZW1fYmFzZSwgc2l6ZSk7Ci0JaWYgKHVubGlrZWx5KHIpKSB7Ci0JCWtmcmVl KGJvKTsKLQkJcmV0dXJuIHI7Ci0JfQogCUlOSVRfTElTVF9IRUFEKCZiby0+c2hhZG93X2xpc3Qp OwogCUlOSVRfTElTVF9IRUFEKCZiby0+dmEpOworCUlOSVRfTElTVF9IRUFEKCZiby0+Z2VtX29i amVjdHMpOwogCWJvLT5wcmVmZXJlZF9kb21haW5zID0gZG9tYWluICYgKEFNREdQVV9HRU1fRE9N QUlOX1ZSQU0gfAogCQkJCQkgQU1ER1BVX0dFTV9ET01BSU5fR1RUIHwKIAkJCQkJIEFNREdQVV9H RU1fRE9NQUlOX0NQVSB8CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9h bWRncHVfcHJpbWUuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9wcmltZS5j CmluZGV4IDZiZGM4NjYuLmI5NDI1ZWQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQv YW1kZ3B1L2FtZGdwdV9wcmltZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2Ft ZGdwdV9wcmltZS5jCkBAIC02NSw2ICs2NSw3IEBAIHN0cnVjdCBkcm1fZ2VtX29iamVjdCAqCiAJ c3RydWN0IHJlc2VydmF0aW9uX29iamVjdCAqcmVzdiA9IGF0dGFjaC0+ZG1hYnVmLT5yZXN2Owog CXN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3Qg YW1kZ3B1X2JvICpibzsKKwlzdHJ1Y3QgYW1kZ3B1X2dlbV9vYmplY3QgKmdvYmo7CiAJaW50IHJl dDsKIAogCXd3X211dGV4X2xvY2soJnJlc3YtPmxvY2ssIE5VTEwpOwpAQCAtNzUsNyArNzYsMjQg QEAgc3RydWN0IGRybV9nZW1fb2JqZWN0ICoKIAkJcmV0dXJuIEVSUl9QVFIocmV0KTsKIAogCWJv LT5wcmltZV9zaGFyZWRfY291bnQgPSAxOwotCXJldHVybiAmYm8tPmdlbV9iYXNlOworCisJZ29i aiA9IGt6YWxsb2Moc2l6ZW9mKHN0cnVjdCBhbWRncHVfZ2VtX29iamVjdCksIEdGUF9LRVJORUwp OworCWlmICh1bmxpa2VseSghZ29iaikpIHsKKwkJYW1kZ3B1X2JvX3VucmVmKCZibyk7CisJCXJl dHVybiBFUlJfUFRSKC1FTk9NRU0pOworCX0KKworCXJldCA9IGRybV9nZW1fb2JqZWN0X2luaXQo YWRldi0+ZGRldiwgJmdvYmotPmJhc2UsIGFtZGdwdV9ib19zaXplKGJvKSk7CisJaWYgKHVubGlr ZWx5KHJldCkpIHsKKwkJa2ZyZWUoZ29iaik7CisJCWFtZGdwdV9ib191bnJlZigmYm8pOworCQly ZXR1cm4gRVJSX1BUUihyZXQpOworCX0KKworCWxpc3RfYWRkKCZnb2JqLT5saXN0LCAmYm8tPmdl bV9vYmplY3RzKTsKKwlnb2JqLT5ibyA9IGFtZGdwdV9ib19yZWYoYm8pOworCisJcmV0dXJuICZn b2JqLT5iYXNlOwogfQogCiBpbnQgYW1kZ3B1X2dlbV9wcmltZV9waW4oc3RydWN0IGRybV9nZW1f b2JqZWN0ICpvYmopCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRn cHVfdHRtLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfdHRtLmMKaW5kZXgg M2Y5MjdjMi4uZDAxOThmMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUv YW1kZ3B1X3R0bS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV90dG0u YwpAQCAtMjM1LDExICsyMzUsMjQgQEAgc3RhdGljIHZvaWQgYW1kZ3B1X2V2aWN0X2ZsYWdzKHN0 cnVjdCB0dG1fYnVmZmVyX29iamVjdCAqYm8sCiBzdGF0aWMgaW50IGFtZGdwdV92ZXJpZnlfYWNj ZXNzKHN0cnVjdCB0dG1fYnVmZmVyX29iamVjdCAqYm8sIHN0cnVjdCBmaWxlICpmaWxwKQogewog CXN0cnVjdCBhbWRncHVfYm8gKmFibyA9IGNvbnRhaW5lcl9vZihibywgc3RydWN0IGFtZGdwdV9i bywgdGJvKTsKKwlzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGVfcHJpdiA9IGZpbHAtPnByaXZhdGVfZGF0 YTsKKwlzdHJ1Y3QgYW1kZ3B1X2dlbV9vYmplY3QgKmdvYmo7CiAKIAlpZiAoYW1kZ3B1X3R0bV90 dF9nZXRfdXNlcm1tKGJvLT50dG0pKQogCQlyZXR1cm4gLUVQRVJNOwotCXJldHVybiBkcm1fdm1h X25vZGVfdmVyaWZ5X2FjY2VzcygmYWJvLT5nZW1fYmFzZS52bWFfbm9kZSwKLQkJCQkJICBmaWxw LT5wcml2YXRlX2RhdGEpOworCisJd3dfbXV0ZXhfbG9jaygmYWJvLT50Ym8ucmVzdi0+bG9jaywg TlVMTCk7CisJbGlzdF9mb3JfZWFjaF9lbnRyeShnb2JqLCAmYWJvLT5nZW1fb2JqZWN0cywgbGlz dCkgeworCQlpZiAoZ29iai0+YmFzZS5kZXYgIT0gZmlsZV9wcml2LT5taW5vci0+ZGV2KQorCQkJ Y29udGludWU7CisKKwkJd3dfbXV0ZXhfdW5sb2NrKCZhYm8tPnRiby5yZXN2LT5sb2NrKTsKKwkJ cmV0dXJuIGRybV92bWFfbm9kZV92ZXJpZnlfYWNjZXNzKCZnb2JqLT5iYXNlLnZtYV9ub2RlLAor CQkJCQkJICBmaWxlX3ByaXYpOworCX0KKwl3d19tdXRleF91bmxvY2soJmFiby0+dGJvLnJlc3Yt PmxvY2spOworCisJcmV0dXJuIC1FUEVSTTsKIH0KIAogc3RhdGljIHZvaWQgYW1kZ3B1X21vdmVf bnVsbChzdHJ1Y3QgdHRtX2J1ZmZlcl9vYmplY3QgKmJvLAotLSAKMS45LjEKCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmFtZC1nZnggbWFpbGluZyBsaXN0 CmFtZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Au b3JnL21haWxtYW4vbGlzdGluZm8vYW1kLWdmeAo=