From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrey Grodzovsky Subject: [PATCH v3 2/3] drm/amd/display: Switch to using atomic_helper for flip. Date: Wed, 18 Jan 2017 23:57:17 -0500 Message-ID: <1484801837-8214-1-git-send-email-Andrey.Grodzovsky@amd.com> References: <79d1c845-3586-4641-ad06-73af32ab66e5@daenzer.net> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <79d1c845-3586-4641-ad06-73af32ab66e5@daenzer.net> 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: dc_upstream@amd.com, nouveau@lists.freedesktop.org, michel@daenzer.net, amd-gfx@lists.freedesktop.org, laurent.pinchart@ideasonboard.com, Alexander.Deucher@amd.com, daniel.vetter@intel.com List-Id: amd-gfx.lists.freedesktop.org djM6IFJlbW92ZSB3aGl0ZSBzcGFjZSBjaGFuZ2UuCgpTaWduZWQtb2ZmLWJ5OiBBbmRyZXkgR3Jv ZHpvdnNreSA8QW5kcmV5Lkdyb2R6b3Zza3lAYW1kLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0v YW1kL2FtZGdwdS9hbWRncHVfbW9kZS5oICAgICAgICAgICB8ICAxIC0KIC4uLi9kcm0vYW1kL2Rp c3BsYXkvYW1kZ3B1X2RtL2FtZGdwdV9kbV90eXBlcy5jICAgIHwgODkgKystLS0tLS0tLS0tLS0t LS0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCA1IGluc2VydGlvbnMoKyksIDg1IGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9tb2RlLmgg Yi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfbW9kZS5oCmluZGV4IDRjMGE4NmUu LjNmZjNjMTQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9t b2RlLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X21vZGUuaApAQCAt NDQzLDcgKzQ0Myw2IEBAIHN0cnVjdCBhbWRncHVfY3J0YyB7CiAJZW51bSBhbWRncHVfaW50ZXJy dXB0X3N0YXRlIHZzeW5jX3RpbWVyX2VuYWJsZWQ7CiAKIAlpbnQgb3RnX2luc3Q7Ci0JdWludDMy X3QgZmxpcF9mbGFnczsKIAkvKiBBZnRlciBTZXQgTW9kZSB0YXJnZXQgd2lsbCBiZSBub24tTlVM TCAqLwogCXN0cnVjdCBkY190YXJnZXQgKnRhcmdldDsKIH07CmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vYW1kL2Rpc3BsYXkvYW1kZ3B1X2RtL2FtZGdwdV9kbV90eXBlcy5jIGIvZHJpdmVy cy9ncHUvZHJtL2FtZC9kaXNwbGF5L2FtZGdwdV9kbS9hbWRncHVfZG1fdHlwZXMuYwppbmRleCBh NDQzYjcwLi43MGUwMWFkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkv YW1kZ3B1X2RtL2FtZGdwdV9kbV90eXBlcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlz cGxheS9hbWRncHVfZG0vYW1kZ3B1X2RtX3R5cGVzLmMKQEAgLTEwNjAsODMgKzEwNjAsNiBAQCBz dGF0aWMgaW50IGRtX2NydGNfZnVuY3NfYXRvbWljX3NldF9wcm9wZXJ0eSgKIAlyZXR1cm4gMDsK IH0KIAotCi1zdGF0aWMgaW50IGFtZGdwdV9hdG9taWNfaGVscGVyX3BhZ2VfZmxpcChzdHJ1Y3Qg ZHJtX2NydGMgKmNydGMsCi0JCQkJc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIsCi0JCQkJc3Ry dWN0IGRybV9wZW5kaW5nX3ZibGFua19ldmVudCAqZXZlbnQsCi0JCQkJdWludDMyX3QgZmxhZ3Mp Ci17Ci0Jc3RydWN0IGRybV9wbGFuZSAqcGxhbmUgPSBjcnRjLT5wcmltYXJ5OwotCXN0cnVjdCBh bWRncHVfY3J0YyAqYWNydGMgPSB0b19hbWRncHVfY3J0YyhjcnRjKTsKLQlzdHJ1Y3QgZHJtX2F0 b21pY19zdGF0ZSAqc3RhdGU7Ci0Jc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqcGxhbmVfc3RhdGU7 Ci0Jc3RydWN0IGRybV9jcnRjX3N0YXRlICpjcnRjX3N0YXRlOwotCWludCByZXQgPSAwOwotCi0J c3RhdGUgPSBkcm1fYXRvbWljX3N0YXRlX2FsbG9jKHBsYW5lLT5kZXYpOwotCWlmICghc3RhdGUp Ci0JCXJldHVybiAtRU5PTUVNOwotCi0JcmV0ID0gZHJtX2NydGNfdmJsYW5rX2dldChjcnRjKTsK LQlpZiAocmV0KQotCQlyZXR1cm4gcmV0OwotCi0Jc3RhdGUtPmFjcXVpcmVfY3R4ID0gZHJtX21v ZGVzZXRfbGVnYWN5X2FjcXVpcmVfY3R4KGNydGMpOwotcmV0cnk6Ci0JY3J0Y19zdGF0ZSA9IGRy bV9hdG9taWNfZ2V0X2NydGNfc3RhdGUoc3RhdGUsIGNydGMpOwotCWlmIChJU19FUlIoY3J0Y19z dGF0ZSkpIHsKLQkJcmV0ID0gUFRSX0VSUihjcnRjX3N0YXRlKTsKLQkJZ290byBmYWlsOwotCX0K LQljcnRjX3N0YXRlLT5ldmVudCA9IGV2ZW50OwotCi0JcGxhbmVfc3RhdGUgPSBkcm1fYXRvbWlj X2dldF9wbGFuZV9zdGF0ZShzdGF0ZSwgcGxhbmUpOwotCWlmIChJU19FUlIocGxhbmVfc3RhdGUp KSB7Ci0JCXJldCA9IFBUUl9FUlIocGxhbmVfc3RhdGUpOwotCQlnb3RvIGZhaWw7Ci0JfQotCi0J cmV0ID0gZHJtX2F0b21pY19zZXRfY3J0Y19mb3JfcGxhbmUocGxhbmVfc3RhdGUsIGNydGMpOwot CWlmIChyZXQgIT0gMCkKLQkJZ290byBmYWlsOwotCWRybV9hdG9taWNfc2V0X2ZiX2Zvcl9wbGFu ZShwbGFuZV9zdGF0ZSwgZmIpOwotCi0JLyogTWFrZSBzdXJlIHdlIGRvbid0IGFjY2lkZW50YWxs eSBkbyBhIGZ1bGwgbW9kZXNldC4gKi8KLQlzdGF0ZS0+YWxsb3dfbW9kZXNldCA9IGZhbHNlOwot CWlmICghY3J0Y19zdGF0ZS0+YWN0aXZlKSB7Ci0JCURSTV9ERUJVR19BVE9NSUMoIltDUlRDOiVk XSBkaXNhYmxlZCwgcmVqZWN0aW5nIGxlZ2FjeSBmbGlwXG4iLAotCQkJCSBjcnRjLT5iYXNlLmlk KTsKLQkJcmV0ID0gLUVJTlZBTDsKLQkJZ290byBmYWlsOwotCX0KLQlhY3J0Yy0+ZmxpcF9mbGFn cyA9IGZsYWdzOwotCi0JcmV0ID0gZHJtX2F0b21pY19ub25ibG9ja2luZ19jb21taXQoc3RhdGUp OwotCi1mYWlsOgotCWlmIChyZXQgPT0gLUVERUFETEspCi0JCWdvdG8gYmFja29mZjsKLQotCWlm IChyZXQpCi0JCWRybV9jcnRjX3ZibGFua19wdXQoY3J0Yyk7Ci0KLQlkcm1fYXRvbWljX3N0YXRl X3B1dChzdGF0ZSk7Ci0KLQlyZXR1cm4gcmV0OwotYmFja29mZjoKLQlkcm1fYXRvbWljX3N0YXRl X2NsZWFyKHN0YXRlKTsKLQlkcm1fYXRvbWljX2xlZ2FjeV9iYWNrb2ZmKHN0YXRlKTsKLQotCS8q Ci0JICogU29tZW9uZSBtaWdodCBoYXZlIGV4Y2hhbmdlZCB0aGUgZnJhbWVidWZmZXIgd2hpbGUg d2UgZHJvcHBlZCBsb2NrcwotCSAqIGluIHRoZSBiYWNrb2ZmIGNvZGUuIFdlIG5lZWQgdG8gZml4 IHVwIHRoZSBmYiByZWZjb3VudCB0cmFja2luZyB0aGUKLQkgKiBjb3JlIGRvZXMgZm9yIHVzLgot CSAqLwotCXBsYW5lLT5vbGRfZmIgPSBwbGFuZS0+ZmI7Ci0KLQlnb3RvIHJldHJ5OwotfQotCiAv KiBJbXBsZW1lbnRlZCBvbmx5IHRoZSBvcHRpb25zIGN1cnJlbnRseSBhdmFpbGlibGUgZm9yIHRo ZSBkcml2ZXIgKi8KIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX2NydGNfZnVuY3MgYW1kZ3B1X2Rt X2NydGNfZnVuY3MgPSB7CiAJLnJlc2V0ID0gZHJtX2F0b21pY19oZWxwZXJfY3J0Y19yZXNldCwK QEAgLTExNDUsNyArMTA2OCw3IEBAIHN0YXRpYyBpbnQgYW1kZ3B1X2F0b21pY19oZWxwZXJfcGFn ZV9mbGlwKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkuZGVzdHJveSA9IGFtZGdwdV9kbV9jcnRj X2Rlc3Ryb3ksCiAJLmdhbW1hX3NldCA9IGFtZGdwdV9kbV9hdG9taWNfY3J0Y19nYW1tYV9zZXQs CiAJLnNldF9jb25maWcgPSBkcm1fYXRvbWljX2hlbHBlcl9zZXRfY29uZmlnLAotCS5wYWdlX2Zs aXAgPSBhbWRncHVfYXRvbWljX2hlbHBlcl9wYWdlX2ZsaXAsCisJLnBhZ2VfZmxpcF90YXJnZXQg PSBkcm1fYXRvbWljX2hlbHBlcl9wYWdlX2ZsaXBfdGFyZ2V0LAogCS5hdG9taWNfZHVwbGljYXRl X3N0YXRlID0gZHJtX2F0b21pY19oZWxwZXJfY3J0Y19kdXBsaWNhdGVfc3RhdGUsCiAJLmF0b21p Y19kZXN0cm95X3N0YXRlID0gZHJtX2F0b21pY19oZWxwZXJfY3J0Y19kZXN0cm95X3N0YXRlLAog CS5hdG9taWNfc2V0X3Byb3BlcnR5ID0gZG1fY3J0Y19mdW5jc19hdG9taWNfc2V0X3Byb3BlcnR5 CkBAIC0xNjc5LDcgKzE2MDIsNyBAQCBzdGF0aWMgYm9vbCBwYWdlX2ZsaXBfbmVlZGVkKAogCQkJ CSAgICBzaXplb2Yob2xkX3N0YXRlX3RtcCkpID09IDAgPyB0cnVlOmZhbHNlOwogCWlmIChuZXdf c3RhdGUtPmNydGMgJiYgcGFnZV9mbGlwX3JlcXVpcmVkID09IGZhbHNlKSB7CiAJCWFjcnRjX25l dyA9IHRvX2FtZGdwdV9jcnRjKG5ld19zdGF0ZS0+Y3J0Yyk7Ci0JCWlmIChhY3J0Y19uZXctPmZs aXBfZmxhZ3MgJiBEUk1fTU9ERV9QQUdFX0ZMSVBfQVNZTkMpCisJCWlmIChuZXdfc3RhdGUtPnBm bGlwX2ZsYWdzICYgRFJNX01PREVfUEFHRV9GTElQX0FTWU5DKQogCQkJcGFnZV9mbGlwX3JlcXVp cmVkID0gdHJ1ZTsKIAl9CiAJcmV0dXJuIHBhZ2VfZmxpcF9yZXF1aXJlZDsKQEAgLTI3NjAsNyAr MjY4Myw2IEBAIGludCBhbWRncHVfZG1fYXRvbWljX2NvbW1pdCgKIAlmb3JfZWFjaF9wbGFuZV9p bl9zdGF0ZShzdGF0ZSwgcGxhbmUsIG9sZF9wbGFuZV9zdGF0ZSwgaSkgewogCQlzdHJ1Y3QgZHJt X3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZSA9IHBsYW5lLT5zdGF0ZTsKIAkJc3RydWN0IGRybV9j cnRjICpjcnRjID0gcGxhbmVfc3RhdGUtPmNydGM7Ci0JCXN0cnVjdCBhbWRncHVfY3J0YyAqYWNy dGMgPSB0b19hbWRncHVfY3J0YyhjcnRjKTsKIAkJc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIg PSBwbGFuZV9zdGF0ZS0+ZmI7CiAKIAkJaWYgKCFmYiB8fCAhY3J0YyB8fCAhY3J0Yy0+c3RhdGUt PnBsYW5lc19jaGFuZ2VkIHx8CkBAIC0yNzcxLDEwICsyNjkzLDkgQEAgaW50IGFtZGdwdV9kbV9h dG9taWNfY29tbWl0KAogCQkJcmV0ID0gYW1kZ3B1X2NydGNfcGFnZV9mbGlwX3RhcmdldChjcnRj LAogCQkJCQkJCSAgIGZiLAogCQkJCQkJCSAgIGNydGMtPnN0YXRlLT5ldmVudCwKLQkJCQkJCQkg ICBhY3J0Yy0+ZmxpcF9mbGFncywKLQkJCQkJCQkgICBkcm1fY3J0Y192YmxhbmtfY291bnQoY3J0 YykpOwotCQkJLypjbGVhbiB1cCB0aGUgZmxhZ3MgZm9yIG5leHQgdXNhZ2UqLwotCQkJYWNydGMt PmZsaXBfZmxhZ3MgPSAwOworCQkJCQkJCSAgIHBsYW5lX3N0YXRlLT5wZmxpcF9mbGFncywKKwkJ CQkJCQkgICBjcnRjLT5zdGF0ZS0+dGFyZ2V0X3ZibGFuayk7CisKIAkJCWlmIChyZXQpCiAJCQkJ YnJlYWs7CiAJCX0KLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVl ZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9kcmktZGV2ZWwK