From: ville.syrjala@linux.intel.com Subject: [PATCH v2 05.2/24] drm/i915: Merge LP1+ watermarks in safer way Date: Mon, 28 Apr 2014 15:44:57 +0300 Message-ID: <1398689097-1472-2-git-send-email-ville.syrjala@linux.intel.com> References: <1398689097-1472-1-git-send-email-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id CA62F6E83D for ; Mon, 28 Apr 2014 05:45:04 -0700 (PDT) In-Reply-To: <1398689097-1472-1-git-send-email-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 IElMSyB3aGVuIHdlIGRpc2FibGUgYSBwYXJ0aWN1bGFyIHdhdGVybWFyayBsZXZlbCwgd2UgbXVz dAptYWludGFpbiB0aGUgYWN0dWFsIHdhdGVybWFyayB2YWx1ZXMgZm9yIHRoYXQgbGV2ZWwgZm9y IHNvbWUgdGltZQoodW50aWwgdGhlIG5leHQgdmJsYW5rIHBvc3NpYmx5KS4gT3RoZXJ3aXNlIHdl IHJpc2sgdW5kZXJydW5zLgoKSW4gb3JkZXIgdG8gYWNoaWV2ZSB0aGF0IHJlc3VsdCB3ZSBtdXN0 IG1lcmdlIHRoZSBMUDErIHdhdGVybWFya3MgYQpiaXQgZGlmZmVyZW50bHkgc2luY2Ugd2UgbXVz dCBhbHNvIG1lcmdlIGxldmVscyB0aGF0IGFyZSB0byBiZQpkaXNhYmxlZC4gV2UgbXVzdCBhbHNv IG1ha2Ugc3VyZSB3ZSBkb24ndCBvdmVyZmxvdyB0aGUgZmllbGRzIGluIHRoZQp3YXRlcm1hcmsg cmVnaXN0ZXJzIGluIGNhc2UgdGhlIGNhbGN1bGF0ZWQgd2F0ZXJtYXJrcyBjb21lIG91dCB0b28K YmlnIHRvIGZpdC4KCkFzIGVhcmx5IGFzIHBvc3NiaWxlIHdlIG1hcmsgYWxsIGNvbXB1dGVkIHdh dGVybWFyayBsZXZlbHMgYXMKZGlzYWJsZWQgaWYgdGhleSB3b3VsZCBleGNlZWQgdGhlIHJlZ2lz dGVyIG1heGltdW1zLiBXZSBtYWtlIHN1cmUKdG8gbGVhdmUgdGhlIGFjdHVhbCB3YXRlcm1hcmtz IGZvciBzdWNoIGxldmVscyB6ZXJvZWQgb3V0LiBUaGUgZHVyaW5nCm1lcmdpbmcsIHdlIHRha2Ug dGhlIG1heGl1bSB2YWx1ZXMgZm9yIGV2ZXJ5IGxldmVsLCByZWdhcmRsZXNzIGlmCnRoZXkncmUg ZGlzYWJsZWQgb3Igbm90LiBUaGF0IG1heSBzZWVtIGEgYml0IHBvaW50bGVzcyBzaW5jZSBhdCB0 aGUKbW9tZW50IGFsbCB0aGUgd2F0ZXJtYXJrIGxldmVscyB3ZSBtZXJnZSBzaG91bGQgaGF2ZSB0 aGVpciB2YWx1ZXMKemVyb2VkIGlmIHRoZSBsZXZlbCBpcyBhbHJlYWR5IGRpc2FibGVkLiBIb3dl dmVyIHNvb24gd2Ugd2lsbCBiZQpkZWFsaW5nIHdpdGggaW50ZXJtZWRpYXRlIHdhdGVybWFya3Mg dGhhdCwgaW4gYWRkaXRpb24gdG8gdGhlIG5ldwp3YXRlcm1hcmsgdmFsdWVzLCBhbHNvIGNvbnRh aW4gdGhlIHByZXZpb3VzIHdhdGVybWFyayB2YWx1ZXMsIGFuZCBzbwpsZXZlbHMgdGhhdCBhcmUg ZGlzYWJsZWQgbWF5IG5vIGxvbmdlciBiZSB6ZXJvZWQgb3V0LgoKdjI6IFNwbGl0IHRoZSBwYXRj aCBpbiB0d28gKFBhdWxvKQogICAgVXNlIGlmKCkgaW5zdGVhZCBvZiAmIHdoZW4gbWVyZ2luZyAt PmVuYWJsZSAoUGF1bG8pCgpTaWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5 cmphbGFAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bt LmMgfCAzNyArKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tCiAxIGZpbGUgY2hh bmdlZCwgMjggaW5zZXJ0aW9ucygrKSwgOSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf cG0uYwppbmRleCBjNzIyYWNiLi5iODlmYzMzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKQEAg LTIyNDIsNiArMjI0Miw4IEBAIHN0YXRpYyB2b2lkIGlsa19tZXJnZV93bV9sZXZlbChzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2LAogewogCWNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRj OwogCisJcmV0X3dtLT5lbmFibGUgPSB0cnVlOworCiAJbGlzdF9mb3JfZWFjaF9lbnRyeShpbnRl bF9jcnRjLCAmZGV2LT5tb2RlX2NvbmZpZy5jcnRjX2xpc3QsIGJhc2UuaGVhZCkgewogCQljb25z dCBzdHJ1Y3QgaW50ZWxfcGlwZV93bSAqYWN0aXZlID0gJmludGVsX2NydGMtPndtLmFjdGl2ZTsK IAkJY29uc3Qgc3RydWN0IGludGVsX3dtX2xldmVsICp3bSA9ICZhY3RpdmUtPndtW2xldmVsXTsK QEAgLTIyNDksMTYgKzIyNTEsMTkgQEAgc3RhdGljIHZvaWQgaWxrX21lcmdlX3dtX2xldmVsKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCWlmICghYWN0aXZlLT5waXBlX2VuYWJsZWQpCiAJCQlj b250aW51ZTsKIAorCQkvKgorCQkgKiBUaGUgd2F0ZXJtYXJrIHZhbHVlcyBtYXkgaGF2ZSBiZWVu IHVzZWQgaW4gdGhlIHBhc3QsCisJCSAqIHNvIHdlIG11c3QgbWFpbnRhaW4gdGhlbSBpbiB0aGUg cmVnaXN0ZXJzIGZvciBzb21lCisJCSAqIHRpbWUgZXZlbiBpZiB0aGUgbGV2ZWwgaXMgbm93IGRp c2FibGVkLgorCQkgKi8KIAkJaWYgKCF3bS0+ZW5hYmxlKQotCQkJcmV0dXJuOworCQkJcmV0X3dt LT5lbmFibGUgPSBmYWxzZTsKIAogCQlyZXRfd20tPnByaV92YWwgPSBtYXgocmV0X3dtLT5wcmlf dmFsLCB3bS0+cHJpX3ZhbCk7CiAJCXJldF93bS0+c3ByX3ZhbCA9IG1heChyZXRfd20tPnNwcl92 YWwsIHdtLT5zcHJfdmFsKTsKIAkJcmV0X3dtLT5jdXJfdmFsID0gbWF4KHJldF93bS0+Y3VyX3Zh bCwgd20tPmN1cl92YWwpOwogCQlyZXRfd20tPmZiY192YWwgPSBtYXgocmV0X3dtLT5mYmNfdmFs LCB3bS0+ZmJjX3ZhbCk7CiAJfQotCi0JcmV0X3dtLT5lbmFibGUgPSB0cnVlOwogfQogCiAvKgpA QCAtMjI3MCw2ICsyMjc1LDcgQEAgc3RhdGljIHZvaWQgaWxrX3dtX21lcmdlKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYsCiAJCQkgc3RydWN0IGludGVsX3BpcGVfd20gKm1lcmdlZCkKIHsKIAlpbnQg bGV2ZWwsIG1heF9sZXZlbCA9IGlsa193bV9tYXhfbGV2ZWwoZGV2KTsKKwlpbnQgbGFzdF9lbmFi bGVkX2xldmVsID0gbWF4X2xldmVsOwogCiAJLyogSUxLL1NOQi9JVkI6IExQMSsgd2F0ZXJtYXJr cyBvbmx5IHcvIHNpbmdsZSBwaXBlICovCiAJaWYgKChJTlRFTF9JTkZPKGRldiktPmdlbiA8PSA2 IHx8IElTX0lWWUJSSURHRShkZXYpKSAmJgpAQCAtMjI4NSwxNSArMjI5MSwxOSBAQCBzdGF0aWMg dm9pZCBpbGtfd21fbWVyZ2Uoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAogCQlpbGtfbWVyZ2Vf d21fbGV2ZWwoZGV2LCBsZXZlbCwgd20pOwogCi0JCWlmICghaWxrX3ZhbGlkYXRlX3dtX2xldmVs KGxldmVsLCBtYXgsIHdtKSkKLQkJCWJyZWFrOworCQlpZiAobGV2ZWwgPiBsYXN0X2VuYWJsZWRf bGV2ZWwpCisJCQl3bS0+ZW5hYmxlID0gZmFsc2U7CisJCWVsc2UgaWYgKCFpbGtfdmFsaWRhdGVf d21fbGV2ZWwobGV2ZWwsIG1heCwgd20pKQorCQkJLyogbWFrZSBzdXJlIGFsbCBmb2xsb3dpbmcg bGV2ZWxzIGdldCBkaXNhYmxlZCAqLworCQkJbGFzdF9lbmFibGVkX2xldmVsID0gbGV2ZWwgLSAx OwogCiAJCS8qCiAJCSAqIFRoZSBzcGVjIHNheXMgaXQgaXMgcHJlZmVycmVkIHRvIGRpc2FibGUK IAkJICogRkJDIFdNcyBpbnN0ZWFkIG9mIGRpc2FibGluZyBhIFdNIGxldmVsLgogCQkgKi8KIAkJ aWYgKHdtLT5mYmNfdmFsID4gbWF4LT5mYmMpIHsKLQkJCW1lcmdlZC0+ZmJjX3dtX2VuYWJsZWQg PSBmYWxzZTsKKwkJCWlmICh3bS0+ZW5hYmxlKQorCQkJCW1lcmdlZC0+ZmJjX3dtX2VuYWJsZWQg PSBmYWxzZTsKIAkJCXdtLT5mYmNfdmFsID0gMDsKIAkJfQogCX0KQEAgLTIzNDgsMTQgKzIzNTgs MTkgQEAgc3RhdGljIHZvaWQgaWxrX2NvbXB1dGVfd21fcmVzdWx0cyhzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2LAogCQlsZXZlbCA9IGlsa193bV9scF90b19sZXZlbCh3bV9scCwgbWVyZ2VkKTsKIAog CQlyID0gJm1lcmdlZC0+d21bbGV2ZWxdOwotCQlpZiAoIXItPmVuYWJsZSkKLQkJCWJyZWFrOwog Ci0JCXJlc3VsdHMtPndtX2xwW3dtX2xwIC0gMV0gPSBXTTNfTFBfRU4gfAorCQkvKgorCQkgKiBN YWludGFpbiB0aGUgd2F0ZXJtYXJrIHZhbHVlcyBldmVuIGlmIHRoZSBsZXZlbCBpcworCQkgKiBk aXNhYmxlZC4gRG9pbmcgb3RoZXJ3aXNlIGNvdWxkIGNhdXNlIHVuZGVycnVucy4KKwkJICovCisJ CXJlc3VsdHMtPndtX2xwW3dtX2xwIC0gMV0gPQogCQkJKGlsa193bV9scF9sYXRlbmN5KGRldiwg bGV2ZWwpIDw8IFdNMV9MUF9MQVRFTkNZX1NISUZUKSB8CiAJCQkoci0+cHJpX3ZhbCA8PCBXTTFf TFBfU1JfU0hJRlQpIHwKIAkJCXItPmN1cl92YWw7CiAKKwkJaWYgKHItPmVuYWJsZSkKKwkJCXJl c3VsdHMtPndtX2xwW3dtX2xwIC0gMV0gfD0gV00xX0xQX1NSX0VOOworCiAJCWlmIChJTlRFTF9J TkZPKGRldiktPmdlbiA+PSA4KQogCQkJcmVzdWx0cy0+d21fbHBbd21fbHAgLSAxXSB8PQogCQkJ CXItPmZiY192YWwgPDwgV00xX0xQX0ZCQ19TSElGVF9CRFc7CkBAIC0yMzYzLDYgKzIzNzgsMTAg QEAgc3RhdGljIHZvaWQgaWxrX2NvbXB1dGVfd21fcmVzdWx0cyhzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2LAogCQkJcmVzdWx0cy0+d21fbHBbd21fbHAgLSAxXSB8PQogCQkJCXItPmZiY192YWwgPDwg V00xX0xQX0ZCQ19TSElGVDsKIAorCQkvKgorCQkgKiBBbHdheXMgc2V0IFdNMVNfTFBfRU4gd2hl biBzcHJfdmFsICE9IDAsIGV2ZW4gaWYgdGhlCisJCSAqIGxldmVsIGlzIGRpc2FibGVkLiBEb2lu ZyBvdGhlcndpc2UgY291bGQgY2F1c2UgdW5kZXJydW5zLgorCQkgKi8KIAkJaWYgKElOVEVMX0lO Rk8oZGV2KS0+Z2VuIDw9IDYgJiYgci0+c3ByX3ZhbCkgewogCQkJV0FSTl9PTih3bV9scCAhPSAx KTsKIAkJCXJlc3VsdHMtPndtX2xwX3Nwclt3bV9scCAtIDFdID0gV00xU19MUF9FTiB8IHItPnNw cl92YWw7Ci0tIAoxLjguMy4yCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2lu dGVsLWdmeAo=