From: Maarten Lankhorst Subject: [PATCH 1/2] Revert "drm/i915: Make intel_display_suspend atomic, v2." Date: Wed, 10 Jun 2015 10:24:19 +0200 Message-ID: <1433924660-2228-2-git-send-email-maarten.lankhorst@linux.intel.com> References: <1433924660-2228-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 ESMTP id EBF026E3B2 for ; Wed, 10 Jun 2015 01:24:26 -0700 (PDT) In-Reply-To: <1433924660-2228-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 VGhpcyByZXZlcnRzIGNvbW1pdCA0OTBmNDAwZGI1ZDg4NmZjMjg1NjZhZjY5YjAyZjY0OTdmMzFi ZTRiLgoKV2UncmUgbm90IHJlYWR5IHlldCB0byBtYWtlIGl0IGF0b21pYywgd2UgY2FsY3VsYXRl IHNvbWUgc3RhdGUgaW4KYWR2YW5jZSwgYnV0IHdpdGhvdXQgYXRvbWljIHBsYW5lIHN1cHBvcnQg YXRvbWljIHRoZSBodyByZWFkb3V0IHdpbGwKZmFpbC4KCkl0J3MgcmVxdWlyZWQgdG8gcmV2ZXJ0 IHRoaXMgY29tbWl0IHRvIHJldmVydCB0aGUgYXRvbWljIGh3CnN0YXRlIHJlYWRvdXQgcGF0Y2gu CgpCdWd6aWxsYTogaHR0cHM6Ly9idWdzLmZyZWVkZXNrdG9wLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 OTA4NjgKQnVnemlsbGE6IGh0dHBzOi8vYnVncy5mcmVlZGVza3RvcC5vcmcvc2hvd19idWcuY2dp P2lkPTkwODYxCgpTaWduZWQtb2ZmLWJ5OiBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5sYW5r aG9yc3RAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2 LmMgICAgICB8ICAzIC0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCA1 NSArKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rydi5oICAgICB8ICAyICstCiAzIGZpbGVzIGNoYW5nZWQsIDEzIGluc2VydGlv bnMoKyksIDQ3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZHJ2LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCmluZGV4IGQzNjMy YzU2ZmRmNy4uNzhlZjBiYjUzYzM2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2Rydi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKQEAgLTYzNCw5 ICs2MzQsNiBAQCBzdGF0aWMgaW50IGk5MTVfZHJtX3N1c3BlbmQoc3RydWN0IGRybV9kZXZpY2Ug KmRldikKIAlpbnRlbF9kaXNwbGF5X3N1c3BlbmQoZGV2KTsKIAlkcm1fbW9kZXNldF91bmxvY2tf YWxsKGRldik7CiAKLQkvKiBzdXNwZW5kaW5nIGRpc3BsYXlzIHdpbGwgdW5zZXRzIGluaXQgcG93 ZXIgKi8KLQlpbnRlbF9kaXNwbGF5X3NldF9pbml0X3Bvd2VyKGRldl9wcml2LCB0cnVlKTsKLQog CWludGVsX2RwX21zdF9zdXNwZW5kKGRldik7CiAKIAlpbnRlbF9ydW50aW1lX3BtX2Rpc2FibGVf aW50ZXJydXB0cyhkZXZfcHJpdik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5k ZXggYzM4YzI5N2Y2YTQxLi4zNTBlZWUyMmI5ZTIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k aXNwbGF5LmMKQEAgLTYxNzcsNTggKzYxNzcsMjcgQEAgc3RhdGljIHZvaWQgaTl4eF9jcnRjX2Rp c2FibGUoc3RydWN0IGRybV9jcnRjICpjcnRjKQogICogdHVybiBhbGwgY3J0YydzIG9mZiwgYnV0 IGRvIG5vdCBhZGp1c3Qgc3RhdGUKICAqIFRoaXMgaGFzIHRvIGJlIHBhaXJlZCB3aXRoIGEgY2Fs bCB0byBpbnRlbF9tb2Rlc2V0X3NldHVwX2h3X3N0YXRlLgogICovCi1pbnQgaW50ZWxfZGlzcGxh eV9zdXNwZW5kKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCit2b2lkIGludGVsX2Rpc3BsYXlfc3Vz cGVuZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogewotCXN0cnVjdCBkcm1fbW9kZV9jb25maWcg KmNvbmZpZyA9ICZkZXYtPm1vZGVfY29uZmlnOwotCXN0cnVjdCBkcm1fbW9kZXNldF9hY3F1aXJl X2N0eCAqY3R4ID0gY29uZmlnLT5hY3F1aXJlX2N0eDsKLQlzdHJ1Y3QgZHJtX2F0b21pY19zdGF0 ZSAqc3RhdGU7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShk ZXYpOwogCXN0cnVjdCBkcm1fY3J0YyAqY3J0YzsKLQl1bnNpZ25lZCBjcnRjX21hc2sgPSAwOwot CWludCByZXQgPSAwOwotCi0JaWYgKFdBUk5fT04oIWN0eCkpCi0JCXJldHVybiAwOwotCi0JbG9j a2RlcF9hc3NlcnRfaGVsZCgmY3R4LT53d19jdHgpOwotCXN0YXRlID0gZHJtX2F0b21pY19zdGF0 ZV9hbGxvYyhkZXYpOwotCWlmIChXQVJOX09OKCFzdGF0ZSkpCi0JCXJldHVybiAtRU5PTUVNOwot Ci0Jc3RhdGUtPmFjcXVpcmVfY3R4ID0gY3R4OwotCXN0YXRlLT5hbGxvd19tb2Rlc2V0ID0gdHJ1 ZTsKIAogCWZvcl9lYWNoX2NydGMoZGV2LCBjcnRjKSB7Ci0JCXN0cnVjdCBkcm1fY3J0Y19zdGF0 ZSAqY3J0Y19zdGF0ZSA9Ci0JCQlkcm1fYXRvbWljX2dldF9jcnRjX3N0YXRlKHN0YXRlLCBjcnRj KTsKLQotCQlyZXQgPSBQVFJfRVJSX09SX1pFUk8oY3J0Y19zdGF0ZSk7Ci0JCWlmIChyZXQpCi0J CQlnb3RvIGZyZWU7CisJCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxf Y3J0YyhjcnRjKTsKKwkJZW51bSBpbnRlbF9kaXNwbGF5X3Bvd2VyX2RvbWFpbiBkb21haW47CisJ CXVuc2lnbmVkIGxvbmcgZG9tYWluczsKIAotCQlpZiAoIWNydGNfc3RhdGUtPmFjdGl2ZSkKKwkJ aWYgKCFpbnRlbF9jcnRjLT5hY3RpdmUpCiAJCQljb250aW51ZTsKIAotCQljcnRjX3N0YXRlLT5h Y3RpdmUgPSBmYWxzZTsKLQkJY3J0Y19tYXNrIHw9IDEgPDwgZHJtX2NydGNfaW5kZXgoY3J0Yyk7 Ci0JfQotCi0JaWYgKGNydGNfbWFzaykgewotCQlyZXQgPSBpbnRlbF9zZXRfbW9kZShzdGF0ZSk7 Ci0KLQkJaWYgKCFyZXQpIHsKLQkJCWZvcl9lYWNoX2NydGMoZGV2LCBjcnRjKQotCQkJCWlmIChj cnRjX21hc2sgJiAoMSA8PCBkcm1fY3J0Y19pbmRleChjcnRjKSkpCi0JCQkJCWNydGMtPnN0YXRl LT5hY3RpdmUgPSB0cnVlOworCQlpbnRlbF9jcnRjX2Rpc2FibGVfcGxhbmVzKGNydGMpOworCQlk ZXZfcHJpdi0+ZGlzcGxheS5jcnRjX2Rpc2FibGUoY3J0Yyk7CiAKLQkJCXJldHVybiByZXQ7Ci0J CX0KKwkJZG9tYWlucyA9IGludGVsX2NydGMtPmVuYWJsZWRfcG93ZXJfZG9tYWluczsKKwkJZm9y X2VhY2hfcG93ZXJfZG9tYWluKGRvbWFpbiwgZG9tYWlucykKKwkJCWludGVsX2Rpc3BsYXlfcG93 ZXJfcHV0KGRldl9wcml2LCBkb21haW4pOworCQlpbnRlbF9jcnRjLT5lbmFibGVkX3Bvd2VyX2Rv bWFpbnMgPSAwOwogCX0KLQotZnJlZToKLQlpZiAocmV0KQotCQlEUk1fRVJST1IoIlN1c3BlbmRp bmcgY3J0YydzIGZhaWxlZCB3aXRoICVpXG4iLCByZXQpOwotCWRybV9hdG9taWNfc3RhdGVfZnJl ZShzdGF0ZSk7Ci0JcmV0dXJuIHJldDsKIH0KIAogLyogTWFzdGVyIGZ1bmN0aW9uIHRvIGVuYWJs ZS9kaXNhYmxlIENSVEMgYW5kIGNvcnJlc3BvbmRpbmcgcG93ZXIgd2VsbHMgKi8KZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZHJ2LmgKaW5kZXggY2IzYTMwYzFlN2NjLi41OGJkMGVkYmEyYTQgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rydi5oCkBAIC05OTIsNyArOTkyLDcgQEAgaW50IGludGVsX3BjaF9yYXdj bGsoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CiB2b2lkIGludGVsX21hcmtfYnVzeShzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2KTsKIHZvaWQgaW50ZWxfbWFya19pZGxlKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYpOwogdm9pZCBpbnRlbF9jcnRjX3Jlc3RvcmVfbW9kZShzdHJ1Y3QgZHJtX2NydGMgKmNy dGMpOwotaW50IGludGVsX2Rpc3BsYXlfc3VzcGVuZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsK K3ZvaWQgaW50ZWxfZGlzcGxheV9zdXNwZW5kKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogaW50 IGludGVsX2NydGNfY29udHJvbChzdHJ1Y3QgZHJtX2NydGMgKmNydGMsIGJvb2wgZW5hYmxlKTsK IHZvaWQgaW50ZWxfY3J0Y191cGRhdGVfZHBtcyhzdHJ1Y3QgZHJtX2NydGMgKmNydGMpOwogdm9p ZCBpbnRlbF9lbmNvZGVyX2Rlc3Ryb3koc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyKTsKLS0g CjIuMS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJ bnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0 cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=