From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mika Kuoppala Subject: [PATCH 3/4] drm/i915: Reorder hw init to avoid executing with invalid context/mm state Date: Tue, 17 Mar 2015 18:18:36 +0200 Message-ID: <1426609117-11976-4-git-send-email-mika.kuoppala@intel.com> References: <1426609117-11976-1-git-send-email-mika.kuoppala@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id CBB5A6E732 for ; Tue, 17 Mar 2015 09:19:10 -0700 (PDT) In-Reply-To: <1426609117-11976-1-git-send-email-mika.kuoppala@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 Cc: miku@iki.fi List-Id: intel-gfx@lists.freedesktop.org RnJvbTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+CgpDdXJyZW50bHkg d2UgaW5pdGlhbGlzZSB0aGUgcmluZ3MsIGFkZCB0aGUgZmlyc3QgY29udGV4dCBzd2l0Y2ggdG8g dGhlCnJpbmcgYW5kIGV4ZWN1dGUgb3VyIGdvbGRlbiBzdGF0ZSB0aGVuIGVuYWJsZSAoYWxpYXNp bmcgb3IgZnVsbCkgcHBndHQuCkhvd2V2ZXIsIGFzIHdlIGVuYWJsZSBwcGd0dCB1c2luZyBkaXJl Y3QgTU1JTyBidXQgbG9hZCB0aGUgUEQgdXNpbmcKTUlfTFJJLCB3ZSBlbmQgdXAgZXhlY3V0aW5n IHRoZSBjb250ZXh0IHN3aXRjaCBhbmQgZ29sZGVuIHJlbmRlciBzdGF0ZQp3aXRoIGFuIGludmFs aWQgUEQgZ2VuZXJhdGluZyBwYWdlIGZhdWx0cy4gVG8gc29sdmUgdGhpcyBpc3N1ZSwgZmlyc3Qg ZG8KdGhlIHBwZ3R0IFBEIHNldHVwLCB0aGVuIHNldCB0aGUgZGVmYXVsdCBjb250ZXh0IGFuZCB3 cml0ZSB0aGUgY29tbWFuZHMKdG8gcnVuIHRoZSByZW5kZXIgc3RhdGUgaW50byB0aGUgcmluZywg YmVmb3JlIHdlIGFjdGl2YXRlIHRoZSByaW5nLiBUaGlzCmFsbG93cyB1cyB0byBiZSBzdXJlIHRo YXQgdGhlIHJlZ2lzdGVyIHN0YXRlIGlzIHZhbGlkIGJlZm9yZSB3ZSBiZWdpbgpleGVjdXRpb24u CgpUaGlzIHdhcyBzcG90dGVkIHdoZW4gd3JpdGluZyB0aGUgc2Vxbm8vcmVxdWVzdCBjb252ZXJz aW9uLCBidXQgb25seSB3aXRoCnRoZSBFUlJPUiBjYXB0dXJlIGRpZCBJIHJlYWxpc2UgdGhhdCBp dCB3YXMgYSBuZWNlc3NpdHkgbm93LgoKUkZDOiBjbGVhbnVwIHRoZSBlcnJvciBoYW5kbGluZyBp biBpOTE1X2dlbV9pbml0X2h3LgoKdjI6IGFkZGVkIGludGVsX3JpbmdfcmVzZXQKdjM6IGFkYXB0 IHRvIHJpbmctPnN0YXJ0X3JpbmcKClNpZ25lZC1vZmYtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNA Y2hyaXMtd2lsc29uLmNvLnVrPiAodjEpClNpZ25lZC1vZmYtYnk6IE1pa2EgS3VvcHBhbGEgPG1p a2Eua3VvcHBhbGFAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt LmMgfCAyOSArKysrKysrKysrKysrKysrKysrKystLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDIx IGluc2VydGlvbnMoKyksIDggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKaW5k ZXggODE0N2UyZS4uNTYzNjM1MSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9nZW0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCkBAIC00ODU2LDEx ICs0ODU2LDI1IEBAIGNsZWFudXBfcmVuZGVyX3Jpbmc6CiAJcmV0dXJuIHJldDsKIH0KIAorc3Rh dGljIGludCBpOTE1X2dlbV9pbml0X3JpbmdfaHcoc3RydWN0IGRybV9kZXZpY2UgKmRldikKK3sK KwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwor CXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmc7CisJaW50IGksIHJldDsKKworCWZvcl9lYWNo X3JpbmcocmluZywgZGV2X3ByaXYsIGkpIHsKKwkJcmV0ID0gcmluZy0+aW5pdF9odyhyaW5nKTsK KwkJaWYgKHJldCkKKwkJCXJldHVybiByZXQ7CisJfQorCisJcmV0dXJuIDA7Cit9CisKIGludAog aTkxNV9nZW1faW5pdF9odyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogewogCXN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7Ci0Jc3RydWN0IGludGVs X2VuZ2luZV9jcyAqcmluZzsKIAlpbnQgcmV0LCBpOwogCiAJaWYgKElOVEVMX0lORk8oZGV2KS0+ Z2VuIDwgNiAmJiAhaW50ZWxfZW5hYmxlX2d0dCgpKQpAQCAtNDg5OCwxMyArNDkxMiw3IEBAIGk5 MTVfZ2VtX2luaXRfaHcoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkgKi8KIAlpbml0X3VudXNl ZF9yaW5ncyhkZXYpOwogCi0JZm9yX2VhY2hfcmluZyhyaW5nLCBkZXZfcHJpdiwgaSkgewotCQly ZXQgPSByaW5nLT5pbml0X2h3KHJpbmcpOwotCQlpZiAocmV0KQotCQkJZ290byBvdXQ7Ci0JfQot Ci0JaTkxNV9nZW1fc3RhcnRfcmluZ2J1ZmZlcnMoZGV2KTsKKwlpOTE1X2dlbV9pbml0X3Jpbmdf aHcoZGV2KTsKIAogCWZvciAoaSA9IDA7IGkgPCBOVU1fTDNfU0xJQ0VTKGRldik7IGkrKykKIAkJ aTkxNV9nZW1fbDNfcmVtYXAoJmRldl9wcml2LT5yaW5nW1JDU10sIGkpOwpAQCAtNDkxNSw2ICs0 OTIzLDkgQEAgaTkxNV9nZW1faW5pdF9odyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQlpOTE1 X2dlbV9jbGVhbnVwX3JpbmdidWZmZXIoZGV2KTsKIAl9CiAKKwlmb3IgKGkgPSAwOyBpIDwgTlVN X0wzX1NMSUNFUyhkZXYpOyBpKyspCisJCWk5MTVfZ2VtX2wzX3JlbWFwKCZkZXZfcHJpdi0+cmlu Z1tSQ1NdLCBpKTsKKwogCXJldCA9IGk5MTVfZ2VtX2NvbnRleHRfZW5hYmxlKGRldl9wcml2KTsK IAlpZiAocmV0ICYmIHJldCAhPSAtRUlPKSB7CiAJCURSTV9FUlJPUigiQ29udGV4dCBlbmFibGUg ZmFpbGVkICVkXG4iLCByZXQpOwpAQCAtNDkyMyw2ICs0OTM0LDggQEAgaTkxNV9nZW1faW5pdF9o dyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQlnb3RvIG91dDsKIAl9CiAKKwlpOTE1X2dlbV9z dGFydF9yaW5nYnVmZmVycyhkZXYpOworCiBvdXQ6CiAJaW50ZWxfdW5jb3JlX2ZvcmNld2FrZV9w dXQoZGV2X3ByaXYsIEZPUkNFV0FLRV9BTEwpOwogCXJldHVybiByZXQ7Ci0tIAoxLjkuMQoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1h aWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK