From mboxrd@z Thu Jan 1 00:00:00 1970 From: ville.syrjala@linux.intel.com Subject: [PATCH v2 4/9] drm/i915: Follow the same sequence when disabling planes Date: Tue, 4 Jun 2013 13:49:02 +0300 Message-ID: <1370342947-20757-5-git-send-email-ville.syrjala@linux.intel.com> References: <1370342947-20757-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: Received: from mga14.intel.com (mga14.intel.com [143.182.124.37]) by gabe.freedesktop.org (Postfix) with ESMTP id 07AB5E62DB for ; Tue, 4 Jun 2013 03:49:26 -0700 (PDT) In-Reply-To: <1370342947-20757-1-git-send-email-ville.syrjala@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCkZp cnN0IGRpc2FibGUgRkJDLCB0aGVuIElQUywgdGhlbiBkaXNhYmxlIGFsbCBwbGFuZXMsIGFuZCBm aW5hbGx5CmRpc2FibGUgdGhlIHBpcGUuCgp2MjogTWVudGlvbiBJUFMgaW4gdGhlIGNvbW1pdCBt ZXNzYWdlCgpTaWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGlu dXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8 IDEzICsrKysrKystLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA3IGluc2VydGlvbnMoKyksIDYgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh eS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IDA1NTEwZjUu LmRhYzJkYjcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXku YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTMzODMsMTMg KzMzODMsMTMgQEAgc3RhdGljIHZvaWQgaXJvbmxha2VfY3J0Y19kaXNhYmxlKHN0cnVjdCBkcm1f Y3J0YyAqY3J0YykKIAogCWludGVsX2NydGNfd2FpdF9mb3JfcGVuZGluZ19mbGlwcyhjcnRjKTsK IAlkcm1fdmJsYW5rX29mZihkZXYsIHBpcGUpOwotCWludGVsX2NydGNfdXBkYXRlX2N1cnNvcihj cnRjLCBmYWxzZSk7Ci0KLQlpbnRlbF9kaXNhYmxlX3BsYW5lKGRldl9wcml2LCBwbGFuZSwgcGlw ZSk7CiAKIAlpZiAoZGV2X3ByaXYtPmNmYl9wbGFuZSA9PSBwbGFuZSkKIAkJaW50ZWxfZGlzYWJs ZV9mYmMoZGV2KTsKIAorCWludGVsX2NydGNfdXBkYXRlX2N1cnNvcihjcnRjLCBmYWxzZSk7CisJ aW50ZWxfZGlzYWJsZV9wbGFuZShkZXZfcHJpdiwgcGxhbmUsIHBpcGUpOworCiAJaW50ZWxfc2V0 X3BjaF9maWZvX3VuZGVycnVuX3JlcG9ydGluZyhkZXYsIHBpcGUsIGZhbHNlKTsKIAlpbnRlbF9k aXNhYmxlX3BpcGUoZGV2X3ByaXYsIHBpcGUpOwogCkBAIC0zNDYyLDcgKzM0NjIsNiBAQCBzdGF0 aWMgdm9pZCBoYXN3ZWxsX2NydGNfZGlzYWJsZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAKIAlp bnRlbF9jcnRjX3dhaXRfZm9yX3BlbmRpbmdfZmxpcHMoY3J0Yyk7CiAJZHJtX3ZibGFua19vZmYo ZGV2LCBwaXBlKTsKLQlpbnRlbF9jcnRjX3VwZGF0ZV9jdXJzb3IoY3J0YywgZmFsc2UpOwogCiAJ LyogRkJDIG11c3QgYmUgZGlzYWJsZWQgYmVmb3JlIGRpc2FibGluZyB0aGUgcGxhbmUgb24gSFNX LiAqLwogCWlmIChkZXZfcHJpdi0+Y2ZiX3BsYW5lID09IHBsYW5lKQpAQCAtMzQ3MCw2ICszNDY5 LDcgQEAgc3RhdGljIHZvaWQgaGFzd2VsbF9jcnRjX2Rpc2FibGUoc3RydWN0IGRybV9jcnRjICpj cnRjKQogCiAJaHN3X2Rpc2FibGVfaXBzKGludGVsX2NydGMpOwogCisJaW50ZWxfY3J0Y191cGRh dGVfY3Vyc29yKGNydGMsIGZhbHNlKTsKIAlpbnRlbF9kaXNhYmxlX3BsYW5lKGRldl9wcml2LCBw bGFuZSwgcGlwZSk7CiAKIAlpZiAoaW50ZWxfY3J0Yy0+Y29uZmlnLmhhc19wY2hfZW5jb2RlcikK QEAgLTM3MDMsMTMgKzM3MDMsMTQgQEAgc3RhdGljIHZvaWQgaTl4eF9jcnRjX2Rpc2FibGUoc3Ry dWN0IGRybV9jcnRjICpjcnRjKQogCS8qIEdpdmUgdGhlIG92ZXJsYXkgc2NhbGVyIGEgY2hhbmNl IHRvIGRpc2FibGUgaWYgaXQncyBvbiB0aGlzIHBpcGUgKi8KIAlpbnRlbF9jcnRjX3dhaXRfZm9y X3BlbmRpbmdfZmxpcHMoY3J0Yyk7CiAJZHJtX3ZibGFua19vZmYoZGV2LCBwaXBlKTsKLQlpbnRl bF9jcnRjX2RwbXNfb3ZlcmxheShpbnRlbF9jcnRjLCBmYWxzZSk7Ci0JaW50ZWxfY3J0Y191cGRh dGVfY3Vyc29yKGNydGMsIGZhbHNlKTsKIAogCWlmIChkZXZfcHJpdi0+Y2ZiX3BsYW5lID09IHBs YW5lKQogCQlpbnRlbF9kaXNhYmxlX2ZiYyhkZXYpOwogCisJaW50ZWxfY3J0Y19kcG1zX292ZXJs YXkoaW50ZWxfY3J0YywgZmFsc2UpOworCWludGVsX2NydGNfdXBkYXRlX2N1cnNvcihjcnRjLCBm YWxzZSk7CiAJaW50ZWxfZGlzYWJsZV9wbGFuZShkZXZfcHJpdiwgcGxhbmUsIHBpcGUpOworCiAJ aW50ZWxfZGlzYWJsZV9waXBlKGRldl9wcml2LCBwaXBlKTsKIAogCWk5eHhfcGZpdF9kaXNhYmxl KGludGVsX2NydGMpOwotLSAKMS44LjEuNQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9pbnRlbC1nZngK