From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH] drm/i915: Only use sanitized values for ILK watermarks Date: Tue, 8 Mar 2016 10:57:16 +0100 Message-ID: <56DEA1FC.8080703@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 F3F856E63A for ; Tue, 8 Mar 2016 09:57:18 +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 Graphics Development Cc: "Zanoni, Paulo R" List-Id: intel-gfx@lists.freedesktop.org VGhlIHJhdyB3YXRlcm1hcmsgdmFsdWVzIGFyZSBuZWVkZWQgd2hlbiBwbGFuZXMgYXJlIG5vdCBw YXJ0IG9mIHRoZSBzdGF0ZSwKYnV0IHRoaXMgaW50cm9kdWNlZCBhIHJlZ3Jlc3Npb24gYW5kIHBv c3NpYmx5IGFuIG92ZXJmbG93IHdoZW4gbWVyZ2luZwp0aGUgd2F0ZXJtYXJrcyBiZWNhdXNlIGlu dmFsaWQgdmFsdWVzIG1heSBlbmQgdXAgdXNlZC4gU29sdmUgdGhpcyBieSBjYWxjdWxhdGluZwpy YXcgd2F0ZXJtYXJrcyBmb3IgYWxsIGxldmVscywgYW5kIG9ubHkgc2V0dGluZyBub24temVybyB2 YWx1ZXMgd2hlbiB0aGUgbGV2ZWwKaXMgdmFsaWQuCgpGaXhlcyB0aGUgU05CIHdhcm5pbmc6CiAg IFdBUk5JTkc6IENQVTogMSBQSUQ6IDI1NDA1IGF0IC9ob21lL21hdHRyb3BlL3dvcmsva2VybmVs L2dtcy9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jOjI1ODAgaWxrX3Byb2dyYW1fd2F0 ZXJtYXJrcysweDdiMi8weDlkMCBbaTkxNV0oKQogICBXQVJOX09OKHdtX2xwICE9IDEpCiAgIE1v ZHVsZXMgbGlua2VkIGluOiBpOTE1IGRybV9rbXNfaGVscGVyIGRybSBibHVldG9vdGggZnVzZSBp VENPX3dkdCBpVENPX3ZlbmRvcl9zdXBwb3J0IHN5c2NvcHlhcmVhIHN5c2ZpbGxyZWN0IHN5c2lt Z2JsdCBmYl9zeXNfZm9wcyB0cG1fdGlzIG1laV9tZSBlMTAwMGUgc25kX2hkYV9jb2RlY19oZG1p IHBjc3BrciB0cG0gbWVpIGkyY19pODAxIGxwY19pY2ggc25kX2hkYV9jb2RlYyBzbmRfaGRhX2Nv cmUKICAgQ1BVOiAxIFBJRDogMjU0MDUgQ29tbToga21zX3VuaXZlcnNhbF9wIFRhaW50ZWQ6IEcg ICAgIFUgIFcgICAgICAgNC41LjAtcmM2YXBvbGxvbGFrZSsgIzQ2MgogICBIYXJkd2FyZSBuYW1l OiAgICAgICAgICAgICAgICAgIC9ESDY3R0QsIEJJT1MgQkxINjcxMEguODZBLjAxNjAuMjAxMi4x MjA0LjExNTYgMTIvMDQvMjAxMgogICAgMDAwMDAwMDAwMDAwMDAwMCBmZmZmODgwMDlkNDJiOTE4 IGZmZmZmZmZmODE0M2NmYWIgZmZmZjg4MDA5ZDQyYjk2MAogICAgZmZmZmZmZmZhMDM2MzU4MCBm ZmZmODgwMDlkNDJiOTUwIGZmZmZmZmZmODEwODI3NDYgZmZmZjg4MDBiOWEyNDkyOAogICAgZmZm Zjg4MDA5ZDQyYmEwMCBmZmZmODgwMDlkNGEwMDAwIDAwMDAwMDAwMDAwMDAwMDAgZmZmZjg4MDA5 ZDQyYmE2YwogICBDYWxsIFRyYWNlOgogICAgWzxmZmZmZmZmZjgxNDNjZmFiPl0gZHVtcF9zdGFj aysweDRkLzB4NzIKICAgIFs8ZmZmZmZmZmY4MTA4Mjc0Nj5dIHdhcm5fc2xvd3BhdGhfY29tbW9u KzB4ODYvMHhjMAogICAgWzxmZmZmZmZmZjgxMDgyN2NjPl0gd2Fybl9zbG93cGF0aF9mbXQrMHg0 Yy8weDUwCiAgICBbPGZmZmZmZmZmYTAyOTI4NjI+XSBpbGtfcHJvZ3JhbV93YXRlcm1hcmtzKzB4 N2IyLzB4OWQwIFtpOTE1XQogICAgWzxmZmZmZmZmZmEwMjkyY2I3Pl0gaWxrX2luaXRpYWxfd2F0 ZXJtYXJrcysweDEwNy8weDEyMCBbaTkxNV0KICAgIFs8ZmZmZmZmZmZhMDJmZWZmYT5dIGludGVs X3ByZV9wbGFuZV91cGRhdGUrMHgxMmEvMHgxOTAgW2k5MTVdCiAgICBbPGZmZmZmZmZmYTAyZmZi MzY+XSBpbnRlbF9hdG9taWNfY29tbWl0KzB4NTQ2LzB4ZDUwIFtpOTE1XQogICAgWzxmZmZmZmZm ZmEwMTJjOWU3Pl0gZHJtX2F0b21pY19jb21taXQrMHgzNy8weDYwIFtkcm1dCiAgICBbPGZmZmZm ZmZmYTAyMTczNjE+XSBkcm1fYXRvbWljX2hlbHBlcl9kaXNhYmxlX3BsYW5lKzB4YjEvMHhmMCBb ZHJtX2ttc19oZWxwZXJdCiAgICBbPGZmZmZmZmZmYTAxMWNkYjQ+XSBfX3NldHBsYW5lX2ludGVy bmFsKzB4MTg0LzB4MjgwIFtkcm1dCiAgICBbPGZmZmZmZmZmYTAxMmI1N2E+XSA/IGRybV9tb2Rl c2V0X2xvY2tfYWxsX2N0eCsweDlhLzB4YjAgW2RybV0KICAgIFs8ZmZmZmZmZmZhMDEyMDEwZj5d IGRybV9tb2RlX3NldHBsYW5lKzB4MTNmLzB4MWMwIFtkcm1dCiAgICBbPGZmZmZmZmZmYTAxMTFi NTI+XSBkcm1faW9jdGwrMHgxNDIvMHg1OTAgW2RybV0KICAgIFs8ZmZmZmZmZmZhMDExZmZkMD5d ID8gZHJtX3BsYW5lX2NoZWNrX3BpeGVsX2Zvcm1hdCsweDUwLzB4NTAgW2RybV0KICAgIFs8ZmZm ZmZmZmY4MTFmMjc0ND5dID8gbW50cHV0KzB4MjQvMHg0MAogICAgWzxmZmZmZmZmZjgxMWQyOGQ0 Pl0gPyBfX2ZwdXQrMHgxOTQvMHgyMDAKICAgIFs8ZmZmZmZmZmZhMDEyZGVjMz5dIGRybV9jb21w YXRfaW9jdGwrMHgzMy8weDQwIFtkcm1dCiAgICBbPGZmZmZmZmZmYTAyOWUxYzI+XSBpOTE1X2Nv bXBhdF9pb2N0bCsweDMyLzB4NDAgW2k5MTVdCiAgICBbPGZmZmZmZmZmODEyMjhkNzI+XSBjb21w YXRfU3lTX2lvY3RsKzB4YzIvMHgzMzAKICAgIFs8ZmZmZmZmZmY4MTAwMjFkNT5dID8gZXhpdF90 b191c2VybW9kZV9sb29wKzB4OTUvMHhiMAogICAgWzxmZmZmZmZmZjgxMDAyZDJlPl0gZG9fZmFz dF9zeXNjYWxsXzMyKzB4OWUvMHgyMTAKICAgIFs8ZmZmZmZmZmY4MTk3ZmFmMj5dIGVudHJ5X1NZ U0VOVEVSX2NvbXBhdCsweDUyLzB4NzAKCkNjOiBNYXR0IFJvcGVyIDxtYXR0aGV3LmQucm9wZXJA aW50ZWwuY29tPgpDYzogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+CkNj OiBQYXVsbyBaYW5vbmkgPHBhdWxvLnIuemFub25pQGludGVsLmNvbT4KQ2M6IFZpbGxlIFN5cmrD pGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+ClRlc3RjYXNlOiBrbXNfdW5pdmVy c2FsX3BsYW5lCkZpeGVzOiBkODFmMDRjNWVmICgiZHJtL2k5MTU6IEFsbG93IHByZXNlcnZhdGlv biBvZiB3YXRlcm1hcmtzLCB2Mi4iKQpTaWduZWQtb2ZmLWJ5OiBNYWFydGVuIExhbmtob3JzdCA8 bWFhcnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwuY29tPgotLS0KZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZHJ2LmgKaW5kZXggY2QwYjRlYWNiZGRmLi4yODMxODQyNTQxM2EgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rydi5oCkBAIC0zOTAsNiArMzkwLDcgQEAgc3RydWN0IGludGVsX2NydGNfc2NhbGVyX3N0 YXRlIHsKIAogc3RydWN0IGludGVsX3BpcGVfd20gewogCXN0cnVjdCBpbnRlbF93bV9sZXZlbCB3 bVs1XTsKKwlzdHJ1Y3QgaW50ZWxfd21fbGV2ZWwgcmF3X3dtWzVdOwogCXVpbnQzMl90IGxpbmV0 aW1lOwogCWJvb2wgZmJjX3dtX2VuYWJsZWQ7CiAJYm9vbCBwaXBlX2VuYWJsZWQ7CmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfcG0uYwppbmRleCBmNjVlODQxMzcwNjAuLmQ3YWVmMTdiZjBmOSAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9wbS5jCkBAIC0yMzM1LDcgKzIzMzUsNiBAQCBzdGF0aWMgaW50IGlsa19jb21w dXRlX3BpcGVfd20oc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSkKIAkJCSBkcm1fcmVj dF9oZWlnaHQoJnNwcnN0YXRlLT5kc3QpICE9IGRybV9yZWN0X2hlaWdodCgmc3Byc3RhdGUtPnNy YykgPj4gMTYpOwogCX0KIAotCiAJdXNhYmxlX2xldmVsID0gbWF4X2xldmVsOwogCiAJLyogSUxL L1NOQjogTFAyKyB3YXRlcm1hcmtzIG9ubHkgdy9vIHNwcml0ZXMgKi8KQEAgLTIzNDcsNyArMjM0 NiwxMCBAQCBzdGF0aWMgaW50IGlsa19jb21wdXRlX3BpcGVfd20oc3RydWN0IGludGVsX2NydGNf c3RhdGUgKmNzdGF0ZSkKIAkJdXNhYmxlX2xldmVsID0gMDsKIAogCWlsa19jb21wdXRlX3dtX2xl dmVsKGRldl9wcml2LCBpbnRlbF9jcnRjLCAwLCBjc3RhdGUsCi0JCQkgICAgIHByaXN0YXRlLCBz cHJzdGF0ZSwgY3Vyc3RhdGUsICZwaXBlX3dtLT53bVswXSk7CisJCQkgICAgIHByaXN0YXRlLCBz cHJzdGF0ZSwgY3Vyc3RhdGUsICZwaXBlX3dtLT5yYXdfd21bMF0pOworCisJbWVtc2V0KCZwaXBl X3dtLT53bSwgMCwgc2l6ZW9mKHBpcGVfd20tPndtKSk7CisJcGlwZV93bS0+d21bMF0gPSBwaXBl X3dtLT5yYXdfd21bMF07CiAKIAlpZiAoSVNfSEFTV0VMTChkZXYpIHx8IElTX0JST0FEV0VMTChk ZXYpKQogCQlwaXBlX3dtLT5saW5ldGltZSA9IGhzd19jb21wdXRlX2xpbmV0aW1lX3dtKGRldiwg Y3N0YXRlKTsKQEAgLTIzNTgsNyArMjM2MCw3IEBAIHN0YXRpYyBpbnQgaWxrX2NvbXB1dGVfcGlw ZV93bShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlKQogCWlsa19jb21wdXRlX3dtX3Jl Z19tYXhpbXVtcyhkZXYsIDEsICZtYXgpOwogCiAJZm9yIChsZXZlbCA9IDE7IGxldmVsIDw9IG1h eF9sZXZlbDsgbGV2ZWwrKykgewotCQlzdHJ1Y3QgaW50ZWxfd21fbGV2ZWwgKndtID0gJnBpcGVf d20tPndtW2xldmVsXTsKKwkJc3RydWN0IGludGVsX3dtX2xldmVsICp3bSA9ICZwaXBlX3dtLT5y YXdfd21bbGV2ZWxdOwogCiAJCWlsa19jb21wdXRlX3dtX2xldmVsKGRldl9wcml2LCBpbnRlbF9j cnRjLCBsZXZlbCwgY3N0YXRlLAogCQkJCSAgICAgcHJpc3RhdGUsIHNwcnN0YXRlLCBjdXJzdGF0 ZSwgd20pOwpAQCAtMjM2OCwxMiArMjM3MCwxMyBAQCBzdGF0aWMgaW50IGlsa19jb21wdXRlX3Bp cGVfd20oc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSkKIAkJICogcmVnaXN0ZXIgbWF4 aW11bXMgc2luY2Ugc3VjaCB3YXRlcm1hcmtzIGFyZQogCQkgKiBhbHdheXMgaW52YWxpZC4KIAkJ ICovCi0JCWlmIChsZXZlbCA+IHVzYWJsZV9sZXZlbCkgewotCQkJd20tPmVuYWJsZSA9IGZhbHNl OwotCQl9IGVsc2UgaWYgKCFpbGtfdmFsaWRhdGVfd21fbGV2ZWwobGV2ZWwsICZtYXgsIHdtKSkg ewotCQkJd20tPmVuYWJsZSA9IGZhbHNlOworCQlpZiAobGV2ZWwgPiB1c2FibGVfbGV2ZWwpCisJ CQljb250aW51ZTsKKworCQlpZiAoaWxrX3ZhbGlkYXRlX3dtX2xldmVsKGxldmVsLCAmbWF4LCB3 bSkpCisJCQlwaXBlX3dtLT53bVtsZXZlbF0gPSAqd207CisJCWVsc2UKIAkJCXVzYWJsZV9sZXZl bCA9IGxldmVsOwotCQl9CiAJfQogCiAJcmV0dXJuIDA7CgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdm eEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp bG1hbi9saXN0aW5mby9pbnRlbC1nZngK