From mboxrd@z Thu Jan  1 00:00:00 1970
From: ville.syrjala@linux.intel.com
Subject: [PATCH 4.11] drm/i915: Do .init_clock_gating() earlier
	to avoid it clobbering watermarks
Date: Wed, 15 Mar 2017 16:31:58 +0200
Message-ID: <20170315143158.31780-1-ville.syrjala@linux.intel.com>
References: <87lgs9dugv.fsf@intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga07.intel.com (mga07.intel.com [134.134.136.100])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 20FC66E8DC
 for <intel-gfx@lists.freedesktop.org>; Wed, 15 Mar 2017 14:32:02 +0000 (UTC)
In-Reply-To: <87lgs9dugv.fsf@intel.com>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: intel-gfx@lists.freedesktop.org
Cc: Jani Nikula <jani.nikula@intel.com>
List-Id: intel-gfx@lists.freedesktop.org

RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCkN1
cnJlbnRseSBJTEstQkRXIGV4cGxpY2l0bHkgZGlzYWJsZSBMUDErIHdhdGVybWFya3MgZnJvbSB0
aGVpcgouaW5pdF9jbG9ja19nYXRpbmcoKSBob29rcy4gVW5mb3J0dW5hdGVseSB0aGF0IGhvb2sg
Z2V0cyBjYWxsZWQgd2F5IHRvbwpsYXRlIHNpbmNlIGJ5IHRoYXQgdGltZSB3ZSd2ZSBhbHJlYWR5
IGluaXRpYWxpemVkIGFsbCB0aGUgd2F0ZXJtYXJrCnN0YXRlIHRyYWNraW5nIHdoaWNoIHRoZW4g
Z2V0cyBvdXQgb2Ygc3luYyB3aXRoIHRoZSBoYXJkd2FyZSBzdGF0ZS4KCldlIG1heSBldmVudHVh
bGx5IHdhbnQgdG8gY29uc2lkZXIga2lsbGluZyBvZmYgdGhlIGV4cGxpY2l0IExQMSsKZGlzYWJs
ZSBmcm9tIC5pbml0X2Nsb2NrX2dhdGluZygpLiBJbiB0aGUgbWVhbnRpbWUgaG93ZXZlciwgd2Ug
Y2FuCmF2b2lkIHRoZSBwcm9ibGVtIGJ5IHJlb3JkZXJpbmcgdGhlIGluaXQgc2VxdWVuY2Ugc3Vj
aCB0aGF0CmludGVsX21vZGVzZXRfaW5pdF9odygpLT5pbnRlbF9pbml0X2Nsb2NrX2dhdGluZygp
IGdldHMgY2FsbGVkCnByaW9yIHRvIHRoZSBoYXJkd2FyZSBzdGF0ZSB0YWtlb3Zlci4KCkkgc3Vw
cG9zZSBwcmlvciB0byB0aGUgdHdvIHN0YWdlIHdhdGVybWFyayBwcm9ncmFtbWluZyB3ZSB3ZXJl
Cm1hZ2ljYWxseSBzYXZlZCBieSBzb21ldGhpbmcgdGhhdCBmb3JjZWQgdGhlIHdhdGVybWFya3Mg
dG8gYmUKcmVwcm9ncmFtbWVkIGZ1bGx5IGFmdGVyIC5pbml0X2Nsb2NrX2dhdGluZygpIGdvdCBj
YWxsZWQuIEJ1dApub3cgdGhhdCBubyBsb25nZXIgaGFwcGVucy4KCk5vdGUgdGhhdCB0aGUgZGlm
ZiBtaWdodCBsb29rIGEgYml0IG9kZCBhcyBpdCBraWxscyBvZmYgb25lCmNhbGwgb2YgaW50ZWxf
dXBkYXRlX2NkY2xrKCksIGJ1dCB0aGF0J3MgZmluZSBiZWNhdXNlCmludGVsX21vZGVzZXRfaW5p
dF9odygpIGRvZXMgdGhlIGV4YWN0IHNhbWUgdGhpbmcuIFByZXZpb3VzbHkKd2UganVzdCBkaWQg
aXQgdHdpY2UuCgpBY3R1YWxseSBldmVuIHRoaXMgbmV3IGluaXQgc2VxdWVuY2UgaXMgcHJldHR5
IGJvZ3VzIGFzCi5pbml0X2Nsb2NrX2dhdGluZygpIHJlYWxseSBzaG91bGQgYmUgY2FsbGVkIGJl
Zm9yZSBhbnkgZ2VtCmhhcmR3YXJlIGluaXQgc2luY2UgaXQgY2FuICBjb25maWd1cmUgdmFyaW91
cyBjbG9jayBnYXRpbmcKd29ya2Fyb3VuZHMgYW5kIHdoYXRub3QgdGhhdCBhZmZlY3QgdGhlIEdU
IHNpZGUgYXMgd2VsbC4gQWxzbwppbnRlbF9tb2Rlc2V0X2luaXQoKSByZWFsbHkgc2hvdWxkIGdl
dCBzcGxpdCB1cCBpbnRvIGJldHRlcgpkZWZpbmVkIGluaXQgc3RhZ2VzLiBBbm90aGVyICJmdW4i
IGRldGFpbCBpcyB0aGF0CmludGVsX21vZGVzZXRfZ2VtX2luaXQoKSBpcyB3aGVyZSBSUFMvUkM2
IGdldHMgY29uZmlndXJlZC4KV2h5IHRoYXQgaXMgZG9uZSBmcm9tIHRoZSBkaXNwbGF5IGNvZGUg
aXMgYmV5b25kIG1lLiBJJ3ZlCmRlY2lkZWQgdG8gbGVhdmUgYWxsIHRoaXMgYmUgZm9yIG5vdywg
YW5kIGp1c3QgdHJ5IHRvIGZpeAp0aGUgaW5pdCBzZXF1ZW5jZSBlbm91Z2ggZm9yIHdhdGVybWFy
a3MgdG8gd29yay4KCkNjOiBzdGFibGVAdmdlci5rZXJuZWwub3JnCkNjOiBHYWJyaWVsZSBNYXp6
b3R0YSA8Z2FicmllbGUubXp0QGdtYWlsLmNvbT4KQ2M6IERhdmlkIFB1cnRvbiA8ZGNwdXJ0b25A
bWFyc2h3aWdnbGUubmV0PgpDYzogTWF0dCBSb3BlciA8bWF0dGhldy5kLnJvcGVyQGludGVsLmNv
bT4KQ2M6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5j
b20+ClJlcG9ydGVkLWJ5OiBHYWJyaWVsZSBNYXp6b3R0YSA8Z2FicmllbGUubXp0QGdtYWlsLmNv
bT4KUmVwb3J0ZWQtYnk6IERhdmlkIFB1cnRvbiA8ZGNwdXJ0b25AbWFyc2h3aWdnbGUubmV0PgpU
ZXN0ZWQtYnk6IEdhYnJpZWxlIE1henpvdHRhIDxnYWJyaWVsZS5tenRAZ21haWwuY29tPgpCdWd6
aWxsYTogaHR0cHM6Ly9idWdzLmZyZWVkZXNrdG9wLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTY2NDUK
Rml4ZXM6IGVkNGE2YTdjYTg1MyAoImRybS9pOTE1OiBBZGQgdHdvLXN0YWdlIElMSy1zdHlsZSB3
YXRlcm1hcmsgcHJvZ3JhbW1pbmcgKHYxMSkiKQpTaWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJqw6Rs
w6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgpMaW5rOiBodHRwOi8vcGF0Y2h3b3Jr
LmZyZWVkZXNrdG9wLm9yZy9wYXRjaC9tc2dpZC8yMDE3MDIyMDE0MDQ0My4zMDg5MS0xLXZpbGxl
LnN5cmphbGFAbGludXguaW50ZWwuY29tClJldmlld2VkLWJ5OiBEYW5pZWwgVmV0dGVyIDxkYW5p
ZWwudmV0dGVyQGZmd2xsLmNoPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3Bs
YXkuYyB8IDkgKysrLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMyBpbnNlcnRpb25zKCspLCA2IGRl
bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3Bs
YXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCAwMTM0MTY3
MDczOGYuLjcwYmU3NzNiM2U3MCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50
ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpA
QCAtMTY2OTYsMTIgKzE2Njk2LDExIEBAIGludCBpbnRlbF9tb2Rlc2V0X2luaXQoc3RydWN0IGRy
bV9kZXZpY2UgKmRldikKIAkJfQogCX0KIAotCWludGVsX3VwZGF0ZV9jemNsayhkZXZfcHJpdik7
Ci0JaW50ZWxfdXBkYXRlX2NkY2xrKGRldl9wcml2KTsKLQlkZXZfcHJpdi0+YXRvbWljX2NkY2xr
X2ZyZXEgPSBkZXZfcHJpdi0+Y2RjbGtfZnJlcTsKLQogCWludGVsX3NoYXJlZF9kcGxsX2luaXQo
ZGV2KTsKIAorCWludGVsX3VwZGF0ZV9jemNsayhkZXZfcHJpdik7CisJaW50ZWxfbW9kZXNldF9p
bml0X2h3KGRldik7CisKIAlpZiAoZGV2X3ByaXYtPm1heF9jZGNsa19mcmVxID09IDApCiAJCWlu
dGVsX3VwZGF0ZV9tYXhfY2RjbGsoZGV2X3ByaXYpOwogCkBAIC0xNzI1OCw4ICsxNzI1Nyw2IEBA
IHZvaWQgaW50ZWxfbW9kZXNldF9nZW1faW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCiAJ
aW50ZWxfaW5pdF9ndF9wb3dlcnNhdmUoZGV2X3ByaXYpOwogCi0JaW50ZWxfbW9kZXNldF9pbml0
X2h3KGRldik7Ci0KIAlpbnRlbF9zZXR1cF9vdmVybGF5KGRldl9wcml2KTsKIH0KIAotLSAKMi4x
MC4yCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRl
bC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6
Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK