From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH v2 4/4] drm/atomic: Add checks to ensure get_state is not called after swapping. Date: Wed, 16 Nov 2016 14:58:08 +0100 Message-ID: <1479304688-24010-5-git-send-email-maarten.lankhorst@linux.intel.com> References: <1479304688-24010-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 ESMTPS id 895336E6B1 for ; Wed, 16 Nov 2016 13:58:14 +0000 (UTC) In-Reply-To: <1479304688-24010-1-git-send-email-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 List-Id: dri-devel@lists.freedesktop.org VGhpcyBpc24ndCBhbGxvd2VkLCBjYWxsZXJzIHNob3VsZCB1c2UgZ2V0X25ld19zdGF0ZSBvciBn ZXRfb2xkX3N0YXRlLApidXQgbGV0cyBiZSBwYXJhbm9pZC4uCgpTaWduZWQtb2ZmLWJ5OiBNYWFy dGVuIExhbmtob3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwuY29tPgotLS0KIGRy aXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljLmMgfCAxOCArKysrKysrKysrKysrKystLS0KIDEgZmls ZSBjaGFuZ2VkLCAxNSBpbnNlcnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljLmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21p Yy5jCmluZGV4IGU4MDY2MzE1NDg1OC4uODEwODBlMzcwOTFkIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vZHJtX2F0b21pYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljLmMK QEAgLTI2Nyw4ICsyNjcsMTIgQEAgZHJtX2F0b21pY19nZXRfY3J0Y19zdGF0ZShzdHJ1Y3QgZHJt X2F0b21pY19zdGF0ZSAqc3RhdGUsCiAJV0FSTl9PTighc3RhdGUtPmFjcXVpcmVfY3R4KTsKIAog CWNydGNfc3RhdGUgPSBkcm1fYXRvbWljX2dldF9leGlzdGluZ19jcnRjX3N0YXRlKHN0YXRlLCBj cnRjKTsKLQlpZiAoY3J0Y19zdGF0ZSkKKwlpZiAoY3J0Y19zdGF0ZSkgeworCQlXQVJOKHN0YXRl LT5jcnRjc1tpbmRleF0uc3RhdGUgPT0gc3RhdGUtPmNydGNzW2luZGV4XS5vbGRfc3RhdGUsCisJ CSAgICAgImRybV9hdG9taWNfZ2V0X2NydGNfc3RhdGUoKSB1c2VkIGFmdGVyIHN3YXBwaW5nIHN0 YXRlIVxuIik7CisKIAkJcmV0dXJuIGNydGNfc3RhdGU7CisJfQogCiAJcmV0ID0gZHJtX21vZGVz ZXRfbG9jaygmY3J0Yy0+bXV0ZXgsIHN0YXRlLT5hY3F1aXJlX2N0eCk7CiAJaWYgKHJldCkKQEAg LTY1NSw4ICs2NTksMTIgQEAgZHJtX2F0b21pY19nZXRfcGxhbmVfc3RhdGUoc3RydWN0IGRybV9h dG9taWNfc3RhdGUgKnN0YXRlLAogCVdBUk5fT04oIXN0YXRlLT5hY3F1aXJlX2N0eCk7CiAKIAlw bGFuZV9zdGF0ZSA9IGRybV9hdG9taWNfZ2V0X2V4aXN0aW5nX3BsYW5lX3N0YXRlKHN0YXRlLCBw bGFuZSk7Ci0JaWYgKHBsYW5lX3N0YXRlKQorCWlmIChwbGFuZV9zdGF0ZSkgeworCQlXQVJOKHN0 YXRlLT5wbGFuZXNbaW5kZXhdLnN0YXRlID09IHN0YXRlLT5wbGFuZXNbaW5kZXhdLm9sZF9zdGF0 ZSwKKwkJICAgICAiZHJtX2F0b21pY19nZXRfcGxhbmVfc3RhdGUoKSB1c2VkIGFmdGVyIHN3YXBw aW5nIHN0YXRlIVxuIik7CisKIAkJcmV0dXJuIHBsYW5lX3N0YXRlOworCX0KIAogCXJldCA9IGRy bV9tb2Rlc2V0X2xvY2soJnBsYW5lLT5tdXRleCwgc3RhdGUtPmFjcXVpcmVfY3R4KTsKIAlpZiAo cmV0KQpAQCAtOTg4LDggKzk5NiwxMiBAQCBkcm1fYXRvbWljX2dldF9jb25uZWN0b3Jfc3RhdGUo c3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlLAogCQlzdGF0ZS0+bnVtX2Nvbm5lY3RvciA9 IGFsbG9jOwogCX0KIAotCWlmIChzdGF0ZS0+Y29ubmVjdG9yc1tpbmRleF0uc3RhdGUpCisJaWYg KHN0YXRlLT5jb25uZWN0b3JzW2luZGV4XS5zdGF0ZSkgeworCQlXQVJOKHN0YXRlLT5jb25uZWN0 b3JzW2luZGV4XS5zdGF0ZSA9PSBzdGF0ZS0+Y29ubmVjdG9yc1tpbmRleF0ub2xkX3N0YXRlLAor CQkgICAgICJkcm1fYXRvbWljX2dldF9jb25uZWN0b3Jfc3RhdGUoKSB1c2VkIGFmdGVyIHN3YXBw aW5nIHN0YXRlIVxuIik7CisKIAkJcmV0dXJuIHN0YXRlLT5jb25uZWN0b3JzW2luZGV4XS5zdGF0 ZTsKKwl9CiAKIAljb25uZWN0b3Jfc3RhdGUgPSBjb25uZWN0b3ItPmZ1bmNzLT5hdG9taWNfZHVw bGljYXRlX3N0YXRlKGNvbm5lY3Rvcik7CiAJaWYgKCFjb25uZWN0b3Jfc3RhdGUpCi0tIAoyLjcu NAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRl dmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8v bGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==