From: Andrey Grodzovsky Subject: [PATCH v5 3/3] drm/amd/display: Switch to using atomic_helper for flip. Date: Thu, 2 Feb 2017 16:56:31 -0500 Message-ID: <1486072591-3893-4-git-send-email-Andrey.Grodzovsky@amd.com> References: <1486072591-3893-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: <1486072591-3893-1-git-send-email-Andrey.Grodzovsky-5C7GfCeVMHo@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: nouveau-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "Nouveau" To: dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: dc_upstream-5C7GfCeVMHo@public.gmane.org, Andrey Grodzovsky , nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org, Alexander.Deucher-5C7GfCeVMHo@public.gmane.org, daniel.vetter-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org List-Id: amd-gfx.lists.freedesktop.org djI6Ck1vZGlmeSBmb3IgbW92aWcgcGZsaXAgZmxhZ3MgdG8gY3J0Y19zdGF0ZQoKdjQ6CkZpeCBp ZGVudGF0aW9uLgoKdjU6ClJlbmFtZSBmaWVsZCB0byBwYWdlZmxpcF9mbGFncy4KClNpZ25lZC1v ZmYtYnk6IEFuZHJleSBHcm9kem92c2t5IDxBbmRyZXkuR3JvZHpvdnNreUBhbWQuY29tPgotLS0K IGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9tb2RlLmggICAgICAgICAgIHwgICAx IC0KIC4uLi9kcm0vYW1kL2Rpc3BsYXkvYW1kZ3B1X2RtL2FtZGdwdV9kbV90eXBlcy5jICAgIHwg MTEzICsrKysrLS0tLS0tLS0tLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCAyNCBpbnNlcnRpb25z KCspLCA5MCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Ft ZGdwdS9hbWRncHVfbW9kZS5oIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X21v ZGUuaAppbmRleCA0YzBhODZlLi4zZmYzYzE0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v YW1kL2FtZGdwdS9hbWRncHVfbW9kZS5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1 L2FtZGdwdV9tb2RlLmgKQEAgLTQ0Myw3ICs0NDMsNiBAQCBzdHJ1Y3QgYW1kZ3B1X2NydGMgewog CWVudW0gYW1kZ3B1X2ludGVycnVwdF9zdGF0ZSB2c3luY190aW1lcl9lbmFibGVkOwogCiAJaW50 IG90Z19pbnN0OwotCXVpbnQzMl90IGZsaXBfZmxhZ3M7CiAJLyogQWZ0ZXIgU2V0IE1vZGUgdGFy Z2V0IHdpbGwgYmUgbm9uLU5VTEwgKi8KIAlzdHJ1Y3QgZGNfdGFyZ2V0ICp0YXJnZXQ7CiB9Owpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2FtZGdwdV9kbS9hbWRncHVf ZG1fdHlwZXMuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9hbWRncHVfZG0vYW1kZ3B1 X2RtX3R5cGVzLmMKaW5kZXggYTQ0M2I3MC4uODFjNDZkNiAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2FtZC9kaXNwbGF5L2FtZGdwdV9kbS9hbWRncHVfZG1fdHlwZXMuYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvYW1kZ3B1X2RtL2FtZGdwdV9kbV90eXBlcy5jCkBAIC0x MDYwLDgzICsxMDYwLDYgQEAgc3RhdGljIGludCBkbV9jcnRjX2Z1bmNzX2F0b21pY19zZXRfcHJv cGVydHkoCiAJcmV0dXJuIDA7CiB9CiAKLQotc3RhdGljIGludCBhbWRncHVfYXRvbWljX2hlbHBl cl9wYWdlX2ZsaXAoc3RydWN0IGRybV9jcnRjICpjcnRjLAotCQkJCXN0cnVjdCBkcm1fZnJhbWVi dWZmZXIgKmZiLAotCQkJCXN0cnVjdCBkcm1fcGVuZGluZ192YmxhbmtfZXZlbnQgKmV2ZW50LAot CQkJCXVpbnQzMl90IGZsYWdzKQotewotCXN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lID0gY3J0Yy0+ cHJpbWFyeTsKLQlzdHJ1Y3QgYW1kZ3B1X2NydGMgKmFjcnRjID0gdG9fYW1kZ3B1X2NydGMoY3J0 Yyk7Ci0Jc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlOwotCXN0cnVjdCBkcm1fcGxhbmVf c3RhdGUgKnBsYW5lX3N0YXRlOwotCXN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZTsK LQlpbnQgcmV0ID0gMDsKLQotCXN0YXRlID0gZHJtX2F0b21pY19zdGF0ZV9hbGxvYyhwbGFuZS0+ ZGV2KTsKLQlpZiAoIXN0YXRlKQotCQlyZXR1cm4gLUVOT01FTTsKLQotCXJldCA9IGRybV9jcnRj X3ZibGFua19nZXQoY3J0Yyk7Ci0JaWYgKHJldCkKLQkJcmV0dXJuIHJldDsKLQotCXN0YXRlLT5h Y3F1aXJlX2N0eCA9IGRybV9tb2Rlc2V0X2xlZ2FjeV9hY3F1aXJlX2N0eChjcnRjKTsKLXJldHJ5 OgotCWNydGNfc3RhdGUgPSBkcm1fYXRvbWljX2dldF9jcnRjX3N0YXRlKHN0YXRlLCBjcnRjKTsK LQlpZiAoSVNfRVJSKGNydGNfc3RhdGUpKSB7Ci0JCXJldCA9IFBUUl9FUlIoY3J0Y19zdGF0ZSk7 Ci0JCWdvdG8gZmFpbDsKLQl9Ci0JY3J0Y19zdGF0ZS0+ZXZlbnQgPSBldmVudDsKLQotCXBsYW5l X3N0YXRlID0gZHJtX2F0b21pY19nZXRfcGxhbmVfc3RhdGUoc3RhdGUsIHBsYW5lKTsKLQlpZiAo SVNfRVJSKHBsYW5lX3N0YXRlKSkgewotCQlyZXQgPSBQVFJfRVJSKHBsYW5lX3N0YXRlKTsKLQkJ Z290byBmYWlsOwotCX0KLQotCXJldCA9IGRybV9hdG9taWNfc2V0X2NydGNfZm9yX3BsYW5lKHBs YW5lX3N0YXRlLCBjcnRjKTsKLQlpZiAocmV0ICE9IDApCi0JCWdvdG8gZmFpbDsKLQlkcm1fYXRv bWljX3NldF9mYl9mb3JfcGxhbmUocGxhbmVfc3RhdGUsIGZiKTsKLQotCS8qIE1ha2Ugc3VyZSB3 ZSBkb24ndCBhY2NpZGVudGFsbHkgZG8gYSBmdWxsIG1vZGVzZXQuICovCi0Jc3RhdGUtPmFsbG93 X21vZGVzZXQgPSBmYWxzZTsKLQlpZiAoIWNydGNfc3RhdGUtPmFjdGl2ZSkgewotCQlEUk1fREVC VUdfQVRPTUlDKCJbQ1JUQzolZF0gZGlzYWJsZWQsIHJlamVjdGluZyBsZWdhY3kgZmxpcFxuIiwK LQkJCQkgY3J0Yy0+YmFzZS5pZCk7Ci0JCXJldCA9IC1FSU5WQUw7Ci0JCWdvdG8gZmFpbDsKLQl9 Ci0JYWNydGMtPmZsaXBfZmxhZ3MgPSBmbGFnczsKLQotCXJldCA9IGRybV9hdG9taWNfbm9uYmxv Y2tpbmdfY29tbWl0KHN0YXRlKTsKLQotZmFpbDoKLQlpZiAocmV0ID09IC1FREVBRExLKQotCQln b3RvIGJhY2tvZmY7Ci0KLQlpZiAocmV0KQotCQlkcm1fY3J0Y192YmxhbmtfcHV0KGNydGMpOwot Ci0JZHJtX2F0b21pY19zdGF0ZV9wdXQoc3RhdGUpOwotCi0JcmV0dXJuIHJldDsKLWJhY2tvZmY6 Ci0JZHJtX2F0b21pY19zdGF0ZV9jbGVhcihzdGF0ZSk7Ci0JZHJtX2F0b21pY19sZWdhY3lfYmFj a29mZihzdGF0ZSk7Ci0KLQkvKgotCSAqIFNvbWVvbmUgbWlnaHQgaGF2ZSBleGNoYW5nZWQgdGhl IGZyYW1lYnVmZmVyIHdoaWxlIHdlIGRyb3BwZWQgbG9ja3MKLQkgKiBpbiB0aGUgYmFja29mZiBj b2RlLiBXZSBuZWVkIHRvIGZpeCB1cCB0aGUgZmIgcmVmY291bnQgdHJhY2tpbmcgdGhlCi0JICog Y29yZSBkb2VzIGZvciB1cy4KLQkgKi8KLQlwbGFuZS0+b2xkX2ZiID0gcGxhbmUtPmZiOwotCi0J Z290byByZXRyeTsKLX0KLQogLyogSW1wbGVtZW50ZWQgb25seSB0aGUgb3B0aW9ucyBjdXJyZW50 bHkgYXZhaWxpYmxlIGZvciB0aGUgZHJpdmVyICovCiBzdGF0aWMgY29uc3Qgc3RydWN0IGRybV9j cnRjX2Z1bmNzIGFtZGdwdV9kbV9jcnRjX2Z1bmNzID0gewogCS5yZXNldCA9IGRybV9hdG9taWNf aGVscGVyX2NydGNfcmVzZXQsCkBAIC0xMTQ1LDcgKzEwNjgsNyBAQCBzdGF0aWMgaW50IGFtZGdw dV9hdG9taWNfaGVscGVyX3BhZ2VfZmxpcChzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJLmRlc3Ry b3kgPSBhbWRncHVfZG1fY3J0Y19kZXN0cm95LAogCS5nYW1tYV9zZXQgPSBhbWRncHVfZG1fYXRv bWljX2NydGNfZ2FtbWFfc2V0LAogCS5zZXRfY29uZmlnID0gZHJtX2F0b21pY19oZWxwZXJfc2V0 X2NvbmZpZywKLQkucGFnZV9mbGlwID0gYW1kZ3B1X2F0b21pY19oZWxwZXJfcGFnZV9mbGlwLAor CS5wYWdlX2ZsaXBfdGFyZ2V0ID0gZHJtX2F0b21pY19oZWxwZXJfcGFnZV9mbGlwX3RhcmdldCwK IAkuYXRvbWljX2R1cGxpY2F0ZV9zdGF0ZSA9IGRybV9hdG9taWNfaGVscGVyX2NydGNfZHVwbGlj YXRlX3N0YXRlLAogCS5hdG9taWNfZGVzdHJveV9zdGF0ZSA9IGRybV9hdG9taWNfaGVscGVyX2Ny dGNfZGVzdHJveV9zdGF0ZSwKIAkuYXRvbWljX3NldF9wcm9wZXJ0eSA9IGRtX2NydGNfZnVuY3Nf YXRvbWljX3NldF9wcm9wZXJ0eQpAQCAtMTYyNiw3ICsxNTQ5LDggQEAgc3RhdGljIHZvaWQgY2xl YXJfdW5yZWxhdGVkX2ZpZWxkcyhzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpzdGF0ZSkKIHN0YXRp YyBib29sIHBhZ2VfZmxpcF9uZWVkZWQoCiAJY29uc3Qgc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAq bmV3X3N0YXRlLAogCWNvbnN0IHN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKm9sZF9zdGF0ZSwKLQli b29sIGNvbW1pdF9zdXJmYWNlX3JlcXVpcmVkKQorCWJvb2wgY29tbWl0X3N1cmZhY2VfcmVxdWly ZWQsCisJdWludDMyX3QgcGZsaXBfZmxhZ3MpCiB7CiAJc3RydWN0IGRybV9wbGFuZV9zdGF0ZSBv bGRfc3RhdGVfdG1wOwogCXN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgbmV3X3N0YXRlX3RtcDsKQEAg LTE2NzksNyArMTYwMyw3IEBAIHN0YXRpYyBib29sIHBhZ2VfZmxpcF9uZWVkZWQoCiAJCQkJICAg IHNpemVvZihvbGRfc3RhdGVfdG1wKSkgPT0gMCA/IHRydWU6ZmFsc2U7CiAJaWYgKG5ld19zdGF0 ZS0+Y3J0YyAmJiBwYWdlX2ZsaXBfcmVxdWlyZWQgPT0gZmFsc2UpIHsKIAkJYWNydGNfbmV3ID0g dG9fYW1kZ3B1X2NydGMobmV3X3N0YXRlLT5jcnRjKTsKLQkJaWYgKGFjcnRjX25ldy0+ZmxpcF9m bGFncyAmIERSTV9NT0RFX1BBR0VfRkxJUF9BU1lOQykKKwkJaWYgKHBmbGlwX2ZsYWdzICYgRFJN X01PREVfUEFHRV9GTElQX0FTWU5DKQogCQkJcGFnZV9mbGlwX3JlcXVpcmVkID0gdHJ1ZTsKIAl9 CiAJcmV0dXJuIHBhZ2VfZmxpcF9yZXF1aXJlZDsKQEAgLTI2OTYsNyArMjYyMCwxMSBAQCBpbnQg YW1kZ3B1X2RtX2F0b21pY19jb21taXQoCiAJCSAqIDEuIFRoaXMgY29tbWl0IGlzIG5vdCBhIHBh Z2UgZmxpcC4KIAkJICogMi4gVGhpcyBjb21taXQgaXMgYSBwYWdlIGZsaXAsIGFuZCB0YXJnZXRz IGFyZSBjcmVhdGVkLgogCQkgKi8KLQkJaWYgKCFwYWdlX2ZsaXBfbmVlZGVkKHBsYW5lX3N0YXRl LCBvbGRfcGxhbmVfc3RhdGUsIHRydWUpIHx8CisJCWlmICghcGFnZV9mbGlwX25lZWRlZChwbGFu ZV9zdGF0ZSwKKwkJCQkgICAgICBvbGRfcGxhbmVfc3RhdGUsCisJCQkJICAgICAgdHJ1ZSwKKwkJ CQkgICAgICBjcnRjLT5zdGF0ZS0+cGFnZWZsaXBfZmxhZ3MpCisJCQkJfHwKIAkJCQlhY3Rpb24g PT0gRE1fQ09NTUlUX0FDVElPTl9EUE1TX09OIHx8CiAJCQkJYWN0aW9uID09IERNX0NPTU1JVF9B Q1RJT05fU0VUKSB7CiAJCQlsaXN0X2Zvcl9lYWNoX2VudHJ5KGNvbm5lY3RvciwKQEAgLTI3NjAs MjEgKzI2ODgsMjQgQEAgaW50IGFtZGdwdV9kbV9hdG9taWNfY29tbWl0KAogCWZvcl9lYWNoX3Bs YW5lX2luX3N0YXRlKHN0YXRlLCBwbGFuZSwgb2xkX3BsYW5lX3N0YXRlLCBpKSB7CiAJCXN0cnVj dCBkcm1fcGxhbmVfc3RhdGUgKnBsYW5lX3N0YXRlID0gcGxhbmUtPnN0YXRlOwogCQlzdHJ1Y3Qg ZHJtX2NydGMgKmNydGMgPSBwbGFuZV9zdGF0ZS0+Y3J0YzsKLQkJc3RydWN0IGFtZGdwdV9jcnRj ICphY3J0YyA9IHRvX2FtZGdwdV9jcnRjKGNydGMpOwogCQlzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVy ICpmYiA9IHBsYW5lX3N0YXRlLT5mYjsKKwkJdWludDMyX3QgcGZsaXBfZmxhZ3M7CiAKIAkJaWYg KCFmYiB8fCAhY3J0YyB8fCAhY3J0Yy0+c3RhdGUtPnBsYW5lc19jaGFuZ2VkIHx8CiAJCQkhY3J0 Yy0+c3RhdGUtPmFjdGl2ZSkKIAkJCWNvbnRpbnVlOwogCi0JCWlmIChwYWdlX2ZsaXBfbmVlZGVk KHBsYW5lX3N0YXRlLCBvbGRfcGxhbmVfc3RhdGUsIGZhbHNlKSkgeworCQlwZmxpcF9mbGFncyA9 IGNydGMtPnN0YXRlLT5wYWdlZmxpcF9mbGFnczsKKwkJaWYgKHBhZ2VfZmxpcF9uZWVkZWQocGxh bmVfc3RhdGUsCisJCQkJICAgICBvbGRfcGxhbmVfc3RhdGUsCisJCQkJICAgICBmYWxzZSwKKwkJ CQkgICAgIHBmbGlwX2ZsYWdzKSkgewogCQkJcmV0ID0gYW1kZ3B1X2NydGNfcGFnZV9mbGlwX3Rh cmdldChjcnRjLAogCQkJCQkJCSAgIGZiLAogCQkJCQkJCSAgIGNydGMtPnN0YXRlLT5ldmVudCwK LQkJCQkJCQkgICBhY3J0Yy0+ZmxpcF9mbGFncywKLQkJCQkJCQkgICBkcm1fY3J0Y192Ymxhbmtf Y291bnQoY3J0YykpOwotCQkJLypjbGVhbiB1cCB0aGUgZmxhZ3MgZm9yIG5leHQgdXNhZ2UqLwot CQkJYWNydGMtPmZsaXBfZmxhZ3MgPSAwOworCQkJCQkJCSAgIGNydGMtPnN0YXRlLT5wYWdlZmxp cF9mbGFncywKKwkJCQkJCQkgICBjcnRjLT5zdGF0ZS0+dGFyZ2V0X3ZibGFuayk7CisKIAkJCWlm IChyZXQpCiAJCQkJYnJlYWs7CiAJCX0KQEAgLTMxMzgsMTMgKzMwNjksMTcgQEAgaW50IGFtZGdw dV9kbV9hdG9taWNfY2hlY2soc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJCQljb250aW51ZTsK IAogCQkJYWN0aW9uID0gZ2V0X2RtX2NvbW1pdF9hY3Rpb24oY3J0Yy0+c3RhdGUpOworCQkJY3J0 Y19zdGF0ZSA9IGRybV9hdG9taWNfZ2V0X2V4aXN0aW5nX2NydGNfc3RhdGUoc3RhdGUsIGNydGMp OwogCiAJCQkvKiBTdXJmYWNlcyBhcmUgY3JlYXRlZCB1bmRlciB0d28gc2NlbmFyaW9zOgogCQkJ ICogMS4gVGhpcyBjb21taXQgaXMgbm90IGEgcGFnZSBmbGlwLgogCQkJICogMi4gVGhpcyBjb21t aXQgaXMgYSBwYWdlIGZsaXAsIGFuZCB0YXJnZXRzIGFyZSBjcmVhdGVkLgogCQkJICovCi0JCQlp ZiAoIXBhZ2VfZmxpcF9uZWVkZWQocGxhbmVfc3RhdGUsIG9sZF9wbGFuZV9zdGF0ZSwKLQkJCQkJ ICAgICAgdHJ1ZSkgfHwKKwkJCWlmICghcGFnZV9mbGlwX25lZWRlZChwbGFuZV9zdGF0ZSwKKwkJ CQkJICAgICAgb2xkX3BsYW5lX3N0YXRlLAorCQkJCQkgICAgICB0cnVlLAorCQkJCQkgICAgICBj cnRjX3N0YXRlLT5wYWdlZmxpcF9mbGFncykKKwkJCQkJfHwKIAkJCQkJYWN0aW9uID09IERNX0NP TU1JVF9BQ1RJT05fRFBNU19PTiB8fAogCQkJCQlhY3Rpb24gPT0gRE1fQ09NTUlUX0FDVElPTl9T RVQpIHsKIAkJCQlzdHJ1Y3QgZGNfc3VyZmFjZSAqc3VyZmFjZTsKLS0gCjEuOS4xCgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpOb3V2ZWF1IG1haWxpbmcg bGlzdApOb3V2ZWF1QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNr dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL25vdXZlYXUK