From: Matt Roper Subject: [PATCH] drm/i915: Don't clobber plane state on internal disables Date: Wed, 4 Mar 2015 10:49:04 -0800 Message-ID: <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 mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id E690289F35 for ; Wed, 4 Mar 2015 10:49:32 -0800 (PST) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org V2UgbmVlZCB0byBkaXNhYmxlIGFsbCBzcHJpdGUgcGxhbmVzIHdoZW4gZGlzYWJsaW5nIHRoZSBD UlRDLiAgV2UgaGFkCmJlZW4gdXNpbmcgdGhlIHRvcC1sZXZlbCBhdG9taWMgJ2Rpc2FibGUnIGVu dHJ5cG9pbnQgdG8gYWNjb21wbGlzaCB0aGlzLAp3aGljaCB3YXMgd3JvbmcuICBOb3Qgb25seSBj YW4gdGhpcyBsZWFkIHRvIHZhcmlvdXMgbG9ja2luZyBpc3N1ZXMsIGl0CmFsc28gbW9kaWZpZXMg dGhlIGFjdHVhbCBwbGFuZSBzdGF0ZSwgbWFraW5nIGl0IGltcG9zc2libGUgdG8gcmVzdG9yZQp0 aGUgcGxhbmUgcHJvcGVybHkgbGF0ZXIuICBGb3IgZXhhbXBsZSwgYSBEUE1TIG9mZiBmb2xsb3dl ZCBieSBhIERQTVMgb24Kd2lsbCByZXN1bHQgaW4gYW55IHNwcml0ZSBwbGFuZXMgaW4gdXNlIG5v dCBiZWluZyByZXN0b3JlZCBwcm9wZXJseS4KClRoZSBwcm9wZXIgc29sdXRpb24gaGVyZSBpcyB0 byBjYWxsIGRpcmVjdGx5IGludG8gb3VyICdjb21taXQgcGxhbmUnCmhvb2sgd2l0aCBhIGNvcHkg b2YgdGhlIHBsYW5lJ3MgY3VycmVudCBzdGF0ZSB0aGF0IGhhcyAndmlzaWJsZScgc2V0IHRvCmZh bHNlLiAgQ29tbWl0dGluZyB0aGlzIGR1bW15IHN0YXRlIHdpbGwgdHVybiBvZmYgdGhlIHBsYW5l LCBidXQgd2lsbApub3QgdG91Y2ggdGhlIGFjdHVhbCBwbGFuZS0+c3RhdGUgcG9pbnRlciwgYWxs b3dpbmcgdXMgdG8gcHJvcGVybHkKcmVzdG9yZSB0aGUgcGxhbmUgc3RhdGUgbGF0ZXIuCgpTaWdu ZWQtb2ZmLWJ5OiBNYXR0IFJvcGVyIDxtYXR0aGV3LmQucm9wZXJAaW50ZWwuY29tPgotLS0KVGhp cyB3YXMgYSBwcmV0dHkgYmlnIHByb2JsZW0gc28gSSBzdXNwZWN0IHRoaXMgaXMgcHJvYmFibHkg dGllZCB0byBzb21lIG9mIG91cgpleGlzdGluZyBidWd6aWxsYSdzIGJ1dCBJJ20gbm90IHN1cmUg ZXhhY3RseSB3aGljaCBvbmVzLiAgSXQgc2VlbXMgdGhhdCB3ZSBsYWNrCmFuIGktZy10IHRlc3Qg Zm9yIHBsYW5lIHN0YXR1cyBhY3Jvc3MgRFBNUywgc28gSSdsbCBzZW5kIGFsb25nIGEgbmV3IGkt Zy10IHRlc3QKZm9yIHRoYXQgc2hvcnRseS4KCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k aXNwbGF5LmMgfCAyMiArKysrKysrKysrKysrKysrKysrKy0tCiAxIGZpbGUgY2hhbmdlZCwgMjAg aW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNw bGF5LmMKaW5kZXggOTJjYjJmZi4uNjI3NzcwMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rp c3BsYXkuYwpAQCAtNDIwMSw2ICs0MjAxLDI0IEBAIHN0YXRpYyB2b2lkIGludGVsX2VuYWJsZV9z cHJpdGVfcGxhbmVzKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAl9CiB9CiAKKy8qCisgKiBEaXNh YmxlIGEgcGxhbmUgaW50ZXJuYWxseSB3aXRob3V0IGFjdHVhbGx5IG1vZGlmeWluZyB0aGUgcGxh bmUncyBzdGF0ZS4KKyAqIFRoaXMgd2lsbCBhbGxvdyB1cyB0byBlYXNpbHkgcmVzdG9yZSB0aGUg cGxhbmUgbGF0ZXIgYnkganVzdCByZXByb2dyYW1taW5nCisgKiBpdHMgc3RhdGUuCisgKi8KK3N0 YXRpYyB2b2lkIGRpc2FibGVfcGxhbmVfaW50ZXJuYWwoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUp Cit7CisJc3RydWN0IGludGVsX3BsYW5lICppbnRlbF9wbGFuZSA9IHRvX2ludGVsX3BsYW5lKHBs YW5lKTsKKwlzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpzdGF0ZSA9CisJCXBsYW5lLT5mdW5jcy0+ YXRvbWljX2R1cGxpY2F0ZV9zdGF0ZShwbGFuZSk7CisJc3RydWN0IGludGVsX3BsYW5lX3N0YXRl ICppbnRlbF9zdGF0ZSA9IHRvX2ludGVsX3BsYW5lX3N0YXRlKHN0YXRlKTsKKworCWludGVsX3N0 YXRlLT52aXNpYmxlID0gZmFsc2U7CisJaW50ZWxfcGxhbmUtPmNvbW1pdF9wbGFuZShwbGFuZSwg aW50ZWxfc3RhdGUpOworCisJaW50ZWxfcGxhbmVfZGVzdHJveV9zdGF0ZShwbGFuZSwgc3RhdGUp OworfQorCiBzdGF0aWMgdm9pZCBpbnRlbF9kaXNhYmxlX3Nwcml0ZV9wbGFuZXMoc3RydWN0IGRy bV9jcnRjICpjcnRjKQogewogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjLT5kZXY7CkBA IC00MjEwLDggKzQyMjgsOCBAQCBzdGF0aWMgdm9pZCBpbnRlbF9kaXNhYmxlX3Nwcml0ZV9wbGFu ZXMoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCiAJZHJtX2Zvcl9lYWNoX2xlZ2FjeV9wbGFuZShw bGFuZSwgJmRldi0+bW9kZV9jb25maWcucGxhbmVfbGlzdCkgewogCQlpbnRlbF9wbGFuZSA9IHRv X2ludGVsX3BsYW5lKHBsYW5lKTsKLQkJaWYgKGludGVsX3BsYW5lLT5waXBlID09IHBpcGUpCi0J CQlwbGFuZS0+ZnVuY3MtPmRpc2FibGVfcGxhbmUocGxhbmUpOworCQlpZiAocGxhbmUtPmZiICYm IGludGVsX3BsYW5lLT5waXBlID09IHBpcGUpCisJCQlkaXNhYmxlX3BsYW5lX2ludGVybmFsKHBs YW5lKTsKIAl9CiB9CiAKLS0gCjEuOC41LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3Rz LmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz dGluZm8vaW50ZWwtZ2Z4Cg==