From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matt Roper Subject: [PATCH 3/6] drm/plane-helper: Add transitional helper for .set_plane(). Date: Thu, 15 Jan 2015 18:34:21 -0800 Message-ID: <1421375664-30550-4-git-send-email-matthew.d.roper@intel.com> References: <1421375664-30550-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: <1421375664-30550-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 Cc: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org QWRkIGEgdHJhbnNpdGlvbmFsIGhlbHBlciBmb3IgcGxhbmVzJyAuc2V0X3Byb3BlcnR5KCkgZW50 cnlwb2ludCwKc2ltaWxhciB0byB3aGF0IHdlIGFscmVhZHkgaGF2ZSBmb3IgLnVwZGF0ZV9wbGFu ZSgpIGFuZAouZGlzYWJsZV9wbGFuZSgpLiAgVGhpcyBhbGxvd3MgZHJpdmVycyB0aGF0IGFyZSBz dGlsbCBpbiB0aGUgcHJvY2VzcyBvZgp0cmFuc2l0aW9uaW5nIHRvIGltcGxlbWVudCBhbmQgZXhl cmNpc2UgdGhlIC5hdG9taWNfc2V0X3Byb3BlcnR5KCkKZHJpdmVyIGVudHJ5cG9pbnQgdGhhdCB3 aWxsIGV2ZW50dWFsbHkgYmUgdXNlZCBieSBhdG9taWMuCgpDYzogZHJpLWRldmVsQGxpc3RzLmZy ZWVkZXNrdG9wLm9yZwpTaWduZWQtb2ZmLWJ5OiBNYXR0IFJvcGVyIDxtYXR0aGV3LmQucm9wZXJA aW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9kcm1fcGxhbmVfaGVscGVyLmMgfCAxMDUg KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKwogaW5jbHVkZS9kcm0vZHJtX3Bs YW5lX2hlbHBlci5oICAgICB8ICAgMyArKwogMiBmaWxlcyBjaGFuZ2VkLCAxMDggaW5zZXJ0aW9u cygrKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fcGxhbmVfaGVscGVyLmMgYi9k cml2ZXJzL2dwdS9kcm0vZHJtX3BsYW5lX2hlbHBlci5jCmluZGV4IGYyNGM0Y2YuLjFiMWU5Mjcg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fcGxhbmVfaGVscGVyLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2RybV9wbGFuZV9oZWxwZXIuYwpAQCAtNTc4LDMgKzU3OCwxMDggQEAgaW50 IGRybV9wbGFuZV9oZWxwZXJfZGlzYWJsZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSkKIAlyZXR1 cm4gZHJtX3BsYW5lX2hlbHBlcl9jb21taXQocGxhbmUsIHBsYW5lX3N0YXRlLCBwbGFuZS0+ZmIp OwogfQogRVhQT1JUX1NZTUJPTChkcm1fcGxhbmVfaGVscGVyX2Rpc2FibGUpOworCisvKioKKyAq IGRybV9wbGFuZV9oZWxwZXJfc2V0X3Byb3BlcnR5KCkgLSBUcmFuc2l0aW9uYWwgaGVscGVyIGZv ciBwcm9wZXJ0eSB1cGRhdGVzCisgKiBAcGxhbmU6IHBsYW5lIG9iamVjdCB0byB1cGRhdGUKKyAq IEBwcm9wOiBwcm9wZXJ0eSB0byB1cGRhdGUKKyAqIEB2YWw6IHZhbHVlIHRvIHNldCBwcm9wZXJ0 eSB0bworICoKKyAqIFByb3ZpZGVzIGEgZGVmYXVsdCBwbGFuZSBwcm9wZXJ0eSBoYW5kbGVyIHVz aW5nIHRoZSBhdG9taWMgcGxhbmUgdXBkYXRlCisgKiBmdW5jdGlvbnMuICBEcml2ZXJzIGluIHRo ZSBwcm9jZXNzIG9mIHRyYW5zaXRpb25pbmcgdG8gYXRvbWljIHNob3VsZAorICogcmVwbGFjZSB0 aGVpciBwbGFuZS5zZXRfcHJvcGVydHkoKSBlbnRyeXBvaW50IHdpdGggdGhpcyBmdW5jdGlvbiBh bmQKKyAqIHRoZW4gaW1wbGVtZW50IHRoZSBwbGFuZS5hdG9taWNfc2V0X3Byb3BlcnR5KCkgZW50 cnlwb2ludC4KKyAqCisgKiBUaGlzIGlzIHVzZWZ1bCBmb3IgcGllY2V3aXNlIHRyYW5zaXRpb25p bmcgb2YgYSBkcml2ZXIgdG8gdGhlIGF0b21pYyBoZWxwZXJzLgorICoKKyAqIE5vdGUgdGhhdCB0 aGlzIGhlbHBlciBhc3N1bWVzIHRoYXQgbm8gaGFyZHdhcmUgcHJvZ3JhbW1pbmcgc2hvdWxkIGJl CisgKiBwZXJmb3JtZWQgaWYgdGhlIHBsYW5lIGlzIGRpc2FibGVkLiAgV2hlbiB0aGUgcGxhbmUg aXMgbm90IGF0dGFjaGVkIHRvIGEKKyAqIGNydGMsIHdlIGp1c3Qgc3dhcCBpbiB0aGUgdmFsaWRh dGVkIHBsYW5lIHN0YXRlIGFuZCByZXR1cm47IHRoZXJlJ3Mgbm8KKyAqIGNhbGwgdG8gYXRvbWlj X2JlZ2luKCkvYXRvbWljX3VwZGF0ZSgpL2F0b21pY19mbHVzaCgpLgorICoKKyAqIFJFVFVSTlM6 CisgKiBaZXJvIG9uIHN1Y2Nlc3MsIGVycm9yIGNvZGUgb24gZmFpbHVyZQorICovCitpbnQgZHJt X3BsYW5lX2hlbHBlcl9zZXRfcHJvcGVydHkoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCisJCQkJ ICBzdHJ1Y3QgZHJtX3Byb3BlcnR5ICpwcm9wLAorCQkJCSAgdWludDY0X3QgdmFsKQoreworCXN0 cnVjdCBkcm1fcGxhbmVfc3RhdGUgKnBsYW5lX3N0YXRlOworCXN0cnVjdCBkcm1fcGxhbmVfaGVs cGVyX2Z1bmNzICpwbGFuZV9mdW5jcyA9IHBsYW5lLT5oZWxwZXJfcHJpdmF0ZTsKKwlzdHJ1Y3Qg ZHJtX2NydGNfaGVscGVyX2Z1bmNzICpjcnRjX2Z1bmNzOworCWludCByZXQ7CisKKwkvKgorCSAq IERyaXZlcnMgbWF5IG5vdCBoYXZlIGFuIC5hdG9taWNfc2V0X3Byb3BlcnR5KCkgaGFuZGxlciBp ZiB0aGV5IGhhdmUKKwkgKiBubyBkcml2ZXItc3BlY2lmaWMgcHJvcGVydGllcywgYnV0IHRoZXkg Z2VuZXJhbGx5IHdvdWxkbid0IHNldHVwIGEKKwkgKiAuc2V0X3Byb3BlcnR5KCkgaGFuZGxlciAo cG9pbnRpbmcgdG8gdGhpcyBmdW5jdGlvbikgZm9yIHRoZSBwbGFuZSBpbgorCSAqIHRoYXQgY2Fz ZSBlaXRoZXI7IHRocm93IGEgd2FybmluZyBzaW5jZSB0aGlzIGlzIHByb2JhYmx5IGEgbWlzdGFr ZS4KKwkgKi8KKwlpZiAoV0FSTl9PTighcGxhbmUtPmZ1bmNzLT5hdG9taWNfc2V0X3Byb3BlcnR5 KSkKKwkJcmV0dXJuIC1FSU5WQUw7CisKKwlpZiAocGxhbmUtPmZ1bmNzLT5hdG9taWNfZHVwbGlj YXRlX3N0YXRlKQorCQlwbGFuZV9zdGF0ZSA9IHBsYW5lLT5mdW5jcy0+YXRvbWljX2R1cGxpY2F0 ZV9zdGF0ZShwbGFuZSk7CisJZWxzZSBpZiAocGxhbmUtPnN0YXRlKQorCQlwbGFuZV9zdGF0ZSA9 IGRybV9hdG9taWNfaGVscGVyX3BsYW5lX2R1cGxpY2F0ZV9zdGF0ZShwbGFuZSk7CisJZWxzZQor CQlwbGFuZV9zdGF0ZSA9IGt6YWxsb2Moc2l6ZW9mKCpwbGFuZV9zdGF0ZSksIEdGUF9LRVJORUwp OworCWlmICghcGxhbmVfc3RhdGUpCisJCXJldHVybiAtRU5PTUVNOworCXBsYW5lX3N0YXRlLT5w bGFuZSA9IHBsYW5lOworCisJLyoKKwkgKiBVcGRhdGUgdGhlIHN0YXRlIG9iamVjdCB3aXRoIHRo ZSBuZXcgcHJvcGVydHkgdmFsdWUgd2Ugd2FudCB0bworCSAqIHNldC4gIElmIHRoZSBwcm9wZXJ0 eSBpcyBub3QgcmVjb2duaXplZCBhcyBhIGRyaXZlci1zcGVjaWZpYyBwcm9wZXJ0eSwKKwkgKiAt RUlOVkFMIHdpbGwgYmUgcmV0dXJuZWQgaGVyZS4KKwkgKi8KKwlyZXQgPSBwbGFuZS0+ZnVuY3Mt PmF0b21pY19zZXRfcHJvcGVydHkocGxhbmUsIHBsYW5lX3N0YXRlLCBwcm9wLCB2YWwpOworCWlm IChyZXQpCisJCWdvdG8gb3V0OworCisJLyoKKwkgKiBDaGVjayB0aGF0IHRoZSB1cGRhdGVkIHBs YW5lIHN0YXRlIGlzIGFjdHVhbGx5IHByb2dyYW1tYWJsZSAoZS5nLiwKKwkgKiBkb2Vzbid0IHZp b2xhdGUgaGFyZHdhcmUgY29uc3RyYWludHMpLgorCSAqLworCWlmIChwbGFuZV9mdW5jcy0+YXRv bWljX2NoZWNrKSB7CisJCXJldCA9IHBsYW5lX2Z1bmNzLT5hdG9taWNfY2hlY2socGxhbmUsIHBs YW5lX3N0YXRlKTsKKwkJaWYgKHJldCkKKwkJCWdvdG8gb3V0OworCX0KKworCS8qIFBvaW50IG9m IG5vIHJldHVybiwgY29tbWl0IHN3IHN0YXRlLiAqLworCXN3YXAocGxhbmUtPnN0YXRlLCBwbGFu ZV9zdGF0ZSk7CisKKwkvKgorCSAqIElmIHRoZSBwbGFuZSBpcyBkaXNhYmxlZCwgd2UncmUgZG9u ZS4gIE5vIGhhcmR3YXJlIHByb2dyYW1taW5nIGlzCisJICogYXR0ZW1wdGVkIHdoZW4gdGhlIHBs YW5lIGlzIGRpc2FibGVkLgorCSAqLworCWlmICghcGxhbmUtPmNydGMpCisJCWdvdG8gb3V0Owor CisJLyogU3RhcnQgaGFyZHdhcmUgdHJhbnNhY3Rpb24gdG8gY29tbWl0IG5ldyBzdGF0ZSB0byBo YXJkd2FyZSAqLworCWNydGNfZnVuY3MgPSBwbGFuZS0+Y3J0Yy0+aGVscGVyX3ByaXZhdGU7CisJ aWYgKGNydGNfZnVuY3MgJiYgY3J0Y19mdW5jcy0+YXRvbWljX2JlZ2luKQorCQljcnRjX2Z1bmNz LT5hdG9taWNfYmVnaW4ocGxhbmUtPmNydGMpOworCXBsYW5lX2Z1bmNzLT5hdG9taWNfdXBkYXRl KHBsYW5lLCBwbGFuZV9zdGF0ZSk7CisJaWYgKGNydGNfZnVuY3MgJiYgY3J0Y19mdW5jcy0+YXRv bWljX2ZsdXNoKQorCQljcnRjX2Z1bmNzLT5hdG9taWNfZmx1c2gocGxhbmUtPmNydGMpOworCisJ LyoKKwkgKiBTaW5jZSB3ZSdyZSBub3QgdXNpbmcgZnVsbCBhdG9taWMgeWV0LCB3ZSBzdGlsbCBu ZWVkIHRvIHVwZGF0ZSB0aGUgc2hhZG93CisJICogcHJvcGVydHkgdmFsdWUgdGhhdCdzIG1hbmFn ZWQgYnkgdGhlIERSTSBjb3JlIHNpbmNlIHRoYXQncyB3aGVyZSB0aGUKKwkgKiBwcm9wZXJ0eSB2 YWx1ZXMgd2lsbCBiZSByZWFkIGJhY2sgZnJvbS4KKwkgKi8KKwlkcm1fb2JqZWN0X3Byb3BlcnR5 X3NldF92YWx1ZSgmcGxhbmUtPmJhc2UsIHByb3AsIHZhbCk7CisKK291dDoKKwlpZiAocGxhbmVf c3RhdGUpIHsKKwkJaWYgKHBsYW5lLT5mdW5jcy0+YXRvbWljX2Rlc3Ryb3lfc3RhdGUpCisJCQlw bGFuZS0+ZnVuY3MtPmF0b21pY19kZXN0cm95X3N0YXRlKHBsYW5lLCBwbGFuZV9zdGF0ZSk7CisJ CWVsc2UKKwkJCWRybV9hdG9taWNfaGVscGVyX3BsYW5lX2Rlc3Ryb3lfc3RhdGUocGxhbmUsIHBs YW5lX3N0YXRlKTsKKwl9CisKKwlyZXR1cm4gcmV0OworfQorRVhQT1JUX1NZTUJPTChkcm1fcGxh bmVfaGVscGVyX3NldF9wcm9wZXJ0eSk7CmRpZmYgLS1naXQgYS9pbmNsdWRlL2RybS9kcm1fcGxh bmVfaGVscGVyLmggYi9pbmNsdWRlL2RybS9kcm1fcGxhbmVfaGVscGVyLmgKaW5kZXggYTE4NTM5 Mi4uNGE1Njk2MSAxMDA2NDQKLS0tIGEvaW5jbHVkZS9kcm0vZHJtX3BsYW5lX2hlbHBlci5oCisr KyBiL2luY2x1ZGUvZHJtL2RybV9wbGFuZV9oZWxwZXIuaApAQCAtMTA3LDYgKzEwNyw5IEBAIGlu dCBkcm1fcGxhbmVfaGVscGVyX3VwZGF0ZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwgc3RydWN0 IGRybV9jcnRjICpjcnRjLAogCQkJICAgIHVpbnQzMl90IHNyY194LCB1aW50MzJfdCBzcmNfeSwK IAkJCSAgICB1aW50MzJfdCBzcmNfdywgdWludDMyX3Qgc3JjX2gpOwogaW50IGRybV9wbGFuZV9o ZWxwZXJfZGlzYWJsZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSk7CitpbnQgZHJtX3BsYW5lX2hl bHBlcl9zZXRfcHJvcGVydHkoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCisJCQkJICBzdHJ1Y3Qg ZHJtX3Byb3BlcnR5ICpwcm9wLAorCQkJCSAgdWludDY0X3QgdmFsKTsKIAogLyogRm9yIHVzZSBi eSBkcm1fY3J0Y19oZWxwZXIuYyAqLwogaW50IGRybV9wbGFuZV9oZWxwZXJfY29tbWl0KHN0cnVj dCBkcm1fcGxhbmUgKnBsYW5lLAotLSAKMS44LjUuMQoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h bi9saXN0aW5mby9pbnRlbC1nZngK