From: Maarten Lankhorst Subject: [PATCH 2/2] drm/i915: Remove delayed FBC activation. Date: Mon, 25 Jun 2018 18:37:58 +0200 Message-ID: <20180625163758.10871-2-maarten.lankhorst@linux.intel.com> References: <20180625163758.10871-1-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mblankhorst.nl (mblankhorst.nl [IPv6:2a02:2308::216:3eff:fe92:dfa3]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6FD5C6E27E for ; Mon, 25 Jun 2018 16:38:03 +0000 (UTC) In-Reply-To: <20180625163758.10871-1-maarten.lankhorst@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 Cc: Paulo Zanoni , Rodrigo Vivi List-Id: intel-gfx@lists.freedesktop.org VGhlIG9ubHkgdGltZSB3ZSBzaG91bGQgc3RhcnQgRkJDIGlzIHdoZW4gd2UgaGF2ZSB3YWl0ZWQg YSB2YmxhbmsKYWZ0ZXIgdGhlIGF0b21pYyB1cGRhdGUuIFdlJ3ZlIGFscmVhZHkgZm9yY2VkIGEg dmJsYW5rIHdhaXQgYnkgZG9pbmcKd2FpdF9mb3JfZmxpcF9kb25lIGJlZm9yZSBpbnRlbF9wb3N0 X3BsYW5lX3VwZGF0ZSgpLCBzbyB3ZSBkb24ndCBuZWVkCnRvIHdhaXQgYSBzZWNvbmQgdGltZSBi ZWZvcmUgZW5hYmxpbmcuCgpSZW1vdmluZyB0aGUgd29ya2VyIHNpbXBsaWZpZXMgdGhlIGNvZGUg YW5kIHJlbW92ZXMgcG9zc2libGUgcmFjZQpjb25kaXRpb25zLCBsaWtlIGhhcHBlbmluZyBpbiAx MDMxNjcuCgpDYzogUGF1bG8gWmFub25pIDxwYXVsby5yLnphbm9uaUBpbnRlbC5jb20+CkNjOiBS b2RyaWdvIFZpdmkgPHJvZHJpZ28udml2aUBpbnRlbC5jb20+CkJ1Z3ppbGxhOiBodHRwczovL2J1 Z3MuZnJlZWRlc2t0b3Aub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDMxNjcKU2lnbmVkLW9mZi1ieTog TWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KLS0t CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyB8ICA1IC0tCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICB8ICA2IC0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9mYmMuYyAgICB8IDk2ICstLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAzIGZpbGVz IGNoYW5nZWQsIDEgaW5zZXJ0aW9uKCspLCAxMDYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2RlYnVnZnMuYwppbmRleCBjNDAwZjQyYTU0ZWMuLjQ4YTU3YzA2MzZiZiAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKQEAgLTE2NTksMTEgKzE2NTksNiBAQCBzdGF0aWMg aW50IGk5MTVfZmJjX3N0YXR1cyhzdHJ1Y3Qgc2VxX2ZpbGUgKm0sIHZvaWQgKnVudXNlZCkKIAll bHNlCiAJCXNlcV9wcmludGYobSwgIkZCQyBkaXNhYmxlZDogJXNcbiIsIGZiYy0+bm9fZmJjX3Jl YXNvbik7CiAKLQlpZiAoZmJjLT53b3JrLnNjaGVkdWxlZCkKLQkJc2VxX3ByaW50ZihtLCAiRkJD IHdvcmtlciBzY2hlZHVsZWQgb24gdmJsYW5rICVsbHUsIG5vdyAlbGx1XG4iLAotCQkJICAgZmJj LT53b3JrLnNjaGVkdWxlZF92YmxhbmssCi0JCQkgICBkcm1fY3J0Y192YmxhbmtfY291bnQoJmZi Yy0+Y3J0Yy0+YmFzZSkpOwotCiAJaWYgKGludGVsX2ZiY19pc19hY3RpdmUoZGV2X3ByaXYpKSB7 CiAJCXUzMiBtYXNrOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry di5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCAzMjhkNDMxMmM0Mzgu Ljk2NDVkY2IzMDQ1NCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYu aAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC01ODAsMTIgKzU4MCw2 IEBAIHN0cnVjdCBpbnRlbF9mYmMgewogCQl1bnNpZ25lZCBpbnQgZ2VuOV93YV9jZmJfc3RyaWRl OwogCX0gcGFyYW1zOwogCi0Jc3RydWN0IGludGVsX2ZiY193b3JrIHsKLQkJYm9vbCBzY2hlZHVs ZWQ7Ci0JCXU2NCBzY2hlZHVsZWRfdmJsYW5rOwotCQlzdHJ1Y3Qgd29ya19zdHJ1Y3Qgd29yazsK LQl9IHdvcms7Ci0KIAljb25zdCBjaGFyICpub19mYmNfcmVhc29uOwogfTsKIApkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZmJjLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9mYmMuYwppbmRleCA5ZjllYTBiNTQ1MmYuLjAxZDFkMjA4OGYwNCAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZmJjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZmJjLmMKQEAgLTM5OSw4OSArMzk5LDYgQEAgYm9vbCBpbnRlbF9mYmNfaXNf YWN0aXZlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlyZXR1cm4gZGV2X3By aXYtPmZiYy5hY3RpdmU7CiB9CiAKLXN0YXRpYyB2b2lkIGludGVsX2ZiY193b3JrX2ZuKHN0cnVj dCB3b3JrX3N0cnVjdCAqX193b3JrKQotewotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiA9Ci0JCWNvbnRhaW5lcl9vZihfX3dvcmssIHN0cnVjdCBkcm1faTkxNV9wcml2YXRlLCBm YmMud29yay53b3JrKTsKLQlzdHJ1Y3QgaW50ZWxfZmJjICpmYmMgPSAmZGV2X3ByaXYtPmZiYzsK LQlzdHJ1Y3QgaW50ZWxfZmJjX3dvcmsgKndvcmsgPSAmZmJjLT53b3JrOwotCXN0cnVjdCBpbnRl bF9jcnRjICpjcnRjID0gZmJjLT5jcnRjOwotCXN0cnVjdCBkcm1fdmJsYW5rX2NydGMgKnZibGFu ayA9ICZkZXZfcHJpdi0+ZHJtLnZibGFua1tjcnRjLT5waXBlXTsKLQotCWlmIChkcm1fY3J0Y192 YmxhbmtfZ2V0KCZjcnRjLT5iYXNlKSkgewotCQkvKiBDUlRDIGlzIG5vdyBvZmYsIGxlYXZlIEZC QyBkZWFjdGl2YXRlZCAqLwotCQltdXRleF9sb2NrKCZmYmMtPmxvY2spOwotCQl3b3JrLT5zY2hl ZHVsZWQgPSBmYWxzZTsKLQkJbXV0ZXhfdW5sb2NrKCZmYmMtPmxvY2spOwotCQlyZXR1cm47Ci0J fQotCi1yZXRyeToKLQkvKiBEZWxheSB0aGUgYWN0dWFsIGVuYWJsaW5nIHRvIGxldCBwYWdlZmxp cHBpbmcgY2Vhc2UgYW5kIHRoZQotCSAqIGRpc3BsYXkgdG8gc2V0dGxlIGJlZm9yZSBzdGFydGlu ZyB0aGUgY29tcHJlc3Npb24uIE5vdGUgdGhhdAotCSAqIHRoaXMgZGVsYXkgYWxzbyBzZXJ2ZXMg YSBzZWNvbmQgcHVycG9zZTogaXQgYWxsb3dzIGZvciBhCi0JICogdmJsYW5rIHRvIHBhc3MgYWZ0 ZXIgZGlzYWJsaW5nIHRoZSBGQkMgYmVmb3JlIHdlIGF0dGVtcHQKLQkgKiB0byBtb2RpZnkgdGhl IGNvbnRyb2wgcmVnaXN0ZXJzLgotCSAqCi0JICogV2FGYmNXYWl0Rm9yVkJsYW5rQmVmb3JlRW5h YmxlOmlsayxzbmIKLQkgKgotCSAqIEl0IGlzIGFsc28gd29ydGggbWVudGlvbmluZyB0aGF0IHNp bmNlIHdvcmstPnNjaGVkdWxlZF92YmxhbmsgY2FuIGJlCi0JICogdXBkYXRlZCBtdWx0aXBsZSB0 aW1lcyBieSB0aGUgb3RoZXIgdGhyZWFkcywgaGl0dGluZyB0aGUgdGltZW91dCBpcwotCSAqIG5v dCBhbiBlcnJvciBjb25kaXRpb24uIFdlJ2xsIGp1c3QgZW5kIHVwIGhpdHRpbmcgdGhlICJnb3Rv IHJldHJ5IgotCSAqIGNhc2UgYmVsb3cuCi0JICovCi0Jd2FpdF9ldmVudF90aW1lb3V0KHZibGFu ay0+cXVldWUsCi0JCWRybV9jcnRjX3ZibGFua19jb3VudCgmY3J0Yy0+YmFzZSkgIT0gd29yay0+ c2NoZWR1bGVkX3ZibGFuaywKLQkJbXNlY3NfdG9famlmZmllcyg1MCkpOwotCi0JbXV0ZXhfbG9j aygmZmJjLT5sb2NrKTsKLQotCS8qIFdlcmUgd2UgY2FuY2VsbGVkPyAqLwotCWlmICghd29yay0+ c2NoZWR1bGVkKQotCQlnb3RvIG91dDsKLQotCS8qIFdlcmUgd2UgZGVsYXllZCBhZ2FpbiB3aGls ZSB0aGlzIGZ1bmN0aW9uIHdhcyBzbGVlcGluZz8gKi8KLQlpZiAoZHJtX2NydGNfdmJsYW5rX2Nv dW50KCZjcnRjLT5iYXNlKSA9PSB3b3JrLT5zY2hlZHVsZWRfdmJsYW5rKSB7Ci0JCW11dGV4X3Vu bG9jaygmZmJjLT5sb2NrKTsKLQkJZ290byByZXRyeTsKLQl9Ci0KLQlpbnRlbF9mYmNfaHdfYWN0 aXZhdGUoZGV2X3ByaXYpOwotCi0Jd29yay0+c2NoZWR1bGVkID0gZmFsc2U7Ci0KLW91dDoKLQlt dXRleF91bmxvY2soJmZiYy0+bG9jayk7Ci0JZHJtX2NydGNfdmJsYW5rX3B1dCgmY3J0Yy0+YmFz ZSk7Ci19Ci0KLXN0YXRpYyB2b2lkIGludGVsX2ZiY19zY2hlZHVsZV9hY3RpdmF0aW9uKHN0cnVj dCBpbnRlbF9jcnRjICpjcnRjKQotewotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diA9IHRvX2k5MTUoY3J0Yy0+YmFzZS5kZXYpOwotCXN0cnVjdCBpbnRlbF9mYmMgKmZiYyA9ICZk ZXZfcHJpdi0+ZmJjOwotCXN0cnVjdCBpbnRlbF9mYmNfd29yayAqd29yayA9ICZmYmMtPndvcms7 Ci0KLQlXQVJOX09OKCFtdXRleF9pc19sb2NrZWQoJmZiYy0+bG9jaykpOwotCWlmIChXQVJOX09O KCFmYmMtPmVuYWJsZWQpKQotCQlyZXR1cm47Ci0KLQlpZiAoZHJtX2NydGNfdmJsYW5rX2dldCgm Y3J0Yy0+YmFzZSkpIHsKLQkJRFJNX0VSUk9SKCJ2Ymxhbmsgbm90IGF2YWlsYWJsZSBmb3IgRkJD IG9uIHBpcGUgJWNcbiIsCi0JCQkgIHBpcGVfbmFtZShjcnRjLT5waXBlKSk7Ci0JCXJldHVybjsK LQl9Ci0KLQkvKiBJdCBpcyB1c2VsZXNzIHRvIGNhbGwgaW50ZWxfZmJjX2NhbmNlbF93b3JrKCkg b3IgY2FuY2VsX3dvcmsoKSBpbgotCSAqIHRoaXMgZnVuY3Rpb24gc2luY2Ugd2UncmUgbm90IHJl bGVhc2luZyBmYmMubG9jaywgc28gaXQgd29uJ3QgaGF2ZSBhbgotCSAqIG9wcG9ydHVuaXR5IHRv IGdyYWIgaXQgdG8gZGlzY292ZXIgdGhhdCBpdCB3YXMgY2FuY2VsbGVkLiBTbyB3ZSBqdXN0Ci0J ICogdXBkYXRlIHRoZSBleHBlY3RlZCBqaWZmeSBjb3VudC4gKi8KLQl3b3JrLT5zY2hlZHVsZWQg PSB0cnVlOwotCXdvcmstPnNjaGVkdWxlZF92YmxhbmsgPSBkcm1fY3J0Y192YmxhbmtfY291bnQo JmNydGMtPmJhc2UpOwotCWRybV9jcnRjX3ZibGFua19wdXQoJmNydGMtPmJhc2UpOwotCi0Jc2No ZWR1bGVfd29yaygmd29yay0+d29yayk7Ci19Ci0KIHN0YXRpYyB2b2lkIGludGVsX2ZiY19kZWFj dGl2YXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCQkgY29uc3QgY2hh ciAqcmVhc29uKQogewpAQCAtNDg5LDExICs0MDYsNiBAQCBzdGF0aWMgdm9pZCBpbnRlbF9mYmNf ZGVhY3RpdmF0ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAKIAlXQVJOX09O KCFtdXRleF9pc19sb2NrZWQoJmZiYy0+bG9jaykpOwogCi0JLyogQ2FsbGluZyBjYW5jZWxfd29y aygpIGhlcmUgd29uJ3QgaGVscCBkdWUgdG8gdGhlIGZhY3QgdGhhdCB0aGUgd29yawotCSAqIGZ1 bmN0aW9uIGdyYWJzIGZiYy0+bG9jay4gSnVzdCBzZXQgc2NoZWR1bGVkIHRvIGZhbHNlIHNvIHRo ZSB3b3JrCi0JICogZnVuY3Rpb24gY2FuIGtub3cgaXQgd2FzIGNhbmNlbGxlZC4gKi8KLQlmYmMt Pndvcmsuc2NoZWR1bGVkID0gZmFsc2U7Ci0KIAlpZiAoZmJjLT5hY3RpdmUpCiAJCWludGVsX2Zi Y19od19kZWFjdGl2YXRlKGRldl9wcml2KTsKIApAQCAtMTAwNSw3ICs5MTcsNyBAQCBzdGF0aWMg dm9pZCBfX2ludGVsX2ZiY19wb3N0X3VwZGF0ZShzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIAog CWlmICghZmJjLT5idXN5X2JpdHMpIHsKIAkJaW50ZWxfZmJjX2RlYWN0aXZhdGUoZGV2X3ByaXYs ICJGQkMgZW5hYmxlZCAoYWN0aXZlIG9yIHNjaGVkdWxlZCkiKTsKLQkJaW50ZWxfZmJjX3NjaGVk dWxlX2FjdGl2YXRpb24oY3J0Yyk7CisJCWludGVsX2ZiY19od19hY3RpdmF0ZShkZXZfcHJpdik7 CiAJfSBlbHNlCiAJCWludGVsX2ZiY19kZWFjdGl2YXRlKGRldl9wcml2LCAiZnJvbnRidWZmZXIg d3JpdGUiKTsKIH0KQEAgLTEyMTIsOCArMTEyNCw2IEBAIHZvaWQgaW50ZWxfZmJjX2Rpc2FibGUo c3RydWN0IGludGVsX2NydGMgKmNydGMpCiAJaWYgKGZiYy0+Y3J0YyA9PSBjcnRjKQogCQlfX2lu dGVsX2ZiY19kaXNhYmxlKGRldl9wcml2KTsKIAltdXRleF91bmxvY2soJmZiYy0+bG9jayk7Ci0K LQljYW5jZWxfd29ya19zeW5jKCZmYmMtPndvcmsud29yayk7CiB9CiAKIC8qKgpAQCAtMTIzNSw4 ICsxMTQ1LDYgQEAgdm9pZCBpbnRlbF9mYmNfZ2xvYmFsX2Rpc2FibGUoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2KQogCQlfX2ludGVsX2ZiY19kaXNhYmxlKGRldl9wcml2KTsKIAl9 CiAJbXV0ZXhfdW5sb2NrKCZmYmMtPmxvY2spOwotCi0JY2FuY2VsX3dvcmtfc3luYygmZmJjLT53 b3JrLndvcmspOwogfQogCiBzdGF0aWMgdm9pZCBpbnRlbF9mYmNfdW5kZXJydW5fd29ya19mbihz dHJ1Y3Qgd29ya19zdHJ1Y3QgKndvcmspCkBAIC0xMzg3LDEyICsxMjk1LDEwIEBAIHZvaWQgaW50 ZWxfZmJjX2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewogCXN0cnVj dCBpbnRlbF9mYmMgKmZiYyA9ICZkZXZfcHJpdi0+ZmJjOwogCi0JSU5JVF9XT1JLKCZmYmMtPndv cmsud29yaywgaW50ZWxfZmJjX3dvcmtfZm4pOwogCUlOSVRfV09SSygmZmJjLT51bmRlcnJ1bl93 b3JrLCBpbnRlbF9mYmNfdW5kZXJydW5fd29ya19mbik7CiAJbXV0ZXhfaW5pdCgmZmJjLT5sb2Nr KTsKIAlmYmMtPmVuYWJsZWQgPSBmYWxzZTsKIAlmYmMtPmFjdGl2ZSA9IGZhbHNlOwotCWZiYy0+ d29yay5zY2hlZHVsZWQgPSBmYWxzZTsKIAogCWlmIChuZWVkX2ZiY192dGRfd2EoZGV2X3ByaXYp KQogCQlta3dyaXRlX2RldmljZV9pbmZvKGRldl9wcml2KS0+aGFzX2ZiYyA9IGZhbHNlOwotLSAK Mi4xOC4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJ bnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0 cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK