From: Laura Abbott Subject: [PATCHv4 3/3] drm/vgem: Enable dmabuf import interfaces Date: Thu, 4 May 2017 11:45:48 -0700 Message-ID: <1493923548-20878-4-git-send-email-labbott@redhat.com> References: <1493923548-20878-1-git-send-email-labbott@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1493923548-20878-1-git-send-email-labbott@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Daniel Vetter , Chris Wilson , Sean Paul Cc: intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Laura Abbott , Sumit Semwal List-Id: dri-devel@lists.freedesktop.org CkVuYWJsZSB0aGUgR0VNIGRtYS1idWYgaW1wb3J0IGludGVyZmFjZXMgaW4gYWRkaXRpb24gdG8g dGhlIGV4cG9ydAppbnRlcmZhY2VzLiBUaGlzIGxldHMgdmdlbSBiZSB1c2VkIGFzIGEgdGVzdCBz b3VyY2UgZm9yIG90aGVyIGFsbG9jYXRvcnMKKGUuZy4gSW9uKS4KClJldmlld2VkLWJ5OiBDaHJp cyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KU2lnbmVkLW9mZi1ieTogTGF1cmEg QWJib3R0IDxsYWJib3R0QHJlZGhhdC5jb20+Ci0tLQp2NDogVXNlIG5ldyBkcm1fZ2VtX3ByaW1l X2ltcG9ydF9kZXYgZnVuY3Rpb24KLS0tCiBkcml2ZXJzL2dwdS9kcm0vdmdlbS92Z2VtX2Rydi5j IHwgMTM2ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0KIGRyaXZlcnMv Z3B1L2RybS92Z2VtL3ZnZW1fZHJ2LmggfCAgIDIgKwogMiBmaWxlcyBjaGFuZ2VkLCAxMDkgaW5z ZXJ0aW9ucygrKSwgMjkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L3ZnZW0vdmdlbV9kcnYuYyBiL2RyaXZlcnMvZ3B1L2RybS92Z2VtL3ZnZW1fZHJ2LmMKaW5kZXgg ZDFkOThhZi4uYzkzODFkNDUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS92Z2VtL3ZnZW1f ZHJ2LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3ZnZW0vdmdlbV9kcnYuYwpAQCAtNDgsNiArNDgs MTEgQEAgc3RhdGljIHZvaWQgdmdlbV9nZW1fZnJlZV9vYmplY3Qoc3RydWN0IGRybV9nZW1fb2Jq ZWN0ICpvYmopCiB7CiAJc3RydWN0IGRybV92Z2VtX2dlbV9vYmplY3QgKnZnZW1fb2JqID0gdG9f dmdlbV9ibyhvYmopOwogCisJZHJtX2ZyZWVfbGFyZ2UodmdlbV9vYmotPnBhZ2VzKTsKKworCWlm IChvYmotPmltcG9ydF9hdHRhY2gpCisJCWRybV9wcmltZV9nZW1fZGVzdHJveShvYmosIHZnZW1f b2JqLT50YWJsZSk7CisKIAlkcm1fZ2VtX29iamVjdF9yZWxlYXNlKG9iaik7CiAJa2ZyZWUodmdl bV9vYmopOwogfQpAQCAtNTgsMjYgKzYzLDQ5IEBAIHN0YXRpYyBpbnQgdmdlbV9nZW1fZmF1bHQo c3RydWN0IHZtX2ZhdWx0ICp2bWYpCiAJc3RydWN0IGRybV92Z2VtX2dlbV9vYmplY3QgKm9iaiA9 IHZtYS0+dm1fcHJpdmF0ZV9kYXRhOwogCS8qIFdlIGRvbid0IHVzZSB2bWYtPnBnb2ZmIHNpbmNl IHRoYXQgaGFzIHRoZSBmYWtlIG9mZnNldCAqLwogCXVuc2lnbmVkIGxvbmcgdmFkZHIgPSB2bWYt PmFkZHJlc3M7Ci0Jc3RydWN0IHBhZ2UgKnBhZ2U7Ci0KLQlwYWdlID0gc2htZW1fcmVhZF9tYXBw aW5nX3BhZ2UoZmlsZV9pbm9kZShvYmotPmJhc2UuZmlscCktPmlfbWFwcGluZywKLQkJCQkgICAg ICAgKHZhZGRyIC0gdm1hLT52bV9zdGFydCkgPj4gUEFHRV9TSElGVCk7Ci0JaWYgKCFJU19FUlIo cGFnZSkpIHsKLQkJdm1mLT5wYWdlID0gcGFnZTsKLQkJcmV0dXJuIDA7Ci0JfSBlbHNlIHN3aXRj aCAoUFRSX0VSUihwYWdlKSkgewotCQljYXNlIC1FTk9TUEM6Ci0JCWNhc2UgLUVOT01FTToKLQkJ CXJldHVybiBWTV9GQVVMVF9PT007Ci0JCWNhc2UgLUVCVVNZOgotCQkJcmV0dXJuIFZNX0ZBVUxU X1JFVFJZOwotCQljYXNlIC1FRkFVTFQ6Ci0JCWNhc2UgLUVJTlZBTDoKLQkJCXJldHVybiBWTV9G QVVMVF9TSUdCVVM7Ci0JCWRlZmF1bHQ6Ci0JCQlXQVJOX09OX09OQ0UoUFRSX0VSUihwYWdlKSk7 Ci0JCQlyZXR1cm4gVk1fRkFVTFRfU0lHQlVTOworCWludCByZXQ7CisJbG9mZl90IG51bV9wYWdl czsKKwlwZ29mZl90IHBhZ2Vfb2Zmc2V0OworCXBhZ2Vfb2Zmc2V0ID0gKHZhZGRyIC0gdm1hLT52 bV9zdGFydCkgPj4gUEFHRV9TSElGVDsKKworCW51bV9wYWdlcyA9IERJVl9ST1VORF9VUChvYmot PmJhc2Uuc2l6ZSwgUEFHRV9TSVpFKTsKKworCWlmIChwYWdlX29mZnNldCA+IG51bV9wYWdlcykK KwkJcmV0dXJuIFZNX0ZBVUxUX1NJR0JVUzsKKworCWlmIChvYmotPnBhZ2VzKSB7CisJCWdldF9w YWdlKG9iai0+cGFnZXNbcGFnZV9vZmZzZXRdKTsKKwkJdm1mLT5wYWdlID0gb2JqLT5wYWdlc1tw YWdlX29mZnNldF07CisJCXJldCA9IDA7CisJfSBlbHNlIHsKKwkJc3RydWN0IHBhZ2UgKnBhZ2U7 CisKKwkJcGFnZSA9IHNobWVtX3JlYWRfbWFwcGluZ19wYWdlKAorCQkJCQlmaWxlX2lub2RlKG9i ai0+YmFzZS5maWxwKS0+aV9tYXBwaW5nLAorCQkJCQlwYWdlX29mZnNldCk7CisJCWlmICghSVNf RVJSKHBhZ2UpKSB7CisJCQl2bWYtPnBhZ2UgPSBwYWdlOworCQkJcmV0ID0gMDsKKwkJfSBlbHNl IHN3aXRjaCAoUFRSX0VSUihwYWdlKSkgeworCQkJY2FzZSAtRU5PU1BDOgorCQkJY2FzZSAtRU5P TUVNOgorCQkJCXJldCA9IFZNX0ZBVUxUX09PTTsKKwkJCQlicmVhazsKKwkJCWNhc2UgLUVCVVNZ OgorCQkJCXJldCA9IFZNX0ZBVUxUX1JFVFJZOworCQkJCWJyZWFrOworCQkJY2FzZSAtRUZBVUxU OgorCQkJY2FzZSAtRUlOVkFMOgorCQkJCXJldCA9IFZNX0ZBVUxUX1NJR0JVUzsKKwkJCQlicmVh azsKKwkJCWRlZmF1bHQ6CisJCQkJV0FSTl9PTihQVFJfRVJSKHBhZ2UpKTsKKwkJCQlyZXQgPSBW TV9GQVVMVF9TSUdCVVM7CisJCQkJYnJlYWs7CisJCX0KKwogCX0KKwlyZXR1cm4gcmV0OwogfQog CiBzdGF0aWMgY29uc3Qgc3RydWN0IHZtX29wZXJhdGlvbnNfc3RydWN0IHZnZW1fZ2VtX3ZtX29w cyA9IHsKQEAgLTExNCwxMiArMTQyLDggQEAgc3RhdGljIHZvaWQgdmdlbV9wb3N0Y2xvc2Uoc3Ry dWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGRybV9maWxlICpmaWxlKQogCWtmcmVlKHZmaWxl KTsKIH0KIAotLyogaW9jdGxzICovCi0KLXN0YXRpYyBzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKnZn ZW1fZ2VtX2NyZWF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAotCQkJCQkgICAgICBzdHJ1Y3Qg ZHJtX2ZpbGUgKmZpbGUsCi0JCQkJCSAgICAgIHVuc2lnbmVkIGludCAqaGFuZGxlLAotCQkJCQkg ICAgICB1bnNpZ25lZCBsb25nIHNpemUpCitzdGF0aWMgc3RydWN0IGRybV92Z2VtX2dlbV9vYmpl Y3QgKl9fdmdlbV9nZW1fY3JlYXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCisJCQkJCQl1bnNp Z25lZCBsb25nIHNpemUpCiB7CiAJc3RydWN0IGRybV92Z2VtX2dlbV9vYmplY3QgKm9iajsKIAlp bnQgcmV0OwpAQCAtMTI5LDggKzE1MywzMSBAQCBzdGF0aWMgc3RydWN0IGRybV9nZW1fb2JqZWN0 ICp2Z2VtX2dlbV9jcmVhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJcmV0dXJuIEVSUl9Q VFIoLUVOT01FTSk7CiAKIAlyZXQgPSBkcm1fZ2VtX29iamVjdF9pbml0KGRldiwgJm9iai0+YmFz ZSwgcm91bmR1cChzaXplLCBQQUdFX1NJWkUpKTsKLQlpZiAocmV0KQotCQlnb3RvIGVycl9mcmVl OworCWlmIChyZXQpIHsKKwkJa2ZyZWUob2JqKTsKKwkJcmV0dXJuIEVSUl9QVFIocmV0KTsKKwl9 CisKKwlyZXR1cm4gb2JqOworfQorCitzdGF0aWMgdm9pZCBfX3ZnZW1fZ2VtX2Rlc3Ryb3koc3Ry dWN0IGRybV92Z2VtX2dlbV9vYmplY3QgKm9iaikKK3sKKwlkcm1fZ2VtX29iamVjdF9yZWxlYXNl KCZvYmotPmJhc2UpOworCWtmcmVlKG9iaik7Cit9CisKK3N0YXRpYyBzdHJ1Y3QgZHJtX2dlbV9v YmplY3QgKnZnZW1fZ2VtX2NyZWF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAorCQkJCQkgICAg ICBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUsCisJCQkJCSAgICAgIHVuc2lnbmVkIGludCAqaGFuZGxl LAorCQkJCQkgICAgICB1bnNpZ25lZCBsb25nIHNpemUpCit7CisJc3RydWN0IGRybV92Z2VtX2dl bV9vYmplY3QgKm9iajsKKwlpbnQgcmV0OworCisJb2JqID0gX192Z2VtX2dlbV9jcmVhdGUoZGV2 LCBzaXplKTsKKwlpZiAoSVNfRVJSKG9iaikpCisJCXJldHVybiBFUlJfQ0FTVChvYmopOwogCiAJ cmV0ID0gZHJtX2dlbV9oYW5kbGVfY3JlYXRlKGZpbGUsICZvYmotPmJhc2UsIGhhbmRsZSk7CiAJ ZHJtX2dlbV9vYmplY3RfdW5yZWZlcmVuY2VfdW5sb2NrZWQoJm9iai0+YmFzZSk7CkBAIC0xMzks OSArMTg2LDggQEAgc3RhdGljIHN0cnVjdCBkcm1fZ2VtX29iamVjdCAqdmdlbV9nZW1fY3JlYXRl KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAKIAlyZXR1cm4gJm9iai0+YmFzZTsKIAotZXJyX2Zy ZWU6Ci0Ja2ZyZWUob2JqKTsKIGVycjoKKwlfX3ZnZW1fZ2VtX2Rlc3Ryb3kob2JqKTsKIAlyZXR1 cm4gRVJSX1BUUihyZXQpOwogfQogCkBAIC0yNTgsNiArMzA0LDM1IEBAIHN0YXRpYyBzdHJ1Y3Qg c2dfdGFibGUgKnZnZW1fcHJpbWVfZ2V0X3NnX3RhYmxlKHN0cnVjdCBkcm1fZ2VtX29iamVjdCAq b2JqKQogCXJldHVybiBzdDsKIH0KIAorc3RhdGljIHN0cnVjdCBkcm1fZ2VtX29iamVjdCogdmdl bV9wcmltZV9pbXBvcnQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKKwkJCQkJCXN0cnVjdCBkbWFf YnVmICpkbWFfYnVmKQoreworCXJldHVybiBkcm1fZ2VtX3ByaW1lX2ltcG9ydF9kZXYoZGV2LCBk bWFfYnVmLCAmdmdlbV9wbGF0Zm9ybS0+ZGV2KTsKK30KKworc3RhdGljIHN0cnVjdCBkcm1fZ2Vt X29iamVjdCAqdmdlbV9wcmltZV9pbXBvcnRfc2dfdGFibGUoc3RydWN0IGRybV9kZXZpY2UgKmRl diwKKwkJCXN0cnVjdCBkbWFfYnVmX2F0dGFjaG1lbnQgKmF0dGFjaCwgc3RydWN0IHNnX3RhYmxl ICpzZykKK3sKKwlzdHJ1Y3QgZHJtX3ZnZW1fZ2VtX29iamVjdCAqb2JqOworCWludCBucGFnZXM7 CisKKwlvYmogPSBfX3ZnZW1fZ2VtX2NyZWF0ZShkZXYsIGF0dGFjaC0+ZG1hYnVmLT5zaXplKTsK KwlpZiAoSVNfRVJSKG9iaikpCisJCXJldHVybiBFUlJfQ0FTVChvYmopOworCisJbnBhZ2VzID0g UEFHRV9BTElHTihhdHRhY2gtPmRtYWJ1Zi0+c2l6ZSkgLyBQQUdFX1NJWkU7CisKKwlvYmotPnRh YmxlID0gc2c7CisJb2JqLT5wYWdlcyA9IGRybV9tYWxsb2NfYWIobnBhZ2VzLCBzaXplb2Yoc3Ry dWN0IHBhZ2UgKikpOworCWlmICghb2JqLT5wYWdlcykgeworCQlfX3ZnZW1fZ2VtX2Rlc3Ryb3ko b2JqKTsKKwkJcmV0dXJuIEVSUl9QVFIoLUVOT01FTSk7CisJfQorCWRybV9wcmltZV9zZ190b19w YWdlX2FkZHJfYXJyYXlzKG9iai0+dGFibGUsIG9iai0+cGFnZXMsIE5VTEwsCisJCQkJCW5wYWdl cyk7CisJcmV0dXJuICZvYmotPmJhc2U7Cit9CisKIHN0YXRpYyB2b2lkICp2Z2VtX3ByaW1lX3Zt YXAoc3RydWN0IGRybV9nZW1fb2JqZWN0ICpvYmopCiB7CiAJbG9uZyBuX3BhZ2VzID0gb2JqLT5z aXplID4+IFBBR0VfU0hJRlQ7CkBAIC0zMTYsOCArMzkxLDExIEBAIHN0YXRpYyBzdHJ1Y3QgZHJt X2RyaXZlciB2Z2VtX2RyaXZlciA9IHsKIAkuZHVtYl9tYXBfb2Zmc2V0CQk9IHZnZW1fZ2VtX2R1 bWJfbWFwLAogCiAJLnByaW1lX2hhbmRsZV90b19mZCA9IGRybV9nZW1fcHJpbWVfaGFuZGxlX3Rv X2ZkLAorCS5wcmltZV9mZF90b19oYW5kbGUgPSBkcm1fZ2VtX3ByaW1lX2ZkX3RvX2hhbmRsZSwK IAkuZ2VtX3ByaW1lX3BpbiA9IHZnZW1fcHJpbWVfcGluLAorCS5nZW1fcHJpbWVfaW1wb3J0ID0g dmdlbV9wcmltZV9pbXBvcnQsCiAJLmdlbV9wcmltZV9leHBvcnQgPSBkcm1fZ2VtX3ByaW1lX2V4 cG9ydCwKKwkuZ2VtX3ByaW1lX2ltcG9ydF9zZ190YWJsZSA9IHZnZW1fcHJpbWVfaW1wb3J0X3Nn X3RhYmxlLAogCS5nZW1fcHJpbWVfZ2V0X3NnX3RhYmxlID0gdmdlbV9wcmltZV9nZXRfc2dfdGFi bGUsCiAJLmdlbV9wcmltZV92bWFwID0gdmdlbV9wcmltZV92bWFwLAogCS5nZW1fcHJpbWVfdnVu bWFwID0gdmdlbV9wcmltZV92dW5tYXAsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vdmdl bS92Z2VtX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL3ZnZW0vdmdlbV9kcnYuaAppbmRleCBjYjU5 YzdhLi4xYWFlMDE0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vdmdlbS92Z2VtX2Rydi5o CisrKyBiL2RyaXZlcnMvZ3B1L2RybS92Z2VtL3ZnZW1fZHJ2LmgKQEAgLTQzLDYgKzQzLDggQEAg c3RydWN0IHZnZW1fZmlsZSB7CiAjZGVmaW5lIHRvX3ZnZW1fYm8oeCkgY29udGFpbmVyX29mKHgs IHN0cnVjdCBkcm1fdmdlbV9nZW1fb2JqZWN0LCBiYXNlKQogc3RydWN0IGRybV92Z2VtX2dlbV9v YmplY3QgewogCXN0cnVjdCBkcm1fZ2VtX29iamVjdCBiYXNlOworCXN0cnVjdCBwYWdlICoqcGFn ZXM7CisJc3RydWN0IHNnX3RhYmxlICp0YWJsZTsKIH07CiAKIGludCB2Z2VtX2ZlbmNlX29wZW4o c3RydWN0IHZnZW1fZmlsZSAqZmlsZSk7Ci0tIAoyLjcuNAoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1n ZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==