From: Imre Deak Subject: [PATCH] drm/i915: Fix power domain HW state cleanup on error path Date: Mon, 14 Mar 2016 17:14:20 +0200 Message-ID: <1457968460-11507-1-git-send-email-imre.deak@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 8C6876E12B for ; Mon, 14 Mar 2016 15:14:30 +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 TW92ZSB0aGUgY2xlYW51cCBvZiB0aGUgcG93ZXIgZG9tYWluIEhXIHN0YXRlIG9uIHRoZSBlcnJv ciBwYXRoIHRvIHRoZQpzYW1lIGZ1bmN0aW9uIHdoZXJlIHRoZSBjb3JyZXNwb25kaW5nIGluaXQg Y2FsbCB3YXMgY2FsbGVkIGZyb20uIEkKbm90aWNlZCB0aGlzIHByb2JsZW0gd2hlbiBsb2FkaW5n IHRoZSBtb2R1bGUgd2l0aCBsb2FkIGZhaWx1cmUgaW5qZWN0aW9uCmVuYWJsZWQsIG1ha2luZyBp OTE1X2xvYWRfbW9kZXNldF9pbml0KCkgZmFpbC4KCkNDOiBDaHJpcyBXaWxzb24gPGNocmlzQGNo cmlzLXdpbHNvbi5jby51az4KU2lnbmVkLW9mZi1ieTogSW1yZSBEZWFrIDxpbXJlLmRlYWtAaW50 ZWwuY29tPgotLS0KCltUaGlzIGRlcGVuZHMgb24KIGh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Au b3JnL2FyY2hpdmVzL2ludGVsLWdmeC8yMDE2LU1hcmNoLzA4OTU5Ny5odG1sXQoKIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZG1hLmMgfCA2ICsrKy0tLQogMSBmaWxlIGNoYW5nZWQsIDMgaW5z ZXJ0aW9ucygrKSwgMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2RtYS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kbWEuYwppbmRleCA3 NDkwMzA3Li43ODRlMDkxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rt YS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZG1hLmMKQEAgLTQ1Niw2ICs0NTYs NyBAQCBjbGVhbnVwX2lycToKIAlpbnRlbF90ZWFyZG93bl9nbWJ1cyhkZXYpOwogY2xlYW51cF9j c3I6CiAJaW50ZWxfY3NyX3Vjb2RlX2ZpbmkoZGV2X3ByaXYpOworCWludGVsX3Bvd2VyX2RvbWFp bnNfZmluaShkZXZfcHJpdik7CiAJdmdhX3N3aXRjaGVyb29fdW5yZWdpc3Rlcl9jbGllbnQoZGV2 LT5wZGV2KTsKIGNsZWFudXBfdmdhX2NsaWVudDoKIAl2Z2FfY2xpZW50X3JlZ2lzdGVyKGRldi0+ cGRldiwgTlVMTCwgTlVMTCwgTlVMTCk7CkBAIC0xMzE5LDcgKzEzMjAsNyBAQCBpbnQgaTkxNV9k cml2ZXJfbG9hZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1bnNpZ25lZCBsb25nIGZsYWdzKQog CXJldCA9IGk5MTVfbG9hZF9tb2Rlc2V0X2luaXQoZGV2KTsKIAlpZiAocmV0IDwgMCkgewogCQlE Uk1fRVJST1IoImZhaWxlZCB0byBpbml0IG1vZGVzZXRcbiIpOwotCQlnb3RvIG91dF9wb3dlcl93 ZWxsOworCQlnb3RvIG91dF9jbGVhbnVwX3ZibGFuazsKIAl9CiAKIAlpOTE1X2RyaXZlcl9yZWdp c3RlcihkZXZfcHJpdik7CkBAIC0xMzMwLDggKzEzMzEsNyBAQCBpbnQgaTkxNV9kcml2ZXJfbG9h ZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1bnNpZ25lZCBsb25nIGZsYWdzKQogCiAJcmV0dXJu IDA7CiAKLW91dF9wb3dlcl93ZWxsOgotCWludGVsX3Bvd2VyX2RvbWFpbnNfZmluaShkZXZfcHJp dik7CitvdXRfY2xlYW51cF92Ymxhbms6CiAJZHJtX3ZibGFua19jbGVhbnVwKGRldik7CiBvdXRf Y2xlYW51cF9odzoKIAlpOTE1X2RyaXZlcl9jbGVhbnVwX2h3KGRldl9wcml2KTsKLS0gCjIuNS4w CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1n ZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK