From: Matt Roper Subject: [PATCH 3/5] drm/i915: Clarify sprite plane function names (v4) Date: Tue, 23 Dec 2014 10:41:51 -0800 Message-ID: <1419360113-10972-4-git-send-email-matthew.d.roper@intel.com> References: <1419360113-10972-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 mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id B01896E51C for ; Tue, 23 Dec 2014 10:42:57 -0800 (PST) In-Reply-To: <1419360113-10972-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 ZXIpCgp2NDogQ29udmVydCBjb21tZW50IGZvciBpbnRlbF9wbGFuZV9kZXN0cm95KCkgdG8ga2Vy bmVsZG9jIG5vdyB0aGF0IGl0CiAgICBpcyBubyBsb25nZXIgYSBzdGF0aWMgZnVuY3Rpb24uICAo QW5kZXIpCgpSZXZpZXdlZC1ieSh2MSk6IEJvYiBQYWF1d2UgPGJvYi5qLnBhYXV3ZUBpbnRlbC5j b20+ClNpZ25lZC1vZmYtYnk6IE1hdHQgUm9wZXIgPG1hdHRoZXcuZC5yb3BlckBpbnRlbC5jb20+ Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgMTggKysrKysrKysr KysrLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCAgICAgfCAgMSArCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYyAgfCAxNCArKystLS0tLS0tLS0tLQog MyBmaWxlcyBjaGFuZ2VkLCAxNiBpbnNlcnRpb25zKCspLCAxNyBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggOGQ2ZTcxMC4uNGJiMWEzNyAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtNDAzNyw3ICs0MDM3LDcgQEAgc3RhdGlj IHZvaWQgaXJvbmxha2VfcGZpdF9lbmFibGUoc3RydWN0IGludGVsX2NydGMgKmNydGMpCiAJfQog fQogCi1zdGF0aWMgdm9pZCBpbnRlbF9lbmFibGVfcGxhbmVzKHN0cnVjdCBkcm1fY3J0YyAqY3J0 YykKK3N0YXRpYyB2b2lkIGludGVsX2VuYWJsZV9zcHJpdGVfcGxhbmVzKHN0cnVjdCBkcm1fY3J0 YyAqY3J0YykKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+ZGV2OwogCWVudW0g cGlwZSBwaXBlID0gdG9faW50ZWxfY3J0YyhjcnRjKS0+cGlwZTsKQEAgLTQwNTEsNyArNDA1MSw3 IEBAIHN0YXRpYyB2b2lkIGludGVsX2VuYWJsZV9wbGFuZXMoc3RydWN0IGRybV9jcnRjICpjcnRj KQogCX0KIH0KIAotc3RhdGljIHZvaWQgaW50ZWxfZGlzYWJsZV9wbGFuZXMoc3RydWN0IGRybV9j cnRjICpjcnRjKQorc3RhdGljIHZvaWQgaW50ZWxfZGlzYWJsZV9zcHJpdGVfcGxhbmVzKHN0cnVj dCBkcm1fY3J0YyAqY3J0YykKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+ZGV2 OwogCWVudW0gcGlwZSBwaXBlID0gdG9faW50ZWxfY3J0YyhjcnRjKS0+cGlwZTsKQEAgLTQxOTUs NyArNDE5NSw3IEBAIHN0YXRpYyB2b2lkIGludGVsX2NydGNfZW5hYmxlX3BsYW5lcyhzdHJ1Y3Qg ZHJtX2NydGMgKmNydGMpCiAJaW50IHBpcGUgPSBpbnRlbF9jcnRjLT5waXBlOwogCiAJaW50ZWxf ZW5hYmxlX3ByaW1hcnlfaHdfcGxhbmUoY3J0Yy0+cHJpbWFyeSwgY3J0Yyk7Ci0JaW50ZWxfZW5h YmxlX3BsYW5lcyhjcnRjKTsKKwlpbnRlbF9lbmFibGVfc3ByaXRlX3BsYW5lcyhjcnRjKTsKIAlp bnRlbF9jcnRjX3VwZGF0ZV9jdXJzb3IoY3J0YywgdHJ1ZSk7CiAJaW50ZWxfY3J0Y19kcG1zX292 ZXJsYXkoaW50ZWxfY3J0YywgdHJ1ZSk7CiAKQEAgLTQyMzAsNyArNDIzMCw3IEBAIHN0YXRpYyB2 b2lkIGludGVsX2NydGNfZGlzYWJsZV9wbGFuZXMoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCiAJ aW50ZWxfY3J0Y19kcG1zX292ZXJsYXkoaW50ZWxfY3J0YywgZmFsc2UpOwogCWludGVsX2NydGNf dXBkYXRlX2N1cnNvcihjcnRjLCBmYWxzZSk7Ci0JaW50ZWxfZGlzYWJsZV9wbGFuZXMoY3J0Yyk7 CisJaW50ZWxfZGlzYWJsZV9zcHJpdGVfcGxhbmVzKGNydGMpOwogCWludGVsX2Rpc2FibGVfcHJp bWFyeV9od19wbGFuZShjcnRjLT5wcmltYXJ5LCBjcnRjKTsKIAogCS8qCkBAIC0xMjAxMiw4ICsx MjAxMiwxNCBAQCBpbnRlbF9kaXNhYmxlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lKQog CQkJCQkgIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDApOwogfQogCi0vKiBDb21tb24gZGVzdHJ1Y3Rp b24gZnVuY3Rpb24gZm9yIGJvdGggcHJpbWFyeSBhbmQgY3Vyc29yIHBsYW5lcyAqLwotc3RhdGlj IHZvaWQgaW50ZWxfcGxhbmVfZGVzdHJveShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSkKKy8qKgor ICogaW50ZWxfcGxhbmVfZGVzdHJveSAtIGRlc3Ryb3kgYSBwbGFuZQorICogQHBsYW5lOiBwbGFu ZSB0byBkZXN0cm95CisgKgorICogQ29tbW9uIGRlc3RydWN0aW9uIGZ1bmN0aW9uIGZvciBhbGwg dHlwZXMgb2YgcGxhbmVzIChwcmltYXJ5LCBjdXJzb3IsCisgKiBzcHJpdGUpLgorICovCit2b2lk IGludGVsX3BsYW5lX2Rlc3Ryb3koc3RydWN0IGRybV9wbGFuZSAqcGxhbmUpCiB7CiAJc3RydWN0 IGludGVsX3BsYW5lICppbnRlbF9wbGFuZSA9IHRvX2ludGVsX3BsYW5lKHBsYW5lKTsKIAlkcm1f cGxhbmVfY2xlYW51cChwbGFuZSk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCmluZGV4IDE5MzQx NTYuLjI1MjMzMTUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5o CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCkBAIC0xMDUzLDYgKzEwNTMs NyBAQCBpbnQgaW50ZWxfdXBkYXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLCBzdHJ1 Y3QgZHJtX2NydGMgKmNydGMsCiAJCSAgICAgICB1aW50MzJfdCBzcmNfeCwgdWludDMyX3Qgc3Jj X3ksCiAJCSAgICAgICB1aW50MzJfdCBzcmNfdywgdWludDMyX3Qgc3JjX2gpOwogaW50IGludGVs X2Rpc2FibGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUpOwordm9pZCBpbnRlbF9wbGFu ZV9kZXN0cm95KHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lKTsKIAogLyogaW50ZWxfZHBfbXN0LmMg Ki8KIGludCBpbnRlbF9kcF9tc3RfZW5jb2Rlcl9pbml0KHN0cnVjdCBpbnRlbF9kaWdpdGFsX3Bv cnQgKmludGVsX2RpZ19wb3J0LCBpbnQgY29ubl9pZCk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nw cml0ZS5jCmluZGV4IDE4YmU4MjcuLjUzN2ZmZjI1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9zcHJpdGUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9z cHJpdGUuYwpAQCAtMTMwNiwxNCArMTMwNiw2IEBAIGludGVsX2NvbW1pdF9zcHJpdGVfcGxhbmUo c3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJfQogfQogCi1zdGF0aWMgdm9pZCBpbnRlbF9kZXN0 cm95X3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lKQotewotCXN0cnVjdCBpbnRlbF9wbGFu ZSAqaW50ZWxfcGxhbmUgPSB0b19pbnRlbF9wbGFuZShwbGFuZSk7Ci0JaW50ZWxfZGlzYWJsZV9w bGFuZShwbGFuZSk7Ci0JZHJtX3BsYW5lX2NsZWFudXAocGxhbmUpOwotCWtmcmVlKGludGVsX3Bs YW5lKTsKLX0KLQogaW50IGludGVsX3Nwcml0ZV9zZXRfY29sb3JrZXkoc3RydWN0IGRybV9kZXZp Y2UgKmRldiwgdm9pZCAqZGF0YSwKIAkJCSAgICAgIHN0cnVjdCBkcm1fZmlsZSAqZmlsZV9wcml2 KQogewpAQCAtMTQxMywxMCArMTQwNSwxMCBAQCBpbnQgaW50ZWxfcGxhbmVfcmVzdG9yZShzdHJ1 Y3QgZHJtX3BsYW5lICpwbGFuZSkKIAkJCQkgIGludGVsX3BsYW5lLT5zcmNfdywgaW50ZWxfcGxh bmUtPnNyY19oKTsKIH0KIAotc3RhdGljIGNvbnN0IHN0cnVjdCBkcm1fcGxhbmVfZnVuY3MgaW50 ZWxfcGxhbmVfZnVuY3MgPSB7CitzdGF0aWMgY29uc3Qgc3RydWN0IGRybV9wbGFuZV9mdW5jcyBp bnRlbF9zcHJpdGVfcGxhbmVfZnVuY3MgPSB7CiAJLnVwZGF0ZV9wbGFuZSA9IGludGVsX3VwZGF0 ZV9wbGFuZSwKIAkuZGlzYWJsZV9wbGFuZSA9IGludGVsX2Rpc2FibGVfcGxhbmUsCi0JLmRlc3Ry b3kgPSBpbnRlbF9kZXN0cm95X3BsYW5lLAorCS5kZXN0cm95ID0gaW50ZWxfcGxhbmVfZGVzdHJv eSwKIAkuc2V0X3Byb3BlcnR5ID0gaW50ZWxfcGxhbmVfc2V0X3Byb3BlcnR5LAogfTsKIApAQCAt MTU1Myw3ICsxNTQ1LDcgQEAgaW50ZWxfcGxhbmVfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 LCBlbnVtIHBpcGUgcGlwZSwgaW50IHBsYW5lKQogCWludGVsX3BsYW5lLT5jb21taXRfcGxhbmUg PSBpbnRlbF9jb21taXRfc3ByaXRlX3BsYW5lOwogCXBvc3NpYmxlX2NydGNzID0gKDEgPDwgcGlw ZSk7CiAJcmV0ID0gZHJtX3VuaXZlcnNhbF9wbGFuZV9pbml0KGRldiwgJmludGVsX3BsYW5lLT5i YXNlLCBwb3NzaWJsZV9jcnRjcywKLQkJCQkgICAgICAgJmludGVsX3BsYW5lX2Z1bmNzLAorCQkJ CSAgICAgICAmaW50ZWxfc3ByaXRlX3BsYW5lX2Z1bmNzLAogCQkJCSAgICAgICBwbGFuZV9mb3Jt YXRzLCBudW1fcGxhbmVfZm9ybWF0cywKIAkJCQkgICAgICAgRFJNX1BMQU5FX1RZUEVfT1ZFUkxB WSk7CiAJaWYgKHJldCkgewotLSAKMS44LjUuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9pbnRlbC1nZngK