From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH v3 13/19] drm/i915: Do not run most checks when there's no modeset. Date: Mon, 15 Jun 2015 12:33:50 +0200 Message-ID: <1434364436-6366-14-git-send-email-maarten.lankhorst@linux.intel.com> References: <1434364436-6366-1-git-send-email-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 [141.105.120.124]) by gabe.freedesktop.org (Postfix) with ESMTP id 8A81B6E739 for ; Mon, 15 Jun 2015 03:34:14 -0700 (PDT) In-Reply-To: <1434364436-6366-1-git-send-email-maarten.lankhorst@linux.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 List-Id: intel-gfx@lists.freedesktop.org QWxsIHRoZSBjaGVja3MgaW4gaW50ZWxfbW9kZXNldF9jaGVja3MgYXJlIG9ubHkgdXNlZnVsIHdo ZW4gYSBtb2Rlc2V0Cm9jY3VycywgYmVjYXVzZSB0aGVyZSBpcyBub3RoaW5nIHRvIHVwZGF0ZSBv dGhlcndpc2UuCgpTYW1lIGZvciBwb3dlci9jZGNsayBjaGFuZ2VzLCBpZiB0aGVyZSBpcyBubyBt b2Rlc2V0IHRoZXkgYXJlIG5vb3BzLgoKVW5mb3J0dW5hdGVseSBpbnRlbF9tb2Rlc2V0X3BpcGVf Y29uZmlnIHN0aWxsIGdldHMgY2FsbGVkIHdpdGhvdXQKbW9kZXNldCwgYmVjYXVzZSBhdG9taWMg aHcgcmVhZG91dCBpc24ndCBkb25lIHlldC4KClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hv cnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgMzMgKysrKysrKysrKysrKysrKysrKysrKy0tLS0t LS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMjIgaW5zZXJ0aW9ucygrKSwgMTEgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IDZhZTliZDBlMDI4My4uYWUw NDY2NDhjMjlkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5 LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0xMzE1Nywx OCArMTMxNTcsMTggQEAgaW50ZWxfbW9kZXNldF9jb21wdXRlX2NvbmZpZyhzdHJ1Y3QgZHJtX2F0 b21pY19zdGF0ZSAqc3RhdGUpCiAJc3RydWN0IGRybV9jcnRjICpjcnRjOwogCXN0cnVjdCBkcm1f Y3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZTsKIAlpbnQgcmV0LCBpOworCWJvb2wgYW55X21zID0gZmFs c2U7CiAKIAlyZXQgPSBkcm1fYXRvbWljX2hlbHBlcl9jaGVja19tb2Rlc2V0KHN0YXRlLT5kZXYs IHN0YXRlKTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCiAJZm9yX2VhY2hfY3J0Y19pbl9z dGF0ZShzdGF0ZSwgY3J0YywgY3J0Y19zdGF0ZSwgaSkgewotCQlpZiAoIWNydGNfc3RhdGUtPmVu YWJsZSAmJgotCQkgICAgV0FSTl9PTihjcnRjX3N0YXRlLT5hY3RpdmUpKQotCQkJY3J0Y19zdGF0 ZS0+YWN0aXZlID0gZmFsc2U7Ci0KLQkJaWYgKCFjcnRjX3N0YXRlLT5lbmFibGUpCisJCWlmICgh Y3J0Y19zdGF0ZS0+ZW5hYmxlKSB7CisJCQlpZiAobmVlZHNfbW9kZXNldChjcnRjX3N0YXRlKSkK KwkJCQlhbnlfbXMgPSB0cnVlOwogCQkJY29udGludWU7CisJCX0KIAogCQlpZiAoIW5lZWRzX21v ZGVzZXQoY3J0Y19zdGF0ZSkpIHsKIAkJCXJldCA9IGRybV9hdG9taWNfYWRkX2FmZmVjdGVkX2Nv bm5lY3RvcnMoc3RhdGUsIGNydGMpOwpAQCAtMTMxODEsMTQgKzEzMTgxLDIwIEBAIGludGVsX21v ZGVzZXRfY29tcHV0ZV9jb25maWcoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKQogCQlp ZiAocmV0KQogCQkJcmV0dXJuIHJldDsKIAorCQlpZiAobmVlZHNfbW9kZXNldChjcnRjX3N0YXRl KSkKKwkJCWFueV9tcyA9IHRydWU7CisKIAkJaW50ZWxfZHVtcF9waXBlX2NvbmZpZyh0b19pbnRl bF9jcnRjKGNydGMpLAogCQkJCSAgICAgICB0b19pbnRlbF9jcnRjX3N0YXRlKGNydGNfc3RhdGUp LAogCQkJCSAgICAgICAiW21vZGVzZXRdIik7CiAJfQogCi0JcmV0ID0gaW50ZWxfbW9kZXNldF9j aGVja3Moc3RhdGUpOwotCWlmIChyZXQpCi0JCXJldHVybiByZXQ7CisJaWYgKGFueV9tcykgewor CQlyZXQgPSBpbnRlbF9tb2Rlc2V0X2NoZWNrcyhzdGF0ZSk7CisKKwkJaWYgKHJldCkKKwkJCXJl dHVybiByZXQ7CisJfQogCiAJcmV0dXJuIGRybV9hdG9taWNfaGVscGVyX2NoZWNrX3BsYW5lcyhz dGF0ZS0+ZGV2LCBzdGF0ZSk7CiB9CkBAIC0xMzIwMSw2ICsxMzIwNyw3IEBAIHN0YXRpYyBpbnQg X19pbnRlbF9zZXRfbW9kZShzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpCiAJc3RydWN0 IGRybV9jcnRjX3N0YXRlICpjcnRjX3N0YXRlOwogCWludCByZXQgPSAwOwogCWludCBpOworCWJv b2wgYW55X21zID0gZmFsc2U7CiAKIAlyZXQgPSBkcm1fYXRvbWljX2hlbHBlcl9wcmVwYXJlX3Bs YW5lcyhkZXYsIHN0YXRlKTsKIAlpZiAocmV0KQpAQCAtMTMyMDksNyArMTMyMTYsMTEgQEAgc3Rh dGljIGludCBfX2ludGVsX3NldF9tb2RlKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkK IAlkcm1fYXRvbWljX2hlbHBlcl9zd2FwX3N0YXRlKGRldiwgc3RhdGUpOwogCiAJZm9yX2VhY2hf Y3J0Y19pbl9zdGF0ZShzdGF0ZSwgY3J0YywgY3J0Y19zdGF0ZSwgaSkgewotCQlpZiAoIW5lZWRz X21vZGVzZXQoY3J0Yy0+c3RhdGUpIHx8ICFjcnRjX3N0YXRlLT5hY3RpdmUpCisJCWlmICghbmVl ZHNfbW9kZXNldChjcnRjLT5zdGF0ZSkpCisJCQljb250aW51ZTsKKworCQlhbnlfbXMgPSB0cnVl OworCQlpZiAoIWNydGNfc3RhdGUtPmFjdGl2ZSkKIAkJCWNvbnRpbnVlOwogCiAJCWludGVsX2Ny dGNfZGlzYWJsZV9wbGFuZXMoY3J0Yyk7CkBAIC0xMzIyMiw4ICsxMzIzMyw4IEBAIHN0YXRpYyBp bnQgX19pbnRlbF9zZXRfbW9kZShzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpCiAKIAkv KiBUaGUgc3RhdGUgaGFzIGJlZW4gc3dhcGVkIGFib3ZlLCBzbyBzdGF0ZSBhY3R1YWxseSBjb250 YWlucyB0aGUKIAkgKiBvbGQgc3RhdGUgbm93LiAqLwotCi0JbW9kZXNldF91cGRhdGVfY3J0Y19w b3dlcl9kb21haW5zKHN0YXRlKTsKKwlpZiAoYW55X21zKQorCQltb2Rlc2V0X3VwZGF0ZV9jcnRj X3Bvd2VyX2RvbWFpbnMoc3RhdGUpOwogCiAJLyogTm93IGVuYWJsZSB0aGUgY2xvY2tzLCBwbGFu ZSwgcGlwZSwgYW5kIGNvbm5lY3RvcnMgdGhhdCB3ZSBzZXQgdXAuICovCiAJZm9yX2VhY2hfY3J0 Y19pbl9zdGF0ZShzdGF0ZSwgY3J0YywgY3J0Y19zdGF0ZSwgaSkgewotLSAKMi4xLjAKCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWls aW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJl ZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==