From: Matt Roper Subject: [PATCH 3/4] drm/i915: Switch to full atomic helpers for plane updates/disable, take two Date: Wed, 8 Apr 2015 18:56:53 -0700 Message-ID: <1428544614-28082-4-git-send-email-matthew.d.roper@intel.com> References: <1428544614-28082-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 mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 9BC4E6E2AB for ; Wed, 8 Apr 2015 18:57:22 -0700 (PDT) In-Reply-To: <1428544614-28082-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: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org U3dpdGNoIGZyb20gb3VyIHBsYW5lIHVwZGF0ZS9kaXNhYmxlIGVudHJ5cG9pbnRzIHRvIHVzZSB0 aGUgZnVsbCBhdG9taWMKaGVscGVycyAod2hpY2ggZ2VuZXJhdGUgYSB0b3AtbGV2ZWwgYXRvbWlj IHRyYW5zYWN0aW9uKSByYXRoZXIgdGhhbiB0aGUKdHJhbnNpdGlvbmFsIGhlbHBlcnMgKHdoaWNo IG9ubHkgY3JlYXRlL21hbmlwdWxhdGUgb3JwaGFuZWQgcGxhbmUgc3RhdGVzCmluZGVwZW5kZW50 IG9mIGEgdG9wLWxldmVsIHRyYW5zYWN0aW9uKS4gIFZhcmlvdXMgdXBjb21pbmcgd29yayAoU0tM CnNjYWxlcnMsIGF0b21pYyB3YXRlcm1hcmtzLCBldGMuKSByZXF1aXJlcyBhIGZ1bGwgYXRvbWlj IHRyYW5zYWN0aW9uIHRvCmJlaGF2ZSBwcm9wZXJseS9jbGVhbmx5LgoKTGFzdCB0aW1lIHdlIHRy aWVkIHRoaXMsIHdlIGhhZCB0byBiYWNrIG91dCB0aGUgY2hhbmdlIGJlY2F1c2Ugd2Ugc3RpbGwK Y2FsbCB0aGUgZHJtX3BsYW5lIHZmdW5jcyBkaXJlY3RseSBmcm9tIHdpdGhpbiBvdXIgbGVnYWN5 IG1vZGVzZXR0aW5nCmNvZGUuICBUaGlzIHBvdGVudGlhbGx5IHJlc3VsdHMgaW4gbmVzdGVkIGF0 b21pYyB0cmFuc2FjdGlvbnMsIGxvY2tpbmcKY29sbGlzaW9ucywgYW5kIG90aGVyIGZhaWx1cmVz LiAgVG8gYXZvaWQgdGhhdCBwcm9ibGVtIGFnYWluLCB3ZQpzaWRlc3RlcCB0aGUgaXNzdWUgYnkg Y2FsbGluZyB0aGUgdHJhbnNpdGlvbmFsIGhlbHBlcnMgZGlyZWN0bHkgKHJhdGhlcgp0aGFuIHRo cm91Z2ggYSB2ZnVuYykgd2hlbiB3ZSdyZSBuZXN0ZWQgaW5zaWRlIG9mIG90aGVyIGxlZ2FjeQpt b2Rlc2V0dGluZyBjb2RlLiAgSG93ZXZlciB0aGlzIGRvZXMgYWxsb3cgbGVnYWN5IFNldFBsYW5l KCkgaW9jdGwncyB0bwpwcm9jZXNzIGFuIGVudGlyZSBkcm1fYXRvbWljX3N0YXRlIHRyYW5zYWN0 aW9uLCB3aGljaCBpcyBpbXBvcnRhbnQgZm9yCnVwY29taW5nIHBhdGNoZXMuCgpDYzogQ2hhbmRy YSBLb25kdXJ1IDxjaGFuZHJhLmtvbmR1cnVAaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBNYXR0 IFJvcGVyIDxtYXR0aGV3LmQucm9wZXJAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rpc3BsYXkuYyB8IDI0ICsrKysrKysrKysrKy0tLS0tLS0tLS0tLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMgIHwgMTAgKysrKystLS0tLQogMiBmaWxlcyBj aGFuZ2VkLCAxNyBpbnNlcnRpb25zKCspLCAxNyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggMWNmOTFhZC4uM2E3NDkyMyAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtNTU3Niw3ICs1NTc2LDcgQEAgc3RhdGljIHZvaWQgaW50 ZWxfY3J0Y19kaXNhYmxlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAlkZXZfcHJpdi0+ZGlzcGxh eS5jcnRjX2Rpc2FibGUoY3J0Yyk7CiAJZGV2X3ByaXYtPmRpc3BsYXkub2ZmKGNydGMpOwogCi0J Y3J0Yy0+cHJpbWFyeS0+ZnVuY3MtPmRpc2FibGVfcGxhbmUoY3J0Yy0+cHJpbWFyeSk7CisJZHJt X3BsYW5lX2hlbHBlcl9kaXNhYmxlKGNydGMtPnByaW1hcnkpOwogCiAJLyogVXBkYXRlIGNvbXB1 dGVkIHN0YXRlLiAqLwogCWxpc3RfZm9yX2VhY2hfZW50cnkoY29ubmVjdG9yLCAmZGV2LT5tb2Rl X2NvbmZpZy5jb25uZWN0b3JfbGlzdCwgaGVhZCkgewpAQCAtMTE3MzEsMTEgKzExNzMxLDExIEBA IHN0YXRpYyBpbnQgX19pbnRlbF9zZXRfbW9kZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJCWlu dCB2ZGlzcGxheSwgaGRpc3BsYXk7CiAKIAkJZHJtX2NydGNfZ2V0X2h2X3RpbWluZyhtb2RlLCAm aGRpc3BsYXksICZ2ZGlzcGxheSk7Ci0JCXJldCA9IHByaW1hcnktPmZ1bmNzLT51cGRhdGVfcGxh bmUocHJpbWFyeSwgJmludGVsX2NydGMtPmJhc2UsCi0JCQkJCQkgICBmYiwgMCwgMCwKLQkJCQkJ CSAgIGhkaXNwbGF5LCB2ZGlzcGxheSwKLQkJCQkJCSAgIHggPDwgMTYsIHkgPDwgMTYsCi0JCQkJ CQkgICBoZGlzcGxheSA8PCAxNiwgdmRpc3BsYXkgPDwgMTYpOworCQlyZXQgPSBkcm1fcGxhbmVf aGVscGVyX3VwZGF0ZShwcmltYXJ5LCAmaW50ZWxfY3J0Yy0+YmFzZSwKKwkJCQkJICAgICAgZmIs IDAsIDAsCisJCQkJCSAgICAgIGhkaXNwbGF5LCB2ZGlzcGxheSwKKwkJCQkJICAgICAgeCA8PCAx NiwgeSA8PCAxNiwKKwkJCQkJICAgICAgaGRpc3BsYXkgPDwgMTYsIHZkaXNwbGF5IDw8IDE2KTsK IAl9CiAKIAkvKiBOb3cgZW5hYmxlIHRoZSBjbG9ja3MsIHBsYW5lLCBwaXBlLCBhbmQgY29ubmVj dG9ycyB0aGF0IHdlIHNldCB1cC4gKi8KQEAgLTEyMjg2LDEwICsxMjI4NiwxMCBAQCBzdGF0aWMg aW50IGludGVsX2NydGNfc2V0X2NvbmZpZyhzdHJ1Y3QgZHJtX21vZGVfc2V0ICpzZXQpCiAJCWlu dCB2ZGlzcGxheSwgaGRpc3BsYXk7CiAKIAkJZHJtX2NydGNfZ2V0X2h2X3RpbWluZyhzZXQtPm1v ZGUsICZoZGlzcGxheSwgJnZkaXNwbGF5KTsKLQkJcmV0ID0gcHJpbWFyeS0+ZnVuY3MtPnVwZGF0 ZV9wbGFuZShwcmltYXJ5LCBzZXQtPmNydGMsIHNldC0+ZmIsCi0JCQkJCQkgICAwLCAwLCBoZGlz cGxheSwgdmRpc3BsYXksCi0JCQkJCQkgICBzZXQtPnggPDwgMTYsIHNldC0+eSA8PCAxNiwKLQkJ CQkJCSAgIGhkaXNwbGF5IDw8IDE2LCB2ZGlzcGxheSA8PCAxNik7CisJCXJldCA9IGRybV9wbGFu ZV9oZWxwZXJfdXBkYXRlKHByaW1hcnksIHNldC0+Y3J0Yywgc2V0LT5mYiwKKwkJCQkJICAgICAg MCwgMCwgaGRpc3BsYXksIHZkaXNwbGF5LAorCQkJCQkgICAgICBzZXQtPnggPDwgMTYsIHNldC0+ eSA8PCAxNiwKKwkJCQkJICAgICAgaGRpc3BsYXkgPDwgMTYsIHZkaXNwbGF5IDw8IDE2KTsKIAog CQkvKgogCQkgKiBXZSBuZWVkIHRvIG1ha2Ugc3VyZSB0aGUgcHJpbWFyeSBwbGFuZSBpcyByZS1l bmFibGVkIGlmIGl0CkBAIC0xMjgzMCw4ICsxMjgzMCw4IEBAIHZvaWQgaW50ZWxfcGxhbmVfZGVz dHJveShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSkKIH0KIAogY29uc3Qgc3RydWN0IGRybV9wbGFu ZV9mdW5jcyBpbnRlbF9wbGFuZV9mdW5jcyA9IHsKLQkudXBkYXRlX3BsYW5lID0gZHJtX3BsYW5l X2hlbHBlcl91cGRhdGUsCi0JLmRpc2FibGVfcGxhbmUgPSBkcm1fcGxhbmVfaGVscGVyX2Rpc2Fi bGUsCisJLnVwZGF0ZV9wbGFuZSA9IGRybV9hdG9taWNfaGVscGVyX3VwZGF0ZV9wbGFuZSwKKwku ZGlzYWJsZV9wbGFuZSA9IGRybV9hdG9taWNfaGVscGVyX2Rpc2FibGVfcGxhbmUsCiAJLmRlc3Ry b3kgPSBpbnRlbF9wbGFuZV9kZXN0cm95LAogCS5zZXRfcHJvcGVydHkgPSBkcm1fYXRvbWljX2hl bHBlcl9wbGFuZV9zZXRfcHJvcGVydHksCiAJLmF0b21pY19nZXRfcHJvcGVydHkgPSBpbnRlbF9w bGFuZV9hdG9taWNfZ2V0X3Byb3BlcnR5LApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfc3ByaXRlLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwpp bmRleCA0OTJhYmNkLi5mNDA5NGQyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9zcHJpdGUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwpA QCAtMTE0OSwxMSArMTE0OSwxMSBAQCBpbnQgaW50ZWxfcGxhbmVfcmVzdG9yZShzdHJ1Y3QgZHJt X3BsYW5lICpwbGFuZSkKIAlpZiAoIXBsYW5lLT5jcnRjIHx8ICFwbGFuZS0+c3RhdGUtPmZiKQog CQlyZXR1cm4gMDsKIAotCXJldHVybiBwbGFuZS0+ZnVuY3MtPnVwZGF0ZV9wbGFuZShwbGFuZSwg cGxhbmUtPmNydGMsIHBsYW5lLT5zdGF0ZS0+ZmIsCi0JCQkJICBwbGFuZS0+c3RhdGUtPmNydGNf eCwgcGxhbmUtPnN0YXRlLT5jcnRjX3ksCi0JCQkJICBwbGFuZS0+c3RhdGUtPmNydGNfdywgcGxh bmUtPnN0YXRlLT5jcnRjX2gsCi0JCQkJICBwbGFuZS0+c3RhdGUtPnNyY194LCBwbGFuZS0+c3Rh dGUtPnNyY195LAotCQkJCSAgcGxhbmUtPnN0YXRlLT5zcmNfdywgcGxhbmUtPnN0YXRlLT5zcmNf aCk7CisJcmV0dXJuIGRybV9wbGFuZV9oZWxwZXJfdXBkYXRlKHBsYW5lLCBwbGFuZS0+Y3J0Yywg cGxhbmUtPnN0YXRlLT5mYiwKKwkJCQkgICAgICAgcGxhbmUtPnN0YXRlLT5jcnRjX3gsIHBsYW5l LT5zdGF0ZS0+Y3J0Y195LAorCQkJCSAgICAgICBwbGFuZS0+c3RhdGUtPmNydGNfdywgcGxhbmUt PnN0YXRlLT5jcnRjX2gsCisJCQkJICAgICAgIHBsYW5lLT5zdGF0ZS0+c3JjX3gsIHBsYW5lLT5z dGF0ZS0+c3JjX3ksCisJCQkJICAgICAgIHBsYW5lLT5zdGF0ZS0+c3JjX3csIHBsYW5lLT5zdGF0 ZS0+c3JjX2gpOwogfQogCiBzdGF0aWMgdWludDMyX3QgaWxrX3BsYW5lX2Zvcm1hdHNbXSA9IHsK LS0gCjEuOC41LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9y ZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4 Cg==