From: Tvrtko Ursulin Subject: [PATCH v2 3/5] drm/i915: Add support for CPU mapping to DRM_IOCTL_I915_GEM_MMAP_GTT Date: Wed, 27 Jan 2016 15:21:48 +0000 Message-ID: <1453908108-12869-1-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1453820013-3908-4-git-send-email-tvrtko.ursulin@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 9F9A76E6BF for ; Wed, 27 Jan 2016 07:21:51 -0800 (PST) In-Reply-To: <1453820013-3908-4-git-send-email-tvrtko.ursulin@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClRoaXMgZW5h YmxlcyBtYXBwaW5nIHZpYSBDUFUgdXNpbmcgdGhlIHByb3BlciBEUk0gbW1hcCBBUEkgZm9yCmJl dHRlciBkZWJ1ZyAoVmFsZ3JpbmQpIGFuZCBpbXBsZW1lbnRhdGlvbiBzeW1tZXRyeSBpbiB0aGUK ZHJpdmVyLgoKdjI6CiAqIFVzZSBub3JtYWwgbXV0ZXgsIHNraXAgZG9tYWluIG1hbmFnZW1lbnQg YW5kIHBpbiBwYWdlcy4gKENocmlzIFdpbHNvbikKICogTm8gbmVlZCB0byBkcm9wIHN0cnVjdCBt dXRleCBvdmVyIHZtYV9pbnNlcnRfcGZuLgogKiBUdXJuIG9mZiB3cml0ZS1jb21iaW5lIHNldCB1 cCBieSB0aGUgRFJNIGNvcmUuCiAqIENvbW1pdCBtZXNzYWdlLgoKU2lnbmVkLW9mZi1ieTogVHZy dGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KQ2M6IENocmlzIFdpbHNvbiA8 Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z2VtLmMgfCA5OCArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLQogaW5j bHVkZS91YXBpL2RybS9pOTE1X2RybS5oICAgICB8ICAzICsrCiAyIGZpbGVzIGNoYW5nZWQsIDk1 IGluc2VydGlvbnMoKyksIDYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKaW5k ZXggYTFlMjgzMjA0N2UyLi5hNjkwY2VlMzFmMjAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpA QCAtMTk1NCw2ICsxOTU0LDYyIEBAIG91dDoKIAlyZXR1cm4gaTkxNV9nZW1fcmV0X3RvX3ZtX3Jl dChkZXZfcHJpdiwgcmV0KTsKIH0KIAorc3RhdGljIGludAoraTkxNV9nZW1fY3B1X2ZhdWx0KHN0 cnVjdCB2bV9hcmVhX3N0cnVjdCAqdm1hLCBzdHJ1Y3Qgdm1fZmF1bHQgKnZtZikKK3sKKwlzdHJ1 Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqID0gdG9faW50ZWxfYm8odm1hLT52bV9wcml2YXRl X2RhdGEpOworCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBvYmotPmJhc2UuZGV2OworCXN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CisJYm9vbCB3 cml0ZSA9ICEhKHZtZi0+ZmxhZ3MgJiBGQVVMVF9GTEFHX1dSSVRFKTsKKwlwZ29mZl90IHBhZ2Vf b2Zmc2V0OworCXN0cnVjdCBwYWdlICpwYWdlOworCXVuc2lnbmVkIGxvbmcgcGdwcm90OworCWlu dCByZXQ7CisKKwkvKiBXZSBkb24ndCB1c2Ugdm1mLT5wZ29mZiBzaW5jZSB0aGF0IGhhcyB0aGUg ZmFrZSBvZmZzZXQgKi8KKwlwYWdlX29mZnNldCA9ICgodW5zaWduZWQgbG9uZyl2bWYtPnZpcnR1 YWxfYWRkcmVzcyAtIHZtYS0+dm1fc3RhcnQpID4+CisJCQlQQUdFX1NISUZUOworCisJdHJhY2Vf aTkxNV9nZW1fb2JqZWN0X2ZhdWx0KG9iaiwgcGFnZV9vZmZzZXQsIHRydWUsIHdyaXRlKTsKKwor CWludGVsX3J1bnRpbWVfcG1fZ2V0KGRldl9wcml2KTsKKworCXJldCA9IG11dGV4X2xvY2tfaW50 ZXJydXB0aWJsZSgmZGV2LT5zdHJ1Y3RfbXV0ZXgpOworCWlmIChyZXQpCisJCWdvdG8gb3V0Owor CisJcmV0ID0gaTkxNV9nZW1fb2JqZWN0X2dldF9wYWdlcyhvYmopOworCWlmIChyZXQpCisJCWdv dG8gb3V0X3VubG9jazsKKworCWk5MTVfZ2VtX29iamVjdF9waW5fcGFnZXMob2JqKTsKKworCXBh Z2UgPSBpOTE1X2dlbV9vYmplY3RfZ2V0X3BhZ2Uob2JqLCBwYWdlX29mZnNldCk7CisJaWYgKCFw YWdlKSB7CisJCXJldCA9IC1FRkFVTFQ7CisJCWdvdG8gb3V0X3VucGluOworCX0KKworCXJldCA9 IHZtX2luc2VydF9wZm4odm1hLCAodW5zaWduZWQgbG9uZyl2bWYtPnZpcnR1YWxfYWRkcmVzcywK KwkJCSAgICBwYWdlX3RvX3BmbihwYWdlKSk7CisJaWYgKHJldCA9PSAwKSB7CisJCS8qIERSTSBj b3JlIHNldHMgdXAgV0MgYnkgZGVmYXVsdCBhbmQgd2Ugd2FudCBXQi4gKi8KKwkJcGdwcm90ID0g cGdwcm90X3ZhbCh2bV9nZXRfcGFnZV9wcm90KHZtYS0+dm1fZmxhZ3MpKTsKKwkJcGdwcm90ICY9 IH5fUEFHRV9DQUNIRV9NQVNLOworCQlwZ3Byb3QgfD0gY2FjaGVtb2RlMnByb3R2YWwoX1BBR0Vf Q0FDSEVfTU9ERV9XQik7CisJCXZtYS0+dm1fcGFnZV9wcm90ID0gX19wZ3Byb3QocGdwcm90KTsK Kwl9CisKK291dF91bnBpbjoKKwlpOTE1X2dlbV9vYmplY3RfdW5waW5fcGFnZXMob2JqKTsKK291 dF91bmxvY2s6CisJbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7CitvdXQ6CisJaW50 ZWxfcnVudGltZV9wbV9wdXQoZGV2X3ByaXYpOworCisJcmV0dXJuIGk5MTVfZ2VtX3JldF90b192 bV9yZXQoZGV2X3ByaXYsIHJldCk7Cit9CisKIC8qKgogICogaTkxNV9nZW1fcmVsZWFzZV9tbWFw IC0gcmVtb3ZlIHBoeXNpY2FsIHBhZ2UgbWFwcGluZ3MKICAqIEBvYmo6IG9iaiBpbiBxdWVzdGlv bgpAQCAtMjA3OCwxMSArMjEzNCwxOCBAQCBzdGF0aWMgdm9pZCBpOTE1X2dlbV9vYmplY3RfZnJl ZV9tbWFwX29mZnNldChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqKQogCWRybV9nZW1f ZnJlZV9tbWFwX29mZnNldCgmb2JqLT5iYXNlKTsKIH0KIAotaW50Ci1pOTE1X2dlbV9tbWFwX2d0 dChzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUsCi0JCSAgc3RydWN0IGRybV9kZXZpY2UgKmRldiwKLQkJ ICB1aW50MzJfdCBoYW5kbGUsCi0JCSAgdWludDY0X3QgKm9mZnNldCkKK3N0YXRpYyBjb25zdCBz dHJ1Y3Qgdm1fb3BlcmF0aW9uc19zdHJ1Y3QgaTkxNV9nZW1fY3B1X3ZtX29wcyA9IHsKKwkuZmF1 bHQgPSBpOTE1X2dlbV9jcHVfZmF1bHQsCisJLm9wZW4gPSBkcm1fZ2VtX3ZtX29wZW4sCisJLmNs b3NlID0gZHJtX2dlbV92bV9jbG9zZSwKK307CisKK3N0YXRpYyBpbnQKK2k5MTVfZ2VtX21tYXAo c3RydWN0IGRybV9maWxlICpmaWxlLAorCSAgICAgIHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCisJ ICAgICAgdWludDMyX3QgaGFuZGxlLAorCSAgICAgIHVpbnQzMl90IGZsYWdzLAorCSAgICAgIHVp bnQ2NF90ICpvZmZzZXQpCiB7CiAJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iajsKIAlp bnQgcmV0OwpAQCAtMjEwMywxMCArMjE2NiwyMyBAQCBpOTE1X2dlbV9tbWFwX2d0dChzdHJ1Y3Qg ZHJtX2ZpbGUgKmZpbGUsCiAJCWdvdG8gb3V0OwogCX0KIAorCWlmICghb2JqLT5iYXNlLmZpbHAg JiYgKGZsYWdzICYgSTkxNV9NTUFQMl9DUFUpKSB7CisJCURSTV9ERUJVRygiQXR0ZW1wdGluZyB0 byBtbWFwIG5vbi1zaG0gYmFzZWQgb2JqZWN0IHZpYSBDUFUhXG4iKTsKKwkJcmV0ID0gLUVJTlZB TDsKKwkJZ290byBvdXQ7CisJfQorCiAJcmV0ID0gaTkxNV9nZW1fb2JqZWN0X2NyZWF0ZV9tbWFw X29mZnNldChvYmopOwogCWlmIChyZXQpCiAJCWdvdG8gb3V0OwogCisJaWYgKGZsYWdzICYgSTkx NV9NTUFQMl9DUFUpIHsKKwkJcmV0ID0gZHJtX3ZtYV9ub2RlX3NldF92bV9vcHMoJm9iai0+YmFz ZS52bWFfbm9kZSwKKwkJCQkJICAgICAgJmk5MTVfZ2VtX2NwdV92bV9vcHMpOworCQlpZiAocmV0 KQorCQkJZ290byBvdXQ7CisJfQorCiAJKm9mZnNldCA9IGRybV92bWFfbm9kZV9vZmZzZXRfYWRk cigmb2JqLT5iYXNlLnZtYV9ub2RlKTsKIAogb3V0OgpAQCAtMjExNiw2ICsyMTkyLDE1IEBAIHVu bG9jazoKIAlyZXR1cm4gcmV0OwogfQogCitpbnQKK2k5MTVfZ2VtX21tYXBfZ3R0KHN0cnVjdCBk cm1fZmlsZSAqZmlsZSwKKwkJICBzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAorCQkgIHVpbnQzMl90 IGhhbmRsZSwKKwkJICB1aW50NjRfdCAqb2Zmc2V0KQoreworCXJldHVybiBpOTE1X2dlbV9tbWFw KGZpbGUsIGRldiwgaGFuZGxlLCAwLCBvZmZzZXQpOworfQorCiAvKioKICAqIGk5MTVfZ2VtX21t YXBfZ3R0X2lvY3RsIC0gcHJlcGFyZSBhbiBvYmplY3QgZm9yIEdUVCBtbWFwJ2luZwogICogQGRl djogRFJNIGRldmljZQpAQCAtMjEzNyw3ICsyMjIyLDggQEAgaTkxNV9nZW1fbW1hcF9ndHRfaW9j dGwoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKIHsKIAlzdHJ1Y3QgZHJtX2k5 MTVfZ2VtX21tYXBfZ3R0ICphcmdzID0gZGF0YTsKIAotCXJldHVybiBpOTE1X2dlbV9tbWFwX2d0 dChmaWxlLCBkZXYsIGFyZ3MtPmhhbmRsZSwgJmFyZ3MtPm9mZnNldCk7CisJcmV0dXJuIGk5MTVf Z2VtX21tYXAoZmlsZSwgZGV2LCBhcmdzLT5oYW5kbGUsIGFyZ3MtPmZsYWdzLAorCQkJICAgICAm YXJncy0+b2Zmc2V0KTsKIH0KIAogLyogSW1tZWRpYXRlbHkgZGlzY2FyZCB0aGUgYmFja2luZyBz dG9yYWdlICovCmRpZmYgLS1naXQgYS9pbmNsdWRlL3VhcGkvZHJtL2k5MTVfZHJtLmggYi9pbmNs dWRlL3VhcGkvZHJtL2k5MTVfZHJtLmgKaW5kZXggNmExOTM3MTM5MWZhLi4zNTlhMzZkNjA0YmIg MTAwNjQ0Ci0tLSBhL2luY2x1ZGUvdWFwaS9kcm0vaTkxNV9kcm0uaAorKysgYi9pbmNsdWRlL3Vh cGkvZHJtL2k5MTVfZHJtLmgKQEAgLTUyOCw2ICs1MjgsOSBAQCBzdHJ1Y3QgZHJtX2k5MTVfZ2Vt X21tYXBfZ3R0IHsKIAkgKiBUaGlzIGlzIGEgZml4ZWQtc2l6ZSB0eXBlIGZvciAzMi82NCBjb21w YXRpYmlsaXR5LgogCSAqLwogCV9fdTY0IG9mZnNldDsKKworI2RlZmluZSBJOTE1X01NQVAyX0NQ VSAgIDB4MQorCV9fdTY0IGZsYWdzOwogfTsKIAogc3RydWN0IGRybV9pOTE1X2dlbV9zZXRfZG9t YWluIHsKLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVs LWdmeAo=