From: Daniel Vetter Subject: Re: [PATCH] drm/i915: Don't clobber plane state on internal disables Date: Thu, 5 Mar 2015 13:33:53 +0100 Message-ID: <20150305123353.GZ18775@phenom.ffwll.local> References: <1425494944-15403-1-git-send-email-matthew.d.roper@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wg0-f53.google.com (mail-wg0-f53.google.com [74.125.82.53]) by gabe.freedesktop.org (Postfix) with ESMTP id AD7756E7A3 for ; Thu, 5 Mar 2015 04:32:14 -0800 (PST) Received: by wggx12 with SMTP id x12so53047943wgg.11 for ; Thu, 05 Mar 2015 04:32:13 -0800 (PST) Content-Disposition: inline In-Reply-To: <1425494944-15403-1-git-send-email-matthew.d.roper@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Matt Roper Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T24gV2VkLCBNYXIgMDQsIDIwMTUgYXQgMTA6NDk6MDRBTSAtMDgwMCwgTWF0dCBSb3BlciB3cm90 ZToKPiBXZSBuZWVkIHRvIGRpc2FibGUgYWxsIHNwcml0ZSBwbGFuZXMgd2hlbiBkaXNhYmxpbmcg dGhlIENSVEMuICBXZSBoYWQKPiBiZWVuIHVzaW5nIHRoZSB0b3AtbGV2ZWwgYXRvbWljICdkaXNh YmxlJyBlbnRyeXBvaW50IHRvIGFjY29tcGxpc2ggdGhpcywKPiB3aGljaCB3YXMgd3JvbmcuICBO b3Qgb25seSBjYW4gdGhpcyBsZWFkIHRvIHZhcmlvdXMgbG9ja2luZyBpc3N1ZXMsIGl0Cj4gYWxz byBtb2RpZmllcyB0aGUgYWN0dWFsIHBsYW5lIHN0YXRlLCBtYWtpbmcgaXQgaW1wb3NzaWJsZSB0 byByZXN0b3JlCj4gdGhlIHBsYW5lIHByb3Blcmx5IGxhdGVyLiAgRm9yIGV4YW1wbGUsIGEgRFBN UyBvZmYgZm9sbG93ZWQgYnkgYSBEUE1TIG9uCj4gd2lsbCByZXN1bHQgaW4gYW55IHNwcml0ZSBw bGFuZXMgaW4gdXNlIG5vdCBiZWluZyByZXN0b3JlZCBwcm9wZXJseS4KPiAKPiBUaGUgcHJvcGVy IHNvbHV0aW9uIGhlcmUgaXMgdG8gY2FsbCBkaXJlY3RseSBpbnRvIG91ciAnY29tbWl0IHBsYW5l Jwo+IGhvb2sgd2l0aCBhIGNvcHkgb2YgdGhlIHBsYW5lJ3MgY3VycmVudCBzdGF0ZSB0aGF0IGhh cyAndmlzaWJsZScgc2V0IHRvCj4gZmFsc2UuICBDb21taXR0aW5nIHRoaXMgZHVtbXkgc3RhdGUg d2lsbCB0dXJuIG9mZiB0aGUgcGxhbmUsIGJ1dCB3aWxsCj4gbm90IHRvdWNoIHRoZSBhY3R1YWwg cGxhbmUtPnN0YXRlIHBvaW50ZXIsIGFsbG93aW5nIHVzIHRvIHByb3Blcmx5Cj4gcmVzdG9yZSB0 aGUgcGxhbmUgc3RhdGUgbGF0ZXIuCj4gCj4gU2lnbmVkLW9mZi1ieTogTWF0dCBSb3BlciA8bWF0 dGhldy5kLnJvcGVyQGludGVsLmNvbT4KPiAtLS0KPiBUaGlzIHdhcyBhIHByZXR0eSBiaWcgcHJv YmxlbSBzbyBJIHN1c3BlY3QgdGhpcyBpcyBwcm9iYWJseSB0aWVkIHRvIHNvbWUgb2Ygb3VyCj4g ZXhpc3RpbmcgYnVnemlsbGEncyBidXQgSSdtIG5vdCBzdXJlIGV4YWN0bHkgd2hpY2ggb25lcy4g IEl0IHNlZW1zIHRoYXQgd2UgbGFjawo+IGFuIGktZy10IHRlc3QgZm9yIHBsYW5lIHN0YXR1cyBh Y3Jvc3MgRFBNUywgc28gSSdsbCBzZW5kIGFsb25nIGEgbmV3IGktZy10IHRlc3QKPiBmb3IgdGhh dCBzaG9ydGx5Lgo+IAo+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAy MiArKysrKysrKysrKysrKysrKysrKy0tCj4gIDEgZmlsZSBjaGFuZ2VkLCAyMCBpbnNlcnRpb25z KCspLCAyIGRlbGV0aW9ucygtKQo+IAo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMK PiBpbmRleCA5MmNiMmZmLi42Mjc3NzAxIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rpc3BsYXkuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rp c3BsYXkuYwo+IEBAIC00MjAxLDYgKzQyMDEsMjQgQEAgc3RhdGljIHZvaWQgaW50ZWxfZW5hYmxl X3Nwcml0ZV9wbGFuZXMoc3RydWN0IGRybV9jcnRjICpjcnRjKQo+ICAJfQo+ICB9Cj4gIAo+ICsv Kgo+ICsgKiBEaXNhYmxlIGEgcGxhbmUgaW50ZXJuYWxseSB3aXRob3V0IGFjdHVhbGx5IG1vZGlm eWluZyB0aGUgcGxhbmUncyBzdGF0ZS4KPiArICogVGhpcyB3aWxsIGFsbG93IHVzIHRvIGVhc2ls eSByZXN0b3JlIHRoZSBwbGFuZSBsYXRlciBieSBqdXN0IHJlcHJvZ3JhbW1pbmcKPiArICogaXRz IHN0YXRlLgo+ICsgKi8KPiArc3RhdGljIHZvaWQgZGlzYWJsZV9wbGFuZV9pbnRlcm5hbChzdHJ1 Y3QgZHJtX3BsYW5lICpwbGFuZSkKPiArewo+ICsJc3RydWN0IGludGVsX3BsYW5lICppbnRlbF9w bGFuZSA9IHRvX2ludGVsX3BsYW5lKHBsYW5lKTsKPiArCXN0cnVjdCBkcm1fcGxhbmVfc3RhdGUg KnN0YXRlID0KPiArCQlwbGFuZS0+ZnVuY3MtPmF0b21pY19kdXBsaWNhdGVfc3RhdGUocGxhbmUp Owo+ICsJc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICppbnRlbF9zdGF0ZSA9IHRvX2ludGVsX3Bs YW5lX3N0YXRlKHN0YXRlKTsKPiArCj4gKwlpbnRlbF9zdGF0ZS0+dmlzaWJsZSA9IGZhbHNlOwo+ ICsJaW50ZWxfcGxhbmUtPmNvbW1pdF9wbGFuZShwbGFuZSwgaW50ZWxfc3RhdGUpOwo+ICsKPiAr CWludGVsX3BsYW5lX2Rlc3Ryb3lfc3RhdGUocGxhbmUsIHN0YXRlKTsKCkkgd29uZGVyIHdoZXRo ZXIgbG9uZy10ZXJtIHdlIHNob3VsZCBkbyBhIGZ1bGwgYXRvbWljIGNvbW1pdCBpbmNsdWRpbmcg dGhlCmJlZ2luL2VuZCBkYW5jZSBoZXJlLiBCdXQgdGhpcyBpcyBtb3JlIHRoYW4gZ29vZCBlbm91 Z2ggZm9yIG5vdywgc28gbWVyZ2VkCnRvIGRpbnEuCgpUaGFua3MsIERhbmllbAoKPiArfQo+ICsK PiAgc3RhdGljIHZvaWQgaW50ZWxfZGlzYWJsZV9zcHJpdGVfcGxhbmVzKHN0cnVjdCBkcm1fY3J0 YyAqY3J0YykKPiAgewo+ICAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmRldjsKPiBA QCAtNDIxMCw4ICs0MjI4LDggQEAgc3RhdGljIHZvaWQgaW50ZWxfZGlzYWJsZV9zcHJpdGVfcGxh bmVzKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKPiAgCj4gIAlkcm1fZm9yX2VhY2hfbGVnYWN5X3Bs YW5lKHBsYW5lLCAmZGV2LT5tb2RlX2NvbmZpZy5wbGFuZV9saXN0KSB7Cj4gIAkJaW50ZWxfcGxh bmUgPSB0b19pbnRlbF9wbGFuZShwbGFuZSk7Cj4gLQkJaWYgKGludGVsX3BsYW5lLT5waXBlID09 IHBpcGUpCj4gLQkJCXBsYW5lLT5mdW5jcy0+ZGlzYWJsZV9wbGFuZShwbGFuZSk7Cj4gKwkJaWYg KHBsYW5lLT5mYiAmJiBpbnRlbF9wbGFuZS0+cGlwZSA9PSBwaXBlKQo+ICsJCQlkaXNhYmxlX3Bs YW5lX2ludGVybmFsKHBsYW5lKTsKPiAgCX0KPiAgfQo+ICAKPiAtLSAKPiAxLjguNS4xCj4gCj4g X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KPiBJbnRlbC1n ZnggbWFpbGluZyBsaXN0Cj4gSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwo+IGh0dHA6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngKCi0tIApE YW5pZWwgVmV0dGVyClNvZnR3YXJlIEVuZ2luZWVyLCBJbnRlbCBDb3Jwb3JhdGlvbgorNDEgKDAp IDc5IDM2NSA1NyA0OCAtIGh0dHA6Ly9ibG9nLmZmd2xsLmNoCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==