From mboxrd@z Thu Jan  1 00:00:00 1970
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Subject: [PATCH 37/42] drm/i915: swap state correctly in
	intel_atomic_commit
Date: Mon, 11 May 2015 16:25:13 +0200
Message-ID: <1431354318-11995-38-git-send-email-maarten.lankhorst@linux.intel.com>
References: <1431354318-11995-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 ESMTP id D42B16E417
 for <intel-gfx@lists.freedesktop.org>; Mon, 11 May 2015 07:25:45 -0700 (PDT)
In-Reply-To: <1431354318-11995-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
Cc: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
List-Id: intel-gfx@lists.freedesktop.org

Y3J0Yy0+Y29uZmlnIGlzIGdvbmUsIHN3YXAgc3dhcCBzd2FwLiA6RAoKU2lnbmVkLW9mZi1ieTog
TWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KLS0t
CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWMuYyAgfCAzNiArKy0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3Bs
YXkuYyB8ICA3ICsrKysrLS0KIDIgZmlsZXMgY2hhbmdlZCwgNyBpbnNlcnRpb25zKCspLCAzNiBk
ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9t
aWMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F0b21pYy5jCmluZGV4IGFjZTZhZWVi
MTM1OS4uMDMxNWRjNDRiMTdhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl
bF9hdG9taWMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWMuYwpAQCAt
MTMwLDcgKzEzMCw2IEBAIGludCBpbnRlbF9hdG9taWNfY29tbWl0KHN0cnVjdCBkcm1fZGV2aWNl
ICpkZXYsCiAJCQlib29sIGFzeW5jKQogewogCWludCByZXQ7Ci0JaW50IGk7CiAKIAlpZiAoYXN5
bmMpIHsKIAkJRFJNX0RFQlVHX0tNUygiaTkxNSBkb2VzIG5vdCB5ZXQgc3VwcG9ydCBhc3luYyBj
b21taXRcbiIpOwpAQCAtMTQyLDQ4ICsxNDEsMTcgQEAgaW50IGludGVsX2F0b21pY19jb21taXQo
c3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJcmV0dXJuIHJldDsKIAogCS8qIFBvaW50IG9mIG5v
IHJldHVybiAqLworCWRybV9hdG9taWNfaGVscGVyX3N3YXBfc3RhdGUoZGV2LCBzdGF0ZSk7CiAK
IAkvKgogCSAqIEZJWE1FOiAgVGhlIHByb3BlciBzZXF1ZW5jZSBoZXJlIHdpbGwgZXZlbnR1YWxs
eSBiZToKIAkgKgotCSAqIGRybV9hdG9taWNfaGVscGVyX3N3YXBfc3RhdGUoZGV2LCBzdGF0ZSkK
IAkgKiBkcm1fYXRvbWljX2hlbHBlcl9jb21taXRfbW9kZXNldF9kaXNhYmxlcyhkZXYsIHN0YXRl
KTsKIAkgKiBkcm1fYXRvbWljX2hlbHBlcl9jb21taXRfcGxhbmVzKGRldiwgc3RhdGUpOwogCSAq
IGRybV9hdG9taWNfaGVscGVyX2NvbW1pdF9tb2Rlc2V0X2VuYWJsZXMoZGV2LCBzdGF0ZSk7Ci0J
ICogZHJtX2F0b21pY19oZWxwZXJfd2FpdF9mb3JfdmJsYW5rcyhkZXYsIHN0YXRlKTsKLQkgKiBk
cm1fYXRvbWljX2hlbHBlcl9jbGVhbnVwX3BsYW5lcyhkZXYsIHN0YXRlKTsKLQkgKiBkcm1fYXRv
bWljX3N0YXRlX2ZyZWUoc3RhdGUpOwotCSAqCi0JICogb25jZSB3ZSBoYXZlIGZ1bGwgYXRvbWlj
IG1vZGVzZXQuICBGb3Igbm93LCBqdXN0IG1hbnVhbGx5IHVwZGF0ZQotCSAqIHBsYW5lIHN0YXRl
cyB0byBhdm9pZCBjbG9iYmVyaW5nIGdvb2Qgc3RhdGVzIHdpdGggZHVtbXkgc3RhdGVzCi0JICog
d2hpbGUgbnVjbGVhciBwYWdlZmxpcHBpbmcuCiAJICovCi0JZm9yIChpID0gMDsgaSA8IGRldi0+
bW9kZV9jb25maWcubnVtX3RvdGFsX3BsYW5lOyBpKyspIHsKLQkJc3RydWN0IGRybV9wbGFuZSAq
cGxhbmUgPSBzdGF0ZS0+cGxhbmVzW2ldOwotCi0JCWlmICghcGxhbmUpCi0JCQljb250aW51ZTsK
LQotCQlwbGFuZS0+c3RhdGUtPnN0YXRlID0gc3RhdGU7Ci0JCXN3YXAoc3RhdGUtPnBsYW5lX3N0
YXRlc1tpXSwgcGxhbmUtPnN0YXRlKTsKLQkJcGxhbmUtPnN0YXRlLT5zdGF0ZSA9IE5VTEw7Ci0J
fQotCi0JLyogc3dhcCBjcnRjX3NjYWxlcl9zdGF0ZSAqLwotCWZvciAoaSA9IDA7IGkgPCBkZXYt
Pm1vZGVfY29uZmlnLm51bV9jcnRjOyBpKyspIHsKLQkJc3RydWN0IGRybV9jcnRjICpjcnRjID0g
c3RhdGUtPmNydGNzW2ldOwotCQlpZiAoIWNydGMpIHsKLQkJCWNvbnRpbnVlOwotCQl9Ci0KLQkJ
dG9faW50ZWxfY3J0Y19zdGF0ZShjcnRjLT5zdGF0ZSktPnNjYWxlcl9zdGF0ZSA9Ci0JCQl0b19p
bnRlbF9jcnRjX3N0YXRlKHN0YXRlLT5jcnRjX3N0YXRlc1tpXSktPnNjYWxlcl9zdGF0ZTsKLQot
CQlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPj0gOSkKLQkJCXNrbF9kZXRhY2hfc2NhbGVycyh0
b19pbnRlbF9jcnRjKGNydGMpKTsKLQl9Ci0KIAlkcm1fYXRvbWljX2hlbHBlcl9jb21taXRfcGxh
bmVzKGRldiwgc3RhdGUpOworCiAJZHJtX2F0b21pY19oZWxwZXJfd2FpdF9mb3JfdmJsYW5rcyhk
ZXYsIHN0YXRlKTsKIAlkcm1fYXRvbWljX2hlbHBlcl9jbGVhbnVwX3BsYW5lcyhkZXYsIHN0YXRl
KTsKIAlkcm1fYXRvbWljX3N0YXRlX2ZyZWUoc3RhdGUpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n
cHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf
ZGlzcGxheS5jCmluZGV4IDY1ZWUyY2QwNDM3Yy4uMTA1YmRmODRlNDZhIDEwMDY0NAotLS0gYS9k
cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJt
L2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0xMzIwMiwxMSArMTMyMDIsMTQgQEAgc3RhdGljIHZv
aWQgaW50ZWxfYmVnaW5fY3J0Y19jb21taXQoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCiAJLyog
UGVyZm9ybSB2YmxhbmsgZXZhc2lvbiBhcm91bmQgY29tbWl0IG9wZXJhdGlvbiAqLwogCWlmIChp
bnRlbF9jcnRjLT5hdG9taWMuZXZhZGUgJiYKLQkgICAgIWRldl9wcml2LT5wb3dlcl9kb21haW5z
LmluaXRfcG93ZXJfb24pCisJICAgICFkZXZfcHJpdi0+cG93ZXJfZG9tYWlucy5pbml0X3Bvd2Vy
X29uKSB7CisJCWlmIChkZXZfcHJpdi0+aW5mby5nZW4gPj0gOSkKKwkJCXNrbF9kZXRhY2hfc2Nh
bGVycyh0b19pbnRlbF9jcnRjKGNydGMpKTsKKwogCQlpbnRlbF9jcnRjLT5hdG9taWMuZXZhZGUg
PQogCQkJaW50ZWxfcGlwZV91cGRhdGVfc3RhcnQoaW50ZWxfY3J0YywKIAkJCQkJCSZpbnRlbF9j
cnRjLT5hdG9taWMuc3RhcnRfdmJsX2NvdW50KTsKLQllbHNlCisJfSBlbHNlCiAJCWludGVsX2Ny
dGMtPmF0b21pYy5ldmFkZSA9IGZhbHNlOwogfQogCi0tIAoyLjEuMAoKX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJ
bnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5v
cmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK