From mboxrd@z Thu Jan  1 00:00:00 1970
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Subject: [fixup PATCH] drm/i915: Only commit active planes when
 updating planes during reset.
Date: Mon, 14 Sep 2015 11:41:51 +0200
Message-ID: <55F6965F.20701@linux.intel.com>
References: <1441894085-25662-1-git-send-email-maarten.lankhorst@linux.intel.com>
 <1441894085-25662-4-git-send-email-maarten.lankhorst@linux.intel.com>
 <20150910154326.GJ29811@intel.com>
 <20150910163102.GC31002@phenom.ffwll.local>
 <20150910163405.GQ29811@intel.com> <20150914090241.GP3383@phenom.ffwll.local>
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 mga09.intel.com (mga09.intel.com [134.134.136.24])
 by gabe.freedesktop.org (Postfix) with ESMTP id 5D95C6E80B
 for <intel-gfx@lists.freedesktop.org>; Mon, 14 Sep 2015 02:41:53 -0700 (PDT)
In-Reply-To: <20150914090241.GP3383@phenom.ffwll.local>
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: Daniel Vetter <daniel@ffwll.ch>, =?UTF-8?B?VmlsbGUgU3lyasOkbMOk?= <ville.syrjala@linux.intel.com>
Cc: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

SW4gYSBmdXR1cmUgY29tbWl0IGNvbW1pdF9wbGFuZSB3aWxsIG5vIGxvbmdlciBjaGVjayBpZiB0
aGUgY3J0YyBpcyBhY3RpdmUuClRvIHByZXZlbnQgaXNzdWVzIHdpdGggbGVnYWN5IHBhZ2UgZmxp
cHMgdGhlIGNoZWNrIHNob3VsZCBiZSBwZXJmb3JtZWQgaW5zaWRlCnVwZGF0ZV9wcmltYXJ5X3Bs
YW5lcy4KClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3Jz
dEBsaW51eC5pbnRlbC5jb20+Ci0tLS0KCkhleSwKCk9wIDE0LTA5LTE1IG9tIDExOjAyIHNjaHJl
ZWYgRGFuaWVsIFZldHRlcjoKPiBPbiBUaHUsIFNlcCAxMCwgMjAxNSBhdCAwNzozNDowNVBNICsw
MzAwLCBWaWxsZSBTeXJqw6Rsw6Qgd3JvdGU6Cj4+IE9uIFRodSwgU2VwIDEwLCAyMDE1IGF0IDA2
OjMxOjAyUE0gKzAyMDAsIERhbmllbCBWZXR0ZXIgd3JvdGU6Cj4+PiBPbiBUaHUsIFNlcCAxMCwg
MjAxNSBhdCAwNjo0MzoyNlBNICswMzAwLCBWaWxsZSBTeXJqw6Rsw6Qgd3JvdGU6Cj4+Pj4gT24g
VGh1LCBTZXAgMTAsIDIwMTUgYXQgMDQ6MDc6NThQTSArMDIwMCwgTWFhcnRlbiBMYW5raG9yc3Qg
d3JvdGU6Cj4+Pj4+IFRoaXMgZnVuY3Rpb24gd2FzIHN0aWxsIHVzaW5nIHRoZSBsZWdhY3kgc3Rh
dGUsIGNvbnZlcnQgaXQgdG8gYXRvbWljLgo+Pj4+PiBXaGlsZSB3ZSdyZSBhdCBpdCwgZml4IHRo
ZSBGSVhNRSB0b28gYW5kIGRpc2FibGUgdGhlIHByaW1hcnkgcGxhbmUuCj4+Pj4+Cj4+Pj4+IFNp
Z25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5p
bnRlbC5jb20+Cj4+Pj4+IC0tLQo+Pj4+PiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz
cGxheS5jIHwgMjYgKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0KPj4+Pj4gIDEgZmlsZSBjaGFu
Z2VkLCAxMiBpbnNlcnRpb25zKCspLCAxNCBkZWxldGlvbnMoLSkKPj4+Pj4KPj4+Pj4gZGlmZiAt
LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1
L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwo+Pj4+PiBpbmRleCAzMzIwMDQwM2E1ZGIuLmI2OGFh
OTVjNTQ2MCAxMDA2NDQKPj4+Pj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz
cGxheS5jCj4+Pj4+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwo+
Pj4+PiBAQCAtMzEzOCwyNCArMzEzOCwyMiBAQCBzdGF0aWMgdm9pZCBpbnRlbF9jb21wbGV0ZV9w
YWdlX2ZsaXBzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCj4+Pj4+ICAKPj4+Pj4gIHN0YXRpYyB2
b2lkIGludGVsX3VwZGF0ZV9wcmltYXJ5X3BsYW5lcyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQo+
Pj4+PiAgewo+Pj4+PiAtCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+
ZGV2X3ByaXZhdGU7Cj4+Pj4+ICAJc3RydWN0IGRybV9jcnRjICpjcnRjOwo+Pj4+PiAgCj4+Pj4+
ICAJZm9yX2VhY2hfY3J0YyhkZXYsIGNydGMpIHsKPj4+Pj4gLQkJc3RydWN0IGludGVsX2NydGMg
KmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOwo+Pj4+PiArCQlzdHJ1Y3QgaW50ZWxf
cGxhbmUgKnBsYW5lID0gdG9faW50ZWxfcGxhbmUoY3J0Yy0+cHJpbWFyeSk7Cj4+Pj4+ICsJCXN0
cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqcGxhbmVfc3RhdGU7Cj4+Pj4+ICAKPj4+Pj4gLQkJZHJt
X21vZGVzZXRfbG9jaygmY3J0Yy0+bXV0ZXgsIE5VTEwpOwo+Pj4+PiAtCQkvKgo+Pj4+PiAtCQkg
KiBGSVhNRTogT25jZSB3ZSBoYXZlIHByb3BlciBzdXBwb3J0IGZvciBwcmltYXJ5IHBsYW5lcyAo
YW5kCj4+Pj4+IC0JCSAqIGRpc2FibGluZyB0aGVtIHdpdGhvdXQgZGlzYWJsaW5nIHRoZSBlbnRp
cmUgY3J0YykgYWxsb3cgYWdhaW4KPj4+Pj4gLQkJICogYSBOVUxMIGNydGMtPnByaW1hcnktPmZi
Lgo+Pj4+PiAtCQkgKi8KPj4+Pj4gLQkJaWYgKGludGVsX2NydGMtPmFjdGl2ZSAmJiBjcnRjLT5w
cmltYXJ5LT5mYikKPj4+Pj4gLQkJCWRldl9wcml2LT5kaXNwbGF5LnVwZGF0ZV9wcmltYXJ5X3Bs
YW5lKGNydGMsCj4+Pj4+IC0JCQkJCQkJICAgICAgIGNydGMtPnByaW1hcnktPmZiLAo+Pj4+PiAt
CQkJCQkJCSAgICAgICBjcnRjLT54LAo+Pj4+PiAtCQkJCQkJCSAgICAgICBjcnRjLT55KTsKPj4+
Pj4gLQkJZHJtX21vZGVzZXRfdW5sb2NrKCZjcnRjLT5tdXRleCk7Cj4+Pj4+ICsJCWRybV9tb2Rl
c2V0X2xvY2tfY3J0YyhjcnRjLCAmcGxhbmUtPmJhc2UpOwo+Pj4+PiArCj4+Pj4+ICsJCXBsYW5l
X3N0YXRlID0gdG9faW50ZWxfcGxhbmVfc3RhdGUocGxhbmUtPmJhc2Uuc3RhdGUpOwo+Pj4+PiAr
Cj4+Pj4+ICsJCWlmIChwbGFuZV9zdGF0ZS0+YmFzZS5mYikKPj4+Pj4gKwkJCXBsYW5lLT5jb21t
aXRfcGxhbmUoJnBsYW5lLT5iYXNlLCBwbGFuZV9zdGF0ZSk7Cj4+Pj4+ICsJCWVsc2UgaWYgKGNy
dGMtPnN0YXRlLT5hY3RpdmUpCj4+Pj4+ICsJCQlwbGFuZS0+ZGlzYWJsZV9wbGFuZSgmcGxhbmUt
PmJhc2UsIGNydGMpOwo+Pj4+IFRoYXQgZG9lc24ndCBtYWtlIHNlbnNlLiBUaGVyZSdzIG5vIHdh
eSB0byBkaXNhYmxlIGEgcGxhbmUgd2l0aCBhIHBhZ2UKPj4+PiBmbGlwLCBzbyB0aGVyZSdzIHNp
bXBseSBub3RoaW5nIHRvIGRvIGhlcmUgaWYgdGhlIGZiIGlzIE5VTEwuIElmIHdlIGNhbgo+Pj4+
IHRydXN0IHRoZSBwbGFuZSBzdGF0ZSB0byBiZSBzYW5lIHdlIHNob3VsZCBqdXN0IGNoZWNrICd2
aXNpYmxlJyBoZXJlIGFuZAo+Pj4+IGNvbW1pdCB0aGUgcGxhbmUgaW4gdGhhdCBjYXNlLgo+Pj4g
UmlnaHQgbWlzc2VkIHRoYXQgYW5kIHNxdWFzaCB1cCBhIGZpeHVwIHRoYXQgVmlsbGUgYWNrZWQg
b24gaXJjLiBBbHNvCj4+PiBhZGRlZCB0aGUgRklYTUUgY29tbWVudCB0b28uCj4+IEFjdHVhbGx5
IEkgdGFrZSBpdCBiYWNrLiBXZSBqdXN0IGxvc3QgdGhlIC0+YWN0aXZlIGNoZWNrIGVudGlyZWx5
IHNvIG5vdwo+PiB3ZSdyZSBjb21taXRpbmcgYSBwbGFuZSBvbiBhIGRpc2FibGVkIHBpcGUgcG90
ZW50aWFsbHkuCj4gQmxlcmdoIGFuZCBJIHRhZ2dlZCB0aGUgcGlsZSBhbHJlYWR5IDooIE1hYXJ0
ZW4sIGNhbiB5b3UgcGxzIHNlbmQgb3V0IHRoZQo+IGZpeHVwIGFzIGEgc2VwYXJhdGUgcGF0Y2gg
YXNhcD8KPgpUaGlzIGlzIG5vdCBjdXJyZW50bHkgYW4gaXNzdWUgYmVjYXVzZSAiZHJtL2k5MTU6
IE9ubHkgcnVuIGNvbW1pdCB3aGVuIGNydGMgaXMgYWN0aXZlLicgaXMgbm90IGFwcGxpZWQuCgpU
aGFua3MgZm9yIGNhdGNoaW5nIHRob3VnaCEKLS0tCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k
cm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNw
bGF5LmMKaW5kZXggNDUyZThmNzcxNTFkLi40N2Q5YzBmOGIyZmIgMTAwNjQ0Ci0tLSBhL2RyaXZl
cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx
NS9pbnRlbF9kaXNwbGF5LmMKQEAgLTMxNDUsMTAgKzMxNDUsOSBAQCBzdGF0aWMgdm9pZCBpbnRl
bF91cGRhdGVfcHJpbWFyeV9wbGFuZXMoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJc3RydWN0
IGludGVsX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZTsKIAogCQlkcm1fbW9kZXNldF9sb2NrX2Ny
dGMoY3J0YywgJnBsYW5lLT5iYXNlKTsKLQogCQlwbGFuZV9zdGF0ZSA9IHRvX2ludGVsX3BsYW5l
X3N0YXRlKHBsYW5lLT5iYXNlLnN0YXRlKTsKIAotCQlpZiAocGxhbmVfc3RhdGUtPmJhc2UuZmIp
CisJCWlmIChjcnRjLT5zdGF0ZS0+YWN0aXZlICYmIHBsYW5lX3N0YXRlLT5iYXNlLmZiKQogCQkJ
cGxhbmUtPmNvbW1pdF9wbGFuZSgmcGxhbmUtPmJhc2UsIHBsYW5lX3N0YXRlKTsKIAogCQlkcm1f
bW9kZXNldF91bmxvY2tfY3J0YyhjcnRjKTsKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3Rz
LmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz
dGluZm8vaW50ZWwtZ2Z4Cg==