From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH] drm/atomic: Fix bookkeeping with TEST_ONLY, v3. Date: Mon, 31 Aug 2015 12:25:04 +0200 Message-ID: <1441016704-2699-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: 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 Q29tbWl0IGVjOWY5MzJlZDQxNjIyZDEyMGRlNTJhNWI1MjVlNGQ3N2I5ZWYxN2UKImRybS9hdG9t aWM6IENsZWFudXAgb24gZXJyb3IgcHJvcGVybHkgaW4gdGhlIGF0b21pYyBpb2N0bC4iCmNsZWFu ZWQgdXAgc29tZSBlcnJvciBwYXRocywgYnV0IGRpZG4ndCBmaXggdGhlIFRFU1RfT05MWSBwYXRo LgpJbiB0aGUgY2hlY2sgb25seSBjYXNlIHBsYW5lLT5mYiBzaG91bGRuJ3QgYmUgdXBkYXRlZCwg YW5kCnRoZSB2YmxhbmsgZXZlbnRzIHNob3VsZCBiZSBjbGVhcmVkIGFzIG9uIGZhaWx1cmUuCgpD aGFuZ2VzIHNpbmNlIHYxOgotIEZpeCAtRURFQURMSyBoYW5kbGluZyBvZiB2YmxhbmsgZXZlbnRz IHRvby4KLSBGcmVlIHN0YXRlIGxhc3Qgd2l0aCBDSEVDS19PTkxZLgpDaGFuZ2VzIHNpbmNlIHYy OgotIEFkZCBjb21tZW50IGFib3V0IGZyZWVpbmcgY3J0Y19zdGF0ZS0+ZXZlbnQgd2l0aCBURVNU X09OTFkuCiAgKERhbmllbCBTdG9uZSkKClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0 IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+ClJldmlld2VkLWJ5OiBEYW5pZWwg U3RvbmUgPGRhbmllbHNAY29sbGFib3JhLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vZHJtX2F0 b21pYy5jIHwgMzkgKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tCiAxIGZp bGUgY2hhbmdlZCwgMjMgaW5zZXJ0aW9ucygrKSwgMTYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWMuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRv bWljLmMKaW5kZXggZTUxNTI2MWQwYTdmLi45NDBmODBiYmYxOTIgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9kcm1fYXRvbWljLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWMu YwpAQCAtMTU0MCw3ICsxNTQwLDggQEAgcmV0cnk6CiAJCQljb3BpZWRfcHJvcHMrKzsKIAkJfQog Ci0JCWlmIChvYmotPnR5cGUgPT0gRFJNX01PREVfT0JKRUNUX1BMQU5FICYmIGNvdW50X3Byb3Bz KSB7CisJCWlmIChvYmotPnR5cGUgPT0gRFJNX01PREVfT0JKRUNUX1BMQU5FICYmIGNvdW50X3By b3BzICYmCisJCSAgICAhKGFyZy0+ZmxhZ3MgJiBEUk1fTU9ERV9BVE9NSUNfVEVTVF9PTkxZKSkg ewogCQkJcGxhbmUgPSBvYmpfdG9fcGxhbmUob2JqKTsKIAkJCXBsYW5lX21hc2sgfD0gKDEgPDwg ZHJtX3BsYW5lX2luZGV4KHBsYW5lKSk7CiAJCQlwbGFuZS0+b2xkX2ZiID0gcGxhbmUtPmZiOwpA QCAtMTU2MiwxMCArMTU2MywxMSBAQCByZXRyeToKIAl9CiAKIAlpZiAoYXJnLT5mbGFncyAmIERS TV9NT0RFX0FUT01JQ19URVNUX09OTFkpIHsKKwkJLyoKKwkJICogVW5saWtlIGNvbW1pdCwgY2hl Y2tfb25seSBkb2VzIG5vdCBjbGVhbiB1cCBzdGF0ZS4KKwkJICogQmVsb3cgd2UgY2FsbCBkcm1f YXRvbWljX3N0YXRlX2ZyZWUgZm9yIGl0LgorCQkgKi8KIAkJcmV0ID0gZHJtX2F0b21pY19jaGVj a19vbmx5KHN0YXRlKTsKLQkJLyogX2NoZWNrX29ubHkoKSBkb2VzIG5vdCBmcmVlIHN0YXRlLCB1 bmxpa2UgX2NvbW1pdCgpICovCi0JCWlmICghcmV0KQotCQkJZHJtX2F0b21pY19zdGF0ZV9mcmVl KHN0YXRlKTsKIAl9IGVsc2UgaWYgKGFyZy0+ZmxhZ3MgJiBEUk1fTU9ERV9BVE9NSUNfTk9OQkxP Q0spIHsKIAkJcmV0ID0gZHJtX2F0b21pY19hc3luY19jb21taXQoc3RhdGUpOwogCX0gZWxzZSB7 CkBAIC0xNTkyLDI1ICsxNTk0LDMwIEBAIG91dDoKIAkJcGxhbmUtPm9sZF9mYiA9IE5VTEw7CiAJ fQogCisJaWYgKHJldCAmJiBhcmctPmZsYWdzICYgRFJNX01PREVfUEFHRV9GTElQX0VWRU5UKSB7 CisJCS8qCisJCSAqIFRFU1RfT05MWSBhbmQgUEFHRV9GTElQX0VWRU5UIGFyZSBtdXR1YWxseSBl eGNsdXNpdmUsCisJCSAqIGlmIHRoZXkgd2VyZW4ndCwgdGhpcyBjb2RlIHNob3VsZCBiZSBjYWxs ZWQgb24gc3VjY2VzcworCQkgKiBmb3IgVEVTVF9PTkxZIHRvby4KKwkJICovCisKKwkJZm9yX2Vh Y2hfY3J0Y19pbl9zdGF0ZShzdGF0ZSwgY3J0YywgY3J0Y19zdGF0ZSwgaSkgeworCQkJaWYgKCFj cnRjX3N0YXRlLT5ldmVudCkKKwkJCQljb250aW51ZTsKKworCQkJZGVzdHJveV92YmxhbmtfZXZl bnQoZGV2LCBmaWxlX3ByaXYsCisJCQkJCSAgICAgY3J0Y19zdGF0ZS0+ZXZlbnQpOworCQl9CisJ fQorCiAJaWYgKHJldCA9PSAtRURFQURMSykgewogCQlkcm1fYXRvbWljX3N0YXRlX2NsZWFyKHN0 YXRlKTsKIAkJZHJtX21vZGVzZXRfYmFja29mZigmY3R4KTsKIAkJZ290byByZXRyeTsKIAl9CiAK LQlpZiAocmV0KSB7Ci0JCWlmIChhcmctPmZsYWdzICYgRFJNX01PREVfUEFHRV9GTElQX0VWRU5U KSB7Ci0JCQlmb3JfZWFjaF9jcnRjX2luX3N0YXRlKHN0YXRlLCBjcnRjLCBjcnRjX3N0YXRlLCBp KSB7Ci0JCQkJaWYgKCFjcnRjX3N0YXRlLT5ldmVudCkKLQkJCQkJY29udGludWU7Ci0KLQkJCQlk ZXN0cm95X3ZibGFua19ldmVudChkZXYsIGZpbGVfcHJpdiwKLQkJCQkJCSAgICAgY3J0Y19zdGF0 ZS0+ZXZlbnQpOwotCQkJfQotCQl9Ci0KKwlpZiAocmV0IHx8IGFyZy0+ZmxhZ3MgJiBEUk1fTU9E RV9BVE9NSUNfVEVTVF9PTkxZKQogCQlkcm1fYXRvbWljX3N0YXRlX2ZyZWUoc3RhdGUpOwotCX0K IAogCWRybV9tb2Rlc2V0X2Ryb3BfbG9ja3MoJmN0eCk7CiAJZHJtX21vZGVzZXRfYWNxdWlyZV9m aW5pKCZjdHgpOwotLSAKMi4xLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVk ZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8v ZHJpLWRldmVsCg==