From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: [PATCH 2/2] drm/i915: constify validate_vbt in VBT parsing Date: Wed, 15 Apr 2015 15:18:29 +0300 Message-ID: <1429100309-21983-2-git-send-email-jani.nikula@intel.com> References: <1429100309-21983-1-git-send-email-jani.nikula@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 ESMTP id 22CCE6E833 for ; Wed, 15 Apr 2015 05:17:08 -0700 (PDT) In-Reply-To: <1429100309-21983-1-git-send-email-jani.nikula@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 Cc: jani.nikula@intel.com List-Id: intel-gfx@lists.freedesktop.org TWFrZSBpbnB1dCBhbmQgb3V0cHV0IG9mIHZhbGlkYXRlX3ZidCBjb25zdCwgYW5kIGZpeCB0aGUg ZmFsbG91dC4gV2UKc2hvdWxkbid0IG1vZGlmeSB0aGUgVkJULCBzbyBtYWtlIHRoZSBjb21waWxl ciBoZWxwIHVzIGhlcmUuCgpTaWduZWQtb2ZmLWJ5OiBKYW5pIE5pa3VsYSA8amFuaS5uaWt1bGFA aW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Jpb3MuYyB8IDUwICsr KysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDI2 IGluc2VydGlvbnMoKyksIDI0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Jpb3MuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Jpb3Mu YwppbmRleCA0ZTNmM2Y0MjcxNzguLmIxZTA0N2M1ZTU5NCAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfYmlvcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2Jpb3MuYwpAQCAtMjA1LDcgKzIwNSw3IEBAIGdldF9sdmRzX2ZwX3RpbWluZyhjb25zdCBzdHJ1 Y3QgYmRiX2hlYWRlciAqYmRiLAogLyogVHJ5IHRvIGZpbmQgaW50ZWdyYXRlZCBwYW5lbCBkYXRh ICovCiBzdGF0aWMgdm9pZAogcGFyc2VfbGZwX3BhbmVsX2RhdGEoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2LAotCQkJICAgIHN0cnVjdCBiZGJfaGVhZGVyICpiZGIpCisJCSAgICAg Y29uc3Qgc3RydWN0IGJkYl9oZWFkZXIgKmJkYikKIHsKIAljb25zdCBzdHJ1Y3QgYmRiX2x2ZHNf b3B0aW9ucyAqbHZkc19vcHRpb25zOwogCWNvbnN0IHN0cnVjdCBiZGJfbHZkc19sZnBfZGF0YSAq bHZkc19sZnBfZGF0YTsKQEAgLTMxMSw3ICszMTEsOCBAQCBwYXJzZV9sZnBfcGFuZWxfZGF0YShz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiB9CiAKIHN0YXRpYyB2b2lkCi1wYXJz ZV9sZnBfYmFja2xpZ2h0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgc3RydWN0 IGJkYl9oZWFkZXIgKmJkYikKK3BhcnNlX2xmcF9iYWNrbGlnaHQoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2LAorCQkgICAgY29uc3Qgc3RydWN0IGJkYl9oZWFkZXIgKmJkYikKIHsK IAljb25zdCBzdHJ1Y3QgYmRiX2xmcF9iYWNrbGlnaHRfZGF0YSAqYmFja2xpZ2h0X2RhdGE7CiAJ Y29uc3Qgc3RydWN0IGJkYl9sZnBfYmFja2xpZ2h0X2RhdGFfZW50cnkgKmVudHJ5OwpAQCAtMzQ5 LDcgKzM1MCw3IEBAIHBhcnNlX2xmcF9iYWNrbGlnaHQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2LCBzdHJ1Y3QgYmRiX2hlYWRlciAqYmRiKQogLyogVHJ5IHRvIGZpbmQgc2R2byBw YW5lbCBkYXRhICovCiBzdGF0aWMgdm9pZAogcGFyc2Vfc2R2b19wYW5lbF9kYXRhKHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKLQkJICAgICAgc3RydWN0IGJkYl9oZWFkZXIgKmJk YikKKwkJICAgICAgY29uc3Qgc3RydWN0IGJkYl9oZWFkZXIgKmJkYikKIHsKIAljb25zdCBzdHJ1 Y3QgbHZkc19kdm9fdGltaW5nICpkdm9fdGltaW5nOwogCXN0cnVjdCBkcm1fZGlzcGxheV9tb2Rl ICpwYW5lbF9maXhlZF9tb2RlOwpAQCAtNDAzLDcgKzQwNCw3IEBAIHN0YXRpYyBpbnQgaW50ZWxf Ymlvc19zc2NfZnJlcXVlbmN5KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAKIHN0YXRpYyB2b2lk CiBwYXJzZV9nZW5lcmFsX2ZlYXR1cmVzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diwKLQkJICAgICAgIHN0cnVjdCBiZGJfaGVhZGVyICpiZGIpCisJCSAgICAgICBjb25zdCBzdHJ1 Y3QgYmRiX2hlYWRlciAqYmRiKQogewogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBkZXZfcHJp di0+ZGV2OwogCWNvbnN0IHN0cnVjdCBiZGJfZ2VuZXJhbF9mZWF0dXJlcyAqZ2VuZXJhbDsKQEAg LTQyOSw3ICs0MzAsNyBAQCBwYXJzZV9nZW5lcmFsX2ZlYXR1cmVzKHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiwKIAogc3RhdGljIHZvaWQKIHBhcnNlX2dlbmVyYWxfZGVmaW5pdGlv bnMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAotCQkJICBzdHJ1Y3QgYmRiX2hl YWRlciAqYmRiKQorCQkJICBjb25zdCBzdHJ1Y3QgYmRiX2hlYWRlciAqYmRiKQogewogCWNvbnN0 IHN0cnVjdCBiZGJfZ2VuZXJhbF9kZWZpbml0aW9ucyAqZ2VuZXJhbDsKIApAQCAtNDU2LDcgKzQ1 Nyw3IEBAIGNoaWxkX2RldmljZV9wdHIoY29uc3Qgc3RydWN0IGJkYl9nZW5lcmFsX2RlZmluaXRp b25zICpwX2RlZnMsIGludCBpKQogCiBzdGF0aWMgdm9pZAogcGFyc2Vfc2R2b19kZXZpY2VfbWFw cGluZyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCi0JCQkgIHN0cnVjdCBiZGJf aGVhZGVyICpiZGIpCisJCQkgIGNvbnN0IHN0cnVjdCBiZGJfaGVhZGVyICpiZGIpCiB7CiAJc3Ry dWN0IHNkdm9fZGV2aWNlX21hcHBpbmcgKnBfbWFwcGluZzsKIAljb25zdCBzdHJ1Y3QgYmRiX2dl bmVyYWxfZGVmaW5pdGlvbnMgKnBfZGVmczsKQEAgLTU0Niw3ICs1NDcsNyBAQCBwYXJzZV9zZHZv X2RldmljZV9tYXBwaW5nKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAogc3Rh dGljIHZvaWQKIHBhcnNlX2RyaXZlcl9mZWF0dXJlcyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYsCi0JCSAgICAgICBzdHJ1Y3QgYmRiX2hlYWRlciAqYmRiKQorCQkgICAgICBjb25z dCBzdHJ1Y3QgYmRiX2hlYWRlciAqYmRiKQogewogCWNvbnN0IHN0cnVjdCBiZGJfZHJpdmVyX2Zl YXR1cmVzICpkcml2ZXI7CiAKQEAgLTU3Miw3ICs1NzMsNyBAQCBwYXJzZV9kcml2ZXJfZmVhdHVy ZXMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogfQogCiBzdGF0aWMgdm9pZAot cGFyc2VfZWRwKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgc3RydWN0IGJkYl9o ZWFkZXIgKmJkYikKK3BhcnNlX2VkcChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYs IGNvbnN0IHN0cnVjdCBiZGJfaGVhZGVyICpiZGIpCiB7CiAJY29uc3Qgc3RydWN0IGJkYl9lZHAg KmVkcDsKIAljb25zdCBzdHJ1Y3QgZWRwX3Bvd2VyX3NlcSAqZWRwX3BwczsKQEAgLTY3OSw3ICs2 ODAsNyBAQCBwYXJzZV9lZHAoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCBzdHJ1 Y3QgYmRiX2hlYWRlciAqYmRiKQogfQogCiBzdGF0aWMgdm9pZAotcGFyc2VfcHNyKHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgc3RydWN0IGJkYl9oZWFkZXIgKmJkYikKK3BhcnNl X3BzcihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIGNvbnN0IHN0cnVjdCBiZGJf aGVhZGVyICpiZGIpCiB7CiAJY29uc3Qgc3RydWN0IGJkYl9wc3IgKnBzcjsKIAljb25zdCBzdHJ1 Y3QgcHNyX3RhYmxlICpwc3JfdGFibGU7CkBAIC03OTAsNyArNzkxLDcgQEAgc3RhdGljIHU4ICpn b3RvX25leHRfc2VxdWVuY2UodTggKmRhdGEsIGludCAqc2l6ZSkKIH0KIAogc3RhdGljIHZvaWQK LXBhcnNlX21pcGkoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCBzdHJ1Y3QgYmRi X2hlYWRlciAqYmRiKQorcGFyc2VfbWlwaShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYsIGNvbnN0IHN0cnVjdCBiZGJfaGVhZGVyICpiZGIpCiB7CiAJY29uc3Qgc3RydWN0IGJkYl9t aXBpX2NvbmZpZyAqc3RhcnQ7CiAJY29uc3Qgc3RydWN0IGJkYl9taXBpX3NlcXVlbmNlICpzZXF1 ZW5jZTsKQEAgLTk0MSw3ICs5NDIsNyBAQCBlcnI6CiB9CiAKIHN0YXRpYyB2b2lkIHBhcnNlX2Rk aV9wb3J0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgZW51bSBwb3J0IHBvcnQs Ci0JCQkgICBzdHJ1Y3QgYmRiX2hlYWRlciAqYmRiKQorCQkJICAgY29uc3Qgc3RydWN0IGJkYl9o ZWFkZXIgKmJkYikKIHsKIAl1bmlvbiBjaGlsZF9kZXZpY2VfY29uZmlnICppdCwgKmNoaWxkID0g TlVMTDsKIAlzdHJ1Y3QgZGRpX3ZidF9wb3J0X2luZm8gKmluZm8gPSAmZGV2X3ByaXYtPnZidC5k ZGlfcG9ydF9pbmZvW3BvcnRdOwpAQCAtMTA0Myw3ICsxMDQ0LDcgQEAgc3RhdGljIHZvaWQgcGFy c2VfZGRpX3BvcnQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCBlbnVtIHBvcnQg cG9ydCwKIH0KIAogc3RhdGljIHZvaWQgcGFyc2VfZGRpX3BvcnRzKHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiwKLQkJCSAgICBzdHJ1Y3QgYmRiX2hlYWRlciAqYmRiKQorCQkJICAg IGNvbnN0IHN0cnVjdCBiZGJfaGVhZGVyICpiZGIpCiB7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRl diA9IGRldl9wcml2LT5kZXY7CiAJZW51bSBwb3J0IHBvcnQ7CkBAIC0xMDYzLDcgKzEwNjQsNyBA QCBzdGF0aWMgdm9pZCBwYXJzZV9kZGlfcG9ydHMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2LAogCiBzdGF0aWMgdm9pZAogcGFyc2VfZGV2aWNlX21hcHBpbmcoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2LAotCQkgICAgICAgc3RydWN0IGJkYl9oZWFkZXIgKmJkYikK KwkJICAgICBjb25zdCBzdHJ1Y3QgYmRiX2hlYWRlciAqYmRiKQogewogCWNvbnN0IHN0cnVjdCBi ZGJfZ2VuZXJhbF9kZWZpbml0aW9ucyAqcF9kZWZzOwogCWNvbnN0IHVuaW9uIGNoaWxkX2Rldmlj ZV9jb25maWcgKnBfY2hpbGQ7CkBAIC0xMTkzLDE5ICsxMTk0LDIxIEBAIHN0YXRpYyBjb25zdCBz dHJ1Y3QgZG1pX3N5c3RlbV9pZCBpbnRlbF9ub19vcHJlZ2lvbl92YnRbXSA9IHsKIAl7IH0KIH07 CiAKLXN0YXRpYyBzdHJ1Y3QgYmRiX2hlYWRlciAqdmFsaWRhdGVfdmJ0KGNoYXIgKmJhc2UsIHNp emVfdCBzaXplLAotCQkJCSAgICAgICBzdHJ1Y3QgdmJ0X2hlYWRlciAqdmJ0LAotCQkJCSAgICAg ICBjb25zdCBjaGFyICpzb3VyY2UpCitjb25zdCBzdGF0aWMgc3RydWN0IGJkYl9oZWFkZXIgKnZh bGlkYXRlX3ZidChjb25zdCB2b2lkICpfYmFzZSwgc2l6ZV90IHNpemUsCisJCQkJCSAgICAgY29u c3Qgdm9pZCAqX3ZidCwKKwkJCQkJICAgICBjb25zdCBjaGFyICpzb3VyY2UpCiB7CisJY29uc3Qg Y2hhciAqYmFzZSA9IF9iYXNlOworCWNvbnN0IHN0cnVjdCB2YnRfaGVhZGVyICp2YnQgPSBfdmJ0 OwogCXNpemVfdCBvZmZzZXQ7Ci0Jc3RydWN0IGJkYl9oZWFkZXIgKmJkYjsKKwljb25zdCBzdHJ1 Y3QgYmRiX2hlYWRlciAqYmRiOwogCiAJaWYgKHZidCA9PSBOVUxMKSB7CiAJCURSTV9ERUJVR19E UklWRVIoIlZCVCBzaWduYXR1cmUgbWlzc2luZ1xuIik7CiAJCXJldHVybiBOVUxMOwogCX0KIAot CW9mZnNldCA9IChjaGFyICopdmJ0IC0gYmFzZTsKKwlvZmZzZXQgPSAoY29uc3QgY2hhciAqKXZi dCAtIGJhc2U7CiAJaWYgKG9mZnNldCArIHNpemVvZihzdHJ1Y3QgdmJ0X2hlYWRlcikgPiBzaXpl KSB7CiAJCURSTV9ERUJVR19EUklWRVIoIlZCVCBoZWFkZXIgaW5jb21wbGV0ZVxuIik7CiAJCXJl dHVybiBOVUxMOwpAQCAtMTIyMiw3ICsxMjI1LDcgQEAgc3RhdGljIHN0cnVjdCBiZGJfaGVhZGVy ICp2YWxpZGF0ZV92YnQoY2hhciAqYmFzZSwgc2l6ZV90IHNpemUsCiAJCXJldHVybiBOVUxMOwog CX0KIAotCWJkYiA9IChzdHJ1Y3QgYmRiX2hlYWRlciAqKShiYXNlICsgb2Zmc2V0KTsKKwliZGIg PSAoY29uc3Qgc3RydWN0IGJkYl9oZWFkZXIgKikoYmFzZSArIG9mZnNldCk7CiAJaWYgKG9mZnNl dCArIGJkYi0+YmRiX3NpemUgPiBzaXplKSB7CiAJCURSTV9ERUJVR19EUklWRVIoIkJEQiBpbmNv bXBsZXRlXG4iKTsKIAkJcmV0dXJuIE5VTEw7CkBAIC0xMjQ3LDcgKzEyNTAsNyBAQCBpbnRlbF9w YXJzZV9iaW9zKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7CiAJc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3QgcGNpX2RldiAqcGRl diA9IGRldi0+cGRldjsKLQlzdHJ1Y3QgYmRiX2hlYWRlciAqYmRiID0gTlVMTDsKKwljb25zdCBz dHJ1Y3QgYmRiX2hlYWRlciAqYmRiID0gTlVMTDsKIAl1OCBfX2lvbWVtICpiaW9zID0gTlVMTDsK IAogCWlmIChIQVNfUENIX05PUChkZXYpKQpAQCAtMTI1Nyw5ICsxMjYwLDggQEAgaW50ZWxfcGFy c2VfYmlvcyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCiAJLyogWFhYIFNob3VsZCB0aGlzIHZh bGlkYXRpb24gYmUgbW92ZWQgdG8gaW50ZWxfb3ByZWdpb24uYz8gKi8KIAlpZiAoIWRtaV9jaGVj a19zeXN0ZW0oaW50ZWxfbm9fb3ByZWdpb25fdmJ0KSAmJiBkZXZfcHJpdi0+b3ByZWdpb24udmJ0 KQotCQliZGIgPSB2YWxpZGF0ZV92YnQoKGNoYXIgKilkZXZfcHJpdi0+b3ByZWdpb24uaGVhZGVy LCBPUFJFR0lPTl9TSVpFLAotCQkJCSAgIChzdHJ1Y3QgdmJ0X2hlYWRlciAqKWRldl9wcml2LT5v cHJlZ2lvbi52YnQsCi0JCQkJICAgIk9wUmVnaW9uIik7CisJCWJkYiA9IHZhbGlkYXRlX3ZidChk ZXZfcHJpdi0+b3ByZWdpb24uaGVhZGVyLCBPUFJFR0lPTl9TSVpFLAorCQkJCSAgIGRldl9wcml2 LT5vcHJlZ2lvbi52YnQsICJPcFJlZ2lvbiIpOwogCiAJaWYgKGJkYiA9PSBOVUxMKSB7CiAJCXNp emVfdCBpLCBzaXplOwpAQCAtMTI3Miw3ICsxMjc0LDcgQEAgaW50ZWxfcGFyc2VfYmlvcyhzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2KQogCQlmb3IgKGkgPSAwOyBpICsgNCA8IHNpemU7IGkrKykgewog CQkJaWYgKG1lbWNtcChiaW9zICsgaSwgIiRWQlQiLCA0KSA9PSAwKSB7CiAJCQkJYmRiID0gdmFs aWRhdGVfdmJ0KGJpb3MsIHNpemUsCi0JCQkJCQkgICAoc3RydWN0IHZidF9oZWFkZXIgKikoYmlv cyArIGkpLAorCQkJCQkJICAgYmlvcyArIGksCiAJCQkJCQkgICAiUENJIFJPTSIpOwogCQkJCWJy ZWFrOwogCQkJfQotLSAKMi4xLjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVk ZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8v aW50ZWwtZ2Z4Cg==