From mboxrd@z Thu Jan  1 00:00:00 1970
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Subject: [PATCH 2/3] drm/i915: Use atomic helpers for suspend.
Date: Tue,  9 Feb 2016 13:52:22 +0100
Message-ID: <1455022343-15222-2-git-send-email-maarten.lankhorst@linux.intel.com>
References: <20160203163408.GF23290@intel.com>
 <1455022343-15222-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: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mblankhorst.nl (mblankhorst.nl [141.105.120.124])
 by gabe.freedesktop.org (Postfix) with ESMTPS id D026E6E133
 for <intel-gfx@lists.freedesktop.org>; Tue,  9 Feb 2016 04:52:28 -0800 (PST)
In-Reply-To: <1455022343-15222-1-git-send-email-maarten.lankhorst@linux.intel.com>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

SW5zdGVhZCBvZiBkdXBsaWNhdGluZyB0aGUgZnVuY3Rpb25hbGl0eSBub3cgdGhhdCB3ZSBubyBs
b25nZXIgbmVlZAp0byBwcmVzZXJ2ZSBkcGxsIHN0YXRlIHdlIGNhbiBtb3ZlIHRvIHVzaW5nIHRo
ZSB1cHN0cmVhbSBzdXNwZW5kIGhlbHBlci4KClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hv
cnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUv
ZHJtL2RybV9hdG9taWNfaGVscGVyLmMgIHwgICAzICsKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5
MTVfZHJ2LmMgICAgICB8ICAgOCAtLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2Lmgg
ICAgICB8ICAgMSArCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAxMTcg
KysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDQgZmlsZXMgY2hhbmdlZCwgNDIg
aW5zZXJ0aW9ucygrKSwgODcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv
ZHJtL2RybV9hdG9taWNfaGVscGVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19oZWxw
ZXIuYwppbmRleCAyYjQzMGIwNWYzNWQuLmEyZDNiMDk0ZjI3YyAxMDA2NDQKLS0tIGEvZHJpdmVy
cy9ncHUvZHJtL2RybV9hdG9taWNfaGVscGVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV9h
dG9taWNfaGVscGVyLmMKQEAgLTIxMDIsNiArMjEwMiw5IEBAIGludCBkcm1fYXRvbWljX2hlbHBl
cl9yZXN1bWUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAllcnIgPSBkcm1fYXRvbWljX2NvbW1p
dChzdGF0ZSk7CiAJZHJtX21vZGVzZXRfdW5sb2NrX2FsbChkZXYpOwogCisJaWYgKGVycikKKwkJ
ZHJtX2F0b21pY19zdGF0ZV9mcmVlKHN0YXRlKTsKKwogCXJldHVybiBlcnI7CiB9CiBFWFBPUlRf
U1lNQk9MKGRybV9hdG9taWNfaGVscGVyX3Jlc3VtZSk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw
dS9kcm0vaTkxNS9pOTE1X2Rydi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwpp
bmRleCAxMWQ4NDE0ZWRiYmUuLmZjOWI1NTJiZmNkMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv
ZHJtL2k5MTUvaTkxNV9kcnYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5j
CkBAIC02MDAsMTMgKzYwMCw3IEBAIHN0YXRpYyBpbnQgaTkxNV9kcm1fc3VzcGVuZChzdHJ1Y3Qg
ZHJtX2RldmljZSAqZGV2KQogCiAJaW50ZWxfc3VzcGVuZF9ndF9wb3dlcnNhdmUoZGV2KTsKIAot
CS8qCi0JICogRGlzYWJsZSBDUlRDcyBkaXJlY3RseSBzaW5jZSB3ZSB3YW50IHRvIHByZXNlcnZl
IHN3IHN0YXRlCi0JICogZm9yIF90aGF3LiBBbHNvLCBwb3dlciBnYXRlIHRoZSBDUlRDIHBvd2Vy
IHdlbGxzLgotCSAqLwotCWRybV9tb2Rlc2V0X2xvY2tfYWxsKGRldik7CiAJaW50ZWxfZGlzcGxh
eV9zdXNwZW5kKGRldik7Ci0JZHJtX21vZGVzZXRfdW5sb2NrX2FsbChkZXYpOwogCiAJaW50ZWxf
ZHBfbXN0X3N1c3BlbmQoZGV2KTsKIApAQCAtNzYxLDkgKzc1NSw3IEBAIHN0YXRpYyBpbnQgaTkx
NV9kcm1fcmVzdW1lKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCWRldl9wcml2LT5kaXNwbGF5
LmhwZF9pcnFfc2V0dXAoZGV2KTsKIAlzcGluX3VubG9ja19pcnEoJmRldl9wcml2LT5pcnFfbG9j
ayk7CiAKLQlkcm1fbW9kZXNldF9sb2NrX2FsbChkZXYpOwogCWludGVsX2Rpc3BsYXlfcmVzdW1l
KGRldik7Ci0JZHJtX21vZGVzZXRfdW5sb2NrX2FsbChkZXYpOwogCiAJaW50ZWxfZHBfbXN0X3Jl
c3VtZShkZXYpOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5o
IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCA4MjE2NjY1NDA1ZWIuLmVm
Mjg5NTE0Yjk3ZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAor
KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC0xODQ4LDYgKzE4NDgsNyBA
QCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSB7CiAKIAllbnVtIG1vZGVzZXRfcmVzdG9yZSBtb2Rl
c2V0X3Jlc3RvcmU7CiAJc3RydWN0IG11dGV4IG1vZGVzZXRfcmVzdG9yZV9sb2NrOworCXN0cnVj
dCBkcm1fYXRvbWljX3N0YXRlICptb2Rlc2V0X3Jlc3RvcmVfc3RhdGU7CiAKIAlzdHJ1Y3QgbGlz
dF9oZWFkIHZtX2xpc3Q7IC8qIEdsb2JhbCBsaXN0IG9mIGFsbCBhZGRyZXNzIHNwYWNlcyAqLwog
CXN0cnVjdCBpOTE1X2d0dCBndHQ7IC8qIFZNIHJlcHJlc2VudGluZyB0aGUgZ2xvYmFsIGFkZHJl
c3Mgc3BhY2UgKi8KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3Bs
YXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCBlNDk2YzEz
MDM2NGQuLjRjOTFmZDFjNTIyMiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50
ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpA
QCAtNjM5Myw1OCArNjM5MywxOSBAQCBzdGF0aWMgdm9pZCBpbnRlbF9jcnRjX2Rpc2FibGVfbm9h
dG9taWMoc3RydWN0IGRybV9jcnRjICpjcnRjKQogICovCiBpbnQgaW50ZWxfZGlzcGxheV9zdXNw
ZW5kKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7Ci0Jc3RydWN0IGRybV9tb2RlX2NvbmZpZyAq
Y29uZmlnID0gJmRldi0+bW9kZV9jb25maWc7Ci0Jc3RydWN0IGRybV9tb2Rlc2V0X2FjcXVpcmVf
Y3R4ICpjdHggPSBjb25maWctPmFjcXVpcmVfY3R4OwotCXN0cnVjdCBkcm1fYXRvbWljX3N0YXRl
ICpzdGF0ZTsKLQlzdHJ1Y3QgZHJtX2NydGMgKmNydGM7Ci0JdW5zaWduZWQgY3J0Y19tYXNrID0g
MDsKLQlpbnQgcmV0ID0gMDsKLQotCWlmIChXQVJOX09OKCFjdHgpKQotCQlyZXR1cm4gMDsKLQot
CWxvY2tkZXBfYXNzZXJ0X2hlbGQoJmN0eC0+d3dfY3R4KTsKLQlzdGF0ZSA9IGRybV9hdG9taWNf
c3RhdGVfYWxsb2MoZGV2KTsKLQlpZiAoV0FSTl9PTighc3RhdGUpKQotCQlyZXR1cm4gLUVOT01F
TTsKLQotCXN0YXRlLT5hY3F1aXJlX2N0eCA9IGN0eDsKLQlzdGF0ZS0+YWxsb3dfbW9kZXNldCA9
IHRydWU7Ci0KLQlmb3JfZWFjaF9jcnRjKGRldiwgY3J0YykgewotCQlzdHJ1Y3QgZHJtX2NydGNf
c3RhdGUgKmNydGNfc3RhdGUgPQotCQkJZHJtX2F0b21pY19nZXRfY3J0Y19zdGF0ZShzdGF0ZSwg
Y3J0Yyk7Ci0KLQkJcmV0ID0gUFRSX0VSUl9PUl9aRVJPKGNydGNfc3RhdGUpOwotCQlpZiAocmV0
KQotCQkJZ290byBmcmVlOwotCi0JCWlmICghY3J0Y19zdGF0ZS0+YWN0aXZlKQotCQkJY29udGlu
dWU7Ci0KLQkJY3J0Y19zdGF0ZS0+YWN0aXZlID0gZmFsc2U7Ci0JCWNydGNfbWFzayB8PSAxIDw8
IGRybV9jcnRjX2luZGV4KGNydGMpOwotCX0KLQotCWlmIChjcnRjX21hc2spIHsKLQkJcmV0ID0g
ZHJtX2F0b21pY19jb21taXQoc3RhdGUpOwotCi0JCWlmICghcmV0KSB7Ci0JCQlmb3JfZWFjaF9j
cnRjKGRldiwgY3J0YykKLQkJCQlpZiAoY3J0Y19tYXNrICYgKDEgPDwgZHJtX2NydGNfaW5kZXgo
Y3J0YykpKQotCQkJCQljcnRjLT5zdGF0ZS0+YWN0aXZlID0gdHJ1ZTsKLQotCQkJcmV0dXJuIHJl
dDsKLQkJfQotCX0KKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1
KGRldik7CisJaW50IHJldDsKIAotZnJlZToKLQlpZiAocmV0KQorCWRldl9wcml2LT5tb2Rlc2V0
X3Jlc3RvcmVfc3RhdGUgPSBkcm1fYXRvbWljX2hlbHBlcl9zdXNwZW5kKGRldik7CisJcmV0ID0g
UFRSX0VSUl9PUl9aRVJPKGRldl9wcml2LT5tb2Rlc2V0X3Jlc3RvcmVfc3RhdGUpOworCWlmIChy
ZXQpIHsKIAkJRFJNX0VSUk9SKCJTdXNwZW5kaW5nIGNydGMncyBmYWlsZWQgd2l0aCAlaVxuIiwg
cmV0KTsKLQlkcm1fYXRvbWljX3N0YXRlX2ZyZWUoc3RhdGUpOworCQlkZXZfcHJpdi0+bW9kZXNl
dF9yZXN0b3JlX3N0YXRlID0gTlVMTDsKKwl9CiAJcmV0dXJuIHJldDsKIH0KIAorCiB2b2lkIGlu
dGVsX2VuY29kZXJfZGVzdHJveShzdHJ1Y3QgZHJtX2VuY29kZXIgKmVuY29kZXIpCiB7CiAJc3Ry
dWN0IGludGVsX2VuY29kZXIgKmludGVsX2VuY29kZXIgPSB0b19pbnRlbF9lbmNvZGVyKGVuY29k
ZXIpOwpAQCAtMTU5MDksNTEgKzE1ODcwLDQ5IEBAIGludGVsX21vZGVzZXRfc2V0dXBfaHdfc3Rh
dGUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAogdm9pZCBpbnRlbF9kaXNwbGF5X3Jlc3VtZShz
dHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogewotCXN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0
ZSA9IGRybV9hdG9taWNfc3RhdGVfYWxsb2MoZGV2KTsKLQlzdHJ1Y3QgaW50ZWxfY29ubmVjdG9y
ICpjb25uOwotCXN0cnVjdCBpbnRlbF9wbGFuZSAqcGxhbmU7CisJc3RydWN0IGRybV9pOTE1X3By
aXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOworCXN0cnVjdCBkcm1fYXRvbWljX3N0YXRl
ICpzdGF0ZSA9IGRldl9wcml2LT5tb2Rlc2V0X3Jlc3RvcmVfc3RhdGU7CisJc3RydWN0IGRybV9t
b2Rlc2V0X2FjcXVpcmVfY3R4IGN0eDsKIAlzdHJ1Y3QgZHJtX2NydGMgKmNydGM7Ci0JaW50IHJl
dDsKKwlzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGU7CisJaW50IHJldCwgaTsKKwor
CWludGVsX21vZGVzZXRfc2V0dXBfaHdfc3RhdGUoZGV2KTsKKwlpOTE1X3JlZGlzYWJsZV92Z2Eo
ZGV2KTsKKwlkZXZfcHJpdi0+bW9kZXNldF9yZXN0b3JlX3N0YXRlID0gTlVMTDsKIAogCWlmICgh
c3RhdGUpCiAJCXJldHVybjsKIAotCXN0YXRlLT5hY3F1aXJlX2N0eCA9IGRldi0+bW9kZV9jb25m
aWcuYWNxdWlyZV9jdHg7Ci0KLQlmb3JfZWFjaF9jcnRjKGRldiwgY3J0YykgewotCQlzdHJ1Y3Qg
ZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGUgPQotCQkJZHJtX2F0b21pY19nZXRfY3J0Y19zdGF0
ZShzdGF0ZSwgY3J0Yyk7Ci0KLQkJcmV0ID0gUFRSX0VSUl9PUl9aRVJPKGNydGNfc3RhdGUpOwot
CQlpZiAocmV0KQotCQkJZ290byBlcnI7CisJZHJtX21vZGVzZXRfYWNxdWlyZV9pbml0KCZjdHgs
IDApOworCXN0YXRlLT5hY3F1aXJlX2N0eCA9ICZjdHg7CiAKLQkJLyogZm9yY2UgYSByZXN0b3Jl
ICovCisJZm9yX2VhY2hfY3J0Y19pbl9zdGF0ZShzdGF0ZSwgY3J0YywgY3J0Y19zdGF0ZSwgaSkg
eworCQkvKgorCQkgKiBGb3JjZSByZWNhbGN1bGF0aW9uIGV2ZW4gaWYgd2UgcmVzdG9yZQorCQkg
KiBjdXJyZW50IHN0YXRlLiBXaXRoIGZhc3QgbW9kZXNldCB0aGlzIG1heSBub3QgcmVzdWx0CisJ
CSAqIGluIGEgbW9kZXNldCB3aGVuIHRoZSBzdGF0ZSBpcyBjb21wYXRpYmxlLgorCQkgKi8KIAkJ
Y3J0Y19zdGF0ZS0+bW9kZV9jaGFuZ2VkID0gdHJ1ZTsKIAl9CiAKLQlmb3JfZWFjaF9pbnRlbF9w
bGFuZShkZXYsIHBsYW5lKSB7Ci0JCXJldCA9IFBUUl9FUlJfT1JfWkVSTyhkcm1fYXRvbWljX2dl
dF9wbGFuZV9zdGF0ZShzdGF0ZSwgJnBsYW5lLT5iYXNlKSk7Ci0JCWlmIChyZXQpCi0JCQlnb3Rv
IGVycjsKLQl9CityZXRyeToKKwlyZXQgPSBkcm1fbW9kZXNldF9sb2NrX2FsbF9jdHgoZGV2LCAm
Y3R4KTsKKwlpZiAocmV0ID09IDApCisJCXJldCA9IGRybV9hdG9taWNfY29tbWl0KHN0YXRlKTsK
IAotCWZvcl9lYWNoX2ludGVsX2Nvbm5lY3RvcihkZXYsIGNvbm4pIHsKLQkJcmV0ID0gUFRSX0VS
Ul9PUl9aRVJPKGRybV9hdG9taWNfZ2V0X2Nvbm5lY3Rvcl9zdGF0ZShzdGF0ZSwgJmNvbm4tPmJh
c2UpKTsKLQkJaWYgKHJldCkKLQkJCWdvdG8gZXJyOworCWlmIChyZXQgPT0gLUVERUFETEspIHsK
KwkJZHJtX21vZGVzZXRfYmFja29mZigmY3R4KTsKKwkJZ290byByZXRyeTsKIAl9CiAKLQlpbnRl
bF9tb2Rlc2V0X3NldHVwX2h3X3N0YXRlKGRldik7Ci0KLQlpOTE1X3JlZGlzYWJsZV92Z2EoZGV2
KTsKLQlyZXQgPSBkcm1fYXRvbWljX2NvbW1pdChzdGF0ZSk7Ci0JaWYgKCFyZXQpCi0JCXJldHVy
bjsKKwlkcm1fbW9kZXNldF9kcm9wX2xvY2tzKCZjdHgpOworCWRybV9tb2Rlc2V0X2FjcXVpcmVf
ZmluaSgmY3R4KTsKIAotZXJyOgotCURSTV9FUlJPUigiUmVzdG9yaW5nIG9sZCBzdGF0ZSBmYWls
ZWQgd2l0aCAlaVxuIiwgcmV0KTsKLQlkcm1fYXRvbWljX3N0YXRlX2ZyZWUoc3RhdGUpOworCWlm
IChyZXQpIHsKKwkJRFJNX0VSUk9SKCJSZXN0b3Jpbmcgb2xkIHN0YXRlIGZhaWxlZCB3aXRoICVp
XG4iLCByZXQpOworCQlkcm1fYXRvbWljX3N0YXRlX2ZyZWUoc3RhdGUpOworCX0KIH0KIAogdm9p
ZCBpbnRlbF9tb2Rlc2V0X2dlbV9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCi0tIAoyLjEu
MAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwt
Z2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8v
bGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==