From mboxrd@z Thu Jan  1 00:00:00 1970
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Subject: [PATCH 3/6] drm/atomic: Clean up wait_for_vblanks
Date: Thu,  8 Dec 2016 14:45:26 +0100
Message-ID: <1481204729-9058-4-git-send-email-maarten.lankhorst@linux.intel.com>
References: <1481204729-9058-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: <dri-devel-bounces@lists.freedesktop.org>
In-Reply-To: <1481204729-9058-1-git-send-email-maarten.lankhorst@linux.intel.com>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/dri-devel>,
 <mailto:dri-devel-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/dri-devel>
List-Post: <mailto:dri-devel@lists.freedesktop.org>
List-Help: <mailto:dri-devel-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/dri-devel>,
 <mailto:dri-devel-request@lists.freedesktop.org?subject=subscribe>
Errors-To: dri-devel-bounces@lists.freedesktop.org
Sender: "dri-devel" <dri-devel-bounces@lists.freedesktop.org>
To: dri-devel@lists.freedesktop.org
Cc: intel-gfx@lists.freedesktop.org
List-Id: dri-devel@lists.freedesktop.org

U3RvcCByZWx5aW5nIG9uIGEgcGVyIGNydGNfc3RhdGUgbGFzdF92YmxhbmtfY291bnQsIHdlIGtu
b3cgaW4gYWR2YW5jZQpob3cgbWFueSB0aGVyZSBjYW4gYmUuIEFsc28gc3RvcCByZS11c2luZyBu
ZXdfY3J0Y19zdGF0ZS0+ZW5hYmxlLAp3ZSBjYW4gbm93IHNpbXBseSBzZXQgYSBiaXRtYXNrIHdp
dGggY3J0Y19jcnRjX21hc2suCi0tLQogZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWNfaGVscGVy
LmMgfCAyOSArKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLQogaW5jbHVkZS9kcm0vZHJtX2Ny
dGMuaCAgICAgICAgICAgICAgfCAgNSAtLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCAxNSBpbnNlcnRp
b25zKCspLCAxOSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJt
X2F0b21pY19oZWxwZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljX2hlbHBlci5jCmlu
ZGV4IGQxOTU2MzY1MWUwNy4uY2NmMGJlZDliZjRhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k
cm0vZHJtX2F0b21pY19oZWxwZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19o
ZWxwZXIuYwpAQCAtMTExMCwxOSArMTExMCwyMCBAQCBkcm1fYXRvbWljX2hlbHBlcl93YWl0X2Zv
cl92YmxhbmtzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJc3RydWN0IGRybV9jcnRjICpjcnRj
OwogCXN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqb2xkX2NydGNfc3RhdGU7CiAJaW50IGksIHJldDsK
Kwl1bnNpZ25lZCBjcnRjX21hc2sgPSAwOworCXVuc2lnbmVkIGxhc3RfdmJsYW5rX2NvdW50W2Rl
di0+bW9kZV9jb25maWcubnVtX2NydGNdOworCisJIC8qCisJICAqIExlZ2FjeSBjdXJzb3IgaW9j
dGxzIGFyZSBjb21wbGV0ZWx5IHVuc3luY2VkLCBhbmQgdXNlcnNwYWNlCisJICAqIHJlbGllcyBv
biB0aGF0IChieSBkb2luZyB0b25zIG9mIGN1cnNvciB1cGRhdGVzKS4KKwkgICovCisJaWYgKG9s
ZF9zdGF0ZS0+bGVnYWN5X2N1cnNvcl91cGRhdGUpCisJCXJldHVybjsKIAogCWZvcl9lYWNoX2Ny
dGNfaW5fc3RhdGUob2xkX3N0YXRlLCBjcnRjLCBvbGRfY3J0Y19zdGF0ZSwgaSkgewotCQkvKiBO
byBvbmUgY2FyZXMgYWJvdXQgdGhlIG9sZCBzdGF0ZSwgc28gYWJ1c2UgaXQgZm9yIHRyYWNraW5n
Ci0JCSAqIGFuZCBzdG9yZSB3aGV0aGVyIHdlIGhvbGQgYSB2YmxhbmsgcmVmZXJlbmNlIChhbmQg
c2hvdWxkIGRvIGEKLQkJICogdmJsYW5rIHdhaXQpIGluIHRoZSAtPmVuYWJsZSBib29sZWFuLiAq
LwotCQlvbGRfY3J0Y19zdGF0ZS0+ZW5hYmxlID0gZmFsc2U7Ci0KLQkJaWYgKCFjcnRjLT5zdGF0
ZS0+YWN0aXZlKQotCQkJY29udGludWU7CisJCXN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqbmV3X2Ny
dGNfc3RhdGUgPSBjcnRjLT5zdGF0ZTsKIAotCQkvKiBMZWdhY3kgY3Vyc29yIGlvY3RscyBhcmUg
Y29tcGxldGVseSB1bnN5bmNlZCwgYW5kIHVzZXJzcGFjZQotCQkgKiByZWxpZXMgb24gdGhhdCAo
YnkgZG9pbmcgdG9ucyBvZiBjdXJzb3IgdXBkYXRlcykuICovCi0JCWlmIChvbGRfc3RhdGUtPmxl
Z2FjeV9jdXJzb3JfdXBkYXRlKQorCQlpZiAoIW5ld19jcnRjX3N0YXRlLT5hY3RpdmUpCiAJCQlj
b250aW51ZTsKIAogCQlpZiAoIWRybV9hdG9taWNfaGVscGVyX2ZyYW1lYnVmZmVyX2NoYW5nZWQo
ZGV2LApAQCAtMTEzMywxNiArMTEzNCwxNiBAQCBkcm1fYXRvbWljX2hlbHBlcl93YWl0X2Zvcl92
YmxhbmtzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCWlmIChyZXQgIT0gMCkKIAkJCWNvbnRp
bnVlOwogCi0JCW9sZF9jcnRjX3N0YXRlLT5lbmFibGUgPSB0cnVlOwotCQlvbGRfY3J0Y19zdGF0
ZS0+bGFzdF92YmxhbmtfY291bnQgPSBkcm1fY3J0Y192YmxhbmtfY291bnQoY3J0Yyk7CisJCWNy
dGNfbWFzayB8PSBkcm1fY3J0Y19tYXNrKGNydGMpOworCQlsYXN0X3ZibGFua19jb3VudFtpXSA9
IGRybV9jcnRjX3ZibGFua19jb3VudChjcnRjKTsKIAl9CiAKIAlmb3JfZWFjaF9jcnRjX2luX3N0
YXRlKG9sZF9zdGF0ZSwgY3J0Yywgb2xkX2NydGNfc3RhdGUsIGkpIHsKLQkJaWYgKCFvbGRfY3J0
Y19zdGF0ZS0+ZW5hYmxlKQorCQlpZiAoIShjcnRjX21hc2sgJiBkcm1fY3J0Y19tYXNrKGNydGMp
KSkKIAkJCWNvbnRpbnVlOwogCiAJCXJldCA9IHdhaXRfZXZlbnRfdGltZW91dChkZXYtPnZibGFu
a1tpXS5xdWV1ZSwKLQkJCQlvbGRfY3J0Y19zdGF0ZS0+bGFzdF92YmxhbmtfY291bnQgIT0KKwkJ
CQlsYXN0X3ZibGFua19jb3VudFtpXSAhPQogCQkJCQlkcm1fY3J0Y192YmxhbmtfY291bnQoY3J0
YyksCiAJCQkJbXNlY3NfdG9famlmZmllcyg1MCkpOwogCmRpZmYgLS1naXQgYS9pbmNsdWRlL2Ry
bS9kcm1fY3J0Yy5oIGIvaW5jbHVkZS9kcm0vZHJtX2NydGMuaAppbmRleCA5NDY2NzJmOTdlMWUu
LmUwM2QxOTRiZTA4NiAxMDA2NDQKLS0tIGEvaW5jbHVkZS9kcm0vZHJtX2NydGMuaAorKysgYi9p
bmNsdWRlL2RybS9kcm1fY3J0Yy5oCkBAIC05Myw4ICs5Myw2IEBAIHN0cnVjdCBkcm1fcGxhbmVf
aGVscGVyX2Z1bmNzOwogICogQHBsYW5lX21hc2s6IGJpdG1hc2sgb2YgKDEgPDwgZHJtX3BsYW5l
X2luZGV4KHBsYW5lKSkgb2YgYXR0YWNoZWQgcGxhbmVzCiAgKiBAY29ubmVjdG9yX21hc2s6IGJp
dG1hc2sgb2YgKDEgPDwgZHJtX2Nvbm5lY3Rvcl9pbmRleChjb25uZWN0b3IpKSBvZiBhdHRhY2hl
ZCBjb25uZWN0b3JzCiAgKiBAZW5jb2Rlcl9tYXNrOiBiaXRtYXNrIG9mICgxIDw8IGRybV9lbmNv
ZGVyX2luZGV4KGVuY29kZXIpKSBvZiBhdHRhY2hlZCBlbmNvZGVycwotICogQGxhc3RfdmJsYW5r
X2NvdW50OiBmb3IgaGVscGVycyBhbmQgZHJpdmVycyB0byBjYXB0dXJlIHRoZSB2Ymxhbmsgb2Yg
dGhlCi0gKiAJdXBkYXRlIHRvIGVuc3VyZSBmcmFtZWJ1ZmZlciBjbGVhbnVwIGlzbid0IGRvbmUg
dG9vIGVhcmx5CiAgKiBAYWRqdXN0ZWRfbW9kZTogZm9yIHVzZSBieSBoZWxwZXJzIGFuZCBkcml2
ZXJzIHRvIGNvbXB1dGUgYWRqdXN0ZWQgbW9kZSB0aW1pbmdzCiAgKiBAbW9kZTogY3VycmVudCBt
b2RlIHRpbWluZ3MKICAqIEBtb2RlX2Jsb2I6ICZkcm1fcHJvcGVydHlfYmxvYiBmb3IgQG1vZGUK
QEAgLTE0MCw5ICsxMzgsNiBAQCBzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgewogCXUzMiBjb25uZWN0
b3JfbWFzazsKIAl1MzIgZW5jb2Rlcl9tYXNrOwogCi0JLyogbGFzdF92YmxhbmtfY291bnQ6IGZv
ciB2Ymxhbmsgd2FpdHMgYmVmb3JlIGNsZWFudXAgKi8KLQl1MzIgbGFzdF92YmxhbmtfY291bnQ7
Ci0KIAkvKiBhZGp1c3RlZF9tb2RlOiBmb3IgdXNlIGJ5IGhlbHBlcnMgYW5kIGRyaXZlcnMgKi8K
IAlzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSBhZGp1c3RlZF9tb2RlOwogCi0tIAoyLjcuNAoKX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1h
aWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMu
ZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==