From mboxrd@z Thu Jan  1 00:00:00 1970
From: ville.syrjala@linux.intel.com
Subject: [PATCH v3 2/2] drm/i915: Finish page flips and update
	primary planes after a GPU reset
Date: Mon, 18 Feb 2013 19:08:49 +0200
Message-ID: <1361207329-24539-3-git-send-email-ville.syrjala@linux.intel.com>
References: <1361207329-24539-1-git-send-email-ville.syrjala@linux.intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org>
Received: from mga11.intel.com (mga11.intel.com [192.55.52.93])
	by gabe.freedesktop.org (Postfix) with ESMTP id B05FDE5DD2
	for <intel-gfx@lists.freedesktop.org>;
	Mon, 18 Feb 2013 09:09:27 -0800 (PST)
In-Reply-To: <1361207329-24539-1-git-send-email-ville.syrjala@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>
Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org
Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org
To: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCkdQ
VSByZXNldCB3aWxsIGRyb3AgYWxsIGZsaXBzIHRoYXQgYXJlIHN0aWxsIGluIHRoZSByaW5nLiBT
byBhZnRlciB0aGUKcmVzZXQsIGNhbGwgdXBkYXRlX3BsYW5lKCkgZm9yIGFsbCBDUlRDcyB0byBt
YWtlIHN1cmUgdGhlIHByaW1hcnkKcGxhbmVzIGFyZSBzY2FubmluZyBvdXQgZnJvbSB0aGUgY29y
cmVjdCBidWZmZXIuCgpBbHNvIGZpbmlzaCBhbGwgcGVuZGluZyBmbGlwcy4gVGhhdCBtZWFucyB1
c2VyIHNwYWNlIHdpbGwgZ2V0IGl0cwpwYWdlIGZsaXAgZXZlbnRzIGFuZCB3b24ndCBnZXQgc3R1
Y2sgd2FpdGluZyBmb3IgdGhlbS4KCnYyOiBFeHBsaWNpdGx5IGZpbmlzaCBwYWdlIGZsaXBzIGlu
c3RlYWQgb2YgcmVseWluZyBvbiBGTElQX0RPTkUKICAgIGludGVycnVwdCBiZWluZyBnZW5lcmF0
ZWQgYnkgdGhlIGJhc2UgYWRkcmVzcyB1cGRhdGUuCnYzOiBNYWtlIHR3byBsb29wcyBvdmVyIGNy
dGNzIHRvIGF2b2lkIGRlYWRsb2NrcyB3aXRoIHRoZSBjcnRjIG11dGV4CgpTaWduZWQtb2ZmLWJ5
OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgotLS0KIGRy
aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMgICAgICB8ICAyICsrCiBkcml2ZXJzL2dwdS9k
cm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAzNyArKysrKysrKysrKysrKysrKysrKysrKysrKysr
KysrKysrKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oICAgICB8ICAyICsrCiAz
IGZpbGVzIGNoYW5nZWQsIDQxIGluc2VydGlvbnMoKykKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw
dS9kcm0vaTkxNS9pOTE1X2lycS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYwpp
bmRleCAyY2Q5N2QxLi45ZmRlNDlhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p
OTE1X2lycS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMKQEAgLTkxNSw2
ICs5MTUsOCBAQCBzdGF0aWMgdm9pZCBpOTE1X2Vycm9yX3dvcmtfZnVuYyhzdHJ1Y3Qgd29ya19z
dHJ1Y3QgKndvcmspCiAJCWZvcl9lYWNoX3JpbmcocmluZywgZGV2X3ByaXYsIGkpCiAJCQl3YWtl
X3VwX2FsbCgmcmluZy0+aXJxX3F1ZXVlKTsKIAorCQlpbnRlbF9kaXNwbGF5X2hhbmRsZV9yZXNl
dChkZXYpOworCiAJCXdha2VfdXBfYWxsKCZkZXZfcHJpdi0+Z3B1X2Vycm9yLnJlc2V0X3F1ZXVl
KTsKIAl9CiB9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5
LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggZmQzN2Q4Yi4u
ODkyZjA0YiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5j
CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMjIxOCw2ICsy
MjE4LDQzIEBAIGludGVsX3BpcGVfc2V0X2Jhc2VfYXRvbWljKHN0cnVjdCBkcm1fY3J0YyAqY3J0
Yywgc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIsCiAJcmV0dXJuIGRldl9wcml2LT5kaXNwbGF5
LnVwZGF0ZV9wbGFuZShjcnRjLCBmYiwgeCwgeSk7CiB9CiAKK3ZvaWQgaW50ZWxfZGlzcGxheV9o
YW5kbGVfcmVzZXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKK3sKKwlzdHJ1Y3QgZHJtX2k5MTVf
cHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOworCXN0cnVjdCBkcm1fY3J0YyAq
Y3J0YzsKKworCS8qCisJICogRmxpcHMgaW4gdGhlIHJpbmdzIGhhdmUgYmVlbiBudWtlZCBieSB0
aGUgcmVzZXQsCisJICogc28gY29tcGxldGUgYWxsIHBlbmRpbmcgZmxpcHMgc28gdGhhdCB1c2Vy
IHNwYWNlCisJICogd2lsbCBnZXQgaXRzIGV2ZW50cyBhbmQgbm90IGdldCBzdHVjay4KKwkgKgor
CSAqIEFsc28gdXBkYXRlIHRoZSBiYXNlIGFkZHJlc3Mgb2YgYWxsIHByaW1hcnkKKwkgKiBwbGFu
ZXMgdG8gdGhlIHRoZSBsYXN0IGZiIHRvIG1ha2Ugc3VyZSB3ZSdyZQorCSAqIHNob3dpbmcgdGhl
IGNvcnJlY3QgZmIgYWZ0ZXIgYSByZXNldC4KKwkgKgorCSAqIE5lZWQgdG8gbWFrZSB0d28gbG9v
cHMgb3ZlciB0aGUgY3J0Y3Mgc28gdGhhdCB3ZQorCSAqIGRvbid0IHRyeSB0byBncmFiIGEgY3J0
YyBtdXRleCBiZWZvcmUgdGhlCisJICogcGVuZGluZ19mbGlwX3F1ZXVlIHJlYWxseSBnb3Qgd29r
ZW4gdXAuCisJICovCisKKwlsaXN0X2Zvcl9lYWNoX2VudHJ5KGNydGMsICZkZXYtPm1vZGVfY29u
ZmlnLmNydGNfbGlzdCwgaGVhZCkgeworCQlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9
IHRvX2ludGVsX2NydGMoY3J0Yyk7CisJCWVudW0gcGxhbmUgcGxhbmUgPSBpbnRlbF9jcnRjLT5w
bGFuZTsKKworCQlpbnRlbF9wcmVwYXJlX3BhZ2VfZmxpcChkZXYsIHBsYW5lKTsKKwkJaW50ZWxf
ZmluaXNoX3BhZ2VfZmxpcF9wbGFuZShkZXYsIHBsYW5lKTsKKwl9CisKKwlsaXN0X2Zvcl9lYWNo
X2VudHJ5KGNydGMsICZkZXYtPm1vZGVfY29uZmlnLmNydGNfbGlzdCwgaGVhZCkgeworCQlzdHJ1
Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7CisKKwkJbXV0
ZXhfbG9jaygmY3J0Yy0+bXV0ZXgpOworCQlpZiAoaW50ZWxfY3J0Yy0+YWN0aXZlKQorCQkJZGV2
X3ByaXYtPmRpc3BsYXkudXBkYXRlX3BsYW5lKGNydGMsIGNydGMtPmZiLCBjcnRjLT54LCBjcnRj
LT55KTsKKwkJbXV0ZXhfdW5sb2NrKCZjcnRjLT5tdXRleCk7CisJfQorfQorCiBzdGF0aWMgaW50
CiBpbnRlbF9maW5pc2hfZmIoc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqb2xkX2ZiKQogewpkaWZm
IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9k
cm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCBkMjgyMDUyLi4wZGMxNGMyIDEwMDY0NAotLS0gYS9k
cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx
NS9pbnRlbF9kcnYuaApAQCAtNjk0LDQgKzY5NCw2IEBAIGV4dGVybiBib29sCiBpbnRlbF9kZGlf
Y29ubmVjdG9yX2dldF9od19zdGF0ZShzdHJ1Y3QgaW50ZWxfY29ubmVjdG9yICppbnRlbF9jb25u
ZWN0b3IpOwogZXh0ZXJuIHZvaWQgaW50ZWxfZGRpX2ZkaV9kaXNhYmxlKHN0cnVjdCBkcm1fY3J0
YyAqY3J0Yyk7CiAKK2V4dGVybiB2b2lkIGludGVsX2Rpc3BsYXlfaGFuZGxlX3Jlc2V0KHN0cnVj
dCBkcm1fZGV2aWNlICpkZXYpOworCiAjZW5kaWYgLyogX19JTlRFTF9EUlZfSF9fICovCi0tIAox
LjcuMTIuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K
SW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0
dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK