From mboxrd@z Thu Jan 1 00:00:00 1970 From: ville.syrjala@linux.intel.com Subject: [PATCH 06/14] drm/i915: Fix LP1+ watermark disabling ILK Date: Thu, 5 Dec 2013 15:51:33 +0200 Message-ID: <1386251501-10602-7-git-send-email-ville.syrjala@linux.intel.com> References: <1386251501-10602-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 21999FB717 for ; Thu, 5 Dec 2013 05:52:03 -0800 (PST) In-Reply-To: <1386251501-10602-1-git-send-email-ville.syrjala@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCk9u IElMSyBkaXNhYmxpbmcgTFAxKyB3YXRlcm1hcmtzIG11c3QgYmUgZG9uZSBjYXJlZnVsbHkgdG8g YXZvaWQKdW5kZXJydW5zLiBJZiB3ZSBqdXN0IHdyaXRlIDAgdG8gdGhlIHJlZ2lzdGVyIGluIHRo ZSBtaWRkbGUgb2YgdGhlIHNjYW4KY3ljbGUgd2Ugb2Z0ZW4gZ2V0IGFuIHVuZGVycnVuLiBTbyBp bnN0ZWFkIHdlIGhhdmUgdG8gbGVhdmUgdGhlIGFjdHVhbAp3YXRlcm1hcmsgbGV2ZWxzIGluIHRo ZSByZWdpc3RlciBpbnRhY3QsIGFuZCBqdXN0IHRvZ2dsZSB0aGUgZW5hYmxlIGJpdC4KClByZXN1 bWFibHkgdGhlIGhhcmR3YXJlIHRha2VzIGEgd2hpbGUgdG8gZ2V0IG91dCBvZiBsb3cgcG93ZXIg bW9kZSwgYW5kCnNvIHRoZSB3YXRlcm1hcmsgbGV2ZWwgbmVlZCB0byBzdGF5IHZhbGlkIHVudGls IHRoYXQgdGltZS4KCldlIGFsc28gaGF2ZSB0byBiZSBjYXJlZnVsIHdpdGggdGhlIFdNMVNfTFBf RU4gYml0LiBJdCBzZWVtcyB0aGUKaGFyZHdhcmUgbW9yZSBvciBsZXNzIHRyZWF0cyBpdCBsaWtl IHRoZSBhY3R1YWwgd2F0ZXJtYXJrcyBudW1iZXJzLCBhbmQKc28gd2UgbXVzdCBub3QgdG9nZ2xl IGl0IHRvbyBzb29uLiBKdXN0IGxlYXZlIGl0IGFsb25lIHdoZW4gZGlzYWJsaW5nCnRoZSBMUDEr IHdhdGVybWFya3MuCgpTaWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmph bGFAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMg fCAzMyArKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAy MCBpbnNlcnRpb25zKCspLCAxMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwpp bmRleCBkYjdmM2E2Li4xYWE2ZWE5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKQEAgLTI4OTcs MTYgKzI4OTcsMjMgQEAgc3RhdGljIHZvaWQgaHN3X3dyaXRlX3dtX3ZhbHVlcyhzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJaWYgKCFkaXJ0eSkKIAkJcmV0dXJuOwogCi0JaWYg KGRpcnR5ICYgV01fRElSVFlfTFAoMykgJiYgcHJldmlvdXMtPndtX2xwWzJdICE9IDApCi0JCUk5 MTVfV1JJVEUoV00zX0xQX0lMSywgMCk7Ci0JaWYgKGRpcnR5ICYgV01fRElSVFlfTFAoMikgJiYg cHJldmlvdXMtPndtX2xwWzFdICE9IDApCi0JCUk5MTVfV1JJVEUoV00yX0xQX0lMSywgMCk7Ci0J aWYgKGRpcnR5ICYgV01fRElSVFlfTFAoMSkgJiYgcHJldmlvdXMtPndtX2xwWzBdICE9IDApCi0J CUk5MTVfV1JJVEUoV00xX0xQX0lMSywgMCk7CisJaWYgKGRpcnR5ICYgV01fRElSVFlfTFAoMykg JiYgcHJldmlvdXMtPndtX2xwWzJdICYgV00xX0xQX1NSX0VOKSB7CisJCXByZXZpb3VzLT53bV9s cFsyXSAmPSB+V00xX0xQX1NSX0VOOworCQlJOTE1X1dSSVRFKFdNM19MUF9JTEssIHByZXZpb3Vz LT53bV9scFsyXSk7CisJfQorCWlmIChkaXJ0eSAmIFdNX0RJUlRZX0xQKDIpICYmIHByZXZpb3Vz LT53bV9scFsxXSAmIFdNMV9MUF9TUl9FTikgeworCQlwcmV2aW91cy0+d21fbHBbMV0gJj0gfldN MV9MUF9TUl9FTjsKKwkJSTkxNV9XUklURShXTTJfTFBfSUxLLCBwcmV2aW91cy0+d21fbHBbMV0p OworCX0KKwlpZiAoZGlydHkgJiBXTV9ESVJUWV9MUCgxKSAmJiBwcmV2aW91cy0+d21fbHBbMF0g JiBXTTFfTFBfU1JfRU4pIHsKKwkJcHJldmlvdXMtPndtX2xwWzBdICY9IH5XTTFfTFBfU1JfRU47 CisJCUk5MTVfV1JJVEUoV00xX0xQX0lMSywgcHJldmlvdXMtPndtX2xwWzBdKTsKKwl9CiAKLQlp ZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPD0gNiAmJgotCSAgICBkaXJ0eSAmIFdNX0RJUlRZX0xQ KDEpICYmIHByZXZpb3VzLT53bV9scF9zcHJbMF0gIT0gMCkKLQkJSTkxNV9XUklURShXTTFTX0xQ X0lMSywgMCk7CisJLyoKKwkgKiBEb24ndCB0b3VjaCBXTTFTX0xQX0VOIGhlcmUuCisJICogRG9p bmcgc28gY291bGQgY2F1c2UgdW5kZXJydW5zLgorCSAqLwogCiAJaWYgKGRpcnR5ICYgV01fRElS VFlfUElQRShQSVBFX0EpKQogCQlJOTE1X1dSSVRFKFdNMF9QSVBFQV9JTEssIHJlc3VsdHMtPndt X3BpcGVbMF0pOwpAQCAtMjk1MCw3ICsyOTU3LDcgQEAgc3RhdGljIHZvaWQgaHN3X3dyaXRlX3dt X3ZhbHVlcyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJfQogCiAJaWYgKElO VEVMX0lORk8oZGV2KS0+Z2VuIDw9IDYpIHsKLQkJaWYgKGRpcnR5ICYgV01fRElSVFlfTFAoMSkg JiYgcmVzdWx0cy0+d21fbHBfc3ByWzBdICE9IDApCisJCWlmIChkaXJ0eSAmIFdNX0RJUlRZX0xQ KDEpICYmIHByZXZpb3VzLT53bV9scF9zcHJbMF0gIT0gcmVzdWx0cy0+d21fbHBfc3ByWzBdKQog CQkJSTkxNV9XUklURShXTTFTX0xQX0lMSywgcmVzdWx0cy0+d21fbHBfc3ByWzBdKTsKIAl9IGVs c2UgewogCQlpZiAoZGlydHkgJiBXTV9ESVJUWV9MUCgxKSAmJiBwcmV2aW91cy0+d21fbHBfc3By WzBdICE9IHJlc3VsdHMtPndtX2xwX3NwclswXSkKQEAgLTI5NjEsMTEgKzI5NjgsMTEgQEAgc3Rh dGljIHZvaWQgaHN3X3dyaXRlX3dtX3ZhbHVlcyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYsCiAJCQlJOTE1X1dSSVRFKFdNM1NfTFBfSVZCLCByZXN1bHRzLT53bV9scF9zcHJbMl0p OwogCX0KIAotCWlmIChkaXJ0eSAmIFdNX0RJUlRZX0xQKDEpICYmIHJlc3VsdHMtPndtX2xwWzBd ICE9IDApCisJaWYgKGRpcnR5ICYgV01fRElSVFlfTFAoMSkgJiYgcHJldmlvdXMtPndtX2xwWzBd ICE9IHJlc3VsdHMtPndtX2xwWzBdKQogCQlJOTE1X1dSSVRFKFdNMV9MUF9JTEssIHJlc3VsdHMt PndtX2xwWzBdKTsKLQlpZiAoZGlydHkgJiBXTV9ESVJUWV9MUCgyKSAmJiByZXN1bHRzLT53bV9s cFsxXSAhPSAwKQorCWlmIChkaXJ0eSAmIFdNX0RJUlRZX0xQKDIpICYmIHByZXZpb3VzLT53bV9s cFsxXSAhPSByZXN1bHRzLT53bV9scFsxXSkKIAkJSTkxNV9XUklURShXTTJfTFBfSUxLLCByZXN1 bHRzLT53bV9scFsxXSk7Ci0JaWYgKGRpcnR5ICYgV01fRElSVFlfTFAoMykgJiYgcmVzdWx0cy0+ d21fbHBbMl0gIT0gMCkKKwlpZiAoZGlydHkgJiBXTV9ESVJUWV9MUCgzKSAmJiBwcmV2aW91cy0+ d21fbHBbMl0gIT0gcmVzdWx0cy0+d21fbHBbMl0pCiAJCUk5MTVfV1JJVEUoV00zX0xQX0lMSywg cmVzdWx0cy0+d21fbHBbMl0pOwogCiAJZGV2X3ByaXYtPndtLmh3ID0gKnJlc3VsdHM7Ci0tIAox LjguMy4yCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJ bnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0 cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=