From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [CI 2/5] drm/i915: Fix ordering of sanitize ppgtt and sanitize execlists Date: Fri, 29 Apr 2016 13:18:22 +0100 Message-ID: <1461932305-14637-2-git-send-email-chris@chris-wilson.co.uk> References: <1461932305-14637-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-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id F1DD16EF16 for ; Fri, 29 Apr 2016 12:18:50 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id r12so4658350wme.0 for ; Fri, 29 Apr 2016 05:18:50 -0700 (PDT) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id u187sm3027865wmu.21.2016.04.29.05.18.47 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 29 Apr 2016 05:18:48 -0700 (PDT) In-Reply-To: <1461932305-14637-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 VGhlIGk5MTUuZW5hYmxlX3BwZ3R0IG9wdGlvbiBkZXBlbmRzIHVwb24gdGhlIHN0YXRlIG9mCmk5 MTUuZW5hYmxlX2V4ZWNsaXN0cyBvcHRpb24gLSBzbyB3ZSBuZWVkIHRvIHNhbml0aXplIGV4ZWNs aXN0cyBmaXJzdC4KClNpZ25lZC1vZmYtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2ls c29uLmNvLnVrPgpSZXZpZXdlZC1ieTogSm9vbmFzIExhaHRpbmVuIDxqb29uYXMubGFodGluZW5A bGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZG1hLmMgICAg IHwgMTMgKysrKysrKysrKysrKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAg fCAgMiArKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyAgICAgfCAgMyAtLS0KIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jIHwgMTYgKysrKystLS0tLS0tLS0tLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgICAgfCAgMiAtLQogNSBmaWxlcyBjaGFu Z2VkLCAyMCBpbnNlcnRpb25zKCspLCAxNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RtYS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k bWEuYwppbmRleCBmNjkzMzBjZjAxMTguLmM5MTM4N2YxYWVkZCAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9kbWEuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2RtYS5jCkBAIC05NjgsNiArOTY4LDE5IEBAIHN0YXRpYyB2b2lkIGludGVsX2RldmljZV9pbmZv X3J1bnRpbWVfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQkJIGluZm8tPmhhc19zdWJz bGljZV9wZyA/ICJ5IiA6ICJuIik7CiAJRFJNX0RFQlVHX0RSSVZFUigiaGFzIEVVIHBvd2VyIGdh dGluZzogJXNcbiIsCiAJCQkgaW5mby0+aGFzX2V1X3BnID8gInkiIDogIm4iKTsKKworCWk5MTUu ZW5hYmxlX2V4ZWNsaXN0cyA9CisJCWludGVsX3Nhbml0aXplX2VuYWJsZV9leGVjbGlzdHMoZGV2 LCBpOTE1LmVuYWJsZV9leGVjbGlzdHMpOworCisJLyoKKwkgKiBpOTE1LmVuYWJsZV9wcGd0dCBp cyByZWFkLW9ubHksIHNvIGRvIGFuIGVhcmx5IHBhc3MgdG8gdmFsaWRhdGUgdGhlCisJICogdXNl cidzIHJlcXVlc3RlZCBzdGF0ZSBhZ2FpbnN0IHRoZSBoYXJkd2FyZS9kcml2ZXIgY2FwYWJpbGl0 aWVzLiAgV2UKKwkgKiBkbyB0aGlzIG5vdyBzbyB0aGF0IHdlIGNhbiBwcmludCBvdXQgYW55IGxv ZyBtZXNzYWdlcyBvbmNlIHJhdGhlcgorCSAqIHRoYW4gZXZlcnkgdGltZSB3ZSBjaGVjayBpbnRl bF9lbmFibGVfcHBndHQoKS4KKwkgKi8KKwlpOTE1LmVuYWJsZV9wcGd0dCA9CisJCWludGVsX3Nh bml0aXplX2VuYWJsZV9wcGd0dChkZXYsIGk5MTUuZW5hYmxlX3BwZ3R0KTsKKwlEUk1fREVCVUdf RFJJVkVSKCJwcGd0dCBtb2RlOiAlaVxuIiwgaTkxNS5lbmFibGVfcHBndHQpOwogfQogCiBzdGF0 aWMgdm9pZCBpbnRlbF9pbml0X2RwaW8oc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 KQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggN2QxNTkzMGI2OWIxLi4wMmM2MTllN2FmMDUg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtMjc1Myw2ICsyNzUzLDggQEAgZXh0ZXJuIGlu dCBpOTE1X21heF9pb2N0bDsKIGV4dGVybiBpbnQgaTkxNV9zdXNwZW5kX3N3aXRjaGVyb28oc3Ry dWN0IGRybV9kZXZpY2UgKmRldiwgcG1fbWVzc2FnZV90IHN0YXRlKTsKIGV4dGVybiBpbnQgaTkx NV9yZXN1bWVfc3dpdGNoZXJvbyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKIAoraW50IGludGVs X3Nhbml0aXplX2VuYWJsZV9wcGd0dChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBpbnQgZW5hYmxl X3BwZ3R0KTsKKwogLyogaTkxNV9kbWEuYyAqLwogdm9pZCBfX3ByaW50ZigzLCA0KQogX19pOTE1 X3ByaW50ayhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIGNvbnN0IGNoYXIgKmxl dmVsLApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKaW5kZXggOTZmYmM5YWI0MDM5Li5iZDYwNjFmMTc3 ZmUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtNDkwMSw5ICs0OTAxLDYgQEAgaW50IGk5 MTVfZ2VtX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCWludCByZXQ7CiAKLQlpOTE1LmVu YWJsZV9leGVjbGlzdHMgPSBpbnRlbF9zYW5pdGl6ZV9lbmFibGVfZXhlY2xpc3RzKGRldiwKLQkJ CWk5MTUuZW5hYmxlX2V4ZWNsaXN0cyk7Ci0KIAltdXRleF9sb2NrKCZkZXYtPnN0cnVjdF9tdXRl eCk7CiAKIAlpZiAoIWk5MTUuZW5hYmxlX2V4ZWNsaXN0cykgewpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbV9ndHQuYwppbmRleCA1OWE3OGY3NjBiNmIuLjM2NGNmODIzNjAyMSAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW1fZ3R0LmMKQEAgLTExMCw3ICsxMTAsNyBAQCBjb25zdCBzdHJ1Y3QgaTkx NV9nZ3R0X3ZpZXcgaTkxNV9nZ3R0X3ZpZXdfcm90YXRlZCA9IHsKIAkudHlwZSA9IEk5MTVfR0dU VF9WSUVXX1JPVEFURUQsCiB9OwogCi1zdGF0aWMgaW50IHNhbml0aXplX2VuYWJsZV9wcGd0dChz dHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBpbnQgZW5hYmxlX3BwZ3R0KQoraW50IGludGVsX3Nhbml0 aXplX2VuYWJsZV9wcGd0dChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBpbnQgZW5hYmxlX3BwZ3R0 KQogewogCWJvb2wgaGFzX2FsaWFzaW5nX3BwZ3R0OwogCWJvb2wgaGFzX2Z1bGxfcHBndHQ7CkBA IC0xMjMsMTIgKzEyMywxNCBAQCBzdGF0aWMgaW50IHNhbml0aXplX2VuYWJsZV9wcGd0dChzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2LCBpbnQgZW5hYmxlX3BwZ3R0KQogCWlmIChpbnRlbF92Z3B1X2Fj dGl2ZShkZXYpKQogCQloYXNfZnVsbF9wcGd0dCA9IGZhbHNlOyAvKiBlbXVsYXRpb24gaXMgdG9v IGhhcmQgKi8KIAorCWlmICghaGFzX2FsaWFzaW5nX3BwZ3R0KQorCQlyZXR1cm4gMDsKKwogCS8q CiAJICogV2UgZG9uJ3QgYWxsb3cgZGlzYWJsaW5nIFBQR1RUIGZvciBnZW45KyBhcyBpdCdzIGEg cmVxdWlyZW1lbnQgZm9yCiAJICogZXhlY2xpc3RzLCB0aGUgc29sZSBtZWNoYW5pc20gYXZhaWxh YmxlIHRvIHN1Ym1pdCB3b3JrLgogCSAqLwotCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA8IDkg JiYKLQkgICAgKGVuYWJsZV9wcGd0dCA9PSAwIHx8ICFoYXNfYWxpYXNpbmdfcHBndHQpKQorCWlm IChlbmFibGVfcHBndHQgPT0gMCAmJiBJTlRFTF9JTkZPKGRldiktPmdlbiA8IDkpCiAJCXJldHVy biAwOwogCiAJaWYgKGVuYWJsZV9wcGd0dCA9PSAxKQpAQCAtMzIxOSwxNCArMzIyMSw2IEBAIGlu dCBpOTE1X2dndHRfaW5pdF9odyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWlmIChpbnRlbF9p b21tdV9nZnhfbWFwcGVkKQogCQlEUk1fSU5GTygiVlQtZCBhY3RpdmUgZm9yIGdmeCBhY2Nlc3Nc biIpOwogI2VuZGlmCi0JLyoKLQkgKiBpOTE1LmVuYWJsZV9wcGd0dCBpcyByZWFkLW9ubHksIHNv IGRvIGFuIGVhcmx5IHBhc3MgdG8gdmFsaWRhdGUgdGhlCi0JICogdXNlcidzIHJlcXVlc3RlZCBz dGF0ZSBhZ2FpbnN0IHRoZSBoYXJkd2FyZS9kcml2ZXIgY2FwYWJpbGl0aWVzLiAgV2UKLQkgKiBk byB0aGlzIG5vdyBzbyB0aGF0IHdlIGNhbiBwcmludCBvdXQgYW55IGxvZyBtZXNzYWdlcyBvbmNl IHJhdGhlcgotCSAqIHRoYW4gZXZlcnkgdGltZSB3ZSBjaGVjayBpbnRlbF9lbmFibGVfcHBndHQo KS4KLQkgKi8KLQlpOTE1LmVuYWJsZV9wcGd0dCA9IHNhbml0aXplX2VuYWJsZV9wcGd0dChkZXYs IGk5MTUuZW5hYmxlX3BwZ3R0KTsKLQlEUk1fREVCVUdfRFJJVkVSKCJwcGd0dCBtb2RlOiAlaVxu IiwgaTkxNS5lbmFibGVfcHBndHQpOwogCiAJcmV0dXJuIDA7CiAKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf bHJjLmMKaW5kZXggYjJhOTA3MmM1NzUzLi5kODc2MzUyNDMxOWQgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2xyYy5jCkBAIC0yNDgsOCArMjQ4LDYgQEAgc3RhdGljIGludCBpbnRlbF9scl9jb250ZXh0 X3BpbihzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4LAogICovCiBpbnQgaW50ZWxfc2FuaXRpemVf ZW5hYmxlX2V4ZWNsaXN0cyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBpbnQgZW5hYmxlX2V4ZWNs aXN0cykKIHsKLQlXQVJOX09OKGk5MTUuZW5hYmxlX3BwZ3R0ID09IC0xKTsKLQogCS8qIE9uIHBs YXRmb3JtcyB3aXRoIGV4ZWNsaXN0IGF2YWlsYWJsZSwgdkdQVSB3aWxsIG9ubHkKIAkgKiBzdXBw b3J0IGV4ZWNsaXN0IG1vZGUsIG5vIHJpbmcgYnVmZmVyIG1vZGUuCiAJICovCi0tIAoyLjguMQoK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==