From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: [PATCH v2 4/4] drm/i915/gen9: Remove state asserts when disabling DC states Date: Mon, 29 Feb 2016 22:49:05 +0200 Message-ID: <1456778945-5411-4-git-send-email-imre.deak@intel.com> References: <1456778945-5411-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 mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id 912636E372 for ; Mon, 29 Feb 2016 20:49:12 +0000 (UTC) In-Reply-To: <1456778945-5411-1-git-send-email-imre.deak@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 RGlzYWJsaW5nIHRoZSBEQyBzdGF0ZXMgd2hlbiBpdCdzIGFscmVhZHkgZGlzYWJsZWQgaXMgYSB2 YWxpZCBzY2VuYXJpbywKZm9yIGV4YW1wbGUgZHVyaW5nIEhXIHN0YXRlIHNhbml0aXphdGlvbiBk dXJpbmcgZHJpdmVyIGxvYWRpbmcgYW5kCnJlc3VtaW5nIG9yIHdoZW4gREMgc3RhdGVzIGFyZSBk aXNhYmxlZCB2aWEgdGhlIGk5MTUuZW5hYmxlX2RjIG9yCmRpc2FibGVfcG93ZXJfd2VsbCBvcHRp b24uCgpDQzogUGF0cmlrIEpha29ic3NvbiA8cGF0cmlrLmpha29ic3NvbkBsaW51eC5pbnRlbC5j b20+ClNpZ25lZC1vZmYtYnk6IEltcmUgRGVhayA8aW1yZS5kZWFrQGludGVsLmNvbT4KUmV2aWV3 ZWQtYnk6IFBhdHJpayBKYWtvYnNzb24gPHBhdHJpay5qYWtvYnNzb25AbGludXguaW50ZWwuY29t PgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3J1bnRpbWVfcG0uYyB8IDQxICstLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDEgaW5zZXJ0aW9u KCspLCA0MCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9ydW50aW1lX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ydW50aW1lX3Bt LmMKaW5kZXggZjBjYTUxMzQuLjA5YzUyYjEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3J1bnRpbWVfcG0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9y dW50aW1lX3BtLmMKQEAgLTQ1OCw4ICs0NTgsNiBAQCBzdGF0aWMgdm9pZCBhc3NlcnRfY2FuX2Vu YWJsZV9kYzkoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogc3RhdGljIHZvaWQg YXNzZXJ0X2Nhbl9kaXNhYmxlX2RjOShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYp CiB7CiAJV0FSTihpbnRlbF9pcnFzX2VuYWJsZWQoZGV2X3ByaXYpLCAiSW50ZXJydXB0cyBub3Qg ZGlzYWJsZWQgeWV0LlxuIik7Ci0JV0FSTighKEk5MTVfUkVBRChEQ19TVEFURV9FTikgJiBEQ19T VEFURV9FTl9EQzkpLAotCQkiREM5IGFscmVhZHkgcHJvZ3JhbW1lZCB0byBiZSBkaXNhYmxlZC5c biIpOwogCVdBUk4oSTkxNV9SRUFEKERDX1NUQVRFX0VOKSAmIERDX1NUQVRFX0VOX1VQVE9fREM1 LAogCQkiREM1IHN0aWxsIG5vdCBkaXNhYmxlZC5cbiIpOwogCkBAIC02MDIsMTggKzYwMCw2IEBA IHN0YXRpYyB2b2lkIGFzc2VydF9jYW5fZW5hYmxlX2RjNShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYpCiAJYXNzZXJ0X2Nzcl9sb2FkZWQoZGV2X3ByaXYpOwogfQogCi1zdGF0aWMg dm9pZCBhc3NlcnRfY2FuX2Rpc2FibGVfZGM1KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdikKLXsKLQkvKgotCSAqIER1cmluZyBpbml0aWFsaXphdGlvbiwgdGhlIGZpcm13YXJlIG1h eSBub3QgYmUgbG9hZGVkIHlldC4KLQkgKiBXZSBzdGlsbCB3YW50IHRvIG1ha2Ugc3VyZSB0aGF0 IHRoZSBEQyBlbmFibGluZyBmbGFnIGlzIGNsZWFyZWQuCi0JICovCi0JaWYgKGRldl9wcml2LT5w b3dlcl9kb21haW5zLmluaXRpYWxpemluZykKLQkJcmV0dXJuOwotCi0JYXNzZXJ0X3JwbV93YWtl bG9ja19oZWxkKGRldl9wcml2KTsKLX0KLQogc3RhdGljIHZvaWQgZ2VuOV9lbmFibGVfZGM1KHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKIAlhc3NlcnRfY2FuX2VuYWJsZV9k YzUoZGV2X3ByaXYpOwpAQCAtNjM4LDI5ICs2MjQsNiBAQCBzdGF0aWMgdm9pZCBhc3NlcnRfY2Fu X2VuYWJsZV9kYzYoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCWFzc2VydF9j c3JfbG9hZGVkKGRldl9wcml2KTsKIH0KIAotc3RhdGljIHZvaWQgYXNzZXJ0X2Nhbl9kaXNhYmxl X2RjNihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCi17Ci0JLyoKLQkgKiBEdXJp bmcgaW5pdGlhbGl6YXRpb24sIHRoZSBmaXJtd2FyZSBtYXkgbm90IGJlIGxvYWRlZCB5ZXQuCi0J ICogV2Ugc3RpbGwgd2FudCB0byBtYWtlIHN1cmUgdGhhdCB0aGUgREMgZW5hYmxpbmcgZmxhZyBp cyBjbGVhcmVkLgotCSAqLwotCWlmIChkZXZfcHJpdi0+cG93ZXJfZG9tYWlucy5pbml0aWFsaXpp bmcpCi0JCXJldHVybjsKLQotCVdBUk5fT05DRSghKEk5MTVfUkVBRChEQ19TVEFURV9FTikgJiBE Q19TVEFURV9FTl9VUFRPX0RDNiksCi0JCSAgIkRDNiBhbHJlYWR5IHByb2dyYW1tZWQgdG8gYmUg ZGlzYWJsZWQuXG4iKTsKLX0KLQotc3RhdGljIHZvaWQgZ2VuOV9kaXNhYmxlX2RjNV9kYzYoc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQotewotCWFzc2VydF9jYW5fZGlzYWJsZV9k YzUoZGV2X3ByaXYpOwotCi0JaWYgKGRldl9wcml2LT5jc3IuYWxsb3dlZF9kY19tYXNrICYgRENf U1RBVEVfRU5fVVBUT19EQzYpCi0JCWFzc2VydF9jYW5fZGlzYWJsZV9kYzYoZGV2X3ByaXYpOwot Ci0JZ2VuOV9zZXRfZGNfc3RhdGUoZGV2X3ByaXYsIERDX1NUQVRFX0RJU0FCTEUpOwotfQotCiB2 b2lkIHNrbF9lbmFibGVfZGM2KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsK IAlhc3NlcnRfY2FuX2VuYWJsZV9kYzYoZGV2X3ByaXYpOwpAQCAtNjczLDggKzYzNiw2IEBAIHZv aWQgc2tsX2VuYWJsZV9kYzYoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCiB2 b2lkIHNrbF9kaXNhYmxlX2RjNihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7 Ci0JYXNzZXJ0X2Nhbl9kaXNhYmxlX2RjNihkZXZfcHJpdik7Ci0KIAlEUk1fREVCVUdfS01TKCJE aXNhYmxpbmcgREM2XG4iKTsKIAogCWdlbjlfc2V0X2RjX3N0YXRlKGRldl9wcml2LCBEQ19TVEFU RV9ESVNBQkxFKTsKQEAgLTgyOCw3ICs3ODksNyBAQCBzdGF0aWMgYm9vbCBnZW45X2RjX29mZl9w b3dlcl93ZWxsX2VuYWJsZWQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogc3Rh dGljIHZvaWQgZ2VuOV9kY19vZmZfcG93ZXJfd2VsbF9lbmFibGUoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2LAogCQkJCQkgIHN0cnVjdCBpOTE1X3Bvd2VyX3dlbGwgKnBvd2VyX3dl bGwpCiB7Ci0JZ2VuOV9kaXNhYmxlX2RjNV9kYzYoZGV2X3ByaXYpOworCWdlbjlfc2V0X2RjX3N0 YXRlKGRldl9wcml2LCBEQ19TVEFURV9ESVNBQkxFKTsKIH0KIAogc3RhdGljIHZvaWQgZ2VuOV9k Y19vZmZfcG93ZXJfd2VsbF9kaXNhYmxlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diwKLS0gCjIuNS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5v cmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1n ZngK