From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville Syrjala Subject: [PATCH 3/3] drm/i915: Collect aux ch vfunc setup into intel_dp_aux_init() Date: Tue, 20 Feb 2018 19:05:24 +0200 Message-ID: <20180220170524.12303-3-ville.syrjala@linux.intel.com> References: <20180220170524.12303-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 482B26E915 for ; Tue, 20 Feb 2018 17:05:33 +0000 (UTC) In-Reply-To: <20180220170524.12303-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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCkNv bGxlY3QgYWxsIHRoZSBhdXggY2ggdmZ1bmMgYXNzaWdubWVudHMgaW50byBpbnRlbF9kcF9hdXhf aW5pdCgpCmluc3RlYWQgb2YgaGF2aW5nIGl0IHNwcmVhZCBhcm91bmQuCgpTaWduZWQtb2ZmLWJ5 OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgotLS0KIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMgfCA1MyArKysrKysrKysrKysrKysrKysrLS0t LS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDI0IGluc2VydGlvbnMoKyksIDI5 IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rw LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jCmluZGV4IGVhNDE0NzY2ZjgyYi4u MDA1NzM1YTdmYzI5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMKQEAgLTE1MDAsOSArMTUwMCwy MCBAQCBzdGF0aWMgaTkxNV9yZWdfdCBza2xfYXV4X2RhdGFfcmVnKHN0cnVjdCBpbnRlbF9kcCAq aW50ZWxfZHAsIGludCBpbmRleCkKIAl9CiB9CiAKLXN0YXRpYyB2b2lkIGludGVsX2F1eF9yZWdf aW5pdChzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKQorc3RhdGljIHZvaWQKK2ludGVsX2RwX2F1 eF9maW5pKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCit7CisJa2ZyZWUoaW50ZWxfZHAtPmF1 eC5uYW1lKTsKK30KKworc3RhdGljIHZvaWQKK2ludGVsX2RwX2F1eF9pbml0KHN0cnVjdCBpbnRl bF9kcCAqaW50ZWxfZHApCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0g dG9faTkxNShpbnRlbF9kcF90b19kZXYoaW50ZWxfZHApKTsKKwlzdHJ1Y3QgaW50ZWxfZW5jb2Rl ciAqZW5jb2RlciA9ICZkcF90b19kaWdfcG9ydChpbnRlbF9kcCktPmJhc2U7CisKKwlpbnRlbF9k cC0+YXV4X2NoID0gaW50ZWxfYXV4X2NoKGludGVsX2RwKTsKKwlpbnRlbF9kcC0+YXV4X3Bvd2Vy X2RvbWFpbiA9IGludGVsX2F1eF9wb3dlcl9kb21haW4oaW50ZWxfZHApOwogCiAJaWYgKElOVEVM X0dFTihkZXZfcHJpdikgPj0gOSkgewogCQlpbnRlbF9kcC0+YXV4X2NoX2N0bF9yZWcgPSBza2xf YXV4X2N0bF9yZWc7CkBAIC0xNTE0LDIzICsxNTI1LDIxIEBAIHN0YXRpYyB2b2lkIGludGVsX2F1 eF9yZWdfaW5pdChzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKQogCQlpbnRlbF9kcC0+YXV4X2No X2N0bF9yZWcgPSBnNHhfYXV4X2N0bF9yZWc7CiAJCWludGVsX2RwLT5hdXhfY2hfZGF0YV9yZWcg PSBnNHhfYXV4X2RhdGFfcmVnOwogCX0KLX0KIAotc3RhdGljIHZvaWQKLWludGVsX2RwX2F1eF9m aW5pKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCi17Ci0Ja2ZyZWUoaW50ZWxfZHAtPmF1eC5u YW1lKTsKLX0KLQotc3RhdGljIHZvaWQKLWludGVsX2RwX2F1eF9pbml0KHN0cnVjdCBpbnRlbF9k cCAqaW50ZWxfZHApCi17Ci0Jc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIgPSAmZHBfdG9f ZGlnX3BvcnQoaW50ZWxfZHApLT5iYXNlOworCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDkp CisJCWludGVsX2RwLT5nZXRfYXV4X2Nsb2NrX2RpdmlkZXIgPSBza2xfZ2V0X2F1eF9jbG9ja19k aXZpZGVyOworCWVsc2UgaWYgKElTX0JST0FEV0VMTChkZXZfcHJpdikgfHwgSVNfSEFTV0VMTChk ZXZfcHJpdikpCisJCWludGVsX2RwLT5nZXRfYXV4X2Nsb2NrX2RpdmlkZXIgPSBoc3dfZ2V0X2F1 eF9jbG9ja19kaXZpZGVyOworCWVsc2UgaWYgKEhBU19QQ0hfU1BMSVQoZGV2X3ByaXYpKQorCQlp bnRlbF9kcC0+Z2V0X2F1eF9jbG9ja19kaXZpZGVyID0gaWxrX2dldF9hdXhfY2xvY2tfZGl2aWRl cjsKKwllbHNlCisJCWludGVsX2RwLT5nZXRfYXV4X2Nsb2NrX2RpdmlkZXIgPSBnNHhfZ2V0X2F1 eF9jbG9ja19kaXZpZGVyOwogCi0JaW50ZWxfZHAtPmF1eF9jaCA9IGludGVsX2F1eF9jaChpbnRl bF9kcCk7Ci0JaW50ZWxfZHAtPmF1eF9wb3dlcl9kb21haW4gPSBpbnRlbF9hdXhfcG93ZXJfZG9t YWluKGludGVsX2RwKTsKKwlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA5KQorCQlpbnRlbF9k cC0+Z2V0X2F1eF9zZW5kX2N0bCA9IHNrbF9nZXRfYXV4X3NlbmRfY3RsOworCWVsc2UKKwkJaW50 ZWxfZHAtPmdldF9hdXhfc2VuZF9jdGwgPSBnNHhfZ2V0X2F1eF9zZW5kX2N0bDsKIAotCWludGVs X2F1eF9yZWdfaW5pdChpbnRlbF9kcCk7CiAJZHJtX2RwX2F1eF9pbml0KCZpbnRlbF9kcC0+YXV4 KTsKIAogCS8qIEZhaWx1cmUgdG8gYWxsb2NhdGUgb3VyIHByZWZlcnJlZCBuYW1lIGlzIG5vdCBj cml0aWNhbCAqLwpAQCAtNjMzOCwyMCArNjM0Nyw2IEBAIGludGVsX2RwX2luaXRfY29ubmVjdG9y KHN0cnVjdCBpbnRlbF9kaWdpdGFsX3BvcnQgKmludGVsX2RpZ19wb3J0LAogCWludGVsX2RwLT5h Y3RpdmVfcGlwZSA9IElOVkFMSURfUElQRTsKIAogCS8qIGludGVsX2RwIHZmdW5jcyAqLwotCWlm IChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDkpCi0JCWludGVsX2RwLT5nZXRfYXV4X2Nsb2NrX2Rp dmlkZXIgPSBza2xfZ2V0X2F1eF9jbG9ja19kaXZpZGVyOwotCWVsc2UgaWYgKElTX0hBU1dFTEwo ZGV2X3ByaXYpIHx8IElTX0JST0FEV0VMTChkZXZfcHJpdikpCi0JCWludGVsX2RwLT5nZXRfYXV4 X2Nsb2NrX2RpdmlkZXIgPSBoc3dfZ2V0X2F1eF9jbG9ja19kaXZpZGVyOwotCWVsc2UgaWYgKEhB U19QQ0hfU1BMSVQoZGV2X3ByaXYpKQotCQlpbnRlbF9kcC0+Z2V0X2F1eF9jbG9ja19kaXZpZGVy ID0gaWxrX2dldF9hdXhfY2xvY2tfZGl2aWRlcjsKLQllbHNlCi0JCWludGVsX2RwLT5nZXRfYXV4 X2Nsb2NrX2RpdmlkZXIgPSBnNHhfZ2V0X2F1eF9jbG9ja19kaXZpZGVyOwotCi0JaWYgKElOVEVM X0dFTihkZXZfcHJpdikgPj0gOSkKLQkJaW50ZWxfZHAtPmdldF9hdXhfc2VuZF9jdGwgPSBza2xf Z2V0X2F1eF9zZW5kX2N0bDsKLQllbHNlCi0JCWludGVsX2RwLT5nZXRfYXV4X3NlbmRfY3RsID0g ZzR4X2dldF9hdXhfc2VuZF9jdGw7Ci0KIAlpZiAoSEFTX0RESShkZXZfcHJpdikpCiAJCWludGVs X2RwLT5wcmVwYXJlX2xpbmtfcmV0cmFpbiA9IGludGVsX2RkaV9wcmVwYXJlX2xpbmtfcmV0cmFp bjsKIAotLSAKMi4xMy42CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRl bC1nZngK