From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH 10/24] drm/i915: Do not run most checks when there's no modeset. Date: Mon, 1 Jun 2015 15:27:13 +0200 Message-ID: <1433165247-15928-11-git-send-email-maarten.lankhorst@linux.intel.com> References: <1433165247-15928-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 D9B496E604 for ; Mon, 1 Jun 2015 06:27:44 -0700 (PDT) In-Reply-To: <1433165247-15928-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 VGhlIG9ubHkgcmVhc29uIHRvIGNoZWNrIGFueXRoaW5nIHdpdGhvdXQgbW9kZXNldCB3YXMgZm9y IGZhc3Rib290CmF1ZGlvX2NoYW5nZWQvaW5mb2ZyYW1lX2NoYW5nZWQgY2hhbmdlcy4KCk5vdyB0 aGF0J3MgaGFuZGxlZCBkdXJpbmcgaHcgcmVhZG91dCBwYXJhbWV0ZXJzIHNob3VsZG4ndCBjaGFu Z2UKYW55IG1vcmUgd2hlbiBhbGwgdGhpbmdzIHN0YXkgaWRlbnRpY2FsLgoKU2lnbmVkLW9mZi1i eTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4K LS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAyNyArKysrKysrKysr KysrKysrKysrKy0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAyMCBpbnNlcnRpb25zKCspLCA3IGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3Bs YXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCBjNzRlMzUz ZDkxNTIuLjNjMDVmMzEyNjgzZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpA QCAtMTI2MzQsMTMgKzEyNjM0LDE4IEBAIGludGVsX21vZGVzZXRfY29tcHV0ZV9jb25maWcoc3Ry dWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKQogCXN0cnVjdCBkcm1fY3J0YyAqY3J0YzsKIAlz dHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGU7CiAJaW50IHJldCwgaTsKKwlib29sIGFu eV9tcyA9IGZhbHNlOwogCiAJcmV0ID0gZHJtX2F0b21pY19oZWxwZXJfY2hlY2tfbW9kZXNldChz dGF0ZS0+ZGV2LCBzdGF0ZSk7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIAogCWZvcl9lYWNo X2NydGNfaW5fc3RhdGUoc3RhdGUsIGNydGMsIGNydGNfc3RhdGUsIGkpIHsKLQkJaWYgKCFuZWVk c19tb2Rlc2V0KGNydGNfc3RhdGUpIHx8ICFjcnRjX3N0YXRlLT5lbmFibGUpCisJCWlmICghbmVl ZHNfbW9kZXNldChjcnRjX3N0YXRlKSkKKwkJCWNvbnRpbnVlOworCisJCWFueV9tcyA9IHRydWU7 CisJCWlmICghY3J0Y19zdGF0ZS0+ZW5hYmxlKQogCQkJY29udGludWU7CiAKIAkJcmV0ID0gaW50 ZWxfbW9kZXNldF9waXBlX2NvbmZpZyhjcnRjLApAQCAtMTI2NTMsOSArMTI2NTgsMTIgQEAgaW50 ZWxfbW9kZXNldF9jb21wdXRlX2NvbmZpZyhzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUp CiAJCQkJICAgICAgICJbbW9kZXNldF0iKTsKIAl9CiAKLQlyZXQgPSBpbnRlbF9tb2Rlc2V0X2No ZWNrcyhzdGF0ZSk7Ci0JaWYgKHJldCkKLQkJcmV0dXJuIHJldDsKKwlpZiAoYW55X21zKSB7CisJ CXJldCA9IGludGVsX21vZGVzZXRfY2hlY2tzKHN0YXRlKTsKKworCQlpZiAocmV0KQorCQkJcmV0 dXJuIHJldDsKKwl9CiAKIAlyZXR1cm4gZHJtX2F0b21pY19oZWxwZXJfY2hlY2tfcGxhbmVzKHN0 YXRlLT5kZXYsIHN0YXRlKTsKIH0KQEAgLTEyNjY4LDYgKzEyNjc2LDcgQEAgc3RhdGljIGludCBf X2ludGVsX3NldF9tb2RlKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIAlzdHJ1Y3Qg ZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGU7CiAJaW50IHJldCA9IDA7CiAJaW50IGk7CisJYm9v bCBhbnlfbXMgPSBmYWxzZTsKIAogCXJldCA9IGRybV9hdG9taWNfaGVscGVyX3ByZXBhcmVfcGxh bmVzKGRldiwgc3RhdGUpOwogCWlmIChyZXQpCkBAIC0xMjY3Niw3ICsxMjY4NSwxMSBAQCBzdGF0 aWMgaW50IF9faW50ZWxfc2V0X21vZGUoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKQog CWRybV9hdG9taWNfaGVscGVyX3N3YXBfc3RhdGUoZGV2LCBzdGF0ZSk7CiAKIAlmb3JfZWFjaF9j cnRjX2luX3N0YXRlKHN0YXRlLCBjcnRjLCBjcnRjX3N0YXRlLCBpKSB7Ci0JCWlmICghbmVlZHNf bW9kZXNldChjcnRjLT5zdGF0ZSkgfHwgIWNydGNfc3RhdGUtPmFjdGl2ZSkKKwkJaWYgKCFuZWVk c19tb2Rlc2V0KGNydGMtPnN0YXRlKSkKKwkJCWNvbnRpbnVlOworCisJCWFueV9tcyA9IHRydWU7 CisJCWlmICghY3J0Y19zdGF0ZS0+YWN0aXZlKQogCQkJY29udGludWU7CiAKIAkJaW50ZWxfY3J0 Y19kaXNhYmxlX3BsYW5lcyhjcnRjKTsKQEAgLTEyNjg5LDggKzEyNzAyLDggQEAgc3RhdGljIGlu dCBfX2ludGVsX3NldF9tb2RlKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIAogCS8q IFRoZSBzdGF0ZSBoYXMgYmVlbiBzd2FwZWQgYWJvdmUsIHNvIHN0YXRlIGFjdHVhbGx5IGNvbnRh aW5zIHRoZQogCSAqIG9sZCBzdGF0ZSBub3cuICovCi0KLQltb2Rlc2V0X3VwZGF0ZV9jcnRjX3Bv d2VyX2RvbWFpbnMoc3RhdGUsIHRydWUpOworCWlmIChhbnlfbXMpCisJCW1vZGVzZXRfdXBkYXRl X2NydGNfcG93ZXJfZG9tYWlucyhzdGF0ZSwgdHJ1ZSk7CiAKIAkvKiBOb3cgZW5hYmxlIHRoZSBj bG9ja3MsIHBsYW5lLCBwaXBlLCBhbmQgY29ubmVjdG9ycyB0aGF0IHdlIHNldCB1cC4gKi8KIAlm b3JfZWFjaF9jcnRjX2luX3N0YXRlKHN0YXRlLCBjcnRjLCBjcnRjX3N0YXRlLCBpKSB7Ci0tIAoy LjEuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50 ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK