From: Jani Nikula Subject: [PATCH] drm/i915: Increase WM memory latency values on SNB with high pixel clock Date: Fri, 21 Mar 2014 11:00:48 +0200 Message-ID: <1395392448-6337-1-git-send-email-jani.nikula@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 30EFC6E282 for ; Fri, 21 Mar 2014 02:00:49 -0700 (PDT) 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: jani.nikula@intel.com List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCk9u IFNOQiB0aGUgQklPUyBwcm92aWRlZCBXTSBtZW1vcnkgbGF0ZW5jeSB2YWx1ZXMgc2VlbSBpbnN1 ZmZpY2llbnQgdG8KaGFuZGxlIGhpZ2ggcmVzb2x1dGlvbiBkaXNwbGF5cy4KCkluIHRoaXMgcGFy dGljdWxhciBjYXNlIHRoZSBkaXNwbGF5IG1vZGUgd2FzIGEgMjU2MHgxNDQwQDYwSHosIHdoaWNo Cm1ha2VzIHRoZSBwaXhlbCBjbG9jayAyNDEuNSBNSHouIEl0IHdhcyBlbXBpcmljYWxseSBmb3Vu ZCB0aGF0IGEgbWVtb3J5CmxhdGVuY3kgdmFsdWUgaWYgMS4yIHVzZWMgaXMgZW5vdWdoIHRvIGF2 b2lkIHVuZGVycnVucywgd2hlcmVhcyB0aGUgQklPUwpwcm92aWRlZCB2YWx1ZSBvZiAwLjcgdXNl YyB3YXMgY2xlYXJseSB0b28gbG93LiBJbmNpZGVudGFsbHkgMS4yIHVzZWMKaXMgd2hhdCB0aGUg dHlwaWNhbCBCSU9TIHByb3ZpZGVkIHZhbHVlcyBhcmUgb24gSVZCIHN5c3RlbXMuCgpJbmNyZWFz ZSB0aGUgV00gbWVtb3J5IGxhdGVuY3kgdmFsdWVzIHRvIDEuMiB1c2VjIHdoZW4gZW5jb3VudGVy aW5nIGEKZGlzcGxheSBtb2RlIHdpdGggcGl4ZWwgY2xvY2sgZXhjZWVkaW5nIDIyNSBNSHouIDIy NSBNSHogd2FzIGNob3NlbiBhcwp0aGUgdGhyZXNob2xkIHNpbXBseSBiZWNhdXNlIHRoYXQncyB0 aGUgZG9jdW1lbnRlZCBsaW1pdCBvZiBTTkIgd2l0aApIRE1JLCBzbyBvbmUgbWlnaHQgc3VybWlz ZSB0aGF0IHRoZSBoYXJkd2FyZSBtYXkgaGF2ZSBiZWVuIHRlc3RlZCB1cAp0byB0aGF0IGZyZXF1 ZW5jeS4gSW4gdGhlb3J5IHRoZSBsYXRlbmN5IHNob3VsZG4ndCBkZXBlbmQgb24gdGhlIHBpeGVs CmNsb2NrIGF0IGFsbC4gU28gaXQgbWF5IGJlIHRoYXQgd2Ugc2hvdWxkIGp1c3QgaW5jcmVhc2Ug dGhlIGxhdGVuY3kKdmFsdWVzIGFjcm9zcyB0aGUgYm9hcmQgZm9yIGFsbCBTTkIgc3lzdGVtcy4g QnV0IGZvciBub3cgSSdtIGluY2xpbmVkCnRvIGxpbWl0IHRoaXMgcXVpcmsgdG8gb25seSB0aG9z ZSBjYXNlcyB0aGF0IGFyZSBwcm92ZW4gdG8gbmVlZCBpdCwKYXMgZG9pbmcgb3RoZXJ3aXNlIG1p Z2h0IGNhdXNlIHNvbWUgaW5jcmVhc2UgaW4gcG93ZXIgY29uc3VtcHRpb24gZm9yCmV2ZXJ5b25l LgoKQ2M6IFJvYmVydCBOIDxjcnNobWFuQGdtYWlsLmNvbT4KQnVnemlsbGE6IGh0dHBzOi8vYnVn cy5mcmVlZGVza3RvcC5vcmcvc2hvd19idWcuY2dpP2lkPTcwMjU0ClNpZ25lZC1vZmYtYnk6IFZp bGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+CgotLS0KCkknbSBq dXN0IHJlbGF5aW5nIHRoZSBwYXRjaCBmcm9tIGJ1Z3ppbGxhIHRvIHRoZSBsaXN0IGFzIGl0IHNl ZW1zIHRvIGZpeAp0aGUgYnVnLiBEb24ndCBhc2sgbWUgYW55dGhpbmcgYWJvdXQgaXQuCgpCUiwK SmFuaS4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAgIDEwICsr KysrKysrKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oICAgICB8ICAgIDEgKwog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyAgICAgIHwgICAzMyArKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysKIDMgZmlsZXMgY2hhbmdlZCwgNDQgaW5zZXJ0aW9ucygrKQoK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCAwYjE5YWZkZmJhYTcuLmIwYWM5 MmQ4ZjQ2MSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtOTkzMyw2ICs5 OTMzLDE2IEBAIHN0YXRpYyBpbnQgX19pbnRlbF9zZXRfbW9kZShzdHJ1Y3QgZHJtX2NydGMgKmNy dGMsCiAJCSAqLwogCQlkcm1fY2FsY190aW1lc3RhbXBpbmdfY29uc3RhbnRzKGNydGMsCiAJCQkJ CQkmcGlwZV9jb25maWctPmFkanVzdGVkX21vZGUpOworCisKKwkJLyoKKwkJICogVGhlIEJJT1Mg cHJvdmlkZWQgV00gbWVtb3J5IGxhdGVuY3kgdmFsdWVzIGFyZSBvZnRlbgorCQkgKiBpbmFkZXF1 YXRlIGZvciBoaWdoIHJlc29sdXRpb24gZGlzcGxheXMuIEFkanVzdCB0aGVtLgorCQkgKgorCQkg KiBGSVhNRSBub3Qgc3VyZSAyMjVNSHogaXMgYSBnb29kIHRocmVzaG9sZC4KKwkJICovCisJCWlm IChJU19HRU42KGRldikgJiYgcGlwZV9jb25maWctPmFkanVzdGVkX21vZGUuY3J0Y19jbG9jayA+ IDIyNTAwMCkKKwkJCXNuYl93bV9sYXRlbmN5X3F1aXJrKGRldik7CiAJfQogCiAJLyogT25seSBh ZnRlciBkaXNhYmxpbmcgYWxsIG91dHB1dCBwaXBlbGluZXMgdGhhdCB3aWxsIGJlIGNoYW5nZWQg Y2FuIHdlCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCmluZGV4IDYwZmZhZDM3NjM5MC4uYjFkNjMx YzlkZmE1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtOTAzLDYgKzkwMyw3IEBAIHZv aWQgaW50ZWxfcnVudGltZV9wbV9wdXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 KTsKIHZvaWQgaW50ZWxfaW5pdF9ydW50aW1lX3BtKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdik7CiB2b2lkIGludGVsX2ZpbmlfcnVudGltZV9wbShzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYpOwogdm9pZCBpbGtfd21fZ2V0X2h3X3N0YXRlKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYpOwordm9pZCBzbmJfd21fbGF0ZW5jeV9xdWlyayhzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2KTsKIAogCiAvKiBpbnRlbF9zZHZvLmMgKi8KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCmluZGV4 IDM5ZjMyMzhiZjFjMy4uMjI2NzUwNDUyNjM3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKQEAg LTIxMDQsNiArMjEwNCwzOSBAQCBzdGF0aWMgdm9pZCBpbGtfc2V0dXBfd21fbGF0ZW5jeShzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2KQogCWludGVsX3ByaW50X3dtX2xhdGVuY3koZGV2LCAiQ3Vyc29y IiwgZGV2X3ByaXYtPndtLmN1cl9sYXRlbmN5KTsKIH0KIAorc3RhdGljIGJvb2wgaWxrX2luY3Jl YXNlX3dtX2xhdGVuY3koc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAorCQkJCSAg ICB1aW50MTZfdCB3bVs1XSwgdWludDE2X3QgbWluKQoreworCWludCBsZXZlbCwgbWF4X2xldmVs ID0gaWxrX3dtX21heF9sZXZlbChkZXZfcHJpdi0+ZGV2KTsKKworCWlmICh3bVswXSA+PSBtaW4p CisJCXJldHVybiBmYWxzZTsKKworCXdtWzBdID0gbWF4KHdtWzBdLCBtaW4pOworCWZvciAobGV2 ZWwgPSAxOyBsZXZlbCA8PSBtYXhfbGV2ZWw7IGxldmVsKyspCisJCXdtW2xldmVsXSA9IG1heF90 KHVpbnQxNl90LCB3bVtsZXZlbF0sIERJVl9ST1VORF9VUChtaW4sIDUpKTsKKworCXJldHVybiB0 cnVlOworfQorCit2b2lkIHNuYl93bV9sYXRlbmN5X3F1aXJrKHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYpCit7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJp dmF0ZTsKKwlib29sIGNoYW5nZWQ7CisKKwljaGFuZ2VkID0gaWxrX2luY3JlYXNlX3dtX2xhdGVu Y3koZGV2X3ByaXYsIGRldl9wcml2LT53bS5wcmlfbGF0ZW5jeSwgMTIpIHwKKwkJaWxrX2luY3Jl YXNlX3dtX2xhdGVuY3koZGV2X3ByaXYsIGRldl9wcml2LT53bS5zcHJfbGF0ZW5jeSwgMTIpIHwK KwkJaWxrX2luY3JlYXNlX3dtX2xhdGVuY3koZGV2X3ByaXYsIGRldl9wcml2LT53bS5jdXJfbGF0 ZW5jeSwgMTIpOworCisJaWYgKCFjaGFuZ2VkKQorCQlyZXR1cm47CisKKwlEUk1fREVCVUdfS01T KCJXTSBsYXRlbmN5IHZhbHVlcyBpbmNyZWFzZWQgZHVlIHRvIGhpZ2ggcGl4ZWwgY2xvY2tcbiIp OworCWludGVsX3ByaW50X3dtX2xhdGVuY3koZGV2LCAiUHJpbWFyeSIsIGRldl9wcml2LT53bS5w cmlfbGF0ZW5jeSk7CisJaW50ZWxfcHJpbnRfd21fbGF0ZW5jeShkZXYsICJTcHJpdGUiLCBkZXZf cHJpdi0+d20uc3ByX2xhdGVuY3kpOworCWludGVsX3ByaW50X3dtX2xhdGVuY3koZGV2LCAiQ3Vy c29yIiwgZGV2X3ByaXYtPndtLmN1cl9sYXRlbmN5KTsKK30KKwogc3RhdGljIHZvaWQgaWxrX2Nv bXB1dGVfd21fcGFyYW1ldGVycyhzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJCQkJICAgICAgc3Ry dWN0IGlsa19waXBlX3dtX3BhcmFtZXRlcnMgKnAsCiAJCQkJICAgICAgc3RydWN0IGludGVsX3dt X2NvbmZpZyAqY29uZmlnKQotLSAKMS43LjkuNQoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9pbnRlbC1nZngK