From: ville.syrjala@linux.intel.com Subject: [PATCH 3/7] drm/i915: Eliminate obj->state usage in g4x/vlv/chv wm computation Date: Wed, 23 Aug 2017 18:22:22 +0300 Message-ID: <20170823152226.22938-3-ville.syrjala@linux.intel.com> References: <20170823152226.22938-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 195866E5BF for ; Wed, 23 Aug 2017 15:22:39 +0000 (UTC) In-Reply-To: <20170823152226.22938-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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClVz ZSBleHBsaWNpdCBvbGQvbmV3IHN0YXRlcyBpbnN0ZWFkIG9mIHJlbHlpbmcgb24gb2JqLT5zdGF0 ZS4KClJldmlld2VkLWJ5OiBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGlu dXguaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmph bGFAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2Lmgg IHwgIDkgKysrKysrKysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCB8ICA4ICsr KysrKysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jICB8IDMwICsrKysrKysrKysr KysrKy0tLS0tLS0tLS0tLS0tLQogMyBmaWxlcyBjaGFuZ2VkLCAzMiBpbnNlcnRpb25zKCspLCAx NSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry di5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCA3NTg3ZWY1MzAyNmIu LjEwNzJmYmQ3MGVhZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYu aAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC01NjksNiArNTY5LDE1 IEBAIHN0cnVjdCBpOTE1X2hvdHBsdWcgewogCSAgICAgKF9faSkrKykgXAogCQlmb3JfZWFjaF9p ZiAocGxhbmVfc3RhdGUpCiAKKyNkZWZpbmUgZm9yX2VhY2hfb2xkbmV3X2ludGVsX3BsYW5lX2lu X3N0YXRlKF9fc3RhdGUsIHBsYW5lLCBvbGRfcGxhbmVfc3RhdGUsIG5ld19wbGFuZV9zdGF0ZSwg X19pKSBcCisJZm9yICgoX19pKSA9IDA7IFwKKwkgICAgIChfX2kpIDwgKF9fc3RhdGUpLT5iYXNl LmRldi0+bW9kZV9jb25maWcubnVtX3RvdGFsX3BsYW5lICYmIFwKKwkJICAgICAoKHBsYW5lKSA9 IHRvX2ludGVsX3BsYW5lKChfX3N0YXRlKS0+YmFzZS5wbGFuZXNbX19pXS5wdHIpLCBcCisJCSAg ICAgIChvbGRfcGxhbmVfc3RhdGUpID0gdG9faW50ZWxfcGxhbmVfc3RhdGUoKF9fc3RhdGUpLT5i YXNlLnBsYW5lc1tfX2ldLm9sZF9zdGF0ZSksIFwKKwkJICAgICAgKG5ld19wbGFuZV9zdGF0ZSkg PSB0b19pbnRlbF9wbGFuZV9zdGF0ZSgoX19zdGF0ZSktPmJhc2UucGxhbmVzW19faV0ubmV3X3N0 YXRlKSwgMSk7IFwKKwkgICAgIChfX2kpKyspIFwKKwkJZm9yX2VhY2hfaWYgKHBsYW5lKQorCiBz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZTsKIHN0cnVjdCBpOTE1X21tX3N0cnVjdDsKIHN0cnVjdCBp OTE1X21tdV9vYmplY3Q7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k cnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCmluZGV4IDlhN2M3ZGQwZWE4 NC4uZTJlOWI4MjE1ODY0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k cnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtMTE5MSw2ICsx MTkxLDE0IEBAIGhkbWlfdG9fZGlnX3BvcnQoc3RydWN0IGludGVsX2hkbWkgKmludGVsX2hkbWkp CiB9CiAKIHN0YXRpYyBpbmxpbmUgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKgoraW50ZWxfYXRv bWljX2dldF9vbGRfY3J0Y19zdGF0ZShzdHJ1Y3QgaW50ZWxfYXRvbWljX3N0YXRlICpzdGF0ZSwK KwkJCQlzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKK3sKKwlyZXR1cm4gdG9faW50ZWxfY3J0Y19z dGF0ZShkcm1fYXRvbWljX2dldF9vbGRfY3J0Y19zdGF0ZSgmc3RhdGUtPmJhc2UsCisJCQkJCQkJ CSAmY3J0Yy0+YmFzZSkpOworfQorCitzdGF0aWMgaW5saW5lIHN0cnVjdCBpbnRlbF9jcnRjX3N0 YXRlICoKIGludGVsX2F0b21pY19nZXRfbmV3X2NydGNfc3RhdGUoc3RydWN0IGludGVsX2F0b21p Y19zdGF0ZSAqc3RhdGUsCiAJCQkJc3RydWN0IGludGVsX2NydGMgKmNydGMpCiB7CmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfcG0uYwppbmRleCBkNWZmMGI5Zjk5OWYuLmI5Y2JjNWZlYzkwOSAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9wbS5jCkBAIC0xMzIyLDIxICsxMzIyLDIxIEBAIHN0YXRpYyBpbnQgZzR4X2Nv bXB1dGVfcGlwZV93bShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSkKIAlpbnQg bnVtX2FjdGl2ZV9wbGFuZXMgPSBod2VpZ2h0MzIoY3J0Y19zdGF0ZS0+YWN0aXZlX3BsYW5lcyAm CiAJCQkJCSAgfkJJVChQTEFORV9DVVJTT1IpKTsKIAljb25zdCBzdHJ1Y3QgZzR4X3BpcGVfd20g KnJhdzsKLQlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnBsYW5lX3N0YXRlOworCWNvbnN0IHN0 cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqb2xkX3BsYW5lX3N0YXRlOworCWNvbnN0IHN0cnVjdCBp bnRlbF9wbGFuZV9zdGF0ZSAqbmV3X3BsYW5lX3N0YXRlOwogCXN0cnVjdCBpbnRlbF9wbGFuZSAq cGxhbmU7CiAJZW51bSBwbGFuZV9pZCBwbGFuZV9pZDsKIAlpbnQgaSwgbGV2ZWw7CiAJdW5zaWdu ZWQgaW50IGRpcnR5ID0gMDsKIAotCWZvcl9lYWNoX2ludGVsX3BsYW5lX2luX3N0YXRlKHN0YXRl LCBwbGFuZSwgcGxhbmVfc3RhdGUsIGkpIHsKLQkJY29uc3Qgc3RydWN0IGludGVsX3BsYW5lX3N0 YXRlICpvbGRfcGxhbmVfc3RhdGUgPQotCQkJdG9faW50ZWxfcGxhbmVfc3RhdGUocGxhbmUtPmJh c2Uuc3RhdGUpOwotCi0JCWlmIChwbGFuZV9zdGF0ZS0+YmFzZS5jcnRjICE9ICZjcnRjLT5iYXNl ICYmCisJZm9yX2VhY2hfb2xkbmV3X2ludGVsX3BsYW5lX2luX3N0YXRlKHN0YXRlLCBwbGFuZSwK KwkJCQkJICAgICBvbGRfcGxhbmVfc3RhdGUsCisJCQkJCSAgICAgbmV3X3BsYW5lX3N0YXRlLCBp KSB7CisJCWlmIChuZXdfcGxhbmVfc3RhdGUtPmJhc2UuY3J0YyAhPSAmY3J0Yy0+YmFzZSAmJgog CQkgICAgb2xkX3BsYW5lX3N0YXRlLT5iYXNlLmNydGMgIT0gJmNydGMtPmJhc2UpCiAJCQljb250 aW51ZTsKIAotCQlpZiAoZzR4X3Jhd19wbGFuZV93bV9jb21wdXRlKGNydGNfc3RhdGUsIHBsYW5l X3N0YXRlKSkKKwkJaWYgKGc0eF9yYXdfcGxhbmVfd21fY29tcHV0ZShjcnRjX3N0YXRlLCBuZXdf cGxhbmVfc3RhdGUpKQogCQkJZGlydHkgfD0gQklUKHBsYW5lLT5pZCk7CiAJfQogCkBAIC0xODMx LDIxICsxODMxLDIxIEBAIHN0YXRpYyBpbnQgdmx2X2NvbXB1dGVfcGlwZV93bShzdHJ1Y3QgaW50 ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSkKIAlpbnQgbnVtX2FjdGl2ZV9wbGFuZXMgPSBod2Vp Z2h0MzIoY3J0Y19zdGF0ZS0+YWN0aXZlX3BsYW5lcyAmCiAJCQkJCSAgfkJJVChQTEFORV9DVVJT T1IpKTsKIAlib29sIG5lZWRzX21vZGVzZXQgPSBkcm1fYXRvbWljX2NydGNfbmVlZHNfbW9kZXNl dCgmY3J0Y19zdGF0ZS0+YmFzZSk7Ci0Jc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpwbGFuZV9z dGF0ZTsKKwljb25zdCBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKm9sZF9wbGFuZV9zdGF0ZTsK Kwljb25zdCBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKm5ld19wbGFuZV9zdGF0ZTsKIAlzdHJ1 Y3QgaW50ZWxfcGxhbmUgKnBsYW5lOwogCWVudW0gcGxhbmVfaWQgcGxhbmVfaWQ7CiAJaW50IGxl dmVsLCByZXQsIGk7CiAJdW5zaWduZWQgaW50IGRpcnR5ID0gMDsKIAotCWZvcl9lYWNoX2ludGVs X3BsYW5lX2luX3N0YXRlKHN0YXRlLCBwbGFuZSwgcGxhbmVfc3RhdGUsIGkpIHsKLQkJY29uc3Qg c3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpvbGRfcGxhbmVfc3RhdGUgPQotCQkJdG9faW50ZWxf cGxhbmVfc3RhdGUocGxhbmUtPmJhc2Uuc3RhdGUpOwotCi0JCWlmIChwbGFuZV9zdGF0ZS0+YmFz ZS5jcnRjICE9ICZjcnRjLT5iYXNlICYmCisJZm9yX2VhY2hfb2xkbmV3X2ludGVsX3BsYW5lX2lu X3N0YXRlKHN0YXRlLCBwbGFuZSwKKwkJCQkJICAgICBvbGRfcGxhbmVfc3RhdGUsCisJCQkJCSAg ICAgbmV3X3BsYW5lX3N0YXRlLCBpKSB7CisJCWlmIChuZXdfcGxhbmVfc3RhdGUtPmJhc2UuY3J0 YyAhPSAmY3J0Yy0+YmFzZSAmJgogCQkgICAgb2xkX3BsYW5lX3N0YXRlLT5iYXNlLmNydGMgIT0g JmNydGMtPmJhc2UpCiAJCQljb250aW51ZTsKIAotCQlpZiAodmx2X3Jhd19wbGFuZV93bV9jb21w dXRlKGNydGNfc3RhdGUsIHBsYW5lX3N0YXRlKSkKKwkJaWYgKHZsdl9yYXdfcGxhbmVfd21fY29t cHV0ZShjcnRjX3N0YXRlLCBuZXdfcGxhbmVfc3RhdGUpKQogCQkJZGlydHkgfD0gQklUKHBsYW5l LT5pZCk7CiAJfQogCkBAIC0xODY0LDcgKzE4NjQsNyBAQCBzdGF0aWMgaW50IHZsdl9jb21wdXRl X3BpcGVfd20oc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCiAJLyogY3Vyc29y IGNoYW5nZXMgZG9uJ3Qgd2FycmFudCBhIEZJRk8gcmVjb21wdXRlICovCiAJaWYgKGRpcnR5ICYg fkJJVChQTEFORV9DVVJTT1IpKSB7CiAJCWNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpv bGRfY3J0Y19zdGF0ZSA9Ci0JCQl0b19pbnRlbF9jcnRjX3N0YXRlKGNydGMtPmJhc2Uuc3RhdGUp OworCQkJaW50ZWxfYXRvbWljX2dldF9vbGRfY3J0Y19zdGF0ZShzdGF0ZSwgY3J0Yyk7CiAJCWNv bnN0IHN0cnVjdCB2bHZfZmlmb19zdGF0ZSAqb2xkX2ZpZm9fc3RhdGUgPQogCQkJJm9sZF9jcnRj X3N0YXRlLT53bS52bHYuZmlmb19zdGF0ZTsKIAotLSAKMi4xMy4wCgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0Cklu dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK