From: Tvrtko Ursulin Subject: [RFC 1/2] drm/i915: Move ioremap_wc tracking onto VMA Date: Tue, 12 Apr 2016 16:56:51 +0100 Message-ID: <1460476612-10427-1-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 mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id CBCAD6E70C for ; Tue, 12 Apr 2016 15:56:56 +0000 (UTC) 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 RnJvbTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+CgpCeSB0cmFja2lu ZyB0aGUgaW9tYXBwaW5nIG9uIHRoZSBWTUEgaXRzZWxmLCB3ZSBjYW4gc2hhcmUgdGhhdCBhcmVh CmJldHdlZW4gbXVsdGlwbGUgdXNlcnMuIEFsc28gYnkgb25seSByZXZva2luZyB0aGUgaW9tYXBw aW5nIHVwb24KdW5iaW5kaW5nIGZyb20gdGhlIG1hcHBhYmxlIHBvcnRpb24gb2YgdGhlIEdHVFQs IHdlIGNhbiBrZWVwIHRoYXQgaW9tYXAKYWNyb3NzIG11bHRpcGxlIGludm9jYXRpb25zIChlLmcu IGV4ZWNsaXN0cyBjb250ZXh0IHBpbm5pbmcpLgoKdjI6CiAgKiBSZWJhc2Ugb24gbmlnaHRseTsK ICAqIGFkZGVkIGtlcm5lbGRvYy4gKFR2cnRrbyBVcnN1bGluKQoKU2lnbmVkLW9mZi1ieTogQ2hy aXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+ClNpZ25lZC1vZmYtYnk6IFR2cnRr byBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW0uYyAgICAgfCAgMiArKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW1fZ3R0LmMgfCAzOCArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaCB8IDM4ICsrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiZGV2LmMgIHwg IDggKysrLS0tLS0KIDQgZmlsZXMgY2hhbmdlZCwgODEgaW5zZXJ0aW9ucygrKSwgNSBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRleCBiMzdmZmVhOGI0NTguLjZhNDg1NjMw NTk1ZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCkBAIC0zMzkzLDYgKzMzOTMsOCBAQCBzdGF0 aWMgaW50IF9faTkxNV92bWFfdW5iaW5kKHN0cnVjdCBpOTE1X3ZtYSAqdm1hLCBib29sIHdhaXQp CiAJCXJldCA9IGk5MTVfZ2VtX29iamVjdF9wdXRfZmVuY2Uob2JqKTsKIAkJaWYgKHJldCkKIAkJ CXJldHVybiByZXQ7CisKKwkJaTkxNV92bWFfaW91bm1hcCh2bWEpOwogCX0KIAogCXRyYWNlX2k5 MTVfdm1hX3VuYmluZCh2bWEpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9nZW1fZ3R0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwppbmRleCBj NWNiMDQ5MDc1MjUuLmIyYThhMTRlOGRjYiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9nZW1fZ3R0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0 LmMKQEAgLTM2MjYsMyArMzYyNiw0MSBAQCBpOTE1X2dndHRfdmlld19zaXplKHN0cnVjdCBkcm1f aTkxNV9nZW1fb2JqZWN0ICpvYmosCiAJCXJldHVybiBvYmotPmJhc2Uuc2l6ZTsKIAl9CiB9CisK K3ZvaWQgKmk5MTVfdm1hX2lvbWFwKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwK KwkJICAgICBzdHJ1Y3QgaTkxNV92bWEgKnZtYSkKK3sKKwlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29i amVjdCAqb2JqID0gdm1hLT5vYmo7CisJc3RydWN0IGk5MTVfZ2d0dCAqZ2d0dCA9ICZkZXZfcHJp di0+Z2d0dDsKKworCWlmIChXQVJOX09OKCFvYmotPm1hcF9hbmRfZmVuY2VhYmxlKSkKKwkJcmV0 dXJuIEVSUl9QVFIoLUVOT0RFVik7CisKKwlCVUdfT04oIXZtYS0+aXNfZ2d0dCk7CisJQlVHX09O KHZtYS0+Z2d0dF92aWV3LnR5cGUgIT0gSTkxNV9HR1RUX1ZJRVdfTk9STUFMKTsKKwlCVUdfT04o KHZtYS0+Ym91bmQgJiBHTE9CQUxfQklORCkgPT0gMCk7CisKKwlpZiAodm1hLT5pb21hcCA9PSBO VUxMKSB7CisJCXZvaWQgKnB0cjsKKworCQlwdHIgPSBpb3JlbWFwX3djKGdndHQtPm1hcHBhYmxl X2Jhc2UgKyB2bWEtPm5vZGUuc3RhcnQsCisJCQkJIG9iai0+YmFzZS5zaXplKTsKKwkJaWYgKHB0 ciA9PSBOVUxMKSB7CisJCQlpbnQgcmV0OworCisJCQkvKiBUb28gbWFueSBhcmVhcyBhbHJlYWR5 IGFsbG9jYXRlZD8gKi8KKwkJCXJldCA9IGk5MTVfZ2VtX2V2aWN0X3ZtKHZtYS0+dm0sIHRydWUp OworCQkJaWYgKHJldCkKKwkJCQlyZXR1cm4gRVJSX1BUUihyZXQpOworCisJCQlwdHIgPSBpb3Jl bWFwX3djKGdndHQtPm1hcHBhYmxlX2Jhc2UgKyB2bWEtPm5vZGUuc3RhcnQsCisJCQkJCSBvYmot PmJhc2Uuc2l6ZSk7CisJCQlpZiAocHRyID09IE5VTEwpCisJCQkJcmV0dXJuIEVSUl9QVFIoLUVO T01FTSk7CisJCX0KKworCQl2bWEtPmlvbWFwID0gcHRyOworCX0KKworCXJldHVybiB2bWEtPmlv bWFwOworfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0Lmgg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaAppbmRleCBkN2RkM2Q4YTg3NTgu LjUyNmZkYmM3MWFjZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1f Z3R0LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmgKQEAgLTE3NSw2 ICsxNzUsNyBAQCBzdHJ1Y3QgaTkxNV92bWEgewogCXN0cnVjdCBkcm1fbW1fbm9kZSBub2RlOwog CXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmo7CiAJc3RydWN0IGk5MTVfYWRkcmVzc19z cGFjZSAqdm07CisJdm9pZCAqaW9tYXA7CiAKIAkvKiogRmxhZ3MgYW5kIGFkZHJlc3Mgc3BhY2Ug dGhpcyBWTUEgaXMgYm91bmQgdG8gKi8KICNkZWZpbmUgR0xPQkFMX0JJTkQJKDE8PDApCkBAIC01 NTksNCArNTYwLDQxIEBAIHNpemVfdAogaTkxNV9nZ3R0X3ZpZXdfc2l6ZShzdHJ1Y3QgZHJtX2k5 MTVfZ2VtX29iamVjdCAqb2JqLAogCQkgICAgY29uc3Qgc3RydWN0IGk5MTVfZ2d0dF92aWV3ICp2 aWV3KTsKIAorLyoqCisgKiBpOTE1X3ZtYV9pb21hcCAtIGNhbGxzIGlvcmVtYXBfd2MgdG8gbWFw IHRoZSBHR1RUIFZNQSB2aWEgdGhlIGFwZXJ0dXJlCisgKiBAZGV2X3ByaXY6IGk5MTUgcHJpdmF0 ZSBwb2ludGVyCisgKiBAdm1hOiBWTUEgdG8gaW9tYXAKKyAqCisgKiBUaGUgcGFzc2VkIGluIFZN QSBoYXMgdG8gYmUgcGlubmVkIGluIHRoZSBnbG9iYWwgR1RUIG1hcHBhYmxlIHJlZ2lvbi4gT3Ig aW4KKyAqIG90aGVyIHdvcmRzIGNhbGxlcnMgYXJlIHJlc3BvbnNpYmxlIGZvciBtYW5hZ2luZyB0 aGUgVk1BIHBpbm5lZCBsaWZldGltZSBhbmQKKyAqIGVuc3VyaW5nIGl0IGNvdmVycyB0aGUgdXNl IG9mIHRoZSByZXR1cm5lZCBtYXBwaW5nLgorICoKKyAqIENhbGxlcnMgbXVzdCBob2xkIHRoZSBz dHJ1Y3RfbXV0ZXguCisgKgorICogUmV0dXJucyBhIHZhbGlkIGlvbWFwcGVkIHBvaW50ZXIgb3Ig RVJSX1BUUi4KKyAqLwordm9pZCAqaTkxNV92bWFfaW9tYXAoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2LAorCQkgICAgIHN0cnVjdCBpOTE1X3ZtYSAqdm1hKTsKKworLyoqCisgKiBp OTE1X3ZtYV9pb3VubWFwIC0gdW5tYXBzIHRoZSBtYXBwaW5nIHJldHVybmVkIGZyb20gaTkxNV92 bWFfaW9tYXAKKyAqIEBkZXZfcHJpdjogaTkxNSBwcml2YXRlIHBvaW50ZXIKKyAqIEB2bWE6IFZN QSB0byB1bm1hcAorICoKKyAqIFVubWFwcyB0aGUgcHJldmlvdXNseSBpb21hcHBlZCBWTUEgdXNp bmcgaW91bm1hcC4KKyAqCisgKiBVc2VycyBvZiBpOTE1X3ZtYV9pb21hcCBzaG91bGQgbm90IG1h bnVhbGx5IHVubWFwIGJ5IGNhbGxpbmcgdGhpcyBmdW5jdGlvbgorICogaWYgdGhleSB3YW50IHRv IHRha2UgYWR2YW50YWdlIG9mIHRoZSBtYXBwaW5nIGdldHRpbmcgY2FjaGVkIGluIHRoZSBWTUEu CisgKgorICogQ2FsbGVycyBtdXN0IGhvbGQgdGhlIHN0cnVjdF9tdXRleC4KKyAqLworc3RhdGlj IGlubGluZSB2b2lkIGk5MTVfdm1hX2lvdW5tYXAoc3RydWN0IGk5MTVfdm1hICp2bWEpCit7CisJ aWYgKHZtYS0+aW9tYXAgPT0gTlVMTCkKKwkJcmV0dXJuOworCisJaW91bm1hcCh2bWEtPmlvbWFw KTsKKwl2bWEtPmlvbWFwID0gTlVMTDsKK30KKwogI2VuZGlmCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9mYmRldi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZmJkZXYuYwppbmRleCA3OWFjMjAyZjM4NzAuLjUxNWEyMjE0ODI3ZSAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZmJkZXYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9mYmRldi5jCkBAIC0yNTEsMTIgKzI1MSwxMCBAQCBzdGF0aWMgaW50IGludGVsZmJf Y3JlYXRlKHN0cnVjdCBkcm1fZmJfaGVscGVyICpoZWxwZXIsCiAJaW5mby0+Zml4LnNtZW1fc3Rh cnQgPSBkZXYtPm1vZGVfY29uZmlnLmZiX2Jhc2UgKyBpOTE1X2dlbV9vYmpfZ2d0dF9vZmZzZXQo b2JqKTsKIAlpbmZvLT5maXguc21lbV9sZW4gPSBzaXplOwogCi0JaW5mby0+c2NyZWVuX2Jhc2Ug PQotCQlpb3JlbWFwX3djKGdndHQtPm1hcHBhYmxlX2Jhc2UgKyBpOTE1X2dlbV9vYmpfZ2d0dF9v ZmZzZXQob2JqKSwKLQkJCSAgIHNpemUpOwotCWlmICghaW5mby0+c2NyZWVuX2Jhc2UpIHsKKwlp bmZvLT5zY3JlZW5fYmFzZSA9IGk5MTVfdm1hX2lvbWFwKGRldl9wcml2LCBpOTE1X2dlbV9vYmpf dG9fZ2d0dChvYmopKTsKKwlpZiAoSVNfRVJSKGluZm8tPnNjcmVlbl9iYXNlKSkgewogCQlEUk1f RVJST1IoIkZhaWxlZCB0byByZW1hcCBmcmFtZWJ1ZmZlciBpbnRvIHZpcnR1YWwgbWVtb3J5XG4i KTsKLQkJcmV0ID0gLUVOT1NQQzsKKwkJcmV0ID0gUFRSX0VSUihpbmZvLT5zY3JlZW5fYmFzZSk7 CiAJCWdvdG8gb3V0X2Rlc3Ryb3lfZmJpOwogCX0KIAlpbmZvLT5zY3JlZW5fc2l6ZSA9IHNpemU7 Ci0tIAoxLjkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3Jn Cmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4 Cg==