From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH 3/2] drm/i915: Rename hw state checker to hw state verifier. Date: Wed, 30 Mar 2016 10:00:05 +0200 Message-ID: <56FB8785.8020506@linux.intel.com> References: <1458741487-23801-1-git-send-email-maarten.lankhorst@linux.intel.com> <20160325165930.GL20526@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 0C8C56E715 for ; Wed, 30 Mar 2016 08:00:08 +0000 (UTC) In-Reply-To: <20160325165930.GL20526@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Matt Roper Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org Q2hlY2sgZnVuY3Rpb25zIGFyZSB1c2VkIGJ5IGF0b21pYyB0byBzZWUgaWYgdGhlIG5ldyBzdGF0 ZSB3aWxsCmJlIGFsbG93ZWQuIFRoZXJlJ3MgYWxzbyBhIGh3IHN0YXRlIGNoZWNrZXIgd2hpY2gg Y2hlY2tzIGFmdGVyd2FyZHMKdGhhdCB0aGUgY29tbWl0dGVkIHN0YXRlIGlzIGNvcnJlY3QuIFJl bmFtZSBpdCB0byBodyBzdGF0ZSB2ZXJpZmllcgp0byByZWR1Y2Ugc29tZSBjb25mdXNpb24uCgpT dWdnZXN0ZWQtYnk6IE1hdHQgUm9wZXIgPG1hdHRoZXcuZC5yb3BlckBpbnRlbC5jb20+ClNpZ25l ZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRl bC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgNjAgKysr KysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMzAgaW5z ZXJ0aW9ucygrKSwgMzAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh eS5jCmluZGV4IDllNjM3MjA0MjhmYy4uOGI0MjNjZGQ1Mjk1IDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZGlzcGxheS5jCkBAIC02MjgzLDcgKzYyODMsNyBAQCB2b2lkIGludGVsX2VuY29kZXJf ZGVzdHJveShzdHJ1Y3QgZHJtX2VuY29kZXIgKmVuY29kZXIpCiAKIC8qIENyb3NzIGNoZWNrIHRo ZSBhY3R1YWwgaHcgc3RhdGUgd2l0aCBvdXIgb3duIG1vZGVzZXQgc3RhdGUgdHJhY2tpbmcgKGFu ZCBpdCdzCiAgKiBpbnRlcm5hbCBjb25zaXN0ZW5jeSkuICovCi1zdGF0aWMgdm9pZCBpbnRlbF9j b25uZWN0b3JfY2hlY2tfc3RhdGUoc3RydWN0IGludGVsX2Nvbm5lY3RvciAqY29ubmVjdG9yKQor c3RhdGljIHZvaWQgaW50ZWxfY29ubmVjdG9yX3ZlcmlmeV9zdGF0ZShzdHJ1Y3QgaW50ZWxfY29u bmVjdG9yICpjb25uZWN0b3IpCiB7CiAJc3RydWN0IGRybV9jcnRjICpjcnRjID0gY29ubmVjdG9y LT5iYXNlLnN0YXRlLT5jcnRjOwogCkBAIC0xMjc1Miw4ICsxMjc1Miw4IEBAIHN0YXRpYyB2b2lk IGludGVsX3BpcGVfY29uZmlnX3Nhbml0eV9jaGVjayhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYsCiAJfQogfQogCi1zdGF0aWMgdm9pZCBjaGVja193bV9zdGF0ZShzdHJ1Y3QgZHJt X2NydGMgKmNydGMsCi0JCQkgICBzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKm5ld19zdGF0ZSkKK3N0 YXRpYyB2b2lkIHZlcmlmeV93bV9zdGF0ZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCisJCQkgICAg c3RydWN0IGRybV9jcnRjX3N0YXRlICpuZXdfc3RhdGUpCiB7CiAJc3RydWN0IGRybV9kZXZpY2Ug KmRldiA9IGNydGMtPmRldjsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBk ZXYtPmRldl9wcml2YXRlOwpAQCAtMTI3OTgsNyArMTI3OTgsNyBAQCBzdGF0aWMgdm9pZCBjaGVj a193bV9zdGF0ZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiB9CiAKIHN0YXRpYyB2b2lkCi1jaGVj a19jb25uZWN0b3Jfc3RhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGRybV9jcnRj ICpjcnRjKQordmVyaWZ5X2Nvbm5lY3Rvcl9zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBz dHJ1Y3QgZHJtX2NydGMgKmNydGMpCiB7CiAJc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3Rv cjsKIApAQCAtMTI4MDksNyArMTI4MDksNyBAQCBjaGVja19jb25uZWN0b3Jfc3RhdGUoc3RydWN0 IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGRybV9jcnRjICpjcnRjKQogCQlpZiAoc3RhdGUtPmNy dGMgIT0gY3J0YykKIAkJCWNvbnRpbnVlOwogCi0JCWludGVsX2Nvbm5lY3Rvcl9jaGVja19zdGF0 ZSh0b19pbnRlbF9jb25uZWN0b3IoY29ubmVjdG9yKSk7CisJCWludGVsX2Nvbm5lY3Rvcl92ZXJp Znlfc3RhdGUodG9faW50ZWxfY29ubmVjdG9yKGNvbm5lY3RvcikpOwogCiAJCUk5MTVfU1RBVEVf V0FSTihzdGF0ZS0+YmVzdF9lbmNvZGVyICE9IGVuY29kZXIsCiAJCSAgICAgImNvbm5lY3Rvcidz IGF0b21pYyBlbmNvZGVyIGRvZXNuJ3QgbWF0Y2ggbGVnYWN5IGVuY29kZXJcbiIpOwpAQCAtMTI4 MTcsNyArMTI4MTcsNyBAQCBjaGVja19jb25uZWN0b3Jfc3RhdGUoc3RydWN0IGRybV9kZXZpY2Ug KmRldiwgc3RydWN0IGRybV9jcnRjICpjcnRjKQogfQogCiBzdGF0aWMgdm9pZAotY2hlY2tfZW5j b2Rlcl9zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQordmVyaWZ5X2VuY29kZXJfc3RhdGUo c3RydWN0IGRybV9kZXZpY2UgKmRldikKIHsKIAlzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2Rl cjsKIAlzdHJ1Y3QgaW50ZWxfY29ubmVjdG9yICpjb25uZWN0b3I7CkBAIC0xMjg1Nyw5ICsxMjg1 Nyw5IEBAIGNoZWNrX2VuY29kZXJfc3RhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIH0KIAog c3RhdGljIHZvaWQKLWNoZWNrX2NydGNfc3RhdGUoc3RydWN0IGRybV9jcnRjICpjcnRjLAotCQkg c3RydWN0IGRybV9jcnRjX3N0YXRlICpvbGRfY3J0Y19zdGF0ZSwKLQkJIHN0cnVjdCBkcm1fY3J0 Y19zdGF0ZSAqbmV3X2NydGNfc3RhdGUpCit2ZXJpZnlfY3J0Y19zdGF0ZShzdHJ1Y3QgZHJtX2Ny dGMgKmNydGMsCisJCSAgc3RydWN0IGRybV9jcnRjX3N0YXRlICpvbGRfY3J0Y19zdGF0ZSwKKwkJ ICBzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKm5ld19jcnRjX3N0YXRlKQogewogCXN0cnVjdCBkcm1f ZGV2aWNlICpkZXYgPSBjcnRjLT5kZXY7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKQEAgLTEyOTI2LDEwICsxMjkyNiwxMCBAQCBjaGVja19j cnRjX3N0YXRlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIH0KIAogc3RhdGljIHZvaWQKLWNoZWNr X3NpbmdsZV9kcGxsX3N0YXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKLQkJ CXN0cnVjdCBpbnRlbF9zaGFyZWRfZHBsbCAqcGxsLAotCQkJc3RydWN0IGRybV9jcnRjICpjcnRj LAotCQkJc3RydWN0IGRybV9jcnRjX3N0YXRlICpuZXdfc3RhdGUpCit2ZXJpZnlfc2luZ2xlX2Rw bGxfc3RhdGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAorCQkJIHN0cnVjdCBp bnRlbF9zaGFyZWRfZHBsbCAqcGxsLAorCQkJIHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKKwkJCSBz dHJ1Y3QgZHJtX2NydGNfc3RhdGUgKm5ld19zdGF0ZSkKIHsKIAlzdHJ1Y3QgaW50ZWxfZHBsbF9o d19zdGF0ZSBkcGxsX2h3X3N0YXRlOwogCXVuc2lnbmVkIGNydGNfbWFzazsKQEAgLTEyOTgxLDE2 ICsxMjk4MSwxNiBAQCBjaGVja19zaW5nbGVfZHBsbF9zdGF0ZShzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYsCiB9CiAKIHN0YXRpYyB2b2lkCi1jaGVja19zaGFyZWRfZHBsbF9zdGF0 ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCi0JCQlzdHJ1 Y3QgZHJtX2NydGNfc3RhdGUgKm9sZF9jcnRjX3N0YXRlLAotCQkJc3RydWN0IGRybV9jcnRjX3N0 YXRlICpuZXdfY3J0Y19zdGF0ZSkKK3ZlcmlmeV9zaGFyZWRfZHBsbF9zdGF0ZShzdHJ1Y3QgZHJt X2RldmljZSAqZGV2LCBzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCisJCQkgc3RydWN0IGRybV9jcnRj X3N0YXRlICpvbGRfY3J0Y19zdGF0ZSwKKwkJCSBzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKm5ld19j cnRjX3N0YXRlKQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ ZGV2X3ByaXZhdGU7CiAJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKm9sZF9zdGF0ZSA9IHRvX2lu dGVsX2NydGNfc3RhdGUob2xkX2NydGNfc3RhdGUpOwogCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRl ICpuZXdfc3RhdGUgPSB0b19pbnRlbF9jcnRjX3N0YXRlKG5ld19jcnRjX3N0YXRlKTsKIAogCWlm IChuZXdfc3RhdGUtPnNoYXJlZF9kcGxsKQotCQljaGVja19zaW5nbGVfZHBsbF9zdGF0ZShkZXZf cHJpdiwgbmV3X3N0YXRlLT5zaGFyZWRfZHBsbCwgY3J0YywgbmV3X2NydGNfc3RhdGUpOworCQl2 ZXJpZnlfc2luZ2xlX2RwbGxfc3RhdGUoZGV2X3ByaXYsIG5ld19zdGF0ZS0+c2hhcmVkX2RwbGws IGNydGMsIG5ld19jcnRjX3N0YXRlKTsKIAogCWlmIChvbGRfc3RhdGUtPnNoYXJlZF9kcGxsICYm CiAJICAgIG9sZF9zdGF0ZS0+c2hhcmVkX2RwbGwgIT0gbmV3X3N0YXRlLT5zaGFyZWRfZHBsbCkg ewpAQCAtMTMwMDcsNyArMTMwMDcsNyBAQCBjaGVja19zaGFyZWRfZHBsbF9zdGF0ZShzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiB9CiAKIHN0YXRpYyB2b2lk Ci1pbnRlbF9tb2Rlc2V0X2NoZWNrX2NydGMoc3RydWN0IGRybV9jcnRjICpjcnRjLAoraW50ZWxf bW9kZXNldF92ZXJpZnlfY3J0YyhzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJCQkgc3RydWN0IGRy bV9jcnRjX3N0YXRlICpvbGRfc3RhdGUsCiAJCQkgc3RydWN0IGRybV9jcnRjX3N0YXRlICpuZXdf c3RhdGUpCiB7CkBAIC0xMzAxNSwyOCArMTMwMTUsMjggQEAgaW50ZWxfbW9kZXNldF9jaGVja19j cnRjKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkgICAgIXRvX2ludGVsX2NydGNfc3RhdGUobmV3 X3N0YXRlKS0+dXBkYXRlX3BpcGUpCiAJCXJldHVybjsKIAotCWNoZWNrX3dtX3N0YXRlKGNydGMs IG5ld19zdGF0ZSk7Ci0JY2hlY2tfY29ubmVjdG9yX3N0YXRlKGNydGMtPmRldiwgY3J0Yyk7Ci0J Y2hlY2tfY3J0Y19zdGF0ZShjcnRjLCBvbGRfc3RhdGUsIG5ld19zdGF0ZSk7Ci0JY2hlY2tfc2hh cmVkX2RwbGxfc3RhdGUoY3J0Yy0+ZGV2LCBjcnRjLCBvbGRfc3RhdGUsIG5ld19zdGF0ZSk7CisJ dmVyaWZ5X3dtX3N0YXRlKGNydGMsIG5ld19zdGF0ZSk7CisJdmVyaWZ5X2Nvbm5lY3Rvcl9zdGF0 ZShjcnRjLT5kZXYsIGNydGMpOworCXZlcmlmeV9jcnRjX3N0YXRlKGNydGMsIG9sZF9zdGF0ZSwg bmV3X3N0YXRlKTsKKwl2ZXJpZnlfc2hhcmVkX2RwbGxfc3RhdGUoY3J0Yy0+ZGV2LCBjcnRjLCBv bGRfc3RhdGUsIG5ld19zdGF0ZSk7CiB9CiAKIHN0YXRpYyB2b2lkCi1jaGVja19kaXNhYmxlZF9k cGxsX3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCit2ZXJpZnlfZGlzYWJsZWRfZHBsbF9z dGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJaW50IGk7CiAKIAlmb3IgKGkgPSAwOyBp IDwgZGV2X3ByaXYtPm51bV9zaGFyZWRfZHBsbDsgaSsrKQotCQljaGVja19zaW5nbGVfZHBsbF9z dGF0ZShkZXZfcHJpdiwgJmRldl9wcml2LT5zaGFyZWRfZHBsbHNbaV0sIE5VTEwsIE5VTEwpOwor CQl2ZXJpZnlfc2luZ2xlX2RwbGxfc3RhdGUoZGV2X3ByaXYsICZkZXZfcHJpdi0+c2hhcmVkX2Rw bGxzW2ldLCBOVUxMLCBOVUxMKTsKIH0KIAogc3RhdGljIHZvaWQKLWludGVsX21vZGVzZXRfY2hl Y2tfZGlzYWJsZWQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKK2ludGVsX21vZGVzZXRfdmVyaWZ5 X2Rpc2FibGVkKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7Ci0JY2hlY2tfZW5jb2Rlcl9zdGF0 ZShkZXYpOwotCWNoZWNrX2Nvbm5lY3Rvcl9zdGF0ZShkZXYsIE5VTEwpOwotCWNoZWNrX2Rpc2Fi bGVkX2RwbGxfc3RhdGUoZGV2KTsKKwl2ZXJpZnlfZW5jb2Rlcl9zdGF0ZShkZXYpOworCXZlcmlm eV9jb25uZWN0b3Jfc3RhdGUoZGV2LCBOVUxMKTsKKwl2ZXJpZnlfZGlzYWJsZWRfZHBsbF9zdGF0 ZShkZXYpOwogfQogCiBzdGF0aWMgdm9pZCB1cGRhdGVfc2NhbmxpbmVfb2Zmc2V0KHN0cnVjdCBp bnRlbF9jcnRjICpjcnRjKQpAQCAtMTM2MDcsNyArMTM2MDcsNyBAQCBzdGF0aWMgaW50IGludGVs X2F0b21pY19jb21taXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJICAgIGludGVsX3N0YXRl LT5kZXZfY2RjbGsgIT0gZGV2X3ByaXYtPmNkY2xrX2ZyZXEpCiAJCQlkZXZfcHJpdi0+ZGlzcGxh eS5tb2Rlc2V0X2NvbW1pdF9jZGNsayhzdGF0ZSk7CiAKLQkJaW50ZWxfbW9kZXNldF9jaGVja19k aXNhYmxlZChkZXYpOworCQlpbnRlbF9tb2Rlc2V0X3ZlcmlmeV9kaXNhYmxlZChkZXYpOwogCX0K IAogCS8qIE5vdyBlbmFibGUgdGhlIGNsb2NrcywgcGxhbmUsIHBpcGUsIGFuZCBjb25uZWN0b3Jz IHRoYXQgd2Ugc2V0IHVwLiAqLwpAQCAtMTM2NzUsNyArMTM2NzUsNyBAQCBzdGF0aWMgaW50IGlu dGVsX2F0b21pY19jb21taXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJaWYgKHB1dF9kb21h aW5zW2ldKQogCQkJbW9kZXNldF9wdXRfcG93ZXJfZG9tYWlucyhkZXZfcHJpdiwgcHV0X2RvbWFp bnNbaV0pOwogCi0JCWludGVsX21vZGVzZXRfY2hlY2tfY3J0YyhjcnRjLCBvbGRfY3J0Y19zdGF0 ZSwgY3J0Yy0+c3RhdGUpOworCQlpbnRlbF9tb2Rlc2V0X3ZlcmlmeV9jcnRjKGNydGMsIG9sZF9j cnRjX3N0YXRlLCBjcnRjLT5zdGF0ZSk7CiAJfQogCiAJaWYgKGludGVsX3N0YXRlLT5tb2Rlc2V0 KQotLSAKMi4xLjAKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5v cmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1n ZngK