From mboxrd@z Thu Jan  1 00:00:00 1970
From: Matt Roper <matthew.d.roper@intel.com>
Subject: [RFC 4/8] drm/i915: Refactor ilk_update_wm (v3)
Date: Wed,  1 Jul 2015 19:25:57 -0700
Message-ID: <1435803961-30079-5-git-send-email-matthew.d.roper@intel.com>
References: <1435803961-30079-1-git-send-email-matthew.d.roper@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 mga09.intel.com (mga09.intel.com [134.134.136.24])
 by gabe.freedesktop.org (Postfix) with ESMTP id 8BEF86E416
 for <intel-gfx@lists.freedesktop.org>; Wed,  1 Jul 2015 19:26:46 -0700 (PDT)
In-Reply-To: <1435803961-30079-1-git-send-email-matthew.d.roper@intel.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://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: <http://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
List-Id: intel-gfx@lists.freedesktop.org

RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClNw
bGl0IGlsa191cGRhdGVfd20oKSBpbnRvIHR3byBwYXJ0czsgb25lIGRvaW5nIHRoZSBwcm9ncmFt
bWluZwphbmQgdGhlIG90aGVyIHRoZSBjYWxjdWxhdGlvbnMuCgp2MjogRml4IHR5cG8gaW4gY29t
bWl0IG1lc3NhZ2UKCnYzIChieSBNYXR0KTogSGVhdmlseSByZWJhc2VkIGZvciBjdXJyZW50IGNv
ZGViYXNlLgoKUmV2aWV3ZWQtYnkodjIpOiBQYXVsbyBaYW5vbmkgPHBhdWxvLnIuemFub25pQGlu
dGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxp
bnV4LmludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogTWF0dCBSb3BlciA8bWF0dGhldy5kLnJvcGVy
QGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIHwgNjAgKysr
KysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAz
MyBpbnNlcnRpb25zKCspLCAyNyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw
dS9kcm0vaTkxNS9pbnRlbF9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwpp
bmRleCBkMDYxZmNkLi40NGUzNjFjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p
bnRlbF9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKQEAgLTM3MDgs
MzcgKzM3MDgsMTQgQEAgc2tsX3VwZGF0ZV9zcHJpdGVfd20oc3RydWN0IGRybV9wbGFuZSAqcGxh
bmUsIHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAlza2xfdXBkYXRlX3dtKGNydGMpOwogfQogCi1z
dGF0aWMgdm9pZCBpbGtfdXBkYXRlX3dtKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKK3N0YXRpYyB2
b2lkIGlsa19wcm9ncmFtX3dhdGVybWFya3Moc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w
cml2KQogewotCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0Yyhj
cnRjKTsKLQlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlID0gdG9faW50ZWxfY3J0Y19z
dGF0ZShjcnRjLT5zdGF0ZSk7Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmRldjsK
LQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwor
CXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBkZXZfcHJpdi0+ZGV2OworCXN0cnVjdCBpbnRlbF9w
aXBlX3dtIGxwX3dtXzFfMiA9IHt9LCBscF93bV81XzYgPSB7fSwgKmJlc3RfbHBfd207CiAJc3Ry
dWN0IGlsa193bV9tYXhpbXVtcyBtYXg7CisJc3RydWN0IGludGVsX3dtX2NvbmZpZyBjb25maWcg
PSB7fTsKIAlzdHJ1Y3QgaWxrX3dtX3ZhbHVlcyByZXN1bHRzID0ge307CiAJZW51bSBpbnRlbF9k
ZGJfcGFydGl0aW9uaW5nIHBhcnRpdGlvbmluZzsKLQlzdHJ1Y3QgaW50ZWxfcGlwZV93bSBwaXBl
X3dtID0ge307Ci0Jc3RydWN0IGludGVsX3BpcGVfd20gbHBfd21fMV8yID0ge30sIGxwX3dtXzVf
NiA9IHt9LCAqYmVzdF9scF93bTsKLQlzdHJ1Y3QgaW50ZWxfd21fY29uZmlnIGNvbmZpZyA9IHt9
OwotCi0JLyoKLQkgKiBJVkIgd29ya2Fyb3VuZDogbXVzdCBkaXNhYmxlIGxvdyBwb3dlciB3YXRl
cm1hcmtzIGZvciBhdCBsZWFzdAotCSAqIG9uZSBmcmFtZSBiZWZvcmUgZW5hYmxpbmcgc2NhbGlu
Zy4gIExQIHdhdGVybWFya3MgY2FuIGJlIHJlLWVuYWJsZWQKLQkgKiB3aGVuIHNjYWxpbmcgaXMg
ZGlzYWJsZWQuCi0JICoKLQkgKiBXYUN4U1JEaXNhYmxlZEZvclNwcml0ZVNjYWxpbmc6aXZiCi0J
ICovCi0JaWYgKGNzdGF0ZS0+ZGlzYWJsZV9scF93bSkgewotCQlpbGtfZGlzYWJsZV9scF93bShk
ZXYpOwotCQlpbnRlbF93YWl0X2Zvcl92YmxhbmsoZGV2LCBpbnRlbF9jcnRjLT5waXBlKTsKLQl9
Ci0KLQlpbnRlbF9jb21wdXRlX3BpcGVfd20oY3N0YXRlLCAmcGlwZV93bSk7Ci0KLQlpZiAoIW1l
bWNtcCgmaW50ZWxfY3J0Yy0+d20uYWN0aXZlLCAmcGlwZV93bSwgc2l6ZW9mKHBpcGVfd20pKSkK
LQkJcmV0dXJuOwotCi0JaW50ZWxfY3J0Yy0+d20uYWN0aXZlID0gcGlwZV93bTsKIAogCWlsa19j
b21wdXRlX3dtX2NvbmZpZyhkZXYsICZjb25maWcpOwogCkBAIC0zNzY0LDYgKzM3NDEsMzUgQEAg
c3RhdGljIHZvaWQgaWxrX3VwZGF0ZV93bShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJaWxrX3dy
aXRlX3dtX3ZhbHVlcyhkZXZfcHJpdiwgJnJlc3VsdHMpOwogfQogCitzdGF0aWMgdm9pZCBpbGtf
dXBkYXRlX3dtKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKK3sKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJp
dmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGNydGMtPmRldik7CisJc3RydWN0IGludGVsX2NydGMg
KmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOworCXN0cnVjdCBpbnRlbF9jcnRjX3N0
YXRlICpjc3RhdGUgPSB0b19pbnRlbF9jcnRjX3N0YXRlKGNydGMtPnN0YXRlKTsKKwlzdHJ1Y3Qg
aW50ZWxfcGlwZV93bSBwaXBlX3dtID0ge307CisKKwkvKgorCSAqIElWQiB3b3JrYXJvdW5kOiBt
dXN0IGRpc2FibGUgbG93IHBvd2VyIHdhdGVybWFya3MgZm9yIGF0IGxlYXN0CisJICogb25lIGZy
YW1lIGJlZm9yZSBlbmFibGluZyBzY2FsaW5nLiAgTFAgd2F0ZXJtYXJrcyBjYW4gYmUgcmUtZW5h
YmxlZAorCSAqIHdoZW4gc2NhbGluZyBpcyBkaXNhYmxlZC4KKwkgKgorCSAqIFdhQ3hTUkRpc2Fi
bGVkRm9yU3ByaXRlU2NhbGluZzppdmIKKwkgKi8KKwlpZiAoY3N0YXRlLT5kaXNhYmxlX2xwX3dt
KSB7CisJCWlsa19kaXNhYmxlX2xwX3dtKGNydGMtPmRldik7CisJCWludGVsX3dhaXRfZm9yX3Zi
bGFuayhjcnRjLT5kZXYsIGludGVsX2NydGMtPnBpcGUpOworCX0KKworCWludGVsX2NvbXB1dGVf
cGlwZV93bShjc3RhdGUsICZwaXBlX3dtKTsKKworCWlmICghbWVtY21wKCZpbnRlbF9jcnRjLT53
bS5hY3RpdmUsICZwaXBlX3dtLCBzaXplb2YocGlwZV93bSkpKQorCQlyZXR1cm47CisKKwlpbnRl
bF9jcnRjLT53bS5hY3RpdmUgPSBwaXBlX3dtOworCisJaWxrX3Byb2dyYW1fd2F0ZXJtYXJrcyhk
ZXZfcHJpdik7Cit9CisKIHN0YXRpYyB2b2lkIHNrbF9waXBlX3dtX2FjdGl2ZV9zdGF0ZSh1aW50
MzJfdCB2YWwsCiAJCQkJICAgICBzdHJ1Y3Qgc2tsX3BpcGVfd20gKmFjdGl2ZSwKIAkJCQkgICAg
IGJvb2wgaXNfdHJhbnN3bSwKLS0gCjIuMS40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0
cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xp
c3RpbmZvL2ludGVsLWdmeAo=