From mboxrd@z Thu Jan  1 00:00:00 1970
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Subject: [PATCH 13/18] drm/i915: Make intel_display_suspend
	atomic, try 2.
Date: Thu,  2 Jul 2015 16:36:57 +0200
Message-ID: <1435847822-5318-14-git-send-email-maarten.lankhorst@linux.intel.com>
References: <1435847822-5318-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 E1E3B6ECA7
 for <intel-gfx@lists.freedesktop.org>; Thu,  2 Jul 2015 07:37:25 -0700 (PDT)
In-Reply-To: <1435847822-5318-1-git-send-email-maarten.lankhorst@linux.intel.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://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: <http://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

Q2FsY3VsYXRlIGFsbCBzdGF0ZSB1c2luZyBhIG5vcm1hbCB0cmFuc2l0aW9uLCBidXQgYWZ0ZXJ3
YXJkcyBmdWRnZQpjcnRjLT5zdGF0ZS0+YWN0aXZlIGJhY2sgdG8gaXRzIG9sZCB2YWx1ZS4gVGhp
cyBzaG91bGQgc3RpbGwgYWxsb3cKc3RhdGUgcmVzdG9yZSBpbiBzZXR1cF9od19zdGF0ZSB0byB3
b3JrIHByb3Blcmx5LgoKQnVnemlsbGE6IGh0dHBzOi8vYnVncy5mcmVlZGVza3RvcC5vcmcvc2hv
d19idWcuY2dpP2lkPTkwMzk2ClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFy
dGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv
aW50ZWxfZGlzcGxheS5jIHwgNTIgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0t
CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCAgICAgfCAgMiArLQogMiBmaWxlcyBj
aGFuZ2VkLCA1MCBpbnNlcnRpb25zKCspLCA0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2Ry
aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1
L2ludGVsX2Rpc3BsYXkuYwppbmRleCA0NTgzOTNkZjQ2MzAuLmQ3Nzg0NmEyM2QxOCAxMDA2NDQK
LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMv
Z3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtNjIyNywxMiArNjIyNyw1OCBAQCBzdGF0
aWMgdm9pZCBpbnRlbF9jcnRjX2Rpc2FibGVfbm9hdG9taWMoc3RydWN0IGRybV9jcnRjICpjcnRj
KQogICogdHVybiBhbGwgY3J0YydzIG9mZiwgYnV0IGRvIG5vdCBhZGp1c3Qgc3RhdGUKICAqIFRo
aXMgaGFzIHRvIGJlIHBhaXJlZCB3aXRoIGEgY2FsbCB0byBpbnRlbF9tb2Rlc2V0X3NldHVwX2h3
X3N0YXRlLgogICovCi12b2lkIGludGVsX2Rpc3BsYXlfc3VzcGVuZChzdHJ1Y3QgZHJtX2Rldmlj
ZSAqZGV2KQoraW50IGludGVsX2Rpc3BsYXlfc3VzcGVuZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2
KQogeworCXN0cnVjdCBkcm1fbW9kZV9jb25maWcgKmNvbmZpZyA9ICZkZXYtPm1vZGVfY29uZmln
OworCXN0cnVjdCBkcm1fbW9kZXNldF9hY3F1aXJlX2N0eCAqY3R4ID0gY29uZmlnLT5hY3F1aXJl
X2N0eDsKKwlzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGU7CiAJc3RydWN0IGRybV9jcnRj
ICpjcnRjOworCXVuc2lnbmVkIGNydGNfbWFzayA9IDA7CisJaW50IHJldCA9IDA7CisKKwlpZiAo
V0FSTl9PTighY3R4KSkKKwkJcmV0dXJuIDA7CisKKwlsb2NrZGVwX2Fzc2VydF9oZWxkKCZjdHgt
Pnd3X2N0eCk7CisJc3RhdGUgPSBkcm1fYXRvbWljX3N0YXRlX2FsbG9jKGRldik7CisJaWYgKFdB
Uk5fT04oIXN0YXRlKSkKKwkJcmV0dXJuIC1FTk9NRU07CisKKwlzdGF0ZS0+YWNxdWlyZV9jdHgg
PSBjdHg7CisJc3RhdGUtPmFsbG93X21vZGVzZXQgPSB0cnVlOworCisJZm9yX2VhY2hfY3J0Yyhk
ZXYsIGNydGMpIHsKKwkJc3RydWN0IGRybV9jcnRjX3N0YXRlICpjcnRjX3N0YXRlID0KKwkJCWRy
bV9hdG9taWNfZ2V0X2NydGNfc3RhdGUoc3RhdGUsIGNydGMpOwogCi0JZm9yX2VhY2hfY3J0Yyhk
ZXYsIGNydGMpCi0JCWludGVsX2NydGNfZGlzYWJsZV9ub2F0b21pYyhjcnRjKTsKKwkJcmV0ID0g
UFRSX0VSUl9PUl9aRVJPKGNydGNfc3RhdGUpOworCQlpZiAocmV0KQorCQkJZ290byBmcmVlOwor
CisJCWlmICghY3J0Y19zdGF0ZS0+YWN0aXZlKQorCQkJY29udGludWU7CisKKwkJY3J0Y19zdGF0
ZS0+YWN0aXZlID0gZmFsc2U7CisJCWNydGNfbWFzayB8PSAxIDw8IGRybV9jcnRjX2luZGV4KGNy
dGMpOworCX0KKworCWlmIChjcnRjX21hc2spIHsKKwkJcmV0ID0gaW50ZWxfc2V0X21vZGUoc3Rh
dGUpOworCisJCWlmICghcmV0KSB7CisJCQlmb3JfZWFjaF9jcnRjKGRldiwgY3J0YykKKwkJCQlp
ZiAoY3J0Y19tYXNrICYgKDEgPDwgZHJtX2NydGNfaW5kZXgoY3J0YykpKQorCQkJCQljcnRjLT5z
dGF0ZS0+YWN0aXZlID0gdHJ1ZTsKKworCQkJcmV0dXJuIHJldDsKKwkJfQorCX0KKworZnJlZToK
KwlpZiAocmV0KQorCQlEUk1fRVJST1IoIlN1c3BlbmRpbmcgY3J0YydzIGZhaWxlZCB3aXRoICVp
XG4iLCByZXQpOworCWRybV9hdG9taWNfc3RhdGVfZnJlZShzdGF0ZSk7CisJcmV0dXJuIHJldDsK
IH0KIAogLyogTWFzdGVyIGZ1bmN0aW9uIHRvIGVuYWJsZS9kaXNhYmxlIENSVEMgYW5kIGNvcnJl
c3BvbmRpbmcgcG93ZXIgd2VsbHMgKi8KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1
L2ludGVsX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXggZjdl
NzI5MjMyZjAzLi5jMTllYjVkYzI4MzIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1
L2ludGVsX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCkBAIC05
OTMsNyArOTkzLDcgQEAgaW50IGludGVsX3BjaF9yYXdjbGsoc3RydWN0IGRybV9kZXZpY2UgKmRl
dik7CiB2b2lkIGludGVsX21hcmtfYnVzeShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKIHZvaWQg
aW50ZWxfbWFya19pZGxlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogdm9pZCBpbnRlbF9jcnRj
X3Jlc3RvcmVfbW9kZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpOwotdm9pZCBpbnRlbF9kaXNwbGF5
X3N1c3BlbmQoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CitpbnQgaW50ZWxfZGlzcGxheV9zdXNw
ZW5kKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogaW50IGludGVsX2NydGNfY29udHJvbChzdHJ1
Y3QgZHJtX2NydGMgKmNydGMsIGJvb2wgZW5hYmxlKTsKIHZvaWQgaW50ZWxfY3J0Y191cGRhdGVf
ZHBtcyhzdHJ1Y3QgZHJtX2NydGMgKmNydGMpOwogdm9pZCBpbnRlbF9lbmNvZGVyX2Rlc3Ryb3ko
c3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyKTsKLS0gCjIuMS4wCgpfX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0Cklu
dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9y
Zy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=