From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matt Roper Subject: [PATCH 09/14] drm/i915: Refactor ilk_update_wm (v3) Date: Mon, 14 Sep 2015 19:19:25 -0700 Message-ID: <1442283570-26824-10-git-send-email-matthew.d.roper@intel.com> References: <1442283570-26824-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 mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id E508B6E97D for ; Mon, 14 Sep 2015 19:20:06 -0700 (PDT) In-Reply-To: <1442283570-26824-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 ZGViYXNlLgoKU2lnbmVkLW9mZi1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxp bnV4LmludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogTWF0dCBSb3BlciA8bWF0dGhldy5kLnJvcGVy QGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIHwgNjQgKysr KysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAz NSBpbnNlcnRpb25zKCspLCAyOSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwpp bmRleCAzZjllMGUyLi4yMGQ5MWJkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKQEAgLTM2NzEs MzkgKzM2NzEsMTQgQEAgc3RhdGljIHZvaWQgc2tsX3VwZGF0ZV93bShzdHJ1Y3QgZHJtX2NydGMg KmNydGMpCiAJZGV2X3ByaXYtPndtLnNrbF9odyA9ICpyZXN1bHRzOwogfQogCi1zdGF0aWMgdm9p ZCBpbGtfdXBkYXRlX3dtKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKK3N0YXRpYyB2b2lkIGlsa19w cm9ncmFtX3dhdGVybWFya3Moc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewot CXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKLQlz dHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlID0gdG9faW50ZWxfY3J0Y19zdGF0ZShjcnRj LT5zdGF0ZSk7Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmRldjsKLQlzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOworCXN0cnVjdCBk cm1fZGV2aWNlICpkZXYgPSBkZXZfcHJpdi0+ZGV2OworCXN0cnVjdCBpbnRlbF9waXBlX3dtIGxw X3dtXzFfMiA9IHt9LCBscF93bV81XzYgPSB7fSwgKmJlc3RfbHBfd207CiAJc3RydWN0IGlsa193 bV9tYXhpbXVtcyBtYXg7CisJc3RydWN0IGludGVsX3dtX2NvbmZpZyBjb25maWcgPSB7fTsKIAlz dHJ1Y3QgaWxrX3dtX3ZhbHVlcyByZXN1bHRzID0ge307CiAJZW51bSBpbnRlbF9kZGJfcGFydGl0 aW9uaW5nIHBhcnRpdGlvbmluZzsKLQlzdHJ1Y3QgaW50ZWxfcGlwZV93bSBwaXBlX3dtID0ge307 Ci0Jc3RydWN0IGludGVsX3BpcGVfd20gbHBfd21fMV8yID0ge30sIGxwX3dtXzVfNiA9IHt9LCAq YmVzdF9scF93bTsKLQlzdHJ1Y3QgaW50ZWxfd21fY29uZmlnIGNvbmZpZyA9IHt9OwotCi0JV0FS Tl9PTihjc3RhdGUtPmJhc2UuYWN0aXZlICE9IGludGVsX2NydGMtPmFjdGl2ZSk7Ci0KLQkvKgot CSAqIElWQiB3b3JrYXJvdW5kOiBtdXN0IGRpc2FibGUgbG93IHBvd2VyIHdhdGVybWFya3MgZm9y IGF0IGxlYXN0Ci0JICogb25lIGZyYW1lIGJlZm9yZSBlbmFibGluZyBzY2FsaW5nLiAgTFAgd2F0 ZXJtYXJrcyBjYW4gYmUgcmUtZW5hYmxlZAotCSAqIHdoZW4gc2NhbGluZyBpcyBkaXNhYmxlZC4K LQkgKgotCSAqIFdhQ3hTUkRpc2FibGVkRm9yU3ByaXRlU2NhbGluZzppdmIKLQkgKi8KLQlpZiAo Y3N0YXRlLT5kaXNhYmxlX2xwX3dtKSB7Ci0JCWlsa19kaXNhYmxlX2xwX3dtKGRldik7Ci0JCWlu dGVsX3dhaXRfZm9yX3ZibGFuayhkZXYsIGludGVsX2NydGMtPnBpcGUpOwotCX0KLQotCWludGVs X2NvbXB1dGVfcGlwZV93bShjc3RhdGUsICZwaXBlX3dtKTsKLQotCWlmICghbWVtY21wKCZpbnRl bF9jcnRjLT53bS5hY3RpdmUsICZwaXBlX3dtLCBzaXplb2YocGlwZV93bSkpKQotCQlyZXR1cm47 Ci0KLQlpbnRlbF9jcnRjLT53bS5hY3RpdmUgPSBwaXBlX3dtOwogCiAJaWxrX2NvbXB1dGVfd21f Y29uZmlnKGRldiwgJmNvbmZpZyk7CiAKQEAgLTM3MjksNiArMzcwNCwzNyBAQCBzdGF0aWMgdm9p ZCBpbGtfdXBkYXRlX3dtKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAlpbGtfd3JpdGVfd21fdmFs dWVzKGRldl9wcml2LCAmcmVzdWx0cyk7CiB9CiAKK3N0YXRpYyB2b2lkIGlsa191cGRhdGVfd20o c3RydWN0IGRybV9jcnRjICpjcnRjKQoreworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiA9IHRvX2k5MTUoY3J0Yy0+ZGV2KTsKKwlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0 YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7CisJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0 ZSA9IHRvX2ludGVsX2NydGNfc3RhdGUoY3J0Yy0+c3RhdGUpOworCXN0cnVjdCBpbnRlbF9waXBl X3dtIHBpcGVfd20gPSB7fTsKKworCVdBUk5fT04oY3N0YXRlLT5iYXNlLmFjdGl2ZSAhPSBpbnRl bF9jcnRjLT5hY3RpdmUpOworCisJLyoKKwkgKiBJVkIgd29ya2Fyb3VuZDogbXVzdCBkaXNhYmxl IGxvdyBwb3dlciB3YXRlcm1hcmtzIGZvciBhdCBsZWFzdAorCSAqIG9uZSBmcmFtZSBiZWZvcmUg ZW5hYmxpbmcgc2NhbGluZy4gIExQIHdhdGVybWFya3MgY2FuIGJlIHJlLWVuYWJsZWQKKwkgKiB3 aGVuIHNjYWxpbmcgaXMgZGlzYWJsZWQuCisJICoKKwkgKiBXYUN4U1JEaXNhYmxlZEZvclNwcml0 ZVNjYWxpbmc6aXZiCisJICovCisJaWYgKGNzdGF0ZS0+ZGlzYWJsZV9scF93bSkgeworCQlpbGtf ZGlzYWJsZV9scF93bShjcnRjLT5kZXYpOworCQlpbnRlbF93YWl0X2Zvcl92YmxhbmsoY3J0Yy0+ ZGV2LCBpbnRlbF9jcnRjLT5waXBlKTsKKwl9CisKKwlpbnRlbF9jb21wdXRlX3BpcGVfd20oY3N0 YXRlLCAmcGlwZV93bSk7CisKKwlpZiAoIW1lbWNtcCgmaW50ZWxfY3J0Yy0+d20uYWN0aXZlLCAm cGlwZV93bSwgc2l6ZW9mKHBpcGVfd20pKSkKKwkJcmV0dXJuOworCisJaW50ZWxfY3J0Yy0+d20u YWN0aXZlID0gcGlwZV93bTsKKworCWlsa19wcm9ncmFtX3dhdGVybWFya3MoZGV2X3ByaXYpOwor fQorCiBzdGF0aWMgdm9pZCBza2xfcGlwZV93bV9hY3RpdmVfc3RhdGUodWludDMyX3QgdmFsLAog CQkJCSAgICAgc3RydWN0IHNrbF9waXBlX3dtICphY3RpdmUsCiAJCQkJICAgICBib29sIGlzX3Ry YW5zd20sCi0tIAoyLjEuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRl bC1nZngK