From: Matt Roper Subject: [PATCH 03/13] drm/i915: Consolidate plane handler vtables Date: Mon, 19 Jan 2015 19:57:36 -0800 Message-ID: <1421726266-31941-4-git-send-email-matthew.d.roper@intel.com> References: <1421726266-31941-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 mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id DC3156E58B for ; Mon, 19 Jan 2015 19:58:16 -0800 (PST) In-Reply-To: <1421726266-31941-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 QWxsIG9mIHRoZSBwcmV2aW91cyByZWZhY3RvcmluZy9jb25zb2xpZGF0aW9uIG9mIHBsYW5lIGNv ZGUgaGFzIHJlc3VsdGVkCmluIGludGVsX3ByaW1hcnlfcGxhbmVfZnVuY3MsIGludGVsX2N1cnNv cl9wbGFuZV9mdW5jcywgYW5kCmludGVsX3Nwcml0ZV9wbGFuZV9mdW5jcyBiZWluZyBpZGVudGlj YWwuICBSZXBsYWNlIGFsbCBvZiB0aGVzZSB3aXRoIGEKc2luZ2xlICdpbnRlbF9wbGFuZV9mdW5j cycgdnRhYmxlIGZvciBzaW1wbGljaXR5LgoKU2lnbmVkLW9mZi1ieTogTWF0dCBSb3BlciA8bWF0 dGhldy5kLnJvcGVyQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k aXNwbGF5LmMgfCAxNSArKystLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2Rydi5oICAgICB8ICAxICsKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jICB8 IDExICstLS0tLS0tLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDUgaW5zZXJ0aW9ucygrKSwgMjIgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh eS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IDc4NjM0MTQu LjliZjUyMjEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXku YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTExOTY4LDcg KzExOTY4LDcgQEAgdm9pZCBpbnRlbF9wbGFuZV9kZXN0cm95KHN0cnVjdCBkcm1fcGxhbmUgKnBs YW5lKQogCWtmcmVlKGludGVsX3BsYW5lKTsKIH0KIAotc3RhdGljIGNvbnN0IHN0cnVjdCBkcm1f cGxhbmVfZnVuY3MgaW50ZWxfcHJpbWFyeV9wbGFuZV9mdW5jcyA9IHsKK2NvbnN0IHN0cnVjdCBk cm1fcGxhbmVfZnVuY3MgaW50ZWxfcGxhbmVfZnVuY3MgPSB7CiAJLnVwZGF0ZV9wbGFuZSA9IGRy bV9wbGFuZV9oZWxwZXJfdXBkYXRlLAogCS5kaXNhYmxlX3BsYW5lID0gZHJtX3BsYW5lX2hlbHBl cl9kaXNhYmxlLAogCS5kZXN0cm95ID0gaW50ZWxfcGxhbmVfZGVzdHJveSwKQEAgLTEyMDE2LDcg KzEyMDE2LDcgQEAgc3RhdGljIHN0cnVjdCBkcm1fcGxhbmUgKmludGVsX3ByaW1hcnlfcGxhbmVf Y3JlYXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJfQogCiAJZHJtX3VuaXZlcnNhbF9wbGFu ZV9pbml0KGRldiwgJnByaW1hcnktPmJhc2UsIDAsCi0JCQkJICZpbnRlbF9wcmltYXJ5X3BsYW5l X2Z1bmNzLAorCQkJCSAmaW50ZWxfcGxhbmVfZnVuY3MsCiAJCQkJIGludGVsX3ByaW1hcnlfZm9y bWF0cywgbnVtX2Zvcm1hdHMsCiAJCQkJIERSTV9QTEFORV9UWVBFX1BSSU1BUlkpOwogCkBAIC0x MjE0NCwxNSArMTIxNDQsNiBAQCB1cGRhdGU6CiAJCWludGVsX2NydGNfdXBkYXRlX2N1cnNvcihj cnRjLCBzdGF0ZS0+dmlzaWJsZSk7CiB9CiAKLXN0YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX3BsYW5l X2Z1bmNzIGludGVsX2N1cnNvcl9wbGFuZV9mdW5jcyA9IHsKLQkudXBkYXRlX3BsYW5lID0gZHJt X3BsYW5lX2hlbHBlcl91cGRhdGUsCi0JLmRpc2FibGVfcGxhbmUgPSBkcm1fcGxhbmVfaGVscGVy X2Rpc2FibGUsCi0JLmRlc3Ryb3kgPSBpbnRlbF9wbGFuZV9kZXN0cm95LAotCS5zZXRfcHJvcGVy dHkgPSBpbnRlbF9wbGFuZV9zZXRfcHJvcGVydHksCi0JLmF0b21pY19kdXBsaWNhdGVfc3RhdGUg PSBpbnRlbF9wbGFuZV9kdXBsaWNhdGVfc3RhdGUsCi0JLmF0b21pY19kZXN0cm95X3N0YXRlID0g aW50ZWxfcGxhbmVfZGVzdHJveV9zdGF0ZSwKLX07Ci0KIHN0YXRpYyBzdHJ1Y3QgZHJtX3BsYW5l ICppbnRlbF9jdXJzb3JfcGxhbmVfY3JlYXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQkJ CQkgICBpbnQgcGlwZSkKIHsKQEAgLTEyMTc5LDcgKzEyMTcwLDcgQEAgc3RhdGljIHN0cnVjdCBk cm1fcGxhbmUgKmludGVsX2N1cnNvcl9wbGFuZV9jcmVhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRl diwKIAljdXJzb3ItPmNvbW1pdF9wbGFuZSA9IGludGVsX2NvbW1pdF9jdXJzb3JfcGxhbmU7CiAK IAlkcm1fdW5pdmVyc2FsX3BsYW5lX2luaXQoZGV2LCAmY3Vyc29yLT5iYXNlLCAwLAotCQkJCSAm aW50ZWxfY3Vyc29yX3BsYW5lX2Z1bmNzLAorCQkJCSAmaW50ZWxfcGxhbmVfZnVuY3MsCiAJCQkJ IGludGVsX2N1cnNvcl9mb3JtYXRzLAogCQkJCSBBUlJBWV9TSVpFKGludGVsX2N1cnNvcl9mb3Jt YXRzKSwKIAkJCQkgRFJNX1BMQU5FX1RZUEVfQ1VSU09SKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2 LmgKaW5kZXggOTE4Y2NlMi4uMjEzM2ZkMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAg LTkwOCw2ICs5MDgsNyBAQCB2b2lkIGk5MTVfYXVkaW9fY29tcG9uZW50X2luaXQoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKIHZvaWQgaTkxNV9hdWRpb19jb21wb25lbnRfY2xl YW51cChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogCiAvKiBpbnRlbF9kaXNw bGF5LmMgKi8KK2V4dGVybiBjb25zdCBzdHJ1Y3QgZHJtX3BsYW5lX2Z1bmNzIGludGVsX3BsYW5l X2Z1bmNzOwogYm9vbCBpbnRlbF9oYXNfcGVuZGluZ19mYl91bnBpbihzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2KTsKIGludCBpbnRlbF9wY2hfcmF3Y2xrKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwog dm9pZCBpbnRlbF9tYXJrX2J1c3koc3RydWN0IGRybV9kZXZpY2UgKmRldik7CmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3Nwcml0ZS5jCmluZGV4IDE0MGM1YjcuLjhhZjRjNjkgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3Nwcml0ZS5jCkBAIC0xNDA2LDE1ICsxNDA2LDYgQEAgaW50IGludGVsX3BsYW5l X3Jlc3RvcmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUpCiAJCQkJICBwbGFuZS0+c3RhdGUtPnNy Y193LCBwbGFuZS0+c3RhdGUtPnNyY19oKTsKIH0KIAotc3RhdGljIGNvbnN0IHN0cnVjdCBkcm1f cGxhbmVfZnVuY3MgaW50ZWxfc3ByaXRlX3BsYW5lX2Z1bmNzID0gewotCS51cGRhdGVfcGxhbmUg PSBkcm1fcGxhbmVfaGVscGVyX3VwZGF0ZSwKLQkuZGlzYWJsZV9wbGFuZSA9IGRybV9wbGFuZV9o ZWxwZXJfZGlzYWJsZSwKLQkuZGVzdHJveSA9IGludGVsX3BsYW5lX2Rlc3Ryb3ksCi0JLnNldF9w cm9wZXJ0eSA9IGludGVsX3BsYW5lX3NldF9wcm9wZXJ0eSwKLQkuYXRvbWljX2R1cGxpY2F0ZV9z dGF0ZSA9IGludGVsX3BsYW5lX2R1cGxpY2F0ZV9zdGF0ZSwKLQkuYXRvbWljX2Rlc3Ryb3lfc3Rh dGUgPSBpbnRlbF9wbGFuZV9kZXN0cm95X3N0YXRlLAotfTsKLQogc3RhdGljIHVpbnQzMl90IGls a19wbGFuZV9mb3JtYXRzW10gPSB7CiAJRFJNX0ZPUk1BVF9YUkdCODg4OCwKIAlEUk1fRk9STUFU X1lVWVYsCkBAIC0xNTU3LDcgKzE1NDgsNyBAQCBpbnRlbF9wbGFuZV9pbml0KHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYsIGVudW0gcGlwZSBwaXBlLCBpbnQgcGxhbmUpCiAJaW50ZWxfcGxhbmUtPmNv bW1pdF9wbGFuZSA9IGludGVsX2NvbW1pdF9zcHJpdGVfcGxhbmU7CiAJcG9zc2libGVfY3J0Y3Mg PSAoMSA8PCBwaXBlKTsKIAlyZXQgPSBkcm1fdW5pdmVyc2FsX3BsYW5lX2luaXQoZGV2LCAmaW50 ZWxfcGxhbmUtPmJhc2UsIHBvc3NpYmxlX2NydGNzLAotCQkJCSAgICAgICAmaW50ZWxfc3ByaXRl X3BsYW5lX2Z1bmNzLAorCQkJCSAgICAgICAmaW50ZWxfcGxhbmVfZnVuY3MsCiAJCQkJICAgICAg IHBsYW5lX2Zvcm1hdHMsIG51bV9wbGFuZV9mb3JtYXRzLAogCQkJCSAgICAgICBEUk1fUExBTkVf VFlQRV9PVkVSTEFZKTsKIAlpZiAocmV0KSB7Ci0tIAoxLjguNS4xCgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0Cklu dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=