From: Laura Abbott Subject: [PATCHv3 3/3] drm/vgem: Enable dmabuf import interfaces Date: Tue, 2 May 2017 10:02:08 -0700 Message-ID: <1493744528-25768-4-git-send-email-labbott@redhat.com> References: <1493744528-25768-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: <1493744528-25768-1-git-send-email-labbott@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Daniel Vetter , Chris Wilson , Sean Paul Cc: intel-gfx@lists.freedesktop.org, Joonas Lahtinen , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org RW5hYmxlIHRoZSBHRU0gZG1hLWJ1ZiBpbXBvcnQgaW50ZXJmYWNlcyBpbiBhZGRpdGlvbiB0byB0 aGUgZXhwb3J0CmludGVyZmFjZXMuIFRoaXMgbGV0cyB2Z2VtIGJlIHVzZWQgYXMgYSB0ZXN0IHNv dXJjZSBmb3Igb3RoZXIgYWxsb2NhdG9ycwooZS5nLiBJb24pLgoKQ2M6IGludGVsLWdmeEBsaXN0 cy5mcmVlZGVza3RvcC5vcmcKUmV2aWV3ZWQtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMt d2lsc29uLmNvLnVrPgpTaWduZWQtb2ZmLWJ5OiBMYXVyYSBBYmJvdHQgPGxhYmJvdHRAcmVkaGF0 LmNvbT4KLS0tCnYzOiBNaW5vciBmaXhlcyBzdWdnZXN0ZWQgYnkgQ2hyaXMgV2lsc29uCi0tLQog ZHJpdmVycy9ncHUvZHJtL3ZnZW0vdmdlbV9kcnYuYyB8IDEzMyArKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vdmdlbS92Z2VtX2Rydi5oIHwg ICAyICsKIDIgZmlsZXMgY2hhbmdlZCwgMTA2IGluc2VydGlvbnMoKyksIDI5IGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS92Z2VtL3ZnZW1fZHJ2LmMgYi9kcml2ZXJz L2dwdS9kcm0vdmdlbS92Z2VtX2Rydi5jCmluZGV4IDcyN2VlZDIuLmMyNTRjODAgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS92Z2VtL3ZnZW1fZHJ2LmMKKysrIGIvZHJpdmVycy9ncHUvZHJt L3ZnZW0vdmdlbV9kcnYuYwpAQCAtMzQsNiArMzQsOSBAQAogI2luY2x1ZGUgPGxpbnV4L3JhbWZz Lmg+CiAjaW5jbHVkZSA8bGludXgvc2htZW1fZnMuaD4KICNpbmNsdWRlIDxsaW51eC9kbWEtYnVm Lmg+CisKKyNpbmNsdWRlIDxkcm0vZHJtUC5oPgorCiAjaW5jbHVkZSAidmdlbV9kcnYuaCIKIAog I2RlZmluZSBEUklWRVJfTkFNRQkidmdlbSIKQEAgLTQ2LDYgKzQ5LDExIEBAIHN0YXRpYyB2b2lk IHZnZW1fZ2VtX2ZyZWVfb2JqZWN0KHN0cnVjdCBkcm1fZ2VtX29iamVjdCAqb2JqKQogewogCXN0 cnVjdCBkcm1fdmdlbV9nZW1fb2JqZWN0ICp2Z2VtX29iaiA9IHRvX3ZnZW1fYm8ob2JqKTsKIAor CWRybV9mcmVlX2xhcmdlKHZnZW1fb2JqLT5wYWdlcyk7CisKKwlpZiAob2JqLT5pbXBvcnRfYXR0 YWNoKQorCQlkcm1fcHJpbWVfZ2VtX2Rlc3Ryb3kob2JqLCB2Z2VtX29iai0+dGFibGUpOworCiAJ ZHJtX2dlbV9vYmplY3RfcmVsZWFzZShvYmopOwogCWtmcmVlKHZnZW1fb2JqKTsKIH0KQEAgLTU2 LDI2ICs2NCw0OSBAQCBzdGF0aWMgaW50IHZnZW1fZ2VtX2ZhdWx0KHN0cnVjdCB2bV9mYXVsdCAq dm1mKQogCXN0cnVjdCBkcm1fdmdlbV9nZW1fb2JqZWN0ICpvYmogPSB2bWEtPnZtX3ByaXZhdGVf ZGF0YTsKIAkvKiBXZSBkb24ndCB1c2Ugdm1mLT5wZ29mZiBzaW5jZSB0aGF0IGhhcyB0aGUgZmFr ZSBvZmZzZXQgKi8KIAl1bnNpZ25lZCBsb25nIHZhZGRyID0gdm1mLT5hZGRyZXNzOwotCXN0cnVj dCBwYWdlICpwYWdlOwotCi0JcGFnZSA9IHNobWVtX3JlYWRfbWFwcGluZ19wYWdlKGZpbGVfaW5v ZGUob2JqLT5iYXNlLmZpbHApLT5pX21hcHBpbmcsCi0JCQkJICAgICAgICh2YWRkciAtIHZtYS0+ dm1fc3RhcnQpID4+IFBBR0VfU0hJRlQpOwotCWlmICghSVNfRVJSKHBhZ2UpKSB7Ci0JCXZtZi0+ cGFnZSA9IHBhZ2U7Ci0JCXJldHVybiAwOwotCX0gZWxzZSBzd2l0Y2ggKFBUUl9FUlIocGFnZSkp IHsKLQkJY2FzZSAtRU5PU1BDOgotCQljYXNlIC1FTk9NRU06Ci0JCQlyZXR1cm4gVk1fRkFVTFRf T09NOwotCQljYXNlIC1FQlVTWToKLQkJCXJldHVybiBWTV9GQVVMVF9SRVRSWTsKLQkJY2FzZSAt RUZBVUxUOgotCQljYXNlIC1FSU5WQUw6Ci0JCQlyZXR1cm4gVk1fRkFVTFRfU0lHQlVTOwotCQlk ZWZhdWx0OgotCQkJV0FSTl9PTl9PTkNFKFBUUl9FUlIocGFnZSkpOwotCQkJcmV0dXJuIFZNX0ZB VUxUX1NJR0JVUzsKKwlpbnQgcmV0OworCWxvZmZfdCBudW1fcGFnZXM7CisJcGdvZmZfdCBwYWdl X29mZnNldDsKKwlwYWdlX29mZnNldCA9ICh2YWRkciAtIHZtYS0+dm1fc3RhcnQpID4+IFBBR0Vf U0hJRlQ7CisKKwludW1fcGFnZXMgPSBESVZfUk9VTkRfVVAob2JqLT5iYXNlLnNpemUsIFBBR0Vf U0laRSk7CisKKwlpZiAocGFnZV9vZmZzZXQgPiBudW1fcGFnZXMpCisJCXJldHVybiBWTV9GQVVM VF9TSUdCVVM7CisKKwlpZiAob2JqLT5wYWdlcykgeworCQlnZXRfcGFnZShvYmotPnBhZ2VzW3Bh Z2Vfb2Zmc2V0XSk7CisJCXZtZi0+cGFnZSA9IG9iai0+cGFnZXNbcGFnZV9vZmZzZXRdOworCQly ZXQgPSAwOworCX0gZWxzZSB7CisJCXN0cnVjdCBwYWdlICpwYWdlOworCisJCXBhZ2UgPSBzaG1l bV9yZWFkX21hcHBpbmdfcGFnZSgKKwkJCQkJZmlsZV9pbm9kZShvYmotPmJhc2UuZmlscCktPmlf bWFwcGluZywKKwkJCQkJcGFnZV9vZmZzZXQpOworCQlpZiAoIUlTX0VSUihwYWdlKSkgeworCQkJ dm1mLT5wYWdlID0gcGFnZTsKKwkJCXJldCA9IDA7CisJCX0gZWxzZSBzd2l0Y2ggKFBUUl9FUlIo cGFnZSkpIHsKKwkJCWNhc2UgLUVOT1NQQzoKKwkJCWNhc2UgLUVOT01FTToKKwkJCQlyZXQgPSBW TV9GQVVMVF9PT007CisJCQkJYnJlYWs7CisJCQljYXNlIC1FQlVTWToKKwkJCQlyZXQgPSBWTV9G QVVMVF9SRVRSWTsKKwkJCQlicmVhazsKKwkJCWNhc2UgLUVGQVVMVDoKKwkJCWNhc2UgLUVJTlZB TDoKKwkJCQlyZXQgPSBWTV9GQVVMVF9TSUdCVVM7CisJCQkJYnJlYWs7CisJCQlkZWZhdWx0Ogor CQkJCVdBUk5fT04oUFRSX0VSUihwYWdlKSk7CisJCQkJcmV0ID0gVk1fRkFVTFRfU0lHQlVTOwor CQkJCWJyZWFrOworCQl9CisKIAl9CisJcmV0dXJuIHJldDsKIH0KIAogc3RhdGljIGNvbnN0IHN0 cnVjdCB2bV9vcGVyYXRpb25zX3N0cnVjdCB2Z2VtX2dlbV92bV9vcHMgPSB7CkBAIC0xMTIsMTIg KzE0Myw4IEBAIHN0YXRpYyB2b2lkIHZnZW1fcG9zdGNsb3NlKHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYsIHN0cnVjdCBkcm1fZmlsZSAqZmlsZSkKIAlrZnJlZSh2ZmlsZSk7CiB9CiAKLS8qIGlvY3Rs cyAqLwotCi1zdGF0aWMgc3RydWN0IGRybV9nZW1fb2JqZWN0ICp2Z2VtX2dlbV9jcmVhdGUoc3Ry dWN0IGRybV9kZXZpY2UgKmRldiwKLQkJCQkJICAgICAgc3RydWN0IGRybV9maWxlICpmaWxlLAot CQkJCQkgICAgICB1bnNpZ25lZCBpbnQgKmhhbmRsZSwKLQkJCQkJICAgICAgdW5zaWduZWQgbG9u ZyBzaXplKQorc3RhdGljIHN0cnVjdCBkcm1fdmdlbV9nZW1fb2JqZWN0ICpfX3ZnZW1fZ2VtX2Ny ZWF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAorCQkJCQkJdW5zaWduZWQgbG9uZyBzaXplKQog ewogCXN0cnVjdCBkcm1fdmdlbV9nZW1fb2JqZWN0ICpvYmo7CiAJaW50IHJldDsKQEAgLTEyNyw4 ICsxNTQsMzEgQEAgc3RhdGljIHN0cnVjdCBkcm1fZ2VtX29iamVjdCAqdmdlbV9nZW1fY3JlYXRl KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCXJldHVybiBFUlJfUFRSKC1FTk9NRU0pOwogCiAJ cmV0ID0gZHJtX2dlbV9vYmplY3RfaW5pdChkZXYsICZvYmotPmJhc2UsIHJvdW5kdXAoc2l6ZSwg UEFHRV9TSVpFKSk7Ci0JaWYgKHJldCkKLQkJZ290byBlcnJfZnJlZTsKKwlpZiAocmV0KSB7CisJ CWtmcmVlKG9iaik7CisJCXJldHVybiBFUlJfUFRSKHJldCk7CisJfQorCisJcmV0dXJuIG9iajsK K30KKworc3RhdGljIHZvaWQgX192Z2VtX2dlbV9kZXN0cm95KHN0cnVjdCBkcm1fdmdlbV9nZW1f b2JqZWN0ICpvYmopCit7CisJZHJtX2dlbV9vYmplY3RfcmVsZWFzZSgmb2JqLT5iYXNlKTsKKwlr ZnJlZShvYmopOworfQorCitzdGF0aWMgc3RydWN0IGRybV9nZW1fb2JqZWN0ICp2Z2VtX2dlbV9j cmVhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKKwkJCQkJICAgICAgc3RydWN0IGRybV9maWxl ICpmaWxlLAorCQkJCQkgICAgICB1bnNpZ25lZCBpbnQgKmhhbmRsZSwKKwkJCQkJICAgICAgdW5z aWduZWQgbG9uZyBzaXplKQoreworCXN0cnVjdCBkcm1fdmdlbV9nZW1fb2JqZWN0ICpvYmo7CisJ aW50IHJldDsKKworCW9iaiA9IF9fdmdlbV9nZW1fY3JlYXRlKGRldiwgc2l6ZSk7CisJaWYgKElT X0VSUihvYmopKQorCQlyZXR1cm4gRVJSX0NBU1Qob2JqKTsKIAogCXJldCA9IGRybV9nZW1faGFu ZGxlX2NyZWF0ZShmaWxlLCAmb2JqLT5iYXNlLCBoYW5kbGUpOwogCWRybV9nZW1fb2JqZWN0X3Vu cmVmZXJlbmNlX3VubG9ja2VkKCZvYmotPmJhc2UpOwpAQCAtMTM3LDkgKzE4Nyw4IEBAIHN0YXRp YyBzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKnZnZW1fZ2VtX2NyZWF0ZShzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2LAogCiAJcmV0dXJuICZvYmotPmJhc2U7CiAKLWVycl9mcmVlOgotCWtmcmVlKG9iaik7 CiBlcnI6CisJX192Z2VtX2dlbV9kZXN0cm95KG9iaik7CiAJcmV0dXJuIEVSUl9QVFIocmV0KTsK IH0KIApAQCAtMjU2LDYgKzMwNSwyOSBAQCBzdGF0aWMgc3RydWN0IHNnX3RhYmxlICp2Z2VtX3By aW1lX2dldF9zZ190YWJsZShzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm9iaikKIAlyZXR1cm4gc3Q7 CiB9CiAKK3N0YXRpYyBzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKnZnZW1fcHJpbWVfaW1wb3J0X3Nn X3RhYmxlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCisJCQlzdHJ1Y3QgZG1hX2J1Zl9hdHRhY2ht ZW50ICphdHRhY2gsIHN0cnVjdCBzZ190YWJsZSAqc2cpCit7CisJc3RydWN0IGRybV92Z2VtX2dl bV9vYmplY3QgKm9iajsKKwlpbnQgbnBhZ2VzOworCisJb2JqID0gX192Z2VtX2dlbV9jcmVhdGUo ZGV2LCBhdHRhY2gtPmRtYWJ1Zi0+c2l6ZSk7CisJaWYgKElTX0VSUihvYmopKQorCQlyZXR1cm4g RVJSX0NBU1Qob2JqKTsKKworCW5wYWdlcyA9IFBBR0VfQUxJR04oYXR0YWNoLT5kbWFidWYtPnNp emUpIC8gUEFHRV9TSVpFOworCisJb2JqLT50YWJsZSA9IHNnOworCW9iai0+cGFnZXMgPSBkcm1f bWFsbG9jX2FiKG5wYWdlcywgc2l6ZW9mKHN0cnVjdCBwYWdlICopKTsKKwlpZiAoIW9iai0+cGFn ZXMpIHsKKwkJX192Z2VtX2dlbV9kZXN0cm95KG9iaik7CisJCXJldHVybiBFUlJfUFRSKC1FTk9N RU0pOworCX0KKwlkcm1fcHJpbWVfc2dfdG9fcGFnZV9hZGRyX2FycmF5cyhvYmotPnRhYmxlLCBv YmotPnBhZ2VzLCBOVUxMLAorCQkJCQlucGFnZXMpOworCXJldHVybiAmb2JqLT5iYXNlOworfQor CiBzdGF0aWMgdm9pZCAqdmdlbV9wcmltZV92bWFwKHN0cnVjdCBkcm1fZ2VtX29iamVjdCAqb2Jq KQogewogCWxvbmcgbl9wYWdlcyA9IG9iai0+c2l6ZSA+PiBQQUdFX1NISUZUOwpAQCAtMzE0LDgg KzM4NiwxMSBAQCBzdGF0aWMgc3RydWN0IGRybV9kcml2ZXIgdmdlbV9kcml2ZXIgPSB7CiAJLmR1 bWJfbWFwX29mZnNldAkJPSB2Z2VtX2dlbV9kdW1iX21hcCwKIAogCS5wcmltZV9oYW5kbGVfdG9f ZmQgPSBkcm1fZ2VtX3ByaW1lX2hhbmRsZV90b19mZCwKKwkucHJpbWVfZmRfdG9faGFuZGxlID0g ZHJtX2dlbV9wcmltZV9mZF90b19oYW5kbGUsCiAJLmdlbV9wcmltZV9waW4gPSB2Z2VtX3ByaW1l X3BpbiwKKwkuZ2VtX3ByaW1lX2ltcG9ydCA9IGRybV9nZW1fcHJpbWVfaW1wb3J0X3BsYXRmb3Jt LAogCS5nZW1fcHJpbWVfZXhwb3J0ID0gZHJtX2dlbV9wcmltZV9leHBvcnQsCisJLmdlbV9wcmlt ZV9pbXBvcnRfc2dfdGFibGUgPSB2Z2VtX3ByaW1lX2ltcG9ydF9zZ190YWJsZSwKIAkuZ2VtX3By aW1lX2dldF9zZ190YWJsZSA9IHZnZW1fcHJpbWVfZ2V0X3NnX3RhYmxlLAogCS5nZW1fcHJpbWVf dm1hcCA9IHZnZW1fcHJpbWVfdm1hcCwKIAkuZ2VtX3ByaW1lX3Z1bm1hcCA9IHZnZW1fcHJpbWVf dnVubWFwLApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3ZnZW0vdmdlbV9kcnYuaCBiL2Ry aXZlcnMvZ3B1L2RybS92Z2VtL3ZnZW1fZHJ2LmgKaW5kZXggY2I1OWM3YS4uMWFhZTAxNCAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3ZnZW0vdmdlbV9kcnYuaAorKysgYi9kcml2ZXJzL2dw dS9kcm0vdmdlbS92Z2VtX2Rydi5oCkBAIC00Myw2ICs0Myw4IEBAIHN0cnVjdCB2Z2VtX2ZpbGUg ewogI2RlZmluZSB0b192Z2VtX2JvKHgpIGNvbnRhaW5lcl9vZih4LCBzdHJ1Y3QgZHJtX3ZnZW1f Z2VtX29iamVjdCwgYmFzZSkKIHN0cnVjdCBkcm1fdmdlbV9nZW1fb2JqZWN0IHsKIAlzdHJ1Y3Qg ZHJtX2dlbV9vYmplY3QgYmFzZTsKKwlzdHJ1Y3QgcGFnZSAqKnBhZ2VzOworCXN0cnVjdCBzZ190 YWJsZSAqdGFibGU7CiB9OwogCiBpbnQgdmdlbV9mZW5jZV9vcGVuKHN0cnVjdCB2Z2VtX2ZpbGUg KmZpbGUpOwotLSAKMi43LjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2Ry aS1kZXZlbAo=