From: Ville Syrjala Subject: [PATCH 2/2] drm/i915: Reorganize .disable hooks for pre-DDI DP Date: Mon, 18 Sep 2017 20:31:28 +0300 Message-ID: <20170918173128.476-2-ville.syrjala@linux.intel.com> References: <20170918173128.476-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 mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7455B6E3C4 for ; Mon, 18 Sep 2017 17:31:34 +0000 (UTC) In-Reply-To: <20170918173128.476-1-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 List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCk1v c3Qgb2Ygb3VyIERQIGVuY29kZXIgaG9va3MgYXJlIHNwbGl0IGludG8gcGVyLXBsYXRmb3JtIHZh cmlhbnRzLgouZGlzYWJsZSgpIGFuIGV4Y2VwdGlvbiwgYW5kIHRodXMgaXQncyBhIGJpdCBtZXNz eS4gTGV0J3Mgc3BsaXQgaXQKdXAgYXMgd2VsbC4gV2UnbGwgbGVhdmUgdGhlIGNvbW1vbiBwYXJ0 cyBpbiBhIGhlbHBlciBjYWxsZWQgYnkKZWFjaCBwbGF0Zm9ybSBzcGVjaWZpYyBob29rLgoKVGhl cmUgaXMgYSBzdWJ0bGUgY2hhbmdlIG9uIFZMVi9DSFYgd2hlcmUgd2Ugbm93IGRpc2FibGUgUFNS IGJlZm9yZQphdWRpbywgd2hlcmVhcyBiZWZvcmUgd2UgZGlzYWJsZWQgUFNSIGFmdGVyIGF1ZGlv LiBUaGF0IHNob3VsZCBiZQp0b3RhbGx5IGZpbmUsIGFuZCBQU1IgaXMgZGlzYWJsZWQgYnkgZGVm YXVsdCBhbnl3YXkuCgpTaWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmph bGFAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMg fCA0NCArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLQogMSBmaWxlIGNo YW5nZWQsIDM2IGluc2VydGlvbnMoKyksIDggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2RwLmMKaW5kZXggZDBlYTljNGY4N2M4Li5kY2RlZmQ5ODY1NjkgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZHAuYwpAQCAtMjY5MiwyMyArMjY5Miw0NiBAQCBzdGF0aWMgdm9pZCBpbnRlbF9kaXNhYmxl X2RwKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAogCQkJICAgICBjb25zdCBzdHJ1Y3Qg ZHJtX2Nvbm5lY3Rvcl9zdGF0ZSAqb2xkX2Nvbm5fc3RhdGUpCiB7CiAJc3RydWN0IGludGVsX2Rw ICppbnRlbF9kcCA9IGVuY190b19pbnRlbF9kcCgmZW5jb2Rlci0+YmFzZSk7Ci0Jc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShlbmNvZGVyLT5iYXNlLmRldik7CiAK IAlpZiAob2xkX2NydGNfc3RhdGUtPmhhc19hdWRpbykKIAkJaW50ZWxfYXVkaW9fY29kZWNfZGlz YWJsZShlbmNvZGVyKTsKIAotCWludGVsX3Bzcl9kaXNhYmxlKGludGVsX2RwLCBvbGRfY3J0Y19z dGF0ZSk7Ci0KIAkvKiBNYWtlIHN1cmUgdGhlIHBhbmVsIGlzIG9mZiBiZWZvcmUgdHJ5aW5nIHRv IGNoYW5nZSB0aGUgbW9kZS4gQnV0IGFsc28KIAkgKiBlbnN1cmUgdGhhdCB3ZSBoYXZlIHZkZCB3 aGlsZSB3ZSBzd2l0Y2ggb2ZmIHRoZSBwYW5lbC4gKi8KIAlpbnRlbF9lZHBfcGFuZWxfdmRkX29u KGludGVsX2RwKTsKIAlpbnRlbF9lZHBfYmFja2xpZ2h0X29mZihvbGRfY29ubl9zdGF0ZSk7CiAJ aW50ZWxfZHBfc2lua19kcG1zKGludGVsX2RwLCBEUk1fTU9ERV9EUE1TX09GRik7CiAJaW50ZWxf ZWRwX3BhbmVsX29mZihpbnRlbF9kcCk7Cit9CisKK3N0YXRpYyB2b2lkIGc0eF9kaXNhYmxlX2Rw KHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAorCQkJICAgY29uc3Qgc3RydWN0IGludGVs X2NydGNfc3RhdGUgKm9sZF9jcnRjX3N0YXRlLAorCQkJICAgY29uc3Qgc3RydWN0IGRybV9jb25u ZWN0b3Jfc3RhdGUgKm9sZF9jb25uX3N0YXRlKQoreworCXN0cnVjdCBpbnRlbF9kcCAqaW50ZWxf ZHAgPSBlbmNfdG9faW50ZWxfZHAoJmVuY29kZXItPmJhc2UpOworCisJaW50ZWxfZGlzYWJsZV9k cChlbmNvZGVyLCBvbGRfY3J0Y19zdGF0ZSwgb2xkX2Nvbm5fc3RhdGUpOwogCiAJLyogZGlzYWJs ZSB0aGUgcG9ydCBiZWZvcmUgdGhlIHBpcGUgb24gZzR4ICovCi0JaWYgKElOVEVMX0dFTihkZXZf cHJpdikgPCA1KQotCQlpbnRlbF9kcF9saW5rX2Rvd24oaW50ZWxfZHApOworCWludGVsX2RwX2xp bmtfZG93bihpbnRlbF9kcCk7Cit9CisKK3N0YXRpYyB2b2lkIGlsa19kaXNhYmxlX2RwKHN0cnVj dCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAorCQkJICAgY29uc3Qgc3RydWN0IGludGVsX2NydGNf c3RhdGUgKm9sZF9jcnRjX3N0YXRlLAorCQkJICAgY29uc3Qgc3RydWN0IGRybV9jb25uZWN0b3Jf c3RhdGUgKm9sZF9jb25uX3N0YXRlKQoreworCWludGVsX2Rpc2FibGVfZHAoZW5jb2Rlciwgb2xk X2NydGNfc3RhdGUsIG9sZF9jb25uX3N0YXRlKTsKK30KKworc3RhdGljIHZvaWQgdmx2X2Rpc2Fi bGVfZHAoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCisJCQkgICBjb25zdCBzdHJ1Y3Qg aW50ZWxfY3J0Y19zdGF0ZSAqb2xkX2NydGNfc3RhdGUsCisJCQkgICBjb25zdCBzdHJ1Y3QgZHJt X2Nvbm5lY3Rvcl9zdGF0ZSAqb2xkX2Nvbm5fc3RhdGUpCit7CisJc3RydWN0IGludGVsX2RwICpp bnRlbF9kcCA9IGVuY190b19pbnRlbF9kcCgmZW5jb2Rlci0+YmFzZSk7CisKKwlpbnRlbF9wc3Jf ZGlzYWJsZShpbnRlbF9kcCwgb2xkX2NydGNfc3RhdGUpOworCisJaW50ZWxfZGlzYWJsZV9kcChl bmNvZGVyLCBvbGRfY3J0Y19zdGF0ZSwgb2xkX2Nvbm5fc3RhdGUpOwogfQogCiBzdGF0aWMgdm9p ZCBpbGtfcG9zdF9kaXNhYmxlX2RwKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLApAQCAt NjE0NCw3ICs2MTY3LDYgQEAgYm9vbCBpbnRlbF9kcF9pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiwKIAkJZ290byBlcnJfZW5jb2Rlcl9pbml0OwogCiAJaW50ZWxfZW5jb2Rl ci0+Y29tcHV0ZV9jb25maWcgPSBpbnRlbF9kcF9jb21wdXRlX2NvbmZpZzsKLQlpbnRlbF9lbmNv ZGVyLT5kaXNhYmxlID0gaW50ZWxfZGlzYWJsZV9kcDsKIAlpbnRlbF9lbmNvZGVyLT5nZXRfaHdf c3RhdGUgPSBpbnRlbF9kcF9nZXRfaHdfc3RhdGU7CiAJaW50ZWxfZW5jb2Rlci0+Z2V0X2NvbmZp ZyA9IGludGVsX2RwX2dldF9jb25maWc7CiAJaW50ZWxfZW5jb2Rlci0+c3VzcGVuZCA9IGludGVs X2RwX2VuY29kZXJfc3VzcGVuZDsKQEAgLTYxNTIsMTggKzYxNzQsMjQgQEAgYm9vbCBpbnRlbF9k cF9pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJaW50ZWxfZW5jb2Rl ci0+cHJlX3BsbF9lbmFibGUgPSBjaHZfZHBfcHJlX3BsbF9lbmFibGU7CiAJCWludGVsX2VuY29k ZXItPnByZV9lbmFibGUgPSBjaHZfcHJlX2VuYWJsZV9kcDsKIAkJaW50ZWxfZW5jb2Rlci0+ZW5h YmxlID0gdmx2X2VuYWJsZV9kcDsKKwkJaW50ZWxfZW5jb2Rlci0+ZGlzYWJsZSA9IHZsdl9kaXNh YmxlX2RwOwogCQlpbnRlbF9lbmNvZGVyLT5wb3N0X2Rpc2FibGUgPSBjaHZfcG9zdF9kaXNhYmxl X2RwOwogCQlpbnRlbF9lbmNvZGVyLT5wb3N0X3BsbF9kaXNhYmxlID0gY2h2X2RwX3Bvc3RfcGxs X2Rpc2FibGU7CiAJfSBlbHNlIGlmIChJU19WQUxMRVlWSUVXKGRldl9wcml2KSkgewogCQlpbnRl bF9lbmNvZGVyLT5wcmVfcGxsX2VuYWJsZSA9IHZsdl9kcF9wcmVfcGxsX2VuYWJsZTsKIAkJaW50 ZWxfZW5jb2Rlci0+cHJlX2VuYWJsZSA9IHZsdl9wcmVfZW5hYmxlX2RwOwogCQlpbnRlbF9lbmNv ZGVyLT5lbmFibGUgPSB2bHZfZW5hYmxlX2RwOworCQlpbnRlbF9lbmNvZGVyLT5kaXNhYmxlID0g dmx2X2Rpc2FibGVfZHA7CiAJCWludGVsX2VuY29kZXItPnBvc3RfZGlzYWJsZSA9IHZsdl9wb3N0 X2Rpc2FibGVfZHA7CisJfSBlbHNlIGlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDUpIHsKKwkJ aW50ZWxfZW5jb2Rlci0+cHJlX2VuYWJsZSA9IGc0eF9wcmVfZW5hYmxlX2RwOworCQlpbnRlbF9l bmNvZGVyLT5lbmFibGUgPSBnNHhfZW5hYmxlX2RwOworCQlpbnRlbF9lbmNvZGVyLT5kaXNhYmxl ID0gaWxrX2Rpc2FibGVfZHA7CisJCWludGVsX2VuY29kZXItPnBvc3RfZGlzYWJsZSA9IGlsa19w b3N0X2Rpc2FibGVfZHA7CiAJfSBlbHNlIHsKIAkJaW50ZWxfZW5jb2Rlci0+cHJlX2VuYWJsZSA9 IGc0eF9wcmVfZW5hYmxlX2RwOwogCQlpbnRlbF9lbmNvZGVyLT5lbmFibGUgPSBnNHhfZW5hYmxl X2RwOwotCQlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA1KQotCQkJaW50ZWxfZW5jb2Rlci0+ cG9zdF9kaXNhYmxlID0gaWxrX3Bvc3RfZGlzYWJsZV9kcDsKKwkJaW50ZWxfZW5jb2Rlci0+ZGlz YWJsZSA9IGc0eF9kaXNhYmxlX2RwOwogCX0KIAogCWludGVsX2RpZ19wb3J0LT5wb3J0ID0gcG9y dDsKLS0gCjIuMTMuNQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwt Z2Z4Cg==