From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH 23/24] drm/i915: Unify plane updates. Date: Mon, 1 Jun 2015 15:27:26 +0200 Message-ID: <1433165247-15928-24-git-send-email-maarten.lankhorst@linux.intel.com> References: <1433165247-15928-1-git-send-email-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mblankhorst.nl (mblankhorst.nl [141.105.120.124]) by gabe.freedesktop.org (Postfix) with ESMTP id AA9C76E614 for ; Mon, 1 Jun 2015 06:27:45 -0700 (PDT) In-Reply-To: <1433165247-15928-1-git-send-email-maarten.lankhorst@linux.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 UmVtb3ZlIGFsbW9zdCBhbGwgdXBkYXRlcyBmcm9tIGJlZ2luL2ZpbmlzaCBjcnRjIGNvbW1pdCBh bmQgY2FsbCB0aGVtCmZyb20gaW50ZWxfYXRvbWljX2NvbW1pdC4KClRoaXMgYWxsb3dzIHVzaW5n IGRybV9hdG9taWNfaGVscGVyX2NvbW1pdF9wbGFuZXNfb25fY3J0YyBvbiBtb2Rlc2V0LgoKU2ln bmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4Lmlu dGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCA1MCAr KysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxNiBp bnNlcnRpb25zKCspLCAzNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNw bGF5LmMKaW5kZXggZjZjNmY4ZjhkZjk1Li40NjgzZDJiYjcxNmEgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kaXNwbGF5LmMKQEAgLTQ3NjMsMTcgKzQ3NjMsNiBAQCBzdGF0aWMgdm9pZCBpbnRl bF9wcmVfcGxhbmVfdXBkYXRlKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQogCQlpbnRlbF9wcmVf ZGlzYWJsZV9wcmltYXJ5KCZjcnRjLT5iYXNlKTsKIH0KIAotc3RhdGljIHZvaWQgaW50ZWxfY3J0 Y19lbmFibGVfcGxhbmVzKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKLXsKLQlzdHJ1Y3QgZHJtX3Bs YW5lICpwOwotCi0JZHJtX2Zvcl9lYWNoX3BsYW5lX21hc2socCwgY3J0Yy0+ZGV2LCBjcnRjLT5z dGF0ZS0+cGxhbmVfbWFzaykgewotCQlzdHJ1Y3QgaW50ZWxfcGxhbmUgKnBsYW5lID0gdG9faW50 ZWxfcGxhbmUocCk7Ci0KLQkJcGxhbmUtPmNvbW1pdF9wbGFuZShwLCB0b19pbnRlbF9wbGFuZV9z dGF0ZShwLT5zdGF0ZSkpOwotCX0KLX0KLQogc3RhdGljIHZvaWQgaW50ZWxfY3J0Y19kaXNhYmxl X3BsYW5lcyhzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJCQkJICAgICAgc3RydWN0IGRybV9jcnRj X3N0YXRlICpvbGRfY3J0Y19zdGF0ZSkKIHsKQEAgLTEyODU2LDIwICsxMjg0NSwyMiBAQCBzdGF0 aWMgaW50IGludGVsX2F0b21pY19jb21taXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAogCS8q IE5vdyBlbmFibGUgdGhlIGNsb2NrcywgcGxhbmUsIHBpcGUsIGFuZCBjb25uZWN0b3JzIHRoYXQg d2Ugc2V0IHVwLiAqLwogCWZvcl9lYWNoX2NydGNfaW5fc3RhdGUoc3RhdGUsIGNydGMsIGNydGNf c3RhdGUsIGkpIHsKLQkJaWYgKCFuZWVkc19tb2Rlc2V0KGNydGMtPnN0YXRlKSkgewotCQkJZHJt X2F0b21pY19oZWxwZXJfY29tbWl0X3BsYW5lc19vbl9jcnRjKGNydGNfc3RhdGUpOwotCQkJY29u dGludWU7Ci0JCX0KKwkJc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9j cnRjKGNydGMpOwogCi0JCWlmIChjcnRjLT5zdGF0ZS0+YWN0aXZlKSB7Ci0JCQl1cGRhdGVfc2Nh bmxpbmVfb2Zmc2V0KHRvX2ludGVsX2NydGMoY3J0YykpOworCQlpZiAoIW5lZWRzX21vZGVzZXQo Y3J0Yy0+c3RhdGUpKSB7CisJCQlpbnRlbF9wcmVfcGxhbmVfdXBkYXRlKGludGVsX2NydGMpOwor CQl9IGVsc2UgaWYgKGNydGMtPnN0YXRlLT5hY3RpdmUpIHsKKwkJCXVwZGF0ZV9zY2FubGluZV9v ZmZzZXQoaW50ZWxfY3J0Yyk7CiAJCQlkZXZfcHJpdi0+ZGlzcGxheS5jcnRjX2VuYWJsZShjcnRj KTsKLQkJCWludGVsX2NydGNfZW5hYmxlX3BsYW5lcyhjcnRjKTsKLQkJfSBlbHNlIHsKLQkJCWlm ICh0b19pbnRlbF9jcnRjKGNydGMpLT5hdG9taWMudXBkYXRlX3dtKQotCQkJCWludGVsX3VwZGF0 ZV93YXRlcm1hcmtzKGNydGMpOwogCQl9Ci0JCWludGVsX3Bvc3RfcGxhbmVfdXBkYXRlKHRvX2lu dGVsX2NydGMoY3J0YykpOworCisJCWlmIChpbnRlbF9jcnRjLT5hdG9taWMudXBkYXRlX3dtKQor CQkJaW50ZWxfdXBkYXRlX3dhdGVybWFya3MoY3J0Yyk7CisKKwkJaWYgKGNydGMtPnN0YXRlLT5h Y3RpdmUpCisJCQlkcm1fYXRvbWljX2hlbHBlcl9jb21taXRfcGxhbmVzX29uX2NydGMoY3J0Y19z dGF0ZSk7CisKKwkJaW50ZWxfcG9zdF9wbGFuZV91cGRhdGUoaW50ZWxfY3J0Yyk7CiAJfQogCiAJ LyogRklYTUU6IGFkZCBzdWJwaXhlbCBvcmRlciAqLwpAQCAtMTMyNDcsMjAgKzEzMjM4LDEzIEBA IHN0YXRpYyB2b2lkIGludGVsX2JlZ2luX2NydGNfY29tbWl0KHN0cnVjdCBkcm1fY3J0YyAqY3J0 YykKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+ZGV2OwogCXN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJc3RydWN0IGludGVsX2Ny dGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOwotCXN0cnVjdCBkcm1fY3J0Y19z dGF0ZSAqY3J0Y19zdGF0ZSA9IGludGVsX2NydGMtPmJhc2Uuc3RhdGU7Ci0KLQlpbnRlbF9wcmVf cGxhbmVfdXBkYXRlKGludGVsX2NydGMpOwotCi0JaWYgKGludGVsX2NydGMtPmF0b21pYy51cGRh dGVfd20pCi0JCWludGVsX3VwZGF0ZV93YXRlcm1hcmtzKGNydGMpOwogCiAJaW50ZWxfcnVudGlt ZV9wbV9nZXQoZGV2X3ByaXYpOwogCiAJLyogUGVyZm9ybSB2YmxhbmsgZXZhc2lvbiBhcm91bmQg Y29tbWl0IG9wZXJhdGlvbiAqLwotCWlmIChjcnRjX3N0YXRlLT5hY3RpdmUgJiYgIW5lZWRzX21v ZGVzZXQoY3J0Y19zdGF0ZSkpCi0JCWludGVsX2NydGMtPmF0b21pYy5ldmFkZSA9Ci0JCQlpbnRl bF9waXBlX3VwZGF0ZV9zdGFydChpbnRlbF9jcnRjLAotCQkJCQkJJmludGVsX2NydGMtPmF0b21p Yy5zdGFydF92YmxfY291bnQpOworCWludGVsX2NydGMtPmF0b21pYy5ldmFkZSA9CisJCWludGVs X3BpcGVfdXBkYXRlX3N0YXJ0KGludGVsX2NydGMsCisJCQkJCSZpbnRlbF9jcnRjLT5hdG9taWMu c3RhcnRfdmJsX2NvdW50KTsKIAogCWlmIChpbnRlbF9jcnRjLT5hdG9taWMuc2tsX3VwZGF0ZV9z Y2FsZXIwKSB7CiAJCXVpbnQzMl90IHBzX2N0cmwsIHBzX3dpbl9zejsKQEAgLTEzMjg2LDggKzEz MjcwLDYgQEAgc3RhdGljIHZvaWQgaW50ZWxfZmluaXNoX2NydGNfY29tbWl0KHN0cnVjdCBkcm1f Y3J0YyAqY3J0YykKIAkJCQkgICAgICBpbnRlbF9jcnRjLT5hdG9taWMuc3RhcnRfdmJsX2NvdW50 KTsKIAogCWludGVsX3J1bnRpbWVfcG1fcHV0KGRldl9wcml2KTsKLQotCWludGVsX3Bvc3RfcGxh bmVfdXBkYXRlKGludGVsX2NydGMpOwogfQogCiAvKioKLS0gCjIuMS4wCgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0 CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=