From: Mario Kleiner Subject: [PATCH 1/5] drm/amd/display: Update VRR state earlier in atomic_commit_tail. Date: Fri, 29 Mar 2019 13:00:53 +0100 Message-ID: <20190329120057.1472-2-mario.kleiner.de@gmail.com> References: <20190329120057.1472-1-mario.kleiner.de@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190329120057.1472-1-mario.kleiner.de@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: amd-gfx@lists.freedesktop.org Cc: nicholas.kazlauskas@amd.com, dri-devel@lists.freedesktop.org List-Id: amd-gfx.lists.freedesktop.org V2UgbmVlZCB0aGUgVlJSIGFjdGl2ZS9pbmFjdGl2ZSBzdGF0ZSBpbmZvIGVhcmxpZXIgaW4KdGhl IGNvbW1pdCBzZXF1ZW5jZSwgc28gVlJSIHJlbGF0ZWQgc2V0dXAgZnVuY3Rpb25zIGxpa2UKYW1k Z3B1X2RtX2hhbmRsZV92cnJfdHJhbnNpdGlvbigpIGtub3cgdGhlIGZpbmFsIFZSUiBzdGF0ZQp3 aGVuIHRoZXkgbmVlZCB0byBkbyB0aGVpciBodyBzZXR1cCB3b3JrLgoKU3BsaXQgdXBkYXRlX2Zy ZWVzeW5jX3N0YXRlX29uX3N0cmVhbSgpIGludG8gYW4gZWFybHkgcGFydCwKdGhhdCBjYW4gcnVu IGF0IHRoZSBiZWdpbm5pbmcgb2YgY29tbWl0IHRhaWwgYmVmb3JlIHRoZQp2cnIgdHJhbnNpdGlv biBoYW5kbGluZywgYW5kIGEgbGF0ZSBwYXJ0IHRoYXQgbXVzdCBydW4gYWZ0ZXIKdnJyIHRyYW5z aXRpb24gaGFuZGxpbmcgaW5zaWRlIHRoZSBjb21taXQgcGxhbmVzIGNvZGUgZm9yCmVuYWJsZWQg Y3J0YydzLgoKU3VnZ2VzdGVkIGJ5IE5pY2hvbGFzIEthemxhdXNrYXMuClNpZ25lZC1vZmYtYnk6 IE1hcmlvIEtsZWluZXIgPG1hcmlvLmtsZWluZXIuZGVAZ21haWwuY29tPgotLS0KIC4uLi9ncHUv ZHJtL2FtZC9kaXNwbGF5L2FtZGdwdV9kbS9hbWRncHVfZG0uYyB8IDYxICsrKysrKysrKysrKysr LS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA0NiBpbnNlcnRpb25zKCspLCAxNSBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvYW1kZ3B1X2RtL2FtZGdw dV9kbS5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2FtZGdwdV9kbS9hbWRncHVfZG0u YwppbmRleCA3ZDFjNzgyMDcyZWUuLjY1MjgyNThmODk3NSAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2FtZC9kaXNwbGF5L2FtZGdwdV9kbS9hbWRncHVfZG0uYworKysgYi9kcml2ZXJzL2dw dS9kcm0vYW1kL2Rpc3BsYXkvYW1kZ3B1X2RtL2FtZGdwdV9kbS5jCkBAIC00NjQ1LDcgKzQ2NDUs NiBAQCBzdGF0aWMgdm9pZCB1cGRhdGVfZnJlZXN5bmNfc3RhdGVfb25fc3RyZWFtKAogewogCXN0 cnVjdCBtb2RfdnJyX3BhcmFtcyB2cnJfcGFyYW1zID0gbmV3X2NydGNfc3RhdGUtPnZycl9wYXJh bXM7CiAJc3RydWN0IGRjX2luZm9fcGFja2V0IHZycl9pbmZvcGFja2V0ID0gezB9OwotCXN0cnVj dCBtb2RfZnJlZXN5bmNfY29uZmlnIGNvbmZpZyA9IG5ld19jcnRjX3N0YXRlLT5mcmVlc3luY19j b25maWc7CiAKIAlpZiAoIW5ld19zdHJlYW0pCiAJCXJldHVybjsKQEAgLTQ2NTgsMjAgKzQ2NTcs NiBAQCBzdGF0aWMgdm9pZCB1cGRhdGVfZnJlZXN5bmNfc3RhdGVfb25fc3RyZWFtKAogCWlmICgh bmV3X3N0cmVhbS0+dGltaW5nLmhfdG90YWwgfHwgIW5ld19zdHJlYW0tPnRpbWluZy52X3RvdGFs KQogCQlyZXR1cm47CiAKLQlpZiAobmV3X2NydGNfc3RhdGUtPnZycl9zdXBwb3J0ZWQgJiYKLQkg ICAgY29uZmlnLm1pbl9yZWZyZXNoX2luX3VoeiAmJgotCSAgICBjb25maWcubWF4X3JlZnJlc2hf aW5fdWh6KSB7Ci0JCWNvbmZpZy5zdGF0ZSA9IG5ld19jcnRjX3N0YXRlLT5iYXNlLnZycl9lbmFi bGVkID8KLQkJCVZSUl9TVEFURV9BQ1RJVkVfVkFSSUFCTEUgOgotCQkJVlJSX1NUQVRFX0lOQUNU SVZFOwotCX0gZWxzZSB7Ci0JCWNvbmZpZy5zdGF0ZSA9IFZSUl9TVEFURV9VTlNVUFBPUlRFRDsK LQl9Ci0KLQltb2RfZnJlZXN5bmNfYnVpbGRfdnJyX3BhcmFtcyhkbS0+ZnJlZXN5bmNfbW9kdWxl LAotCQkJCSAgICAgIG5ld19zdHJlYW0sCi0JCQkJICAgICAgJmNvbmZpZywgJnZycl9wYXJhbXMp OwotCiAJaWYgKHN1cmZhY2UpIHsKIAkJbW9kX2ZyZWVzeW5jX2hhbmRsZV9wcmVmbGlwKAogCQkJ ZG0tPmZyZWVzeW5jX21vZHVsZSwKQEAgLTQ3MTIsNiArNDY5Nyw0NiBAQCBzdGF0aWMgdm9pZCB1 cGRhdGVfZnJlZXN5bmNfc3RhdGVfb25fc3RyZWFtKAogCQkJICAgICAgKGludCl2cnJfcGFyYW1z LnN0YXRlKTsKIH0KIAorc3RhdGljIHZvaWQgcHJlX3VwZGF0ZV9mcmVlc3luY19zdGF0ZV9vbl9z dHJlYW0oCisJc3RydWN0IGFtZGdwdV9kaXNwbGF5X21hbmFnZXIgKmRtLAorCXN0cnVjdCBkbV9j cnRjX3N0YXRlICpuZXdfY3J0Y19zdGF0ZSkKK3sKKwlzdHJ1Y3QgZGNfc3RyZWFtX3N0YXRlICpu ZXdfc3RyZWFtID0gbmV3X2NydGNfc3RhdGUtPnN0cmVhbTsKKwlzdHJ1Y3QgbW9kX3Zycl9wYXJh bXMgdnJyX3BhcmFtcyA9IG5ld19jcnRjX3N0YXRlLT52cnJfcGFyYW1zOworCXN0cnVjdCBtb2Rf ZnJlZXN5bmNfY29uZmlnIGNvbmZpZyA9IG5ld19jcnRjX3N0YXRlLT5mcmVlc3luY19jb25maWc7 CisKKwlpZiAoIW5ld19zdHJlYW0pCisJCXJldHVybjsKKworCS8qCisJICogVE9ETzogRGV0ZXJt aW5lIHdoeSBtaW4vbWF4IHRvdGFscyBhbmQgdnJlZnJlc2ggY2FuIGJlIDAgaGVyZS4KKwkgKiBG b3Igbm93IGl0J3Mgc3VmZmljaWVudCB0byBqdXN0IGd1YXJkIGFnYWluc3QgdGhlc2UgY29uZGl0 aW9ucy4KKwkgKi8KKwlpZiAoIW5ld19zdHJlYW0tPnRpbWluZy5oX3RvdGFsIHx8ICFuZXdfc3Ry ZWFtLT50aW1pbmcudl90b3RhbCkKKwkJcmV0dXJuOworCisJaWYgKG5ld19jcnRjX3N0YXRlLT52 cnJfc3VwcG9ydGVkICYmCisJICAgIGNvbmZpZy5taW5fcmVmcmVzaF9pbl91aHogJiYKKwkgICAg Y29uZmlnLm1heF9yZWZyZXNoX2luX3VoeikgeworCQljb25maWcuc3RhdGUgPSBuZXdfY3J0Y19z dGF0ZS0+YmFzZS52cnJfZW5hYmxlZCA/CisJCQlWUlJfU1RBVEVfQUNUSVZFX1ZBUklBQkxFIDoK KwkJCVZSUl9TVEFURV9JTkFDVElWRTsKKwl9IGVsc2UgeworCQljb25maWcuc3RhdGUgPSBWUlJf U1RBVEVfVU5TVVBQT1JURUQ7CisJfQorCisJbW9kX2ZyZWVzeW5jX2J1aWxkX3Zycl9wYXJhbXMo ZG0tPmZyZWVzeW5jX21vZHVsZSwKKwkJCQkgICAgICBuZXdfc3RyZWFtLAorCQkJCSAgICAgICZj b25maWcsICZ2cnJfcGFyYW1zKTsKKworCW5ld19jcnRjX3N0YXRlLT5mcmVlc3luY190aW1pbmdf Y2hhbmdlZCB8PQorCQkobWVtY21wKCZuZXdfY3J0Y19zdGF0ZS0+dnJyX3BhcmFtcy5hZGp1c3Qs CisJCQkmdnJyX3BhcmFtcy5hZGp1c3QsCisJCQlzaXplb2YodnJyX3BhcmFtcy5hZGp1c3QpKSAh PSAwKTsKKworCW5ld19jcnRjX3N0YXRlLT52cnJfcGFyYW1zID0gdnJyX3BhcmFtczsKK30KKwog c3RhdGljIHZvaWQgYW1kZ3B1X2RtX2NvbW1pdF9wbGFuZXMoc3RydWN0IGRybV9hdG9taWNfc3Rh dGUgKnN0YXRlLAogCQkJCSAgICBzdHJ1Y3QgZGNfc3RhdGUgKmRjX3N0YXRlLAogCQkJCSAgICBz dHJ1Y3QgZHJtX2RldmljZSAqZGV2LApAQCAtNTIzMyw2ICs1MjU4LDEyIEBAIHN0YXRpYyB2b2lk IGFtZGdwdV9kbV9hdG9taWNfY29tbWl0X3RhaWwoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0 YXRlKQogCQltdXRleF91bmxvY2soJmRtLT5kY19sb2NrKTsKIAl9CiAKKwkvKiBVcGRhdGUgZnJl ZXN5bmMgc3RhdGUgYmVmb3JlIGFtZGdwdV9kbV9oYW5kbGVfdnJyX3RyYW5zaXRpb24oKS4gKi8K Kwlmb3JfZWFjaF9uZXdfY3J0Y19pbl9zdGF0ZShzdGF0ZSwgY3J0YywgbmV3X2NydGNfc3RhdGUs IGkpIHsKKwkJZG1fbmV3X2NydGNfc3RhdGUgPSB0b19kbV9jcnRjX3N0YXRlKG5ld19jcnRjX3N0 YXRlKTsKKwkJcHJlX3VwZGF0ZV9mcmVlc3luY19zdGF0ZV9vbl9zdHJlYW0oZG0sIGRtX25ld19j cnRjX3N0YXRlKTsKKwl9CisKIAlmb3JfZWFjaF9vbGRuZXdfY3J0Y19pbl9zdGF0ZShzdGF0ZSwg Y3J0Yywgb2xkX2NydGNfc3RhdGUsCiAJCQluZXdfY3J0Y19zdGF0ZSwgaSkgewogCQkvKgotLSAK Mi4yMC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpk cmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0 cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWw=