From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH v2 4/6] drm/i915: Program gen4 watermarks atomically Date: Wed, 13 Sep 2017 10:40:22 +0200 Message-ID: <20170913084024.25501-5-maarten.lankhorst@linux.intel.com> References: <20170913084024.25501-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 [141.105.120.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id B49816E7AD for ; Wed, 13 Sep 2017 08:40:30 +0000 (UTC) In-Reply-To: <20170913084024.25501-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 List-Id: intel-gfx@lists.freedesktop.org V2UncmUgYWxyZWFkeSBjYWxjdWxhdGluZyB0aGUgd2F0ZXJtYXJrcyBjb3JyZWN0bHksIG5vdyB3 ZSBoYXZlIHRvCnByb2dyYW0gdGhlbSB0b28uCgpTaWduZWQtb2ZmLWJ5OiBNYWFydGVuIExhbmto b3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3BtLmMgfCAyNSArKysrKysrKysrKysrKystLS0tLS0tLS0tCiAxIGZp bGUgY2hhbmdlZCwgMTUgaW5zZXJ0aW9ucygrKSwgMTAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3BtLmMKaW5kZXggMDkzYzRiMzU1MjJhLi5kZGVmMDU2OGM0NzcgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfcG0uYwpAQCAtMjI5MywyMCArMjI5MywyMCBAQCBzdGF0aWMgaW50IGk5NjVfY29t cHV0ZV9waXBlX3dtKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKQogCXJldHVy biAwOwogfQogCi1zdGF0aWMgdm9pZCBpOTY1X3VwZGF0ZV93bShzdHJ1Y3QgaW50ZWxfY3J0YyAq Y3J0YykKK3N0YXRpYyB2b2lkIGk5NjVfcHJvZ3JhbV93YXRlcm1hcmtzKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdikKIHsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYgPSB0b19pOTE1KGNydGMtPmJhc2UuZGV2KTsKKwlzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YzsK KwlzdHJ1Y3QgaTl4eF93bV9zdGF0ZSAqd21fc3RhdGUgPSBOVUxMOwogCWludCBzcndtID0gMTsK IAlpbnQgY3Vyc29yX3NyID0gMTY7CiAJYm9vbCBjeHNyX2VuYWJsZWQgPSBmYWxzZTsKIAotCWNy dGMtPndtLmFjdGl2ZS5pOXh4ID0gY3J0Yy0+Y29uZmlnLT53bS5pOXh4Lm9wdGltYWw7Ci0KLQkv KiBDYWxjIHNyIGVudHJpZXMgZm9yIG9uZSBwbGFuZSBjb25maWdzICovCiAJY3J0YyA9IHNpbmds ZV9lbmFibGVkX2NydGMoZGV2X3ByaXYpOwotCWlmIChjcnRjICYmIGNydGMtPndtLmFjdGl2ZS5p OXh4LmN4c3IpIHsKLQkJc3RydWN0IGk5eHhfd21fc3RhdGUgKndtX3N0YXRlID0gJmNydGMtPndt LmFjdGl2ZS5pOXh4OworCWlmIChjcnRjKQorCQl3bV9zdGF0ZSA9ICZjcnRjLT53bS5hY3RpdmUu aTl4eDsKIAorCS8qIENhbGMgc3IgZW50cmllcyBmb3Igb25lIHBsYW5lIGNvbmZpZ3MgKi8KKwlp ZiAod21fc3RhdGUgJiYgd21fc3RhdGUtPmN4c3IpIHsKIAkJc3J3bSA9IHdtX3N0YXRlLT5zci5w bGFuZV93bTsKIAkJY3Vyc29yX3NyID0gd21fc3RhdGUtPnNyLmN1cnNvcl93bTsKIApAQCAtMjU5 OCw4ICsyNTk4LDEwIEBAIHN0YXRpYyB2b2lkIGk5eHhfaW5pdGlhbF93YXRlcm1hcmtzKHN0cnVj dCBpbnRlbF9hdG9taWNfc3RhdGUgKnN0YXRlLAogCQlwbnZfcHJvZ3JhbV93YXRlcm1hcmtzKGRl dl9wcml2KTsKIAllbHNlIGlmIChJTlRFTF9JTkZPKGRldl9wcml2KS0+bnVtX3BpcGVzID09IDEp CiAJCWk4NDVfcHJvZ3JhbV93YXRlcm1hcmtzKGludGVsX2NydGMpOwotCWVsc2UKKwllbHNlIGlm IChJTlRFTF9HRU4oZGV2X3ByaXYpIDwgNCkKIAkJaTl4eF9wcm9ncmFtX3dhdGVybWFya3MoZGV2 X3ByaXYpOworCWVsc2UKKwkJaTk2NV9wcm9ncmFtX3dhdGVybWFya3MoZGV2X3ByaXYpOwogCW11 dGV4X3VubG9jaygmZGV2X3ByaXYtPndtLndtX211dGV4KTsKIH0KIApAQCAtMjYxOCw4ICsyNjIw LDEwIEBAIHN0YXRpYyB2b2lkIGk5eHhfb3B0aW1pemVfd2F0ZXJtYXJrcyhzdHJ1Y3QgaW50ZWxf YXRvbWljX3N0YXRlICpzdGF0ZSwKIAkJcG52X3Byb2dyYW1fd2F0ZXJtYXJrcyhkZXZfcHJpdik7 CiAJZWxzZSBpZiAoSU5URUxfSU5GTyhkZXZfcHJpdiktPm51bV9waXBlcyA9PSAxKQogCQlpODQ1 X3Byb2dyYW1fd2F0ZXJtYXJrcyhpbnRlbF9jcnRjKTsKLQllbHNlCisJZWxzZSBpZiAoSU5URUxf R0VOKGRldl9wcml2KSA8IDQpCiAJCWk5eHhfcHJvZ3JhbV93YXRlcm1hcmtzKGRldl9wcml2KTsK KwllbHNlCisJCWk5NjVfcHJvZ3JhbV93YXRlcm1hcmtzKGRldl9wcml2KTsKIAltdXRleF91bmxv Y2soJmRldl9wcml2LT53bS53bV9tdXRleCk7CiB9CiAKQEAgLTkyMTgsNyArOTIyMiw4IEBAIHZv aWQgaW50ZWxfaW5pdF9wbShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJCX0K IAl9IGVsc2UgaWYgKElTX0dFTjQoZGV2X3ByaXYpKSB7CiAJCWRldl9wcml2LT5kaXNwbGF5LmNv bXB1dGVfcGlwZV93bSA9IGk5NjVfY29tcHV0ZV9waXBlX3dtOwotCQlkZXZfcHJpdi0+ZGlzcGxh eS51cGRhdGVfd20gPSBpOTY1X3VwZGF0ZV93bTsKKwkJZGV2X3ByaXYtPmRpc3BsYXkuaW5pdGlh bF93YXRlcm1hcmtzID0gaTl4eF9pbml0aWFsX3dhdGVybWFya3M7CisJCWRldl9wcml2LT5kaXNw bGF5Lm9wdGltaXplX3dhdGVybWFya3MgPSBpOXh4X29wdGltaXplX3dhdGVybWFya3M7CiAJfSBl bHNlIGlmIChJU19HRU4zKGRldl9wcml2KSkgewogCQlkZXZfcHJpdi0+ZGlzcGxheS5jb21wdXRl X3BpcGVfd20gPSBpOXh4X2NvbXB1dGVfcGlwZV93bTsKIAkJZGV2X3ByaXYtPmRpc3BsYXkuY29t cHV0ZV9pbnRlcm1lZGlhdGVfd20gPSBpOXh4X2NvbXB1dGVfaW50ZXJtZWRpYXRlX3dtOwotLSAK Mi4xNC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJ bnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0 cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK