From: Andrey Grodzovsky Subject: [PATCH v5 2/3] drm/nouveau/kms/nv50: Switch to using atomic helper for flip. Date: Thu, 2 Feb 2017 16:56:30 -0500 Message-ID: <1486072591-3893-3-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 djI6ClVwZGF0ZSBjb2RlIGFmdGVyIGZsaXBfZmxhZ3MgbW92ZWQgZnJvbSBwbGFuZV9zdGF0ZQp0 byBjcnRjX3N0YXRlCgp2NToKUmVuYW1lIHRvIHBhZ2VmbGlwX2ZsYWdzLgoKU2lnbmVkLW9mZi1i eTogQW5kcmV5IEdyb2R6b3Zza3kgPEFuZHJleS5Hcm9kem92c2t5QGFtZC5jb20+Ci0tLQogZHJp dmVycy9ncHUvZHJtL25vdXZlYXUvbnY1MF9kaXNwbGF5LmMgfCA4NCArKysrLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTAgaW5zZXJ0aW9ucygrKSwgNzQg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL25vdXZlYXUvbnY1MF9k aXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9udjUwX2Rpc3BsYXkuYwppbmRleCAy YzJjNjQ1Li5jNjE1M2QzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9udjUw X2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9udjUwX2Rpc3BsYXkuYwpA QCAtODMxLDcgKzgzMSw4IEBAIHN0cnVjdCBudjUwX3duZHdfZnVuYyB7CiBzdGF0aWMgaW50CiBu djUwX3duZHdfYXRvbWljX2NoZWNrX2FjcXVpcmUoc3RydWN0IG52NTBfd25kdyAqd25kdywKIAkJ CSAgICAgICBzdHJ1Y3QgbnY1MF93bmR3X2F0b20gKmFzeXcsCi0JCQkgICAgICAgc3RydWN0IG52 NTBfaGVhZF9hdG9tICphc3loKQorCQkJICAgICAgIHN0cnVjdCBudjUwX2hlYWRfYXRvbSAqYXN5 aCwKKwkJCSAgICAgICB1MzIgcGZsaXBfZmxhZ3MpCiB7CiAJc3RydWN0IG5vdXZlYXVfZnJhbWVi dWZmZXIgKmZiID0gbm91dmVhdV9mcmFtZWJ1ZmZlcihhc3l3LT5zdGF0ZS5mYik7CiAJc3RydWN0 IG5vdXZlYXVfZHJtICpkcm0gPSBub3V2ZWF1X2RybSh3bmR3LT5wbGFuZS5kZXYpOwpAQCAtODQ2 LDYgKzg0Nyw5IEBAIHN0cnVjdCBudjUwX3duZHdfZnVuYyB7CiAJYXN5dy0+aW1hZ2UudyA9IGZi LT5iYXNlLndpZHRoOwogCWFzeXctPmltYWdlLmggPSBmYi0+YmFzZS5oZWlnaHQ7CiAJYXN5dy0+ aW1hZ2Uua2luZCA9IChmYi0+bnZiby0+dGlsZV9mbGFncyAmIDB4MDAwMGZmMDApID4+IDg7CisK Kwlhc3l3LT5pbnRlcnZhbCA9IHBmbGlwX2ZsYWdzICYgRFJNX01PREVfUEFHRV9GTElQX0FTWU5D ID8gMCA6IDE7CisKIAlpZiAoYXN5dy0+aW1hZ2Uua2luZCkgewogCQlhc3l3LT5pbWFnZS5sYXlv dXQgPSAwOwogCQlpZiAoZHJtLT5kZXZpY2UuaW5mby5jaGlwc2V0ID49IDB4YzApCkBAIC04ODMs NiArODg3LDcgQEAgc3RydWN0IG52NTBfd25kd19mdW5jIHsKIAlzdHJ1Y3QgbnY1MF9oZWFkX2F0 b20gKmhhcm0gPSBOVUxMLCAqYXN5aCA9IE5VTEw7CiAJYm9vbCB2YXJtID0gZmFsc2UsIGFzeXYg PSBmYWxzZSwgYXN5bSA9IGZhbHNlOwogCWludCByZXQ7CisJdTMyIHBmbGlwX2ZsYWdzID0gMDsK IAogCU5WX0FUT01JQyhkcm0sICIlcyBhdG9taWNfY2hlY2tcbiIsIHBsYW5lLT5uYW1lKTsKIAlp ZiAoYXN5dy0+c3RhdGUuY3J0YykgewpAQCAtODkxLDYgKzg5Niw3IEBAIHN0cnVjdCBudjUwX3du ZHdfZnVuYyB7CiAJCQlyZXR1cm4gUFRSX0VSUihhc3loKTsKIAkJYXN5bSA9IGRybV9hdG9taWNf Y3J0Y19uZWVkc19tb2Rlc2V0KCZhc3loLT5zdGF0ZSk7CiAJCWFzeXYgPSBhc3loLT5zdGF0ZS5h Y3RpdmU7CisJCXBmbGlwX2ZsYWdzID0gYXN5aC0+c3RhdGUucGFnZWZsaXBfZmxhZ3M7CiAJfQog CiAJaWYgKGFybXctPnN0YXRlLmNydGMpIHsKQEAgLTkwNyw3ICs5MTMsOCBAQCBzdHJ1Y3QgbnY1 MF93bmR3X2Z1bmMgewogCQkJYXN5dy0+c2V0LnBvaW50ID0gdHJ1ZTsKIAogCQlpZiAoIXZhcm0g fHwgYXN5bSB8fCBhcm13LT5zdGF0ZS5mYiAhPSBhc3l3LT5zdGF0ZS5mYikgewotCQkJcmV0ID0g bnY1MF93bmR3X2F0b21pY19jaGVja19hY3F1aXJlKHduZHcsIGFzeXcsIGFzeWgpOworCQkJcmV0 ID0gbnY1MF93bmR3X2F0b21pY19jaGVja19hY3F1aXJlKAorCQkJCQl3bmR3LCBhc3l3LCBhc3lo LCBwZmxpcF9mbGFncyk7CiAJCQlpZiAocmV0KQogCQkJCXJldHVybiByZXQ7CiAJCX0KQEAgLTIy MjEsNzcgKzIyMjgsNiBAQCBzdHJ1Y3QgbnY1MF9iYXNlIHsKIAkuYXRvbWljX2NoZWNrID0gbnY1 MF9oZWFkX2F0b21pY19jaGVjaywKIH07CiAKLS8qIFRoaXMgaXMgaWRlbnRpY2FsIHRvIHRoZSB2 ZXJzaW9uIGluIHRoZSBhdG9taWMgaGVscGVycywgZXhjZXB0IHRoYXQKLSAqIGl0IHN1cHBvcnRz IG5vbi12YmxhbmtlZCAoImFzeW5jIikgcGFnZSBmbGlwcy4KLSAqLwotc3RhdGljIGludAotbnY1 MF9oZWFkX3BhZ2VfZmxpcChzdHJ1Y3QgZHJtX2NydGMgKmNydGMsIHN0cnVjdCBkcm1fZnJhbWVi dWZmZXIgKmZiLAotCQkgICAgc3RydWN0IGRybV9wZW5kaW5nX3ZibGFua19ldmVudCAqZXZlbnQs IHUzMiBmbGFncykKLXsKLQlzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSA9IGNydGMtPnByaW1hcnk7 Ci0Jc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlOwotCXN0cnVjdCBkcm1fcGxhbmVfc3Rh dGUgKnBsYW5lX3N0YXRlOwotCXN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZTsKLQlp bnQgcmV0ID0gMDsKLQotCXN0YXRlID0gZHJtX2F0b21pY19zdGF0ZV9hbGxvYyhwbGFuZS0+ZGV2 KTsKLQlpZiAoIXN0YXRlKQotCQlyZXR1cm4gLUVOT01FTTsKLQotCXN0YXRlLT5hY3F1aXJlX2N0 eCA9IGRybV9tb2Rlc2V0X2xlZ2FjeV9hY3F1aXJlX2N0eChjcnRjKTsKLXJldHJ5OgotCWNydGNf c3RhdGUgPSBkcm1fYXRvbWljX2dldF9jcnRjX3N0YXRlKHN0YXRlLCBjcnRjKTsKLQlpZiAoSVNf RVJSKGNydGNfc3RhdGUpKSB7Ci0JCXJldCA9IFBUUl9FUlIoY3J0Y19zdGF0ZSk7Ci0JCWdvdG8g ZmFpbDsKLQl9Ci0JY3J0Y19zdGF0ZS0+ZXZlbnQgPSBldmVudDsKLQotCXBsYW5lX3N0YXRlID0g ZHJtX2F0b21pY19nZXRfcGxhbmVfc3RhdGUoc3RhdGUsIHBsYW5lKTsKLQlpZiAoSVNfRVJSKHBs YW5lX3N0YXRlKSkgewotCQlyZXQgPSBQVFJfRVJSKHBsYW5lX3N0YXRlKTsKLQkJZ290byBmYWls OwotCX0KLQotCXJldCA9IGRybV9hdG9taWNfc2V0X2NydGNfZm9yX3BsYW5lKHBsYW5lX3N0YXRl LCBjcnRjKTsKLQlpZiAocmV0ICE9IDApCi0JCWdvdG8gZmFpbDsKLQlkcm1fYXRvbWljX3NldF9m Yl9mb3JfcGxhbmUocGxhbmVfc3RhdGUsIGZiKTsKLQotCS8qIE1ha2Ugc3VyZSB3ZSBkb24ndCBh Y2NpZGVudGFsbHkgZG8gYSBmdWxsIG1vZGVzZXQuICovCi0Jc3RhdGUtPmFsbG93X21vZGVzZXQg PSBmYWxzZTsKLQlpZiAoIWNydGNfc3RhdGUtPmFjdGl2ZSkgewotCQlEUk1fREVCVUdfQVRPTUlD KCJbQ1JUQzolZF0gZGlzYWJsZWQsIHJlamVjdGluZyBsZWdhY3kgZmxpcFxuIiwKLQkJCQkgY3J0 Yy0+YmFzZS5pZCk7Ci0JCXJldCA9IC1FSU5WQUw7Ci0JCWdvdG8gZmFpbDsKLQl9Ci0KLQlpZiAo ZmxhZ3MgJiBEUk1fTU9ERV9QQUdFX0ZMSVBfQVNZTkMpCi0JCW52NTBfd25kd19hdG9tKHBsYW5l X3N0YXRlKS0+aW50ZXJ2YWwgPSAwOwotCi0JcmV0ID0gZHJtX2F0b21pY19ub25ibG9ja2luZ19j b21taXQoc3RhdGUpOwotZmFpbDoKLQlpZiAocmV0ID09IC1FREVBRExLKQotCQlnb3RvIGJhY2tv ZmY7Ci0KLQlkcm1fYXRvbWljX3N0YXRlX3B1dChzdGF0ZSk7Ci0JcmV0dXJuIHJldDsKLQotYmFj a29mZjoKLQlkcm1fYXRvbWljX3N0YXRlX2NsZWFyKHN0YXRlKTsKLQlkcm1fYXRvbWljX2xlZ2Fj eV9iYWNrb2ZmKHN0YXRlKTsKLQotCS8qCi0JICogU29tZW9uZSBtaWdodCBoYXZlIGV4Y2hhbmdl ZCB0aGUgZnJhbWVidWZmZXIgd2hpbGUgd2UgZHJvcHBlZCBsb2NrcwotCSAqIGluIHRoZSBiYWNr b2ZmIGNvZGUuIFdlIG5lZWQgdG8gZml4IHVwIHRoZSBmYiByZWZjb3VudCB0cmFja2luZyB0aGUK LQkgKiBjb3JlIGRvZXMgZm9yIHVzLgotCSAqLwotCXBsYW5lLT5vbGRfZmIgPSBwbGFuZS0+ZmI7 Ci0KLQlnb3RvIHJldHJ5OwotfQotCiBzdGF0aWMgaW50CiBudjUwX2hlYWRfZ2FtbWFfc2V0KHN0 cnVjdCBkcm1fY3J0YyAqY3J0YywgdTE2ICpyLCB1MTYgKmcsIHUxNiAqYiwKIAkJICAgIHVpbnQz Ml90IHNpemUpCkBAIC0yMzg2LDcgKzIzMjIsNyBAQCBzdHJ1Y3QgbnY1MF9iYXNlIHsKIAkuZ2Ft bWFfc2V0ID0gbnY1MF9oZWFkX2dhbW1hX3NldCwKIAkuZGVzdHJveSA9IG52NTBfaGVhZF9kZXN0 cm95LAogCS5zZXRfY29uZmlnID0gZHJtX2F0b21pY19oZWxwZXJfc2V0X2NvbmZpZywKLQkucGFn ZV9mbGlwID0gbnY1MF9oZWFkX3BhZ2VfZmxpcCwKKwkucGFnZV9mbGlwID0gZHJtX2F0b21pY19o ZWxwZXJfcGFnZV9mbGlwLAogCS5zZXRfcHJvcGVydHkgPSBkcm1fYXRvbWljX2hlbHBlcl9jcnRj X3NldF9wcm9wZXJ0eSwKIAkuYXRvbWljX2R1cGxpY2F0ZV9zdGF0ZSA9IG52NTBfaGVhZF9hdG9t aWNfZHVwbGljYXRlX3N0YXRlLAogCS5hdG9taWNfZGVzdHJveV9zdGF0ZSA9IG52NTBfaGVhZF9h dG9taWNfZGVzdHJveV9zdGF0ZSwKLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpOb3V2ZWF1IG1haWxpbmcgbGlzdApOb3V2ZWF1QGxpc3Rz LmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xp c3RpbmZvL25vdXZlYXUK