From mboxrd@z Thu Jan 1 00:00:00 1970 From: ville.syrjala@linux.intel.com Subject: [PATCH v2 6/9] drm/i915: Disable/restore all sprite planes around modeset Date: Tue, 4 Jun 2013 13:49:04 +0300 Message-ID: <1370342947-20757-7-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 mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id D61C5E62D9 for ; Tue, 4 Jun 2013 03:49:32 -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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCkRp c2FibGUvcmVzdG9yZSBzcHJpdGUgcGxhbmVzIGFyb3VuZCBtb2RlLXNldCBqdXN0IGxpa2Ugd2Ug ZG8gZm9yIHRoZQpwcmltYXJ5IGFuZCBjdXJzb3IgcGxhbmVzLiBOb3cgdGhhdCB3ZSBoYXZlIHdv cmtpbmcgc3ByaXRlIGNsaXBwaW5nLAp0aGlzIGFjdHVhbGx5IHdvcmtzIHF1aXRlIGRlY2VudGx5 LgoKUHJldmlvc3VseSB3ZSBkaWRuJ3QgZXZlbiBib3RoZXIgdG8gZGlzYWJsZSBzcHJpdGVzIHdo ZW4gY2hhbmdpbmcgbW9kZSwKd2hpY2ggY291bGQgbGVhZCB0byBhIGNvcnJ1cHRlZCBzcHJpdGUg YXBwZWFyaW5nIG9uIHRoZSBzY3JlZW4gYWZ0ZXIgYQptb2Rlc2V0IChhdCBsZWFzdCBvbiBteSBJ VkIpLiBOb3Qgc3VyZSBpZiBhbGwgaGFyZHdhcmUgZ2VuZXJhdGlvbnMgd291bGQKYmUgc28gZm9y Z2l2aW5nIHdoZW4gZW5hYmxlZCBzcHJpdGVzIGVuZCB1cCBvdXRzaWRlIHRoZSBwaXBlIGRpbWVu c29ucy4KCnYyOiBEaXNhYmxlIHJhdGhlciB0aGFuIGVuYWJsZSBzcHJpdGVzIGluIGlyb25sYWtl X2NydGNfZGlzYWJsZSgpCgpTaWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5 cmphbGFAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rp c3BsYXkuYyB8IDI5ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kcnYuaCAgICAgfCAgMSArCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9zcHJpdGUuYyAgfCAgOCArKysrKysrKwogMyBmaWxlcyBjaGFuZ2VkLCAzOCBpbnNlcnRpb25z KCspCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IDYxYmVlMTIuLmU5Mjhh NTQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTMxNjEsNiArMzE2MSwy OCBAQCBzdGF0aWMgdm9pZCBpcm9ubGFrZV9wZml0X2VuYWJsZShzdHJ1Y3QgaW50ZWxfY3J0YyAq Y3J0YykKIAl9CiB9CiAKK3N0YXRpYyB2b2lkIGludGVsX2VuYWJsZV9wbGFuZXMoc3RydWN0IGRy bV9jcnRjICpjcnRjKQoreworCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjLT5kZXY7CisJ ZW51bSBwaXBlIHBpcGUgPSB0b19pbnRlbF9jcnRjKGNydGMpLT5waXBlOworCXN0cnVjdCBpbnRl bF9wbGFuZSAqaW50ZWxfcGxhbmU7CisKKwlsaXN0X2Zvcl9lYWNoX2VudHJ5KGludGVsX3BsYW5l LCAmZGV2LT5tb2RlX2NvbmZpZy5wbGFuZV9saXN0LCBiYXNlLmhlYWQpCisJCWlmIChpbnRlbF9w bGFuZS0+cGlwZSA9PSBwaXBlKQorCQkJaW50ZWxfcGxhbmVfcmVzdG9yZSgmaW50ZWxfcGxhbmUt PmJhc2UpOworfQorCitzdGF0aWMgdm9pZCBpbnRlbF9kaXNhYmxlX3BsYW5lcyhzdHJ1Y3QgZHJt X2NydGMgKmNydGMpCit7CisJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmRldjsKKwll bnVtIHBpcGUgcGlwZSA9IHRvX2ludGVsX2NydGMoY3J0YyktPnBpcGU7CisJc3RydWN0IGludGVs X3BsYW5lICppbnRlbF9wbGFuZTsKKworCWxpc3RfZm9yX2VhY2hfZW50cnkoaW50ZWxfcGxhbmUs ICZkZXYtPm1vZGVfY29uZmlnLnBsYW5lX2xpc3QsIGJhc2UuaGVhZCkKKwkJaWYgKGludGVsX3Bs YW5lLT5waXBlID09IHBpcGUpCisJCQlpbnRlbF9wbGFuZV9kaXNhYmxlKCZpbnRlbF9wbGFuZS0+ YmFzZSk7Cit9CisKIHN0YXRpYyB2b2lkIGlyb25sYWtlX2NydGNfZW5hYmxlKHN0cnVjdCBkcm1f Y3J0YyAqY3J0YykKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+ZGV2OwpAQCAt MzIxNiw2ICszMjM4LDcgQEAgc3RhdGljIHZvaWQgaXJvbmxha2VfY3J0Y19lbmFibGUoc3RydWN0 IGRybV9jcnRjICpjcnRjKQogCWludGVsX2VuYWJsZV9waXBlKGRldl9wcml2LCBwaXBlLAogCQkJ ICBpbnRlbF9jcnRjLT5jb25maWcuaGFzX3BjaF9lbmNvZGVyKTsKIAlpbnRlbF9lbmFibGVfcGxh bmUoZGV2X3ByaXYsIHBsYW5lLCBwaXBlKTsKKwlpbnRlbF9lbmFibGVfcGxhbmVzKGNydGMpOwog CWludGVsX2NydGNfdXBkYXRlX2N1cnNvcihjcnRjLCB0cnVlKTsKIAogCWlmIChpbnRlbF9jcnRj LT5jb25maWcuaGFzX3BjaF9lbmNvZGVyKQpAQCAtMzMyNCw2ICszMzQ3LDcgQEAgc3RhdGljIHZv aWQgaGFzd2VsbF9jcnRjX2VuYWJsZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJaW50ZWxfZW5h YmxlX3BpcGUoZGV2X3ByaXYsIHBpcGUsCiAJCQkgIGludGVsX2NydGMtPmNvbmZpZy5oYXNfcGNo X2VuY29kZXIpOwogCWludGVsX2VuYWJsZV9wbGFuZShkZXZfcHJpdiwgcGxhbmUsIHBpcGUpOwor CWludGVsX2VuYWJsZV9wbGFuZXMoY3J0Yyk7CiAJaW50ZWxfY3J0Y191cGRhdGVfY3Vyc29yKGNy dGMsIHRydWUpOwogCiAJaHN3X2VuYWJsZV9pcHMoaW50ZWxfY3J0Yyk7CkBAIC0zMzg4LDYgKzM0 MTIsNyBAQCBzdGF0aWMgdm9pZCBpcm9ubGFrZV9jcnRjX2Rpc2FibGUoc3RydWN0IGRybV9jcnRj ICpjcnRjKQogCQlpbnRlbF9kaXNhYmxlX2ZiYyhkZXYpOwogCiAJaW50ZWxfY3J0Y191cGRhdGVf Y3Vyc29yKGNydGMsIGZhbHNlKTsKKwlpbnRlbF9kaXNhYmxlX3BsYW5lcyhjcnRjKTsKIAlpbnRl bF9kaXNhYmxlX3BsYW5lKGRldl9wcml2LCBwbGFuZSwgcGlwZSk7CiAKIAlpbnRlbF9zZXRfcGNo X2ZpZm9fdW5kZXJydW5fcmVwb3J0aW5nKGRldiwgcGlwZSwgZmFsc2UpOwpAQCAtMzQ3MCw2ICsz NDk1LDcgQEAgc3RhdGljIHZvaWQgaGFzd2VsbF9jcnRjX2Rpc2FibGUoc3RydWN0IGRybV9jcnRj ICpjcnRjKQogCWhzd19kaXNhYmxlX2lwcyhpbnRlbF9jcnRjKTsKIAogCWludGVsX2NydGNfdXBk YXRlX2N1cnNvcihjcnRjLCBmYWxzZSk7CisJaW50ZWxfZGlzYWJsZV9wbGFuZXMoY3J0Yyk7CiAJ aW50ZWxfZGlzYWJsZV9wbGFuZShkZXZfcHJpdiwgcGxhbmUsIHBpcGUpOwogCiAJaWYgKGludGVs X2NydGMtPmNvbmZpZy5oYXNfcGNoX2VuY29kZXIpCkBAIC0zNjE3LDYgKzM2NDMsNyBAQCBzdGF0 aWMgdm9pZCB2YWxsZXl2aWV3X2NydGNfZW5hYmxlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAog CWludGVsX2VuYWJsZV9waXBlKGRldl9wcml2LCBwaXBlLCBmYWxzZSk7CiAJaW50ZWxfZW5hYmxl X3BsYW5lKGRldl9wcml2LCBwbGFuZSwgcGlwZSk7CisJaW50ZWxfZW5hYmxlX3BsYW5lcyhjcnRj KTsKIAlpbnRlbF9jcnRjX3VwZGF0ZV9jdXJzb3IoY3J0YywgdHJ1ZSk7CiAKIAlpbnRlbF91cGRh dGVfZmJjKGRldik7CkBAIC0zNjU0LDYgKzM2ODEsNyBAQCBzdGF0aWMgdm9pZCBpOXh4X2NydGNf ZW5hYmxlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAogCWludGVsX2VuYWJsZV9waXBlKGRldl9w cml2LCBwaXBlLCBmYWxzZSk7CiAJaW50ZWxfZW5hYmxlX3BsYW5lKGRldl9wcml2LCBwbGFuZSwg cGlwZSk7CisJaW50ZWxfZW5hYmxlX3BsYW5lcyhjcnRjKTsKIAlpbnRlbF9jcnRjX3VwZGF0ZV9j dXJzb3IoY3J0YywgdHJ1ZSk7CiAJaWYgKElTX0c0WChkZXYpKQogCQlnNHhfZml4dXBfcGxhbmUo ZGV2X3ByaXYsIHBpcGUpOwpAQCAtMzcwNiw2ICszNzM0LDcgQEAgc3RhdGljIHZvaWQgaTl4eF9j cnRjX2Rpc2FibGUoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCiAJaW50ZWxfY3J0Y19kcG1zX292 ZXJsYXkoaW50ZWxfY3J0YywgZmFsc2UpOwogCWludGVsX2NydGNfdXBkYXRlX2N1cnNvcihjcnRj LCBmYWxzZSk7CisJaW50ZWxfZGlzYWJsZV9wbGFuZXMoY3J0Yyk7CiAJaW50ZWxfZGlzYWJsZV9w bGFuZShkZXZfcHJpdiwgcGxhbmUsIHBpcGUpOwogCiAJaW50ZWxfZGlzYWJsZV9waXBlKGRldl9w cml2LCBwaXBlKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5o IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXggZmRmNjMwMy4uMDM1NTMx NSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAgLTYzMyw2ICs2MzMsNyBAQCBleHRlcm4g dm9pZCBpbnRlbF9jb25uZWN0b3JfZHBtcyhzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqLCBpbnQgbW9k ZSk7CiBleHRlcm4gYm9vbCBpbnRlbF9jb25uZWN0b3JfZ2V0X2h3X3N0YXRlKHN0cnVjdCBpbnRl bF9jb25uZWN0b3IgKmNvbm5lY3Rvcik7CiBleHRlcm4gdm9pZCBpbnRlbF9tb2Rlc2V0X2NoZWNr X3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogZXh0ZXJuIHZvaWQgaW50ZWxfcGxhbmVf cmVzdG9yZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSk7CitleHRlcm4gdm9pZCBpbnRlbF9wbGFu ZV9kaXNhYmxlKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lKTsKIAogCiBzdGF0aWMgaW5saW5lIHN0 cnVjdCBpbnRlbF9lbmNvZGVyICppbnRlbF9hdHRhY2hlZF9lbmNvZGVyKHN0cnVjdCBkcm1fY29u bmVjdG9yICpjb25uZWN0b3IpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9zcHJpdGUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCmluZGV4IDA0 ZDM4ZDQuLjFmYTU2MTIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nw cml0ZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCkBAIC05NTcs NiArOTU3LDE0IEBAIHZvaWQgaW50ZWxfcGxhbmVfcmVzdG9yZShzdHJ1Y3QgZHJtX3BsYW5lICpw bGFuZSkKIAkJCSAgIGludGVsX3BsYW5lLT5zcmNfdywgaW50ZWxfcGxhbmUtPnNyY19oKTsKIH0K IAordm9pZCBpbnRlbF9wbGFuZV9kaXNhYmxlKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lKQorewor CWlmICghcGxhbmUtPmNydGMgfHwgIXBsYW5lLT5mYikKKwkJcmV0dXJuOworCisJaW50ZWxfZGlz YWJsZV9wbGFuZShwbGFuZSk7Cit9CisKIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX3BsYW5lX2Z1 bmNzIGludGVsX3BsYW5lX2Z1bmNzID0gewogCS51cGRhdGVfcGxhbmUgPSBpbnRlbF91cGRhdGVf cGxhbmUsCiAJLmRpc2FibGVfcGxhbmUgPSBpbnRlbF9kaXNhYmxlX3BsYW5lLAotLSAKMS44LjEu NQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwt Z2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK