From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH v2 12/12] drm/atomic: Allow drm_atomic_helper_swap_state to fail Date: Tue, 11 Jul 2017 16:33:14 +0200 Message-ID: <20170711143314.2148-13-maarten.lankhorst@linux.intel.com> References: <20170711143314.2148-1-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170711143314.2148-1-maarten.lankhorst@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org U2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4 LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19oZWxwZXIuYyB8IDE1 ICsrKysrKystLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDcgaW5zZXJ0aW9ucygrKSwgOCBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19oZWxwZXIu YyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljX2hlbHBlci5jCmluZGV4IGJmYjk4ZmJkMGUw ZS4uMDVhMjJhZWZmYmIwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19o ZWxwZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19oZWxwZXIuYwpAQCAtMjI2 MSwxMyArMjI2MSwxMyBAQCBFWFBPUlRfU1lNQk9MKGRybV9hdG9taWNfaGVscGVyX2NsZWFudXBf cGxhbmVzKTsKICAqCiAgKiBSZXR1cm5zOgogICoKLSAqIEFsd2F5cyByZXR1cm5zIDAsIGNhbm5v dCBmYWlsIHlldC4KKyAqIFJldHVybnMgMCBvbiBzdWNjZXNzLiBDYW4gcmV0dXJuIC1FUkVTVEFS VFNZUyB3aGVuIEBzdGFsbCBpcyB0cnVlIGFuZCB0aGUKKyAqIHdhaXRpbmcgZm9yIHRoZSBwcmV2 aW91cyBjb21taXRzIGhhcyBiZWVuIGludGVycnVwdGVkLgogICovCiBpbnQgZHJtX2F0b21pY19o ZWxwZXJfc3dhcF9zdGF0ZShzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUsCiAJCQkJICBi b29sIHN0YWxsKQogewotCWludCBpOwotCWxvbmcgcmV0OworCWludCBpLCByZXQ7CiAJc3RydWN0 IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvcjsKIAlzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9zdGF0ZSAq b2xkX2Nvbm5fc3RhdGUsICpuZXdfY29ubl9zdGF0ZTsKIAlzdHJ1Y3QgZHJtX2NydGMgKmNydGM7 CkBAIC0yMjkwLDEyICsyMjkwLDExIEBAIGludCBkcm1fYXRvbWljX2hlbHBlcl9zd2FwX3N0YXRl KHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSwKIAkJCWlmICghY29tbWl0KQogCQkJCWNv bnRpbnVlOwogCi0JCQlyZXQgPSB3YWl0X2Zvcl9jb21wbGV0aW9uX3RpbWVvdXQoJmNvbW1pdC0+ aHdfZG9uZSwKLQkJCQkJCQkgIDEwKkhaKTsKLQkJCWlmIChyZXQgPT0gMCkKLQkJCQlEUk1fRVJS T1IoIltDUlRDOiVkOiVzXSBod19kb25lIHRpbWVkIG91dFxuIiwKLQkJCQkJICBjcnRjLT5iYXNl LmlkLCBjcnRjLT5uYW1lKTsKKwkJCXJldCA9IHdhaXRfZm9yX2NvbXBsZXRpb25faW50ZXJydXB0 aWJsZSgmY29tbWl0LT5od19kb25lKTsKIAkJCWRybV9jcnRjX2NvbW1pdF9wdXQoY29tbWl0KTsK KworCQkJaWYgKHJldCkKKwkJCQlyZXR1cm4gcmV0OwogCQl9CiAJfQogCi0tIAoyLjExLjAKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBt YWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=