From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paulo Zanoni Subject: [PATCH 3/4] drm/i915: Disable/enable planes as the first/last thing during modeset on HSW Date: Thu, 19 Sep 2013 17:00:37 -0300 Message-ID: <1379620838-1491-4-git-send-email-przanoni@gmail.com> References: <1379620838-1491-1-git-send-email-przanoni@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-vc0-f182.google.com (mail-vc0-f182.google.com [209.85.220.182]) by gabe.freedesktop.org (Postfix) with ESMTP id A37B5E7AC6 for ; Thu, 19 Sep 2013 13:01:01 -0700 (PDT) Received: by mail-vc0-f182.google.com with SMTP id hf12so7117632vcb.27 for ; Thu, 19 Sep 2013 13:01:01 -0700 (PDT) In-Reply-To: <1379620838-1491-1-git-send-email-przanoni@gmail.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 Cc: Paulo Zanoni List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClJl ZmFjdG9yIHRoZSBwbGFuZSBlbmFibGluZy9kaXNhYmxpbmcgaW50byBoZWxwZXIgZnVuY3Rpb25z IGFuZCBtb3ZlCnRoZSBjYWxscyB0byBoYXBwZW4gYXMgdGhlIGZpcnN0IHRoaW5nIGR1cmluZyAu Y3J0Y19kaXNhYmxlLCBhbmQgdGhlCmxhc3QgdGhpbmcgZHVyaW5nIC5jcnRjX2VuYWJsZS4KClRo b3NlIGFyZSB0aGUgdHdvIGNsZWFyIHBvaW50cyB3aGVyZSB3ZSBhcmUgc3VyZSB0aGF0IHRoZSBw aXBlIGlzCmFjdHVhbGx5IHJ1bm5pbmcgcmVnYXJkbGVzcyBvZiB0aGUgZW5jb2RlciB0eXBlIG9y IGhhcmR3YXJlCmdlbmVyYXRpb24uCgp2MjogTWFkZSBieSBQYXVsbzoKICBSZW1vdmUgdGhlIGNv ZGUgdG91Y2hpbmcgZXZlcnl0aGluZyBidXQgdGhlIEhhc3dlbGwgZnVuY3Rpb25zLiBXZQogIG5l ZWQgdGhpcyBjaGFuZ2Ugb24gSGFzd2VsbCByaWdodCBub3cgc2luY2UgaXQgZml4ZXMgYSBGSUZP IHVuZGVycnVuCiAgdGhhdCB3ZSBnZXQgb24gcGlwZSBBIHdoaWxlIHdlIGVuYWJsZSBwaXBlIEIg KHNlZSB0aGUgd29ya2Fyb3VuZAogIG5vdGVzIG9uIHRoZSBIYXN3ZWxsIG1vZGUgc2V0IHNlcXVl bmNlIGRvY3VtZW50YXRpb24pLiBXZSBjYW4gYnJpbmcKICBiYWNrIHRoZSBjb2RlIHRvIGdlbnMg Mi03IGxhdGVyLCBvbmNlIHRoZXkncmUgdGVzdGVkLgoKU2lnbmVkLW9mZi1ieTogVmlsbGUgU3ly asOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogUGF1 bG8gWmFub25pIDxwYXVsby5yLnphbm9uaUBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgNjkgKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0t LS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNDUgaW5zZXJ0aW9ucygrKSwgMjQgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IGQ1NWQwNDEuLjhjMzAwMGQg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTMzOTEsNiArMzM5MSw0NyBA QCBzdGF0aWMgdm9pZCBoc3dfZGlzYWJsZV9pcHMoc3RydWN0IGludGVsX2NydGMgKmNydGMpCiAJ aW50ZWxfd2FpdF9mb3JfdmJsYW5rKGRldiwgY3J0Yy0+cGlwZSk7CiB9CiAKK3N0YXRpYyB2b2lk IGhhc3dlbGxfY3J0Y19lbmFibGVfcGxhbmVzKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKK3sKKwlz dHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+ZGV2OworCXN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CisJc3RydWN0IGludGVsX2NydGMgKmlu dGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOworCWludCBwaXBlID0gaW50ZWxfY3J0Yy0+ cGlwZTsKKwlpbnQgcGxhbmUgPSBpbnRlbF9jcnRjLT5wbGFuZTsKKworCWludGVsX2VuYWJsZV9w bGFuZShkZXZfcHJpdiwgcGxhbmUsIHBpcGUpOworCWludGVsX2VuYWJsZV9wbGFuZXMoY3J0Yyk7 CisJaW50ZWxfY3J0Y191cGRhdGVfY3Vyc29yKGNydGMsIHRydWUpOworCisJaHN3X2VuYWJsZV9p cHMoaW50ZWxfY3J0Yyk7CisKKwltdXRleF9sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7CisJaW50 ZWxfdXBkYXRlX2ZiYyhkZXYpOworCW11dGV4X3VubG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwor fQorCitzdGF0aWMgdm9pZCBoYXN3ZWxsX2NydGNfZGlzYWJsZV9wbGFuZXMoc3RydWN0IGRybV9j cnRjICpjcnRjKQoreworCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjLT5kZXY7CisJc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKKwlzdHJ1 Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7CisJaW50IHBp cGUgPSBpbnRlbF9jcnRjLT5waXBlOworCWludCBwbGFuZSA9IGludGVsX2NydGMtPnBsYW5lOwor CisJaW50ZWxfY3J0Y193YWl0X2Zvcl9wZW5kaW5nX2ZsaXBzKGNydGMpOworCWRybV92Ymxhbmtf b2ZmKGRldiwgcGlwZSk7CisKKwkvKiBGQkMgbXVzdCBiZSBkaXNhYmxlZCBiZWZvcmUgZGlzYWJs aW5nIHRoZSBwbGFuZSBvbiBIU1cuICovCisJaWYgKGRldl9wcml2LT5mYmMucGxhbmUgPT0gcGxh bmUpCisJCWludGVsX2Rpc2FibGVfZmJjKGRldik7CisKKwloc3dfZGlzYWJsZV9pcHMoaW50ZWxf Y3J0Yyk7CisKKwlpbnRlbF9jcnRjX3VwZGF0ZV9jdXJzb3IoY3J0YywgZmFsc2UpOworCWludGVs X2Rpc2FibGVfcGxhbmVzKGNydGMpOworCWludGVsX2Rpc2FibGVfcGxhbmUoZGV2X3ByaXYsIHBs YW5lLCBwaXBlKTsKK30KKwogc3RhdGljIHZvaWQgaGFzd2VsbF9jcnRjX2VuYWJsZShzdHJ1Y3Qg ZHJtX2NydGMgKmNydGMpCiB7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmRldjsK QEAgLTMzOTgsNyArMzQzOSw2IEBAIHN0YXRpYyB2b2lkIGhhc3dlbGxfY3J0Y19lbmFibGUoc3Ry dWN0IGRybV9jcnRjICpjcnRjKQogCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9f aW50ZWxfY3J0YyhjcnRjKTsKIAlzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlcjsKIAlpbnQg cGlwZSA9IGludGVsX2NydGMtPnBpcGU7Ci0JaW50IHBsYW5lID0gaW50ZWxfY3J0Yy0+cGxhbmU7 CiAKIAlXQVJOX09OKCFjcnRjLT5lbmFibGVkKTsKIApAQCAtMzQzNCwyNCArMzQ3NCwxNyBAQCBz dGF0aWMgdm9pZCBoYXN3ZWxsX2NydGNfZW5hYmxlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAlp bnRlbF91cGRhdGVfd2F0ZXJtYXJrcyhjcnRjKTsKIAlpbnRlbF9lbmFibGVfcGlwZShkZXZfcHJp diwgcGlwZSwKIAkJCSAgaW50ZWxfY3J0Yy0+Y29uZmlnLmhhc19wY2hfZW5jb2RlciwgZmFsc2Up OwotCWludGVsX2VuYWJsZV9wbGFuZShkZXZfcHJpdiwgcGxhbmUsIHBpcGUpOwotCWludGVsX2Vu YWJsZV9wbGFuZXMoY3J0Yyk7Ci0JaW50ZWxfY3J0Y191cGRhdGVfY3Vyc29yKGNydGMsIHRydWUp OwotCi0JaHN3X2VuYWJsZV9pcHMoaW50ZWxfY3J0Yyk7CiAKIAlpZiAoaW50ZWxfY3J0Yy0+Y29u ZmlnLmhhc19wY2hfZW5jb2RlcikKIAkJbHB0X3BjaF9lbmFibGUoY3J0Yyk7CiAKLQltdXRleF9s b2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7Ci0JaW50ZWxfdXBkYXRlX2ZiYyhkZXYpOwotCW11dGV4 X3VubG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwotCiAJZm9yX2VhY2hfZW5jb2Rlcl9vbl9jcnRj KGRldiwgY3J0YywgZW5jb2RlcikgewogCQllbmNvZGVyLT5lbmFibGUoZW5jb2Rlcik7CiAJCWlu dGVsX29wcmVnaW9uX25vdGlmeV9lbmNvZGVyKGVuY29kZXIsIHRydWUpOwogCX0KIAorCWhhc3dl bGxfY3J0Y19lbmFibGVfcGxhbmVzKGNydGMpOworCiAJLyoKIAkgKiBUaGVyZSBzZWVtcyB0byBi ZSBhIHJhY2UgaW4gUENIIHBsYXRmb3JtIGh3IChhdCBsZWFzdCBvbiBzb21lCiAJICogb3V0cHV0 cykgd2hlcmUgYW4gZW5hYmxlZCBwaXBlIHN0aWxsIGNvbXBsZXRlcyBhbnkgcGFnZWZsaXAgcmln aHQKQEAgLTM1NTgsMzAgKzM1OTEsMTggQEAgc3RhdGljIHZvaWQgaGFzd2VsbF9jcnRjX2Rpc2Fi bGUoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRj ID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKIAlzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlcjsK IAlpbnQgcGlwZSA9IGludGVsX2NydGMtPnBpcGU7Ci0JaW50IHBsYW5lID0gaW50ZWxfY3J0Yy0+ cGxhbmU7CiAJZW51bSB0cmFuc2NvZGVyIGNwdV90cmFuc2NvZGVyID0gaW50ZWxfY3J0Yy0+Y29u ZmlnLmNwdV90cmFuc2NvZGVyOwogCiAJaWYgKCFpbnRlbF9jcnRjLT5hY3RpdmUpCiAJCXJldHVy bjsKIAorCWhhc3dlbGxfY3J0Y19kaXNhYmxlX3BsYW5lcyhjcnRjKTsKKwogCWZvcl9lYWNoX2Vu Y29kZXJfb25fY3J0YyhkZXYsIGNydGMsIGVuY29kZXIpIHsKIAkJaW50ZWxfb3ByZWdpb25fbm90 aWZ5X2VuY29kZXIoZW5jb2RlciwgZmFsc2UpOwogCQllbmNvZGVyLT5kaXNhYmxlKGVuY29kZXIp OwogCX0KIAotCWludGVsX2NydGNfd2FpdF9mb3JfcGVuZGluZ19mbGlwcyhjcnRjKTsKLQlkcm1f dmJsYW5rX29mZihkZXYsIHBpcGUpOwotCi0JLyogRkJDIG11c3QgYmUgZGlzYWJsZWQgYmVmb3Jl IGRpc2FibGluZyB0aGUgcGxhbmUgb24gSFNXLiAqLwotCWlmIChkZXZfcHJpdi0+ZmJjLnBsYW5l ID09IHBsYW5lKQotCQlpbnRlbF9kaXNhYmxlX2ZiYyhkZXYpOwotCi0JaHN3X2Rpc2FibGVfaXBz KGludGVsX2NydGMpOwotCi0JaW50ZWxfY3J0Y191cGRhdGVfY3Vyc29yKGNydGMsIGZhbHNlKTsK LQlpbnRlbF9kaXNhYmxlX3BsYW5lcyhjcnRjKTsKLQlpbnRlbF9kaXNhYmxlX3BsYW5lKGRldl9w cml2LCBwbGFuZSwgcGlwZSk7Ci0KIAlpZiAoaW50ZWxfY3J0Yy0+Y29uZmlnLmhhc19wY2hfZW5j b2RlcikKIAkJaW50ZWxfc2V0X3BjaF9maWZvX3VuZGVycnVuX3JlcG9ydGluZyhkZXYsIFRSQU5T Q09ERVJfQSwgZmFsc2UpOwogCWludGVsX2Rpc2FibGVfcGlwZShkZXZfcHJpdiwgcGlwZSk7Ci0t IAoxLjguMy4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=