From: Jani Nikula Subject: [PATCH RESEND FOR CI] drm/i915: remove g4x lowfreq_avail and has_pipe_cxsr Date: Tue, 17 Oct 2017 17:02:34 +0300 Message-ID: <20171017140234.20677-1-jani.nikula@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id B0F5E6E6AA for ; Tue, 17 Oct 2017 14:01:10 +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 Cc: jani.nikula@intel.com, Daniel Vetter List-Id: intel-gfx@lists.freedesktop.org VGhleSdyZSB1bnVzZWQgYW5kIHVuc3VwcG9ydGVkLiBMZWF2ZSB0aGUgcmVkdWNlZF9jbG9jayBw b2ludGVycyBpbgpwbGFjZSBzdGlsbCwgc2hvdWxkIHRoZXkgcHJvdmUgdXNlZnVsIGxhdGVyIG9u LgoKdjI6IGdvIGZyb20gbnVraW5nIERESSBsb3dmcmVxX2F2YWlsIHRvIG51a2luZyBpdCBlbnRp cmVseSAoVmlsbGUpCgpDYzogRGFuaWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBmZndsbC5jaD4K Q2M6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+ClN1Z2dl c3RlZC1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4K UmV2aWV3ZWQtYnk6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5j b20+ClNpZ25lZC1vZmYtYnk6IEphbmkgTmlrdWxhIDxqYW5pLm5pa3VsYUBpbnRlbC5jb20+Ci0t LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgIHwgIDIgLS0KIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfcGNpLmMgICAgICB8ICAyIC0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kaXNwbGF5LmMgfCAxNSAtLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rydi5oICAgICB8ICAxIC0KIDQgZmlsZXMgY2hhbmdlZCwgMjAgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggZGQxNDFiMjUwNTgzLi4wODQ4MjJiNGU3 ZmEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtNzg1LDcgKzc4NSw2IEBAIHN0cnVjdCBp bnRlbF9jc3IgewogCWZ1bmMoaGFzX2xvZ2ljYWxfcmluZ19jb250ZXh0cyk7IFwKIAlmdW5jKGhh c19sb2dpY2FsX3JpbmdfcHJlZW1wdGlvbik7IFwKIAlmdW5jKGhhc19vdmVybGF5KTsgXAotCWZ1 bmMoaGFzX3BpcGVfY3hzcik7IFwKIAlmdW5jKGhhc19wb29sZWRfZXUpOyBcCiAJZnVuYyhoYXNf cHNyKTsgXAogCWZ1bmMoaGFzX3JjNik7IFwKQEAgLTMxNzMsNyArMzE3Miw2IEBAIGludGVsX2lu Zm8oY29uc3Qgc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogI2RlZmluZSBJOTE1 X0hBU19IT1RQTFVHKGRldl9wcml2KQkoKGRldl9wcml2KS0+aW5mby5oYXNfaG90cGx1ZykKIAog I2RlZmluZSBIQVNfRldfQkxDKGRldl9wcml2KSAJKElOVEVMX0dFTihkZXZfcHJpdikgPiAyKQot I2RlZmluZSBIQVNfUElQRV9DWFNSKGRldl9wcml2KSAoKGRldl9wcml2KS0+aW5mby5oYXNfcGlw ZV9jeHNyKQogI2RlZmluZSBIQVNfRkJDKGRldl9wcml2KQkoKGRldl9wcml2KS0+aW5mby5oYXNf ZmJjKQogI2RlZmluZSBIQVNfQ1VSX0ZCQyhkZXZfcHJpdikJKCFIQVNfR01DSF9ESVNQTEFZKGRl dl9wcml2KSAmJiBJTlRFTF9JTkZPKGRldl9wcml2KS0+Z2VuID49IDcpCiAKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcGNpLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X3BjaS5jCmluZGV4IGJmNDY3ZjMwYzk5Yi4uYzE2MjQ3N2FkMWZmIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3BjaS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfcGNpLmMKQEAgLTE5Myw3ICsxOTMsNiBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IGludGVs X2RldmljZV9pbmZvIGludGVsX2k5NjVnbV9pbmZvIF9faW5pdGNvbnN0ID0gewogc3RhdGljIGNv bnN0IHN0cnVjdCBpbnRlbF9kZXZpY2VfaW5mbyBpbnRlbF9nNDVfaW5mbyBfX2luaXRjb25zdCA9 IHsKIAlHRU40X0ZFQVRVUkVTLAogCS5wbGF0Zm9ybSA9IElOVEVMX0c0NSwKLQkuaGFzX3BpcGVf Y3hzciA9IDEsCiAJLnJpbmdfbWFzayA9IFJFTkRFUl9SSU5HIHwgQlNEX1JJTkcsCiB9OwogCkBA IC0yMDEsNyArMjAwLDYgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBpbnRlbF9kZXZpY2VfaW5mbyBp bnRlbF9nbTQ1X2luZm8gX19pbml0Y29uc3QgPSB7CiAJR0VONF9GRUFUVVJFUywKIAkucGxhdGZv cm0gPSBJTlRFTF9HTTQ1LAogCS5pc19tb2JpbGUgPSAxLCAuaGFzX2ZiYyA9IDEsCi0JLmhhc19w aXBlX2N4c3IgPSAxLAogCS5zdXBwb3J0c190diA9IDEsCiAJLnJpbmdfbWFzayA9IFJFTkRFUl9S SU5HIHwgQlNEX1JJTkcsCiB9OwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4 IDg5N2ZlN2UwY2NlNS4uYWM3MmJlNTJkZTQ3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz cGxheS5jCkBAIC02NTIyLDExICs2NTIyLDkgQEAgc3RhdGljIHZvaWQgaTl4eF91cGRhdGVfcGxs X2RpdmlkZXJzKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogCiAJY3J0Y19zdGF0ZS0+ZHBsbF9o d19zdGF0ZS5mcDAgPSBmcDsKIAotCWNydGMtPmxvd2ZyZXFfYXZhaWwgPSBmYWxzZTsKIAlpZiAo aW50ZWxfY3J0Y19oYXNfdHlwZShjcnRjX3N0YXRlLCBJTlRFTF9PVVRQVVRfTFZEUykgJiYKIAkg ICAgcmVkdWNlZF9jbG9jaykgewogCQljcnRjX3N0YXRlLT5kcGxsX2h3X3N0YXRlLmZwMSA9IGZw MjsKLQkJY3J0Yy0+bG93ZnJlcV9hdmFpbCA9IHRydWU7CiAJfSBlbHNlIHsKIAkJY3J0Y19zdGF0 ZS0+ZHBsbF9od19zdGF0ZS5mcDEgPSBmcDsKIAl9CkBAIC03MjIxLDE1ICs3MjE5LDYgQEAgc3Rh dGljIHZvaWQgaTl4eF9zZXRfcGlwZWNvbmYoc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMp CiAJCX0KIAl9CiAKLQlpZiAoSEFTX1BJUEVfQ1hTUihkZXZfcHJpdikpIHsKLQkJaWYgKGludGVs X2NydGMtPmxvd2ZyZXFfYXZhaWwpIHsKLQkJCURSTV9ERUJVR19LTVMoImVuYWJsaW5nIEN4U1Ig ZG93bmNsb2NraW5nXG4iKTsKLQkJCXBpcGVjb25mIHw9IFBJUEVDT05GX0NYU1JfRE9XTkNMT0NL OwotCQl9IGVsc2UgewotCQkJRFJNX0RFQlVHX0tNUygiZGlzYWJsaW5nIEN4U1IgZG93bmNsb2Nr aW5nXG4iKTsKLQkJfQotCX0KLQogCWlmIChpbnRlbF9jcnRjLT5jb25maWctPmJhc2UuYWRqdXN0 ZWRfbW9kZS5mbGFncyAmIERSTV9NT0RFX0ZMQUdfSU5URVJMQUNFKSB7CiAJCWlmIChJTlRFTF9H RU4oZGV2X3ByaXYpIDwgNCB8fAogCQkgICAgaW50ZWxfY3J0Y19oYXNfdHlwZShpbnRlbF9jcnRj LT5jb25maWcsIElOVEVMX09VVFBVVF9TRFZPKSkKQEAgLTgzNjUsOCArODM1NCw2IEBAIHN0YXRp YyBpbnQgaXJvbmxha2VfY3J0Y19jb21wdXRlX2Nsb2NrKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRj LAogCW1lbXNldCgmY3J0Y19zdGF0ZS0+ZHBsbF9od19zdGF0ZSwgMCwKIAkgICAgICAgc2l6ZW9m KGNydGNfc3RhdGUtPmRwbGxfaHdfc3RhdGUpKTsKIAotCWNydGMtPmxvd2ZyZXFfYXZhaWwgPSBm YWxzZTsKLQogCS8qIENQVSBlRFAgaXMgdGhlIG9ubHkgb3V0cHV0IHRoYXQgZG9lc24ndCBuZWVk IGEgUENIIFBMTCBvZiBpdHMgb3duLiAqLwogCWlmICghY3J0Y19zdGF0ZS0+aGFzX3BjaF9lbmNv ZGVyKQogCQlyZXR1cm4gMDsKQEAgLTkwMjUsOCArOTAxMiw2IEBAIHN0YXRpYyBpbnQgaGFzd2Vs bF9jcnRjX2NvbXB1dGVfY2xvY2soc3RydWN0IGludGVsX2NydGMgKmNydGMsCiAJCX0KIAl9CiAK LQljcnRjLT5sb3dmcmVxX2F2YWlsID0gZmFsc2U7Ci0KIAlyZXR1cm4gMDsKIH0KIApkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kcnYuaAppbmRleCA4NmVlZDNjNzgyOGIuLmMwZDhiMmQ5ZWNkZCAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAgLTgwMyw3ICs4MDMsNiBAQCBzdHJ1Y3QgaW50ZWxfY3J0 YyB7CiAJICogc29tZSBvdXRwdXRzIGNvbm5lY3RlZCB0byB0aGlzIGNydGMuCiAJICovCiAJYm9v bCBhY3RpdmU7Ci0JYm9vbCBsb3dmcmVxX2F2YWlsOwogCXU4IHBsYW5lX2lkc19tYXNrOwogCXVu c2lnbmVkIGxvbmcgbG9uZyBlbmFibGVkX3Bvd2VyX2RvbWFpbnM7CiAJc3RydWN0IGludGVsX292 ZXJsYXkgKm92ZXJsYXk7Ci0tIAoyLjExLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3Rz LmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xp c3RpbmZvL2ludGVsLWdmeAo=