From: ville.syrjala@linux.intel.com Subject: [PATCH 1/2] drm/i915: Remove crtc->config usage from intel_modeset_readout_hw_state() Date: Thu, 22 Dec 2016 16:04:41 +0200 Message-ID: <20161222140442.7204-1-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id E67176E267 for ; Thu, 22 Dec 2016 14:04:45 +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 List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCmNy dGMtPmNvbmZpZyBpcyBvbiBpdHMgd2F5IG91dC4gTGV0J3MgcmVkdWNlIG91ciBkZXBlbmRlbmNl IG9uIGl0IGEKbGl0dGxlIGJpdCBieSByZW1vdmluZyBpdCBmcm9tIGludGVsX21vZGVzZXRfcmVh ZG91dF9od19zdGF0ZSgpLgoKQWxzbyByZXBsYWNlIGNydGMtPmFjdHRpdmUgY2hlY2tzIHdpdGgg Y3J0Y19zdGF0ZS0+YmFzZS5hY3RpdmUgY2hlY2tzLgoKQ2M6IE1hYXJ0ZW4gTGFua2hvcnN0IDxt YWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+ClN1Z2dlc3RlZC1ieTogTWFhcnRlbiBM YW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KU2lnbmVkLW9mZi1i eTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KLS0tCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAzOCArKysrKysrKysrKysrKysr KysrKysrKy0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAyNCBpbnNlcnRpb25zKCspLCAx NCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k aXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggZDhl ZmZkNGRhMDM0Li4wOTFjMTkyYzZjNWMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5 LmMKQEAgLTE3MDMyLDcgKzE3MDMyLDggQEAgc3RhdGljIHZvaWQgaW50ZWxfbW9kZXNldF9yZWFk b3V0X2h3X3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJZGV2X3ByaXYtPmFjdGl2ZV9j cnRjcyA9IDA7CiAKIAlmb3JfZWFjaF9pbnRlbF9jcnRjKGRldiwgY3J0YykgewotCQlzdHJ1Y3Qg aW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSA9IGNydGMtPmNvbmZpZzsKKwkJc3RydWN0IGlu dGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUgPQorCQkJdG9faW50ZWxfY3J0Y19zdGF0ZShjcnRj LT5iYXNlLnN0YXRlKTsKIAogCQlfX2RybV9hdG9taWNfaGVscGVyX2NydGNfZGVzdHJveV9zdGF0 ZSgmY3J0Y19zdGF0ZS0+YmFzZSk7CiAJCW1lbXNldChjcnRjX3N0YXRlLCAwLCBzaXplb2YoKmNy dGNfc3RhdGUpKTsKQEAgLTE3MDUxLDcgKzE3MDUyLDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfbW9k ZXNldF9yZWFkb3V0X2h3X3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAKIAkJRFJNX0RF QlVHX0tNUygiW0NSVEM6JWQ6JXNdIGh3IHN0YXRlIHJlYWRvdXQ6ICVzXG4iLAogCQkJICAgICAg Y3J0Yy0+YmFzZS5iYXNlLmlkLCBjcnRjLT5iYXNlLm5hbWUsCi0JCQkgICAgICBlbmFibGVkZGlz YWJsZWQoY3J0Yy0+YWN0aXZlKSk7CisJCQkgICAgICBlbmFibGVkZGlzYWJsZWQoY3J0Y19zdGF0 ZS0+YmFzZS5hY3RpdmUpKTsKIAl9CiAKIAlmb3IgKGkgPSAwOyBpIDwgZGV2X3ByaXYtPm51bV9z aGFyZWRfZHBsbDsgaSsrKSB7CkBAIC0xNzA2MSw3ICsxNzA2MiwxMSBAQCBzdGF0aWMgdm9pZCBp bnRlbF9tb2Rlc2V0X3JlYWRvdXRfaHdfc3RhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJ CQkJCSAgJnBsbC0+Y29uZmlnLmh3X3N0YXRlKTsKIAkJcGxsLT5jb25maWcuY3J0Y19tYXNrID0g MDsKIAkJZm9yX2VhY2hfaW50ZWxfY3J0YyhkZXYsIGNydGMpIHsKLQkJCWlmIChjcnRjLT5hY3Rp dmUgJiYgY3J0Yy0+Y29uZmlnLT5zaGFyZWRfZHBsbCA9PSBwbGwpCisJCQlzdHJ1Y3QgaW50ZWxf Y3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSA9CisJCQkJdG9faW50ZWxfY3J0Y19zdGF0ZShjcnRjLT5i YXNlLnN0YXRlKTsKKworCQkJaWYgKGNydGNfc3RhdGUtPmJhc2UuYWN0aXZlICYmCisJCQkgICAg Y3J0Y19zdGF0ZS0+c2hhcmVkX2RwbGwgPT0gcGxsKQogCQkJCXBsbC0+Y29uZmlnLmNydGNfbWFz ayB8PSAxIDw8IGNydGMtPnBpcGU7CiAJCX0KIAkJcGxsLT5hY3RpdmVfbWFzayA9IHBsbC0+Y29u ZmlnLmNydGNfbWFzazsKQEAgLTE3MDc0LDExICsxNzA3OSwxNCBAQCBzdGF0aWMgdm9pZCBpbnRl bF9tb2Rlc2V0X3JlYWRvdXRfaHdfc3RhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJcGlw ZSA9IDA7CiAKIAkJaWYgKGVuY29kZXItPmdldF9od19zdGF0ZShlbmNvZGVyLCAmcGlwZSkpIHsK KwkJCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlOworCiAJCQljcnRjID0gaW50 ZWxfZ2V0X2NydGNfZm9yX3BpcGUoZGV2X3ByaXYsIHBpcGUpOworCQkJY3J0Y19zdGF0ZSA9IHRv X2ludGVsX2NydGNfc3RhdGUoY3J0Yy0+YmFzZS5zdGF0ZSk7CiAKIAkJCWVuY29kZXItPmJhc2Uu Y3J0YyA9ICZjcnRjLT5iYXNlOwotCQkJY3J0Yy0+Y29uZmlnLT5vdXRwdXRfdHlwZXMgfD0gMSA8 PCBlbmNvZGVyLT50eXBlOwotCQkJZW5jb2Rlci0+Z2V0X2NvbmZpZyhlbmNvZGVyLCBjcnRjLT5j b25maWcpOworCQkJY3J0Y19zdGF0ZS0+b3V0cHV0X3R5cGVzIHw9IDEgPDwgZW5jb2Rlci0+dHlw ZTsKKwkJCWVuY29kZXItPmdldF9jb25maWcoZW5jb2RlciwgY3J0Y19zdGF0ZSk7CiAJCX0gZWxz ZSB7CiAJCQllbmNvZGVyLT5iYXNlLmNydGMgPSBOVUxMOwogCQl9CkBAIC0xNzExOSwxNCArMTcx MjcsMTYgQEAgc3RhdGljIHZvaWQgaW50ZWxfbW9kZXNldF9yZWFkb3V0X2h3X3N0YXRlKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYpCiAJfQogCiAJZm9yX2VhY2hfaW50ZWxfY3J0YyhkZXYsIGNydGMp IHsKKwkJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUgPQorCQkJdG9faW50ZWxf Y3J0Y19zdGF0ZShjcnRjLT5iYXNlLnN0YXRlKTsKIAkJaW50IHBpeGNsayA9IDA7CiAKLQkJY3J0 Yy0+YmFzZS5od21vZGUgPSBjcnRjLT5jb25maWctPmJhc2UuYWRqdXN0ZWRfbW9kZTsKKwkJY3J0 Yy0+YmFzZS5od21vZGUgPSBjcnRjX3N0YXRlLT5iYXNlLmFkanVzdGVkX21vZGU7CiAKIAkJbWVt c2V0KCZjcnRjLT5iYXNlLm1vZGUsIDAsIHNpemVvZihjcnRjLT5iYXNlLm1vZGUpKTsKLQkJaWYg KGNydGMtPmJhc2Uuc3RhdGUtPmFjdGl2ZSkgewotCQkJaW50ZWxfbW9kZV9mcm9tX3BpcGVfY29u ZmlnKCZjcnRjLT5iYXNlLm1vZGUsIGNydGMtPmNvbmZpZyk7Ci0JCQlpbnRlbF9tb2RlX2Zyb21f cGlwZV9jb25maWcoJmNydGMtPmJhc2Uuc3RhdGUtPmFkanVzdGVkX21vZGUsIGNydGMtPmNvbmZp Zyk7CisJCWlmIChjcnRjX3N0YXRlLT5iYXNlLmFjdGl2ZSkgeworCQkJaW50ZWxfbW9kZV9mcm9t X3BpcGVfY29uZmlnKCZjcnRjLT5iYXNlLm1vZGUsIGNydGNfc3RhdGUpOworCQkJaW50ZWxfbW9k ZV9mcm9tX3BpcGVfY29uZmlnKCZjcnRjX3N0YXRlLT5iYXNlLmFkanVzdGVkX21vZGUsIGNydGNf c3RhdGUpOwogCQkJV0FSTl9PTihkcm1fYXRvbWljX3NldF9tb2RlX2Zvcl9jcnRjKGNydGMtPmJh c2Uuc3RhdGUsICZjcnRjLT5iYXNlLm1vZGUpKTsKIAogCQkJLyoKQEAgLTE3MTQ2LDE3ICsxNzE1 NiwxNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9tb2Rlc2V0X3JlYWRvdXRfaHdfc3RhdGUoc3RydWN0 IGRybV9kZXZpY2UgKmRldikKIAkJCSAqIG1vZGUgY2hhbmdlLCB3aGljaCBtZWFucyBpdCdzIHNh ZmUgdG8gZG8gYSBmdWxsCiAJCQkgKiByZWNhbGN1bGF0aW9uLgogCQkJICovCi0JCQljcnRjLT5i YXNlLnN0YXRlLT5tb2RlLnByaXZhdGVfZmxhZ3MgPSBJOTE1X01PREVfRkxBR19JTkhFUklURUQ7 CisJCQljcnRjX3N0YXRlLT5iYXNlLm1vZGUucHJpdmF0ZV9mbGFncyA9IEk5MTVfTU9ERV9GTEFH X0lOSEVSSVRFRDsKIAogCQkJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gOSB8fCBJU19CUk9B RFdFTEwoZGV2X3ByaXYpKQotCQkJCXBpeGNsayA9IGlsa19waXBlX3BpeGVsX3JhdGUoY3J0Yy0+ Y29uZmlnKTsKKwkJCQlwaXhjbGsgPSBpbGtfcGlwZV9waXhlbF9yYXRlKGNydGNfc3RhdGUpOwog CQkJZWxzZSBpZiAoSVNfVkFMTEVZVklFVyhkZXZfcHJpdikgfHwgSVNfQ0hFUlJZVklFVyhkZXZf cHJpdikpCi0JCQkJcGl4Y2xrID0gY3J0Yy0+Y29uZmlnLT5iYXNlLmFkanVzdGVkX21vZGUuY3J0 Y19jbG9jazsKKwkJCQlwaXhjbGsgPSBjcnRjX3N0YXRlLT5iYXNlLmFkanVzdGVkX21vZGUuY3J0 Y19jbG9jazsKIAkJCWVsc2UKIAkJCQlXQVJOX09OKGRldl9wcml2LT5kaXNwbGF5Lm1vZGVzZXRf Y2FsY19jZGNsayk7CiAKIAkJCS8qIHBpeGVsIHJhdGUgbXVzdG4ndCBleGNlZWQgOTUlIG9mIGNk Y2xrIHdpdGggSVBTIG9uIEJEVyAqLwotCQkJaWYgKElTX0JST0FEV0VMTChkZXZfcHJpdikgJiYg Y3J0Yy0+Y29uZmlnLT5pcHNfZW5hYmxlZCkKKwkJCWlmIChJU19CUk9BRFdFTEwoZGV2X3ByaXYp ICYmIGNydGNfc3RhdGUtPmlwc19lbmFibGVkKQogCQkJCXBpeGNsayA9IERJVl9ST1VORF9VUChw aXhjbGsgKiAxMDAsIDk1KTsKIAogCQkJZHJtX2NhbGNfdGltZXN0YW1waW5nX2NvbnN0YW50cygm Y3J0Yy0+YmFzZSwgJmNydGMtPmJhc2UuaHdtb2RlKTsKQEAgLTE3MTY1LDcgKzE3MTc1LDcgQEAg c3RhdGljIHZvaWQgaW50ZWxfbW9kZXNldF9yZWFkb3V0X2h3X3N0YXRlKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYpCiAKIAkJZGV2X3ByaXYtPm1pbl9waXhjbGtbY3J0Yy0+cGlwZV0gPSBwaXhjbGs7 CiAKLQkJaW50ZWxfcGlwZV9jb25maWdfc2FuaXR5X2NoZWNrKGRldl9wcml2LCBjcnRjLT5jb25m aWcpOworCQlpbnRlbF9waXBlX2NvbmZpZ19zYW5pdHlfY2hlY2soZGV2X3ByaXYsIGNydGNfc3Rh dGUpOwogCX0KIH0KIAotLSAKMi4xMC4yCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5m cmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9pbnRlbC1nZngK