From: Ville Syrjala Subject: [PATCH v2 12/14] drm/i915/fbc: Wait for vblank after FBC disable on glk+ Date: Wed, 27 Nov 2019 22:12:20 +0200 Message-ID: <20191127201222.16669-13-ville.syrjala@linux.intel.com> References: <20191127201222.16669-1-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2DB12897F5 for ; Wed, 27 Nov 2019 20:13:15 +0000 (UTC) In-Reply-To: <20191127201222.16669-1-ville.syrjala@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCk9u IGdsaysgdGhlIGhhcmR3YXJlIGdldHMgY29uZnVzZWQgaWYgd2UgZGlzYWJsZSBGQkMgd2hpbGUK aXQncyByZWNvbXByZXNzaW5nIGFuZCB3ZSBwZXJmb3JtIGEgcGxhbmUgdXBkYXRlIGR1cmluZyB0 aGUKc2FtZSBmcmFtZS4gVGhlIHJlc3VsdCBpcyB0aGF0IHRvcCBvZiB0aGUgc2NyZWVuIGdldHMg Y29ycnVwdGVkLgoKV2UgY2FuIGF2b2lkIHRoYXQgYnkgZ2l2aW5nIHRoZSBoYXJkd2FyZSBlbm91 Z2ggdGltZSB0byBmaW5pc2gKdGhlIEZCQyBkaXNhYmxlIGJlZm9yZSB3ZSB0b3VjaCB0aGUgcGxh bmUgcmVnaXN0ZXJzLiBJZS4gd2UgbmVlZAphbiBleHRyYSB2Ymxhbmsgd2FpdCBhZnRlciBGQkMg ZGlzYWJsZS4KClNpZ25lZC1vZmYtYnk6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBs aW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9k aXNwbGF5LmMgfCAgNCArKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZmJj LmMgICAgIHwgMjYgKysrKysrKysrKysrKysrKystLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2Rp c3BsYXkvaW50ZWxfZmJjLmggICAgIHwgIDIgKy0KIDMgZmlsZXMgY2hhbmdlZCwgMjcgaW5zZXJ0 aW9ucygrKSwgNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9kaXNwbGF5L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkv aW50ZWxfZGlzcGxheS5jCmluZGV4IGQ1OTJiNzI4NDQwNi4uMzIxMGEwZjAwMDA5IDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rpc3BsYXkuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rpc3BsYXkuYwpAQCAtNjEwNSw3ICs2 MTA1LDkgQEAgc3RhdGljIHZvaWQgaW50ZWxfcHJlX3BsYW5lX3VwZGF0ZShzdHJ1Y3QgaW50ZWxf Y3J0Y19zdGF0ZSAqb2xkX2NydGNfc3RhdGUsCiAJCQlpbnRlbF9hdG9taWNfZ2V0X25ld19wbGFu ZV9zdGF0ZShpbnRlbF9zdGF0ZSwKIAkJCQkJCQkgdG9faW50ZWxfcGxhbmUocHJpbWFyeSkpOwog Ci0JCWludGVsX2ZiY19wcmVfdXBkYXRlKGNydGMsIHBpcGVfY29uZmlnLCBuZXdfcHJpbWFyeV9z dGF0ZSk7CisJCWlmIChpbnRlbF9mYmNfcHJlX3VwZGF0ZShjcnRjLCBwaXBlX2NvbmZpZywgbmV3 X3ByaW1hcnlfc3RhdGUpKQorCQkJaW50ZWxfd2FpdF9mb3JfdmJsYW5rKGRldl9wcml2LCBjcnRj LT5waXBlKTsKKwogCQkvKgogCQkgKiBHZW4yIHJlcG9ydHMgcGlwZSB1bmRlcnJ1bnMgd2hlbmV2 ZXIgYWxsIHBsYW5lcyBhcmUgZGlzYWJsZWQuCiAJCSAqIFNvIGRpc2FibGUgdW5kZXJydW4gcmVw b3J0aW5nIGJlZm9yZSBhbGwgdGhlIHBsYW5lcyBnZXQgZGlzYWJsZWQuCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2ZiYy5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvZGlzcGxheS9pbnRlbF9mYmMuYwppbmRleCAyMjBmYmU1YmQ5MTkuLjc4ZmU0YWJiNWE5 MyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9mYmMuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2ZiYy5jCkBAIC04NTksMTYg Kzg1OSwxNyBAQCBzdGF0aWMgYm9vbCBpbnRlbF9mYmNfY2FuX2ZsaXBfbnVrZShjb25zdCBzdHJ1 Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSkKIAlyZXR1cm4gdHJ1ZTsKIH0KIAotdm9p ZCBpbnRlbF9mYmNfcHJlX3VwZGF0ZShzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKK2Jvb2wgaW50 ZWxfZmJjX3ByZV91cGRhdGUoc3RydWN0IGludGVsX2NydGMgKmNydGMsCiAJCQkgIHN0cnVjdCBp bnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAogCQkJICBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3Rh dGUgKnBsYW5lX3N0YXRlKQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9 IHRvX2k5MTUoY3J0Yy0+YmFzZS5kZXYpOwogCXN0cnVjdCBpbnRlbF9mYmMgKmZiYyA9ICZkZXZf cHJpdi0+ZmJjOwogCWNvbnN0IGNoYXIgKnJlYXNvbiA9ICJ1cGRhdGUgcGVuZGluZyI7CisJYm9v bCBuZWVkX3ZibGFua193YWl0ID0gZmFsc2U7CiAKIAlpZiAoIWZiY19zdXBwb3J0ZWQoZGV2X3By aXYpKQotCQlyZXR1cm47CisJCXJldHVybiBuZWVkX3ZibGFua193YWl0OwogCiAJbXV0ZXhfbG9j aygmZmJjLT5sb2NrKTsKIApAQCAtODc4LDEwICs4NzksMjkgQEAgdm9pZCBpbnRlbF9mYmNfcHJl X3VwZGF0ZShzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKIAlpbnRlbF9mYmNfdXBkYXRlX3N0YXRl X2NhY2hlKGNydGMsIGNydGNfc3RhdGUsIHBsYW5lX3N0YXRlKTsKIAlmYmMtPmZsaXBfcGVuZGlu ZyA9IHRydWU7CiAKLQlpZiAoIWludGVsX2ZiY19jYW5fZmxpcF9udWtlKGNydGNfc3RhdGUpKQor CWlmICghaW50ZWxfZmJjX2Nhbl9mbGlwX251a2UoY3J0Y19zdGF0ZSkpIHsKIAkJaW50ZWxfZmJj X2RlYWN0aXZhdGUoZGV2X3ByaXYsIHJlYXNvbik7CisKKwkJLyoKKwkJICogRGlzcGxheSBXQSAj MTE5ODogZ2xrKworCQkgKiBOZWVkIGFuIGV4dHJhIHZibGFuayB3YWl0IGJldHdlZW4gRkJDIGRp c2FibGUgYW5kIG1vc3QgcGxhbmUKKwkJICogdXBkYXRlcy4gQnNwZWMgc2F5cyB0aGlzIGlzIG9u bHkgbmVlZGVkIGZvciBwbGFuZSBkaXNhYmxlLCBidXQKKwkJICogdGhhdCBpcyBub3QgdHJ1ZS4g VG91Y2hpbmcgbW9zdCBwbGFuZSByZWdpc3RlcnMgd2lsbCBjYXVzZSB0aGUKKwkJICogY29ycnVw dGlvbiB0byBhcHBlYXIuIEFsc28gU0tML2Rlcml2YXRpdmVzIGRvIG5vdCBzZWVtIHRvIGJlCisJ CSAqIGFmZmVjdGVkLgorCQkgKgorCQkgKiBUT0RPOiBjb3VsZCBvcHRpbWl6ZSB0aGlzIGEgYml0 IGJ5IHNhbXBsaW5nIHRoZSBmcmFtZQorCQkgKiBjb3VudGVyIHdoZW4gd2UgZGlzYWJsZSBGQkMg KGlmIGl0IHdhcyBhbHJlYWR5IGRvbmUgZWFybGllcikKKwkJICogYW5kIHNraXBwaW5nIHRoZSBl eHRyYSB2Ymxhbmsgd2FpdCBiZWZvcmUgdGhlIHBsYW5lIHVwZGF0ZQorCQkgKiBpZiBhdCBsZWFz dCBvbmUgZnJhbWUgaGFzIGFscmVhZHkgcGFzc2VkLgorCQkgKi8KKwkJaWYgKElOVEVMX0dFTihk ZXZfcHJpdikgPj0gMTAgfHwgSVNfR0VNSU5JTEFLRShkZXZfcHJpdikpCisJCQluZWVkX3ZibGFu a193YWl0ID0gdHJ1ZTsKKwl9CiB1bmxvY2s6CiAJbXV0ZXhfdW5sb2NrKCZmYmMtPmxvY2spOwor CisJcmV0dXJuIG5lZWRfdmJsYW5rX3dhaXQ7CiB9CiAKIC8qKgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9mYmMuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2Rpc3BsYXkvaW50ZWxfZmJjLmgKaW5kZXggYmE4ZWVlZmQ0ZDlhLi45YTJmMTA5NGNiZGEgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZmJjLmgKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9mYmMuaApAQCAtMTksNyArMTksNyBA QCBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGU7CiB2b2lkIGludGVsX2ZiY19jaG9vc2VfY3J0Yyhz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCQkgICBzdHJ1Y3QgaW50ZWxfYXRv bWljX3N0YXRlICpzdGF0ZSk7CiBib29sIGludGVsX2ZiY19pc19hY3RpdmUoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2KTsKLXZvaWQgaW50ZWxfZmJjX3ByZV91cGRhdGUoc3RydWN0 IGludGVsX2NydGMgKmNydGMsCitib29sIGludGVsX2ZiY19wcmVfdXBkYXRlKHN0cnVjdCBpbnRl bF9jcnRjICpjcnRjLAogCQkJICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwK IAkJCSAgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZSk7CiB2b2lkIGludGVs X2ZiY19wb3N0X3VwZGF0ZShzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0Yyk7Ci0tIAoyLjIzLjAKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBt YWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeA==