From: Maarten Lankhorst Subject: [PATCH 2/2] drm/i915: Do not enable IPS with the primary plane disabled. Date: Wed, 26 Aug 2015 10:55:55 +0200 Message-ID: <1440579355-30104-2-git-send-email-maarten.lankhorst@linux.intel.com> References: <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 BAA586E8CF for ; Wed, 26 Aug 2015 01:56:01 -0700 (PDT) In-Reply-To: <1440579355-30104-1-git-send-email-maarten.lankhorst@linux.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 VGhpcyBmaXhlcyBrbXNfdW5pdmVyc2FsX3BsYW5lLnVuaXZlcnNhbC1wbGFuZS1waXBlLUEtZnVu Y3Rpb25hbC4KCklQUyBnZXRzIGVuYWJsZWQgZXZlbiB0aG91Z2ggdGhlIHByaW1hcnkgcGxhbmUg aXMgZGlzYWJsZWQuIFRoaXMgaXMKbm90IHN1cHBvcnRlZCwgYW5kIHJlc3VsdHMgaW4gd2Fybmlu Z3MgbGlrZSBiZWxvdzoKCi0tLS0tLS0tLS0tLVsgY3V0IGhlcmUgXS0tLS0tLS0tLS0tLQpXQVJO SU5HOiBDUFU6IDAgUElEOiAxNzA3IGF0IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3Bs YXkuYzoxMzU0CmFzc2VydF9wbGFuZS5jb25zdHByb3AuNjYrMHg3MC8weGEwIFtpOTE1XSgpCnBs YW5lIEEgYXNzZXJ0aW9uIGZhaWx1cmUgKGV4cGVjdGVkIG9uLCBjdXJyZW50IG9mZikKTW9kdWxl cyBsaW5rZWQgaW46IGk5MTUKQ1BVOiAwIFBJRDogMTcwNyBDb21tOiBrbXNfdW5pdmVyc2FsX3Ag VGFpbnRlZDogRyAgICAgICAgVwo0LjIuMC1yYzItcGF0c2VyKyAjNDI4OApIYXJkd2FyZSBuYW1l OiBOVUM1aTdSWUIsCkJJT1MgUllCRFdpMzUuODZBLjAyNDYuMjAxNS4wMzA5LjEzNTUgMDMvMDkv MjAxNQogZmZmZmZmZmZjMDFkMzI3OCBmZmZmODgwMGNjYzM3Yzg4IGZmZmZmZmZmODE2ZjZlNzQg MDAwMDAwMDA4MDAwMDAwMAogZmZmZjg4MDBjY2MzN2NkOCBmZmZmODgwMGNjYzM3Y2M4IGZmZmZm ZmZmODEwN2JmZTEgZmZmZjg4MDBjY2MzN2NhOAogMDAwMDAwMDAwMDAwMDAwMCBmZmZmODgwMTE3 YWE0NTIwIGZmZmY4ODAwZDc0MzUzODggZmZmZjg4MDBkNTE3MDAwMApDYWxsIFRyYWNlOgogWzxm ZmZmZmZmZjgxNmY2ZTc0Pl0gZHVtcF9zdGFjaysweDRmLzB4N2IKIFs8ZmZmZmZmZmY4MTA3YmZl MT5dIHdhcm5fc2xvd3BhdGhfY29tbW9uKzB4ODEvMHhjMAogWzxmZmZmZmZmZjgxMDdjMDYxPl0g d2Fybl9zbG93cGF0aF9mbXQrMHg0MS8weDUwCiBbPGZmZmZmZmZmYzAxNmEyNzA+XSBhc3NlcnRf cGxhbmUuY29uc3Rwcm9wLjY2KzB4NzAvMHhhMCBbaTkxNV0KIFs8ZmZmZmZmZmZjMDE3MzUxMD5d IGhzd19lbmFibGVfaXBzKzB4NTAvMHgxNTAgW2k5MTVdCiBbPGZmZmZmZmZmYzAxMjhhNjM+XSBk aXNwbGF5X2NyY19jdGxfd3JpdGUrMHg2MjMvMHhiZjAgW2k5MTVdCiBbPGZmZmZmZmZmODExOTIx NTM+XSBfX3Zmc193cml0ZSsweDIzLzB4ZTAKIFs8ZmZmZmZmZmY4MTE5NTMzND5dID8gX19zYl9z dGFydF93cml0ZSsweDQ0LzB4ZjAKIFs8ZmZmZmZmZmY4MTI3NzcxOD5dID8gc2VjdXJpdHlfZmls ZV9wZXJtaXNzaW9uKzB4MzgvMHhjMAogWzxmZmZmZmZmZjgxMTkyYjM0Pl0gdmZzX3dyaXRlKzB4 YTQvMHgxOTAKIFs8ZmZmZmZmZmY4MTBkNzNkZT5dID8gZG9fc2V0aXRpbWVyKzB4MTJlLzB4MjIw CiBbPGZmZmZmZmZmODExOTM3NDE+XSBTeVNfd3JpdGUrMHg0MS8weGEwCiBbPGZmZmZmZmZmODE2 ZmRhZDc+XSBlbnRyeV9TWVNDQUxMXzY0X2Zhc3RwYXRoKzB4MTIvMHg2YQotLS1bIGVuZCB0cmFj ZSAyNjRiN2Y4ODA0YTc1NGMzIF0tLS0KClRoaXMgY2FuIGJlIGZpeGVkIGVhc2lseSBieSBjaGVj a2luZyBwcmltYXJ5LT52aXNpYmxlLgoKU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3Qg PG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2RlYnVnZnMuYyB8IDE2ICsrKysrKysrKysrKystLS0KIDEgZmlsZSBjaGFuZ2Vk LCAxMyBpbnNlcnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k ZWJ1Z2ZzLmMKaW5kZXggY2FmMTM4MjExNmRlLi45YWJmNzBjYjM1MjUgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZGVidWdmcy5jCkBAIC0zNzk5LDcgKzM3OTksMTMgQEAgc3RhdGljIGludCBwaXBl X2NyY19zZXRfc291cmNlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGVudW0gcGlwZSBwaXBlLAog CQkgKiB1c2VyIHNwYWNlIGNhbid0IG1ha2UgcmVsaWFibGUgdXNlIG9mIHRoZSBDUkNzLCBzbyBs ZXQncyBqdXN0CiAJCSAqIGNvbXBsZXRlbHkgZGlzYWJsZSBpdC4KIAkJICovCi0JCWhzd19kaXNh YmxlX2lwcyhjcnRjKTsKKworCQlpZiAoSEFTX0lQUyhkZXYpICYmIHBpcGUgPT0gUElQRV9BKSB7 CisJCQlkcm1fbW9kZXNldF9sb2NrKCZjcnRjLT5iYXNlLnByaW1hcnktPm11dGV4LCBOVUxMKTsK KwkJCWlmICh0b19pbnRlbF9wbGFuZV9zdGF0ZShjcnRjLT5iYXNlLnByaW1hcnktPnN0YXRlKS0+ dmlzaWJsZSkKKwkJCQloc3dfZGlzYWJsZV9pcHMoY3J0Yyk7CisJCQlkcm1fbW9kZXNldF91bmxv Y2soJmNydGMtPmJhc2UucHJpbWFyeS0+bXV0ZXgpOworCQl9CiAKIAkJc3Bpbl9sb2NrX2lycSgm cGlwZV9jcmMtPmxvY2spOwogCQlrZnJlZShwaXBlX2NyYy0+ZW50cmllcyk7CkBAIC0zODQzLDgg KzM4NDksMTIgQEAgc3RhdGljIGludCBwaXBlX2NyY19zZXRfc291cmNlKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYsIGVudW0gcGlwZSBwaXBlLAogCQkJdmx2X3VuZG9fcGlwZV9zY3JhbWJsZV9yZXNl dChkZXYsIHBpcGUpOwogCQllbHNlIGlmIChJU19IQVNXRUxMKGRldikgJiYgcGlwZSA9PSBQSVBF X0EpCiAJCQloc3dfdW5kb190cmFuc19lZHBfcGlwZV9BX2NyY193YShkZXYpOwotCi0JCWhzd19l bmFibGVfaXBzKGNydGMpOworCQllbHNlIGlmIChIQVNfSVBTKGRldikgJiYgcGlwZSA9PSBQSVBF X0EpIHsKKwkJCWRybV9tb2Rlc2V0X2xvY2soJmNydGMtPmJhc2UucHJpbWFyeS0+bXV0ZXgsIE5V TEwpOworCQkJaWYgKHRvX2ludGVsX3BsYW5lX3N0YXRlKGNydGMtPmJhc2UucHJpbWFyeS0+c3Rh dGUpLT52aXNpYmxlKQorCQkJCWhzd19lbmFibGVfaXBzKGNydGMpOworCQkJZHJtX21vZGVzZXRf dW5sb2NrKCZjcnRjLT5iYXNlLnByaW1hcnktPm11dGV4KTsKKwkJfQogCX0KIAogCXJldHVybiAw OwotLSAKMi4xLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9y ZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4 Cg==