From: Andrey Grodzovsky Subject: [PATCH v2 2/3] drm/amd/display: Switch to using atomic_helper for flip. Date: Tue, 17 Jan 2017 00:16:46 -0500 Message-ID: <1484630207-27366-3-git-send-email-Andrey.Grodzovsky@amd.com> References: <1484630207-27366-1-git-send-email-Andrey.Grodzovsky@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1484630207-27366-1-git-send-email-Andrey.Grodzovsky@amd.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: nouveau@lists.freedesktop.org, amd-gfx@lists.freedesktop.org, laurent.pinchart@ideasonboard.com, Alexander.Deucher@amd.com, daniel.vetter@intel.com List-Id: amd-gfx.lists.freedesktop.org U2lnbmVkLW9mZi1ieTogQW5kcmV5IEdyb2R6b3Zza3kgPEFuZHJleS5Hcm9kem92c2t5QGFtZC5j b20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X21vZGUuaCAgICAgICAg ICAgfCAgMSAtCiAuLi4vZHJtL2FtZC9kaXNwbGF5L2FtZGdwdV9kbS9hbWRncHVfZG1fdHlwZXMu YyAgICB8IDkyICsrLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgNiBpbnNl cnRpb25zKCspLCA4NyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v YW1kL2FtZGdwdS9hbWRncHVfbW9kZS5oIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1k Z3B1X21vZGUuaAppbmRleCA0YzBhODZlLi4zZmYzYzE0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfbW9kZS5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQv YW1kZ3B1L2FtZGdwdV9tb2RlLmgKQEAgLTQ0Myw3ICs0NDMsNiBAQCBzdHJ1Y3QgYW1kZ3B1X2Ny dGMgewogCWVudW0gYW1kZ3B1X2ludGVycnVwdF9zdGF0ZSB2c3luY190aW1lcl9lbmFibGVkOwog CiAJaW50IG90Z19pbnN0OwotCXVpbnQzMl90IGZsaXBfZmxhZ3M7CiAJLyogQWZ0ZXIgU2V0IE1v ZGUgdGFyZ2V0IHdpbGwgYmUgbm9uLU5VTEwgKi8KIAlzdHJ1Y3QgZGNfdGFyZ2V0ICp0YXJnZXQ7 CiB9OwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2FtZGdwdV9kbS9h bWRncHVfZG1fdHlwZXMuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9hbWRncHVfZG0v YW1kZ3B1X2RtX3R5cGVzLmMKaW5kZXggYTQ0M2I3MC4uZDQ2NjRiZiAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2FtZGdwdV9kbS9hbWRncHVfZG1fdHlwZXMuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvYW1kZ3B1X2RtL2FtZGdwdV9kbV90eXBlcy5j CkBAIC0xMDYwLDgzICsxMDYwLDYgQEAgc3RhdGljIGludCBkbV9jcnRjX2Z1bmNzX2F0b21pY19z ZXRfcHJvcGVydHkoCiAJcmV0dXJuIDA7CiB9CiAKLQotc3RhdGljIGludCBhbWRncHVfYXRvbWlj X2hlbHBlcl9wYWdlX2ZsaXAoc3RydWN0IGRybV9jcnRjICpjcnRjLAotCQkJCXN0cnVjdCBkcm1f ZnJhbWVidWZmZXIgKmZiLAotCQkJCXN0cnVjdCBkcm1fcGVuZGluZ192YmxhbmtfZXZlbnQgKmV2 ZW50LAotCQkJCXVpbnQzMl90IGZsYWdzKQotewotCXN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lID0g Y3J0Yy0+cHJpbWFyeTsKLQlzdHJ1Y3QgYW1kZ3B1X2NydGMgKmFjcnRjID0gdG9fYW1kZ3B1X2Ny dGMoY3J0Yyk7Ci0Jc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlOwotCXN0cnVjdCBkcm1f cGxhbmVfc3RhdGUgKnBsYW5lX3N0YXRlOwotCXN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19z dGF0ZTsKLQlpbnQgcmV0ID0gMDsKLQotCXN0YXRlID0gZHJtX2F0b21pY19zdGF0ZV9hbGxvYyhw bGFuZS0+ZGV2KTsKLQlpZiAoIXN0YXRlKQotCQlyZXR1cm4gLUVOT01FTTsKLQotCXJldCA9IGRy bV9jcnRjX3ZibGFua19nZXQoY3J0Yyk7Ci0JaWYgKHJldCkKLQkJcmV0dXJuIHJldDsKLQotCXN0 YXRlLT5hY3F1aXJlX2N0eCA9IGRybV9tb2Rlc2V0X2xlZ2FjeV9hY3F1aXJlX2N0eChjcnRjKTsK LXJldHJ5OgotCWNydGNfc3RhdGUgPSBkcm1fYXRvbWljX2dldF9jcnRjX3N0YXRlKHN0YXRlLCBj cnRjKTsKLQlpZiAoSVNfRVJSKGNydGNfc3RhdGUpKSB7Ci0JCXJldCA9IFBUUl9FUlIoY3J0Y19z dGF0ZSk7Ci0JCWdvdG8gZmFpbDsKLQl9Ci0JY3J0Y19zdGF0ZS0+ZXZlbnQgPSBldmVudDsKLQot CXBsYW5lX3N0YXRlID0gZHJtX2F0b21pY19nZXRfcGxhbmVfc3RhdGUoc3RhdGUsIHBsYW5lKTsK LQlpZiAoSVNfRVJSKHBsYW5lX3N0YXRlKSkgewotCQlyZXQgPSBQVFJfRVJSKHBsYW5lX3N0YXRl KTsKLQkJZ290byBmYWlsOwotCX0KLQotCXJldCA9IGRybV9hdG9taWNfc2V0X2NydGNfZm9yX3Bs YW5lKHBsYW5lX3N0YXRlLCBjcnRjKTsKLQlpZiAocmV0ICE9IDApCi0JCWdvdG8gZmFpbDsKLQlk cm1fYXRvbWljX3NldF9mYl9mb3JfcGxhbmUocGxhbmVfc3RhdGUsIGZiKTsKLQotCS8qIE1ha2Ug c3VyZSB3ZSBkb24ndCBhY2NpZGVudGFsbHkgZG8gYSBmdWxsIG1vZGVzZXQuICovCi0Jc3RhdGUt PmFsbG93X21vZGVzZXQgPSBmYWxzZTsKLQlpZiAoIWNydGNfc3RhdGUtPmFjdGl2ZSkgewotCQlE Uk1fREVCVUdfQVRPTUlDKCJbQ1JUQzolZF0gZGlzYWJsZWQsIHJlamVjdGluZyBsZWdhY3kgZmxp cFxuIiwKLQkJCQkgY3J0Yy0+YmFzZS5pZCk7Ci0JCXJldCA9IC1FSU5WQUw7Ci0JCWdvdG8gZmFp bDsKLQl9Ci0JYWNydGMtPmZsaXBfZmxhZ3MgPSBmbGFnczsKLQotCXJldCA9IGRybV9hdG9taWNf bm9uYmxvY2tpbmdfY29tbWl0KHN0YXRlKTsKLQotZmFpbDoKLQlpZiAocmV0ID09IC1FREVBRExL KQotCQlnb3RvIGJhY2tvZmY7Ci0KLQlpZiAocmV0KQotCQlkcm1fY3J0Y192YmxhbmtfcHV0KGNy dGMpOwotCi0JZHJtX2F0b21pY19zdGF0ZV9wdXQoc3RhdGUpOwotCi0JcmV0dXJuIHJldDsKLWJh Y2tvZmY6Ci0JZHJtX2F0b21pY19zdGF0ZV9jbGVhcihzdGF0ZSk7Ci0JZHJtX2F0b21pY19sZWdh Y3lfYmFja29mZihzdGF0ZSk7Ci0KLQkvKgotCSAqIFNvbWVvbmUgbWlnaHQgaGF2ZSBleGNoYW5n ZWQgdGhlIGZyYW1lYnVmZmVyIHdoaWxlIHdlIGRyb3BwZWQgbG9ja3MKLQkgKiBpbiB0aGUgYmFj a29mZiBjb2RlLiBXZSBuZWVkIHRvIGZpeCB1cCB0aGUgZmIgcmVmY291bnQgdHJhY2tpbmcgdGhl Ci0JICogY29yZSBkb2VzIGZvciB1cy4KLQkgKi8KLQlwbGFuZS0+b2xkX2ZiID0gcGxhbmUtPmZi OwotCi0JZ290byByZXRyeTsKLX0KLQogLyogSW1wbGVtZW50ZWQgb25seSB0aGUgb3B0aW9ucyBj dXJyZW50bHkgYXZhaWxpYmxlIGZvciB0aGUgZHJpdmVyICovCiBzdGF0aWMgY29uc3Qgc3RydWN0 IGRybV9jcnRjX2Z1bmNzIGFtZGdwdV9kbV9jcnRjX2Z1bmNzID0gewogCS5yZXNldCA9IGRybV9h dG9taWNfaGVscGVyX2NydGNfcmVzZXQsCkBAIC0xMTQ1LDcgKzEwNjgsNyBAQCBzdGF0aWMgaW50 IGFtZGdwdV9hdG9taWNfaGVscGVyX3BhZ2VfZmxpcChzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJ LmRlc3Ryb3kgPSBhbWRncHVfZG1fY3J0Y19kZXN0cm95LAogCS5nYW1tYV9zZXQgPSBhbWRncHVf ZG1fYXRvbWljX2NydGNfZ2FtbWFfc2V0LAogCS5zZXRfY29uZmlnID0gZHJtX2F0b21pY19oZWxw ZXJfc2V0X2NvbmZpZywKLQkucGFnZV9mbGlwID0gYW1kZ3B1X2F0b21pY19oZWxwZXJfcGFnZV9m bGlwLAorCS5wYWdlX2ZsaXBfdGFyZ2V0ID0gZHJtX2F0b21pY19oZWxwZXJfcGFnZV9mbGlwX3Rh cmdldCwKIAkuYXRvbWljX2R1cGxpY2F0ZV9zdGF0ZSA9IGRybV9hdG9taWNfaGVscGVyX2NydGNf ZHVwbGljYXRlX3N0YXRlLAogCS5hdG9taWNfZGVzdHJveV9zdGF0ZSA9IGRybV9hdG9taWNfaGVs cGVyX2NydGNfZGVzdHJveV9zdGF0ZSwKIAkuYXRvbWljX3NldF9wcm9wZXJ0eSA9IGRtX2NydGNf ZnVuY3NfYXRvbWljX3NldF9wcm9wZXJ0eQpAQCAtMTY3OSw3ICsxNjAyLDcgQEAgc3RhdGljIGJv b2wgcGFnZV9mbGlwX25lZWRlZCgKIAkJCQkgICAgc2l6ZW9mKG9sZF9zdGF0ZV90bXApKSA9PSAw ID8gdHJ1ZTpmYWxzZTsKIAlpZiAobmV3X3N0YXRlLT5jcnRjICYmIHBhZ2VfZmxpcF9yZXF1aXJl ZCA9PSBmYWxzZSkgewogCQlhY3J0Y19uZXcgPSB0b19hbWRncHVfY3J0YyhuZXdfc3RhdGUtPmNy dGMpOwotCQlpZiAoYWNydGNfbmV3LT5mbGlwX2ZsYWdzICYgRFJNX01PREVfUEFHRV9GTElQX0FT WU5DKQorCQlpZiAobmV3X3N0YXRlLT5wZmxpcF9mbGFncyAmIERSTV9NT0RFX1BBR0VfRkxJUF9B U1lOQykKIAkJCXBhZ2VfZmxpcF9yZXF1aXJlZCA9IHRydWU7CiAJfQogCXJldHVybiBwYWdlX2Zs aXBfcmVxdWlyZWQ7CkBAIC0yNzYwLDcgKzI2ODMsNiBAQCBpbnQgYW1kZ3B1X2RtX2F0b21pY19j b21taXQoCiAJZm9yX2VhY2hfcGxhbmVfaW5fc3RhdGUoc3RhdGUsIHBsYW5lLCBvbGRfcGxhbmVf c3RhdGUsIGkpIHsKIAkJc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqcGxhbmVfc3RhdGUgPSBwbGFu ZS0+c3RhdGU7CiAJCXN0cnVjdCBkcm1fY3J0YyAqY3J0YyA9IHBsYW5lX3N0YXRlLT5jcnRjOwot CQlzdHJ1Y3QgYW1kZ3B1X2NydGMgKmFjcnRjID0gdG9fYW1kZ3B1X2NydGMoY3J0Yyk7CiAJCXN0 cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiID0gcGxhbmVfc3RhdGUtPmZiOwogCiAJCWlmICghZmIg fHwgIWNydGMgfHwgIWNydGMtPnN0YXRlLT5wbGFuZXNfY2hhbmdlZCB8fApAQCAtMjc3MSwxMCAr MjY5Myw5IEBAIGludCBhbWRncHVfZG1fYXRvbWljX2NvbW1pdCgKIAkJCXJldCA9IGFtZGdwdV9j cnRjX3BhZ2VfZmxpcF90YXJnZXQoY3J0YywKIAkJCQkJCQkgICBmYiwKIAkJCQkJCQkgICBjcnRj LT5zdGF0ZS0+ZXZlbnQsCi0JCQkJCQkJICAgYWNydGMtPmZsaXBfZmxhZ3MsCi0JCQkJCQkJICAg ZHJtX2NydGNfdmJsYW5rX2NvdW50KGNydGMpKTsKLQkJCS8qY2xlYW4gdXAgdGhlIGZsYWdzIGZv ciBuZXh0IHVzYWdlKi8KLQkJCWFjcnRjLT5mbGlwX2ZsYWdzID0gMDsKKwkJCQkJCQkgICBwbGFu ZV9zdGF0ZS0+cGZsaXBfZmxhZ3MsCisJCQkJCQkJICAgY3J0Yy0+c3RhdGUtPnRhcmdldF92Ymxh bmspOworCiAJCQlpZiAocmV0KQogCQkJCWJyZWFrOwogCQl9CkBAIC0zMTQzLDggKzMwNjQsNyBA QCBpbnQgYW1kZ3B1X2RtX2F0b21pY19jaGVjayhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQkJ ICogMS4gVGhpcyBjb21taXQgaXMgbm90IGEgcGFnZSBmbGlwLgogCQkJICogMi4gVGhpcyBjb21t aXQgaXMgYSBwYWdlIGZsaXAsIGFuZCB0YXJnZXRzIGFyZSBjcmVhdGVkLgogCQkJICovCi0JCQlp ZiAoIXBhZ2VfZmxpcF9uZWVkZWQocGxhbmVfc3RhdGUsIG9sZF9wbGFuZV9zdGF0ZSwKLQkJCQkJ ICAgICAgdHJ1ZSkgfHwKKwkJCWlmICghcGFnZV9mbGlwX25lZWRlZChwbGFuZV9zdGF0ZSwgb2xk X3BsYW5lX3N0YXRlLCB0cnVlKSB8fAogCQkJCQlhY3Rpb24gPT0gRE1fQ09NTUlUX0FDVElPTl9E UE1TX09OIHx8CiAJCQkJCWFjdGlvbiA9PSBETV9DT01NSVRfQUNUSU9OX1NFVCkgewogCQkJCXN0 cnVjdCBkY19zdXJmYWNlICpzdXJmYWNlOwotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRl dmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=