From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH v3 12/20] drm/i915: Convert resume to atomic. Date: Mon, 13 Jul 2015 16:30:25 +0200 Message-ID: <1436797833-11493-13-git-send-email-maarten.lankhorst@linux.intel.com> References: <1436797833-11493-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 ESMTPS id 9A3916E861 for ; Mon, 13 Jul 2015 07:30:54 -0700 (PDT) In-Reply-To: <1436797833-11493-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 SW5zdGVhZCBvZiBhbGwgdGhlIGFkLWhvYyB1cGRhdGluZywgZHVwbGljYXRlIHRoZSBvbGQgc3Rh dGUgZmlyc3QKYmVmb3JlIHJlYWRpbmcgb3V0IHRoZSBodyBzdGF0ZSwgdGhlbiByZXN0b3JlIGl0 LgoKaW50ZWxfZGlzcGxheV9yZXN1bWUgaXMgYSBuZXcgZnVuY3Rpb24gdGhhdCBkdXBsaWNhdGVz IHRoZSBzdyBzdGF0ZSwKdGhlbiByZWFkcyBvdXQgdGhlIGh3IHN0YXRlLCBhbmQgY29tbWl0cyB0 aGUgb2xkIHN0YXRlLgoKaW50ZWxfZGlzcGxheV9zZXR1cF9od19zdGF0ZSBub3cgb25seSByZWFk cyBvdXQgdGhlIGF0b21pYyBzdGF0ZS4KCkJ1Z3ppbGxhOiBodHRwczovL2J1Z3MuZnJlZWRlc2t0 b3Aub3JnL3Nob3dfYnVnLmNnaT9pZD05MDM5NgpTaWduZWQtb2ZmLWJ5OiBNYWFydGVuIExhbmto b3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZHJ2LmMgICAgICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2Rydi5oICAgICAgfCAgMyArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh eS5jIHwgNzcgKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9sdmRzLmMgICAgfCAgMiArLQogNCBmaWxlcyBjaGFuZ2VkLCA2MCBp bnNlcnRpb25zKCspLCAyNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2Rydi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwppbmRl eCBlNDRkYzBkNjY1NmYuLmRiNDhhZWU3ZjE0MCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kcnYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCkBA IC03NDEsNyArNzQxLDcgQEAgc3RhdGljIGludCBpOTE1X2RybV9yZXN1bWUoc3RydWN0IGRybV9k ZXZpY2UgKmRldikKIAlzcGluX3VubG9ja19pcnEoJmRldl9wcml2LT5pcnFfbG9jayk7CiAKIAlk cm1fbW9kZXNldF9sb2NrX2FsbChkZXYpOwotCWludGVsX21vZGVzZXRfc2V0dXBfaHdfc3RhdGUo ZGV2LCB0cnVlKTsKKwlpbnRlbF9kaXNwbGF5X3Jlc3VtZShkZXYpOwogCWRybV9tb2Rlc2V0X3Vu bG9ja19hbGwoZGV2KTsKIAogCWludGVsX2RwX21zdF9yZXN1bWUoZGV2KTsKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2Rydi5oCmluZGV4IDM4Y2ZkNTNiYzI2Mi4uZDNlMTRjYjQzOTI0IDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZHJ2LmgKQEAgLTMyNzksOCArMzI3OSw3IEBAIGV4dGVybiB2b2lkIGludGVsX21vZGVz ZXRfZ2VtX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CiBleHRlcm4gdm9pZCBpbnRlbF9t b2Rlc2V0X2NsZWFudXAoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CiBleHRlcm4gdm9pZCBpbnRl bF9jb25uZWN0b3JfdW5yZWdpc3RlcihzdHJ1Y3QgaW50ZWxfY29ubmVjdG9yICopOwogZXh0ZXJu IGludCBpbnRlbF9tb2Rlc2V0X3ZnYV9zZXRfc3RhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwg Ym9vbCBzdGF0ZSk7Ci1leHRlcm4gdm9pZCBpbnRlbF9tb2Rlc2V0X3NldHVwX2h3X3N0YXRlKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYsCi0JCQkJCSBib29sIGZvcmNlX3Jlc3RvcmUpOworZXh0ZXJu IHZvaWQgaW50ZWxfZGlzcGxheV9yZXN1bWUoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CiBleHRl cm4gdm9pZCBpOTE1X3JlZGlzYWJsZV92Z2Eoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CiBleHRl cm4gdm9pZCBpOTE1X3JlZGlzYWJsZV92Z2FfcG93ZXJfb24oc3RydWN0IGRybV9kZXZpY2UgKmRl dik7CiBleHRlcm4gYm9vbCBpcm9ubGFrZV9zZXRfZHJwcyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 LCB1OCB2YWwpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh eS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IGE0YTJjM2Zi ZGMyZC4uYjg5ODRiNGY4MDgxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBA IC0xMDksNiArMTA5LDcgQEAgc3RhdGljIHZvaWQgc2tsX2luaXRfc2NhbGVycyhzdHJ1Y3QgZHJt X2RldmljZSAqZGV2LCBzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3IKIAlzdHJ1Y3QgaW50ZWxf Y3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSk7CiBzdGF0aWMgaW50IGk5eHhfZ2V0X3JlZmNsayhjb25z dCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKIAkJCSAgIGludCBudW1fY29u bmVjdG9ycyk7CitzdGF0aWMgdm9pZCBpbnRlbF9tb2Rlc2V0X3NldHVwX2h3X3N0YXRlKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYpOwogCiBzdGF0aWMgc3RydWN0IGludGVsX2VuY29kZXIgKmludGVs X2ZpbmRfZW5jb2RlcihzdHJ1Y3QgaW50ZWxfY29ubmVjdG9yICpjb25uZWN0b3IsIGludCBwaXBl KQogewpAQCAtMzI0OSw3ICszMjUwLDcgQEAgdm9pZCBpbnRlbF9maW5pc2hfcmVzZXQoc3RydWN0 IGRybV9kZXZpY2UgKmRldikKIAkJZGV2X3ByaXYtPmRpc3BsYXkuaHBkX2lycV9zZXR1cChkZXYp OwogCXNwaW5fdW5sb2NrX2lycSgmZGV2X3ByaXYtPmlycV9sb2NrKTsKIAotCWludGVsX21vZGVz ZXRfc2V0dXBfaHdfc3RhdGUoZGV2LCB0cnVlKTsKKwlpbnRlbF9kaXNwbGF5X3Jlc3VtZShkZXYp OwogCiAJaW50ZWxfaHBkX2luaXQoZGV2X3ByaXYpOwogCkBAIC0xNTE2Myw3ICsxNTE2NCw3IEBA IHZvaWQgaW50ZWxfbW9kZXNldF9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJaW50ZWxf ZmJjX2Rpc2FibGUoZGV2X3ByaXYpOwogCiAJZHJtX21vZGVzZXRfbG9ja19hbGwoZGV2KTsKLQlp bnRlbF9tb2Rlc2V0X3NldHVwX2h3X3N0YXRlKGRldiwgZmFsc2UpOworCWludGVsX21vZGVzZXRf c2V0dXBfaHdfc3RhdGUoZGV2KTsKIAlkcm1fbW9kZXNldF91bmxvY2tfYWxsKGRldik7CiAKIAlm b3JfZWFjaF9pbnRlbF9jcnRjKGRldiwgY3J0YykgewpAQCAtMTU1NDIsMTAgKzE1NTQzLDExIEBA IHN0YXRpYyB2b2lkIGludGVsX21vZGVzZXRfcmVhZG91dF9od19zdGF0ZShzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2KQogCX0KIH0KIAotLyogU2NhbiBvdXQgdGhlIGN1cnJlbnQgaHcgbW9kZXNldCBz dGF0ZSwgc2FuaXRpemVzIGl0IGFuZCBtYXBzIGl0IGludG8gdGhlIGRybQotICogYW5kIGk5MTUg c3RhdGUgdHJhY2tpbmcgc3RydWN0dXJlcy4gKi8KLXZvaWQgaW50ZWxfbW9kZXNldF9zZXR1cF9o d19zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAotCQkJCSAgYm9vbCBmb3JjZV9yZXN0b3Jl KQorLyogU2NhbiBvdXQgdGhlIGN1cnJlbnQgaHcgbW9kZXNldCBzdGF0ZSwKKyAqIGFuZCBzYW5p dGl6ZXMgaXQgdG8gdGhlIGN1cnJlbnQgc3RhdGUKKyAqLworc3RhdGljIHZvaWQKK2ludGVsX21v ZGVzZXRfc2V0dXBfaHdfc3RhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIHsKIAlzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCWVudW0gcGlw ZSBwaXBlOwpAQCAtMTU1ODgsMjQgKzE1NTkwLDU5IEBAIHZvaWQgaW50ZWxfbW9kZXNldF9zZXR1 cF9od19zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCWVsc2UgaWYgKEhBU19QQ0hfU1BM SVQoZGV2KSkKIAkJaWxrX3dtX2dldF9od19zdGF0ZShkZXYpOwogCi0JaWYgKGZvcmNlX3Jlc3Rv cmUpIHsKLQkJaTkxNV9yZWRpc2FibGVfdmdhKGRldik7CisJaW50ZWxfbW9kZXNldF91cGRhdGVf c3RhZ2VkX291dHB1dF9zdGF0ZShkZXYpOworfQogCi0JCS8qCi0JCSAqIFdlIG5lZWQgdG8gdXNl IHJhdyBpbnRlcmZhY2VzIGZvciByZXN0b3Jpbmcgc3RhdGUgdG8gYXZvaWQKLQkJICogY2hlY2tp bmcgKGJvZ3VzKSBpbnRlcm1lZGlhdGUgc3RhdGVzLgotCQkgKi8KLQkJZm9yX2VhY2hfcGlwZShk ZXZfcHJpdiwgcGlwZSkgewotCQkJc3RydWN0IGRybV9jcnRjICpjcnRjID0KLQkJCQlkZXZfcHJp di0+cGlwZV90b19jcnRjX21hcHBpbmdbcGlwZV07Cit2b2lkIGludGVsX2Rpc3BsYXlfcmVzdW1l KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCit7CisJc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0 YXRlID0gZHJtX2F0b21pY19zdGF0ZV9hbGxvYyhkZXYpOworCXN0cnVjdCBpbnRlbF9jb25uZWN0 b3IgKmNvbm47CisJc3RydWN0IGludGVsX3BsYW5lICpwbGFuZTsKKwlzdHJ1Y3QgZHJtX2NydGMg KmNydGM7CisJaW50IHJldDsKIAotCQkJaW50ZWxfY3J0Y19yZXN0b3JlX21vZGUoY3J0Yyk7Ci0J CX0KLQl9IGVsc2UgewotCQlpbnRlbF9tb2Rlc2V0X3VwZGF0ZV9zdGFnZWRfb3V0cHV0X3N0YXRl KGRldik7CisJaWYgKCFzdGF0ZSkKKwkJcmV0dXJuOworCisJc3RhdGUtPmFjcXVpcmVfY3R4ID0g ZGV2LT5tb2RlX2NvbmZpZy5hY3F1aXJlX2N0eDsKKworCS8qIHByZXNlcnZlIGNvbXBsZXRlIG9s ZCBzdGF0ZSwgaW5jbHVkaW5nIGRwbGwgKi8KKwlpbnRlbF9hdG9taWNfZ2V0X3NoYXJlZF9kcGxs X3N0YXRlKHN0YXRlKTsKKworCWZvcl9lYWNoX2NydGMoZGV2LCBjcnRjKSB7CisJCXN0cnVjdCBk cm1fY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSA9CisJCQlkcm1fYXRvbWljX2dldF9jcnRjX3N0YXRl KHN0YXRlLCBjcnRjKTsKKworCQlyZXQgPSBQVFJfRVJSX09SX1pFUk8oY3J0Y19zdGF0ZSk7CisJ CWlmIChyZXQpCisJCQlnb3RvIGVycjsKKworCQkvKiBmb3JjZSBhIHJlc3RvcmUgKi8KKwkJY3J0 Y19zdGF0ZS0+bW9kZV9jaGFuZ2VkID0gdHJ1ZTsKIAl9CiAKLQlpbnRlbF9tb2Rlc2V0X2NoZWNr X3N0YXRlKGRldik7CisJZm9yX2VhY2hfaW50ZWxfcGxhbmUoZGV2LCBwbGFuZSkgeworCQlyZXQg PSBQVFJfRVJSX09SX1pFUk8oZHJtX2F0b21pY19nZXRfcGxhbmVfc3RhdGUoc3RhdGUsICZwbGFu ZS0+YmFzZSkpOworCQlpZiAocmV0KQorCQkJZ290byBlcnI7CisJfQorCisJZm9yX2VhY2hfaW50 ZWxfY29ubmVjdG9yKGRldiwgY29ubikgeworCQlyZXQgPSBQVFJfRVJSX09SX1pFUk8oZHJtX2F0 b21pY19nZXRfY29ubmVjdG9yX3N0YXRlKHN0YXRlLCAmY29ubi0+YmFzZSkpOworCQlpZiAocmV0 KQorCQkJZ290byBlcnI7CisJfQorCisJaW50ZWxfbW9kZXNldF9zZXR1cF9od19zdGF0ZShkZXYp OworCisJaTkxNV9yZWRpc2FibGVfdmdhKGRldik7CisJcmV0ID0gaW50ZWxfc2V0X21vZGUoc3Rh dGUpOworCWlmICghcmV0KQorCQlyZXR1cm47CisKK2VycjoKKwlEUk1fRVJST1IoIlJlc3Rvcmlu ZyBvbGQgc3RhdGUgZmFpbGVkIHdpdGggJWlcbiIsIHJldCk7CisJZHJtX2F0b21pY19zdGF0ZV9m cmVlKHN0YXRlKTsKIH0KIAogdm9pZCBpbnRlbF9tb2Rlc2V0X2dlbV9pbml0KHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9sdmRz LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9sdmRzLmMKaW5kZXggOTM3ZTgyMTZlOWQ2 Li5jYjYzNGY0OGU3ZDkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2x2 ZHMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9sdmRzLmMKQEAgLTQ3Myw3ICs0 NzMsNyBAQCBzdGF0aWMgaW50IGludGVsX2xpZF9ub3RpZnkoc3RydWN0IG5vdGlmaWVyX2Jsb2Nr ICpuYiwgdW5zaWduZWQgbG9uZyB2YWwsCiAJICovCiAJaWYgKCFIQVNfUENIX1NQTElUKGRldikp IHsKIAkJZHJtX21vZGVzZXRfbG9ja19hbGwoZGV2KTsKLQkJaW50ZWxfbW9kZXNldF9zZXR1cF9o d19zdGF0ZShkZXYsIHRydWUpOworCQlpbnRlbF9kaXNwbGF5X3Jlc3VtZShkZXYpOwogCQlkcm1f bW9kZXNldF91bmxvY2tfYWxsKGRldik7CiAJfQogCi0tIAoyLjEuMAoKX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJ bnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK