From: Maarten Lankhorst Subject: [PATCH 1/2] drm/i915: Do not turn off IPS twice. Date: Wed, 26 Aug 2015 10:55:54 +0200 Message-ID: <1440579355-30104-1-git-send-email-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mblankhorst.nl (mblankhorst.nl [141.105.120.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id BA8DC6E8C9 for ; Wed, 26 Aug 2015 01:56:01 -0700 (PDT) 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 VGhpcyBpcyBkb25lIHRocm91Z2ggcHJlX2Rpc2FibGVfcHJpbWFyeSBhbmQgaHN3X2Rpc2FibGVf aXBzLgpUaGV5J3JlIGJvdGggc2V0IG9uIHRoZSBzYW1lIGNvbmRpdGlvbnMsIHNvIGxlYXZlIHRo ZSBjaGVjayBvZgpkaXNhYmxlX2lwcyBpbiBwcmVfZGlzYWJsZV9wcmltYXJ5LgoKU2lnbmVkLW9m Zi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNv bT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAxNiArLS0tLS0t LS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCAgICAgfCAgMSAtCiAy IGZpbGVzIGNoYW5nZWQsIDEgaW5zZXJ0aW9uKCspLCAxNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggYWYwYmNmZWU0NzcxLi5iMDFlODk0ODc3ODQg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTQ3OTAsOSArNDc5MCw2IEBA IHN0YXRpYyB2b2lkIGludGVsX3ByZV9wbGFuZV91cGRhdGUoc3RydWN0IGludGVsX2NydGMgKmNy dGMpCiAJaWYgKGF0b21pYy0+ZGlzYWJsZV9mYmMpCiAJCWludGVsX2ZiY19kaXNhYmxlX2NydGMo Y3J0Yyk7CiAKLQlpZiAoY3J0Yy0+YXRvbWljLmRpc2FibGVfaXBzKQotCQloc3dfZGlzYWJsZV9p cHMoY3J0Yyk7Ci0KIAlpZiAoYXRvbWljLT5wcmVfZGlzYWJsZV9wcmltYXJ5KQogCQlpbnRlbF9w cmVfZGlzYWJsZV9wcmltYXJ5KCZjcnRjLT5iYXNlKTsKIApAQCAtMTE3MjYsMTkgKzExNzIzLDgg QEAgaW50IGludGVsX3BsYW5lX2F0b21pY19jYWxjX2NoYW5nZXMoc3RydWN0IGRybV9jcnRjX3N0 YXRlICpjcnRjX3N0YXRlLAogCQlpbnRlbF9jcnRjLT5hdG9taWMucHJlX2Rpc2FibGVfcHJpbWFy eSA9IHR1cm5fb2ZmOwogCQlpbnRlbF9jcnRjLT5hdG9taWMucG9zdF9lbmFibGVfcHJpbWFyeSA9 IHR1cm5fb247CiAKLQkJaWYgKHR1cm5fb2ZmKSB7Ci0JCQkvKgotCQkJICogRklYTUU6IEFjdHVh bGx5IGlmIHdlIHdpbGwgc3RpbGwgaGF2ZSBhbnkgb3RoZXIKLQkJCSAqIHBsYW5lIGVuYWJsZWQg b24gdGhlIHBpcGUgd2UgY291bGQgbGV0IElQUyBlbmFibGVkCi0JCQkgKiBzdGlsbCwgYnV0IGZv ciBub3cgbGV0cyBjb25zaWRlciB0aGF0IHdoZW4gd2UgbWFrZQotCQkJICogcHJpbWFyeSBpbnZp c2libGUgYnkgc2V0dGluZyBEU1BDTlRSIHRvIDAgb24KLQkJCSAqIHVwZGF0ZV9wcmltYXJ5X3Bs YW5lIGZ1bmN0aW9uIElQUyBuZWVkcyB0byBiZQotCQkJICogZGlzYWJsZS4KLQkJCSAqLwotCQkJ aW50ZWxfY3J0Yy0+YXRvbWljLmRpc2FibGVfaXBzID0gdHJ1ZTsKLQorCQlpZiAodHVybl9vZmYp CiAJCQlpbnRlbF9jcnRjLT5hdG9taWMuZGlzYWJsZV9mYmMgPSB0cnVlOwotCQl9CiAKIAkJLyoK IAkJICogRkJDIGRvZXMgbm90IHdvcmsgb24gc29tZSBwbGF0Zm9ybXMgZm9yIHJvdGF0ZWQKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXggM2IwMGQwMGMwYmMwLi4zNzk0ODVmNzQ0ZWYgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCkBAIC00OTMsNyArNDkzLDYgQEAgc3RydWN0IGludGVs X2NydGNfYXRvbWljX2NvbW1pdCB7CiAJLyogU2xlZXBhYmxlIG9wZXJhdGlvbnMgdG8gcGVyZm9y bSBiZWZvcmUgY29tbWl0ICovCiAJYm9vbCB3YWl0X2Zvcl9mbGlwczsKIAlib29sIGRpc2FibGVf ZmJjOwotCWJvb2wgZGlzYWJsZV9pcHM7CiAJYm9vbCBkaXNhYmxlX2N4c3I7CiAJYm9vbCBwcmVf ZGlzYWJsZV9wcmltYXJ5OwogCWJvb2wgdXBkYXRlX3dtX3ByZSwgdXBkYXRlX3dtX3Bvc3Q7Ci0t IAoyLjEuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K SW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0 dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK