From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH 2/2] drm/i915: Move modeset state checker calls. Date: Wed, 23 Mar 2016 14:58:07 +0100 Message-ID: <1458741487-23801-3-git-send-email-maarten.lankhorst@linux.intel.com> References: <1458741487-23801-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 ESMTPS id F200A6E874 for ; Wed, 23 Mar 2016 13:58:10 +0000 (UTC) In-Reply-To: <1458741487-23801-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 VGhlIG1vZGVzZXQgc3RhdGUgY2hlY2tlciBubyBsb25nZXIgaGFzIGZ1bGwgYWNjZXNzIHRvIHRo ZSBoYXJkd2FyZSwKaW5zdGVhZCBpdCBzaG91bGQgb25seSBjaGVjayBhZmZlY3RlZCBjcnRjJ3Mu CgpMb29raW5nIGZvciBkaXNhYmxlZCBzdHVmZiBjYW4gYmUgY2hlY2tlZCBpbW1lZGlhdGVseSBh ZnRlciBhbGwgY3J0YwpkaXNhYmxlcyBoYXZlIGNvbXBsZXRlZCwgd2hpbGUgZWFjaCBlbmFibGVk IGNydGMgY2FuIGJlIGNoZWNrZWQgcmlnaHQKYWZ0ZXIgYmVpbmcgZW5hYmxlZC4KClNpZ25lZC1v ZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5j b20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgMjQgKysrKyst LS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNSBpbnNlcnRpb25zKCspLCAxOSBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNw bGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggNDE0OGIy NjJmMmE3Li5iNmE3NWFhMzJlNWEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMK QEAgLTEzMDI3LDI4ICsxMzAyNywxMyBAQCBjaGVja19kaXNhYmxlZF9kcGxsX3N0YXRlKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYpCiB9CiAKIHN0YXRpYyB2b2lkCi1pbnRlbF9tb2Rlc2V0X2NoZWNr X2Rpc2FibGVkKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCi0JCQkgICAgIHN0cnVjdCBkcm1fYXRv bWljX3N0YXRlICpvbGRfc3RhdGUpCitpbnRlbF9tb2Rlc2V0X2NoZWNrX2Rpc2FibGVkKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYpCiB7CiAJY2hlY2tfZW5jb2Rlcl9zdGF0ZShkZXYpOwogCWNoZWNr X2Nvbm5lY3Rvcl9zdGF0ZShkZXYsIE5VTEwpOwogCWNoZWNrX2Rpc2FibGVkX2RwbGxfc3RhdGUo ZGV2KTsKIH0KIAotc3RhdGljIHZvaWQKLWludGVsX21vZGVzZXRfY2hlY2tfc3RhdGUoc3RydWN0 IGRybV9kZXZpY2UgKmRldiwKLQkJCSAgc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKm9sZF9zdGF0 ZSkKLXsKLQlzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKm9sZF9jcnRjX3N0YXRlOwotCXN0cnVjdCBk cm1fY3J0YyAqY3J0YzsKLQlpbnQgaTsKLQotCWZvcl9lYWNoX2NydGNfaW5fc3RhdGUob2xkX3N0 YXRlLCBjcnRjLCBvbGRfY3J0Y19zdGF0ZSwgaSkKLQkJaW50ZWxfbW9kZXNldF9jaGVja19jcnRj KGNydGMsIG9sZF9jcnRjX3N0YXRlLCBjcnRjLT5zdGF0ZSk7Ci0KLQlpbnRlbF9tb2Rlc2V0X2No ZWNrX2Rpc2FibGVkKGRldiwgb2xkX3N0YXRlKTsKLX0KLQogc3RhdGljIHZvaWQgdXBkYXRlX3Nj YW5saW5lX29mZnNldChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIHsKIAlzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2ID0gY3J0Yy0+YmFzZS5kZXY7CkBAIC0xMzYxNiw2ICsxMzYwMSw4IEBAIHN0YXRp YyBpbnQgaW50ZWxfYXRvbWljX2NvbW1pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQlpZiAo ZGV2X3ByaXYtPmRpc3BsYXkubW9kZXNldF9jb21taXRfY2RjbGsgJiYKIAkJICAgIGludGVsX3N0 YXRlLT5kZXZfY2RjbGsgIT0gZGV2X3ByaXYtPmNkY2xrX2ZyZXEpCiAJCQlkZXZfcHJpdi0+ZGlz cGxheS5tb2Rlc2V0X2NvbW1pdF9jZGNsayhzdGF0ZSk7CisKKwkJaW50ZWxfbW9kZXNldF9jaGVj a19kaXNhYmxlZChkZXYpOwogCX0KIAogCS8qIE5vdyBlbmFibGUgdGhlIGNsb2NrcywgcGxhbmUs IHBpcGUsIGFuZCBjb25uZWN0b3JzIHRoYXQgd2Ugc2V0IHVwLiAqLwpAQCAtMTM2ODIsNiArMTM2 NjksOCBAQCBzdGF0aWMgaW50IGludGVsX2F0b21pY19jb21taXQoc3RydWN0IGRybV9kZXZpY2Ug KmRldiwKIAogCQlpZiAocHV0X2RvbWFpbnNbaV0pCiAJCQltb2Rlc2V0X3B1dF9wb3dlcl9kb21h aW5zKGRldl9wcml2LCBwdXRfZG9tYWluc1tpXSk7CisKKwkJaW50ZWxfbW9kZXNldF9jaGVja19j cnRjKGNydGMsIG9sZF9jcnRjX3N0YXRlLCBjcnRjLT5zdGF0ZSk7CiAJfQogCiAJaWYgKGludGVs X3N0YXRlLT5tb2Rlc2V0KQpAQCAtMTM2OTEsOSArMTM2ODAsNiBAQCBzdGF0aWMgaW50IGludGVs X2F0b21pY19jb21taXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAlkcm1fYXRvbWljX2hlbHBl cl9jbGVhbnVwX3BsYW5lcyhkZXYsIHN0YXRlKTsKIAltdXRleF91bmxvY2soJmRldi0+c3RydWN0 X211dGV4KTsKIAotCWlmIChod19jaGVjaykKLQkJaW50ZWxfbW9kZXNldF9jaGVja19zdGF0ZShk ZXYsIHN0YXRlKTsKLQogCWRybV9hdG9taWNfc3RhdGVfZnJlZShzdGF0ZSk7CiAKIAkvKiBBcyBv bmUgb2YgdGhlIHByaW1hcnkgbW1pbyBhY2Nlc3NvcnMsIEtNUyBoYXMgYSBoaWdoIGxpa2VsaWhv b2QKLS0gCjIuMS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5v cmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1n ZngK