From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville Syrjala Subject: [PATCH 6/6] drm: Reject bad property flag combinations Date: Tue, 6 Mar 2018 18:48:49 +0200 Message-ID: <20180306164849.2862-6-ville.syrjala@linux.intel.com> References: <20180306164849.2862-1-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180306164849.2862-1-ville.syrjala@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClBp bXAgZHJtX3Byb3BlcnR5X3R5cGVfdmFsaWQoKSB0byBjaGVjayBmb3IgbW9yZSBmYWlscyB3aXRo IHRoZQpwcm9wZXJ0eSBmbGFncy4gQWxzbyBtYWtlIHRoZSBjaGVjayBiZWZvcmUgYWRkaW5nIHRo ZSBwcm9wZXJ0eSwKYW5kIGJhaWwgb3V0IGlmIHRoaW5ncyBsb29rIGJhZC4KClNpbmNlIHdlJ3Jl IG5vdyBjaGVrY2luZyBmb3IgbW9yZSB0aGFuIHRoZSB0eXBlIGxldCdzIGFsc28KY2hhbmdlIHRo ZSBmdW5jdGlvbiBuYW1lIHRvIGRybV9wcm9wZXJ0eV9mbGFnc192YWxpZCgpLgoKU2lnbmVkLW9m Zi1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KLS0t CiBkcml2ZXJzL2dwdS9kcm0vZHJtX3Byb3BlcnR5LmMgfCAyOSArKysrKysrKysrKysrKysrKysr KysrKy0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDIzIGluc2VydGlvbnMoKyksIDYgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9wcm9wZXJ0eS5jIGIvZHJpdmVy cy9ncHUvZHJtL2RybV9wcm9wZXJ0eS5jCmluZGV4IDAyN2E1MGU1NWU5Ni4uNmFjNmVlNDFhNmEz IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX3Byb3BlcnR5LmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2RybV9wcm9wZXJ0eS5jCkBAIC01MCwxMSArNTAsMjcgQEAKICAqIElPQ1RMIGFu ZCBpbiB0aGUgZ2V0L3NldCBwcm9wZXJ0eSBJT0NUTC4KICAqLwogCi1zdGF0aWMgYm9vbCBkcm1f cHJvcGVydHlfdHlwZV92YWxpZChzdHJ1Y3QgZHJtX3Byb3BlcnR5ICpwcm9wZXJ0eSkKK3N0YXRp YyBib29sIGRybV9wcm9wZXJ0eV9mbGFnc192YWxpZCh1MzIgZmxhZ3MpCiB7Ci0JaWYgKHByb3Bl cnR5LT5mbGFncyAmIERSTV9NT0RFX1BST1BfRVhURU5ERURfVFlQRSkKLQkJcmV0dXJuICEocHJv cGVydHktPmZsYWdzICYgRFJNX01PREVfUFJPUF9MRUdBQ1lfVFlQRSk7Ci0JcmV0dXJuICEhKHBy b3BlcnR5LT5mbGFncyAmIERSTV9NT0RFX1BST1BfTEVHQUNZX1RZUEUpOworCXUzMiBsZWdhY3lf dHlwZSA9IGZsYWdzICYgRFJNX01PREVfUFJPUF9MRUdBQ1lfVFlQRTsKKwl1MzIgZXh0X3R5cGUg PSBmbGFncyAmIERSTV9NT0RFX1BST1BfRVhURU5ERURfVFlQRTsKKworCS8qIFJlamVjdCB1bmRl ZmluZWQvZGVwcmVjYXRlZCBmbGFncyAqLworCWlmIChmbGFncyAmIH4oRFJNX01PREVfUFJPUF9M RUdBQ1lfVFlQRSB8CisJCSAgICAgIERSTV9NT0RFX1BST1BfRVhURU5ERURfVFlQRSB8CisJCSAg ICAgIERSTV9NT0RFX1BST1BfSU1NVVRBQkxFIHwKKwkJICAgICAgRFJNX01PREVfUFJPUF9BVE9N SUMpKQorCQlyZXR1cm4gZmFsc2U7CisKKwkvKiBXZSB3YW50IGVpdGhlciBhIGxlZ2FjeSB0eXBl IG9yIGFuIGV4dGVuZGVkIHR5cGUsIGJ1dCBub3QgYm90aCAqLworCWlmICghbGVnYWN5X3R5cGUg PT0gIWV4dF90eXBlKQorCQlyZXR1cm4gZmFsc2U7CisKKwkvKiBPbmx5IG9uZSBsZWdhY3kgdHlw ZSBhdCBhIHRpbWUgcGxlYXNlICovCisJaWYgKGxlZ2FjeV90eXBlICYmICFpc19wb3dlcl9vZl8y KGxlZ2FjeV90eXBlKSkKKwkJcmV0dXJuIGZhbHNlOworCisJcmV0dXJuIHRydWU7CiB9CiAKIC8q KgpAQCAtNzksNiArOTUsOSBAQCBzdHJ1Y3QgZHJtX3Byb3BlcnR5ICpkcm1fcHJvcGVydHlfY3Jl YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJc3RydWN0IGRybV9wcm9wZXJ0eSAqcHJvcGVy dHkgPSBOVUxMOwogCWludCByZXQ7CiAKKwlpZiAoV0FSTl9PTighZHJtX3Byb3BlcnR5X2ZsYWdz X3ZhbGlkKGZsYWdzKSkpCisJCXJldHVybiBOVUxMOworCiAJaWYgKFdBUk5fT04oc3RybGVuKG5h bWUpID49IERSTV9QUk9QX05BTUVfTEVOKSkKIAkJcmV0dXJuIE5VTEw7CiAKQEAgLTEwOCw4ICsx MjcsNiBAQCBzdHJ1Y3QgZHJtX3Byb3BlcnR5ICpkcm1fcHJvcGVydHlfY3JlYXRlKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYsCiAKIAlsaXN0X2FkZF90YWlsKCZwcm9wZXJ0eS0+aGVhZCwgJmRldi0+ bW9kZV9jb25maWcucHJvcGVydHlfbGlzdCk7CiAKLQlXQVJOX09OKCFkcm1fcHJvcGVydHlfdHlw ZV92YWxpZChwcm9wZXJ0eSkpOwotCiAJcmV0dXJuIHByb3BlcnR5OwogZmFpbDoKIAlrZnJlZShw cm9wZXJ0eS0+dmFsdWVzKTsKLS0gCjIuMTYuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v bGlzdGluZm8vZHJpLWRldmVsCg==