From: Robert Bragg Subject: [PATCH v3 04/11] drm/i915: don't whitelist oacontrol in cmd parser Date: Mon, 15 Aug 2016 15:41:21 +0100 Message-ID: <20160815144128.7847-5-robert@sixbynine.org> References: <20160815144128.7847-1-robert@sixbynine.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20160815144128.7847-1-robert@sixbynine.org> 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: David Airlie , dri-devel@lists.freedesktop.org, Sourab Gupta , Daniel Vetter List-Id: dri-devel@lists.freedesktop.org QmVpbmcgYWJsZSB0byBwcm9ncmFtIE9BQ09OVFJPTCBmcm9tIGEgbm9uLXByaXZpbGVnZWQgYmF0 Y2ggYnVmZmVyIGlzCm5vdCBzdWZmaWNpZW50IHRvIGJlIGFibGUgdG8gY29uZmlndXJlIHRoZSBP QSB1bml0LiBUaGlzIHdhcyBvcmlnaW5hbGx5CmFsbG93ZWQgdG8gaGVscCBlbmFibGUgTWVzYSB0 byBleHBvc2UgT0EgY291bnRlcnMgdmlhIHRoZQpJTlRFTF9wZXJmb3JtYW5jZV9xdWVyeSBleHRl bnNpb24sIGJ1dCB0aGUgY3VycmVudCBpbXBsZW1lbnRhdGlvbiBiYXNlZApvbiBwcm9ncmFtbWlu ZyBPQUNPTlRST0wgdmlhIGEgYmF0Y2ggYnVmZmVyIGlzbid0IGFibGUgdG8gcmVwb3J0IHVzZWFi bGUKZGF0YSB3aXRob3V0IGEgbW9yZSBjb21wbGV0ZSBPQSB1bml0IGNvbmZpZ3VyYXRpb24uIE1l c2EgaGFuZGxlcyB0aGUKcG9zc2liaWxpdHkgdGhhdCB3cml0ZXMgdG8gT0FDT05UUk9MIG1heSBu b3QgYmUgYWxsb3dlZCBhbmQgc28gb25seQphZHZlcnRpc2VzIHRoZSBleHRlbnNpb24gYWZ0ZXIg ZXhwbGljaXRseSB0ZXN0aW5nIHRoYXQgYSB3cml0ZSB0bwpPQUNPTlRST0wgc3VjY2VlZHMuIEJh c2VkIG9uIHRoaXM7IHJlbW92aW5nIE9BQ09OVFJPTCBmcm9tIHRoZSB3aGl0ZWxpc3QKc2hvdWxk IGJlIG9rIGZvciB1c2Vyc3BhY2UuCgpSZW1vdmluZyB0aGlzIHNpbXBsaWZpZXMgYWRkaW5nIGEg bmV3IGtlcm5lbCBhcGkgZm9yIGNvbmZpZ3VyaW5nIHRoZSBPQQp1bml0IHdpdGhvdXQgbmVlZGlu ZyB0byBjb25zaWRlciB0aGUgcG9zc2liaWxpdHkgdGhhdCB1c2Vyc3BhY2UgbWlnaHQKdHJhbXBs ZSBvbiBPQUNPTlRST0wgc3RhdGUgd2hpY2ggd2UnZCBsaWtlIHRvIHN0YXJ0IG1hbmFnaW5nIHdp dGhpbgp0aGUga2VybmVsIGluc3RlYWQuIEluIHBhcnRpY3VsYXIgcnVubmluZyBhbnkgTWVzYSBi YXNlZCBHTCBhcHBsaWNhdGlvbgpjdXJyZW50bHkgcmVzdWx0cyBpbiBjbGVhcmluZyBPQUNPTlRS T0wgd2hlbiBpbml0aWFsaXppbmcgd2hpY2ggd291bGQKZGlzYWJsZSB0aGUgY2FwdHVyaW5nIG9m IG1ldHJpY3MuCgpTaWduZWQtb2ZmLWJ5OiBSb2JlcnQgQnJhZ2cgPHJvYmVydEBzaXhieW5pbmUu b3JnPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfY21kX3BhcnNlci5jIHwgMzggKyst LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDIgaW5zZXJ0 aW9ucygrKSwgMzYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9jbWRfcGFyc2VyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2NtZF9wYXJz ZXIuYwppbmRleCA3MWU3NzhiLi5hYzAzYzcxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2NtZF9wYXJzZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Nt ZF9wYXJzZXIuYwpAQCAtNDQ2LDcgKzQ0Niw2IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX2k5 MTVfcmVnX2Rlc2NyaXB0b3IgZ2VuN19yZW5kZXJfcmVnc1tdID0gewogCVJFRzY0KFBTX0lOVk9D QVRJT05fQ09VTlQpLAogCVJFRzY0KFBTX0RFUFRIX0NPVU5UKSwKIAlSRUc2NF9JRFgoUklOR19U SU1FU1RBTVAsIFJFTkRFUl9SSU5HX0JBU0UpLAotCVJFRzMyKEdFTjdfT0FDT05UUk9MKSwgLyog T25seSBhbGxvd2VkIGZvciBMUkkgYW5kIFNSTS4gU2VlIGJlbG93LiAqLwogCVJFRzY0KE1JX1BS RURJQ0FURV9TUkMwKSwKIAlSRUc2NChNSV9QUkVESUNBVEVfU1JDMSksCiAJUkVHMzIoR0VON18z RFBSSU1fRU5EX09GRlNFVCksCkBAIC0xMDQ5LDggKzEwNDgsNyBAQCBib29sIGludGVsX2VuZ2lu ZV9uZWVkc19jbWRfcGFyc2VyKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIHN0YXRp YyBib29sIGNoZWNrX2NtZChjb25zdCBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsCiAJ CSAgICAgIGNvbnN0IHN0cnVjdCBkcm1faTkxNV9jbWRfZGVzY3JpcHRvciAqZGVzYywKIAkJICAg ICAgY29uc3QgdTMyICpjbWQsIHUzMiBsZW5ndGgsCi0JCSAgICAgIGNvbnN0IGJvb2wgaXNfbWFz dGVyLAotCQkgICAgICBib29sICpvYWNvbnRyb2xfc2V0KQorCQkgICAgICBjb25zdCBib29sIGlz X21hc3RlcikKIHsKIAlpZiAoZGVzYy0+ZmxhZ3MgJiBDTURfREVTQ19SRUpFQ1QpIHsKIAkJRFJN X0RFQlVHX0RSSVZFUigiQ01EOiBSZWplY3RlZCBjb21tYW5kOiAweCUwOFhcbiIsICpjbWQpOwpA QCAtMTA4OCwzMSArMTA4Niw2IEBAIHN0YXRpYyBib29sIGNoZWNrX2NtZChjb25zdCBzdHJ1Y3Qg aW50ZWxfZW5naW5lX2NzICplbmdpbmUsCiAJCQl9CiAKIAkJCS8qCi0JCQkgKiBPQUNPTlRST0wg cmVxdWlyZXMgc29tZSBzcGVjaWFsIGhhbmRsaW5nIGZvcgotCQkJICogd3JpdGVzLiBXZSB3YW50 IHRvIG1ha2Ugc3VyZSB0aGF0IGFueSBiYXRjaCB3aGljaAotCQkJICogZW5hYmxlcyBPQSBhbHNv IGRpc2FibGVzIGl0IGJlZm9yZSB0aGUgZW5kIG9mIHRoZQotCQkJICogYmF0Y2guIFRoZSBnb2Fs IGlzIHRvIHByZXZlbnQgb25lIHByb2Nlc3MgZnJvbQotCQkJICogc25vb3Bpbmcgb24gdGhlIHBl cmYgZGF0YSBmcm9tIGFub3RoZXIgcHJvY2Vzcy4gVG8gZG8KLQkJCSAqIHRoYXQsIHdlIG5lZWQg dG8gY2hlY2sgdGhlIHZhbHVlIHRoYXQgd2lsbCBiZSB3cml0dGVuCi0JCQkgKiB0byB0aGUgcmVn aXN0ZXIuIEhlbmNlLCBsaW1pdCBPQUNPTlRST0wgd3JpdGVzIHRvCi0JCQkgKiBvbmx5IE1JX0xP QURfUkVHSVNURVJfSU1NIGNvbW1hbmRzLgotCQkJICovCi0JCQlpZiAocmVnX2FkZHIgPT0gaTkx NV9tbWlvX3JlZ19vZmZzZXQoR0VON19PQUNPTlRST0wpKSB7Ci0JCQkJaWYgKGRlc2MtPmNtZC52 YWx1ZSA9PSBNSV9MT0FEX1JFR0lTVEVSX01FTSkgewotCQkJCQlEUk1fREVCVUdfRFJJVkVSKCJD TUQ6IFJlamVjdGVkIExSTSB0byBPQUNPTlRST0xcbiIpOwotCQkJCQlyZXR1cm4gZmFsc2U7Ci0J CQkJfQotCi0JCQkJaWYgKGRlc2MtPmNtZC52YWx1ZSA9PSBNSV9MT0FEX1JFR0lTVEVSX1JFRykg ewotCQkJCQlEUk1fREVCVUdfRFJJVkVSKCJDTUQ6IFJlamVjdGVkIExSUiB0byBPQUNPTlRST0xc biIpOwotCQkJCQlyZXR1cm4gZmFsc2U7Ci0JCQkJfQotCi0JCQkJaWYgKGRlc2MtPmNtZC52YWx1 ZSA9PSBNSV9MT0FEX1JFR0lTVEVSX0lNTSgxKSkKLQkJCQkJKm9hY29udHJvbF9zZXQgPSAoY21k W29mZnNldCArIDFdICE9IDApOwotCQkJfQotCi0JCQkvKgogCQkJICogQ2hlY2sgdGhlIHZhbHVl IHdyaXR0ZW4gdG8gdGhlIHJlZ2lzdGVyIGFnYWluc3QgdGhlCiAJCQkgKiBhbGxvd2VkIG1hc2sv dmFsdWUgcGFpciBnaXZlbiBpbiB0aGUgd2hpdGVsaXN0IGVudHJ5LgogCQkJICovCkBAIC0xMjAy LDcgKzExNzUsNiBAQCBpbnQgaW50ZWxfZW5naW5lX2NtZF9wYXJzZXIoc3RydWN0IGludGVsX2Vu Z2luZV9jcyAqZW5naW5lLAogewogCXUzMiAqY21kLCAqYmF0Y2hfYmFzZSwgKmJhdGNoX2VuZDsK IAlzdHJ1Y3QgZHJtX2k5MTVfY21kX2Rlc2NyaXB0b3IgZGVmYXVsdF9kZXNjID0geyAwIH07Ci0J Ym9vbCBvYWNvbnRyb2xfc2V0ID0gZmFsc2U7IC8qIE9BQ09OVFJPTCB0cmFja2luZy4gU2VlIGNo ZWNrX2NtZCgpICovCiAJaW50IHJldCA9IDA7CiAKIAliYXRjaF9iYXNlID0gY29weV9iYXRjaChz aGFkb3dfYmF0Y2hfb2JqLCBiYXRjaF9vYmosCkBAIC0xMjU5LDggKzEyMzEsNyBAQCBpbnQgaW50 ZWxfZW5naW5lX2NtZF9wYXJzZXIoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLAogCQkJ YnJlYWs7CiAJCX0KIAotCQlpZiAoIWNoZWNrX2NtZChlbmdpbmUsIGRlc2MsIGNtZCwgbGVuZ3Ro LCBpc19tYXN0ZXIsCi0JCQkgICAgICAgJm9hY29udHJvbF9zZXQpKSB7CisJCWlmICghY2hlY2tf Y21kKGVuZ2luZSwgZGVzYywgY21kLCBsZW5ndGgsIGlzX21hc3RlcikpIHsKIAkJCXJldCA9IC1F QUNDRVM7CiAJCQlicmVhazsKIAkJfQpAQCAtMTI2OCwxMSArMTIzOSw2IEBAIGludCBpbnRlbF9l bmdpbmVfY21kX3BhcnNlcihzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsCiAJCWNtZCAr PSBsZW5ndGg7CiAJfQogCi0JaWYgKG9hY29udHJvbF9zZXQpIHsKLQkJRFJNX0RFQlVHX0RSSVZF UigiQ01EOiBiYXRjaCBzZXQgT0FDT05UUk9MIGJ1dCBkaWQgbm90IGNsZWFyIGl0XG4iKTsKLQkJ cmV0ID0gLUVJTlZBTDsKLQl9Ci0KIAlpZiAoY21kID49IGJhdGNoX2VuZCkgewogCQlEUk1fREVC VUdfRFJJVkVSKCJDTUQ6IEdvdCB0byB0aGUgZW5kIG9mIHRoZSBidWZmZXIgdy9vIGEgQkJFIGNt ZCFcbiIpOwogCQlyZXQgPSAtRUlOVkFMOwotLSAKMi45LjIKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=