From: Maarten Lankhorst Subject: [PATCH] drm/i915: Rework FBC schedule locking Date: Fri, 16 Mar 2018 16:01:21 +0100 Message-ID: <20180316150121.18664-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 18EDC6EB80 for ; Fri, 16 Mar 2018 15:01:27 +0000 (UTC) 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 SW5zdGVhZCBvZiB0YWtpbmcgZmJjLT5sb2NrIGluc2lkZSB0aGUgd29ya2VyLCBkb24ndCB0YWtl IGFueSBsb2NrCmFuZCBjYW5jZWwgdGhlIHdvcmsgc3luY2hyb25vdXNseSB0byBwcmV2ZW50IHJh Y2VzLiBTaW5jZSB0aGUgd29ya2VyCndhaXRzIGZvciBhIHZibGFuayBiZWZvcmUgYWN0aXZhdGlu Zywgd2FrZSB1cCBhbGwgdmJsYW5rIHdhaXRlcnMgYWZ0ZXIKc2lnbmFsbGluZyB0aGUgY2FuY2Vs IHRocm91Z2ggdW5zZXR0aW5nIHdvcmstPnNjaGVkdWxlZF92YmxhbmsuIFRoaXMKd2lsbCBtYWtl IHN1cmUgdGhhdCB3ZSBkb24ndCB3YWl0IHRvbyBsb25nIHdoZW4gY2FuY2VsbGluZyB0aGUgYWN0 aXZhdGlvbi4KClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmto b3JzdEBsaW51eC5pbnRlbC5jb20+CkNjOiBQYXVsbyBaYW5vbmkgPHBhdWxvLnIuemFub25pQGlu dGVsLmNvbT4KQ2M6IFJvZHJpZ28gVml2aSA8cm9kcmlnby52aXZpQGludGVsLmNvbT4KQnVnemls bGE6IGh0dHBzOi8vYnVncy5mcmVlZGVza3RvcC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMzE2Nwot LS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jIHwgIDQgKy0KIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggICAgIHwgIDMgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2ZiYy5jICAgIHwgNzYgKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0t LQogMyBmaWxlcyBjaGFuZ2VkLCAzNiBpbnNlcnRpb25zKCspLCA0NyBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCmluZGV4IDk4ZTE2OTYzNmY4Ni4uY2JmNTUwNGRl MTgzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwpAQCAtMTY0Myw5ICsxNjQzLDkg QEAgc3RhdGljIGludCBpOTE1X2ZiY19zdGF0dXMoc3RydWN0IHNlcV9maWxlICptLCB2b2lkICp1 bnVzZWQpCiAJZWxzZQogCQlzZXFfcHJpbnRmKG0sICJGQkMgZGlzYWJsZWQ6ICVzXG4iLCBmYmMt Pm5vX2ZiY19yZWFzb24pOwogCi0JaWYgKGZiYy0+d29yay5zY2hlZHVsZWQpCisJaWYgKHdvcmtf YnVzeSgmZmJjLT53b3JrLndvcmspKQogCQlzZXFfcHJpbnRmKG0sICJGQkMgd29ya2VyIHNjaGVk dWxlZCBvbiB2YmxhbmsgJWxsdSwgbm93ICVsbHVcbiIsCi0JCQkgICBmYmMtPndvcmsuc2NoZWR1 bGVkX3ZibGFuaywKKwkJCSAgICh1NjQpYXRvbWljNjRfcmVhZCgmZmJjLT53b3JrLnNjaGVkdWxl ZF92YmxhbmspLAogCQkJICAgZHJtX2NydGNfdmJsYW5rX2NvdW50KCZmYmMtPmNydGMtPmJhc2Up KTsKIAogCWlmIChpbnRlbF9mYmNfaXNfYWN0aXZlKGRldl9wcml2KSkgewpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmgKaW5kZXggOTI2MmNmYjhhYWMyLi5hN2ExYjA0NTMzMjAgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kcnYuaApAQCAtNTU4LDggKzU1OCw3IEBAIHN0cnVjdCBpbnRlbF9mYmMgewogCX0gcGFy YW1zOwogCiAJc3RydWN0IGludGVsX2ZiY193b3JrIHsKLQkJYm9vbCBzY2hlZHVsZWQ7Ci0JCXU2 NCBzY2hlZHVsZWRfdmJsYW5rOworCQlhdG9taWM2NF90IHNjaGVkdWxlZF92Ymxhbms7CiAJCXN0 cnVjdCB3b3JrX3N0cnVjdCB3b3JrOwogCX0gd29yazsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZmJjLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmMu YwppbmRleCA3MDdkNDljMTI2MzguLjIwZDQ1YmNiNmI2YiAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZmJjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZmJjLmMKQEAgLTM1NywxMCArMzU3LDYgQEAgc3RhdGljIGJvb2wgaW50ZWxfZmJjX2h3X2lzX2Fj dGl2ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAKIHN0YXRpYyB2b2lkIGlu dGVsX2ZiY19od19hY3RpdmF0ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7 Ci0Jc3RydWN0IGludGVsX2ZiYyAqZmJjID0gJmRldl9wcml2LT5mYmM7Ci0KLQlmYmMtPmFjdGl2 ZSA9IHRydWU7Ci0KIAlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA3KQogCQlnZW43X2ZiY19h Y3RpdmF0ZShkZXZfcHJpdik7CiAJZWxzZSBpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA1KQpA QCAtNDA3LDE2ICs0MDMsMTMgQEAgc3RhdGljIHZvaWQgaW50ZWxfZmJjX3dvcmtfZm4oc3RydWN0 IHdvcmtfc3RydWN0ICpfX3dvcmspCiAJc3RydWN0IGludGVsX2ZiY193b3JrICp3b3JrID0gJmZi Yy0+d29yazsKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YyA9IGZiYy0+Y3J0YzsKIAlzdHJ1Y3Qg ZHJtX3ZibGFua19jcnRjICp2YmxhbmsgPSAmZGV2X3ByaXYtPmRybS52YmxhbmtbY3J0Yy0+cGlw ZV07CisJdTY0IHZibDsKIAogCWlmIChkcm1fY3J0Y192YmxhbmtfZ2V0KCZjcnRjLT5iYXNlKSkg ewogCQkvKiBDUlRDIGlzIG5vdyBvZmYsIGxlYXZlIEZCQyBkZWFjdGl2YXRlZCAqLwotCQltdXRl eF9sb2NrKCZmYmMtPmxvY2spOwotCQl3b3JrLT5zY2hlZHVsZWQgPSBmYWxzZTsKLQkJbXV0ZXhf dW5sb2NrKCZmYmMtPmxvY2spOwogCQlyZXR1cm47CiAJfQogCi1yZXRyeToKIAkvKiBEZWxheSB0 aGUgYWN0dWFsIGVuYWJsaW5nIHRvIGxldCBwYWdlZmxpcHBpbmcgY2Vhc2UgYW5kIHRoZQogCSAq IGRpc3BsYXkgdG8gc2V0dGxlIGJlZm9yZSBzdGFydGluZyB0aGUgY29tcHJlc3Npb24uIE5vdGUg dGhhdAogCSAqIHRoaXMgZGVsYXkgYWxzbyBzZXJ2ZXMgYSBzZWNvbmQgcHVycG9zZTogaXQgYWxs b3dzIGZvciBhCkBAIC00MjUsMzQgKzQxOCwzNSBAQCBzdGF0aWMgdm9pZCBpbnRlbF9mYmNfd29y a19mbihzdHJ1Y3Qgd29ya19zdHJ1Y3QgKl9fd29yaykKIAkgKgogCSAqIFdhRmJjV2FpdEZvclZC bGFua0JlZm9yZUVuYWJsZTppbGssc25iCiAJICoKLQkgKiBJdCBpcyBhbHNvIHdvcnRoIG1lbnRp b25pbmcgdGhhdCBzaW5jZSB3b3JrLT5zY2hlZHVsZWRfdmJsYW5rIGNhbiBiZQotCSAqIHVwZGF0 ZWQgbXVsdGlwbGUgdGltZXMgYnkgdGhlIG90aGVyIHRocmVhZHMsIGhpdHRpbmcgdGhlIHRpbWVv dXQgaXMKLQkgKiBub3QgYW4gZXJyb3IgY29uZGl0aW9uLiBXZSdsbCBqdXN0IGVuZCB1cCBoaXR0 aW5nIHRoZSAiZ290byByZXRyeSIKLQkgKiBjYXNlIGJlbG93LgorCSAqIFRoaXMgbWF5IGJlIGtp bGxlZCBieSB1bnNldHRpbmcgc2NoZWR1bGVkX3ZibGFuaywgaW4gd2hpY2gKKwkgKiBjYXNlIHdl IHJldHVybiBlYXJseSB3aXRob3V0IGFjdGl2YXRpbmcuCiAJICovCiAJd2FpdF9ldmVudF90aW1l b3V0KHZibGFuay0+cXVldWUsCi0JCWRybV9jcnRjX3ZibGFua19jb3VudCgmY3J0Yy0+YmFzZSkg IT0gd29yay0+c2NoZWR1bGVkX3ZibGFuaywKKwkJISh2YmwgPSBhdG9taWM2NF9yZWFkKCZ3b3Jr LT5zY2hlZHVsZWRfdmJsYW5rKSkgfHwgdmJsICE9IGRybV9jcnRjX3ZibGFua19jb3VudCgmY3J0 Yy0+YmFzZSksCiAJCW1zZWNzX3RvX2ppZmZpZXMoNTApKTsKIAotCW11dGV4X2xvY2soJmZiYy0+ bG9jayk7CisJaWYgKHZibCkKKwkJaW50ZWxfZmJjX2h3X2FjdGl2YXRlKGRldl9wcml2KTsKIAot CS8qIFdlcmUgd2UgY2FuY2VsbGVkPyAqLwotCWlmICghd29yay0+c2NoZWR1bGVkKQotCQlnb3Rv IG91dDsKKwlkcm1fY3J0Y192YmxhbmtfcHV0KCZjcnRjLT5iYXNlKTsKK30KIAotCS8qIFdlcmUg d2UgZGVsYXllZCBhZ2FpbiB3aGlsZSB0aGlzIGZ1bmN0aW9uIHdhcyBzbGVlcGluZz8gKi8KLQlp ZiAoZHJtX2NydGNfdmJsYW5rX2NvdW50KCZjcnRjLT5iYXNlKSA9PSB3b3JrLT5zY2hlZHVsZWRf dmJsYW5rKSB7Ci0JCW11dGV4X3VubG9jaygmZmJjLT5sb2NrKTsKLQkJZ290byByZXRyeTsKLQl9 CitzdGF0aWMgdm9pZCBpbnRlbF9mYmNfY2FuY2VsX2FjdGl2YXRpb24oc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2KQoreworCXN0cnVjdCBpbnRlbF9mYmMgKmZiYyA9ICZkZXZfcHJp di0+ZmJjOworCXN0cnVjdCBpbnRlbF9jcnRjICpjcnRjOworCXN0cnVjdCBkcm1fdmJsYW5rX2Ny dGMgKnZibGFuazsKIAotCWludGVsX2ZiY19od19hY3RpdmF0ZShkZXZfcHJpdik7CisJaWYgKCFm YmMtPmFjdGl2ZSkKKwkJcmV0dXJuOwogCi0Jd29yay0+c2NoZWR1bGVkID0gZmFsc2U7CisJY3J0 YyA9IGZiYy0+Y3J0YzsKKwl2YmxhbmsgPSAmZGV2X3ByaXYtPmRybS52YmxhbmtbY3J0Yy0+cGlw ZV07CiAKLW91dDoKLQltdXRleF91bmxvY2soJmZiYy0+bG9jayk7Ci0JZHJtX2NydGNfdmJsYW5r X3B1dCgmY3J0Yy0+YmFzZSk7CisJLyogS2lsbCBGQkMgd29ya2VyIGlmIGl0J3Mgd2FpdGluZyAq LworCWF0b21pYzY0X3NldCgmZmJjLT53b3JrLnNjaGVkdWxlZF92YmxhbmssIDApOworCXdha2Vf dXBfYWxsKCZ2YmxhbmstPnF1ZXVlKTsKKwljYW5jZWxfd29ya19zeW5jKCZmYmMtPndvcmsud29y ayk7CiB9CiAKIHN0YXRpYyB2b2lkIGludGVsX2ZiY19zY2hlZHVsZV9hY3RpdmF0aW9uKHN0cnVj dCBpbnRlbF9jcnRjICpjcnRjKQpAQCAtNDcxLDEyICs0NjUsMTAgQEAgc3RhdGljIHZvaWQgaW50 ZWxfZmJjX3NjaGVkdWxlX2FjdGl2YXRpb24oc3RydWN0IGludGVsX2NydGMgKmNydGMpCiAJCXJl dHVybjsKIAl9CiAKLQkvKiBJdCBpcyB1c2VsZXNzIHRvIGNhbGwgaW50ZWxfZmJjX2NhbmNlbF93 b3JrKCkgb3IgY2FuY2VsX3dvcmsoKSBpbgotCSAqIHRoaXMgZnVuY3Rpb24gc2luY2Ugd2UncmUg bm90IHJlbGVhc2luZyBmYmMubG9jaywgc28gaXQgd29uJ3QgaGF2ZSBhbgotCSAqIG9wcG9ydHVu aXR5IHRvIGdyYWIgaXQgdG8gZGlzY292ZXIgdGhhdCBpdCB3YXMgY2FuY2VsbGVkLiBTbyB3ZSBq dXN0Ci0JICogdXBkYXRlIHRoZSBleHBlY3RlZCBqaWZmeSBjb3VudC4gKi8KLQl3b3JrLT5zY2hl ZHVsZWQgPSB0cnVlOwotCXdvcmstPnNjaGVkdWxlZF92YmxhbmsgPSBkcm1fY3J0Y192Ymxhbmtf Y291bnQoJmNydGMtPmJhc2UpOworCWludGVsX2ZiY19jYW5jZWxfYWN0aXZhdGlvbihkZXZfcHJp dik7CisJZmJjLT5hY3RpdmUgPSB0cnVlOworCisJYXRvbWljNjRfc2V0KCZ3b3JrLT5zY2hlZHVs ZWRfdmJsYW5rLCBkcm1fY3J0Y19hY2N1cmF0ZV92YmxhbmtfY291bnQoJmNydGMtPmJhc2UpKTsK IAlkcm1fY3J0Y192YmxhbmtfcHV0KCZjcnRjLT5iYXNlKTsKIAogCXNjaGVkdWxlX3dvcmsoJndv cmstPndvcmspOwpAQCAtNDg5LDEzICs0ODEsMTEgQEAgc3RhdGljIHZvaWQgaW50ZWxfZmJjX2Rl YWN0aXZhdGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCiAJV0FSTl9PTigh bXV0ZXhfaXNfbG9ja2VkKCZmYmMtPmxvY2spKTsKIAotCS8qIENhbGxpbmcgY2FuY2VsX3dvcmso KSBoZXJlIHdvbid0IGhlbHAgZHVlIHRvIHRoZSBmYWN0IHRoYXQgdGhlIHdvcmsKLQkgKiBmdW5j dGlvbiBncmFicyBmYmMtPmxvY2suIEp1c3Qgc2V0IHNjaGVkdWxlZCB0byBmYWxzZSBzbyB0aGUg d29yawotCSAqIGZ1bmN0aW9uIGNhbiBrbm93IGl0IHdhcyBjYW5jZWxsZWQuICovCi0JZmJjLT53 b3JrLnNjaGVkdWxlZCA9IGZhbHNlOworCWlmIChmYmMtPmFjdGl2ZSkgeworCQlpbnRlbF9mYmNf Y2FuY2VsX2FjdGl2YXRpb24oZGV2X3ByaXYpOwogCi0JaWYgKGZiYy0+YWN0aXZlKQogCQlpbnRl bF9mYmNfaHdfZGVhY3RpdmF0ZShkZXZfcHJpdik7CisJfQogCiAJZmJjLT5ub19mYmNfcmVhc29u ID0gcmVhc29uOwogfQpAQCAtMTIyMiwxMSArMTIxMiwxMSBAQCB2b2lkIGludGVsX2ZiY19kaXNh YmxlKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQogCVdBUk5fT04oY3J0Yy0+YWN0aXZlKTsKIAog CW11dGV4X2xvY2soJmZiYy0+bG9jayk7CisJaW50ZWxfZmJjX2NhbmNlbF9hY3RpdmF0aW9uKGRl dl9wcml2KTsKKwogCWlmIChmYmMtPmNydGMgPT0gY3J0YykKIAkJX19pbnRlbF9mYmNfZGlzYWJs ZShkZXZfcHJpdik7CiAJbXV0ZXhfdW5sb2NrKCZmYmMtPmxvY2spOwotCi0JY2FuY2VsX3dvcmtf c3luYygmZmJjLT53b3JrLndvcmspOwogfQogCiAvKioKQEAgLTEyNDMsMTMgKzEyMzMsMTMgQEAg dm9pZCBpbnRlbF9mYmNfZ2xvYmFsX2Rpc2FibGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2KQogCQlyZXR1cm47CiAKIAltdXRleF9sb2NrKCZmYmMtPmxvY2spOworCWludGVsX2Zi Y19jYW5jZWxfYWN0aXZhdGlvbihkZXZfcHJpdik7CisKIAlpZiAoZmJjLT5lbmFibGVkKSB7CiAJ CVdBUk5fT04oZmJjLT5jcnRjLT5hY3RpdmUpOwogCQlfX2ludGVsX2ZiY19kaXNhYmxlKGRldl9w cml2KTsKIAl9CiAJbXV0ZXhfdW5sb2NrKCZmYmMtPmxvY2spOwotCi0JY2FuY2VsX3dvcmtfc3lu YygmZmJjLT53b3JrLndvcmspOwogfQogCiBzdGF0aWMgdm9pZCBpbnRlbF9mYmNfdW5kZXJydW5f d29ya19mbihzdHJ1Y3Qgd29ya19zdHJ1Y3QgKndvcmspCkBAIC0xMzczLDExICsxMzYzLDExIEBA IHZvaWQgaW50ZWxfZmJjX2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQog CXN0cnVjdCBpbnRlbF9mYmMgKmZiYyA9ICZkZXZfcHJpdi0+ZmJjOwogCiAJSU5JVF9XT1JLKCZm YmMtPndvcmsud29yaywgaW50ZWxfZmJjX3dvcmtfZm4pOworCWF0b21pYzY0X3NldCgmZmJjLT53 b3JrLnNjaGVkdWxlZF92YmxhbmssIDApOwogCUlOSVRfV09SSygmZmJjLT51bmRlcnJ1bl93b3Jr LCBpbnRlbF9mYmNfdW5kZXJydW5fd29ya19mbik7CiAJbXV0ZXhfaW5pdCgmZmJjLT5sb2NrKTsK IAlmYmMtPmVuYWJsZWQgPSBmYWxzZTsKIAlmYmMtPmFjdGl2ZSA9IGZhbHNlOwotCWZiYy0+d29y ay5zY2hlZHVsZWQgPSBmYWxzZTsKIAogCWlmIChuZWVkX2ZiY192dGRfd2EoZGV2X3ByaXYpKQog CQlta3dyaXRlX2RldmljZV9pbmZvKGRldl9wcml2KS0+aGFzX2ZiYyA9IGZhbHNlOwotLSAKMi4x Ni4yCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRl bC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK