From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [CI 09/20] drm/i915: Stop mapping the scratch page into CPU space Date: Thu, 19 May 2016 12:32:45 +0100 Message-ID: <1463657576-32063-9-git-send-email-chris@chris-wilson.co.uk> References: <1463657576-32063-1-git-send-email-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3566888AEF for ; Thu, 19 May 2016 11:33:14 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id r12so20224434wme.0 for ; Thu, 19 May 2016 04:33:14 -0700 (PDT) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id q76sm9429419wmd.6.2016.05.19.04.33.11 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 May 2016 04:33:11 -0700 (PDT) In-Reply-To: <1463657576-32063-1-git-send-email-chris@chris-wilson.co.uk> 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 QWZ0ZXIgdGhlIGVsaW1pbmF0aW9uIG9mIHVzaW5nIHRoZSBzY3JhdGNoIHBhZ2UgZm9yIElyb25s YWtlJ3MKYnJlYWRjcnVtYiwgd2Ugbm8gbG9uZ2VyIG5lZWQgdG8ga21hcCB0aGUgb2JqZWN0LiBX ZSB0aGVyZWZvcmUgY2FuIG1vdmUKaXQgaW50byB0aGUgaGlnaCB1bm1hcHBhYmxlIHNwYWNlIGFu ZCBkbyBub3QgbmVlZCB0byBmb3JjZSB0aGUgb2JqZWN0IHRvCmJlIGNvaGVyZW50IChpLmUuIHNu b29wZWQgb24gIWxsYyBwbGF0Zm9ybXMpLgoKU2lnbmVkLW9mZi1ieTogQ2hyaXMgV2lsc29uIDxj aHJpc0BjaHJpcy13aWxzb24uY28udWs+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf cmluZ2J1ZmZlci5jIHwgNDAgKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmggfCAgMSAtCiAyIGZpbGVzIGNoYW5n ZWQsIDExIGluc2VydGlvbnMoKyksIDMwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3JpbmdidWZmZXIuYwppbmRleCBiM2ZjNTAwNTU3N2QuLjkwZGZhYmIzNzJhOCAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwpAQCAtNjQzLDU4ICs2NDMsNDAg QEAgb3V0OgogCXJldHVybiByZXQ7CiB9CiAKLXZvaWQKLWludGVsX2ZpbmlfcGlwZV9jb250cm9s KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKK3ZvaWQgaW50ZWxfZmluaV9waXBlX2Nv bnRyb2woc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogewogCWlmIChlbmdpbmUtPnNj cmF0Y2gub2JqID09IE5VTEwpCiAJCXJldHVybjsKIAotCWlmIChJTlRFTF9HRU4oZW5naW5lLT5p OTE1KSA+PSA1KSB7Ci0JCWt1bm1hcChzZ19wYWdlKGVuZ2luZS0+c2NyYXRjaC5vYmotPnBhZ2Vz LT5zZ2wpKTsKLQkJaTkxNV9nZW1fb2JqZWN0X2dndHRfdW5waW4oZW5naW5lLT5zY3JhdGNoLm9i aik7Ci0JfQotCisJaTkxNV9nZW1fb2JqZWN0X2dndHRfdW5waW4oZW5naW5lLT5zY3JhdGNoLm9i aik7CiAJZHJtX2dlbV9vYmplY3RfdW5yZWZlcmVuY2UoJmVuZ2luZS0+c2NyYXRjaC5vYmotPmJh c2UpOwogCWVuZ2luZS0+c2NyYXRjaC5vYmogPSBOVUxMOwogfQogCi1pbnQKLWludGVsX2luaXRf cGlwZV9jb250cm9sKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKK2ludCBpbnRlbF9p bml0X3BpcGVfY29udHJvbChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiB7CisJc3Ry dWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iajsKIAlpbnQgcmV0OwogCiAJV0FSTl9PTihlbmdp bmUtPnNjcmF0Y2gub2JqKTsKIAotCWVuZ2luZS0+c2NyYXRjaC5vYmogPSBpOTE1X2dlbV9vYmpl Y3RfY3JlYXRlKGVuZ2luZS0+aTkxNS0+ZGV2LCA0MDk2KTsKLQlpZiAoSVNfRVJSKGVuZ2luZS0+ c2NyYXRjaC5vYmopKSB7Ci0JCURSTV9FUlJPUigiRmFpbGVkIHRvIGFsbG9jYXRlIHNlcW5vIHBh Z2VcbiIpOwotCQlyZXQgPSBQVFJfRVJSKGVuZ2luZS0+c2NyYXRjaC5vYmopOwotCQllbmdpbmUt PnNjcmF0Y2gub2JqID0gTlVMTDsKKwlvYmogPSBpOTE1X2dlbV9vYmplY3RfY3JlYXRlKGVuZ2lu ZS0+aTkxNS0+ZGV2LCA0MDk2KTsKKwlpZiAoSVNfRVJSKG9iaikpIHsKKwkJRFJNX0VSUk9SKCJG YWlsZWQgdG8gYWxsb2NhdGUgc2NyYXRjaCBwYWdlXG4iKTsKKwkJcmV0ID0gUFRSX0VSUihvYmop OwogCQlnb3RvIGVycjsKIAl9CiAKLQlyZXQgPSBpOTE1X2dlbV9vYmplY3Rfc2V0X2NhY2hlX2xl dmVsKGVuZ2luZS0+c2NyYXRjaC5vYmosCi0JCQkJCSAgICAgIEk5MTVfQ0FDSEVfTExDKTsKKwly ZXQgPSBpOTE1X2dlbV9vYmpfZ2d0dF9waW4ob2JqLCA0MDk2LCBQSU5fSElHSCk7CiAJaWYgKHJl dCkKIAkJZ290byBlcnJfdW5yZWY7CiAKLQlyZXQgPSBpOTE1X2dlbV9vYmpfZ2d0dF9waW4oZW5n aW5lLT5zY3JhdGNoLm9iaiwgNDA5NiwgMCk7Ci0JaWYgKHJldCkKLQkJZ290byBlcnJfdW5yZWY7 Ci0KLQllbmdpbmUtPnNjcmF0Y2guZ3R0X29mZnNldCA9IGk5MTVfZ2VtX29ial9nZ3R0X29mZnNl dChlbmdpbmUtPnNjcmF0Y2gub2JqKTsKLQllbmdpbmUtPnNjcmF0Y2guY3B1X3BhZ2UgPSBrbWFw KHNnX3BhZ2UoZW5naW5lLT5zY3JhdGNoLm9iai0+cGFnZXMtPnNnbCkpOwotCWlmIChlbmdpbmUt PnNjcmF0Y2guY3B1X3BhZ2UgPT0gTlVMTCkgewotCQlyZXQgPSAtRU5PTUVNOwotCQlnb3RvIGVy cl91bnBpbjsKLQl9Ci0KKwllbmdpbmUtPnNjcmF0Y2gub2JqID0gb2JqOworCWVuZ2luZS0+c2Ny YXRjaC5ndHRfb2Zmc2V0ID0gaTkxNV9nZW1fb2JqX2dndHRfb2Zmc2V0KG9iaik7CiAJRFJNX0RF QlVHX0RSSVZFUigiJXMgcGlwZSBjb250cm9sIG9mZnNldDogMHglMDh4XG4iLAogCQkJIGVuZ2lu ZS0+bmFtZSwgZW5naW5lLT5zY3JhdGNoLmd0dF9vZmZzZXQpOwogCXJldHVybiAwOwogCi1lcnJf dW5waW46Ci0JaTkxNV9nZW1fb2JqZWN0X2dndHRfdW5waW4oZW5naW5lLT5zY3JhdGNoLm9iaik7 CiBlcnJfdW5yZWY6CiAJZHJtX2dlbV9vYmplY3RfdW5yZWZlcmVuY2UoJmVuZ2luZS0+c2NyYXRj aC5vYmotPmJhc2UpOwogZXJyOgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfcmluZ2J1ZmZlci5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5o CmluZGV4IDU1OWJlMDRiNTQ1Ni4uOTYwZGUyZTQ0MDc5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfcmluZ2J1ZmZlci5oCkBAIC0zMzcsNyArMzM3LDYgQEAgc3RydWN0IGludGVsX2VuZ2lu ZV9jcyB7CiAJc3RydWN0IHsKIAkJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iajsKIAkJ dTMyIGd0dF9vZmZzZXQ7Ci0JCXZvbGF0aWxlIHUzMiAqY3B1X3BhZ2U7CiAJfSBzY3JhdGNoOwog CiAJYm9vbCBuZWVkc19jbWRfcGFyc2VyOwotLSAKMi44LjEKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=