From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: [PATCH 2/2] drm/i915/lspcon: Add workaround for resuming in PCON mode Date: Thu, 20 Oct 2016 20:06:27 +0300 Message-ID: <1476983187-27216-2-git-send-email-imre.deak@intel.com> References: <1476983187-27216-1-git-send-email-imre.deak@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id AB7126E0BD for ; Thu, 20 Oct 2016 17:06:33 +0000 (UTC) In-Reply-To: <1476983187-27216-1-git-send-email-imre.deak@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: Jani Nikula List-Id: intel-gfx@lists.freedesktop.org T24gbXkgQVBMIHRoZSBMU1BDT04gZmlybXdhcmUgcmVzdW1lcyBpbiBQQ09OIG1vZGUgYXMgb3Bw b3NlZCB0byB0aGUKZXhwZWN0ZWQgTFMgbW9kZS4gSXQgYWxzbyBhcHBlYXJzIHRvIGJlIGluIGEg c3RhdGUgd2hlcmUgQVVYIERQQ0QgcmVhZHMKd2lsbCBzdWNjZWVkIGJ1dCByZXR1cm4gZ2FyYmFn ZSByZWNvdmVyaW5nIG9ubHkgYWZ0ZXIgYSBmZXcgaHVuZHJlZHMgb2YKbWlsbGlzZWNvbmRzLiBB ZnRlciB0aGUgcmVjb3ZlcnkgdGltZSBEUENEIHJlYWRzIHdpbGwgcmVzdWx0IGluIHRoZQpjb3Jy ZWN0IHZhbHVlcyBhbmQgdGhpbmdzIHdpbGwgY29udGludWUgdG8gd29yay4gSWYgSTJDIG92ZXIg QVVYIGlzCmF0dGVtcHRlZCBkdXJpbmcgdGhpcyByZWNvdmVyeSB0aW1lIChpbXBseWluZyBhbiBB VVggd3JpdGUgdHJhbnNhY3Rpb24pCnRoZSBmaXJtd2FyZSB3b24ndCByZWNvdmVyIGFuZCB3aWxs IHN0YXkgaW4gdGhpcyBicm9rZW4gc3RhdGUuCgpBcyBhIHdvcmthcm91bmQgY2hlY2sgaWYgdGhl IGZpcm13YXJlIGlzIGluIFBDT04gc3RhdGUgYWZ0ZXIgcmVzdW1lIGFuZAppZiBzbyB3YWl0IHVu dGlsIHRoZSBjb3JyZWN0IERQQ0QgdmFsdWVzIGFyZSByZXR1cm5lZC4gRm9yIHRoaXMgd2UKY29t cGFyZSB0aGUgYnJhbmNoIGRlc2NyaXB0b3Igd2l0aCB0aGUgb25lIHdlIGNhY2hlZCBkdXJpbmcg aW5pdCB0aW1lLgpJZiB0aGUgZmlybXdhcmUgd2FzIGluIHRoZSBMUyBzdGF0ZSwgd2Ugc2tpcCB0 aGUgdy9hIGFuZCBjb250aW51ZSBhcwpiZWZvcmUuCgpDYzogU2hhc2hhbmsgU2hhcm1hIDxzaGFz aGFuay5zaGFybWFAaW50ZWwuY29tPgpDYzogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxh QGxpbnV4LmludGVsLmNvbT4KQ2M6IEphbmkgTmlrdWxhIDxqYW5pLm5pa3VsYUBpbnRlbC5jb20+ ClNpZ25lZC1vZmYtYnk6IEltcmUgRGVhayA8aW1yZS5kZWFrQGludGVsLmNvbT4KLS0tCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jICAgICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kcnYuaCAgICB8ICA2ICsrKystCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9sc3Bjb24uYyB8IDUyICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0KIDMg ZmlsZXMgY2hhbmdlZCwgNDggaW5zZXJ0aW9ucygrKSwgMTIgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2RwLmMKaW5kZXggZTkwMjExZS4uZWMwMzFkYiAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kcC5jCkBAIC0zNDg3LDcgKzM0ODcsNyBAQCBpbnRlbF9kcF9saW5rX2Rvd24oc3RydWN0IGlu dGVsX2RwICppbnRlbF9kcCkKIAlpbnRlbF9kcC0+RFAgPSBEUDsKIH0KIAotc3RhdGljIGJvb2wK K2Jvb2wKIGludGVsX2RwX3JlYWRfZHBjZChzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKQogewog CWlmIChkcm1fZHBfZHBjZF9yZWFkKCZpbnRlbF9kcC0+YXV4LCAweDAwMCwgaW50ZWxfZHAtPmRw Y2QsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCmluZGV4IGEzNWUyNDEuLjlhMjM2NmUgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rydi5oCkBAIC05NzIsNyArOTcyLDkgQEAgc3RydWN0IGludGVsX2Rw IHsKIHN0cnVjdCBpbnRlbF9sc3Bjb24gewogCWJvb2wgYWN0aXZlOwogCWVudW0gZHJtX2xzcGNv bl9tb2RlIG1vZGU7Ci0Jc3RydWN0IGRybV9kcF9hdXggKmF1eDsKKwlzdHJ1Y3QgaW50ZWxfZHAg KmludGVsX2RwOworCWJvb2wgZGVzY192YWxpZDsKKwlzdHJ1Y3QgaW50ZWxfZHBfZGVzYyBkZXNj OwogfTsKIAogc3RydWN0IGludGVsX2RpZ2l0YWxfcG9ydCB7CkBAIC0xNDY5LDYgKzE0NzEsOCBA QCBzdGF0aWMgaW5saW5lIHVuc2lnbmVkIGludCBpbnRlbF9kcF91bnVzZWRfbGFuZV9tYXNrKGlu dCBsYW5lX2NvdW50KQogfQogCiBib29sCitpbnRlbF9kcF9yZWFkX2RwY2Qoc3RydWN0IGludGVs X2RwICppbnRlbF9kcCk7Citib29sCiBpbnRlbF9kcF9yZWFkX2Rlc2Moc3RydWN0IGludGVsX2Rw ICppbnRlbF9kcCwgc3RydWN0IGludGVsX2RwX2Rlc2MgKmRlc2MpOwogdm9pZAogaW50ZWxfZHBf cHJpbnRfZGVzYyhzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwLCBzdHJ1Y3QgaW50ZWxfZHBfZGVz YyAqZGVzYyk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9sc3Bjb24u YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xzcGNvbi5jCmluZGV4IGQyYzhjYjIuLjU0 YzYxNzMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xzcGNvbi5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xzcGNvbi5jCkBAIC0zMCw3ICszMCw3IEBA CiBzdGF0aWMgZW51bSBkcm1fbHNwY29uX21vZGUgbHNwY29uX2dldF9jdXJyZW50X21vZGUoc3Ry dWN0IGludGVsX2xzcGNvbiAqbHNwY29uKQogewogCWVudW0gZHJtX2xzcGNvbl9tb2RlIGN1cnJl bnRfbW9kZSA9IERSTV9MU1BDT05fTU9ERV9JTlZBTElEOwotCXN0cnVjdCBpMmNfYWRhcHRlciAq YWRhcHRlciA9ICZsc3Bjb24tPmF1eC0+ZGRjOworCXN0cnVjdCBpMmNfYWRhcHRlciAqYWRhcHRl ciA9ICZsc3Bjb24tPmludGVsX2RwLT5hdXguZGRjOwogCiAJaWYgKGRybV9sc3Bjb25fZ2V0X21v ZGUoYWRhcHRlciwgJmN1cnJlbnRfbW9kZSkpCiAJCURSTV9FUlJPUigiRXJyb3IgcmVhZGluZyBM U1BDT04gbW9kZVxuIik7CkBAIC00NSw3ICs0NSw3IEBAIHN0YXRpYyBpbnQgbHNwY29uX2NoYW5n ZV9tb2RlKHN0cnVjdCBpbnRlbF9sc3Bjb24gKmxzcGNvbiwKIHsKIAlpbnQgZXJyOwogCWVudW0g ZHJtX2xzcGNvbl9tb2RlIGN1cnJlbnRfbW9kZTsKLQlzdHJ1Y3QgaTJjX2FkYXB0ZXIgKmFkYXB0 ZXIgPSAmbHNwY29uLT5hdXgtPmRkYzsKKwlzdHJ1Y3QgaTJjX2FkYXB0ZXIgKmFkYXB0ZXIgPSAm bHNwY29uLT5pbnRlbF9kcC0+YXV4LmRkYzsKIAogCWVyciA9IGRybV9sc3Bjb25fZ2V0X21vZGUo YWRhcHRlciwgJmN1cnJlbnRfbW9kZSk7CiAJaWYgKGVycikgewpAQCAtNzIsNyArNzIsNyBAQCBz dGF0aWMgaW50IGxzcGNvbl9jaGFuZ2VfbW9kZShzdHJ1Y3QgaW50ZWxfbHNwY29uICpsc3Bjb24s CiBzdGF0aWMgYm9vbCBsc3Bjb25fcHJvYmUoc3RydWN0IGludGVsX2xzcGNvbiAqbHNwY29uKQog ewogCWVudW0gZHJtX2RwX2R1YWxfbW9kZV90eXBlIGFkYXB0b3JfdHlwZTsKLQlzdHJ1Y3QgaTJj X2FkYXB0ZXIgKmFkYXB0ZXIgPSAmbHNwY29uLT5hdXgtPmRkYzsKKwlzdHJ1Y3QgaTJjX2FkYXB0 ZXIgKmFkYXB0ZXIgPSAmbHNwY29uLT5pbnRlbF9kcC0+YXV4LmRkYzsKIAogCS8qIExldHMgcHJv YmUgdGhlIGFkYXB0b3IgYW5kIGNoZWNrIGl0cyB0eXBlICovCiAJYWRhcHRvcl90eXBlID0gZHJt X2RwX2R1YWxfbW9kZV9kZXRlY3QoYWRhcHRlcik7CkBAIC04OSw4ICs4OSw0MiBAQCBzdGF0aWMg Ym9vbCBsc3Bjb25fcHJvYmUoc3RydWN0IGludGVsX2xzcGNvbiAqbHNwY29uKQogCXJldHVybiB0 cnVlOwogfQogCitzdGF0aWMgdm9pZCBsc3Bjb25fcmVzdW1lX2luX3Bjb25fd2Eoc3RydWN0IGlu dGVsX2xzcGNvbiAqbHNwY29uKQoreworCXVuc2lnbmVkIGxvbmcgc3RhcnQgPSBqaWZmaWVzOwor CisJaWYgKCFsc3Bjb24tPmRlc2NfdmFsaWQpCisJCXJldHVybjsKKworCXdoaWxlICgxKSB7CisJ CXN0cnVjdCBpbnRlbF9kcF9kZXNjIGRlc2M7CisKKwkJLyoKKwkJICogVGhlIHcvYSBvbmx5IGFw cGxpZXMgaW4gUENPTiBtb2RlIGFuZCB3ZSBkb24ndCBleHBlY3QgYW55CisJCSAqIEFVWCBlcnJv cnMuCisJCSAqLworCQlpZiAoIWludGVsX2RwX3JlYWRfZGVzYyhsc3Bjb24tPmludGVsX2RwLCAm ZGVzYykpCisJCQlyZXR1cm47CisKKwkJaWYgKCFtZW1jbXAoJmxzcGNvbi0+ZGVzYywgJmRlc2Ms IHNpemVvZihkZXNjKSkpIHsKKwkJCURSTV9ERUJVR19LTVMoIkxTUENPTiByZWNvdmVyaW5nIGlu IFBDT04gbW9kZSBhZnRlciAldSBtc1xuIiwKKwkJCQkgICAgICBqaWZmaWVzX3RvX21zZWNzKGpp ZmZpZXMgLSBzdGFydCkpOworCQkJcmV0dXJuOworCQl9CisKKwkJaWYgKHRpbWVfYWZ0ZXIoamlm Zmllcywgc3RhcnQgKyBtc2Vjc190b19qaWZmaWVzKDEwMDApKSkKKwkJCWJyZWFrOworCisJCW1z bGVlcCgxMCk7CisJfQorCisJRFJNX0RFQlVHX0tNUygiTFNQQ09OIERQIGRlc2NyaXB0b3IgbWlz bWF0Y2ggYWZ0ZXIgcmVzdW1lXG4iKTsKK30KKwogdm9pZCBsc3Bjb25fcmVzdW1lKHN0cnVjdCBp bnRlbF9sc3Bjb24gKmxzcGNvbikKIHsKKwlsc3Bjb25fcmVzdW1lX2luX3Bjb25fd2EobHNwY29u KTsKKwogCWlmIChsc3Bjb25fY2hhbmdlX21vZGUobHNwY29uLCBEUk1fTFNQQ09OX01PREVfUENP TiwgdHJ1ZSkpCiAJCURSTV9FUlJPUigiTFNQQ09OIHJlc3VtZSBmYWlsZWRcbiIpOwogCWVsc2UK QEAgLTExMSw3ICsxNDUsNyBAQCBib29sIGxzcGNvbl9pbml0KHN0cnVjdCBpbnRlbF9kaWdpdGFs X3BvcnQgKmludGVsX2RpZ19wb3J0KQogCiAJbHNwY29uLT5hY3RpdmUgPSBmYWxzZTsKIAlsc3Bj b24tPm1vZGUgPSBEUk1fTFNQQ09OX01PREVfSU5WQUxJRDsKLQlsc3Bjb24tPmF1eCA9ICZkcC0+ YXV4OworCWxzcGNvbi0+aW50ZWxfZHAgPSBkcDsKIAogCWlmICghbHNwY29uX3Byb2JlKGxzcGNv bikpIHsKIAkJRFJNX0VSUk9SKCJGYWlsZWQgdG8gcHJvYmUgbHNwY29uXG4iKTsKQEAgLTEzMSwx MiArMTY1LDEwIEBAIGJvb2wgbHNwY29uX2luaXQoc3RydWN0IGludGVsX2RpZ2l0YWxfcG9ydCAq aW50ZWxfZGlnX3BvcnQpCiAJCX0KIAl9CiAKLQlpZiAoZHJtX2RlYnVnICYgRFJNX1VUX0tNUykg ewotCQlzdHJ1Y3QgaW50ZWxfZHBfZGVzYyBkZXNjOwotCi0JCWlmIChpbnRlbF9kcF9yZWFkX2Rl c2MoZHAsICZkZXNjKSkKLQkJCWludGVsX2RwX3ByaW50X2Rlc2MoZHAsICZkZXNjKTsKLQl9CisJ bHNwY29uLT5kZXNjX3ZhbGlkID0gaW50ZWxfZHBfcmVhZF9kcGNkKGRwKSAmJgorCQkJICAgICBp bnRlbF9kcF9yZWFkX2Rlc2MoZHAsICZsc3Bjb24tPmRlc2MpOworCWlmICgoZHJtX2RlYnVnICYg RFJNX1VUX0tNUykgJiYgbHNwY29uLT5kZXNjX3ZhbGlkKQorCQlpbnRlbF9kcF9wcmludF9kZXNj KGRwLCAmbHNwY29uLT5kZXNjKTsKIAogCURSTV9ERUJVR19LTVMoIlN1Y2Nlc3M6IExTUENPTiBp bml0XG4iKTsKIAlyZXR1cm4gdHJ1ZTsKLS0gCjIuNS4wCgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdm eEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp bG1hbi9saXN0aW5mby9pbnRlbC1nZngK