From: Mika Kuoppala Subject: [PATCH 3/3] drm/i915: Reorder hw init to avoid executing with invalid context/mm state Date: Mon, 16 Mar 2015 15:46:36 +0200 Message-ID: <1426513596-11338-4-git-send-email-mika.kuoppala@intel.com> References: <1426513596-11338-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 mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 8CAB76E3F2 for ; Mon, 16 Mar 2015 06:46:39 -0700 (PDT) In-Reply-To: <1426513596-11338-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 List-Id: intel-gfx@lists.freedesktop.org RnJvbTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+CgpDdXJyZW50bHkg d2UgaW5pdGlhbGlzZSB0aGUgcmluZ3MsIGFkZCB0aGUgZmlyc3QgY29udGV4dCBzd2l0Y2ggdG8g dGhlCnJpbmcgYW5kIGV4ZWN1dGUgb3VyIGdvbGRlbiBzdGF0ZSB0aGVuIGVuYWJsZSAoYWxpYXNp bmcgb3IgZnVsbCkgcHBndHQuCkhvd2V2ZXIsIGFzIHdlIGVuYWJsZSBwcGd0dCB1c2luZyBkaXJl Y3QgTU1JTyBidXQgbG9hZCB0aGUgUEQgdXNpbmcKTUlfTFJJLCB3ZSBlbmQgdXAgZXhlY3V0aW5n IHRoZSBjb250ZXh0IHN3aXRjaCBhbmQgZ29sZGVuIHJlbmRlciBzdGF0ZQp3aXRoIGFuIGludmFs aWQgUEQgZ2VuZXJhdGluZyBwYWdlIGZhdWx0cy4gVG8gc29sdmUgdGhpcyBpc3N1ZSwgZmlyc3Qg ZG8KdGhlIHBwZ3R0IFBEIHNldHVwLCB0aGVuIHNldCB0aGUgZGVmYXVsdCBjb250ZXh0IGFuZCB3 cml0ZSB0aGUgY29tbWFuZHMKdG8gcnVuIHRoZSByZW5kZXIgc3RhdGUgaW50byB0aGUgcmluZywg YmVmb3JlIHdlIGFjdGl2YXRlIHRoZSByaW5nLiBUaGlzCmFsbG93cyB1cyB0byBiZSBzdXJlIHRo YXQgdGhlIHJlZ2lzdGVyIHN0YXRlIGlzIHZhbGlkIGJlZm9yZSB3ZSBiZWdpbgpleGVjdXRpb24u CgpUaGlzIHdhcyBzcG90dGVkIHdoZW4gd3JpdGluZyB0aGUgc2Vxbm8vcmVxdWVzdCBjb252ZXJz aW9uLCBidXQgb25seSB3aXRoCnRoZSBFUlJPUiBjYXB0dXJlIGRpZCBJIHJlYWxpc2UgdGhhdCBp dCB3YXMgYSBuZWNlc3NpdHkgbm93LgoKUkZDOiBjbGVhbnVwIHRoZSBlcnJvciBoYW5kbGluZyBp biBpOTE1X2dlbV9pbml0X2h3LgoKdjI6IGFkZGVkIGludGVsX3JpbmdfcmVzZXQKClNpZ25lZC1v ZmYtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPiAodjEpClNpZ25l ZC1vZmYtYnk6IE1pa2EgS3VvcHBhbGEgPG1pa2Eua3VvcHBhbGFAaW50ZWwuY29tPgotLS0KIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgICAgICAgICB8IDE5ICsrKysrKysrKysrLS0t LS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYyB8IDI2ICsrKysr KysrKysrKysrKysrKysrKystLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVm ZmVyLmggfCAgMSArCiAzIGZpbGVzIGNoYW5nZWQsIDM0IGluc2VydGlvbnMoKyksIDEyIGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IDBmZTMxM2QuLmUxNTQ3NzAgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtNDgxNyw2ICs0ODE3LDkgQEAgaTkxNV9nZW1faW5p dF9odyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQl9CiAJfQogCisJZm9yX2VhY2hfcmluZyhy aW5nLCBkZXZfcHJpdiwgaSkKKwkJaW50ZWxfcmluZ19yZXNldChyaW5nKTsKKwogCWk5MTVfZ2Vt X2luaXRfc3dpenpsaW5nKGRldik7CiAKIAkvKgpAQCAtNDgyNywxOSArNDgzMCwxOSBAQCBpOTE1 X2dlbV9pbml0X2h3KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJICovCiAJaW5pdF91bnVzZWRf cmluZ3MoZGV2KTsKIAotCWZvcl9lYWNoX3JpbmcocmluZywgZGV2X3ByaXYsIGkpIHsKLQkJcmV0 ID0gcmluZy0+aW5pdF9odyhyaW5nKTsKLQkJaWYgKHJldCkKLQkJCWdvdG8gb3V0OworCXJldCA9 IGk5MTVfcHBndHRfaW5pdF9odyhkZXYpOworCWlmIChyZXQgJiYgcmV0ICE9IC1FSU8pIHsKKwkJ RFJNX0VSUk9SKCJQUEdUVCBlbmFibGUgZmFpbGVkICVkXG4iLCByZXQpOworCQlpOTE1X2dlbV9j bGVhbnVwX3JpbmdidWZmZXIoZGV2KTsKIAl9CiAKIAlmb3IgKGkgPSAwOyBpIDwgTlVNX0wzX1NM SUNFUyhkZXYpOyBpKyspCiAJCWk5MTVfZ2VtX2wzX3JlbWFwKCZkZXZfcHJpdi0+cmluZ1tSQ1Nd LCBpKTsKIAotCXJldCA9IGk5MTVfcHBndHRfaW5pdF9odyhkZXYpOwotCWlmIChyZXQgJiYgcmV0 ICE9IC1FSU8pIHsKLQkJRFJNX0VSUk9SKCJQUEdUVCBlbmFibGUgZmFpbGVkICVkXG4iLCByZXQp OwotCQlpOTE1X2dlbV9jbGVhbnVwX3JpbmdidWZmZXIoZGV2KTsKKwlmb3JfZWFjaF9yaW5nKHJp bmcsIGRldl9wcml2LCBpKSB7CisJCXJldCA9IHJpbmctPmluaXRfaHcocmluZyk7CisJCWlmIChy ZXQpCisJCQlnb3RvIG91dDsKIAl9CiAKIAlyZXQgPSBpOTE1X2dlbV9jb250ZXh0X2VuYWJsZShk ZXZfcHJpdik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVm ZmVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKaW5kZXggNDQx ZTI1MC4uMGY5NzU4OCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmlu Z2J1ZmZlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwpA QCAtNTYwLDYgKzU2MCwyMiBAQCBzdGF0aWMgYm9vbCBzdG9wX3Jpbmcoc3RydWN0IGludGVsX2Vu Z2luZV9jcyAqcmluZykKIAlyZXR1cm4gKEk5MTVfUkVBRF9IRUFEKHJpbmcpICYgSEVBRF9BRERS KSA9PSAwOwogfQogCit2b2lkIGludGVsX3JpbmdfcmVzZXQoc3RydWN0IGludGVsX2VuZ2luZV9j cyAqcmluZykKK3sKKwlzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiA9IHJpbmctPmJ1 ZmZlcjsKKworCVdBUk5fT04oIXN0b3BfcmluZyhyaW5nKSk7CisKKwlpZiAoV0FSTl9PTihyaW5n YnVmID09IE5VTEwpKQorCQlyZXR1cm47CisKKwlyaW5nYnVmLT5oZWFkID0gMDsKKwlyaW5nYnVm LT50YWlsID0gMDsKKworCXJpbmdidWYtPmxhc3RfcmV0aXJlZF9oZWFkID0gLTE7Cit9CisKKwog c3RhdGljIGludCBpbml0X3JpbmdfY29tbW9uKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcp CiB7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IHJpbmctPmRldjsKQEAgLTYxNCw2ICs2MzAs OSBAQCBzdGF0aWMgaW50IGluaXRfcmluZ19jb21tb24oc3RydWN0IGludGVsX2VuZ2luZV9jcyAq cmluZykKIAlJOTE1X1dSSVRFX0hFQUQocmluZywgMCk7CiAJKHZvaWQpSTkxNV9SRUFEX0hFQUQo cmluZyk7CiAKKwlJOTE1X1dSSVRFX0hFQUQocmluZywgcmluZ2J1Zi0+aGVhZCk7CisJSTkxNV9X UklURV9UQUlMKHJpbmcsIHJpbmdidWYtPmhlYWQpOworCiAJSTkxNV9XUklURV9DVEwocmluZywK IAkJCSgocmluZ2J1Zi0+c2l6ZSAtIFBBR0VfU0laRSkgJiBSSU5HX05SX1BBR0VTKQogCQkJfCBS SU5HX1ZBTElEKTsKQEAgLTYyMSw3ICs2NDAsNyBAQCBzdGF0aWMgaW50IGluaXRfcmluZ19jb21t b24oc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKIAkvKiBJZiB0aGUgaGVhZCBpcyBzdGls bCBub3QgemVybywgdGhlIHJpbmcgaXMgZGVhZCAqLwogCWlmICh3YWl0X2ZvcigoSTkxNV9SRUFE X0NUTChyaW5nKSAmIFJJTkdfVkFMSUQpICE9IDAgJiYKIAkJICAgICBJOTE1X1JFQURfU1RBUlQo cmluZykgPT0gaTkxNV9nZW1fb2JqX2dndHRfb2Zmc2V0KG9iaikgJiYKLQkJICAgICAoSTkxNV9S RUFEX0hFQUQocmluZykgJiBIRUFEX0FERFIpID09IDAsIDUwKSkgeworCQkgICAgIChJOTE1X1JF QURfSEVBRChyaW5nKSAmIEhFQURfQUREUikgPT0gcmluZ2J1Zi0+aGVhZCwgNTApKSB7CiAJCURS TV9FUlJPUigiJXMgaW5pdGlhbGl6YXRpb24gZmFpbGVkICIKIAkJCSAgImN0bCAlMDh4ICh2YWxp ZD8gJWQpIGhlYWQgJTA4eCB0YWlsICUwOHggc3RhcnQgJTA4eCBbZXhwZWN0ZWQgJTA4bHhdXG4i LAogCQkJICByaW5nLT5uYW1lLApAQCAtNjMyLDEzICs2NTEsMTIgQEAgc3RhdGljIGludCBpbml0 X3JpbmdfY29tbW9uKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCiAJCWdvdG8gb3V0Owog CX0KIAorCUk5MTVfV1JJVEVfVEFJTChyaW5nLCByaW5nYnVmLT50YWlsKTsKKwogCXJpbmdidWYt Pmxhc3RfcmV0aXJlZF9oZWFkID0gLTE7Ci0JcmluZ2J1Zi0+aGVhZCA9IEk5MTVfUkVBRF9IRUFE KHJpbmcpOwotCXJpbmdidWYtPnRhaWwgPSBJOTE1X1JFQURfVEFJTChyaW5nKSAmIFRBSUxfQURE UjsKIAlpbnRlbF9yaW5nX3VwZGF0ZV9zcGFjZShyaW5nYnVmKTsKIAogCW1lbXNldCgmcmluZy0+ aGFuZ2NoZWNrLCAwLCBzaXplb2YocmluZy0+aGFuZ2NoZWNrKSk7Ci0KIG91dDoKIAlpbnRlbF91 bmNvcmVfZm9yY2V3YWtlX3B1dChkZXZfcHJpdiwgRk9SQ0VXQUtFX0FMTCk7CiAKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaCBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaAppbmRleCBjNzYxZmUwLi4xNjhhNjcwIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCkBAIC00MDgsNiArNDA4LDcgQEAg aW50IF9faW50ZWxfcmluZ19zcGFjZShpbnQgaGVhZCwgaW50IHRhaWwsIGludCBzaXplKTsKIHZv aWQgaW50ZWxfcmluZ191cGRhdGVfc3BhY2Uoc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdi dWYpOwogaW50IGludGVsX3Jpbmdfc3BhY2Uoc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdi dWYpOwogYm9vbCBpbnRlbF9yaW5nX3N0b3BwZWQoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmlu Zyk7Cit2b2lkIGludGVsX3JpbmdfcmVzZXQoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyk7 CiB2b2lkIF9faW50ZWxfcmluZ19hZHZhbmNlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcp OwogCiBpbnQgX19tdXN0X2NoZWNrIGludGVsX3JpbmdfaWRsZShzdHJ1Y3QgaW50ZWxfZW5naW5l X2NzICpyaW5nKTsKLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVl ZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZv L2ludGVsLWdmeAo=