From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rodrigo Vivi Subject: [PATCH] drm/i915: Allow a way to disable watermark for debuging purposes. Date: Mon, 4 Jan 2016 15:00:03 -0800 Message-ID: <1451948403-2847-1-git-send-email-rodrigo.vivi@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 A246B6E142 for ; Mon, 4 Jan 2016 15:00:19 -0800 (PST) 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: Rodrigo Vivi List-Id: intel-gfx@lists.freedesktop.org V2l0aG91dCB3YXRlcm1hcmsgdGhlIHBvd2VyIGNvbnN1bXB0aW9uIHdpbGwgYmxvdyB1cCwgYnV0 CndoZW4gZW5hYmxpbmcgcGxhdGZvcm1zIGFuZCBkZWFsaW5nIHdpdGggZGlmZmVyZW50IGtpbmRz IG9mCmNyYXNoZXMsIHNjcmVlbiBjb3JydXB0aW9ucywgcGlwZSB1bmRlcnVucywgZXRjIHdlIG5l ZWQgdG8gYmUKYWJsZSB0byBlYXNpbHkgZGlzYWJsZSB3YXRlcm1hcmsgdG8gc2VlIGlmIHdlIGFy ZSBvbiB0aGUgcmlnaHQKaW52ZXN0aWdhdGlvbiB0cmFjay4KCkFub3RoZXIgcG9zc2liaWxpdHkg d2FzIHRvIHNraXAgYXQgdGhlIGJlZ2lubmluZyBhbmQgYXZvaWQgYWxsCmNhbGN1bGF0aW9ucywg YnV0IEknbSBub3Qgc3VyZSBhYm91dCBpdC4gTWF5YmUgaXQgbWlnaHQgYmUgc3RpbGwKdXNlZnVs IHRvIGtub3cgdGhlIGNhbGN1bGF0ZWQgdmFsdWVzIHdoZW4gZGVidWdpbmcuCgpTaWduZWQtb2Zm LWJ5OiBSb2RyaWdvIFZpdmkgPHJvZHJpZ28udml2aUBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9wYXJhbXMuYyB8ICA0ICsrKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfcGFyYW1zLmggfCAgMSArCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jICAg IHwgMTQgKysrKysrKysrLS0tLS0KIDMgZmlsZXMgY2hhbmdlZCwgMTQgaW5zZXJ0aW9ucygrKSwg NSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3Bh cmFtcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wYXJhbXMuYwppbmRleCA4ZDkwYzI1 Li43YTA5MDlkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3BhcmFtcy5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcGFyYW1zLmMKQEAgLTQyLDYgKzQyLDcg QEAgc3RydWN0IGk5MTVfcGFyYW1zIGk5MTUgX19yZWFkX21vc3RseSA9IHsKIAkucHJlbGltaW5h cnlfaHdfc3VwcG9ydCA9IElTX0VOQUJMRUQoQ09ORklHX0RSTV9JOTE1X1BSRUxJTUlOQVJZX0hX X1NVUFBPUlQpLAogCS5kaXNhYmxlX3Bvd2VyX3dlbGwgPSAtMSwKIAkuZW5hYmxlX2lwcyA9IDEs CisJLmVuYWJsZV93YXRlcm1hcmsgPSAxLAogCS5mYXN0Ym9vdCA9IDAsCiAJLnByZWZhdWx0X2Rp c2FibGUgPSAwLAogCS5sb2FkX2RldGVjdF90ZXN0ID0gMCwKQEAgLTE0MSw2ICsxNDIsOSBAQCBN T0RVTEVfUEFSTV9ERVNDKGRpc2FibGVfcG93ZXJfd2VsbCwKIG1vZHVsZV9wYXJhbV9uYW1lZF91 bnNhZmUoZW5hYmxlX2lwcywgaTkxNS5lbmFibGVfaXBzLCBpbnQsIDA2MDApOwogTU9EVUxFX1BB Uk1fREVTQyhlbmFibGVfaXBzLCAiRW5hYmxlIElQUyAoZGVmYXVsdDogdHJ1ZSkiKTsKIAorbW9k dWxlX3BhcmFtX25hbWVkX3Vuc2FmZShlbmFibGVfd2F0ZXJtYXJrLCBpOTE1LmVuYWJsZV93YXRl cm1hcmssIGludCwgMDYwMCk7CitNT0RVTEVfUEFSTV9ERVNDKGVuYWJsZV93YXRlcm1hcmssICJF bmFibGUgV2F0ZXJtYXJrIChkZWZhdWx0OiB0cnVlKSIpOworCiBtb2R1bGVfcGFyYW1fbmFtZWQo ZmFzdGJvb3QsIGk5MTUuZmFzdGJvb3QsIGJvb2wsIDA2MDApOwogTU9EVUxFX1BBUk1fREVTQyhm YXN0Ym9vdCwKIAkiVHJ5IHRvIHNraXAgdW5uZWNlc3NhcnkgbW9kZSBzZXRzIGF0IGJvb3QgdGlt ZSAoZGVmYXVsdDogZmFsc2UpIik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X3BhcmFtcy5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wYXJhbXMuaAppbmRleCA1 Mjk5MjkwLi5hMTg1NmUwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3Bh cmFtcy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcGFyYW1zLmgKQEAgLTQzLDYg KzQzLDcgQEAgc3RydWN0IGk5MTVfcGFyYW1zIHsKIAl1bnNpZ25lZCBpbnQgcHJlbGltaW5hcnlf aHdfc3VwcG9ydDsKIAlpbnQgZGlzYWJsZV9wb3dlcl93ZWxsOwogCWludCBlbmFibGVfaXBzOwor CWludCBlbmFibGVfd2F0ZXJtYXJrOwogCWludCBpbnZlcnRfYnJpZ2h0bmVzczsKIAlpbnQgZW5h YmxlX2NtZF9wYXJzZXI7CiAJaW50IGd1Y19sb2dfbGV2ZWw7CmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0u YwppbmRleCAwMmZlMDgxLi42ZjE0Y2Q3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKQEAgLTI0 ODQsNyArMjQ4NCw3IEBAIHN0YXRpYyB2b2lkIGlsa19jb21wdXRlX3dtX3Jlc3VsdHMoc3RydWN0 IGRybV9kZXZpY2UgKmRldiwKIAkJCShyLT5wcmlfdmFsIDw8IFdNMV9MUF9TUl9TSElGVCkgfAog CQkJci0+Y3VyX3ZhbDsKIAotCQlpZiAoci0+ZW5hYmxlKQorCQlpZiAoci0+ZW5hYmxlICYmIGk5 MTUuZW5hYmxlX3dhdGVybWFyaykKIAkJCXJlc3VsdHMtPndtX2xwW3dtX2xwIC0gMV0gfD0gV00x X0xQX1NSX0VOOwogCiAJCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA+PSA4KQpAQCAtMzI1OCw3 ICszMjU4LDggQEAgc3RhdGljIHZvaWQgc2tsX2NvbXB1dGVfd21fcmVzdWx0cyhzdHJ1Y3QgZHJt X2RldmljZSAqZGV2LAogCQkJdGVtcCB8PSBwX3dtLT53bVtsZXZlbF0ucGxhbmVfcmVzX2xbaV0g PDwKIAkJCQkJUExBTkVfV01fTElORVNfU0hJRlQ7CiAJCQl0ZW1wIHw9IHBfd20tPndtW2xldmVs XS5wbGFuZV9yZXNfYltpXTsKLQkJCWlmIChwX3dtLT53bVtsZXZlbF0ucGxhbmVfZW5baV0pCisJ CQlpZiAocF93bS0+d21bbGV2ZWxdLnBsYW5lX2VuW2ldCisJCQkgICAgJiYgaTkxNS5lbmFibGVf d2F0ZXJtYXJrKQogCQkJCXRlbXAgfD0gUExBTkVfV01fRU47CiAKIAkJCXItPnBsYW5lW3BpcGVd W2ldW2xldmVsXSA9IHRlbXA7CkBAIC0zMjY5LDcgKzMyNzAsOCBAQCBzdGF0aWMgdm9pZCBza2xf Y29tcHV0ZV93bV9yZXN1bHRzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCXRlbXAgfD0gcF93 bS0+d21bbGV2ZWxdLnBsYW5lX3Jlc19sW1BMQU5FX0NVUlNPUl0gPDwgUExBTkVfV01fTElORVNf U0hJRlQ7CiAJCXRlbXAgfD0gcF93bS0+d21bbGV2ZWxdLnBsYW5lX3Jlc19iW1BMQU5FX0NVUlNP Ul07CiAKLQkJaWYgKHBfd20tPndtW2xldmVsXS5wbGFuZV9lbltQTEFORV9DVVJTT1JdKQorCQlp ZiAocF93bS0+d21bbGV2ZWxdLnBsYW5lX2VuW1BMQU5FX0NVUlNPUl0KKwkJICAgICYmIGk5MTUu ZW5hYmxlX3dhdGVybWFyaykKIAkJCXRlbXAgfD0gUExBTkVfV01fRU47CiAKIAkJci0+cGxhbmVb cGlwZV1bUExBTkVfQ1VSU09SXVtsZXZlbF0gPSB0ZW1wOwpAQCAtMzI4MSw3ICszMjgzLDggQEAg c3RhdGljIHZvaWQgc2tsX2NvbXB1dGVfd21fcmVzdWx0cyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 LAogCQl0ZW1wID0gMDsKIAkJdGVtcCB8PSBwX3dtLT50cmFuc193bS5wbGFuZV9yZXNfbFtpXSA8 PCBQTEFORV9XTV9MSU5FU19TSElGVDsKIAkJdGVtcCB8PSBwX3dtLT50cmFuc193bS5wbGFuZV9y ZXNfYltpXTsKLQkJaWYgKHBfd20tPnRyYW5zX3dtLnBsYW5lX2VuW2ldKQorCQlpZiAocF93bS0+ dHJhbnNfd20ucGxhbmVfZW5baV0KKwkJICAgICYmIGk5MTUuZW5hYmxlX3dhdGVybWFyaykKIAkJ CXRlbXAgfD0gUExBTkVfV01fRU47CiAKIAkJci0+cGxhbmVfdHJhbnNbcGlwZV1baV0gPSB0ZW1w OwpAQCAtMzI5MCw3ICszMjkzLDggQEAgc3RhdGljIHZvaWQgc2tsX2NvbXB1dGVfd21fcmVzdWx0 cyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCXRlbXAgPSAwOwogCXRlbXAgfD0gcF93bS0+dHJh bnNfd20ucGxhbmVfcmVzX2xbUExBTkVfQ1VSU09SXSA8PCBQTEFORV9XTV9MSU5FU19TSElGVDsK IAl0ZW1wIHw9IHBfd20tPnRyYW5zX3dtLnBsYW5lX3Jlc19iW1BMQU5FX0NVUlNPUl07Ci0JaWYg KHBfd20tPnRyYW5zX3dtLnBsYW5lX2VuW1BMQU5FX0NVUlNPUl0pCisJaWYgKHBfd20tPnRyYW5z X3dtLnBsYW5lX2VuW1BMQU5FX0NVUlNPUl0KKwkgICAgJiYgaTkxNS5lbmFibGVfd2F0ZXJtYXJr KQogCQl0ZW1wIHw9IFBMQU5FX1dNX0VOOwogCiAJci0+cGxhbmVfdHJhbnNbcGlwZV1bUExBTkVf Q1VSU09SXSA9IHRlbXA7Ci0tIAoyLjQuMwoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9pbnRlbC1nZngK