From: Matt Roper Subject: [PATCH 03/10] drm/i915: Consolidate plane handler vtables Date: Wed, 21 Jan 2015 16:35:42 -0800 Message-ID: <1421886949-26704-4-git-send-email-matthew.d.roper@intel.com> References: <1421886949-26704-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 3A7856E279 for ; Wed, 21 Jan 2015 16:36:31 -0800 (PST) In-Reply-To: <1421886949-26704-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 dGhldy5kLnJvcGVyQGludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IEFuZGVyIENvbnNlbHZhbiBkZSBP bGl2ZWlyYSA8Y29uc2VsdmFuMkBnbWFpbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZGlzcGxheS5jIHwgMTUgKysrLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kcnYuaCAgICAgfCAgMSArCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJp dGUuYyAgfCAxMSArLS0tLS0tLS0tLQogMyBmaWxlcyBjaGFuZ2VkLCA1IGluc2VydGlvbnMoKyks IDIyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCBk YjQyODI0Li5lMGZmYjE0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k aXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0x MjA0OSw3ICsxMjA0OSw3IEBAIHZvaWQgaW50ZWxfcGxhbmVfZGVzdHJveShzdHJ1Y3QgZHJtX3Bs YW5lICpwbGFuZSkKIAlrZnJlZShpbnRlbF9wbGFuZSk7CiB9CiAKLXN0YXRpYyBjb25zdCBzdHJ1 Y3QgZHJtX3BsYW5lX2Z1bmNzIGludGVsX3ByaW1hcnlfcGxhbmVfZnVuY3MgPSB7Citjb25zdCBz dHJ1Y3QgZHJtX3BsYW5lX2Z1bmNzIGludGVsX3BsYW5lX2Z1bmNzID0gewogCS51cGRhdGVfcGxh bmUgPSBkcm1fcGxhbmVfaGVscGVyX3VwZGF0ZSwKIAkuZGlzYWJsZV9wbGFuZSA9IGRybV9wbGFu ZV9oZWxwZXJfZGlzYWJsZSwKIAkuZGVzdHJveSA9IGludGVsX3BsYW5lX2Rlc3Ryb3ksCkBAIC0x MjA5Niw3ICsxMjA5Niw3IEBAIHN0YXRpYyBzdHJ1Y3QgZHJtX3BsYW5lICppbnRlbF9wcmltYXJ5 X3BsYW5lX2NyZWF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCX0KIAogCWRybV91bml2ZXJz YWxfcGxhbmVfaW5pdChkZXYsICZwcmltYXJ5LT5iYXNlLCAwLAotCQkJCSAmaW50ZWxfcHJpbWFy eV9wbGFuZV9mdW5jcywKKwkJCQkgJmludGVsX3BsYW5lX2Z1bmNzLAogCQkJCSBpbnRlbF9wcmlt YXJ5X2Zvcm1hdHMsIG51bV9mb3JtYXRzLAogCQkJCSBEUk1fUExBTkVfVFlQRV9QUklNQVJZKTsK IApAQCAtMTIyMjQsMTUgKzEyMjI0LDYgQEAgdXBkYXRlOgogCQlpbnRlbF9jcnRjX3VwZGF0ZV9j dXJzb3IoY3J0Yywgc3RhdGUtPnZpc2libGUpOwogfQogCi1zdGF0aWMgY29uc3Qgc3RydWN0IGRy bV9wbGFuZV9mdW5jcyBpbnRlbF9jdXJzb3JfcGxhbmVfZnVuY3MgPSB7Ci0JLnVwZGF0ZV9wbGFu ZSA9IGRybV9wbGFuZV9oZWxwZXJfdXBkYXRlLAotCS5kaXNhYmxlX3BsYW5lID0gZHJtX3BsYW5l X2hlbHBlcl9kaXNhYmxlLAotCS5kZXN0cm95ID0gaW50ZWxfcGxhbmVfZGVzdHJveSwKLQkuc2V0 X3Byb3BlcnR5ID0gaW50ZWxfcGxhbmVfc2V0X3Byb3BlcnR5LAotCS5hdG9taWNfZHVwbGljYXRl X3N0YXRlID0gaW50ZWxfcGxhbmVfZHVwbGljYXRlX3N0YXRlLAotCS5hdG9taWNfZGVzdHJveV9z dGF0ZSA9IGludGVsX3BsYW5lX2Rlc3Ryb3lfc3RhdGUsCi19OwotCiBzdGF0aWMgc3RydWN0IGRy bV9wbGFuZSAqaW50ZWxfY3Vyc29yX3BsYW5lX2NyZWF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 LAogCQkJCQkJICAgaW50IHBpcGUpCiB7CkBAIC0xMjI1OCw3ICsxMjI0OSw3IEBAIHN0YXRpYyBz dHJ1Y3QgZHJtX3BsYW5lICppbnRlbF9jdXJzb3JfcGxhbmVfY3JlYXRlKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYsCiAJY3Vyc29yLT5jb21taXRfcGxhbmUgPSBpbnRlbF9jb21taXRfY3Vyc29yX3Bs YW5lOwogCiAJZHJtX3VuaXZlcnNhbF9wbGFuZV9pbml0KGRldiwgJmN1cnNvci0+YmFzZSwgMCwK LQkJCQkgJmludGVsX2N1cnNvcl9wbGFuZV9mdW5jcywKKwkJCQkgJmludGVsX3BsYW5lX2Z1bmNz LAogCQkJCSBpbnRlbF9jdXJzb3JfZm9ybWF0cywKIAkJCQkgQVJSQVlfU0laRShpbnRlbF9jdXJz b3JfZm9ybWF0cyksCiAJCQkJIERSTV9QTEFORV9UWVBFX0NVUlNPUik7CmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rydi5oCmluZGV4IGIwNTYyZTQuLjNiODhlY2MgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Ry di5oCkBAIC04OTAsNiArODkwLDcgQEAgdm9pZCBpOTE1X2F1ZGlvX2NvbXBvbmVudF9pbml0KHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CiB2b2lkIGk5MTVfYXVkaW9fY29tcG9u ZW50X2NsZWFudXAoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKIAogLyogaW50 ZWxfZGlzcGxheS5jICovCitleHRlcm4gY29uc3Qgc3RydWN0IGRybV9wbGFuZV9mdW5jcyBpbnRl bF9wbGFuZV9mdW5jczsKIGJvb2wgaW50ZWxfaGFzX3BlbmRpbmdfZmJfdW5waW4oc3RydWN0IGRy bV9kZXZpY2UgKmRldik7CiBpbnQgaW50ZWxfcGNoX3Jhd2NsayhzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2KTsKIHZvaWQgaW50ZWxfbWFya19idXN5KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwppbmRleCBiYTg1NDM5Li41MDY4M2Q0IDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwpAQCAtMTQwMCwxNSArMTQwMCw2IEBAIGludCBpbnRl bF9wbGFuZV9yZXN0b3JlKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lKQogCQkJCSAgcGxhbmUtPnN0 YXRlLT5zcmNfdywgcGxhbmUtPnN0YXRlLT5zcmNfaCk7CiB9CiAKLXN0YXRpYyBjb25zdCBzdHJ1 Y3QgZHJtX3BsYW5lX2Z1bmNzIGludGVsX3Nwcml0ZV9wbGFuZV9mdW5jcyA9IHsKLQkudXBkYXRl X3BsYW5lID0gZHJtX3BsYW5lX2hlbHBlcl91cGRhdGUsCi0JLmRpc2FibGVfcGxhbmUgPSBkcm1f cGxhbmVfaGVscGVyX2Rpc2FibGUsCi0JLmRlc3Ryb3kgPSBpbnRlbF9wbGFuZV9kZXN0cm95LAot CS5zZXRfcHJvcGVydHkgPSBpbnRlbF9wbGFuZV9zZXRfcHJvcGVydHksCi0JLmF0b21pY19kdXBs aWNhdGVfc3RhdGUgPSBpbnRlbF9wbGFuZV9kdXBsaWNhdGVfc3RhdGUsCi0JLmF0b21pY19kZXN0 cm95X3N0YXRlID0gaW50ZWxfcGxhbmVfZGVzdHJveV9zdGF0ZSwKLX07Ci0KIHN0YXRpYyB1aW50 MzJfdCBpbGtfcGxhbmVfZm9ybWF0c1tdID0gewogCURSTV9GT1JNQVRfWFJHQjg4ODgsCiAJRFJN X0ZPUk1BVF9ZVVlWLApAQCAtMTU0OSw3ICsxNTQwLDcgQEAgaW50ZWxfcGxhbmVfaW5pdChzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2LCBlbnVtIHBpcGUgcGlwZSwgaW50IHBsYW5lKQogCWludGVsX3Bs YW5lLT5jb21taXRfcGxhbmUgPSBpbnRlbF9jb21taXRfc3ByaXRlX3BsYW5lOwogCXBvc3NpYmxl X2NydGNzID0gKDEgPDwgcGlwZSk7CiAJcmV0ID0gZHJtX3VuaXZlcnNhbF9wbGFuZV9pbml0KGRl diwgJmludGVsX3BsYW5lLT5iYXNlLCBwb3NzaWJsZV9jcnRjcywKLQkJCQkgICAgICAgJmludGVs X3Nwcml0ZV9wbGFuZV9mdW5jcywKKwkJCQkgICAgICAgJmludGVsX3BsYW5lX2Z1bmNzLAogCQkJ CSAgICAgICBwbGFuZV9mb3JtYXRzLCBudW1fcGxhbmVfZm9ybWF0cywKIAkJCQkgICAgICAgRFJN X1BMQU5FX1RZUEVfT1ZFUkxBWSk7CiAJaWYgKHJldCkgewotLSAKMS44LjUuMQoKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcg bGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVz a3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK