From: Felix Kuehling Subject: [PATCH 4/6] drm/amdgpu: separate BO from GEM object Date: Wed, 12 Jul 2017 01:29:25 -0400 Message-ID: <1499837367-8368-5-git-send-email-Felix.Kuehling@amd.com> References: <1499837367-8368-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: <1499837367-8368-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?= , dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org RnJvbTogQ2hyaXN0aWFuIEvDtm5pZyA8Y2hyaXN0aWFuLmtvZW5pZ0BhbWQuY29tPgoKVGhpcyBh bGxvd3MgdXMgdG8gaGF2ZSBtdWx0aXBsZSBHRU0gb2JqZWN0cyBmb3Igb25lIEJPLgoKU2lnbmVk LW9mZi1ieTogQ2hyaXN0aWFuIEvDtm5pZyA8Y2hyaXN0aWFuLmtvZW5pZ0BhbWQuY29tPgpSZXZp ZXdlZC1ieTogRmVsaXggS3VlaGxpbmcgPEZlbGl4Lkt1ZWhsaW5nQGFtZC5jb20+Ci0tLQogZHJp dmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1LmggICAgICAgIHwgMTIgKysrKysrKy0tCiBk cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZ2VtLmMgICAgfCA0MSArKysrKysrKysr KysrKysrKysrKysrKy0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9v YmplY3QuYyB8ICA3ICstLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfcHJp bWUuYyAgfCAyMCArKysrKysrKysrKysrKy0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2Ft ZGdwdV90dG0uYyAgICB8IDE3ICsrKysrKysrKysrLS0KIDUgZmlsZXMgY2hhbmdlZCwgNzcgaW5z ZXJ0aW9ucygrKSwgMjAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2FtZC9hbWRncHUvYW1kZ3B1LmggYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHUu aAppbmRleCBmNjM0NWI5Li45ZmEzY2VlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1k L2FtZGdwdS9hbWRncHUuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHUu aApAQCAtNDE3LDYgKzQxNywxMiBAQCBzdHJ1Y3QgYW1kZ3B1X2JvX3ZhIHsKIAogI2RlZmluZSBB TURHUFVfR0VNX0RPTUFJTl9NQVgJCTB4MwogCitzdHJ1Y3QgYW1kZ3B1X2dlbV9vYmplY3Qgewor CXN0cnVjdCBkcm1fZ2VtX29iamVjdAkJYmFzZTsKKwlzdHJ1Y3QgbGlzdF9oZWFkCQlsaXN0Owor CXN0cnVjdCBhbWRncHVfYm8JCSpibzsKK307CisKIHN0cnVjdCBhbWRncHVfYm8gewogCS8qIFBy b3RlY3RlZCBieSB0Ym8ucmVzZXJ2ZWQgKi8KIAl1MzIJCQkJcHJlZmVyZWRfZG9tYWluczsKQEAg LTQzMywxMiArNDM5LDE0IEBAIHN0cnVjdCBhbWRncHVfYm8gewogCXZvaWQJCQkJKm1ldGFkYXRh OwogCXUzMgkJCQltZXRhZGF0YV9zaXplOwogCXVuc2lnbmVkCQkJcHJpbWVfc2hhcmVkX2NvdW50 OworCS8qIEdFTSBvYmplY3RzIHJlZmVyZWluZyB0byB0aGlzIEJPICovCisJc3RydWN0IGxpc3Rf aGVhZAlnZW1fb2JqZWN0czsKKwogCS8qIGxpc3Qgb2YgYWxsIHZpcnR1YWwgYWRkcmVzcyB0byB3 aGljaCB0aGlzIGJvCiAJICogaXMgYXNzb2NpYXRlZCB0bwogCSAqLwogCXN0cnVjdCBsaXN0X2hl YWQJCXZhOwogCS8qIENvbnN0YW50IGFmdGVyIGluaXRpYWxpemF0aW9uICovCi0Jc3RydWN0IGRy bV9nZW1fb2JqZWN0CQlnZW1fYmFzZTsKIAlzdHJ1Y3QgYW1kZ3B1X2JvCQkqcGFyZW50OwogCXN0 cnVjdCBhbWRncHVfYm8JCSpzaGFkb3c7CiAKQEAgLTQ0Nyw3ICs0NTUsNyBAQCBzdHJ1Y3QgYW1k Z3B1X2JvIHsKIAlzdHJ1Y3QgbGlzdF9oZWFkCQltbl9saXN0OwogCXN0cnVjdCBsaXN0X2hlYWQJ CXNoYWRvd19saXN0OwogfTsKLSNkZWZpbmUgZ2VtX3RvX2FtZGdwdV9ibyhnb2JqKSBjb250YWlu ZXJfb2YoKGdvYmopLCBzdHJ1Y3QgYW1kZ3B1X2JvLCBnZW1fYmFzZSkKKyNkZWZpbmUgZ2VtX3Rv X2FtZGdwdV9ibyhnb2JqKSBjb250YWluZXJfb2YoKGdvYmopLCBzdHJ1Y3QgYW1kZ3B1X2dlbV9v YmplY3QsIGJhc2UpLT5ibwogCiB2b2lkIGFtZGdwdV9nZW1fb2JqZWN0X2ZyZWUoc3RydWN0IGRy bV9nZW1fb2JqZWN0ICpvYmopOwogaW50IGFtZGdwdV9nZW1fb2JqZWN0X29wZW4oc3RydWN0IGRy bV9nZW1fb2JqZWN0ICpvYmosCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdw dS9hbWRncHVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZ2VtLmMK aW5kZXggOTE3YWM1ZS4uYjYyNWVlNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9h bWRncHUvYW1kZ3B1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdw dV9nZW0uYwpAQCAtMzMsMTQgKzMzLDIwIEBACiAKIHZvaWQgYW1kZ3B1X2dlbV9vYmplY3RfZnJl ZShzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKmdvYmopCiB7Ci0Jc3RydWN0IGFtZGdwdV9ibyAqcm9i aiA9IGdlbV90b19hbWRncHVfYm8oZ29iaik7CisJc3RydWN0IGFtZGdwdV9nZW1fb2JqZWN0ICph b2JqOwogCi0JaWYgKHJvYmopIHsKLQkJaWYgKHJvYmotPmdlbV9iYXNlLmltcG9ydF9hdHRhY2gp Ci0JCQlkcm1fcHJpbWVfZ2VtX2Rlc3Ryb3koJnJvYmotPmdlbV9iYXNlLCByb2JqLT50Ym8uc2cp OwotCQlhbWRncHVfbW5fdW5yZWdpc3Rlcihyb2JqKTsKLQkJYW1kZ3B1X2JvX3VucmVmKCZyb2Jq KTsKLQl9CisJYW9iaiA9IGNvbnRhaW5lcl9vZigoZ29iaiksIHN0cnVjdCBhbWRncHVfZ2VtX29i amVjdCwgYmFzZSk7CisJaWYgKGFvYmotPmJhc2UuaW1wb3J0X2F0dGFjaCkKKwkJZHJtX3ByaW1l X2dlbV9kZXN0cm95KCZhb2JqLT5iYXNlLCBhb2JqLT5iby0+dGJvLnNnKTsKKworCXd3X211dGV4 X2xvY2soJmFvYmotPmJvLT50Ym8ucmVzdi0+bG9jaywgTlVMTCk7CisJbGlzdF9kZWwoJmFvYmot Pmxpc3QpOworCXd3X211dGV4X3VubG9jaygmYW9iai0+Ym8tPnRiby5yZXN2LT5sb2NrKTsKKwor CWFtZGdwdV9tbl91bnJlZ2lzdGVyKGFvYmotPmJvKTsKKwlhbWRncHVfYm9fdW5yZWYoJmFvYmot PmJvKTsKKwlkcm1fZ2VtX29iamVjdF9yZWxlYXNlKCZhb2JqLT5iYXNlKTsKKwlrZnJlZShhb2Jq KTsKIH0KIAogaW50IGFtZGdwdV9nZW1fb2JqZWN0X2NyZWF0ZShzdHJ1Y3QgYW1kZ3B1X2Rldmlj ZSAqYWRldiwgdW5zaWduZWQgbG9uZyBzaXplLApAQCAtNDksNiArNTUsNyBAQCBpbnQgYW1kZ3B1 X2dlbV9vYmplY3RfY3JlYXRlKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LCB1bnNpZ25lZCBs b25nIHNpemUsCiAJCQkJc3RydWN0IGRybV9nZW1fb2JqZWN0ICoqb2JqKQogewogCXN0cnVjdCBh bWRncHVfYm8gKnJvYmo7CisJc3RydWN0IGFtZGdwdV9nZW1fb2JqZWN0ICpnb2JqOwogCWludCBy OwogCiAJKm9iaiA9IE5VTEw7CkBAIC03MSw3ICs3OCwyMyBAQCBpbnQgYW1kZ3B1X2dlbV9vYmpl Y3RfY3JlYXRlKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LCB1bnNpZ25lZCBsb25nIHNpemUs CiAJCX0KIAkJcmV0dXJuIHI7CiAJfQotCSpvYmogPSAmcm9iai0+Z2VtX2Jhc2U7CisKKwlnb2Jq ID0ga3phbGxvYyhzaXplb2Yoc3RydWN0IGFtZGdwdV9nZW1fb2JqZWN0KSwgR0ZQX0tFUk5FTCk7 CisJaWYgKHVubGlrZWx5KCFnb2JqKSkgeworCQlhbWRncHVfYm9fdW5yZWYoJnJvYmopOworCQly ZXR1cm4gLUVOT01FTTsKKwl9CisKKwlyID0gZHJtX2dlbV9vYmplY3RfaW5pdChhZGV2LT5kZGV2 LCAmZ29iai0+YmFzZSwgYW1kZ3B1X2JvX3NpemUocm9iaikpOworCWlmICh1bmxpa2VseShyKSkg eworCQlrZnJlZShnb2JqKTsKKwkJYW1kZ3B1X2JvX3VucmVmKCZyb2JqKTsKKwkJcmV0dXJuIHI7 CisJfQorCisJbGlzdF9hZGQoJmdvYmotPmxpc3QsICZyb2JqLT5nZW1fb2JqZWN0cyk7CisJZ29i ai0+Ym8gPSByb2JqOworCSpvYmogPSAmZ29iai0+YmFzZTsKIAogCXJldHVybiAwOwogfQpAQCAt NjkxLDcgKzcxNCw3IEBAIGludCBhbWRncHVfZ2VtX29wX2lvY3RsKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYsIHZvaWQgKmRhdGEsCiAJCXN0cnVjdCBkcm1fYW1kZ3B1X2dlbV9jcmVhdGVfaW4gaW5m bzsKIAkJdm9pZCBfX3VzZXIgKm91dCA9ICh2b2lkIF9fdXNlciAqKSh1aW50cHRyX3QpYXJncy0+ dmFsdWU7CiAKLQkJaW5mby5ib19zaXplID0gcm9iai0+Z2VtX2Jhc2Uuc2l6ZTsKKwkJaW5mby5i b19zaXplID0gYW1kZ3B1X2JvX3NpemUocm9iaik7CiAJCWluZm8uYWxpZ25tZW50ID0gcm9iai0+ dGJvLm1lbS5wYWdlX2FsaWdubWVudCA8PCBQQUdFX1NISUZUOwogCQlpbmZvLmRvbWFpbnMgPSBy b2JqLT5wcmVmZXJlZF9kb21haW5zOwogCQlpbmZvLmRvbWFpbl9mbGFncyA9IHJvYmotPmZsYWdz OwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X29iamVjdC5j IGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X29iamVjdC5jCmluZGV4IDZlMjQz MzkuLjc3NmRlNzcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdw dV9vYmplY3QuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfb2JqZWN0 LmMKQEAgLTk1LDcgKzk1LDYgQEAgc3RhdGljIHZvaWQgYW1kZ3B1X3R0bV9ib19kZXN0cm95KHN0 cnVjdCB0dG1fYnVmZmVyX29iamVjdCAqdGJvKQogCiAJYW1kZ3B1X3VwZGF0ZV9tZW1vcnlfdXNh Z2UoYWRldiwgJmJvLT50Ym8ubWVtLCBOVUxMKTsKIAotCWRybV9nZW1fb2JqZWN0X3JlbGVhc2Uo JmJvLT5nZW1fYmFzZSk7CiAJYW1kZ3B1X2JvX3VucmVmKCZiby0+cGFyZW50KTsKIAlpZiAoIWxp c3RfZW1wdHkoJmJvLT5zaGFkb3dfbGlzdCkpIHsKIAkJbXV0ZXhfbG9jaygmYWRldi0+c2hhZG93 X2xpc3RfbG9jayk7CkBAIC0zNDQsMTMgKzM0Myw5IEBAIGludCBhbWRncHVfYm9fY3JlYXRlX3Jl c3RyaWN0ZWQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsCiAJYm8gPSBremFsbG9jKHNpemVv ZihzdHJ1Y3QgYW1kZ3B1X2JvKSwgR0ZQX0tFUk5FTCk7CiAJaWYgKGJvID09IE5VTEwpCiAJCXJl dHVybiAtRU5PTUVNOwotCXIgPSBkcm1fZ2VtX29iamVjdF9pbml0KGFkZXYtPmRkZXYsICZiby0+ Z2VtX2Jhc2UsIHNpemUpOwotCWlmICh1bmxpa2VseShyKSkgewotCQlrZnJlZShibyk7Ci0JCXJl dHVybiByOwotCX0KIAlJTklUX0xJU1RfSEVBRCgmYm8tPnNoYWRvd19saXN0KTsKIAlJTklUX0xJ U1RfSEVBRCgmYm8tPnZhKTsKKwlJTklUX0xJU1RfSEVBRCgmYm8tPmdlbV9vYmplY3RzKTsKIAli by0+cHJlZmVyZWRfZG9tYWlucyA9IGRvbWFpbiAmIChBTURHUFVfR0VNX0RPTUFJTl9WUkFNIHwK IAkJCQkJIEFNREdQVV9HRU1fRE9NQUlOX0dUVCB8CiAJCQkJCSBBTURHUFVfR0VNX0RPTUFJTl9D UFUgfApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3ByaW1l LmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfcHJpbWUuYwppbmRleCA2YmRj ODY2Li5iOTQyNWVkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRn cHVfcHJpbWUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfcHJpbWUu YwpAQCAtNjUsNiArNjUsNyBAQCBzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKgogCXN0cnVjdCByZXNl cnZhdGlvbl9vYmplY3QgKnJlc3YgPSBhdHRhY2gtPmRtYWJ1Zi0+cmVzdjsKIAlzdHJ1Y3QgYW1k Z3B1X2RldmljZSAqYWRldiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJc3RydWN0IGFtZGdwdV9ibyAq Ym87CisJc3RydWN0IGFtZGdwdV9nZW1fb2JqZWN0ICpnb2JqOwogCWludCByZXQ7CiAKIAl3d19t dXRleF9sb2NrKCZyZXN2LT5sb2NrLCBOVUxMKTsKQEAgLTc1LDcgKzc2LDI0IEBAIHN0cnVjdCBk cm1fZ2VtX29iamVjdCAqCiAJCXJldHVybiBFUlJfUFRSKHJldCk7CiAKIAliby0+cHJpbWVfc2hh cmVkX2NvdW50ID0gMTsKLQlyZXR1cm4gJmJvLT5nZW1fYmFzZTsKKworCWdvYmogPSBremFsbG9j KHNpemVvZihzdHJ1Y3QgYW1kZ3B1X2dlbV9vYmplY3QpLCBHRlBfS0VSTkVMKTsKKwlpZiAodW5s aWtlbHkoIWdvYmopKSB7CisJCWFtZGdwdV9ib191bnJlZigmYm8pOworCQlyZXR1cm4gRVJSX1BU UigtRU5PTUVNKTsKKwl9CisKKwlyZXQgPSBkcm1fZ2VtX29iamVjdF9pbml0KGFkZXYtPmRkZXYs ICZnb2JqLT5iYXNlLCBhbWRncHVfYm9fc2l6ZShibykpOworCWlmICh1bmxpa2VseShyZXQpKSB7 CisJCWtmcmVlKGdvYmopOworCQlhbWRncHVfYm9fdW5yZWYoJmJvKTsKKwkJcmV0dXJuIEVSUl9Q VFIocmV0KTsKKwl9CisKKwlsaXN0X2FkZCgmZ29iai0+bGlzdCwgJmJvLT5nZW1fb2JqZWN0cyk7 CisJZ29iai0+Ym8gPSBhbWRncHVfYm9fcmVmKGJvKTsKKworCXJldHVybiAmZ29iai0+YmFzZTsK IH0KIAogaW50IGFtZGdwdV9nZW1fcHJpbWVfcGluKHN0cnVjdCBkcm1fZ2VtX29iamVjdCAqb2Jq KQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3R0bS5jIGIv ZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3R0bS5jCmluZGV4IDdjZGE1ZGQuLjFk MTg1NzAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV90dG0u YworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfdHRtLmMKQEAgLTI1Niwx MSArMjU2LDI0IEBAIHN0YXRpYyB2b2lkIGFtZGdwdV9ldmljdF9mbGFncyhzdHJ1Y3QgdHRtX2J1 ZmZlcl9vYmplY3QgKmJvLAogc3RhdGljIGludCBhbWRncHVfdmVyaWZ5X2FjY2VzcyhzdHJ1Y3Qg dHRtX2J1ZmZlcl9vYmplY3QgKmJvLCBzdHJ1Y3QgZmlsZSAqZmlscCkKIHsKIAlzdHJ1Y3QgYW1k Z3B1X2JvICphYm8gPSBjb250YWluZXJfb2YoYm8sIHN0cnVjdCBhbWRncHVfYm8sIHRibyk7CisJ c3RydWN0IGRybV9maWxlICpmaWxlX3ByaXYgPSBmaWxwLT5wcml2YXRlX2RhdGE7CisJc3RydWN0 IGFtZGdwdV9nZW1fb2JqZWN0ICpnb2JqOwogCiAJaWYgKGFtZGdwdV90dG1fdHRfZ2V0X3VzZXJt bShiby0+dHRtKSkKIAkJcmV0dXJuIC1FUEVSTTsKLQlyZXR1cm4gZHJtX3ZtYV9ub2RlX3Zlcmlm eV9hY2Nlc3MoJmFiby0+Z2VtX2Jhc2Uudm1hX25vZGUsCi0JCQkJCSAgZmlscC0+cHJpdmF0ZV9k YXRhKTsKKworCXd3X211dGV4X2xvY2soJmFiby0+dGJvLnJlc3YtPmxvY2ssIE5VTEwpOworCWxp c3RfZm9yX2VhY2hfZW50cnkoZ29iaiwgJmFiby0+Z2VtX29iamVjdHMsIGxpc3QpIHsKKwkJaWYg KGdvYmotPmJhc2UuZGV2ICE9IGZpbGVfcHJpdi0+bWlub3ItPmRldikKKwkJCWNvbnRpbnVlOwor CisJCXd3X211dGV4X3VubG9jaygmYWJvLT50Ym8ucmVzdi0+bG9jayk7CisJCXJldHVybiBkcm1f dm1hX25vZGVfdmVyaWZ5X2FjY2VzcygmZ29iai0+YmFzZS52bWFfbm9kZSwKKwkJCQkJCSAgZmls ZV9wcml2KTsKKwl9CisJd3dfbXV0ZXhfdW5sb2NrKCZhYm8tPnRiby5yZXN2LT5sb2NrKTsKKwor CXJldHVybiAtRVBFUk07CiB9CiAKIHN0YXRpYyB2b2lkIGFtZGdwdV9tb3ZlX251bGwoc3RydWN0 IHR0bV9idWZmZXJfb2JqZWN0ICpibywKLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxp c3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2FtZC1nZngK