From: Maarten Lankhorst Subject: [PATCH] drm/i915: Check for I915_MODE_FLAG_INHERITED before drm_atomic_helper_check_modeset Date: Wed, 21 Feb 2018 10:28:08 +0100 Message-ID: <20180221092808.30060-1-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mblankhorst.nl (mblankhorst.nl [IPv6:2a02:2308::216:3eff:fe92:dfa3]) by gabe.freedesktop.org (Postfix) with ESMTPS id C8C026E5A9 for ; Wed, 21 Feb 2018 09:28:11 +0000 (UTC) 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: Daniel Vetter List-Id: intel-gfx@lists.freedesktop.org TW92aW5nIHRoZSBjaGVjayB1cHdhcmRzIHdpbGwgbWVhbiB3ZSB3ZSBubyBsb25nZXIgaGF2ZSB0 byBhZGQgcGxhbmVzCmFuZCBjb25uZWN0b3JzIG1hbnVhbGx5LCBiZWNhdXNlIGV2ZXJ5dGhpbmcg aXMgaGFuZGxlZCBjb3JyZWN0bHkgYnkKZHJtX2F0b21pY19oZWxwZXJfY2hlY2tfbW9kZXNldCgp IGFzIGludGVuZGVkLgoKU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4u bGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KQ2M6IEx5dWRlIFBhdWwgPGx5dWRlQHJlZGhhdC5j b20+CkNjOiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVyQGZmd2xsLmNoPgpSZXZpZXdlZC1i eTogRGFuaWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBmZndsbC5jaD4KLS0tCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAyMCArKysrKy0tLS0tLS0tLS0tLS0tLQogMSBm aWxlIGNoYW5nZWQsIDUgaW5zZXJ0aW9ucygrKSwgMTUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IDY1YmU3YWY3ZjY0Ny4uYzVjYzkwMjJkNTQ1IDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0xMTkyNyw2ICsxMTkyNywxMSBA QCBzdGF0aWMgaW50IGludGVsX2F0b21pY19jaGVjayhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAog CWludCByZXQsIGk7CiAJYm9vbCBhbnlfbXMgPSBmYWxzZTsKIAorCS8qIENhdGNoIEk5MTVfTU9E RV9GTEFHX0lOSEVSSVRFRCAqLworCWZvcl9lYWNoX29sZG5ld19jcnRjX2luX3N0YXRlKHN0YXRl LCBjcnRjLCBvbGRfY3J0Y19zdGF0ZSwgY3J0Y19zdGF0ZSwgaSkKKwkJaWYgKGNydGNfc3RhdGUt Pm1vZGUucHJpdmF0ZV9mbGFncyAhPSBvbGRfY3J0Y19zdGF0ZS0+bW9kZS5wcml2YXRlX2ZsYWdz KQorCQkJY3J0Y19zdGF0ZS0+bW9kZV9jaGFuZ2VkID0gdHJ1ZTsKKwogCXJldCA9IGRybV9hdG9t aWNfaGVscGVyX2NoZWNrX21vZGVzZXQoZGV2LCBzdGF0ZSk7CiAJaWYgKHJldCkKIAkJcmV0dXJu IHJldDsKQEAgLTExOTM1LDEwICsxMTk0MCw2IEBAIHN0YXRpYyBpbnQgaW50ZWxfYXRvbWljX2No ZWNrKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpw aXBlX2NvbmZpZyA9CiAJCQl0b19pbnRlbF9jcnRjX3N0YXRlKGNydGNfc3RhdGUpOwogCi0JCS8q IENhdGNoIEk5MTVfTU9ERV9GTEFHX0lOSEVSSVRFRCAqLwotCQlpZiAoY3J0Y19zdGF0ZS0+bW9k ZS5wcml2YXRlX2ZsYWdzICE9IG9sZF9jcnRjX3N0YXRlLT5tb2RlLnByaXZhdGVfZmxhZ3MpCi0J CQljcnRjX3N0YXRlLT5tb2RlX2NoYW5nZWQgPSB0cnVlOwotCiAJCWlmICghbmVlZHNfbW9kZXNl dChjcnRjX3N0YXRlKSkKIAkJCWNvbnRpbnVlOwogCkBAIC0xMTk0NywxMyArMTE5NDgsNiBAQCBz dGF0aWMgaW50IGludGVsX2F0b21pY19jaGVjayhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQkJ Y29udGludWU7CiAJCX0KIAotCQkvKiBGSVhNRTogRm9yIG9ubHkgYWN0aXZlX2NoYW5nZWQgd2Ug c2hvdWxkbid0IG5lZWQgdG8gZG8gYW55Ci0JCSAqIHN0YXRlIHJlY29tcHV0YXRpb24gYXQgYWxs LiAqLwotCi0JCXJldCA9IGRybV9hdG9taWNfYWRkX2FmZmVjdGVkX2Nvbm5lY3RvcnMoc3RhdGUs IGNydGMpOwotCQlpZiAocmV0KQotCQkJcmV0dXJuIHJldDsKLQogCQlyZXQgPSBpbnRlbF9tb2Rl c2V0X3BpcGVfY29uZmlnKGNydGMsIHBpcGVfY29uZmlnKTsKIAkJaWYgKHJldCkgewogCQkJaW50 ZWxfZHVtcF9waXBlX2NvbmZpZyh0b19pbnRlbF9jcnRjKGNydGMpLApAQCAtMTE5NzIsMTAgKzEx OTY2LDYgQEAgc3RhdGljIGludCBpbnRlbF9hdG9taWNfY2hlY2soc3RydWN0IGRybV9kZXZpY2Ug KmRldiwKIAkJaWYgKG5lZWRzX21vZGVzZXQoY3J0Y19zdGF0ZSkpCiAJCQlhbnlfbXMgPSB0cnVl OwogCi0JCXJldCA9IGRybV9hdG9taWNfYWRkX2FmZmVjdGVkX3BsYW5lcyhzdGF0ZSwgY3J0Yyk7 Ci0JCWlmIChyZXQpCi0JCQlyZXR1cm4gcmV0OwotCiAJCWludGVsX2R1bXBfcGlwZV9jb25maWco dG9faW50ZWxfY3J0YyhjcnRjKSwgcGlwZV9jb25maWcsCiAJCQkJICAgICAgIG5lZWRzX21vZGVz ZXQoY3J0Y19zdGF0ZSkgPwogCQkJCSAgICAgICAiW21vZGVzZXRdIiA6ICJbZmFzdHNldF0iKTsK LS0gCjIuMTYuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3Jn Cmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4 Cg==