From: Ville Syrjala Subject: [PATCH v2 2/2] drm/i915: Reorganize .disable hooks for pre-DDI DP Date: Wed, 20 Sep 2017 18:12:51 +0300 Message-ID: <20170920151251.5961-1-ville.syrjala@linux.intel.com> References: <20170918173128.476-2-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9DDE66E76A for ; Wed, 20 Sep 2017 15:12:55 +0000 (UTC) In-Reply-To: <20170918173128.476-2-ville.syrjala@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 Cc: Jani Nikula List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCk1v c3Qgb2Ygb3VyIERQIGVuY29kZXIgaG9va3MgYXJlIHNwbGl0IGludG8gcGVyLXBsYXRmb3JtIHZh cmlhbnRzLgouZGlzYWJsZSgpIGFuIGV4Y2VwdGlvbiwgYW5kIHRodXMgaXQncyBhIGJpdCBtZXNz eS4gTGV0J3Mgc3BsaXQgaXQKdXAgYXMgd2VsbC4gV2UnbGwgbGVhdmUgdGhlIGNvbW1vbiBwYXJ0 cyBpbiBhIGhlbHBlciBjYWxsZWQgYnkKZWFjaCBwbGF0Zm9ybSBzcGVjaWZpYyBob29rLiBOb3cg ZWFjaCBwbGF0Zm9ybSBoYXMgbW9zdGx5IGl0cyBvd24KaG9va3MuIFNvbWUgaG9va3MgYXJlIHN0 aWxsIHNoYXJlZCBiZXR3ZWVuIHZsdiBhbmQgY2h2LCBhbmQgYmV0d2VlbgpnNHggYW5kIGlsay4g Tm9uZSBvZiB0aGUgcmVtYWluaW5nIHNoYXJlZCBob29rcyBoYXZlIGFueSBwbGF0Zm9ybQpjaGVj a3MgaW4gdGhlbSBob3dldmVyIHNvIGR1cGxpY2F0aW5nIHRoZW0gZG9lc24ndCBzZWVtIHBhcnRp Y3VsYXJseQp1c2VmdWwuCgpUaGVyZSBpcyBhIHN1YnRsZSBjaGFuZ2Ugb24gVkxWL0NIViB3aGVy ZSB3ZSBub3cgZGlzYWJsZSBQU1IgYmVmb3JlCmF1ZGlvLCB3aGVyZWFzIGJlZm9yZSB3ZSBkaXNh YmxlZCBQU1IgYWZ0ZXIgYXVkaW8uIFRoYXQgc2hvdWxkIGJlCnRvdGFsbHkgZmluZSwgYW5kIFBT UiBpcyBkaXNhYmxlZCBieSBkZWZhdWx0IGFueXdheS4gSmFuaSBhbHNvIHBvaW50ZWQKb3V0IHRv IG1lIHRoYXQgUFNSICsgYXVkaW8gZG9lc24ndCBzZWVtIGxpa2UgYSBwYXJ0aWN1bGFybHkgcmVh bGlzdGljCmNvbWJpbmF0aW9uLgoKdjI6IERyb3AgdGhlIFBTUiBIQVNfRERJIGNoZWNrIGhlcmUg KFJvZHJpZ28pCiAgICBQaW1wIHVwIHRoZSBjb21taXQgbWVzc2FnZSBhIGJpdCBiYXNlZCBvbiBh IGNoYXQgd2l0aCBKYW5pCgpDYzogSmFuaSBOaWt1bGEgPGphbmkubmlrdWxhQGludGVsLmNvbT4K UmV2aWV3ZWQtYnk6IFJvZHJpZ28gVml2aSA8cm9kcmlnby52aXZpQGludGVsLmNvbT4KU2lnbmVk LW9mZi1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4K LS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jIHwgNDUgKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKystLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAzNiBpbnNlcnRpb25z KCspLCA5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2RwLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jCmluZGV4IGU1MzZmNTk0 MmQ3Zi4uMWUwYmZiZTZiNGYzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kcC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMKQEAgLTI2OTIsMjQg KzI2OTIsNDYgQEAgc3RhdGljIHZvaWQgaW50ZWxfZGlzYWJsZV9kcChzdHJ1Y3QgaW50ZWxfZW5j b2RlciAqZW5jb2RlciwKIAkJCSAgICAgY29uc3Qgc3RydWN0IGRybV9jb25uZWN0b3Jfc3RhdGUg Km9sZF9jb25uX3N0YXRlKQogewogCXN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHAgPSBlbmNfdG9f aW50ZWxfZHAoJmVuY29kZXItPmJhc2UpOwotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiA9IHRvX2k5MTUoZW5jb2Rlci0+YmFzZS5kZXYpOwogCiAJaWYgKG9sZF9jcnRjX3N0YXRl LT5oYXNfYXVkaW8pCiAJCWludGVsX2F1ZGlvX2NvZGVjX2Rpc2FibGUoZW5jb2Rlcik7CiAKLQlp ZiAoIUhBU19EREkoZGV2X3ByaXYpKQotCQlpbnRlbF9wc3JfZGlzYWJsZShpbnRlbF9kcCwgb2xk X2NydGNfc3RhdGUpOwotCiAJLyogTWFrZSBzdXJlIHRoZSBwYW5lbCBpcyBvZmYgYmVmb3JlIHRy eWluZyB0byBjaGFuZ2UgdGhlIG1vZGUuIEJ1dCBhbHNvCiAJICogZW5zdXJlIHRoYXQgd2UgaGF2 ZSB2ZGQgd2hpbGUgd2Ugc3dpdGNoIG9mZiB0aGUgcGFuZWwuICovCiAJaW50ZWxfZWRwX3BhbmVs X3ZkZF9vbihpbnRlbF9kcCk7CiAJaW50ZWxfZWRwX2JhY2tsaWdodF9vZmYob2xkX2Nvbm5fc3Rh dGUpOwogCWludGVsX2RwX3NpbmtfZHBtcyhpbnRlbF9kcCwgRFJNX01PREVfRFBNU19PRkYpOwog CWludGVsX2VkcF9wYW5lbF9vZmYoaW50ZWxfZHApOworfQorCitzdGF0aWMgdm9pZCBnNHhfZGlz YWJsZV9kcChzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwKKwkJCSAgIGNvbnN0IHN0cnVj dCBpbnRlbF9jcnRjX3N0YXRlICpvbGRfY3J0Y19zdGF0ZSwKKwkJCSAgIGNvbnN0IHN0cnVjdCBk cm1fY29ubmVjdG9yX3N0YXRlICpvbGRfY29ubl9zdGF0ZSkKK3sKKwlzdHJ1Y3QgaW50ZWxfZHAg KmludGVsX2RwID0gZW5jX3RvX2ludGVsX2RwKCZlbmNvZGVyLT5iYXNlKTsKKworCWludGVsX2Rp c2FibGVfZHAoZW5jb2Rlciwgb2xkX2NydGNfc3RhdGUsIG9sZF9jb25uX3N0YXRlKTsKIAogCS8q IGRpc2FibGUgdGhlIHBvcnQgYmVmb3JlIHRoZSBwaXBlIG9uIGc0eCAqLwotCWlmIChJTlRFTF9H RU4oZGV2X3ByaXYpIDwgNSkKLQkJaW50ZWxfZHBfbGlua19kb3duKGludGVsX2RwKTsKKwlpbnRl bF9kcF9saW5rX2Rvd24oaW50ZWxfZHApOworfQorCitzdGF0aWMgdm9pZCBpbGtfZGlzYWJsZV9k cChzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwKKwkJCSAgIGNvbnN0IHN0cnVjdCBpbnRl bF9jcnRjX3N0YXRlICpvbGRfY3J0Y19zdGF0ZSwKKwkJCSAgIGNvbnN0IHN0cnVjdCBkcm1fY29u bmVjdG9yX3N0YXRlICpvbGRfY29ubl9zdGF0ZSkKK3sKKwlpbnRlbF9kaXNhYmxlX2RwKGVuY29k ZXIsIG9sZF9jcnRjX3N0YXRlLCBvbGRfY29ubl9zdGF0ZSk7Cit9CisKK3N0YXRpYyB2b2lkIHZs dl9kaXNhYmxlX2RwKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAorCQkJICAgY29uc3Qg c3RydWN0IGludGVsX2NydGNfc3RhdGUgKm9sZF9jcnRjX3N0YXRlLAorCQkJICAgY29uc3Qgc3Ry dWN0IGRybV9jb25uZWN0b3Jfc3RhdGUgKm9sZF9jb25uX3N0YXRlKQoreworCXN0cnVjdCBpbnRl bF9kcCAqaW50ZWxfZHAgPSBlbmNfdG9faW50ZWxfZHAoJmVuY29kZXItPmJhc2UpOworCisJaW50 ZWxfcHNyX2Rpc2FibGUoaW50ZWxfZHAsIG9sZF9jcnRjX3N0YXRlKTsKKworCWludGVsX2Rpc2Fi bGVfZHAoZW5jb2Rlciwgb2xkX2NydGNfc3RhdGUsIG9sZF9jb25uX3N0YXRlKTsKIH0KIAogc3Rh dGljIHZvaWQgaWxrX3Bvc3RfZGlzYWJsZV9kcChzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2Rl ciwKQEAgLTYxNDUsNyArNjE2Nyw2IEBAIGJvb2wgaW50ZWxfZHBfaW5pdChzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCWdvdG8gZXJyX2VuY29kZXJfaW5pdDsKIAogCWludGVs X2VuY29kZXItPmNvbXB1dGVfY29uZmlnID0gaW50ZWxfZHBfY29tcHV0ZV9jb25maWc7Ci0JaW50 ZWxfZW5jb2Rlci0+ZGlzYWJsZSA9IGludGVsX2Rpc2FibGVfZHA7CiAJaW50ZWxfZW5jb2Rlci0+ Z2V0X2h3X3N0YXRlID0gaW50ZWxfZHBfZ2V0X2h3X3N0YXRlOwogCWludGVsX2VuY29kZXItPmdl dF9jb25maWcgPSBpbnRlbF9kcF9nZXRfY29uZmlnOwogCWludGVsX2VuY29kZXItPnN1c3BlbmQg PSBpbnRlbF9kcF9lbmNvZGVyX3N1c3BlbmQ7CkBAIC02MTUzLDE4ICs2MTc0LDI0IEBAIGJvb2wg aW50ZWxfZHBfaW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCWludGVs X2VuY29kZXItPnByZV9wbGxfZW5hYmxlID0gY2h2X2RwX3ByZV9wbGxfZW5hYmxlOwogCQlpbnRl bF9lbmNvZGVyLT5wcmVfZW5hYmxlID0gY2h2X3ByZV9lbmFibGVfZHA7CiAJCWludGVsX2VuY29k ZXItPmVuYWJsZSA9IHZsdl9lbmFibGVfZHA7CisJCWludGVsX2VuY29kZXItPmRpc2FibGUgPSB2 bHZfZGlzYWJsZV9kcDsKIAkJaW50ZWxfZW5jb2Rlci0+cG9zdF9kaXNhYmxlID0gY2h2X3Bvc3Rf ZGlzYWJsZV9kcDsKIAkJaW50ZWxfZW5jb2Rlci0+cG9zdF9wbGxfZGlzYWJsZSA9IGNodl9kcF9w b3N0X3BsbF9kaXNhYmxlOwogCX0gZWxzZSBpZiAoSVNfVkFMTEVZVklFVyhkZXZfcHJpdikpIHsK IAkJaW50ZWxfZW5jb2Rlci0+cHJlX3BsbF9lbmFibGUgPSB2bHZfZHBfcHJlX3BsbF9lbmFibGU7 CiAJCWludGVsX2VuY29kZXItPnByZV9lbmFibGUgPSB2bHZfcHJlX2VuYWJsZV9kcDsKIAkJaW50 ZWxfZW5jb2Rlci0+ZW5hYmxlID0gdmx2X2VuYWJsZV9kcDsKKwkJaW50ZWxfZW5jb2Rlci0+ZGlz YWJsZSA9IHZsdl9kaXNhYmxlX2RwOwogCQlpbnRlbF9lbmNvZGVyLT5wb3N0X2Rpc2FibGUgPSB2 bHZfcG9zdF9kaXNhYmxlX2RwOworCX0gZWxzZSBpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA1 KSB7CisJCWludGVsX2VuY29kZXItPnByZV9lbmFibGUgPSBnNHhfcHJlX2VuYWJsZV9kcDsKKwkJ aW50ZWxfZW5jb2Rlci0+ZW5hYmxlID0gZzR4X2VuYWJsZV9kcDsKKwkJaW50ZWxfZW5jb2Rlci0+ ZGlzYWJsZSA9IGlsa19kaXNhYmxlX2RwOworCQlpbnRlbF9lbmNvZGVyLT5wb3N0X2Rpc2FibGUg PSBpbGtfcG9zdF9kaXNhYmxlX2RwOwogCX0gZWxzZSB7CiAJCWludGVsX2VuY29kZXItPnByZV9l bmFibGUgPSBnNHhfcHJlX2VuYWJsZV9kcDsKIAkJaW50ZWxfZW5jb2Rlci0+ZW5hYmxlID0gZzR4 X2VuYWJsZV9kcDsKLQkJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gNSkKLQkJCWludGVsX2Vu Y29kZXItPnBvc3RfZGlzYWJsZSA9IGlsa19wb3N0X2Rpc2FibGVfZHA7CisJCWludGVsX2VuY29k ZXItPmRpc2FibGUgPSBnNHhfZGlzYWJsZV9kcDsKIAl9CiAKIAlpbnRlbF9kaWdfcG9ydC0+cG9y dCA9IHBvcnQ7Ci0tIAoyLjEzLjUKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVk ZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZv L2ludGVsLWdmeAo=