From mboxrd@z Thu Jan 1 00:00:00 1970 From: ville.syrjala@linux.intel.com Subject: [PATCH 10/14] drm/i915: Disable LP1+ watermarks safely in init Date: Thu, 5 Dec 2013 15:51:37 +0200 Message-ID: <1386251501-10602-11-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 mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id D9A10FB779 for ; Thu, 5 Dec 2013 05:52:31 -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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCklM SyBkb2Vzbid0IGxpa2UgaWYgd2UganVzdCB3cml0ZSB0aGUgTFAxKyB3YXRlcm1hcmtzIHJlZ2lz dGVycyB3aXRoIDAuCldlIG5lZWQgdG8ganVzdCBkaXNhYmxlIHRoZSB3YXRlcm1hcmtzIGJ5IGNs ZWFyaW5nIHRoZSBlbmFibGUgYml0LiBVc2UKdGhhdCBtZXRob2QgYWxzbyB3aGVuIGRpc2FibGlu ZyBMUDErIHdhdGVybWFya3MgaW4gaW5pdF9jbG9ja19nYXRpbmcuCgpJdCBsb29rcyBsaWtlIGRp c2FibGluZyB0aGUgc3ByaXRlIExQMSB3YXRlcm1hcmtzIGNhbiBjYXVzZSB1bmRlcnJ1bnMKZXZl biBpZiB3ZSBqdXN0IHRvZ2dsZSB0aGUgV00xU19MUF9FTiBiaXQuIFNvIHRyZWF0IHRoYXQgYml0 IGxpa2UgdGhlCmFjdHVhbCB3YXRlcm1hcmsgbnVtYmVycyBhbmQgYXZvaWQgc2V0dGluZyBpdCB0 byAwIGltbWVkaWF0ZWx5LgoKU2lnbmVkLW9mZi1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5z eXJqYWxhQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9w bS5jIHwgMzEgKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQs IDE5IGluc2VydGlvbnMoKyksIDEyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5j CmluZGV4IDk1NGMxZmIuLjQyMGJlMmYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3BtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwpAQCAtNTA0 OCw2ICs1MDQ4LDIwIEBAIHN0YXRpYyB2b2lkIGc0eF9kaXNhYmxlX3RyaWNrbGVfZmVlZChzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2KQogCX0KIH0KIAorc3RhdGljIHZvaWQgaWxrX2luaXRfbHBfd2F0 ZXJtYXJrcyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQoreworCXN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CisKKwlJOTE1X1dSSVRFKFdNM19MUF9J TEssIEk5MTVfUkVBRChXTTNfTFBfSUxLKSAmIH5XTTFfTFBfU1JfRU4pOworCUk5MTVfV1JJVEUo V00yX0xQX0lMSywgSTkxNV9SRUFEKFdNMl9MUF9JTEspICYgfldNMV9MUF9TUl9FTik7CisJSTkx NV9XUklURShXTTFfTFBfSUxLLCBJOTE1X1JFQUQoV00xX0xQX0lMSykgJiB+V00xX0xQX1NSX0VO KTsKKworCS8qCisJICogRG9uJ3QgdG91Y2ggV00xU19MUF9FTiBoZXJlLgorCSAqIERvaW5nIHNv IGNvdWxkIGNhdXNlIHVuZGVycnVucy4KKwkgKi8KK30KKwogc3RhdGljIHZvaWQgaXJvbmxha2Vf aW5pdF9jbG9ja19nYXRpbmcoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIHsKIAlzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwpAQCAtNTA4MSw5ICs1 MDk1LDggQEAgc3RhdGljIHZvaWQgaXJvbmxha2VfaW5pdF9jbG9ja19nYXRpbmcoc3RydWN0IGRy bV9kZXZpY2UgKmRldikKIAlJOTE1X1dSSVRFKERJU1BfQVJCX0NUTCwKIAkJICAgKEk5MTVfUkVB RChESVNQX0FSQl9DVEwpIHwKIAkJICAgIERJU1BfRkJDX1dNX0RJUykpOwotCUk5MTVfV1JJVEUo V00zX0xQX0lMSywgMCk7Ci0JSTkxNV9XUklURShXTTJfTFBfSUxLLCAwKTsKLQlJOTE1X1dSSVRF KFdNMV9MUF9JTEssIDApOworCisJaWxrX2luaXRfbHBfd2F0ZXJtYXJrcyhkZXYpOwogCiAJLyoK IAkgKiBCYXNlZCBvbiB0aGUgZG9jdW1lbnQgZnJvbSBoYXJkd2FyZSBndXlzIHRoZSBmb2xsb3dp bmcgYml0cwpAQCAtNTE5MCw5ICs1MjAzLDcgQEAgc3RhdGljIHZvaWQgZ2VuNl9pbml0X2Nsb2Nr X2dhdGluZyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQlJOTE1X1dSSVRFKEdFTjZfR1RfTU9E RSwKIAkJCSAgIF9NQVNLRURfQklUX0VOQUJMRShHRU42X1REX0ZPVVJfUk9XX0RJU1BBVENIX0RJ U0FCTEUpKTsKIAotCUk5MTVfV1JJVEUoV00zX0xQX0lMSywgMCk7Ci0JSTkxNV9XUklURShXTTJf TFBfSUxLLCAwKTsKLQlJOTE1X1dSSVRFKFdNMV9MUF9JTEssIDApOworCWlsa19pbml0X2xwX3dh dGVybWFya3MoZGV2KTsKIAogCUk5MTVfV1JJVEUoQ0FDSEVfTU9ERV8wLAogCQkgICBfTUFTS0VE X0JJVF9ESVNBQkxFKENNMF9TVENfRVZJQ1RfRElTQUJMRV9MUkFfU05CKSk7CkBAIC01MzUyLDkg KzUzNjMsNyBAQCBzdGF0aWMgdm9pZCBoYXN3ZWxsX2luaXRfY2xvY2tfZ2F0aW5nKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0g ZGV2LT5kZXZfcHJpdmF0ZTsKIAotCUk5MTVfV1JJVEUoV00zX0xQX0lMSywgMCk7Ci0JSTkxNV9X UklURShXTTJfTFBfSUxLLCAwKTsKLQlJOTE1X1dSSVRFKFdNMV9MUF9JTEssIDApOworCWlsa19p bml0X2xwX3dhdGVybWFya3MoZGV2KTsKIAogCS8qIEFjY29yZGluZyB0byB0aGUgc3BlYywgYml0 IDEzIChSQ1pVTklUKSBtdXN0IGJlIHNldCBvbiBJVkIuCiAJICogVGhpcyBpbXBsZW1lbnRzIHRo ZSBXYURpc2FibGVSQ1pVbml0Q2xvY2tHYXRpbmc6aHN3IHdvcmthcm91bmQuCkBAIC01NDAzLDkg KzU0MTIsNyBAQCBzdGF0aWMgdm9pZCBpdnlicmlkZ2VfaW5pdF9jbG9ja19nYXRpbmcoc3RydWN0 IGRybV9kZXZpY2UgKmRldikKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBk ZXYtPmRldl9wcml2YXRlOwogCXVpbnQzMl90IHNucGNyOwogCi0JSTkxNV9XUklURShXTTNfTFBf SUxLLCAwKTsKLQlJOTE1X1dSSVRFKFdNMl9MUF9JTEssIDApOwotCUk5MTVfV1JJVEUoV00xX0xQ X0lMSywgMCk7CisJaWxrX2luaXRfbHBfd2F0ZXJtYXJrcyhkZXYpOwogCiAJSTkxNV9XUklURShJ TEtfRFNQQ0xLX0dBVEVfRCwgSUxLX1ZSSFVOSVRfQ0xPQ0tfR0FURV9ESVNBQkxFKTsKIAotLSAK MS44LjMuMgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K SW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0 dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK