From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rodrigo Vivi Subject: [PATCH 08/31] drm/i915: Add psr_ready on pipe_config Date: Thu, 5 Nov 2015 10:50:00 -0800 Message-ID: <1446749423-4789-9-git-send-email-rodrigo.vivi@intel.com> References: <1446749423-4789-1-git-send-email-rodrigo.vivi@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id EAD8B6E465 for ; Thu, 5 Nov 2015 10:49:49 -0800 (PST) In-Reply-To: <1446749423-4789-1-git-send-email-rodrigo.vivi@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 Cc: Rodrigo Vivi List-Id: intel-gfx@lists.freedesktop.org TGV0J3Mga25vdyBiZWZvcmVoYW5kIGlmIFBTUiBpcyByZWFkeSBhbmQgd2lsbCBiZSBlbmFibGVk IHNvIHdlIGNhbgpwcmV2ZW50IERSUlMgdG8gZ2V0IGVuYWJsZWQuCgpXQVJOX09OKCFkcm1fbW9k ZXNldF9pc19sb2NrZWQoJmNydGMtPm11dGV4KSkgb24gaW50ZWxfcHNyX3JlYWR5KCkKaGFzIGJl ZW4gcmVtb3ZlZCBvbiB2My4gV2UgZG9uJ3QgZGVyZWZlcnJlbmNlIGNydGMgaGVyZSBhbnltb3Jl IHNvCndlIGRvbid0IG5lZWQgdGhpcyBjaGVjay4gQWxsIGNvbmZpZ3MgYXJlIG5vdyBjaGVja2Vk IGZyb20gcmVjZWl2ZWQKcGlwZSBjb25maWcuCgp2MjogUmVtb3ZpbmcgaXNfZWRwX3BzciBmdW5j IHRoYXQgaXMgbm90IHVzZWQgYWZ0ZXIgdGhpcyBwYXRjaC4KICAgIFJlbmFtZSBtYXRjaF9jb25k aXRpb25zIGFuZCBkb2N1bWVudCBpdCBzaW5jZSBpdCBpcyBub3cgZXh0ZXJuYWwuCiAgICBNb3Zp bmcgdG8gYSBwcm9wcGVyIHBsYWNlIGFzIHBvaW50ZWQgb3V0IGJ5IFNpdmFrdW1hci4KICAgIFVz ZSBhIGJldHRlciBuYW1lIGFzIHBvaW50ZWQgb3V0IGJ5IFJhbS4KCnYzOiBEb24ndCBkZXJlZmVy cmVuY2UgZHJtX2VuY29kZXItPmNydGMgYW5kIGludGVsX2NydGMtPmNvbmZpZyBvbgogICAgcHNy X3JlYWR5IGNoZWNrLiBGaXggYSBvcHBzIGNhdXNlZCB3aXRoIHByZXZpb3VzIHZlcnNpb25zLgoK djQ6IE1lbnRpb24gYW5kIGV4cGxhaW4gb24gY29tbWl0IG1lc3NhZ2UgdGhlIGNydGMtPm11dGV4 IGNoZWNrCiAgICByZW1vdmFsIHRoYXQgaGFwcGVuZWQgb24gdjMuCgp2NTogUmViYXNlIG9uIHRv cCBvZiBpcHNfcmVhZHkgcmV3b3JrLgoKQ2M6IFNpdmFrdW1hciBUaHVsYXNpbWFuaSA8c2l2YWt1 bWFyLnRodWxhc2ltYW5pQGludGVsLmNvbT4KQ2M6IFJhbWFsaW5nYW0gQyA8cmFtYWxpbmdhbS5j QGludGVsLmNvbT4KQ2M6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpD YzogRGFuaWVsIFZldHRlciA8ZGFuaWVsQGZmd2xsLmNoPgpSZXZpZXdlZC1ieTogUmFtYWxpbmdh bSBDIDxyYW1hbGluZ2FtLmNAaW50ZWwuY29tPiAodjIpClNpZ25lZC1vZmYtYnk6IFJvZHJpZ28g Vml2aSA8cm9kcmlnby52aXZpQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kaXNwbGF5LmMgfCAgMSArCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jICAg ICAgfCAgMiArKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggICAgIHwgIDMgKysK IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bzci5jICAgICB8IDU3ICsrKysrKysrKysrKysr KysrKysrLS0tLS0tLS0tLS0tLS0tLQogNCBmaWxlcyBjaGFuZ2VkLCAzOCBpbnNlcnRpb25zKCsp LCAyNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXgg YTBlMDUzZS4uODY5OTI5ZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAt MTE4NzEsNiArMTE4NzEsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9kdW1wX3BpcGVfY29uZmlnKHN0 cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogCQkgICAgICBwaXBlX2NvbmZpZy0+cGNoX3BmaXQuc2l6 ZSwKIAkJICAgICAgcGlwZV9jb25maWctPnBjaF9wZml0LmVuYWJsZWQgPyAiZW5hYmxlZCIgOiAi ZGlzYWJsZWQiKTsKIAlEUk1fREVCVUdfS01TKCJpcHMgcmVhZHk6ICVpXG4iLCBwaXBlX2NvbmZp Zy0+aXBzX3JlYWR5KTsKKwlEUk1fREVCVUdfS01TKCJwc3IgcmVhZHk6ICVpXG4iLCBwaXBlX2Nv bmZpZy0+cHNyX3JlYWR5KTsKIAlEUk1fREVCVUdfS01TKCJkb3VibGUgd2lkZTogJWlcbiIsIHBp cGVfY29uZmlnLT5kb3VibGVfd2lkZSk7CiAKIAlpZiAoSVNfQlJPWFRPTihkZXYpKSB7CmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZHAuYwppbmRleCAyNzNlMWFkLi5lMWMzZTlhIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2RwLmMKQEAgLTE0NjcsNiArMTQ2Nyw4IEBAIGludGVsX2RwX2NvbXB1dGVfY29uZmlnKHN0 cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAogCQkgKi8KIAkJbWluX2xhbmVfY291bnQgPSBt YXhfbGFuZV9jb3VudDsKIAkJbWluX2Nsb2NrID0gbWF4X2Nsb2NrOworCisJCXBpcGVfY29uZmln LT5wc3JfcmVhZHkgPSBpbnRlbF9wc3JfcmVhZHkoaW50ZWxfZHAsIHBpcGVfY29uZmlnKTsKIAl9 CiAKIAlmb3IgKDsgYnBwID49IDYqMzsgYnBwIC09IDIqMykgewpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k cnYuaAppbmRleCA2ZjBiMzU5Li4wNjUxMWQyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApA QCAtNDc3LDYgKzQ3Nyw3IEBAIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlIHsKIAlzdHJ1Y3QgaW50 ZWxfbGlua19tX24gZmRpX21fbjsKIAogCWJvb2wgaXBzX3JlYWR5OworCWJvb2wgcHNyX3JlYWR5 OwogCiAJYm9vbCBkb3VibGVfd2lkZTsKIApAQCAtMTM5Niw2ICsxMzk3LDggQEAgdm9pZCBpbnRl bF9iYWNrbGlnaHRfdW5yZWdpc3RlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKIAogCiAvKiBp bnRlbF9wc3IuYyAqLworYm9vbCBpbnRlbF9wc3JfcmVhZHkoc3RydWN0IGludGVsX2RwICppbnRl bF9kcCwKKwkJICAgICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9jb25maWcpOwogdm9p ZCBpbnRlbF9wc3JfZW5hYmxlKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApOwogdm9pZCBpbnRl bF9wc3JfZGlzYWJsZShzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKTsKIHZvaWQgaW50ZWxfcHNy X2ludmFsaWRhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3Bzci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcHNy LmMKaW5kZXggMjEzNTgxYy4uNGE5ZDYyMCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfcHNyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcHNyLmMKQEAg LTU2LDExICs1Niw2IEBACiAjaW5jbHVkZSAiaW50ZWxfZHJ2LmgiCiAjaW5jbHVkZSAiaTkxNV9k cnYuaCIKIAotc3RhdGljIGJvb2wgaXNfZWRwX3BzcihzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2Rw KQotewotCXJldHVybiBpbnRlbF9kcC0+cHNyX2RwY2RbMF0gJiBEUF9QU1JfSVNfU1VQUE9SVEVE OwotfQotCiBzdGF0aWMgYm9vbCB2bHZfaXNfcHNyX2FjdGl2ZV9vbl9waXBlKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYsIGludCBwaXBlKQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CkBAIC0yODcsMTkgKzI4MiwzMiBAQCBzdGF0aWMgdm9p ZCBoc3dfcHNyX2VuYWJsZV9zb3VyY2Uoc3RydWN0IGludGVsX2RwICppbnRlbF9kcCkKIAkJCQlF RFBfU1VfVFJBQ0tfRU5BQkxFIHwgRURQX1BTUjJfVFAyX1RJTUVfMTAwKTsKIH0KIAotc3RhdGlj IGJvb2wgaW50ZWxfcHNyX21hdGNoX2NvbmRpdGlvbnMoc3RydWN0IGludGVsX2RwICppbnRlbF9k cCkKKy8qKgorICogaW50ZWxfcHNyX3JlYWR5IC0gUFNSIHJlYWR5CisgKiBAaW50ZWxfZHA6IElu dGVsIERQCisgKiBAcGlwZV9jb25maWc6IFBpcGUgQ29uZmlnCisgKgorICogVGhpcyBmdW5jdGlv biBDaGVja3MgaWYgUFNSIGlzIHN1cHBvcnRlZCBieSBIYXJkd2FyZS9Tb3VyY2UgYW5kCisgKiBQ YW5lbC9TaW5rIGFuZCBpZiBhbGwgY29uZGl0aW9ucyB0byBiZSBlbmFibGVkIGFyZSBmdWxmaWxs ZWQuCisgKgorICogSXQgaXMgdXNlZCB0byBrbm93IGJlZm9yZWhhbmQgaWYgUFNSIGlzIGdvaW5n IHRvIGJlIGVuYWJsZWQuCisgKgorICogUmV0dXJuczoKKyAqIFRydWUgd2hlbiBQU1IgaXMgcmVh ZHkgdG8gYmUgZW5hYmxlZCwgZmFsc2Ugb3RoZXJ3aXNlLgorICovCitib29sIGludGVsX3Bzcl9y ZWFkeShzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwLAorCQkgICAgIHN0cnVjdCBpbnRlbF9jcnRj X3N0YXRlICpwaXBlX2NvbmZpZykKIHsKIAlzdHJ1Y3QgaW50ZWxfZGlnaXRhbF9wb3J0ICpkaWdf cG9ydCA9IGRwX3RvX2RpZ19wb3J0KGludGVsX2RwKTsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 ID0gZGlnX3BvcnQtPmJhc2UuYmFzZS5kZXY7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKLQlzdHJ1Y3QgZHJtX2NydGMgKmNydGMgPSBkaWdf cG9ydC0+YmFzZS5iYXNlLmNydGM7Ci0Jc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0 b19pbnRlbF9jcnRjKGNydGMpOwogCi0JbG9ja2RlcF9hc3NlcnRfaGVsZCgmZGV2X3ByaXYtPnBz ci5sb2NrKTsKLQlXQVJOX09OKCFkcm1fbW9kZXNldF9pc19sb2NrZWQoJmRldi0+bW9kZV9jb25m aWcuY29ubmVjdGlvbl9tdXRleCkpOwotCVdBUk5fT04oIWRybV9tb2Rlc2V0X2lzX2xvY2tlZCgm Y3J0Yy0+bXV0ZXgpKTsKKwlpZiAoIUhBU19QU1IoZGV2KSkgeworCQlEUk1fREVCVUdfS01TKCJQ U1Igbm90IHN1cHBvcnRlZCBvbiB0aGlzIHBsYXRmb3JtXG4iKTsKKwkJcmV0dXJuIGZhbHNlOwor CX0KIAotCWRldl9wcml2LT5wc3Iuc291cmNlX29rID0gZmFsc2U7CisJV0FSTl9PTighZHJtX21v ZGVzZXRfaXNfbG9ja2VkKCZkZXYtPm1vZGVfY29uZmlnLmNvbm5lY3Rpb25fbXV0ZXgpKTsKIAog CWlmIChJU19IQVNXRUxMKGRldikgJiYgZGlnX3BvcnQtPnBvcnQgIT0gUE9SVF9BKSB7CiAJCURS TV9ERUJVR19LTVMoIkhTVyB0aWVzIFBTUiB0byBEREkgQSAoZURQKVxuIik7CkBAIC0zMTIsMTQg KzMyMCwxNCBAQCBzdGF0aWMgYm9vbCBpbnRlbF9wc3JfbWF0Y2hfY29uZGl0aW9ucyhzdHJ1Y3Qg aW50ZWxfZHAgKmludGVsX2RwKQogCX0KIAogCWlmIChJU19IQVNXRUxMKGRldikgJiYKLQkgICAg STkxNV9SRUFEKEhTV19TVEVSRU9fM0RfQ1RMKGludGVsX2NydGMtPmNvbmZpZy0+Y3B1X3RyYW5z Y29kZXIpKSAmCisJICAgIEk5MTVfUkVBRChIU1dfU1RFUkVPXzNEX0NUTChwaXBlX2NvbmZpZy0+ Y3B1X3RyYW5zY29kZXIpKSAmCiAJCSAgICAgIFMzRF9FTkFCTEUpIHsKIAkJRFJNX0RFQlVHX0tN UygiUFNSIGNvbmRpdGlvbiBmYWlsZWQ6IFN0ZXJlbyAzRCBpcyBFbmFibGVkXG4iKTsKIAkJcmV0 dXJuIGZhbHNlOwogCX0KIAogCWlmIChJU19IQVNXRUxMKGRldikgJiYKLQkgICAgaW50ZWxfY3J0 Yy0+Y29uZmlnLT5iYXNlLmFkanVzdGVkX21vZGUuZmxhZ3MgJiBEUk1fTU9ERV9GTEFHX0lOVEVS TEFDRSkgeworCSAgICBwaXBlX2NvbmZpZy0+YmFzZS5hZGp1c3RlZF9tb2RlLmZsYWdzICYgRFJN X01PREVfRkxBR19JTlRFUkxBQ0UpIHsKIAkJRFJNX0RFQlVHX0tNUygiUFNSIGNvbmRpdGlvbiBm YWlsZWQ6IEludGVybGFjZWQgaXMgRW5hYmxlZFxuIik7CiAJCXJldHVybiBmYWxzZTsKIAl9CkBA IC0zMzAsMTAgKzMzOCwxOSBAQCBzdGF0aWMgYm9vbCBpbnRlbF9wc3JfbWF0Y2hfY29uZGl0aW9u cyhzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKQogCQlyZXR1cm4gZmFsc2U7CiAJfQogCisJLyog QXQgdGhpcyBwb2ludCB3ZSBjYW4gdGVsbCBIVy9Tb3VyY2Ugc3VwcG9ydHMgUFNSICovCiAJZGV2 X3ByaXYtPnBzci5zb3VyY2Vfb2sgPSB0cnVlOworCisJLyogTm93IGNoZWNrIGlmIFBhbmVsL1Np bmsgc3VwcG9ydHMgaXQgKi8KKwlpZiAoIWRldl9wcml2LT5wc3Iuc2lua19zdXBwb3J0KSB7CisJ CURSTV9ERUJVR19LTVMoIlBTUiBub3Qgc3VwcG9ydGVkIGJ5IHRoaXMgcGFuZWxcbiIpOworCQly ZXR1cm4gZmFsc2U7CisJfQorCiAJcmV0dXJuIHRydWU7CiB9CiAKKwogc3RhdGljIHZvaWQgaW50 ZWxfcHNyX2FjdGl2YXRlKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCiB7CiAJc3RydWN0IGlu dGVsX2RpZ2l0YWxfcG9ydCAqaW50ZWxfZGlnX3BvcnQgPSBkcF90b19kaWdfcG9ydChpbnRlbF9k cCk7CkBAIC0zNzAsMTUgKzM4Nyw4IEBAIHZvaWQgaW50ZWxfcHNyX2VuYWJsZShzdHJ1Y3QgaW50 ZWxfZHAgKmludGVsX2RwKQogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRl di0+ZGV2X3ByaXZhdGU7CiAJc3RydWN0IGludGVsX2NydGMgKmNydGMgPSB0b19pbnRlbF9jcnRj KGludGVsX2RpZ19wb3J0LT5iYXNlLmJhc2UuY3J0Yyk7CiAKLQlpZiAoIUhBU19QU1IoZGV2KSkg ewotCQlEUk1fREVCVUdfS01TKCJQU1Igbm90IHN1cHBvcnRlZCBvbiB0aGlzIHBsYXRmb3JtXG4i KTsKLQkJcmV0dXJuOwotCX0KLQotCWlmICghaXNfZWRwX3BzcihpbnRlbF9kcCkpIHsKLQkJRFJN X0RFQlVHX0tNUygiUFNSIG5vdCBzdXBwb3J0ZWQgYnkgdGhpcyBwYW5lbFxuIik7CisJaWYgKCFj cnRjLT5jb25maWctPnBzcl9yZWFkeSkKIAkJcmV0dXJuOwotCX0KIAogCW11dGV4X2xvY2soJmRl dl9wcml2LT5wc3IubG9jayk7CiAJaWYgKGRldl9wcml2LT5wc3IuZW5hYmxlZCkgewpAQCAtMzg2 LDkgKzM5Niw2IEBAIHZvaWQgaW50ZWxfcHNyX2VuYWJsZShzdHJ1Y3QgaW50ZWxfZHAgKmludGVs X2RwKQogCQlnb3RvIHVubG9jazsKIAl9CiAKLQlpZiAoIWludGVsX3Bzcl9tYXRjaF9jb25kaXRp b25zKGludGVsX2RwKSkKLQkJZ290byB1bmxvY2s7Ci0KIAlkZXZfcHJpdi0+cHNyLmJ1c3lfZnJv bnRidWZmZXJfYml0cyA9IDA7CiAKIAlpZiAoSEFTX0RESShkZXYpKSB7Ci0tIAoyLjQuMwoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1h aWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK