From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rodrigo Vivi Subject: [PATCH] drm/i915: Add psr_ready on pipe_config Date: Wed, 15 Apr 2015 13:21:54 -0700 Message-ID: <1429129314-3759-1-git-send-email-rodrigo.vivi@intel.com> References: <1429115899-1916-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 E1DE46E8CF for ; Wed, 15 Apr 2015 13:21:55 -0700 (PDT) In-Reply-To: <1429115899-1916-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 cmVuY2UgZHJtX2VuY29kZXItPmNydGMgYW5kIGludGVsX2NydGMtPmNvbmZpZyBvbiBwc3JfcmVh ZHkKICAgIGNoZWNrLiBGaXggYSBvcHBzIGNhdXNlZCB3aXRoIHByZXZpb3VzIHZlcnNpb25zLgoK djQ6IE1lbnRpb24gYW5kIGV4cGxhaW4gb24gY29tbWl0IG1lc3NhZ2UgdGhlIGNydGMtPm11dGV4 IGNoZWNrIHJlbW92YWwgdGhhdAogICAgaGFwcGVuZWQgb24gdjMuCgpDYzogU2l2YWt1bWFyIFRo dWxhc2ltYW5pIDxzaXZha3VtYXIudGh1bGFzaW1hbmlAaW50ZWwuY29tPgpDYzogUmFtYWxpbmdh bSBDIDxyYW1hbGluZ2FtLmNAaW50ZWwuY29tPgpDYzogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJp cy13aWxzb24uY28udWs+CkNjOiBEYW5pZWwgVmV0dGVyIDxkYW5pZWxAZmZ3bGwuY2g+ClJldmll d2VkLWJ5OiBSYW1hbGluZ2FtIEMgPHJhbWFsaW5nYW0uY0BpbnRlbC5jb20+ICh2MikKU2lnbmVk LW9mZi1ieTogUm9kcmlnbyBWaXZpIDxyb2RyaWdvLnZpdmlAaW50ZWwuY29tPgotLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8ICAxICsKIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2RwLmMgICAgICB8ICAyICsrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k cnYuaCAgICAgfCAgMyArKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcHNyLmMgICAgIHwg NTcgKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tCiA0IGZpbGVzIGNoYW5nZWQs IDM4IGluc2VydGlvbnMoKyksIDI1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2Rpc3BsYXkuYwppbmRleCA3NWFmYTZlLi41MGYyZGI3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZGlzcGxheS5jCkBAIC0xMDg5NSw2ICsxMDg5NSw3IEBAIHN0YXRpYyB2b2lkIGludGVsX2R1 bXBfcGlwZV9jb25maWcoc3RydWN0IGludGVsX2NydGMgKmNydGMsCiAJCSAgICAgIHBpcGVfY29u ZmlnLT5wY2hfcGZpdC5wb3MsCiAJCSAgICAgIHBpcGVfY29uZmlnLT5wY2hfcGZpdC5zaXplLAog CQkgICAgICBwaXBlX2NvbmZpZy0+cGNoX3BmaXQuZW5hYmxlZCA/ICJlbmFibGVkIiA6ICJkaXNh YmxlZCIpOworCURSTV9ERUJVR19LTVMoInBzciByZWFkeTogJWlcbiIsIHBpcGVfY29uZmlnLT5w c3JfcmVhZHkpOwogCURSTV9ERUJVR19LTVMoImlwczogJWlcbiIsIHBpcGVfY29uZmlnLT5pcHNf ZW5hYmxlZCk7CiAJRFJNX0RFQlVHX0tNUygiZG91YmxlIHdpZGU6ICVpXG4iLCBwaXBlX2NvbmZp Zy0+ZG91YmxlX3dpZGUpOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kcC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYwppbmRleCAxNGNkZDAwLi45 NGJiZGY0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMKQEAgLTEzOTQsNiArMTM5NCw4IEBAIGlu dGVsX2RwX2NvbXB1dGVfY29uZmlnKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAogCQkg Ki8KIAkJbWluX2xhbmVfY291bnQgPSBtYXhfbGFuZV9jb3VudDsKIAkJbWluX2Nsb2NrID0gbWF4 X2Nsb2NrOworCisJCXBpcGVfY29uZmlnLT5wc3JfcmVhZHkgPSBpbnRlbF9wc3JfcmVhZHkoaW50 ZWxfZHAsIHBpcGVfY29uZmlnKTsKIAl9CiAKIAlmb3IgKDsgYnBwID49IDYqMzsgYnBwIC09IDIq MykgewpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCAwODJiZTcxLi45ODk1NzcyIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtNDQ4LDYgKzQ0OCw3IEBAIHN0cnVjdCBpbnRlbF9j cnRjX3N0YXRlIHsKIAlpbnQgZmRpX2xhbmVzOwogCXN0cnVjdCBpbnRlbF9saW5rX21fbiBmZGlf bV9uOwogCisJYm9vbCBwc3JfcmVhZHk7CiAJYm9vbCBpcHNfZW5hYmxlZDsKIAogCWJvb2wgZG91 YmxlX3dpZGU7CkBAIC0xMjg3LDYgKzEyODgsOCBAQCB2b2lkIGludGVsX2JhY2tsaWdodF91bnJl Z2lzdGVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogCiAKIC8qIGludGVsX3Bzci5jICovCiti b29sIGludGVsX3Bzcl9yZWFkeShzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwLAorCQkgICAgIHN0 cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpwaXBlX2NvbmZpZyk7CiB2b2lkIGludGVsX3Bzcl9lbmFi bGUoc3RydWN0IGludGVsX2RwICppbnRlbF9kcCk7CiB2b2lkIGludGVsX3Bzcl9kaXNhYmxlKHN0 cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApOwogdm9pZCBpbnRlbF9wc3JfaW52YWxpZGF0ZShzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2LApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfcHNyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wc3IuYwppbmRleCA1ZWUwZmE1 Li42MWQ1ODJiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wc3IuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wc3IuYwpAQCAtNTYsMTEgKzU2LDYgQEAK ICNpbmNsdWRlICJpbnRlbF9kcnYuaCIKICNpbmNsdWRlICJpOTE1X2Rydi5oIgogCi1zdGF0aWMg Ym9vbCBpc19lZHBfcHNyKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCi17Ci0JcmV0dXJuIGlu dGVsX2RwLT5wc3JfZHBjZFswXSAmIERQX1BTUl9JU19TVVBQT1JURUQ7Ci19Ci0KIHN0YXRpYyBi b29sIHZsdl9pc19wc3JfYWN0aXZlX29uX3BpcGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgaW50 IHBpcGUpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZf cHJpdmF0ZTsKQEAgLTI4MiwxOSArMjc3LDMyIEBAIHN0YXRpYyB2b2lkIGhzd19wc3JfZW5hYmxl X3NvdXJjZShzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKQogCQkJCUVEUF9TVV9UUkFDS19FTkFC TEUgfCBFRFBfUFNSMl9UUDJfVElNRV8xMDApOwogfQogCi1zdGF0aWMgYm9vbCBpbnRlbF9wc3Jf bWF0Y2hfY29uZGl0aW9ucyhzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKQorLyoqCisgKiBpbnRl bF9wc3JfcmVhZHkgLSBQU1IgcmVhZHkKKyAqIEBpbnRlbF9kcDogSW50ZWwgRFAKKyAqIEBwaXBl X2NvbmZpZzogUGlwZSBDb25maWcKKyAqCisgKiBUaGlzIGZ1bmN0aW9uIENoZWNrcyBpZiBQU1Ig aXMgc3VwcG9ydGVkIGJ5IEhhcmR3YXJlL1NvdXJjZSBhbmQKKyAqIFBhbmVsL1NpbmsgYW5kIGlm IGFsbCBjb25kaXRpb25zIHRvIGJlIGVuYWJsZWQgYXJlIGZ1bGZpbGxlZC4KKyAqCisgKiBJdCBp cyB1c2VkIHRvIGtub3cgYmVmb3JlaGFuZCBpZiBQU1IgaXMgZ29pbmcgdG8gYmUgZW5hYmxlZC4K KyAqCisgKiBSZXR1cm5zOgorICogVHJ1ZSB3aGVuIFBTUiBpcyByZWFkeSB0byBiZSBlbmFibGVk LCBmYWxzZSBvdGhlcndpc2UuCisgKi8KK2Jvb2wgaW50ZWxfcHNyX3JlYWR5KHN0cnVjdCBpbnRl bF9kcCAqaW50ZWxfZHAsCisJCSAgICAgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKnBpcGVfY29u ZmlnKQogewogCXN0cnVjdCBpbnRlbF9kaWdpdGFsX3BvcnQgKmRpZ19wb3J0ID0gZHBfdG9fZGln X3BvcnQoaW50ZWxfZHApOwogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBkaWdfcG9ydC0+YmFz ZS5iYXNlLmRldjsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRl dl9wcml2YXRlOwotCXN0cnVjdCBkcm1fY3J0YyAqY3J0YyA9IGRpZ19wb3J0LT5iYXNlLmJhc2Uu Y3J0YzsKLQlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0 Yyk7CiAKLQlsb2NrZGVwX2Fzc2VydF9oZWxkKCZkZXZfcHJpdi0+cHNyLmxvY2spOwotCVdBUk5f T04oIWRybV9tb2Rlc2V0X2lzX2xvY2tlZCgmZGV2LT5tb2RlX2NvbmZpZy5jb25uZWN0aW9uX211 dGV4KSk7Ci0JV0FSTl9PTighZHJtX21vZGVzZXRfaXNfbG9ja2VkKCZjcnRjLT5tdXRleCkpOwor CWlmICghSEFTX1BTUihkZXYpKSB7CisJCURSTV9ERUJVR19LTVMoIlBTUiBub3Qgc3VwcG9ydGVk IG9uIHRoaXMgcGxhdGZvcm1cbiIpOworCQlyZXR1cm4gZmFsc2U7CisJfQogCi0JZGV2X3ByaXYt PnBzci5zb3VyY2Vfb2sgPSBmYWxzZTsKKwlXQVJOX09OKCFkcm1fbW9kZXNldF9pc19sb2NrZWQo JmRldi0+bW9kZV9jb25maWcuY29ubmVjdGlvbl9tdXRleCkpOwogCiAJaWYgKElTX0hBU1dFTEwo ZGV2KSAmJiBkaWdfcG9ydC0+cG9ydCAhPSBQT1JUX0EpIHsKIAkJRFJNX0RFQlVHX0tNUygiSFNX IHRpZXMgUFNSIHRvIERESSBBIChlRFApXG4iKTsKQEAgLTMwNywxNCArMzE1LDE0IEBAIHN0YXRp YyBib29sIGludGVsX3Bzcl9tYXRjaF9jb25kaXRpb25zKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxf ZHApCiAJfQogCiAJaWYgKElTX0hBU1dFTEwoZGV2KSAmJgotCSAgICBJOTE1X1JFQUQoSFNXX1NU RVJFT18zRF9DVEwoaW50ZWxfY3J0Yy0+Y29uZmlnLT5jcHVfdHJhbnNjb2RlcikpICYKKwkgICAg STkxNV9SRUFEKEhTV19TVEVSRU9fM0RfQ1RMKHBpcGVfY29uZmlnLT5jcHVfdHJhbnNjb2Rlcikp ICYKIAkJICAgICAgUzNEX0VOQUJMRSkgewogCQlEUk1fREVCVUdfS01TKCJQU1IgY29uZGl0aW9u IGZhaWxlZDogU3RlcmVvIDNEIGlzIEVuYWJsZWRcbiIpOwogCQlyZXR1cm4gZmFsc2U7CiAJfQog CiAJaWYgKElTX0hBU1dFTEwoZGV2KSAmJgotCSAgICBpbnRlbF9jcnRjLT5jb25maWctPmJhc2Uu YWRqdXN0ZWRfbW9kZS5mbGFncyAmIERSTV9NT0RFX0ZMQUdfSU5URVJMQUNFKSB7CisJICAgIHBp cGVfY29uZmlnLT5iYXNlLmFkanVzdGVkX21vZGUuZmxhZ3MgJiBEUk1fTU9ERV9GTEFHX0lOVEVS TEFDRSkgewogCQlEUk1fREVCVUdfS01TKCJQU1IgY29uZGl0aW9uIGZhaWxlZDogSW50ZXJsYWNl ZCBpcyBFbmFibGVkXG4iKTsKIAkJcmV0dXJuIGZhbHNlOwogCX0KQEAgLTMyNSwxMCArMzMzLDE5 IEBAIHN0YXRpYyBib29sIGludGVsX3Bzcl9tYXRjaF9jb25kaXRpb25zKHN0cnVjdCBpbnRlbF9k cCAqaW50ZWxfZHApCiAJCXJldHVybiBmYWxzZTsKIAl9CiAKKwkvKiBBdCB0aGlzIHBvaW50IHdl IGNhbiB0ZWxsIEhXL1NvdXJjZSBzdXBwb3J0cyBQU1IgKi8KIAlkZXZfcHJpdi0+cHNyLnNvdXJj ZV9vayA9IHRydWU7CisKKwkvKiBOb3cgY2hlY2sgaWYgUGFuZWwvU2luayBzdXBwb3J0cyBpdCAq LworCWlmICghZGV2X3ByaXYtPnBzci5zaW5rX3N1cHBvcnQpIHsKKwkJRFJNX0RFQlVHX0tNUygi UFNSIG5vdCBzdXBwb3J0ZWQgYnkgdGhpcyBwYW5lbFxuIik7CisJCXJldHVybiBmYWxzZTsKKwl9 CisKIAlyZXR1cm4gdHJ1ZTsKIH0KIAorCiBzdGF0aWMgdm9pZCBpbnRlbF9wc3JfYWN0aXZhdGUo c3RydWN0IGludGVsX2RwICppbnRlbF9kcCkKIHsKIAlzdHJ1Y3QgaW50ZWxfZGlnaXRhbF9wb3J0 ICppbnRlbF9kaWdfcG9ydCA9IGRwX3RvX2RpZ19wb3J0KGludGVsX2RwKTsKQEAgLTM2NSwxNSAr MzgyLDggQEAgdm9pZCBpbnRlbF9wc3JfZW5hYmxlKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHAp CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsK IAlzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YyA9IHRvX2ludGVsX2NydGMoaW50ZWxfZGlnX3BvcnQt PmJhc2UuYmFzZS5jcnRjKTsKIAotCWlmICghSEFTX1BTUihkZXYpKSB7Ci0JCURSTV9ERUJVR19L TVMoIlBTUiBub3Qgc3VwcG9ydGVkIG9uIHRoaXMgcGxhdGZvcm1cbiIpOwotCQlyZXR1cm47Ci0J fQotCi0JaWYgKCFpc19lZHBfcHNyKGludGVsX2RwKSkgewotCQlEUk1fREVCVUdfS01TKCJQU1Ig bm90IHN1cHBvcnRlZCBieSB0aGlzIHBhbmVsXG4iKTsKKwlpZiAoIWNydGMtPmNvbmZpZy0+cHNy X3JlYWR5KQogCQlyZXR1cm47Ci0JfQogCiAJbXV0ZXhfbG9jaygmZGV2X3ByaXYtPnBzci5sb2Nr KTsKIAlpZiAoZGV2X3ByaXYtPnBzci5lbmFibGVkKSB7CkBAIC0zODEsOSArMzkxLDYgQEAgdm9p ZCBpbnRlbF9wc3JfZW5hYmxlKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCiAJCWdvdG8gdW5s b2NrOwogCX0KIAotCWlmICghaW50ZWxfcHNyX21hdGNoX2NvbmRpdGlvbnMoaW50ZWxfZHApKQot CQlnb3RvIHVubG9jazsKLQogCWRldl9wcml2LT5wc3IuYnVzeV9mcm9udGJ1ZmZlcl9iaXRzID0g MDsKIAogCWlmIChIQVNfRERJKGRldikpIHsKLS0gCjIuMS4wCgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVs LWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=