From: ville.syrjala@linux.intel.com Subject: [PATCH 11/18] drm/i915: Only use update_wm_{pre, post} for pre-ilk platforms Date: Thu, 16 Feb 2017 20:07:44 +0200 Message-ID: <20170216180751.3097-12-ville.syrjala@linux.intel.com> References: <20170216180751.3097-1-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 353FA6EC0C for ; Thu, 16 Feb 2017 18:08:28 +0000 (UTC) In-Reply-To: <20170216180751.3097-1-ville.syrjala@linux.intel.com> 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 List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCk5v dyB0aGF0IHZsdi9jaHYgaGF2ZSBtb3JlIHByb3BlciB3bSBwcm9ncmFtbWluZyBzdXBwb3J0LCBs ZXQncyByZWR1Y2UKdGhlIHRoZSB1cGRhdGVfd21fe3ByZSxwb3N0fSBmbGFncyB0byBvbmx5IGNv dmVyIHRoZSBwcmUtaWxrIHBsYXRmb3Jtcy4KV2hlbiB3ZSBmaW5hbGx5IGNvbnZlcnQgdGhvc2Ug YXMgd2VsbCB3ZSBjYW4gZHJvcCB0aGVzZSBmbGFncyBlbnRpcmVseS4KClNpZ25lZC1vZmYtYnk6 IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgMTQgKysrKysrKysrLS0tLS0KIDEg ZmlsZSBjaGFuZ2VkLCA5IGluc2VydGlvbnMoKyksIDUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IDgyMTM1MTAxZmFhZS4uYThmMjhlNzc2ODc5IDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0xMDk0MiwyMSArMTA5NDIsMjUg QEAgaW50IGludGVsX3BsYW5lX2F0b21pY19jYWxjX2NoYW5nZXMoc3RydWN0IGRybV9jcnRjX3N0 YXRlICpjcnRjX3N0YXRlLAogCQkJIHR1cm5fb2ZmLCB0dXJuX29uLCBtb2RlX2NoYW5nZWQpOwog CiAJaWYgKHR1cm5fb24pIHsKLQkJcGlwZV9jb25maWctPnVwZGF0ZV93bV9wcmUgPSB0cnVlOwor CQlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA8IDUpCisJCQlwaXBlX2NvbmZpZy0+dXBkYXRlX3dt X3ByZSA9IHRydWU7CiAKIAkJLyogbXVzdCBkaXNhYmxlIGN4c3IgYXJvdW5kIHBsYW5lIGVuYWJs ZS9kaXNhYmxlICovCiAJCWlmIChwbGFuZS0+aWQgIT0gUExBTkVfQ1VSU09SKQogCQkJcGlwZV9j b25maWctPmRpc2FibGVfY3hzciA9IHRydWU7CiAJfSBlbHNlIGlmICh0dXJuX29mZikgewotCQlw aXBlX2NvbmZpZy0+dXBkYXRlX3dtX3Bvc3QgPSB0cnVlOworCQlpZiAoSU5URUxfR0VOKGRldl9w cml2KSA8IDUpCisJCQlwaXBlX2NvbmZpZy0+dXBkYXRlX3dtX3Bvc3QgPSB0cnVlOwogCiAJCS8q IG11c3QgZGlzYWJsZSBjeHNyIGFyb3VuZCBwbGFuZSBlbmFibGUvZGlzYWJsZSAqLwogCQlpZiAo cGxhbmUtPmlkICE9IFBMQU5FX0NVUlNPUikKIAkJCXBpcGVfY29uZmlnLT5kaXNhYmxlX2N4c3Ig PSB0cnVlOwogCX0gZWxzZSBpZiAoaW50ZWxfd21fbmVlZF91cGRhdGUoJnBsYW5lLT5iYXNlLCBw bGFuZV9zdGF0ZSkpIHsKLQkJLyogRklYTUUgYm9sbG9ja3MgKi8KLQkJcGlwZV9jb25maWctPnVw ZGF0ZV93bV9wcmUgPSB0cnVlOwotCQlwaXBlX2NvbmZpZy0+dXBkYXRlX3dtX3Bvc3QgPSB0cnVl OworCQlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA8IDUpIHsKKwkJCS8qIEZJWE1FIGJvbGxvY2tz ICovCisJCQlwaXBlX2NvbmZpZy0+dXBkYXRlX3dtX3ByZSA9IHRydWU7CisJCQlwaXBlX2NvbmZp Zy0+dXBkYXRlX3dtX3Bvc3QgPSB0cnVlOworCQl9CiAJfQogCiAJaWYgKHZpc2libGUgfHwgd2Fz X3Zpc2libGUpCi0tIAoyLjEwLjIKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVk ZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZv L2ludGVsLWdmeAo=