From mboxrd@z Thu Jan  1 00:00:00 1970
From: Matt Roper <matthew.d.roper@intel.com>
Subject: [PATCH] drm/i915: Drop ilk_wm_max_level()
Date: Mon, 21 Dec 2015 11:32:50 -0800
Message-ID: <1450726370-4459-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 F04656E0EE
 for <intel-gfx@lists.freedesktop.org>; Mon, 21 Dec 2015 11:32:52 -0800 (PST)
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

U3RvcmluZyB0aGUgbWF4X2xldmVsIGluIGRldl9wcml2IGFzIFZMVi9DSFYgYWxyZWFkeSBkbyBp
cyBhIGJpdCBzaW1wbGVyCnRoYW4gY2FsbGluZyB0aGlzIHN0YW5kYWxvbmUgZnVuY3Rpb24sIGVz
cGVjaWFsbHkgc2luY2Ugc29tZSBvZiB0aGUKY2FsbHNpdGVzIG5lZWQgdG8gc3BlY2lhbC1jYXNl
IHRoZSBjYWxsIHRvIGNoZWNrIHdoZXRoZXIgdGhleSdyZSBydW5uaW5nCm9uIFZMVi9DSFYuCgpU
aGlzIGZ1bmN0aW9uIHdhcyBmdXJ0aGVyIGNvbmZ1c2luZyBzaW5jZSBpdCB3YXNuJ3QgYWN0dWFs
bHkgc3BlY2lmaWMgdG8KSUxLLXN0eWxlIHBsYXRmb3JtcyBhcyBpdHMgbmFtZSBpbXBsaWVkIChp
dCB3YXMgYWxzbyB1c2VkIG9uIFNreWxha2UgYW5kCndvdWxkIGV2ZW4gYmUgY2FsbGVkIG9uIHBy
ZS1JTEsgcGxhdGZvcm1zIHZpYSBkZWJ1Z2ZzKS4gIEFzaWRlIGZyb20gdGhpcwpmdW5jdGlvbiwg
b3VyIHdhdGVybWFyayBwcm9ncmFtbWluZyBhY3Jvc3MgdmFyaW91cyBwbGF0Zm9ybS10eXBlcwpk
b2Vzbid0IHJlYWxseSBoYXZlIGFueSBvdmVybGFwLgoKTm90ZSB0aGF0IHdlIGRvIGNoYW5nZSBk
ZWJ1Z2ZzIGJlaGF2aW9yIHNsaWdodGx5IHdpdGggdGhpcyBwYXRjaDsKaTkxNV8qX3dtX2xhdGVu
Y3kgZmlsZXMgd2lsbCBhbGwgbm93IGFwcGVhciBlbXB0eSBvbiBwcmUtSUxLIHBsYXRmb3Jtcwpy
YXRoZXIgdGhhbiBzaG93aW5nIHR3byB3YXRlcm1hcmsgbGV2ZWxzIG9mIDAuCgpTaWduZWQtb2Zm
LWJ5OiBNYXR0IFJvcGVyIDxtYXR0aGV3LmQucm9wZXJAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMv
Z3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jIHwgMTggKystLS0tLS0tLS0tLS0tCiBkcml2ZXJz
L2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jICAgICB8IDQ0ICsrKysrKysrKysrKysrKysrLS0tLS0t
LS0tLS0tLS0tLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgMjIgaW5zZXJ0aW9ucygrKSwgNDAgZGVs
ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2Zz
LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwppbmRleCAwZmMzOGJiLi5h
ZTM2NjU2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwor
KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwpAQCAtNDQ0NSwxNCArNDQ0
NSw3IEBAIHN0YXRpYyB2b2lkIHdtX2xhdGVuY3lfc2hvdyhzdHJ1Y3Qgc2VxX2ZpbGUgKm0sIGNv
bnN0IHVpbnQxNl90IHdtWzhdKQogewogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBtLT5wcml2
YXRlOwogCWludCBsZXZlbDsKLQlpbnQgbnVtX2xldmVsczsKLQotCWlmIChJU19DSEVSUllWSUVX
KGRldikpCi0JCW51bV9sZXZlbHMgPSAzOwotCWVsc2UgaWYgKElTX1ZBTExFWVZJRVcoZGV2KSkK
LQkJbnVtX2xldmVscyA9IDE7Ci0JZWxzZQotCQludW1fbGV2ZWxzID0gaWxrX3dtX21heF9sZXZl
bChkZXYpICsgMTsKKwlpbnQgbnVtX2xldmVscyA9IHRvX2k5MTUoZGV2KS0+d20ubWF4X2xldmVs
ICsgMTsKIAogCWRybV9tb2Rlc2V0X2xvY2tfYWxsKGRldik7CiAKQEAgLTQ1NjAsMTggKzQ1NTMs
MTEgQEAgc3RhdGljIHNzaXplX3Qgd21fbGF0ZW5jeV93cml0ZShzdHJ1Y3QgZmlsZSAqZmlsZSwg
Y29uc3QgY2hhciBfX3VzZXIgKnVidWYsCiAJc3RydWN0IHNlcV9maWxlICptID0gZmlsZS0+cHJp
dmF0ZV9kYXRhOwogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBtLT5wcml2YXRlOwogCXVpbnQx
Nl90IG5ld1s4XSA9IHsgMCB9OwotCWludCBudW1fbGV2ZWxzOworCWludCBudW1fbGV2ZWxzID0g
dG9faTkxNShkZXYpLT53bS5tYXhfbGV2ZWwgKyAxOwogCWludCBsZXZlbDsKIAlpbnQgcmV0Owog
CWNoYXIgdG1wWzMyXTsKIAotCWlmIChJU19DSEVSUllWSUVXKGRldikpCi0JCW51bV9sZXZlbHMg
PSAzOwotCWVsc2UgaWYgKElTX1ZBTExFWVZJRVcoZGV2KSkKLQkJbnVtX2xldmVscyA9IDE7Ci0J
ZWxzZQotCQludW1fbGV2ZWxzID0gaWxrX3dtX21heF9sZXZlbChkZXYpICsgMTsKLQogCWlmIChs
ZW4gPj0gc2l6ZW9mKHRtcCkpCiAJCXJldHVybiAtRUlOVkFMOwogCmRpZmYgLS1naXQgYS9kcml2
ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf
cG0uYwppbmRleCBiMDc2NTgwLi43MWQ4MTRjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v
aTkxNS9pbnRlbF9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKQEAg
LTIwMjcsNyArMjAyNyw3IEBAIHN0YXRpYyB2b2lkIGludGVsX3JlYWRfd21fbGF0ZW5jeShzdHJ1
Y3QgZHJtX2RldmljZSAqZGV2LCB1aW50MTZfdCB3bVs4XSkKIAlpZiAoSVNfR0VOOShkZXYpKSB7
CiAJCXVpbnQzMl90IHZhbDsKIAkJaW50IHJldCwgaTsKLQkJaW50IGxldmVsLCBtYXhfbGV2ZWwg
PSBpbGtfd21fbWF4X2xldmVsKGRldik7CisJCWludCBsZXZlbCwgbWF4X2xldmVsID0gZGV2X3By
aXYtPndtLm1heF9sZXZlbDsKIAogCQkvKiByZWFkIHRoZSBmaXJzdCBzZXQgb2YgbWVtb3J5IGxh
dGVuY2llc1swOjNdICovCiAJCXZhbCA9IDA7IC8qIGRhdGEwIHRvIGJlIHByb2dyYW1tZWQgdG8g
MCBmb3IgZmlyc3Qgc2V0ICovCkBAIC0yMTQyLDI0ICsyMTQyLDExIEBAIHN0YXRpYyB2b2lkIGlu
dGVsX2ZpeHVwX2N1cl93bV9sYXRlbmN5KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHVpbnQxNl90
IHdtWzVdKQogCQl3bVszXSAqPSAyOwogfQogCi1pbnQgaWxrX3dtX21heF9sZXZlbChjb25zdCBz
dHJ1Y3QgZHJtX2RldmljZSAqZGV2KQotewotCS8qIGhvdyBtYW55IFdNIGxldmVscyBhcmUgd2Ug
ZXhwZWN0aW5nICovCi0JaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuID49IDkpCi0JCXJldHVybiA3
OwotCWVsc2UgaWYgKElTX0hBU1dFTEwoZGV2KSB8fCBJU19CUk9BRFdFTEwoZGV2KSkKLQkJcmV0
dXJuIDQ7Ci0JZWxzZSBpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPj0gNikKLQkJcmV0dXJuIDM7
Ci0JZWxzZQotCQlyZXR1cm4gMjsKLX0KLQogc3RhdGljIHZvaWQgaW50ZWxfcHJpbnRfd21fbGF0
ZW5jeShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQkJCSAgIGNvbnN0IGNoYXIgKm5hbWUsCiAJ
CQkJICAgY29uc3QgdWludDE2X3Qgd21bOF0pCiB7Ci0JaW50IGxldmVsLCBtYXhfbGV2ZWwgPSBp
bGtfd21fbWF4X2xldmVsKGRldik7CisJaW50IGxldmVsLCBtYXhfbGV2ZWwgPSB0b19pOTE1KGRl
diktPndtLm1heF9sZXZlbDsKIAogCWZvciAobGV2ZWwgPSAwOyBsZXZlbCA8PSBtYXhfbGV2ZWw7
IGxldmVsKyspIHsKIAkJdW5zaWduZWQgaW50IGxhdGVuY3kgPSB3bVtsZXZlbF07CkBAIC0yMTg4
LDcgKzIxNzUsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9wcmludF93bV9sYXRlbmN5KHN0cnVjdCBk
cm1fZGV2aWNlICpkZXYsCiBzdGF0aWMgYm9vbCBpbGtfaW5jcmVhc2Vfd21fbGF0ZW5jeShzdHJ1
Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCQkJICAgIHVpbnQxNl90IHdtWzVdLCB1
aW50MTZfdCBtaW4pCiB7Ci0JaW50IGxldmVsLCBtYXhfbGV2ZWwgPSBpbGtfd21fbWF4X2xldmVs
KGRldl9wcml2LT5kZXYpOworCWludCBsZXZlbCwgbWF4X2xldmVsID0gZGV2X3ByaXYtPndtLm1h
eF9sZXZlbDsKIAogCWlmICh3bVswXSA+PSBtaW4pCiAJCXJldHVybiBmYWxzZTsKQEAgLTIyNDIs
NiArMjIyOSwxMyBAQCBzdGF0aWMgdm9pZCBpbGtfc2V0dXBfd21fbGF0ZW5jeShzdHJ1Y3QgZHJt
X2RldmljZSAqZGV2KQogCiAJaWYgKElTX0dFTjYoZGV2KSkKIAkJc25iX3dtX2xhdGVuY3lfcXVp
cmsoZGV2KTsKKworCWlmIChJU19IQVNXRUxMKGRldikgfHwgSVNfQlJPQURXRUxMKGRldikpCisJ
CWRldl9wcml2LT53bS5tYXhfbGV2ZWwgPSA0OworCWVsc2UgaWYgKElOVEVMX0lORk8oZGV2KS0+
Z2VuID49IDYpCisJCWRldl9wcml2LT53bS5tYXhfbGV2ZWwgPSAzOworCWVsc2UKKwkJZGV2X3By
aXYtPndtLm1heF9sZXZlbCA9IDI7CiB9CiAKIHN0YXRpYyB2b2lkIHNrbF9zZXR1cF93bV9sYXRl
bmN5KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCkBAIC0yMjUwLDYgKzIyNDQsOCBAQCBzdGF0aWMg
dm9pZCBza2xfc2V0dXBfd21fbGF0ZW5jeShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCiAJaW50
ZWxfcmVhZF93bV9sYXRlbmN5KGRldiwgZGV2X3ByaXYtPndtLnNrbF9sYXRlbmN5KTsKIAlpbnRl
bF9wcmludF93bV9sYXRlbmN5KGRldiwgIkdlbjkgUGxhbmUiLCBkZXZfcHJpdi0+d20uc2tsX2xh
dGVuY3kpOworCisJZGV2X3ByaXYtPndtLm1heF9sZXZlbCA9IDc7CiB9CiAKIC8qIENvbXB1dGUg
bmV3IHdhdGVybWFya3MgZm9yIHRoZSBwaXBlICovCkBAIC0yMjY1LDcgKzIyNjEsNyBAQCBzdGF0
aWMgaW50IGlsa19jb21wdXRlX3BpcGVfd20oc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMs
CiAJc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpwcmlzdGF0ZSA9IE5VTEw7CiAJc3RydWN0IGlu
dGVsX3BsYW5lX3N0YXRlICpzcHJzdGF0ZSA9IE5VTEw7CiAJc3RydWN0IGludGVsX3BsYW5lX3N0
YXRlICpjdXJzdGF0ZSA9IE5VTEw7Ci0JaW50IGxldmVsLCBtYXhfbGV2ZWwgPSBpbGtfd21fbWF4
X2xldmVsKGRldik7CisJaW50IGxldmVsLCBtYXhfbGV2ZWwgPSBkZXZfcHJpdi0+d20ubWF4X2xl
dmVsOwogCS8qIExQMCB3YXRlcm1hcmsgbWF4aW11bXMgZGVwZW5kIG9uIHRoaXMgcGlwZSBhbG9u
ZSAqLwogCXN0cnVjdCBpbnRlbF93bV9jb25maWcgY29uZmlnID0gewogCQkubnVtX3BpcGVzX2Fj
dGl2ZSA9IDEsCkBAIC0yMzg5LDcgKzIzODUsNyBAQCBzdGF0aWMgdm9pZCBpbGtfd21fbWVyZ2Uo
c3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJCSBzdHJ1Y3QgaW50ZWxfcGlwZV93bSAqbWVyZ2Vk
KQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZh
dGU7Ci0JaW50IGxldmVsLCBtYXhfbGV2ZWwgPSBpbGtfd21fbWF4X2xldmVsKGRldik7CisJaW50
IGxldmVsLCBtYXhfbGV2ZWwgPSBkZXZfcHJpdi0+d20ubWF4X2xldmVsOwogCWludCBsYXN0X2Vu
YWJsZWRfbGV2ZWwgPSBtYXhfbGV2ZWw7CiAKIAkvKiBJTEsvU05CL0lWQjogTFAxKyB3YXRlcm1h
cmtzIG9ubHkgdy8gc2luZ2xlIHBpcGUgKi8KQEAgLTI1MzAsNyArMjUyNiw3IEBAIHN0YXRpYyBz
dHJ1Y3QgaW50ZWxfcGlwZV93bSAqaWxrX2ZpbmRfYmVzdF9yZXN1bHQoc3RydWN0IGRybV9kZXZp
Y2UgKmRldiwKIAkJCQkJCSAgc3RydWN0IGludGVsX3BpcGVfd20gKnIxLAogCQkJCQkJICBzdHJ1
Y3QgaW50ZWxfcGlwZV93bSAqcjIpCiB7Ci0JaW50IGxldmVsLCBtYXhfbGV2ZWwgPSBpbGtfd21f
bWF4X2xldmVsKGRldik7CisJaW50IGxldmVsLCBtYXhfbGV2ZWwgPSB0b19pOTE1KGRldiktPndt
Lm1heF9sZXZlbDsKIAlpbnQgbGV2ZWwxID0gMCwgbGV2ZWwyID0gMDsKIAogCWZvciAobGV2ZWwg
PSAxOyBsZXZlbCA8PSBtYXhfbGV2ZWw7IGxldmVsKyspIHsKQEAgLTMyMzIsNyArMzIyOCw3IEBA
IHN0YXRpYyB2b2lkIHNrbF9jb21wdXRlX3BpcGVfd20oc3RydWN0IGludGVsX2NydGNfc3RhdGUg
KmNzdGF0ZSwKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3N0YXRlLT5iYXNlLmNydGMt
PmRldjsKIAljb25zdCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRl
dl9wcml2YXRlOwotCWludCBsZXZlbCwgbWF4X2xldmVsID0gaWxrX3dtX21heF9sZXZlbChkZXYp
OworCWludCBsZXZlbCwgbWF4X2xldmVsID0gZGV2X3ByaXYtPndtLm1heF9sZXZlbDsKIAogCWZv
ciAobGV2ZWwgPSAwOyBsZXZlbCA8PSBtYXhfbGV2ZWw7IGxldmVsKyspIHsKIAkJc2tsX2NvbXB1
dGVfd21fbGV2ZWwoZGV2X3ByaXYsIGRkYiwgY3N0YXRlLApAQCAtMzI0OCw3ICszMjQ0LDcgQEAg
c3RhdGljIHZvaWQgc2tsX2NvbXB1dGVfd21fcmVzdWx0cyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2
LAogCQkJCSAgIHN0cnVjdCBza2xfd21fdmFsdWVzICpyLAogCQkJCSAgIHN0cnVjdCBpbnRlbF9j
cnRjICppbnRlbF9jcnRjKQogewotCWludCBsZXZlbCwgbWF4X2xldmVsID0gaWxrX3dtX21heF9s
ZXZlbChkZXYpOworCWludCBsZXZlbCwgbWF4X2xldmVsID0gdG9faTkxNShkZXYpLT53bS5tYXhf
bGV2ZWw7CiAJZW51bSBwaXBlIHBpcGUgPSBpbnRlbF9jcnRjLT5waXBlOwogCXVpbnQzMl90IHRl
bXA7CiAJaW50IGk7CkBAIC0zMzE3LDcgKzMzMTMsNyBAQCBzdGF0aWMgdm9pZCBza2xfd3JpdGVf
d21fdmFsdWVzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAlzdHJ1Y3QgaW50
ZWxfY3J0YyAqY3J0YzsKIAogCWZvcl9lYWNoX2ludGVsX2NydGMoZGV2LCBjcnRjKSB7Ci0JCWlu
dCBpLCBsZXZlbCwgbWF4X2xldmVsID0gaWxrX3dtX21heF9sZXZlbChkZXYpOworCQlpbnQgaSwg
bGV2ZWwsIG1heF9sZXZlbCA9IGRldl9wcml2LT53bS5tYXhfbGV2ZWw7CiAJCWVudW0gcGlwZSBw
aXBlID0gY3J0Yy0+cGlwZTsKIAogCQlpZiAoIW5ldy0+ZGlydHlbcGlwZV0pCkBAIC0zNzExLDcg
KzM3MDcsNyBAQCBzdGF0aWMgdm9pZCBza2xfcGlwZV93bV9nZXRfaHdfc3RhdGUoc3RydWN0IGRy
bV9jcnRjICpjcnRjKQogCWludCBsZXZlbCwgaSwgbWF4X2xldmVsOwogCXVpbnQzMl90IHRlbXA7
CiAKLQltYXhfbGV2ZWwgPSBpbGtfd21fbWF4X2xldmVsKGRldik7CisJbWF4X2xldmVsID0gZGV2
X3ByaXYtPndtLm1heF9sZXZlbDsKIAogCWh3LT53bV9saW5ldGltZVtwaXBlXSA9IEk5MTVfUkVB
RChQSVBFX1dNX0xJTkVUSU1FKHBpcGUpKTsKIApAQCAtMzgwMSw3ICszNzk3LDcgQEAgc3RhdGlj
IHZvaWQgaWxrX3BpcGVfd21fZ2V0X2h3X3N0YXRlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAkJ
YWN0aXZlLT53bVswXS5jdXJfdmFsID0gdG1wICYgV00wX1BJUEVfQ1VSU09SX01BU0s7CiAJCWFj
dGl2ZS0+bGluZXRpbWUgPSBody0+d21fbGluZXRpbWVbcGlwZV07CiAJfSBlbHNlIHsKLQkJaW50
IGxldmVsLCBtYXhfbGV2ZWwgPSBpbGtfd21fbWF4X2xldmVsKGRldik7CisJCWludCBsZXZlbCwg
bWF4X2xldmVsID0gZGV2X3ByaXYtPndtLm1heF9sZXZlbDsKIAogCQkvKgogCQkgKiBGb3IgaW5h
Y3RpdmUgcGlwZXMsIGFsbCB3YXRlcm1hcmsgbGV2ZWxzCi0tIAoyLjEuNAoKX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlz
dApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3Rv
cC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK