From: Matt Roper Subject: [PATCH 2/4] drm/atomic/helper: Allow duplication of in-flight states Date: Wed, 9 Sep 2015 18:57:53 -0700 Message-ID: <1441850275-20353-3-git-send-email-matthew.d.roper@intel.com> References: <1441850275-20353-1-git-send-email-matthew.d.roper@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1441850275-20353-1-git-send-email-matthew.d.roper@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: intel-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org RHJpdmVycyBtYXkgd2lzaCB0byBkdXBsaWNhdGUgaW4tZmxpZ2h0IHN0YXRlcyBpbnRlcm5hbGx5 LCBidXQgdGhlCl9fZHJtX2F0b21pY19oZWxwZXJfe2NydGMscGxhbmV9X2R1cGxpY2F0ZV9zdGF0 ZSBoZWxwZXIgZnVuY3Rpb25zIGNhbgpvbmx5IGJlIHVzZWQgdG8gbWFrZSBhIGNvcHkgb2Ygc3Rh dGUgdGhhdCBoYXMgYWxyZWFkeSBiZWVuIGNvbW1pdHRlZCB0bwpvYmotPnN0YXRlLiAgTGV0J3Mg dXBkYXRlIHRoZSBoZWxwZXJzIHRvIHRha2UgYW55IGV4aXN0aW5nIHN0YXRlIG9iamVjdAphcyB0 aGVpciBmaXJzdCBwYXJhbWV0ZXIgcmF0aGVyIHRoYW4gdGhlIERSTSBvYmplY3QgcG9pbnRlci4g IFdlIGNhbgp1cGRhdGUgaGFuZGZ1bCBvZiBleGlzdGluZyBjYWxsc2l0ZXMgdG8ganVzdCBwYXNz IG9iai0+c3RhdGUgZm9yIGl0LgoKQ2M6IGRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK U2lnbmVkLW9mZi1ieTogTWF0dCBSb3BlciA8bWF0dGhldy5kLnJvcGVyQGludGVsLmNvbT4KLS0t CiBkcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19oZWxwZXIuYyAgICAgICB8IDEyICsrKysrKy0t LS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljLmMgICAgICAgfCAgMiArLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljX3BsYW5lLmMgfCAgMiArLQogZHJpdmVy cy9ncHUvZHJtL29tYXBkcm0vb21hcF9wbGFuZS5jICAgICAgfCAgMiArLQogZHJpdmVycy9ncHUv ZHJtL3JjYXItZHUvcmNhcl9kdV9wbGFuZS5jICAgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL3Rl Z3JhL2RjLmMgICAgICAgICAgICAgICAgfCAgNCArKy0tCiBpbmNsdWRlL2RybS9kcm1fYXRvbWlj X2hlbHBlci5oICAgICAgICAgICB8ICA0ICsrLS0KIDcgZmlsZXMgY2hhbmdlZCwgMTQgaW5zZXJ0 aW9ucygrKSwgMTQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2Ry bV9hdG9taWNfaGVscGVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19oZWxwZXIuYwpp bmRleCA5OTQxMTY3Li45MTViNDYyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0 b21pY19oZWxwZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19oZWxwZXIuYwpA QCAtMjE0OSwxMCArMjE0OSwxMCBAQCBFWFBPUlRfU1lNQk9MKGRybV9hdG9taWNfaGVscGVyX2Ny dGNfcmVzZXQpOwogICogQ29waWVzIGF0b21pYyBzdGF0ZSBmcm9tIGEgQ1JUQydzIGN1cnJlbnQg c3RhdGUgYW5kIHJlc2V0cyBpbmZlcnJlZCB2YWx1ZXMuCiAgKiBUaGlzIGlzIHVzZWZ1bCBmb3Ig ZHJpdmVycyB0aGF0IHN1YmNsYXNzIHRoZSBDUlRDIHN0YXRlLgogICovCi12b2lkIF9fZHJtX2F0 b21pY19oZWxwZXJfY3J0Y19kdXBsaWNhdGVfc3RhdGUoc3RydWN0IGRybV9jcnRjICpjcnRjLAor dm9pZCBfX2RybV9hdG9taWNfaGVscGVyX2NydGNfZHVwbGljYXRlX3N0YXRlKHN0cnVjdCBkcm1f Y3J0Y19zdGF0ZSAqZnJvbSwKIAkJCQkJICAgICAgc3RydWN0IGRybV9jcnRjX3N0YXRlICpzdGF0 ZSkKIHsKLQltZW1jcHkoc3RhdGUsIGNydGMtPnN0YXRlLCBzaXplb2YoKnN0YXRlKSk7CisJbWVt Y3B5KHN0YXRlLCBmcm9tLCBzaXplb2YoKnN0YXRlKSk7CiAKIAlpZiAoc3RhdGUtPm1vZGVfYmxv YikKIAkJZHJtX3Byb3BlcnR5X3JlZmVyZW5jZV9ibG9iKHN0YXRlLT5tb2RlX2Jsb2IpOwpAQCAt MjE4MSw3ICsyMTgxLDcgQEAgZHJtX2F0b21pY19oZWxwZXJfY3J0Y19kdXBsaWNhdGVfc3RhdGUo c3RydWN0IGRybV9jcnRjICpjcnRjKQogCiAJc3RhdGUgPSBrbWFsbG9jKHNpemVvZigqc3RhdGUp LCBHRlBfS0VSTkVMKTsKIAlpZiAoc3RhdGUpCi0JCV9fZHJtX2F0b21pY19oZWxwZXJfY3J0Y19k dXBsaWNhdGVfc3RhdGUoY3J0Yywgc3RhdGUpOworCQlfX2RybV9hdG9taWNfaGVscGVyX2NydGNf ZHVwbGljYXRlX3N0YXRlKGNydGMtPnN0YXRlLCBzdGF0ZSk7CiAKIAlyZXR1cm4gc3RhdGU7CiB9 CkBAIC0yMjQ4LDEwICsyMjQ4LDEwIEBAIEVYUE9SVF9TWU1CT0woZHJtX2F0b21pY19oZWxwZXJf cGxhbmVfcmVzZXQpOwogICogQ29waWVzIGF0b21pYyBzdGF0ZSBmcm9tIGEgcGxhbmUncyBjdXJy ZW50IHN0YXRlLiBUaGlzIGlzIHVzZWZ1bCBmb3IKICAqIGRyaXZlcnMgdGhhdCBzdWJjbGFzcyB0 aGUgcGxhbmUgc3RhdGUuCiAgKi8KLXZvaWQgX19kcm1fYXRvbWljX2hlbHBlcl9wbGFuZV9kdXBs aWNhdGVfc3RhdGUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCit2b2lkIF9fZHJtX2F0b21pY19o ZWxwZXJfcGxhbmVfZHVwbGljYXRlX3N0YXRlKHN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKmZyb20s CiAJCQkJCSAgICAgICBzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpzdGF0ZSkKIHsKLQltZW1jcHko c3RhdGUsIHBsYW5lLT5zdGF0ZSwgc2l6ZW9mKCpzdGF0ZSkpOworCW1lbWNweShzdGF0ZSwgZnJv bSwgc2l6ZW9mKCpzdGF0ZSkpOwogCiAJaWYgKHN0YXRlLT5mYikKIAkJZHJtX2ZyYW1lYnVmZmVy X3JlZmVyZW5jZShzdGF0ZS0+ZmIpOwpAQCAtMjI3NSw3ICsyMjc1LDcgQEAgZHJtX2F0b21pY19o ZWxwZXJfcGxhbmVfZHVwbGljYXRlX3N0YXRlKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lKQogCiAJ c3RhdGUgPSBrbWFsbG9jKHNpemVvZigqc3RhdGUpLCBHRlBfS0VSTkVMKTsKIAlpZiAoc3RhdGUp Ci0JCV9fZHJtX2F0b21pY19oZWxwZXJfcGxhbmVfZHVwbGljYXRlX3N0YXRlKHBsYW5lLCBzdGF0 ZSk7CisJCV9fZHJtX2F0b21pY19oZWxwZXJfcGxhbmVfZHVwbGljYXRlX3N0YXRlKHBsYW5lLT5z dGF0ZSwgc3RhdGUpOwogCiAJcmV0dXJuIHN0YXRlOwogfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9h dG9taWMuYwppbmRleCAzZmZjMzg1Li40NWIyMWFjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9hdG9taWMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9h dG9taWMuYwpAQCAtOTcsNyArOTcsNyBAQCBpbnRlbF9jcnRjX2R1cGxpY2F0ZV9zdGF0ZShzdHJ1 Y3QgZHJtX2NydGMgKmNydGMpCiAJaWYgKCFjcnRjX3N0YXRlKQogCQlyZXR1cm4gTlVMTDsKIAot CV9fZHJtX2F0b21pY19oZWxwZXJfY3J0Y19kdXBsaWNhdGVfc3RhdGUoY3J0YywgJmNydGNfc3Rh dGUtPmJhc2UpOworCV9fZHJtX2F0b21pY19oZWxwZXJfY3J0Y19kdXBsaWNhdGVfc3RhdGUoY3J0 Yy0+c3RhdGUsICZjcnRjX3N0YXRlLT5iYXNlKTsKIAogCWNydGNfc3RhdGUtPmJhc2UuY3J0YyA9 IGNydGM7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F0b21pY19w bGFuZS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljX3BsYW5lLmMKaW5kZXgg ZjFhYjhlNC4uYWZiYmZlMCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf YXRvbWljX3BsYW5lLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljX3Bs YW5lLmMKQEAgLTg3LDcgKzg3LDcgQEAgaW50ZWxfcGxhbmVfZHVwbGljYXRlX3N0YXRlKHN0cnVj dCBkcm1fcGxhbmUgKnBsYW5lKQogCiAJc3RhdGUgPSAmaW50ZWxfc3RhdGUtPmJhc2U7CiAKLQlf X2RybV9hdG9taWNfaGVscGVyX3BsYW5lX2R1cGxpY2F0ZV9zdGF0ZShwbGFuZSwgc3RhdGUpOwor CV9fZHJtX2F0b21pY19oZWxwZXJfcGxhbmVfZHVwbGljYXRlX3N0YXRlKHBsYW5lLT5zdGF0ZSwg c3RhdGUpOwogCiAJcmV0dXJuIHN0YXRlOwogfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L29tYXBkcm0vb21hcF9wbGFuZS5jIGIvZHJpdmVycy9ncHUvZHJtL29tYXBkcm0vb21hcF9wbGFu ZS5jCmluZGV4IDA5ZTM2M2IuLjg5NjJlNmIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9v bWFwZHJtL29tYXBfcGxhbmUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vb21hcGRybS9vbWFwX3Bs YW5lLmMKQEAgLTI1OCw3ICsyNTgsNyBAQCBvbWFwX3BsYW5lX2F0b21pY19kdXBsaWNhdGVfc3Rh dGUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUpCiAJaWYgKGNvcHkgPT0gTlVMTCkKIAkJcmV0dXJu IE5VTEw7CiAKLQlfX2RybV9hdG9taWNfaGVscGVyX3BsYW5lX2R1cGxpY2F0ZV9zdGF0ZShwbGFu ZSwgJmNvcHktPmJhc2UpOworCV9fZHJtX2F0b21pY19oZWxwZXJfcGxhbmVfZHVwbGljYXRlX3N0 YXRlKHBsYW5lLT5zdGF0ZSwgJmNvcHktPmJhc2UpOwogCiAJcmV0dXJuICZjb3B5LT5iYXNlOwog fQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3JjYXItZHUvcmNhcl9kdV9wbGFuZS5jIGIv ZHJpdmVycy9ncHUvZHJtL3JjYXItZHUvcmNhcl9kdV9wbGFuZS5jCmluZGV4IGM2Njk4NjQuLmUw NTBmNTQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9yY2FyLWR1L3JjYXJfZHVfcGxhbmUu YworKysgYi9kcml2ZXJzL2dwdS9kcm0vcmNhci1kdS9yY2FyX2R1X3BsYW5lLmMKQEAgLTMxMCw3 ICszMTAsNyBAQCByY2FyX2R1X3BsYW5lX2F0b21pY19kdXBsaWNhdGVfc3RhdGUoc3RydWN0IGRy bV9wbGFuZSAqcGxhbmUpCiAJaWYgKGNvcHkgPT0gTlVMTCkKIAkJcmV0dXJuIE5VTEw7CiAKLQlf X2RybV9hdG9taWNfaGVscGVyX3BsYW5lX2R1cGxpY2F0ZV9zdGF0ZShwbGFuZSwgJmNvcHktPnN0 YXRlKTsKKwlfX2RybV9hdG9taWNfaGVscGVyX3BsYW5lX2R1cGxpY2F0ZV9zdGF0ZShwbGFuZS0+ c3RhdGUsICZjb3B5LT5zdGF0ZSk7CiAKIAlyZXR1cm4gJmNvcHktPnN0YXRlOwogfQpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL3RlZ3JhL2RjLmMgYi9kcml2ZXJzL2dwdS9kcm0vdGVncmEv ZGMuYwppbmRleCBiNGFmNGFiLi5lZmQxZmMxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v dGVncmEvZGMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vdGVncmEvZGMuYwpAQCAtNDU1LDcgKzQ1 NSw3IEBAIHN0YXRpYyBzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICp0ZWdyYV9wbGFuZV9hdG9taWNf ZHVwbGljYXRlX3N0YXRlKHN0cnVjdCBkcm1fcGxhCiAJaWYgKCFjb3B5KQogCQlyZXR1cm4gTlVM TDsKIAotCV9fZHJtX2F0b21pY19oZWxwZXJfcGxhbmVfZHVwbGljYXRlX3N0YXRlKHBsYW5lLCAm Y29weS0+YmFzZSk7CisJX19kcm1fYXRvbWljX2hlbHBlcl9wbGFuZV9kdXBsaWNhdGVfc3RhdGUo cGxhbmUtPnN0YXRlLCAmY29weS0+YmFzZSk7CiAJY29weS0+dGlsaW5nID0gc3RhdGUtPnRpbGlu ZzsKIAljb3B5LT5mb3JtYXQgPSBzdGF0ZS0+Zm9ybWF0OwogCWNvcHktPnN3YXAgPSBzdGF0ZS0+ c3dhcDsKQEAgLTEwMzYsNyArMTAzNiw3IEBAIHRlZ3JhX2NydGNfYXRvbWljX2R1cGxpY2F0ZV9z dGF0ZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJaWYgKCFjb3B5KQogCQlyZXR1cm4gTlVMTDsK IAotCV9fZHJtX2F0b21pY19oZWxwZXJfY3J0Y19kdXBsaWNhdGVfc3RhdGUoY3J0YywgJmNvcHkt PmJhc2UpOworCV9fZHJtX2F0b21pY19oZWxwZXJfY3J0Y19kdXBsaWNhdGVfc3RhdGUoY3J0Yy0+ c3RhdGUsICZjb3B5LT5iYXNlKTsKIAljb3B5LT5jbGsgPSBzdGF0ZS0+Y2xrOwogCWNvcHktPnBj bGsgPSBzdGF0ZS0+cGNsazsKIAljb3B5LT5kaXYgPSBzdGF0ZS0+ZGl2OwpkaWZmIC0tZ2l0IGEv aW5jbHVkZS9kcm0vZHJtX2F0b21pY19oZWxwZXIuaCBiL2luY2x1ZGUvZHJtL2RybV9hdG9taWNf aGVscGVyLmgKaW5kZXggMTU0N2ViNC4uNTcwZWJmZiAxMDA2NDQKLS0tIGEvaW5jbHVkZS9kcm0v ZHJtX2F0b21pY19oZWxwZXIuaAorKysgYi9pbmNsdWRlL2RybS9kcm1fYXRvbWljX2hlbHBlci5o CkBAIC05Myw3ICs5Myw3IEBAIGludCBkcm1fYXRvbWljX2hlbHBlcl9jb25uZWN0b3JfZHBtcyhz dHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yLAogCiAvKiBkZWZhdWx0IGltcGxlbWVudGF0 aW9ucyBmb3Igc3RhdGUgaGFuZGxpbmcgKi8KIHZvaWQgZHJtX2F0b21pY19oZWxwZXJfY3J0Y19y ZXNldChzdHJ1Y3QgZHJtX2NydGMgKmNydGMpOwotdm9pZCBfX2RybV9hdG9taWNfaGVscGVyX2Ny dGNfZHVwbGljYXRlX3N0YXRlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKK3ZvaWQgX19kcm1fYXRv bWljX2hlbHBlcl9jcnRjX2R1cGxpY2F0ZV9zdGF0ZShzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmZy b20sCiAJCQkJCSAgICAgIHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqc3RhdGUpOwogc3RydWN0IGRy bV9jcnRjX3N0YXRlICoKIGRybV9hdG9taWNfaGVscGVyX2NydGNfZHVwbGljYXRlX3N0YXRlKHN0 cnVjdCBkcm1fY3J0YyAqY3J0Yyk7CkBAIC0xMDMsNyArMTAzLDcgQEAgdm9pZCBkcm1fYXRvbWlj X2hlbHBlcl9jcnRjX2Rlc3Ryb3lfc3RhdGUoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCQkJCQkg IHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqc3RhdGUpOwogCiB2b2lkIGRybV9hdG9taWNfaGVscGVy X3BsYW5lX3Jlc2V0KHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lKTsKLXZvaWQgX19kcm1fYXRvbWlj X2hlbHBlcl9wbGFuZV9kdXBsaWNhdGVfc3RhdGUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCit2 b2lkIF9fZHJtX2F0b21pY19oZWxwZXJfcGxhbmVfZHVwbGljYXRlX3N0YXRlKHN0cnVjdCBkcm1f cGxhbmVfc3RhdGUgKmZyb20sCiAJCQkJCSAgICAgICBzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpz dGF0ZSk7CiBzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICoKIGRybV9hdG9taWNfaGVscGVyX3BsYW5l X2R1cGxpY2F0ZV9zdGF0ZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSk7Ci0tIAoyLjEuNAoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1h aWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK