From: Matt Roper Subject: [RFC 08/15] drm/i915: Refactor ilk_update_wm (v3) Date: Wed, 20 May 2015 19:12:20 -0700 Message-ID: <1432174347-19138-9-git-send-email-matthew.d.roper@intel.com> References: <1432174347-19138-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: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id E2EA96E80B for ; Wed, 20 May 2015 19:12:29 -0700 (PDT) In-Reply-To: <1432174347-19138-1-git-send-email-matthew.d.roper@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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClNw bGl0IGlsa191cGRhdGVfd20oKSBpbnRvIHR3byBwYXJ0czsgb25lIGRvaW5nIHRoZSBwcm9ncmFt bWluZwphbmQgdGhlIG90aGVyIHRoZSBjYWxjdWxhdGlvbnMuCgp2MjogRml4IHR5cG8gaW4gY29t bWl0IG1lc3NhZ2UKCnYzIChieSBNYXR0KTogSGVhdmlseSByZWJhc2VkIGZvciBjdXJyZW50IGNv ZGViYXNlLgoKUmV2aWV3ZWQtYnkodjIpOiBQYXVsbyBaYW5vbmkgPHBhdWxvLnIuemFub25pQGlu dGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxp bnV4LmludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogTWF0dCBSb3BlciA8bWF0dGhldy5kLnJvcGVy QGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIHwgMzYgKysr KysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMjEgaW5z ZXJ0aW9ucygrKSwgMTUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfcG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKaW5kZXgg MTNiMWNkMy4uZGJmZjI3OCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf cG0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCkBAIC0zNDQyLDI1ICsz NDQyLDE0IEBAIHNrbF91cGRhdGVfc3ByaXRlX3dtKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLCBz dHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJc2tsX3VwZGF0ZV93bShjcnRjKTsKIH0KIAotc3RhdGlj IHZvaWQgaWxrX3VwZGF0ZV93bShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCitzdGF0aWMgdm9pZCBp bGtfcHJvZ3JhbV93YXRlcm1hcmtzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikK IHsKLQlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7 Ci0Jc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSA9IHRvX2ludGVsX2NydGNfc3RhdGUo Y3J0Yy0+c3RhdGUpOwotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjLT5kZXY7Ci0Jc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKKwlzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2ID0gZGV2X3ByaXYtPmRldjsKKwlzdHJ1Y3QgaW50ZWxfcGlwZV93 bSBscF93bV8xXzIgPSB7fSwgbHBfd21fNV82ID0ge30sICpiZXN0X2xwX3dtOwogCXN0cnVjdCBp bGtfd21fbWF4aW11bXMgbWF4OworCXN0cnVjdCBpbnRlbF93bV9jb25maWcgY29uZmlnID0ge307 CiAJc3RydWN0IGlsa193bV92YWx1ZXMgcmVzdWx0cyA9IHt9OwogCWVudW0gaW50ZWxfZGRiX3Bh cnRpdGlvbmluZyBwYXJ0aXRpb25pbmc7Ci0Jc3RydWN0IGludGVsX3BpcGVfd20gcGlwZV93bSA9 IHt9OwotCXN0cnVjdCBpbnRlbF9waXBlX3dtIGxwX3dtXzFfMiA9IHt9LCBscF93bV81XzYgPSB7 fSwgKmJlc3RfbHBfd207Ci0Jc3RydWN0IGludGVsX3dtX2NvbmZpZyBjb25maWcgPSB7fTsKLQot CWludGVsX2NvbXB1dGVfcGlwZV93bShjc3RhdGUsICZwaXBlX3dtKTsKLQotCWlmICghbWVtY21w KCZpbnRlbF9jcnRjLT53bS5hY3RpdmUsICZwaXBlX3dtLCBzaXplb2YocGlwZV93bSkpKQotCQly ZXR1cm47Ci0KLQlpbnRlbF9jcnRjLT53bS5hY3RpdmUgPSBwaXBlX3dtOwogCiAJaWxrX2NvbXB1 dGVfd21fY29uZmlnKGRldiwgJmNvbmZpZyk7CiAKQEAgLTM0ODYsNiArMzQ3NSwyMyBAQCBzdGF0 aWMgdm9pZCBpbGtfdXBkYXRlX3dtKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAlpbGtfd3JpdGVf d21fdmFsdWVzKGRldl9wcml2LCAmcmVzdWx0cyk7CiB9CiAKK3N0YXRpYyB2b2lkIGlsa191cGRh dGVfd20oc3RydWN0IGRybV9jcnRjICpjcnRjKQoreworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiA9IHRvX2k5MTUoY3J0Yy0+ZGV2KTsKKwlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50 ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7CisJc3RydWN0IGludGVsX2NydGNfc3RhdGUg KmNzdGF0ZSA9IHRvX2ludGVsX2NydGNfc3RhdGUoY3J0Yy0+c3RhdGUpOworCXN0cnVjdCBpbnRl bF9waXBlX3dtIHBpcGVfd20gPSB7fTsKKworCWludGVsX2NvbXB1dGVfcGlwZV93bShjc3RhdGUs ICZwaXBlX3dtKTsKKworCWlmICghbWVtY21wKCZpbnRlbF9jcnRjLT53bS5hY3RpdmUsICZwaXBl X3dtLCBzaXplb2YocGlwZV93bSkpKQorCQlyZXR1cm47CisKKwlpbnRlbF9jcnRjLT53bS5hY3Rp dmUgPSBwaXBlX3dtOworCisJaWxrX3Byb2dyYW1fd2F0ZXJtYXJrcyhkZXZfcHJpdik7Cit9CisK IHN0YXRpYyB2b2lkCiBpbGtfdXBkYXRlX3Nwcml0ZV93bShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFu ZSwKIAkJICAgICBzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCi0tIAoxLjguNS4xCgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBs aXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNr dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=