From: Harry Wentland Subject: [PATCH 10/31] drm/amd/display: Unify loop for surface update and page flip. Date: Tue, 23 May 2017 10:08:48 -0400 Message-ID: <20170523140909.9924-11-harry.wentland@amd.com> References: <20170523140909.9924-1-harry.wentland@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170523140909.9924-1-harry.wentland-5C7GfCeVMHo@public.gmane.org> List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: Andrey Grodzovsky RnJvbTogQW5kcmV5IEdyb2R6b3Zza3kgPEFuZHJleS5Hcm9kem92c2t5QGFtZC5jb20+CgpSZW1v dmUgZXh0cmEgbG9vcCB3ZSBoYXZlIGZvciBwYWdlIGZsaXBzIGFuZCBkbyBmbGlwcyBpbiBzYW1l IGxvb3Agd2UgZG8KZm9yIHN1cmZhY2UgY3JlYXRlL3VwZGF0ZS4KQWRkIGRvY3VtZW50YXRpb24g Zm9yIHN5bmNocm9uaXphdGlvbiBiZXR3ZWVuIGNvbW1pdHMgb24gZGlmZmVyZW50IGNydGNzLgpS ZW5hbWUgZnVuY3Rpb24gdG8gaGF2ZSBETSBwcmVmaXguCgpDaGFuZ2UtSWQ6IEliYjY2NDRiMTVm NzU5ODFlYWU3YzY1YTg5MWE5MzE0ZmI1YzIzZmU5ClNpZ25lZC1vZmYtYnk6IEFuZHJleSBHcm9k em92c2t5IDxBbmRyZXkuR3JvZHpvdnNreUBhbWQuY29tPgpSZXZpZXdlZC1ieTogSGFycnkgV2Vu dGxhbmQgPEhhcnJ5LldlbnRsYW5kQGFtZC5jb20+Ci0tLQogLi4uL2RybS9hbWQvZGlzcGxheS9h bWRncHVfZG0vYW1kZ3B1X2RtX3R5cGVzLmMgICAgfCA4OCArKysrKysrKysrKy0tLS0tLS0tLS0t CiAxIGZpbGUgY2hhbmdlZCwgNDIgaW5zZXJ0aW9ucygrKSwgNDYgZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2FtZGdwdV9kbS9hbWRncHVfZG1f dHlwZXMuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9hbWRncHVfZG0vYW1kZ3B1X2Rt X3R5cGVzLmMKaW5kZXggZGU1YzYzZjQyZDY1Li42ZDhhMTI3N2Q1OWUgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9hbWRncHVfZG0vYW1kZ3B1X2RtX3R5cGVzLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2FtZGdwdV9kbS9hbWRncHVfZG1fdHlwZXMu YwpAQCAtMjU2MiwxMCArMjU2MiwxMSBAQCBzdGF0aWMgdm9pZCBhbWRncHVfZG1fZG9fZmxpcCgK IAkJCQkJCSBhY3J0Yy0+Y3J0Y19pZCk7CiB9CiAKLXZvaWQgZGNfY29tbWl0X3N1cmZhY2VzKHN0 cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSwKK3N0YXRpYyB2b2lkIGFtZGdwdV9kbV9jb21t aXRfc3VyZmFjZXMoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlLAogCQkJc3RydWN0IGRy bV9kZXZpY2UgKmRldiwKIAkJCXN0cnVjdCBhbWRncHVfZGlzcGxheV9tYW5hZ2VyICpkbSwKLQkJ CXN0cnVjdCBkcm1fY3J0YyAqcGNydGMpCisJCQlzdHJ1Y3QgZHJtX2NydGMgKnBjcnRjLAorCQkJ Ym9vbCAqd2FpdF9mb3JfdmJsYW5rKQogewogCXVpbnQzMl90IGk7CiAJc3RydWN0IGRybV9wbGFu ZSAqcGxhbmU7CkBAIC0yNTc4LDEwICsyNTc5LDExIEBAIHZvaWQgZGNfY29tbWl0X3N1cmZhY2Vz KHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSwKIAlmb3JfZWFjaF9wbGFuZV9pbl9zdGF0 ZShzdGF0ZSwgcGxhbmUsIG9sZF9wbGFuZV9zdGF0ZSwgaSkgewogCQlzdHJ1Y3QgZHJtX3BsYW5l X3N0YXRlICpwbGFuZV9zdGF0ZSA9IHBsYW5lLT5zdGF0ZTsKIAkJc3RydWN0IGRybV9jcnRjICpj cnRjID0gcGxhbmVfc3RhdGUtPmNydGM7CisJCXN0cnVjdCBhbWRncHVfY3J0YyAqYWNydGNfYXR0 YWNoID0gdG9fYW1kZ3B1X2NydGMoY3J0Yyk7CiAJCXN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZi ID0gcGxhbmVfc3RhdGUtPmZiOwogCQlzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yOwog CQlzdHJ1Y3QgZG1fY29ubmVjdG9yX3N0YXRlICpkbV9zdGF0ZSA9IE5VTEw7Ci0JCXN0cnVjdCBh bWRncHVfY3J0YyAqYWNydGNfYXR0YWNoOworCiAJCWVudW0gZG1fY29tbWl0X2FjdGlvbiBhY3Rp b247CiAJCWJvb2wgcGZsaXBfbmVlZGVkOwogCkBAIC0yNTkwLDEzICsyNTkyLDEzIEBAIHZvaWQg ZGNfY29tbWl0X3N1cmZhY2VzKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSwKIAogCQlh Y3Rpb24gPSBnZXRfZG1fY29tbWl0X2FjdGlvbihjcnRjLT5zdGF0ZSk7CiAKLQkJLyogU3VyZmFj ZXMgYXJlIGNyZWF0ZWQgdW5kZXIgdHdvIHNjZW5hcmlvczoKLQkJICogMS4gVGhpcyBjb21taXQg aXMgbm90IGEgcGFnZSBmbGlwLgotCQkgKiAyLiBUaGlzIGNvbW1pdCBpcyBhIHBhZ2UgZmxpcCwg YW5kIHN0cmVhbXMgYXJlIGNyZWF0ZWQuCisJCS8qCisJCSAqIFRPRE8gLSBUTyBkZWNpZGUgaWYg aXQncyBhIGZsaXAgb3Igc3VyZmFjZSB1cGRhdGUKKwkJICogc3RvcCByZWx5aW5nIG9uIGFsbG93 X21vZGVzZXQgZmxhZyBhbmQgcXVlcnkgREMKKwkJICogdXNpbmcgZGNfY2hlY2tfdXBkYXRlX3N1 cmZhY2VzX2Zvcl9zdHJlYW0uCiAJCSAqLwogCQlwZmxpcF9uZWVkZWQgPSAhc3RhdGUtPmFsbG93 X21vZGVzZXQ7Ci0JCWlmICghcGZsaXBfbmVlZGVkIHx8IGFjdGlvbiA9PSBETV9DT01NSVRfQUNU SU9OX0RQTVNfT04KLQkJCQl8fCBhY3Rpb24gPT0gRE1fQ09NTUlUX0FDVElPTl9TRVQpIHsKKwkJ aWYgKCFwZmxpcF9uZWVkZWQpIHsKIAkJCWxpc3RfZm9yX2VhY2hfZW50cnkoY29ubmVjdG9yLAog CQkJCQkgICAgJmRldi0+bW9kZV9jb25maWcuY29ubmVjdG9yX2xpc3QsCiAJCQkJCSAgICBoZWFk KSB7CkBAIC0yNjI2LDExICsyNjI4LDIzIEBAIHZvaWQgZGNfY29tbWl0X3N1cmZhY2VzKHN0cnVj dCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSwKIAkJCWlmIChjcnRjID09IHBjcnRjKSB7CiAJCQkJ YWRkX3N1cmZhY2UoZG0tPmRjLCBjcnRjLCBwbGFuZSwKIAkJCQkJICAgICZkY19zdXJmYWNlc19j b25zdHJ1Y3RlZFtwbGFuZXNfY291bnRdKTsKLQkJCQlhY3J0Y19hdHRhY2ggPSB0b19hbWRncHVf Y3J0YyhjcnRjKTsKIAkJCQlkY19zdHJlYW1fYXR0YWNoID0gYWNydGNfYXR0YWNoLT5zdHJlYW07 CiAJCQkJcGxhbmVzX2NvdW50Kys7CiAJCQl9CisJCX0gZWxzZSBpZiAoY3J0Yy0+c3RhdGUtPnBs YW5lc19jaGFuZ2VkKSB7CisJCQkqd2FpdF9mb3JfdmJsYW5rID0KKwkJCQlhY3J0Y19hdHRhY2gt PmZsaXBfZmxhZ3MgJiBEUk1fTU9ERV9QQUdFX0ZMSVBfQVNZTkMgPworCQkJCWZhbHNlIDogdHJ1 ZTsKKworCQkJYW1kZ3B1X2RtX2RvX2ZsaXAoCisJCQkJY3J0YywKKwkJCQlmYiwKKwkJCQlkcm1f Y3J0Y192YmxhbmtfY291bnQoY3J0YykgKyAqd2FpdF9mb3JfdmJsYW5rKTsKKworCQkJLypjbGVh biB1cCB0aGUgZmxhZ3MgZm9yIG5leHQgdXNhZ2UqLworCQkJYWNydGNfYXR0YWNoLT5mbGlwX2Zs YWdzID0gMDsKIAkJfQorCiAJfQogCiAJaWYgKHBsYW5lc19jb3VudCkgewpAQCAtMjY1Miw4ICsy NjY2LDYgQEAgdm9pZCBhbWRncHVfZG1fYXRvbWljX2NvbW1pdF90YWlsKAogCXN0cnVjdCBkcm1f ZGV2aWNlICpkZXYgPSBzdGF0ZS0+ZGV2OwogCXN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2ID0g ZGV2LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3QgYW1kZ3B1X2Rpc3BsYXlfbWFuYWdlciAqZG0gPSAm YWRldi0+ZG07Ci0Jc3RydWN0IGRybV9wbGFuZSAqcGxhbmU7Ci0Jc3RydWN0IGRybV9wbGFuZV9z dGF0ZSAqb2xkX3BsYW5lX3N0YXRlOwogCXVpbnQzMl90IGksIGo7CiAJdWludDMyX3QgY29tbWl0 X3N0cmVhbXNfY291bnQgPSAwOwogCXVpbnQzMl90IG5ld19jcnRjc19jb3VudCA9IDA7CkBAIC0y ODE4LDcgKzI4MzAsNyBAQCB2b2lkIGFtZGdwdV9kbV9hdG9taWNfY29tbWl0X3RhaWwoCiAKIAkv KiB1cGRhdGUgcGxhbmVzIHdoZW4gbmVlZGVkIHBlciBjcnRjKi8KIAlmb3JfZWFjaF9jcnRjX2lu X3N0YXRlKHN0YXRlLCBwY3J0Yywgb2xkX2NydGNfc3RhdGUsIGopCi0JCWRjX2NvbW1pdF9zdXJm YWNlcyhzdGF0ZSwgZGV2LCBkbSwgcGNydGMpOworCQlhbWRncHVfZG1fY29tbWl0X3N1cmZhY2Vz KHN0YXRlLCBkZXYsIGRtLCBwY3J0YywgJndhaXRfZm9yX3ZibGFuayk7CiAKIAlmb3IgKGkgPSAw OyBpIDwgbmV3X2NydGNzX2NvdW50OyBpKyspIHsKIAkJLyoKQEAgLTI4MzIsMzQgKzI4NDQsNiBA QCB2b2lkIGFtZGdwdV9kbV9hdG9taWNfY29tbWl0X3RhaWwoCiAKIAkJbWFuYWdlX2RtX2ludGVy cnVwdHMoYWRldiwgYWNydGMsIHRydWUpOwogCQlkbV9jcnRjX2N1cnNvcl9yZXNldCgmYWNydGMt PmJhc2UpOwotCi0JfQotCi0JZm9yX2VhY2hfcGxhbmVfaW5fc3RhdGUoc3RhdGUsIHBsYW5lLCBv bGRfcGxhbmVfc3RhdGUsIGkpIHsKLQkJc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqcGxhbmVfc3Rh dGUgPSBwbGFuZS0+c3RhdGU7Ci0JCXN0cnVjdCBkcm1fY3J0YyAqY3J0YyA9IHBsYW5lX3N0YXRl LT5jcnRjOwotCQlzdHJ1Y3QgYW1kZ3B1X2NydGMgKmFjcnRjID0gdG9fYW1kZ3B1X2NydGMoY3J0 Yyk7Ci0JCXN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiID0gcGxhbmVfc3RhdGUtPmZiOwotCQli b29sIHBmbGlwX25lZWRlZDsKLQotCQlpZiAoIWZiIHx8ICFjcnRjIHx8ICFjcnRjLT5zdGF0ZS0+ cGxhbmVzX2NoYW5nZWQgfHwKLQkJCSFjcnRjLT5zdGF0ZS0+YWN0aXZlKQotCQkJY29udGludWU7 Ci0JCXBmbGlwX25lZWRlZCA9ICFzdGF0ZS0+YWxsb3dfbW9kZXNldDsKLQotCQlpZiAocGZsaXBf bmVlZGVkKSB7Ci0JCQl3YWl0X2Zvcl92YmxhbmsgPQotCQkJCWFjcnRjLT5mbGlwX2ZsYWdzICYg RFJNX01PREVfUEFHRV9GTElQX0FTWU5DID8KLQkJCQlmYWxzZSA6IHRydWU7Ci0KLQkJCWFtZGdw dV9kbV9kb19mbGlwKAotCQkJCWNydGMsCi0JCQkJZmIsCi0JCQkJZHJtX2NydGNfdmJsYW5rX2Nv dW50KGNydGMpICsgd2FpdF9mb3JfdmJsYW5rKTsKLQotCQkJLypjbGVhbiB1cCB0aGUgZmxhZ3Mg Zm9yIG5leHQgdXNhZ2UqLwotCQkJYWNydGMtPmZsaXBfZmxhZ3MgPSAwOwotCQl9CiAJfQogCiAK QEAgLTMwODIsNyArMzA2NiwxMSBAQCBpbnQgYW1kZ3B1X2RtX2F0b21pY19jaGVjayhzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2LAogCXN0cnVjdCBkYyAqZGMgPSBhZGV2LT5kbS5kYzsKIAlib29sIG5l ZWRfdG9fdmFsaWRhdGUgPSBmYWxzZTsKIAlzdHJ1Y3QgdmFsaWRhdGVfY29udGV4dCAqY29udGV4 dDsKLQlib29sIHdhaXRfNF9wcmV2X2NvbW1pdHMgPSBmYWxzZTsKKwkvKgorCSAqIFRoaXMgYm9v bCB3aWxsIGJlIHNldCBmb3IgdHJ1ZSBmb3IgYW55IG1vZGVzZXQvcmVzZXQKKwkgKiBvciBzdXJm YWNlIHVwZGF0ZSB3aGljaCBpbXBsaWVzIG5vbiBmYXN0IHN1cmZhZSB1cGRhdGUuCisJICovCisJ Ym9vbCB3YWl0X2Zvcl9wcmV2X2NvbW1pdHMgPSBmYWxzZTsKIAogCXJldCA9IGRybV9hdG9taWNf aGVscGVyX2NoZWNrKGRldiwgc3RhdGUpOwogCkBAIC0zMTU5LDcgKzMxNDcsNyBAQCBpbnQgYW1k Z3B1X2RtX2F0b21pY19jaGVjayhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCiAJCQluZXdfc3Ry ZWFtX2NvdW50Kys7CiAJCQluZWVkX3RvX3ZhbGlkYXRlID0gdHJ1ZTsKLQkJCXdhaXRfNF9wcmV2 X2NvbW1pdHMgPSB0cnVlOworCQkJd2FpdF9mb3JfcHJldl9jb21taXRzID0gdHJ1ZTsKIAkJCWJy ZWFrOwogCQl9CiAKQEAgLTMyMDUsNyArMzE5Myw3IEBAIGludCBhbWRncHVfZG1fYXRvbWljX2No ZWNrKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAKIAkJCW5ld19zdHJlYW1fY291bnQrKzsKIAkJ CW5lZWRfdG9fdmFsaWRhdGUgPSB0cnVlOwotCQkJd2FpdF80X3ByZXZfY29tbWl0cyA9IHRydWU7 CisJCQl3YWl0X2Zvcl9wcmV2X2NvbW1pdHMgPSB0cnVlOwogCiAJCQlicmVhazsKIAkJfQpAQCAt MzIxNyw3ICszMjA1LDcgQEAgaW50IGFtZGdwdV9kbV9hdG9taWNfY2hlY2soc3RydWN0IGRybV9k ZXZpY2UgKmRldiwKIAkJCQkJCXNldCwKIAkJCQkJCXNldF9jb3VudCwKIAkJCQkJCWFjcnRjLT5z dHJlYW0pOwotCQkJCXdhaXRfNF9wcmV2X2NvbW1pdHMgPSB0cnVlOworCQkJCXdhaXRfZm9yX3By ZXZfY29tbWl0cyA9IHRydWU7CiAJCQl9CiAJCQlicmVhazsKIAkJfQpAQCAtMzMxMyw4ICszMzAx LDE2IEBAIGludCBhbWRncHVfZG1fYXRvbWljX2NoZWNrKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYs CiAJaWYgKG5lZWRfdG9fdmFsaWRhdGUgPT0gZmFsc2UgfHwgc2V0X2NvdW50ID09IDAgfHwgY29u dGV4dCkgewogCiAJCXJldCA9IDA7Ci0KLQkJaWYgKHdhaXRfNF9wcmV2X2NvbW1pdHMpIHsKKwkJ LyoKKwkJICogRm9yIGZ1bGwgdXBkYXRlcyBjYXNlIHdoZW4KKwkJICogcmVtb3ZpbmcvYWRkaW5n L3VwZGF0ZWRpbmcgIHN0cmVhbXMgb24gb25jZSBDUlRDIHdoaWxlIGZsaXBwaW5nCisJCSAqIG9u IGFub3RoZXIgQ1JUQywKKwkJICogQWRkaW5nIGFsbCBjdXJyZW50IGFjdGl2ZSBDUlRDJ3Mgc3Rh dGVzIHRvIHRoZSBhdG9taWMgY29tbWl0IGluCisJCSAqIGFtZGdwdV9kbV9hdG9taWNfY2hlY2sg d2lsbCBndWFyYW50ZWUgdGhhdCBhbnkgc3VjaCBmdWxsIHVwZGF0ZSBjb21taXQKKwkJICogd2ls bCB3YWl0IGZvciBjb21wbGV0aW9uIG9mIGFueSBvdXRzdGFuZGluZyBmbGlwIHVzaW5nIERSTXMK KwkJICogc3luY2hyb25pemF0aW9uIGV2ZW50cy4KKwkJICovCisJCWlmICh3YWl0X2Zvcl9wcmV2 X2NvbW1pdHMpIHsKIAkJCWxpc3RfZm9yX2VhY2hfZW50cnkoY3J0YywgJmRldi0+bW9kZV9jb25m aWcuY3J0Y19saXN0LCBoZWFkKSB7CiAJCQkJc3RydWN0IGFtZGdwdV9jcnRjICphY3J0YyA9IHRv X2FtZGdwdV9jcnRjKGNydGMpOwogCQkJCXN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19zdGF0 ZTsKLS0gCjIuMTEuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KYW1kLWdmeCBtYWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4Cg==