From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: [PATCH 2/8] drm/i915: Move aux_ch to intel_digital_port Date: Tue, 30 Oct 2018 17:40:45 +0200 Message-ID: <20181030154051.30851-3-imre.deak@intel.com> References: <20181030154051.30851-1-imre.deak@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7E7476E0E8 for ; Tue, 30 Oct 2018 15:40:57 +0000 (UTC) In-Reply-To: <20181030154051.30851-1-imre.deak@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: Paulo Zanoni List-Id: intel-gfx@lists.freedesktop.org RnJvbSBJQ0wgb253YXJkcyBhbGwgRERJL1R5cGVDIHBvcnRzIC0gZXZlbiB3b3JraW5nIGluIEhE TUkgbW9kZSAtIG5lZWQKdG8ga25vdyB0aGVpciBjb3JyZXNwb25kaW5nIEFVWCBDSCwgc28gbW92 ZSB0aGUgZmllbGQgdG8gYSBjb21tb24Kc3RydWN0LgoKTm8gZnVuY3Rpb25hbCBjaGFuZ2UuCgpD YzogUGF1bG8gWmFub25pIDxwYXVsby5yLnphbm9uaUBpbnRlbC5jb20+CkNjOiBWaWxsZSBTeXJq w6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBJbXJl IERlYWsgPGltcmUuZGVha0BpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZGRpLmMgfCAgNCArKystCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jICB8IDM1 ICsrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kcnYuaCB8ICAyICstCiAzIGZpbGVzIGNoYW5nZWQsIDI3IGluc2VydGlvbnMoKyks IDE0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2RkaS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGRpLmMKaW5kZXggZTQwYThjOTdk MzRiLi4zMmEwODAyNjVkMDMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2RkaS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RkaS5jCkBAIC0yMDg0LDYg KzIwODQsOCBAQCBib29sIGludGVsX2RkaV9nZXRfaHdfc3RhdGUoc3RydWN0IGludGVsX2VuY29k ZXIgKmVuY29kZXIsCiBzdGF0aWMgaW5saW5lIGVudW0gaW50ZWxfZGlzcGxheV9wb3dlcl9kb21h aW4KIGludGVsX2RkaV9tYWluX2xpbmtfYXV4X2RvbWFpbihzdHJ1Y3QgaW50ZWxfZHAgKmludGVs X2RwKQogeworCXN0cnVjdCBpbnRlbF9kaWdpdGFsX3BvcnQgKmRpZ19wb3J0ID0gZHBfdG9fZGln X3BvcnQoaW50ZWxfZHApOworCiAJLyogQ05MKyBIVyByZXF1aXJlcyBjb3JyZXNwb25kaW5nIEFV WCBJT3MgdG8gYmUgcG93ZXJlZCB1cCBmb3IgUFNSIHdpdGgKIAkgKiBEQyBzdGF0ZXMgZW5hYmxl ZCBhdCB0aGUgc2FtZSB0aW1lLCB3aGlsZSBmb3IgZHJpdmVyIGluaXRpYXRlZCBBVVgKIAkgKiB0 cmFuc2ZlcnMgd2UgbmVlZCB0aGUgc2FtZSBBVVggSU9zIHRvIGJlIHBvd2VyZWQgYnV0IHdpdGgg REMgc3RhdGVzCkBAIC0yMDk2LDcgKzIwOTgsNyBAQCBpbnRlbF9kZGlfbWFpbl9saW5rX2F1eF9k b21haW4oc3RydWN0IGludGVsX2RwICppbnRlbF9kcCkKIAkgKiBOb3RlIHRoYXQgUFNSIGlzIGVu YWJsZWQgb25seSBvbiBQb3J0IEEgZXZlbiB0aG91Z2ggdGhpcyBmdW5jdGlvbgogCSAqIHJldHVy bnMgdGhlIGNvcnJlY3QgZG9tYWluIGZvciBvdGhlciBwb3J0cyB0b28uCiAJICovCi0JcmV0dXJu IGludGVsX2RwLT5hdXhfY2ggPT0gQVVYX0NIX0EgPyBQT1dFUl9ET01BSU5fQVVYX0lPX0EgOgor CXJldHVybiBkaWdfcG9ydC0+YXV4X2NoID09IEFVWF9DSF9BID8gUE9XRVJfRE9NQUlOX0FVWF9J T19BIDoKIAkJCQkJICAgICAgaW50ZWxfZHAtPmF1eF9wb3dlcl9kb21haW47CiB9CiAKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kcC5jCmluZGV4IDI0NDU4OTdiOGY2Yy4uNTUzMGM2MDRjNjk0IDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2RwLmMKQEAgLTExNTYsNiArMTE1Niw3IEBAIHN0YXRpYyB1aW50MzJfdCBn NHhfZ2V0X2F1eF9jbG9ja19kaXZpZGVyKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHAsIGludCBp bmRleCkKIHN0YXRpYyB1aW50MzJfdCBpbGtfZ2V0X2F1eF9jbG9ja19kaXZpZGVyKHN0cnVjdCBp bnRlbF9kcCAqaW50ZWxfZHAsIGludCBpbmRleCkKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYgPSBkcF90b19pOTE1KGludGVsX2RwKTsKKwlzdHJ1Y3QgaW50ZWxfZGlnaXRh bF9wb3J0ICpkaWdfcG9ydCA9IGRwX3RvX2RpZ19wb3J0KGludGVsX2RwKTsKIAogCWlmIChpbmRl eCkKIAkJcmV0dXJuIDA7CkBAIC0xMTY1LDcgKzExNjYsNyBAQCBzdGF0aWMgdWludDMyX3QgaWxr X2dldF9hdXhfY2xvY2tfZGl2aWRlcihzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwLCBpbnQgaW5k ZXgpCiAJICogbGlrZSB0byBydW4gYXQgMk1Iei4gIFNvLCB0YWtlIHRoZSBjZGNsayBvciBQQ0gg cmF3Y2xrIHZhbHVlIGFuZAogCSAqIGRpdmlkZSBieSAyMDAwIGFuZCB1c2UgdGhhdAogCSAqLwot CWlmIChpbnRlbF9kcC0+YXV4X2NoID09IEFVWF9DSF9BKQorCWlmIChkaWdfcG9ydC0+YXV4X2No ID09IEFVWF9DSF9BKQogCQlyZXR1cm4gRElWX1JPVU5EX0NMT1NFU1QoZGV2X3ByaXYtPmNkY2xr Lmh3LmNkY2xrLCAyMDAwKTsKIAllbHNlCiAJCXJldHVybiBESVZfUk9VTkRfQ0xPU0VTVChkZXZf cHJpdi0+cmF3Y2xrX2ZyZXEsIDIwMDApOwpAQCAtMTE3NCw4ICsxMTc1LDkgQEAgc3RhdGljIHVp bnQzMl90IGlsa19nZXRfYXV4X2Nsb2NrX2RpdmlkZXIoc3RydWN0IGludGVsX2RwICppbnRlbF9k cCwgaW50IGluZGV4KQogc3RhdGljIHVpbnQzMl90IGhzd19nZXRfYXV4X2Nsb2NrX2RpdmlkZXIo c3RydWN0IGludGVsX2RwICppbnRlbF9kcCwgaW50IGluZGV4KQogewogCXN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiA9IGRwX3RvX2k5MTUoaW50ZWxfZHApOworCXN0cnVjdCBpbnRl bF9kaWdpdGFsX3BvcnQgKmRpZ19wb3J0ID0gZHBfdG9fZGlnX3BvcnQoaW50ZWxfZHApOwogCi0J aWYgKGludGVsX2RwLT5hdXhfY2ggIT0gQVVYX0NIX0EgJiYgSEFTX1BDSF9MUFRfSChkZXZfcHJp dikpIHsKKwlpZiAoZGlnX3BvcnQtPmF1eF9jaCAhPSBBVVhfQ0hfQSAmJiBIQVNfUENIX0xQVF9I KGRldl9wcml2KSkgewogCQkvKiBXb3JrYXJvdW5kIGZvciBub24tVUxUIEhTVyAqLwogCQlzd2l0 Y2ggKGluZGV4KSB7CiAJCWNhc2UgMDogcmV0dXJuIDYzOwpAQCAtMTUwNiw3ICsxNTA4LDkgQEAg aW50ZWxfZHBfYXV4X3RyYW5zZmVyKHN0cnVjdCBkcm1fZHBfYXV4ICphdXgsIHN0cnVjdCBkcm1f ZHBfYXV4X21zZyAqbXNnKQogc3RhdGljIGVudW0gaW50ZWxfZGlzcGxheV9wb3dlcl9kb21haW4K IGludGVsX2F1eF9wb3dlcl9kb21haW4oc3RydWN0IGludGVsX2RwICppbnRlbF9kcCkKIHsKLQlz d2l0Y2ggKGludGVsX2RwLT5hdXhfY2gpIHsKKwlzdHJ1Y3QgaW50ZWxfZGlnaXRhbF9wb3J0ICpk aWdfcG9ydCA9IGRwX3RvX2RpZ19wb3J0KGludGVsX2RwKTsKKworCXN3aXRjaCAoZGlnX3BvcnQt PmF1eF9jaCkgewogCWNhc2UgQVVYX0NIX0E6CiAJCXJldHVybiBQT1dFUl9ET01BSU5fQVVYX0E7 CiAJY2FzZSBBVVhfQ0hfQjoKQEAgLTE1MjAsNyArMTUyNCw3IEBAIGludGVsX2F1eF9wb3dlcl9k b21haW4oc3RydWN0IGludGVsX2RwICppbnRlbF9kcCkKIAljYXNlIEFVWF9DSF9GOgogCQlyZXR1 cm4gUE9XRVJfRE9NQUlOX0FVWF9GOwogCWRlZmF1bHQ6Ci0JCU1JU1NJTkdfQ0FTRShpbnRlbF9k cC0+YXV4X2NoKTsKKwkJTUlTU0lOR19DQVNFKGRpZ19wb3J0LT5hdXhfY2gpOwogCQlyZXR1cm4g UE9XRVJfRE9NQUlOX0FVWF9BOwogCX0KIH0KQEAgLTE1MjgsNyArMTUzMiw4IEBAIGludGVsX2F1 eF9wb3dlcl9kb21haW4oc3RydWN0IGludGVsX2RwICppbnRlbF9kcCkKIHN0YXRpYyBpOTE1X3Jl Z190IGc0eF9hdXhfY3RsX3JlZyhzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKQogewogCXN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRwX3RvX2k5MTUoaW50ZWxfZHApOwotCWVu dW0gYXV4X2NoIGF1eF9jaCA9IGludGVsX2RwLT5hdXhfY2g7CisJc3RydWN0IGludGVsX2RpZ2l0 YWxfcG9ydCAqZGlnX3BvcnQgPSBkcF90b19kaWdfcG9ydChpbnRlbF9kcCk7CisJZW51bSBhdXhf Y2ggYXV4X2NoID0gZGlnX3BvcnQtPmF1eF9jaDsKIAogCXN3aXRjaCAoYXV4X2NoKSB7CiAJY2Fz ZSBBVVhfQ0hfQjoKQEAgLTE1NDQsNyArMTU0OSw4IEBAIHN0YXRpYyBpOTE1X3JlZ190IGc0eF9h dXhfY3RsX3JlZyhzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKQogc3RhdGljIGk5MTVfcmVnX3Qg ZzR4X2F1eF9kYXRhX3JlZyhzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwLCBpbnQgaW5kZXgpCiB7 CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZHBfdG9faTkxNShpbnRlbF9k cCk7Ci0JZW51bSBhdXhfY2ggYXV4X2NoID0gaW50ZWxfZHAtPmF1eF9jaDsKKwlzdHJ1Y3QgaW50 ZWxfZGlnaXRhbF9wb3J0ICpkaWdfcG9ydCA9IGRwX3RvX2RpZ19wb3J0KGludGVsX2RwKTsKKwll bnVtIGF1eF9jaCBhdXhfY2ggPSBkaWdfcG9ydC0+YXV4X2NoOwogCiAJc3dpdGNoIChhdXhfY2gp IHsKIAljYXNlIEFVWF9DSF9COgpAQCAtMTU2MCw3ICsxNTY2LDggQEAgc3RhdGljIGk5MTVfcmVn X3QgZzR4X2F1eF9kYXRhX3JlZyhzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwLCBpbnQgaW5kZXgp CiBzdGF0aWMgaTkxNV9yZWdfdCBpbGtfYXV4X2N0bF9yZWcoc3RydWN0IGludGVsX2RwICppbnRl bF9kcCkKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkcF90b19pOTE1 KGludGVsX2RwKTsKLQllbnVtIGF1eF9jaCBhdXhfY2ggPSBpbnRlbF9kcC0+YXV4X2NoOworCXN0 cnVjdCBpbnRlbF9kaWdpdGFsX3BvcnQgKmRpZ19wb3J0ID0gZHBfdG9fZGlnX3BvcnQoaW50ZWxf ZHApOworCWVudW0gYXV4X2NoIGF1eF9jaCA9IGRpZ19wb3J0LT5hdXhfY2g7CiAKIAlzd2l0Y2gg KGF1eF9jaCkgewogCWNhc2UgQVVYX0NIX0E6CkBAIC0xNTc4LDcgKzE1ODUsOCBAQCBzdGF0aWMg aTkxNV9yZWdfdCBpbGtfYXV4X2N0bF9yZWcoc3RydWN0IGludGVsX2RwICppbnRlbF9kcCkKIHN0 YXRpYyBpOTE1X3JlZ190IGlsa19hdXhfZGF0YV9yZWcoc3RydWN0IGludGVsX2RwICppbnRlbF9k cCwgaW50IGluZGV4KQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRw X3RvX2k5MTUoaW50ZWxfZHApOwotCWVudW0gYXV4X2NoIGF1eF9jaCA9IGludGVsX2RwLT5hdXhf Y2g7CisJc3RydWN0IGludGVsX2RpZ2l0YWxfcG9ydCAqZGlnX3BvcnQgPSBkcF90b19kaWdfcG9y dChpbnRlbF9kcCk7CisJZW51bSBhdXhfY2ggYXV4X2NoID0gZGlnX3BvcnQtPmF1eF9jaDsKIAog CXN3aXRjaCAoYXV4X2NoKSB7CiAJY2FzZSBBVVhfQ0hfQToKQEAgLTE1OTYsNyArMTYwNCw4IEBA IHN0YXRpYyBpOTE1X3JlZ190IGlsa19hdXhfZGF0YV9yZWcoc3RydWN0IGludGVsX2RwICppbnRl bF9kcCwgaW50IGluZGV4KQogc3RhdGljIGk5MTVfcmVnX3Qgc2tsX2F1eF9jdGxfcmVnKHN0cnVj dCBpbnRlbF9kcCAqaW50ZWxfZHApCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2ID0gZHBfdG9faTkxNShpbnRlbF9kcCk7Ci0JZW51bSBhdXhfY2ggYXV4X2NoID0gaW50ZWxf ZHAtPmF1eF9jaDsKKwlzdHJ1Y3QgaW50ZWxfZGlnaXRhbF9wb3J0ICpkaWdfcG9ydCA9IGRwX3Rv X2RpZ19wb3J0KGludGVsX2RwKTsKKwllbnVtIGF1eF9jaCBhdXhfY2ggPSBkaWdfcG9ydC0+YXV4 X2NoOwogCiAJc3dpdGNoIChhdXhfY2gpIHsKIAljYXNlIEFVWF9DSF9BOgpAQCAtMTYxNSw3ICsx NjI0LDggQEAgc3RhdGljIGk5MTVfcmVnX3Qgc2tsX2F1eF9jdGxfcmVnKHN0cnVjdCBpbnRlbF9k cCAqaW50ZWxfZHApCiBzdGF0aWMgaTkxNV9yZWdfdCBza2xfYXV4X2RhdGFfcmVnKHN0cnVjdCBp bnRlbF9kcCAqaW50ZWxfZHAsIGludCBpbmRleCkKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYgPSBkcF90b19pOTE1KGludGVsX2RwKTsKLQllbnVtIGF1eF9jaCBhdXhfY2gg PSBpbnRlbF9kcC0+YXV4X2NoOworCXN0cnVjdCBpbnRlbF9kaWdpdGFsX3BvcnQgKmRpZ19wb3J0 ID0gZHBfdG9fZGlnX3BvcnQoaW50ZWxfZHApOworCWVudW0gYXV4X2NoIGF1eF9jaCA9IGRpZ19w b3J0LT5hdXhfY2g7CiAKIAlzd2l0Y2ggKGF1eF9jaCkgewogCWNhc2UgQVVYX0NIX0E6CkBAIC0x NjQxLDkgKzE2NTEsMTAgQEAgc3RhdGljIHZvaWQKIGludGVsX2RwX2F1eF9pbml0KHN0cnVjdCBp bnRlbF9kcCAqaW50ZWxfZHApCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 ID0gZHBfdG9faTkxNShpbnRlbF9kcCk7Ci0Jc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIg PSAmZHBfdG9fZGlnX3BvcnQoaW50ZWxfZHApLT5iYXNlOworCXN0cnVjdCBpbnRlbF9kaWdpdGFs X3BvcnQgKmRpZ19wb3J0ID0gZHBfdG9fZGlnX3BvcnQoaW50ZWxfZHApOworCXN0cnVjdCBpbnRl bF9lbmNvZGVyICplbmNvZGVyID0gJmRpZ19wb3J0LT5iYXNlOwogCi0JaW50ZWxfZHAtPmF1eF9j aCA9IGludGVsX2F1eF9jaChkZXZfcHJpdiwgZW5jb2Rlci0+cG9ydCk7CisJZGlnX3BvcnQtPmF1 eF9jaCA9IGludGVsX2F1eF9jaChkZXZfcHJpdiwgZW5jb2Rlci0+cG9ydCk7CiAJaW50ZWxfZHAt PmF1eF9wb3dlcl9kb21haW4gPSBpbnRlbF9hdXhfcG93ZXJfZG9tYWluKGludGVsX2RwKTsKIAog CWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDkpIHsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgK aW5kZXggMjY4YWZiNmQyNzQ2Li5hMjQyYTExODM4OWQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Ry di5oCkBAIC0xMTA5LDcgKzExMDksNiBAQCBzdHJ1Y3QgaW50ZWxfZHAgewogCWJvb2wgbGlua190 cmFpbmVkOwogCWJvb2wgaGFzX2F1ZGlvOwogCWJvb2wgcmVzZXRfbGlua19wYXJhbXM7Ci0JZW51 bSBhdXhfY2ggYXV4X2NoOwogCXVpbnQ4X3QgZHBjZFtEUF9SRUNFSVZFUl9DQVBfU0laRV07CiAJ dWludDhfdCBwc3JfZHBjZFtFRFBfUFNSX1JFQ0VJVkVSX0NBUF9TSVpFXTsKIAl1aW50OF90IGRv d25zdHJlYW1fcG9ydHNbRFBfTUFYX0RPV05TVFJFQU1fUE9SVFNdOwpAQCAtMTIxMyw2ICsxMjEy LDcgQEAgc3RydWN0IGludGVsX2RpZ2l0YWxfcG9ydCB7CiAJZW51bSBpcnFyZXR1cm4gKCpocGRf cHVsc2UpKHN0cnVjdCBpbnRlbF9kaWdpdGFsX3BvcnQgKiwgYm9vbCk7CiAJYm9vbCByZWxlYXNl X2NsMl9vdmVycmlkZTsKIAl1aW50OF90IG1heF9sYW5lczsKKwllbnVtIGF1eF9jaCBhdXhfY2g7 CiAJZW51bSBpbnRlbF9kaXNwbGF5X3Bvd2VyX2RvbWFpbiBkZGlfaW9fcG93ZXJfZG9tYWluOwog CWVudW0gdGNfcG9ydF90eXBlIHRjX3R5cGU7CiAKLS0gCjIuMTMuMgoKX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJ bnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Au b3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==