From mboxrd@z Thu Jan  1 00:00:00 1970
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Subject: [PATCH 12/42] drm/i915: move swap_state to the right
	place
Date: Mon, 11 May 2015 16:24:48 +0200
Message-ID: <1431354318-11995-13-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 251D56E3FB
 for <intel-gfx@lists.freedesktop.org>; Mon, 11 May 2015 07:25:44 -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

RG9uZSBhcyBhIHNlcGFyYXRlIGNvbW1pdCB0byBhbGxvdyBiZXR0ZXIgYmlzZWN0aW5nLgoKU2ln
bmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4Lmlu
dGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCA1MCAr
KysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA3IGlu
c2VydGlvbnMoKyksIDQzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry
bS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3Bs
YXkuYwppbmRleCBhOTBlYmM4ZWZmNmYuLjI1M2Q5Y2Q0MTU0YSAxMDA2NDQKLS0tIGEvZHJpdmVy
cy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1
L2ludGVsX2Rpc3BsYXkuYwpAQCAtMTE0MzcsMjggKzExNDM3LDkgQEAgaW50ZWxfbW9kZXNldF91
cGRhdGVfc3RhdGUoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKQogCXN0cnVjdCBkcm1f
Y3J0YyAqY3J0YzsKIAlzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGU7CiAJc3RydWN0
IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvcjsKLQlzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9zdGF0ZSAq
Y29ubmVjdG9yX3N0YXRlOwotCWludCBpOwogCiAJaW50ZWxfc2hhcmVkX2RwbGxfY29tbWl0KGRl
dl9wcml2KTsKIAotCS8qCi0JICogc3dhcCBjcnRjIGFuZCBjb25uZWN0b3Igc3RhdGUsIHBsYW5l
IHN0YXRlIGlzIGFscmVhZHkgc3dhcHBlZCBpbgotCSAqIF9faW50ZWxfc2V0X21vZGVfdXBkYXRl
X3BsYW5lcy4gT25jZSAuY3J0Y19kaXNhYmxlIGlzIGZpeGVkCi0JICogYWxsIHN0YXRlIHNob3Vs
ZCBiZSBzd2FwcGVkIGJlZm9yZSBkaXNhYmxpbmcgY3J0YydzLgotCSAqLwotCWZvcl9lYWNoX2Ny
dGNfaW5fc3RhdGUoc3RhdGUsIGNydGMsIGNydGNfc3RhdGUsIGkpIHsKLQkJY3J0Yy0+c3RhdGUt
PnN0YXRlID0gc3RhdGU7Ci0JCXN3YXAoc3RhdGUtPmNydGNfc3RhdGVzW2ldLCBjcnRjLT5zdGF0
ZSk7Ci0JCWNydGMtPnN0YXRlLT5zdGF0ZSA9IE5VTEw7Ci0JfQotCi0JZm9yX2VhY2hfY29ubmVj
dG9yX2luX3N0YXRlKHN0YXRlLCBjb25uZWN0b3IsIGNvbm5lY3Rvcl9zdGF0ZSwgaSkgewotCQlj
b25uZWN0b3ItPnN0YXRlLT5zdGF0ZSA9IHN0YXRlOwotCQlzd2FwKHN0YXRlLT5jb25uZWN0b3Jf
c3RhdGVzW2ldLCBjb25uZWN0b3ItPnN0YXRlKTsKLQkJY29ubmVjdG9yLT5zdGF0ZS0+c3RhdGUg
PSBOVUxMOwotCX0KLQogCWZvcl9lYWNoX2ludGVsX2VuY29kZXIoZGV2LCBpbnRlbF9lbmNvZGVy
KSB7CiAJCWlmICghaW50ZWxfZW5jb2Rlci0+YmFzZS5jcnRjKQogCQkJY29udGludWU7CkBAIC0x
MjE4MywyMSArMTIxNjQsNiBAQCBzdGF0aWMgdm9pZCBfX2ludGVsX3NldF9tb2RlX3VwZGF0ZV9w
bGFuZXMoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAlzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZTsK
IAlzdHJ1Y3QgZHJtX2NydGMgKmNydGM7CiAKLQkvKgotCSAqIEZvciBub3cgb25seSBzd2FwIHBs
YW5lIHN0YXRlLCB3aWxsIGJlIHJlcGxhY2VkIHdpdGggYQotCSAqIGNhbGwgdG8gZHJtX2F0b21p
Y19oZWxwZXJfc3dhcF9zdGF0ZQotCSAqLwotCWZvcl9lYWNoX3BsYW5lX2luX3N0YXRlKHN0YXRl
LCBwbGFuZSwgb2xkX3BsYW5lX3N0YXRlLCBpKSB7Ci0JCXN0cnVjdCBkcm1fcGxhbmUgKnBsYW5l
ID0gc3RhdGUtPnBsYW5lc1tpXTsKLQotCQlpZiAoIXBsYW5lKQotCQkJY29udGludWU7Ci0KLQkJ
cGxhbmUtPnN0YXRlLT5zdGF0ZSA9IHN0YXRlOwotCQlzd2FwKHN0YXRlLT5wbGFuZV9zdGF0ZXNb
aV0sIHBsYW5lLT5zdGF0ZSk7Ci0JCXBsYW5lLT5zdGF0ZS0+c3RhdGUgPSBOVUxMOwotCX0KLQog
CWZvcl9lYWNoX2NydGNfaW5fc3RhdGUoc3RhdGUsIGNydGMsIGNydGNfc3RhdGUsIGkpIHsKIAkJ
Y29uc3Qgc3RydWN0IGRybV9jcnRjX2hlbHBlcl9mdW5jcyAqZnVuY3M7CiAKQEAgLTEyMjA2LDEw
ICsxMjE3Miw2IEBAIHN0YXRpYyB2b2lkIF9faW50ZWxfc2V0X21vZGVfdXBkYXRlX3BsYW5lcyhz
dHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQlpZiAoIWZ1bmNzIHx8ICFmdW5jcy0+YXRvbWljX2Jl
Z2luKQogCQkJY29udGludWU7CiAKLQkJLyogWFhYOiBIYWNrIGJlY2F1c2UgY3J0YyBzdGF0ZSBp
cyBub3Qgc3dhcHBlZCAqLwotCQljcnRjLT5zdGF0ZS0+bW9kZV9jaGFuZ2VkID0gY3J0Y19zdGF0
ZS0+bW9kZV9jaGFuZ2VkOwotCQljcnRjLT5zdGF0ZS0+YWN0aXZlX2NoYW5nZWQgPSBjcnRjX3N0
YXRlLT5hY3RpdmVfY2hhbmdlZDsKLQogCQlEUk1fREVCVUdfQVRPTUlDKCJDYWxsaW5nIGF0b21p
Y19iZWdpbiBvbiBjcnRjICVpXG4iLCBpKTsKIAkJZnVuY3MtPmF0b21pY19iZWdpbihjcnRjKTsK
IAl9CkBAIC0xMjI4Nyw3ICsxMjI0OSw3IEBAIHN0YXRpYyBpbnQgX19pbnRlbF9zZXRfbW9kZShz
dHJ1Y3QgZHJtX2NydGMgKm1vZGVzZXRfY3J0YywKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq
ZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCXN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpz
dGF0ZSA9IHBpcGVfY29uZmlnLT5iYXNlLnN0YXRlOwogCXN0cnVjdCBkcm1fY3J0YyAqY3J0YzsK
LQlzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGU7CisJc3RydWN0IGRybV9jcnRjX3N0
YXRlICpvbGRfY3J0Y19zdGF0ZTsKIAlpbnQgcmV0OwogCWludCBpOwogCkBAIC0xMjI5OSwxNSAr
MTIyNjEsMTcgQEAgc3RhdGljIGludCBfX2ludGVsX3NldF9tb2RlKHN0cnVjdCBkcm1fY3J0YyAq
bW9kZXNldF9jcnRjLAogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKKwlkcm1fYXRvbWljX2hl
bHBlcl9zd2FwX3N0YXRlKGRldiwgc3RhdGUpOworCiAJX19pbnRlbF9zZXRfbW9kZV91cGRhdGVf
cGxhbmVzKGRldiwgc3RhdGUpOwogCi0JZm9yX2VhY2hfY3J0Y19pbl9zdGF0ZShzdGF0ZSwgY3J0
YywgY3J0Y19zdGF0ZSwgaSkgeworCWZvcl9lYWNoX2NydGNfaW5fc3RhdGUoc3RhdGUsIGNydGMs
IG9sZF9jcnRjX3N0YXRlLCBpKSB7CiAJCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0g
dG9faW50ZWxfY3J0YyhjcnRjKTsKIAotCQlpZiAoIW5lZWRzX21vZGVzZXQoY3J0Y19zdGF0ZSkp
CisJCWlmICghbmVlZHNfbW9kZXNldChjcnRjLT5zdGF0ZSkpCiAJCQljb250aW51ZTsKIAotCQlp
ZiAoIWNydGMtPnN0YXRlLT5hY3RpdmUpCisJCWlmICghb2xkX2NydGNfc3RhdGUtPmFjdGl2ZSkK
IAkJCWNvbnRpbnVlOwogCiAJCWludGVsX2NydGNfZHBtc19vdmVybGF5X2Rpc2FibGUodG9faW50
ZWxfY3J0YyhjcnRjKSk7CkBAIC0xMjMyOSw3ICsxMjI5Myw3IEBAIHN0YXRpYyBpbnQgX19pbnRl
bF9zZXRfbW9kZShzdHJ1Y3QgZHJtX2NydGMgKm1vZGVzZXRfY3J0YywKIAltb2Rlc2V0X3VwZGF0
ZV9jcnRjX3Bvd2VyX2RvbWFpbnMoc3RhdGUpOwogCiAJLyogTm93IGVuYWJsZSB0aGUgY2xvY2tz
LCBwbGFuZSwgcGlwZSwgYW5kIGNvbm5lY3RvcnMgdGhhdCB3ZSBzZXQgdXAuICovCi0JZm9yX2Vh
Y2hfY3J0Y19pbl9zdGF0ZShzdGF0ZSwgY3J0YywgY3J0Y19zdGF0ZSwgaSkgeworCWZvcl9lYWNo
X2NydGNfaW5fc3RhdGUoc3RhdGUsIGNydGMsIG9sZF9jcnRjX3N0YXRlLCBpKSB7CiAJCWlmICgh
Y3J0Yy0+c3RhdGUtPmFjdGl2ZSkgewogCQkJaWYgKG5lZWRzX21vZGVzZXQoY3J0Yy0+c3RhdGUp
KQogCQkJCWludGVsX3VwZGF0ZV93YXRlcm1hcmtzKGNydGMpOwotLSAKMi4xLjAKCl9fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5n
IGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRl
c2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==