From: Matt Roper Subject: [PATCH 3/5] drm/i915: Clarify sprite plane function names (v3) Date: Mon, 15 Dec 2014 16:23:19 -0800 Message-ID: <1418689401-22957-4-git-send-email-matthew.d.roper@intel.com> References: <1418689401-22957-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 CB5DE6E663 for ; Mon, 15 Dec 2014 16:23:41 -0800 (PST) In-Reply-To: <1418689401-22957-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 QSBmZXcgb2YgdGhlIHNwcml0ZS1yZWxhdGVkIGZ1bmN0aW9uIG5hbWVzIGluIGk5MTUgYXJlIHZl cnkgc2ltaWxhcgooZS5nLiwgaW50ZWxfZW5hYmxlX3BsYW5lcygpIHZzIGludGVsX2NydGNfZW5h YmxlX3BsYW5lcygpKSBhbmQgZG9uJ3QKbWFrZSBpdCBjbGVhciB3aGV0aGVyIHRoZXkgb25seSBv cGVyYXRlIG9uIHNwcml0ZSBwbGFuZXMsIG9yIHdoZXRoZXIKdGhleSBhbHNvIGFwcGx5IHRvIGFs bCB1bml2ZXJzYWwgcGxhbmUgdHlwZXMuICBSZW5hbWUgYSBmZXcgZnVuY3Rpb25zIHRvCmJlIG1v cmUgY29uc2lzdGVudCB3aXRoIG91ciBmdW5jdGlvbiBuYW1pbmcgZm9yIHByaW1hcnkvY3Vyc29y IHBsYW5lcyBvcgp0byBjbGFyaWZ5IHRoYXQgdGhleSBhcHBseSBzcGVjaWZpY2FsbHkgdG8gc3By aXRlIHBsYW5lczoKCiAtIHMvaW50ZWxfZGlzYWJsZV9wbGFuZXMvaW50ZWxfZGlzYWJsZV9zcHJp dGVfcGxhbmVzLwogLSBzL2ludGVsX2VuYWJsZV9wbGFuZXMvaW50ZWxfZW5hYmxlX3Nwcml0ZV9w bGFuZXMvCgpBbHNvLCBkcm9wIHRoZSBzcHJpdGUtc3BlY2lmaWMgaW50ZWxfZGVzdHJveV9wbGFu ZSgpIGFuZCBqdXN0IHVzZQp0aGUgdHlwZS1hZ25vc3RpYyBpbnRlbF9wbGFuZV9kZXN0cm95KCkg ZnVuY3Rpb24uICBUaGUgZXh0cmEgJ2Rpc2FibGUnCmNhbGwgdGhhdCBpbnRlbF9kZXN0cm95X3Bs YW5lKCkgZGlkIGlzIHVubmVjZXNzYXJ5IHNpbmNlIHRoZSBwbGFuZSB3aWxsCmFscmVhZHkgYmUg ZGlzYWJsZWQgZHVlIHRvIGZyYW1lYnVmZmVyIGRlc3RydWN0aW9uIGJ5IHRoZSBwb2ludCBpdCBn ZXRzCmNhbGxlZC4KCnYyOiBFYXJsaWVyIGNvbnNvbGlkYXRpb24gcGF0Y2hlcyBoYXZlIHJlZHVj ZWQgdGhlIG51bWJlciBvZiBmdW5jdGlvbnMKICAgIHdlIG5lZWQgdG8gcmVuYW1lIGhlcmUuCgp2 MzogQWxzbyByZW5hbWUgaW50ZWxfcGxhbmVfZnVuY3MgdnRhYmxlIHRvIGludGVsX3Nwcml0ZV9w bGFuZV9mdW5jcwogICAgZm9yIGNvbnNpc3RlbmN5IHdpdGggcHJpbWFyeS9jdXJzb3IuICAoQW5k ZXIpCgpSZXZpZXdlZC1ieSh2MSk6IEJvYiBQYWF1d2UgPGJvYi5qLnBhYXV3ZUBpbnRlbC5jb20+ ClNpZ25lZC1vZmYtYnk6IE1hdHQgUm9wZXIgPG1hdHRoZXcuZC5yb3BlckBpbnRlbC5jb20+Ci0t LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgMTAgKysrKystLS0tLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggICAgIHwgIDEgKwogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMgIHwgMTQgKysrLS0tLS0tLS0tLS0KIDMgZmlsZXMgY2hh bmdlZCwgOSBpbnNlcnRpb25zKCspLCAxNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kaXNwbGF5LmMKaW5kZXggY2U1NTJkMS4uMDMwY2Y5MyAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2Rpc3BsYXkuYwpAQCAtNDAzNyw3ICs0MDM3LDcgQEAgc3RhdGljIHZvaWQgaXJvbmxh a2VfcGZpdF9lbmFibGUoc3RydWN0IGludGVsX2NydGMgKmNydGMpCiAJfQogfQogCi1zdGF0aWMg dm9pZCBpbnRlbF9lbmFibGVfcGxhbmVzKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKK3N0YXRpYyB2 b2lkIGludGVsX2VuYWJsZV9zcHJpdGVfcGxhbmVzKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIHsK IAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+ZGV2OwogCWVudW0gcGlwZSBwaXBlID0g dG9faW50ZWxfY3J0YyhjcnRjKS0+cGlwZTsKQEAgLTQwNTEsNyArNDA1MSw3IEBAIHN0YXRpYyB2 b2lkIGludGVsX2VuYWJsZV9wbGFuZXMoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCX0KIH0KIAot c3RhdGljIHZvaWQgaW50ZWxfZGlzYWJsZV9wbGFuZXMoc3RydWN0IGRybV9jcnRjICpjcnRjKQor c3RhdGljIHZvaWQgaW50ZWxfZGlzYWJsZV9zcHJpdGVfcGxhbmVzKHN0cnVjdCBkcm1fY3J0YyAq Y3J0YykKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+ZGV2OwogCWVudW0gcGlw ZSBwaXBlID0gdG9faW50ZWxfY3J0YyhjcnRjKS0+cGlwZTsKQEAgLTQxOTUsNyArNDE5NSw3IEBA IHN0YXRpYyB2b2lkIGludGVsX2NydGNfZW5hYmxlX3BsYW5lcyhzdHJ1Y3QgZHJtX2NydGMgKmNy dGMpCiAJaW50IHBpcGUgPSBpbnRlbF9jcnRjLT5waXBlOwogCiAJaW50ZWxfZW5hYmxlX3ByaW1h cnlfaHdfcGxhbmUoY3J0Yy0+cHJpbWFyeSwgY3J0Yyk7Ci0JaW50ZWxfZW5hYmxlX3BsYW5lcyhj cnRjKTsKKwlpbnRlbF9lbmFibGVfc3ByaXRlX3BsYW5lcyhjcnRjKTsKIAlpbnRlbF9jcnRjX3Vw ZGF0ZV9jdXJzb3IoY3J0YywgdHJ1ZSk7CiAJaW50ZWxfY3J0Y19kcG1zX292ZXJsYXkoaW50ZWxf Y3J0YywgdHJ1ZSk7CiAKQEAgLTQyMzAsNyArNDIzMCw3IEBAIHN0YXRpYyB2b2lkIGludGVsX2Ny dGNfZGlzYWJsZV9wbGFuZXMoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCiAJaW50ZWxfY3J0Y19k cG1zX292ZXJsYXkoaW50ZWxfY3J0YywgZmFsc2UpOwogCWludGVsX2NydGNfdXBkYXRlX2N1cnNv cihjcnRjLCBmYWxzZSk7Ci0JaW50ZWxfZGlzYWJsZV9wbGFuZXMoY3J0Yyk7CisJaW50ZWxfZGlz YWJsZV9zcHJpdGVfcGxhbmVzKGNydGMpOwogCWludGVsX2Rpc2FibGVfcHJpbWFyeV9od19wbGFu ZShjcnRjLT5wcmltYXJ5LCBjcnRjKTsKIAogCS8qCkBAIC0xMjAwOCw3ICsxMjAwOCw3IEBAIGlu dGVsX2Rpc2FibGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUpCiB9CiAKIC8qIENvbW1v biBkZXN0cnVjdGlvbiBmdW5jdGlvbiBmb3IgYm90aCBwcmltYXJ5IGFuZCBjdXJzb3IgcGxhbmVz ICovCi1zdGF0aWMgdm9pZCBpbnRlbF9wbGFuZV9kZXN0cm95KHN0cnVjdCBkcm1fcGxhbmUgKnBs YW5lKQordm9pZCBpbnRlbF9wbGFuZV9kZXN0cm95KHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lKQog ewogCXN0cnVjdCBpbnRlbF9wbGFuZSAqaW50ZWxfcGxhbmUgPSB0b19pbnRlbF9wbGFuZShwbGFu ZSk7CiAJZHJtX3BsYW5lX2NsZWFudXAocGxhbmUpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApp bmRleCAxOTM0MTU2Li4yNTIzMzE1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtMTA1 Myw2ICsxMDUzLDcgQEAgaW50IGludGVsX3VwZGF0ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpw bGFuZSwgc3RydWN0IGRybV9jcnRjICpjcnRjLAogCQkgICAgICAgdWludDMyX3Qgc3JjX3gsIHVp bnQzMl90IHNyY195LAogCQkgICAgICAgdWludDMyX3Qgc3JjX3csIHVpbnQzMl90IHNyY19oKTsK IGludCBpbnRlbF9kaXNhYmxlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lKTsKK3ZvaWQg aW50ZWxfcGxhbmVfZGVzdHJveShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSk7CiAKIC8qIGludGVs X2RwX21zdC5jICovCiBpbnQgaW50ZWxfZHBfbXN0X2VuY29kZXJfaW5pdChzdHJ1Y3QgaW50ZWxf ZGlnaXRhbF9wb3J0ICppbnRlbF9kaWdfcG9ydCwgaW50IGNvbm5faWQpOwpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9zcHJpdGUuYwppbmRleCAyNTIwNzQ4Li5hNjg5YzczIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9zcHJpdGUuYwpAQCAtMTI4NiwxNCArMTI4Niw2IEBAIGludGVsX2NvbW1pdF9zcHJp dGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJfQogfQogCi1zdGF0aWMgdm9pZCBp bnRlbF9kZXN0cm95X3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lKQotewotCXN0cnVjdCBp bnRlbF9wbGFuZSAqaW50ZWxfcGxhbmUgPSB0b19pbnRlbF9wbGFuZShwbGFuZSk7Ci0JaW50ZWxf ZGlzYWJsZV9wbGFuZShwbGFuZSk7Ci0JZHJtX3BsYW5lX2NsZWFudXAocGxhbmUpOwotCWtmcmVl KGludGVsX3BsYW5lKTsKLX0KLQogaW50IGludGVsX3Nwcml0ZV9zZXRfY29sb3JrZXkoc3RydWN0 IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKIAkJCSAgICAgIHN0cnVjdCBkcm1fZmlsZSAq ZmlsZV9wcml2KQogewpAQCAtMTM5MywxMCArMTM4NSwxMCBAQCBpbnQgaW50ZWxfcGxhbmVfcmVz dG9yZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSkKIAkJCQkgIGludGVsX3BsYW5lLT5zcmNfdywg aW50ZWxfcGxhbmUtPnNyY19oKTsKIH0KIAotc3RhdGljIGNvbnN0IHN0cnVjdCBkcm1fcGxhbmVf ZnVuY3MgaW50ZWxfcGxhbmVfZnVuY3MgPSB7CitzdGF0aWMgY29uc3Qgc3RydWN0IGRybV9wbGFu ZV9mdW5jcyBpbnRlbF9zcHJpdGVfcGxhbmVfZnVuY3MgPSB7CiAJLnVwZGF0ZV9wbGFuZSA9IGlu dGVsX3VwZGF0ZV9wbGFuZSwKIAkuZGlzYWJsZV9wbGFuZSA9IGludGVsX2Rpc2FibGVfcGxhbmUs Ci0JLmRlc3Ryb3kgPSBpbnRlbF9kZXN0cm95X3BsYW5lLAorCS5kZXN0cm95ID0gaW50ZWxfcGxh bmVfZGVzdHJveSwKIAkuc2V0X3Byb3BlcnR5ID0gaW50ZWxfcGxhbmVfc2V0X3Byb3BlcnR5LAog fTsKIApAQCAtMTUzMyw3ICsxNTI1LDcgQEAgaW50ZWxfcGxhbmVfaW5pdChzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2LCBlbnVtIHBpcGUgcGlwZSwgaW50IHBsYW5lKQogCWludGVsX3BsYW5lLT5jb21t aXRfcGxhbmUgPSBpbnRlbF9jb21taXRfc3ByaXRlX3BsYW5lOwogCXBvc3NpYmxlX2NydGNzID0g KDEgPDwgcGlwZSk7CiAJcmV0ID0gZHJtX3VuaXZlcnNhbF9wbGFuZV9pbml0KGRldiwgJmludGVs X3BsYW5lLT5iYXNlLCBwb3NzaWJsZV9jcnRjcywKLQkJCQkgICAgICAgJmludGVsX3BsYW5lX2Z1 bmNzLAorCQkJCSAgICAgICAmaW50ZWxfc3ByaXRlX3BsYW5lX2Z1bmNzLAogCQkJCSAgICAgICBw bGFuZV9mb3JtYXRzLCBudW1fcGxhbmVfZm9ybWF0cywKIAkJCQkgICAgICAgRFJNX1BMQU5FX1RZ UEVfT1ZFUkxBWSk7CiAJaWYgKHJldCkgewotLSAKMS44LjUuMQoKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRl bC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcv bWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK