From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matt Roper Subject: [PATCH 3/7] drm/i915: Clarify sprite plane function names Date: Thu, 13 Nov 2014 10:43:22 -0800 Message-ID: <1415904206-22548-4-git-send-email-matthew.d.roper@intel.com> References: <1415904206-22548-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: In-Reply-To: <1415904206-22548-1-git-send-email-matthew.d.roper@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: intel-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org QSBmZXcgb2YgdGhlIHNwcml0ZS1yZWxhdGVkIGZ1bmN0aW9uIG5hbWVzIGluIGk5MTUgYXJlIHZl cnkgc2ltaWxhcgooaW50ZWxfcGxhbmVfZGlzYWJsZSgpIHZzIGludGVsX2Rpc2FibGVfcGxhbmUo KSBvcgppbnRlbF9lbmFibGVfcGxhbmVzKCkgdnMgaW50ZWxfY3J0Y19lbmFibGVfcGxhbmVzKCkp IGFuZCBkb24ndCBtYWtlIGl0CmNsZWFyIHdoZXRoZXIgdGhleSBvbmx5IG9wZXJhdGUgb24gc3By aXRlIHBsYW5lcywgb3Igd2hldGhlciB0aGV5IGFsc28KYXBwbHkgdG8gYWxsIHVuaXZlcnNhbCBw bGFuZSB0eXBlcy4gIFJlbmFtZSBhIGZldyBmdW5jdGlvbnMgdG8gYmUgbW9yZQpjb25zaXN0ZW50 IHdpdGggb3VyIGZ1bmN0aW9uIG5hbWluZyBmb3IgcHJpbWFyeS9jdXJzb3IgcGxhbmVzIG9yIHRv CmNsYXJpZnkgdGhhdCB0aGV5IGFwcGx5IHNwZWNpZmljYWxseSB0byBzcHJpdGUgcGxhbmVzOgoK IC0gcy9pbnRlbF9kaXNhYmxlX3BsYW5lL2ludGVsX3Nwcml0ZV9wbGFuZV9kaXNhYmxlLwogLSBz L2ludGVsX2Rpc2FibGVfcGxhbmVzL2ludGVsX2Rpc2FibGVfc3ByaXRlX3BsYW5lcy8KIC0gcy9p bnRlbF9lbmFibGVfcGxhbmVzL2ludGVsX2VuYWJsZV9zcHJpdGVfcGxhbmVzLwoKQWxzbywgZHJv cCB0aGUgc3ByaXRlLXNwZWNpZmljIGludGVsX2Rlc3Ryb3lfcGxhbmUoKSBhbmQganVzdCB1c2UK dGhlIHR5cGUtYWdub3N0aWMgaW50ZWxfcGxhbmVfZGVzdHJveSgpIGZ1bmN0aW9uLiAgVGhlIGV4 dHJhICdkaXNhYmxlJwpjYWxsIHRoYXQgaW50ZWxfZGVzdHJveV9wbGFuZSgpIGRpZCBpcyB1bm5l Y2Vzc2FyeSBzaW5jZSB0aGUgcGxhbmUgd2lsbAphbHJlYWR5IGJlIGRpc2FibGVkIGR1ZSB0byBm cmFtZWJ1ZmZlciBkZXN0cnVjdGlvbiBieSB0aGUgcG9pbnQgaXQgZ2V0cwpjYWxsZWQuCgpTaWdu ZWQtb2ZmLWJ5OiBNYXR0IFJvcGVyIDxtYXR0aGV3LmQucm9wZXJAaW50ZWwuY29tPgotLS0KIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDEyICsrKysrKy0tLS0tLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggICAgIHwgIDMgKystCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9zcHJpdGUuYyAgfCAxNCArKystLS0tLS0tLS0tLQogMyBmaWxlcyBjaGFu Z2VkLCAxMSBpbnNlcnRpb25zKCspLCAxOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kaXNwbGF5LmMKaW5kZXggYzY1OThlOS4uNTJjYThjNCAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2Rpc3BsYXkuYwpAQCAtNDAyNCw3ICs0MDI0LDcgQEAgc3RhdGljIHZvaWQgaXJvbmxh a2VfcGZpdF9lbmFibGUoc3RydWN0IGludGVsX2NydGMgKmNydGMpCiAJfQogfQogCi1zdGF0aWMg dm9pZCBpbnRlbF9lbmFibGVfcGxhbmVzKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKK3N0YXRpYyB2 b2lkIGludGVsX2VuYWJsZV9zcHJpdGVfcGxhbmVzKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIHsK IAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+ZGV2OwogCWVudW0gcGlwZSBwaXBlID0g dG9faW50ZWxfY3J0YyhjcnRjKS0+cGlwZTsKQEAgLTQwMzgsNyArNDAzOCw3IEBAIHN0YXRpYyB2 b2lkIGludGVsX2VuYWJsZV9wbGFuZXMoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCX0KIH0KIAot c3RhdGljIHZvaWQgaW50ZWxfZGlzYWJsZV9wbGFuZXMoc3RydWN0IGRybV9jcnRjICpjcnRjKQor c3RhdGljIHZvaWQgaW50ZWxfZGlzYWJsZV9zcHJpdGVfcGxhbmVzKHN0cnVjdCBkcm1fY3J0YyAq Y3J0YykKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+ZGV2OwogCWVudW0gcGlw ZSBwaXBlID0gdG9faW50ZWxfY3J0YyhjcnRjKS0+cGlwZTsKQEAgLTQxODIsNyArNDE4Miw3IEBA IHN0YXRpYyB2b2lkIGludGVsX2NydGNfZW5hYmxlX3BsYW5lcyhzdHJ1Y3QgZHJtX2NydGMgKmNy dGMpCiAJaW50IHBpcGUgPSBpbnRlbF9jcnRjLT5waXBlOwogCiAJaW50ZWxfZW5hYmxlX3ByaW1h cnlfaHdfcGxhbmUoY3J0Yy0+cHJpbWFyeSwgY3J0Yyk7Ci0JaW50ZWxfZW5hYmxlX3BsYW5lcyhj cnRjKTsKKwlpbnRlbF9lbmFibGVfc3ByaXRlX3BsYW5lcyhjcnRjKTsKIAlpbnRlbF9jcnRjX3Vw ZGF0ZV9jdXJzb3IoY3J0YywgdHJ1ZSk7CiAJaW50ZWxfY3J0Y19kcG1zX292ZXJsYXkoaW50ZWxf Y3J0YywgdHJ1ZSk7CiAKQEAgLTQyMTcsNyArNDIxNyw3IEBAIHN0YXRpYyB2b2lkIGludGVsX2Ny dGNfZGlzYWJsZV9wbGFuZXMoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCiAJaW50ZWxfY3J0Y19k cG1zX292ZXJsYXkoaW50ZWxfY3J0YywgZmFsc2UpOwogCWludGVsX2NydGNfdXBkYXRlX2N1cnNv cihjcnRjLCBmYWxzZSk7Ci0JaW50ZWxfZGlzYWJsZV9wbGFuZXMoY3J0Yyk7CisJaW50ZWxfZGlz YWJsZV9zcHJpdGVfcGxhbmVzKGNydGMpOwogCWludGVsX2Rpc2FibGVfcHJpbWFyeV9od19wbGFu ZShjcnRjLT5wcmltYXJ5LCBjcnRjKTsKIAogCS8qCkBAIC0xMTc0NCw3ICsxMTc0NCw3IEBAIGlu dGVsX3ByaW1hcnlfcGxhbmVfc2V0cGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsIHN0cnVj dCBkcm1fY3J0YyAqY3J0YywKIH0KIAogLyogQ29tbW9uIGRlc3RydWN0aW9uIGZ1bmN0aW9uIGZv ciBib3RoIHByaW1hcnkgYW5kIGN1cnNvciBwbGFuZXMgKi8KLXN0YXRpYyB2b2lkIGludGVsX3Bs YW5lX2Rlc3Ryb3koc3RydWN0IGRybV9wbGFuZSAqcGxhbmUpCit2b2lkIGludGVsX3BsYW5lX2Rl c3Ryb3koc3RydWN0IGRybV9wbGFuZSAqcGxhbmUpCiB7CiAJc3RydWN0IGludGVsX3BsYW5lICpp bnRlbF9wbGFuZSA9IHRvX2ludGVsX3BsYW5lKHBsYW5lKTsKIAlkcm1fcGxhbmVfY2xlYW51cChw bGFuZSk7CkBAIC0xMzY5Myw3ICsxMzY5Myw3IEBAIHZvaWQgaW50ZWxfcGxhbmVfZGlzYWJsZShz dHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSkKIAkJaW50ZWxfY3Vyc29yX3BsYW5lX2Rpc2FibGUocGxh bmUpOwogCQlicmVhazsKIAljYXNlIERSTV9QTEFORV9UWVBFX09WRVJMQVk6Ci0JCWludGVsX2Rp c2FibGVfcGxhbmUocGxhbmUpOworCQlpbnRlbF9zcHJpdGVfcGxhbmVfZGlzYWJsZShwbGFuZSk7 CiAJCWJyZWFrOwogCWRlZmF1bHQ6CiAJCVdBUk4oMSwgIlVua25vd24gcGxhbmUgdHlwZSIpOwpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCBkZjE0MjBiLi40OTEzYjNmIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kcnYuaApAQCAtMTE4MSw2ICsxMTgxLDcgQEAgaW50IGludGVsX3BsYW5lX3Nl dF9wcm9wZXJ0eShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAkJCSAgICAgc3RydWN0IGRybV9w cm9wZXJ0eSAqcHJvcCwKIAkJCSAgICAgdWludDY0X3QgdmFsKTsKIGludCBpbnRlbF9wbGFuZV9y ZXN0b3JlKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lKTsKK3ZvaWQgaW50ZWxfcGxhbmVfZGVzdHJv eShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSk7CiBpbnQgaW50ZWxfc3ByaXRlX3NldF9jb2xvcmtl eShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAogCQkJICAgICAgc3RydWN0IGRy bV9maWxlICpmaWxlX3ByaXYpOwogaW50IGludGVsX3Nwcml0ZV9nZXRfY29sb3JrZXkoc3RydWN0 IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKQEAgLTExODgsNyArMTE4OSw3IEBAIGludCBp bnRlbF9zcHJpdGVfZ2V0X2NvbG9ya2V5KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRh dGEsCiBib29sIGludGVsX3BpcGVfdXBkYXRlX3N0YXJ0KHN0cnVjdCBpbnRlbF9jcnRjICpjcnRj LAogCQkJICAgICB1aW50MzJfdCAqc3RhcnRfdmJsX2NvdW50KTsKIHZvaWQgaW50ZWxfcGlwZV91 cGRhdGVfZW5kKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLCB1MzIgc3RhcnRfdmJsX2NvdW50KTsK LWludCBpbnRlbF9kaXNhYmxlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lKTsKK2ludCBp bnRlbF9zcHJpdGVfcGxhbmVfZGlzYWJsZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSk7CiAKIC8q IGludGVsX3R2LmMgKi8KIHZvaWQgaW50ZWxfdHZfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 KTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKaW5kZXggMTE1YWNkMy4uOWU2YTcyYSAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKQEAgLTE0MjYsNyArMTQyNiw3IEBAIGlu dGVsX3VwZGF0ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwgc3RydWN0IGRybV9jcnRj ICpjcnRjLAogfQogCiBpbnQKLWludGVsX2Rpc2FibGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAq cGxhbmUpCitpbnRlbF9zcHJpdGVfcGxhbmVfZGlzYWJsZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFu ZSkKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gcGxhbmUtPmRldjsKIAlzdHJ1Y3QgaW50 ZWxfcGxhbmUgKmludGVsX3BsYW5lID0gdG9faW50ZWxfcGxhbmUocGxhbmUpOwpAQCAtMTQ2OSwx NCArMTQ2OSw2IEBAIGludGVsX2Rpc2FibGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUp CiAJcmV0dXJuIDA7CiB9CiAKLXN0YXRpYyB2b2lkIGludGVsX2Rlc3Ryb3lfcGxhbmUoc3RydWN0 IGRybV9wbGFuZSAqcGxhbmUpCi17Ci0Jc3RydWN0IGludGVsX3BsYW5lICppbnRlbF9wbGFuZSA9 IHRvX2ludGVsX3BsYW5lKHBsYW5lKTsKLQlpbnRlbF9kaXNhYmxlX3BsYW5lKHBsYW5lKTsKLQlk cm1fcGxhbmVfY2xlYW51cChwbGFuZSk7Ci0Ja2ZyZWUoaW50ZWxfcGxhbmUpOwotfQotCiBpbnQg aW50ZWxfc3ByaXRlX3NldF9jb2xvcmtleShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpk YXRhLAogCQkJICAgICAgc3RydWN0IGRybV9maWxlICpmaWxlX3ByaXYpCiB7CkBAIC0xNTc4LDgg KzE1NzAsOCBAQCBpbnQgaW50ZWxfcGxhbmVfcmVzdG9yZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFu ZSkKIAogc3RhdGljIGNvbnN0IHN0cnVjdCBkcm1fcGxhbmVfZnVuY3MgaW50ZWxfcGxhbmVfZnVu Y3MgPSB7CiAJLnVwZGF0ZV9wbGFuZSA9IGludGVsX3VwZGF0ZV9wbGFuZSwKLQkuZGlzYWJsZV9w bGFuZSA9IGludGVsX2Rpc2FibGVfcGxhbmUsCi0JLmRlc3Ryb3kgPSBpbnRlbF9kZXN0cm95X3Bs YW5lLAorCS5kaXNhYmxlX3BsYW5lID0gaW50ZWxfc3ByaXRlX3BsYW5lX2Rpc2FibGUsCisJLmRl c3Ryb3kgPSBpbnRlbF9wbGFuZV9kZXN0cm95LAogCS5zZXRfcHJvcGVydHkgPSBpbnRlbF9wbGFu ZV9zZXRfcHJvcGVydHksCiB9OwogCi0tIAoxLjguNS4xCgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZl bEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWls bWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=