From: Andrey Grodzovsky Subject: [PATCH v2 3/3] drm/nouveau/kms/nv50: Switch to using atomic helper for flip. Date: Tue, 17 Jan 2017 00:16:47 -0500 Message-ID: <1484630207-27366-4-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 Q2hhbmdlLUlkOiBJNWEzMTg5YzAzZTM4OWFmMmZmNmMxM2Q4NzBhN2QyODI4MmI3YjBlZQpTaWdu ZWQtb2ZmLWJ5OiBBbmRyZXkgR3JvZHpvdnNreSA8QW5kcmV5Lkdyb2R6b3Zza3lAYW1kLmNvbT4K LS0tCiBkcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9udjUwX2Rpc3BsYXkuYyB8IDc3ICsrKy0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA1IGluc2VydGlvbnMo KyksIDcyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1 L252NTBfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL25vdXZlYXUvbnY1MF9kaXNwbGF5LmMK aW5kZXggMmMyYzY0NS4uNDE5ZTAwYyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL25vdXZl YXUvbnY1MF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL25vdXZlYXUvbnY1MF9kaXNw bGF5LmMKQEAgLTg0Niw2ICs4NDYsMTAgQEAgc3RydWN0IG52NTBfd25kd19mdW5jIHsKIAlhc3l3 LT5pbWFnZS53ID0gZmItPmJhc2Uud2lkdGg7CiAJYXN5dy0+aW1hZ2UuaCA9IGZiLT5iYXNlLmhl aWdodDsKIAlhc3l3LT5pbWFnZS5raW5kID0gKGZiLT5udmJvLT50aWxlX2ZsYWdzICYgMHgwMDAw ZmYwMCkgPj4gODsKKworCWFzeXctPmludGVydmFsID0KKwkJCWFzeXctPnN0YXRlLnBmbGlwX2Zs YWdzICYgRFJNX01PREVfUEFHRV9GTElQX0FTWU5DID8gMCA6IDE7CisKIAlpZiAoYXN5dy0+aW1h Z2Uua2luZCkgewogCQlhc3l3LT5pbWFnZS5sYXlvdXQgPSAwOwogCQlpZiAoZHJtLT5kZXZpY2Uu aW5mby5jaGlwc2V0ID49IDB4YzApCkBAIC0yMjIxLDc3ICsyMjI1LDYgQEAgc3RydWN0IG52NTBf YmFzZSB7CiAJLmF0b21pY19jaGVjayA9IG52NTBfaGVhZF9hdG9taWNfY2hlY2ssCiB9OwogCi0v KiBUaGlzIGlzIGlkZW50aWNhbCB0byB0aGUgdmVyc2lvbiBpbiB0aGUgYXRvbWljIGhlbHBlcnMs IGV4Y2VwdCB0aGF0Ci0gKiBpdCBzdXBwb3J0cyBub24tdmJsYW5rZWQgKCJhc3luYyIpIHBhZ2Ug ZmxpcHMuCi0gKi8KLXN0YXRpYyBpbnQKLW52NTBfaGVhZF9wYWdlX2ZsaXAoc3RydWN0IGRybV9j cnRjICpjcnRjLCBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiwKLQkJICAgIHN0cnVjdCBkcm1f cGVuZGluZ192YmxhbmtfZXZlbnQgKmV2ZW50LCB1MzIgZmxhZ3MpCi17Ci0Jc3RydWN0IGRybV9w bGFuZSAqcGxhbmUgPSBjcnRjLT5wcmltYXJ5OwotCXN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpz dGF0ZTsKLQlzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZTsKLQlzdHJ1Y3QgZHJt X2NydGNfc3RhdGUgKmNydGNfc3RhdGU7Ci0JaW50IHJldCA9IDA7Ci0KLQlzdGF0ZSA9IGRybV9h dG9taWNfc3RhdGVfYWxsb2MocGxhbmUtPmRldik7Ci0JaWYgKCFzdGF0ZSkKLQkJcmV0dXJuIC1F Tk9NRU07Ci0KLQlzdGF0ZS0+YWNxdWlyZV9jdHggPSBkcm1fbW9kZXNldF9sZWdhY3lfYWNxdWly ZV9jdHgoY3J0Yyk7Ci1yZXRyeToKLQljcnRjX3N0YXRlID0gZHJtX2F0b21pY19nZXRfY3J0Y19z dGF0ZShzdGF0ZSwgY3J0Yyk7Ci0JaWYgKElTX0VSUihjcnRjX3N0YXRlKSkgewotCQlyZXQgPSBQ VFJfRVJSKGNydGNfc3RhdGUpOwotCQlnb3RvIGZhaWw7Ci0JfQotCWNydGNfc3RhdGUtPmV2ZW50 ID0gZXZlbnQ7Ci0KLQlwbGFuZV9zdGF0ZSA9IGRybV9hdG9taWNfZ2V0X3BsYW5lX3N0YXRlKHN0 YXRlLCBwbGFuZSk7Ci0JaWYgKElTX0VSUihwbGFuZV9zdGF0ZSkpIHsKLQkJcmV0ID0gUFRSX0VS UihwbGFuZV9zdGF0ZSk7Ci0JCWdvdG8gZmFpbDsKLQl9Ci0KLQlyZXQgPSBkcm1fYXRvbWljX3Nl dF9jcnRjX2Zvcl9wbGFuZShwbGFuZV9zdGF0ZSwgY3J0Yyk7Ci0JaWYgKHJldCAhPSAwKQotCQln b3RvIGZhaWw7Ci0JZHJtX2F0b21pY19zZXRfZmJfZm9yX3BsYW5lKHBsYW5lX3N0YXRlLCBmYik7 Ci0KLQkvKiBNYWtlIHN1cmUgd2UgZG9uJ3QgYWNjaWRlbnRhbGx5IGRvIGEgZnVsbCBtb2Rlc2V0 LiAqLwotCXN0YXRlLT5hbGxvd19tb2Rlc2V0ID0gZmFsc2U7Ci0JaWYgKCFjcnRjX3N0YXRlLT5h Y3RpdmUpIHsKLQkJRFJNX0RFQlVHX0FUT01JQygiW0NSVEM6JWRdIGRpc2FibGVkLCByZWplY3Rp bmcgbGVnYWN5IGZsaXBcbiIsCi0JCQkJIGNydGMtPmJhc2UuaWQpOwotCQlyZXQgPSAtRUlOVkFM OwotCQlnb3RvIGZhaWw7Ci0JfQotCi0JaWYgKGZsYWdzICYgRFJNX01PREVfUEFHRV9GTElQX0FT WU5DKQotCQludjUwX3duZHdfYXRvbShwbGFuZV9zdGF0ZSktPmludGVydmFsID0gMDsKLQotCXJl dCA9IGRybV9hdG9taWNfbm9uYmxvY2tpbmdfY29tbWl0KHN0YXRlKTsKLWZhaWw6Ci0JaWYgKHJl dCA9PSAtRURFQURMSykKLQkJZ290byBiYWNrb2ZmOwotCi0JZHJtX2F0b21pY19zdGF0ZV9wdXQo c3RhdGUpOwotCXJldHVybiByZXQ7Ci0KLWJhY2tvZmY6Ci0JZHJtX2F0b21pY19zdGF0ZV9jbGVh cihzdGF0ZSk7Ci0JZHJtX2F0b21pY19sZWdhY3lfYmFja29mZihzdGF0ZSk7Ci0KLQkvKgotCSAq IFNvbWVvbmUgbWlnaHQgaGF2ZSBleGNoYW5nZWQgdGhlIGZyYW1lYnVmZmVyIHdoaWxlIHdlIGRy b3BwZWQgbG9ja3MKLQkgKiBpbiB0aGUgYmFja29mZiBjb2RlLiBXZSBuZWVkIHRvIGZpeCB1cCB0 aGUgZmIgcmVmY291bnQgdHJhY2tpbmcgdGhlCi0JICogY29yZSBkb2VzIGZvciB1cy4KLQkgKi8K LQlwbGFuZS0+b2xkX2ZiID0gcGxhbmUtPmZiOwotCi0JZ290byByZXRyeTsKLX0KLQogc3RhdGlj IGludAogbnY1MF9oZWFkX2dhbW1hX3NldChzdHJ1Y3QgZHJtX2NydGMgKmNydGMsIHUxNiAqciwg dTE2ICpnLCB1MTYgKmIsCiAJCSAgICB1aW50MzJfdCBzaXplKQpAQCAtMjM4Niw3ICsyMzE5LDcg QEAgc3RydWN0IG52NTBfYmFzZSB7CiAJLmdhbW1hX3NldCA9IG52NTBfaGVhZF9nYW1tYV9zZXQs CiAJLmRlc3Ryb3kgPSBudjUwX2hlYWRfZGVzdHJveSwKIAkuc2V0X2NvbmZpZyA9IGRybV9hdG9t aWNfaGVscGVyX3NldF9jb25maWcsCi0JLnBhZ2VfZmxpcCA9IG52NTBfaGVhZF9wYWdlX2ZsaXAs CisJLnBhZ2VfZmxpcCA9IGRybV9hdG9taWNfaGVscGVyX3BhZ2VfZmxpcCwKIAkuc2V0X3Byb3Bl cnR5ID0gZHJtX2F0b21pY19oZWxwZXJfY3J0Y19zZXRfcHJvcGVydHksCiAJLmF0b21pY19kdXBs aWNhdGVfc3RhdGUgPSBudjUwX2hlYWRfYXRvbWljX2R1cGxpY2F0ZV9zdGF0ZSwKIAkuYXRvbWlj X2Rlc3Ryb3lfc3RhdGUgPSBudjUwX2hlYWRfYXRvbWljX2Rlc3Ryb3lfc3RhdGUsCi0tIAoxLjku MQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRl dmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8v bGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==