From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [fixup PATCH] drm/i915: Only commit active planes when updating planes during reset. Date: Mon, 14 Sep 2015 15:12:57 +0200 Message-ID: <20150914131257.GF3383@phenom.ffwll.local> 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> <55F6965F.20701@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wi0-f176.google.com (mail-wi0-f176.google.com [209.85.212.176]) by gabe.freedesktop.org (Postfix) with ESMTPS id 271D46E8B3 for ; Mon, 14 Sep 2015 06:10:14 -0700 (PDT) Received: by wiclk2 with SMTP id lk2so140099480wic.0 for ; Mon, 14 Sep 2015 06:10:12 -0700 (PDT) Content-Disposition: inline In-Reply-To: <55F6965F.20701@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Maarten Lankhorst Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T24gTW9uLCBTZXAgMTQsIDIwMTUgYXQgMTE6NDE6NTFBTSArMDIwMCwgTWFhcnRlbiBMYW5raG9y c3Qgd3JvdGU6Cj4gSW4gYSBmdXR1cmUgY29tbWl0IGNvbW1pdF9wbGFuZSB3aWxsIG5vIGxvbmdl ciBjaGVjayBpZiB0aGUgY3J0YyBpcyBhY3RpdmUuCj4gVG8gcHJldmVudCBpc3N1ZXMgd2l0aCBs ZWdhY3kgcGFnZSBmbGlwcyB0aGUgY2hlY2sgc2hvdWxkIGJlIHBlcmZvcm1lZCBpbnNpZGUKPiB1 cGRhdGVfcHJpbWFyeV9wbGFuZXMuCj4gCj4gU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9y c3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KPiAtLS0tCj4gCj4gSGV5LAo+ IAo+IE9wIDE0LTA5LTE1IG9tIDExOjAyIHNjaHJlZWYgRGFuaWVsIFZldHRlcjoKPiA+IE9uIFRo dSwgU2VwIDEwLCAyMDE1IGF0IDA3OjM0OjA1UE0gKzAzMDAsIFZpbGxlIFN5cmrDpGzDpCB3cm90 ZToKPiA+PiBPbiBUaHUsIFNlcCAxMCwgMjAxNSBhdCAwNjozMTowMlBNICswMjAwLCBEYW5pZWwg VmV0dGVyIHdyb3RlOgo+ID4+PiBPbiBUaHUsIFNlcCAxMCwgMjAxNSBhdCAwNjo0MzoyNlBNICsw MzAwLCBWaWxsZSBTeXJqw6Rsw6Qgd3JvdGU6Cj4gPj4+PiBPbiBUaHUsIFNlcCAxMCwgMjAxNSBh dCAwNDowNzo1OFBNICswMjAwLCBNYWFydGVuIExhbmtob3JzdCB3cm90ZToKPiA+Pj4+PiBUaGlz IGZ1bmN0aW9uIHdhcyBzdGlsbCB1c2luZyB0aGUgbGVnYWN5IHN0YXRlLCBjb252ZXJ0IGl0IHRv IGF0b21pYy4KPiA+Pj4+PiBXaGlsZSB3ZSdyZSBhdCBpdCwgZml4IHRoZSBGSVhNRSB0b28gYW5k IGRpc2FibGUgdGhlIHByaW1hcnkgcGxhbmUuCj4gPj4+Pj4KPiA+Pj4+PiBTaWduZWQtb2ZmLWJ5 OiBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwuY29tPgo+ ID4+Pj4+IC0tLQo+ID4+Pj4+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMg fCAyNiArKysrKysrKysrKystLS0tLS0tLS0tLS0tLQo+ID4+Pj4+ICAxIGZpbGUgY2hhbmdlZCwg MTIgaW5zZXJ0aW9ucygrKSwgMTQgZGVsZXRpb25zKC0pCj4gPj4+Pj4KPiA+Pj4+PiBkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCj4gPj4+Pj4gaW5kZXggMzMyMDA0MDNhNWRiLi5iNjhh YTk1YzU0NjAgMTAwNjQ0Cj4gPj4+Pj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZGlzcGxheS5jCj4gPj4+Pj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh eS5jCj4gPj4+Pj4gQEAgLTMxMzgsMjQgKzMxMzgsMjIgQEAgc3RhdGljIHZvaWQgaW50ZWxfY29t cGxldGVfcGFnZV9mbGlwcyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQo+ID4+Pj4+ICAKPiA+Pj4+ PiAgc3RhdGljIHZvaWQgaW50ZWxfdXBkYXRlX3ByaW1hcnlfcGxhbmVzKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYpCj4gPj4+Pj4gIHsKPiA+Pj4+PiAtCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7Cj4gPj4+Pj4gIAlzdHJ1Y3QgZHJtX2NydGMgKmNy dGM7Cj4gPj4+Pj4gIAo+ID4+Pj4+ICAJZm9yX2VhY2hfY3J0YyhkZXYsIGNydGMpIHsKPiA+Pj4+ PiAtCQlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7 Cj4gPj4+Pj4gKwkJc3RydWN0IGludGVsX3BsYW5lICpwbGFuZSA9IHRvX2ludGVsX3BsYW5lKGNy dGMtPnByaW1hcnkpOwo+ID4+Pj4+ICsJCXN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqcGxhbmVf c3RhdGU7Cj4gPj4+Pj4gIAo+ID4+Pj4+IC0JCWRybV9tb2Rlc2V0X2xvY2soJmNydGMtPm11dGV4 LCBOVUxMKTsKPiA+Pj4+PiAtCQkvKgo+ID4+Pj4+IC0JCSAqIEZJWE1FOiBPbmNlIHdlIGhhdmUg cHJvcGVyIHN1cHBvcnQgZm9yIHByaW1hcnkgcGxhbmVzIChhbmQKPiA+Pj4+PiAtCQkgKiBkaXNh YmxpbmcgdGhlbSB3aXRob3V0IGRpc2FibGluZyB0aGUgZW50aXJlIGNydGMpIGFsbG93IGFnYWlu Cj4gPj4+Pj4gLQkJICogYSBOVUxMIGNydGMtPnByaW1hcnktPmZiLgo+ID4+Pj4+IC0JCSAqLwo+ ID4+Pj4+IC0JCWlmIChpbnRlbF9jcnRjLT5hY3RpdmUgJiYgY3J0Yy0+cHJpbWFyeS0+ZmIpCj4g Pj4+Pj4gLQkJCWRldl9wcml2LT5kaXNwbGF5LnVwZGF0ZV9wcmltYXJ5X3BsYW5lKGNydGMsCj4g Pj4+Pj4gLQkJCQkJCQkgICAgICAgY3J0Yy0+cHJpbWFyeS0+ZmIsCj4gPj4+Pj4gLQkJCQkJCQkg ICAgICAgY3J0Yy0+eCwKPiA+Pj4+PiAtCQkJCQkJCSAgICAgICBjcnRjLT55KTsKPiA+Pj4+PiAt CQlkcm1fbW9kZXNldF91bmxvY2soJmNydGMtPm11dGV4KTsKPiA+Pj4+PiArCQlkcm1fbW9kZXNl dF9sb2NrX2NydGMoY3J0YywgJnBsYW5lLT5iYXNlKTsKPiA+Pj4+PiArCj4gPj4+Pj4gKwkJcGxh bmVfc3RhdGUgPSB0b19pbnRlbF9wbGFuZV9zdGF0ZShwbGFuZS0+YmFzZS5zdGF0ZSk7Cj4gPj4+ Pj4gKwo+ID4+Pj4+ICsJCWlmIChwbGFuZV9zdGF0ZS0+YmFzZS5mYikKPiA+Pj4+PiArCQkJcGxh bmUtPmNvbW1pdF9wbGFuZSgmcGxhbmUtPmJhc2UsIHBsYW5lX3N0YXRlKTsKPiA+Pj4+PiArCQll bHNlIGlmIChjcnRjLT5zdGF0ZS0+YWN0aXZlKQo+ID4+Pj4+ICsJCQlwbGFuZS0+ZGlzYWJsZV9w bGFuZSgmcGxhbmUtPmJhc2UsIGNydGMpOwo+ID4+Pj4gVGhhdCBkb2Vzbid0IG1ha2Ugc2Vuc2Uu IFRoZXJlJ3Mgbm8gd2F5IHRvIGRpc2FibGUgYSBwbGFuZSB3aXRoIGEgcGFnZQo+ID4+Pj4gZmxp cCwgc28gdGhlcmUncyBzaW1wbHkgbm90aGluZyB0byBkbyBoZXJlIGlmIHRoZSBmYiBpcyBOVUxM LiBJZiB3ZSBjYW4KPiA+Pj4+IHRydXN0IHRoZSBwbGFuZSBzdGF0ZSB0byBiZSBzYW5lIHdlIHNo b3VsZCBqdXN0IGNoZWNrICd2aXNpYmxlJyBoZXJlIGFuZAo+ID4+Pj4gY29tbWl0IHRoZSBwbGFu ZSBpbiB0aGF0IGNhc2UuCj4gPj4+IFJpZ2h0IG1pc3NlZCB0aGF0IGFuZCBzcXVhc2ggdXAgYSBm aXh1cCB0aGF0IFZpbGxlIGFja2VkIG9uIGlyYy4gQWxzbwo+ID4+PiBhZGRlZCB0aGUgRklYTUUg Y29tbWVudCB0b28uCj4gPj4gQWN0dWFsbHkgSSB0YWtlIGl0IGJhY2suIFdlIGp1c3QgbG9zdCB0 aGUgLT5hY3RpdmUgY2hlY2sgZW50aXJlbHkgc28gbm93Cj4gPj4gd2UncmUgY29tbWl0aW5nIGEg cGxhbmUgb24gYSBkaXNhYmxlZCBwaXBlIHBvdGVudGlhbGx5Lgo+ID4gQmxlcmdoIGFuZCBJIHRh Z2dlZCB0aGUgcGlsZSBhbHJlYWR5IDooIE1hYXJ0ZW4sIGNhbiB5b3UgcGxzIHNlbmQgb3V0IHRo ZQo+ID4gZml4dXAgYXMgYSBzZXBhcmF0ZSBwYXRjaCBhc2FwPwo+ID4KPiBUaGlzIGlzIG5vdCBj dXJyZW50bHkgYW4gaXNzdWUgYmVjYXVzZSAiZHJtL2k5MTU6IE9ubHkgcnVuIGNvbW1pdCB3aGVu IGNydGMgaXMgYWN0aXZlLicgaXMgbm90IGFwcGxpZWQuCj4gCj4gVGhhbmtzIGZvciBjYXRjaGlu ZyB0aG91Z2ghCgpJIE1lYW50IGEgZnVsbCBwYXRjaCAoaW5jbHVkaW5nIGNvbW1pdCBjaXRhdGlv biBhbmQgc29iIGFuZCBhbGwgdGFodCkKc2luY2UgSSBhbHJlYWR5IHRhZ2dlZCBpdCBhbmQgY2Fu J3Qgc3F1YXNoIGluIGFueSBtb3JlLgotRGFuaWVsCgo+IC0tLQo+IGRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kaXNwbGF5LmMKPiBpbmRleCA0NTJlOGY3NzE1MWQuLjQ3ZDljMGY4YjJmYiAxMDA2NDQK PiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKPiArKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKPiBAQCAtMzE0NSwxMCArMzE0NSw5IEBA IHN0YXRpYyB2b2lkIGludGVsX3VwZGF0ZV9wcmltYXJ5X3BsYW5lcyhzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2KQo+ICAJCXN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqcGxhbmVfc3RhdGU7Cj4gIAo+ ICAJCWRybV9tb2Rlc2V0X2xvY2tfY3J0YyhjcnRjLCAmcGxhbmUtPmJhc2UpOwo+IC0KPiAgCQlw bGFuZV9zdGF0ZSA9IHRvX2ludGVsX3BsYW5lX3N0YXRlKHBsYW5lLT5iYXNlLnN0YXRlKTsKPiAg Cj4gLQkJaWYgKHBsYW5lX3N0YXRlLT5iYXNlLmZiKQo+ICsJCWlmIChjcnRjLT5zdGF0ZS0+YWN0 aXZlICYmIHBsYW5lX3N0YXRlLT5iYXNlLmZiKQo+ICAJCQlwbGFuZS0+Y29tbWl0X3BsYW5lKCZw bGFuZS0+YmFzZSwgcGxhbmVfc3RhdGUpOwo+ICAKPiAgCQlkcm1fbW9kZXNldF91bmxvY2tfY3J0 YyhjcnRjKTsKPiAKCi0tIApEYW5pZWwgVmV0dGVyClNvZnR3YXJlIEVuZ2luZWVyLCBJbnRlbCBD b3Jwb3JhdGlvbgpodHRwOi8vYmxvZy5mZndsbC5jaApfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2ludGVsLWdmeAo=