From: Ville Syrjala Subject: [PATCH 3/7] drm/i915: Nuke intel_trans_dp_port_sel() Date: Fri, 18 May 2018 18:29:27 +0300 Message-ID: <20180518152931.13104-3-ville.syrjala@linux.intel.com> References: <20180518152931.13104-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 mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 35D716EE06 for ; Fri, 18 May 2018 15:29:40 +0000 (UTC) In-Reply-To: <20180518152931.13104-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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCmZv cl9lYWNoX2VuY29kZXJfb25fY3J0YygpIGlzIGxlZ2FjeSBhbmQgc2hvdWxkbid0IGJlIHVzZWQg YnkgYXRvbWljCmRyaXZlcnMuIExldCdzIHRocm93IG91dCBpbnRlbF90cmFuc19kcF9wb3J0X3Nl bCgpIGFuZCByZXBsYWNlIGl0CndpdGggaW50ZWxfZ2V0X2NydGNfbmV3X2VuY29kZXIoKSB3aGlj aCBsb29rcyB0aGUgYXRvbWljIHN0YXRlIGluc3RlYWQuCgpTaW5jZSB3ZSBub3cgaGF2ZSB0byBj YWxsIGludGVsX2dldF9jcnRjX25ld19lbmNvZGVyKCkgZHVyaW5nIHRoZSBjb21taXQKcGhhc2Ug d2UnbGwgbmVlZCB0byBwbHVtYiBpbiB0aGUgdG9wIGxldmVsIGF0b21pYyBzdGF0ZS4gVGhlCmNy dGNfc3RhdGUtPnN0YXRlIHBvaW50ZXJzIGFyZSBubyBsb25nZXIgdmFsaWQgYXQgdGhhdCBwb2lu dC4KClNpZ25lZC1vZmYtYnk6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5p bnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgMzkg KysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTQg aW5zZXJ0aW9ucygrKSwgMjUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz cGxheS5jCmluZGV4IGE4NWY3N2FlYmQxMi4uZDM2ZGVhNTY4YjgyIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZGlzcGxheS5jCkBAIC00NTk0LDE3ICs0NTk0LDE3IEBAIHN0YXRpYyB2b2lkIGl2 eWJyaWRnZV91cGRhdGVfZmRpX2JjX2JpZnVyY2F0aW9uKHN0cnVjdCBpbnRlbF9jcnRjICppbnRl bF9jcnRjKQogICogdXNlZCB3aGVuIHdlIGtub3cgdGhhdCB0aGUgQ1JUQyBpc24ndCBmZWVkaW5n IG11bHRpcGxlIGVuY29kZXJzIQogICovCiBzdGF0aWMgc3RydWN0IGludGVsX2VuY29kZXIgKgot aW50ZWxfZ2V0X2NydGNfbmV3X2VuY29kZXIoY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUg KmNydGNfc3RhdGUpCitpbnRlbF9nZXRfY3J0Y19uZXdfZW5jb2Rlcihjb25zdCBzdHJ1Y3QgaW50 ZWxfYXRvbWljX3N0YXRlICpzdGF0ZSwKKwkJCSAgIGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0 YXRlICpjcnRjX3N0YXRlKQogewogCXN0cnVjdCBpbnRlbF9jcnRjICpjcnRjID0gdG9faW50ZWxf Y3J0YyhjcnRjX3N0YXRlLT5iYXNlLmNydGMpOwotCWNvbnN0IHN0cnVjdCBkcm1fYXRvbWljX3N0 YXRlICpzdGF0ZSA9IGNydGNfc3RhdGUtPmJhc2Uuc3RhdGU7CiAJY29uc3Qgc3RydWN0IGRybV9j b25uZWN0b3Jfc3RhdGUgKmNvbm5lY3Rvcl9zdGF0ZTsKIAljb25zdCBzdHJ1Y3QgZHJtX2Nvbm5l Y3RvciAqY29ubmVjdG9yOwogCXN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyID0gTlVMTDsK IAlpbnQgbnVtX2VuY29kZXJzID0gMDsKIAlpbnQgaTsKIAotCWZvcl9lYWNoX25ld19jb25uZWN0 b3JfaW5fc3RhdGUoc3RhdGUsIGNvbm5lY3RvciwgY29ubmVjdG9yX3N0YXRlLCBpKSB7CisJZm9y X2VhY2hfbmV3X2Nvbm5lY3Rvcl9pbl9zdGF0ZSgmc3RhdGUtPmJhc2UsIGNvbm5lY3RvciwgY29u bmVjdG9yX3N0YXRlLCBpKSB7CiAJCWlmIChjb25uZWN0b3Jfc3RhdGUtPmNydGMgIT0gJmNydGMt PmJhc2UpCiAJCQljb250aW51ZTsKIApAQCAtNDYxOCwyMiArNDYxOCw2IEBAIGludGVsX2dldF9j cnRjX25ld19lbmNvZGVyKGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRl KQogCXJldHVybiBlbmNvZGVyOwogfQogCi0vKiBSZXR1cm4gd2hpY2ggRFAgUG9ydCBzaG91bGQg YmUgc2VsZWN0ZWQgZm9yIFRyYW5zY29kZXIgRFAgY29udHJvbCAqLwotc3RhdGljIGVudW0gcG9y dAotaW50ZWxfdHJhbnNfZHBfcG9ydF9zZWwoc3RydWN0IGludGVsX2NydGMgKmNydGMpCi17Ci0J c3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmJhc2UuZGV2OwotCXN0cnVjdCBpbnRlbF9l bmNvZGVyICplbmNvZGVyOwotCi0JZm9yX2VhY2hfZW5jb2Rlcl9vbl9jcnRjKGRldiwgJmNydGMt PmJhc2UsIGVuY29kZXIpIHsKLQkJaWYgKGVuY29kZXItPnR5cGUgPT0gSU5URUxfT1VUUFVUX0RQ IHx8Ci0JCSAgICBlbmNvZGVyLT50eXBlID09IElOVEVMX09VVFBVVF9FRFApCi0JCQlyZXR1cm4g ZW5jb2Rlci0+cG9ydDsKLQl9Ci0KLQlyZXR1cm4gLTE7Ci19Ci0KIC8qCiAgKiBFbmFibGUgUENI IHJlc291cmNlcyByZXF1aXJlZCBmb3IgUENIIHBvcnRzOgogICogICAtIFBDSCBQTExzCkBAIC00 NjQyLDcgKzQ2MjYsOCBAQCBpbnRlbF90cmFuc19kcF9wb3J0X3NlbChzdHJ1Y3QgaW50ZWxfY3J0 YyAqY3J0YykKICAqICAgLSBEUCB0cmFuc2NvZGluZyBiaXRzCiAgKiAgIC0gdHJhbnNjb2Rlcgog ICovCi1zdGF0aWMgdm9pZCBpcm9ubGFrZV9wY2hfZW5hYmxlKGNvbnN0IHN0cnVjdCBpbnRlbF9j cnRjX3N0YXRlICpjcnRjX3N0YXRlKQorc3RhdGljIHZvaWQgaXJvbmxha2VfcGNoX2VuYWJsZShj b25zdCBzdHJ1Y3QgaW50ZWxfYXRvbWljX3N0YXRlICpzdGF0ZSwKKwkJCQljb25zdCBzdHJ1Y3Qg aW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSkKIHsKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0 YyA9IHRvX2ludGVsX2NydGMoY3J0Y19zdGF0ZS0+YmFzZS5jcnRjKTsKIAlzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2ID0gY3J0Yy0+YmFzZS5kZXY7CkBAIC00NzE1LDcgKzQ3MDAsNyBAQCBzdGF0aWMg dm9pZCBpcm9ubGFrZV9wY2hfZW5hYmxlKGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpj cnRjX3N0YXRlKQogCQlpZiAoYWRqdXN0ZWRfbW9kZS0+ZmxhZ3MgJiBEUk1fTU9ERV9GTEFHX1BW U1lOQykKIAkJCXRlbXAgfD0gVFJBTlNfRFBfVlNZTkNfQUNUSVZFX0hJR0g7CiAKLQkJcG9ydCA9 IGludGVsX3RyYW5zX2RwX3BvcnRfc2VsKGNydGMpOworCQlwb3J0ID0gaW50ZWxfZ2V0X2NydGNf bmV3X2VuY29kZXIoc3RhdGUsIGNydGNfc3RhdGUpLT5wb3J0OwogCQlXQVJOX09OKHBvcnQgPCBQ T1JUX0IgfHwgcG9ydCA+IFBPUlRfRCk7CiAJCXRlbXAgfD0gVFJBTlNfRFBfUE9SVF9TRUwocG9y dCk7CiAKQEAgLTQ3MjUsNyArNDcxMCw4IEBAIHN0YXRpYyB2b2lkIGlyb25sYWtlX3BjaF9lbmFi bGUoY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCiAJaXJvbmxha2Vf ZW5hYmxlX3BjaF90cmFuc2NvZGVyKGRldl9wcml2LCBwaXBlKTsKIH0KIAotc3RhdGljIHZvaWQg bHB0X3BjaF9lbmFibGUoY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUp CitzdGF0aWMgdm9pZCBscHRfcGNoX2VuYWJsZShjb25zdCBzdHJ1Y3QgaW50ZWxfYXRvbWljX3N0 YXRlICpzdGF0ZSwKKwkJCSAgIGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0 YXRlKQogewogCXN0cnVjdCBpbnRlbF9jcnRjICpjcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjX3N0 YXRlLT5iYXNlLmNydGMpOwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRv X2k5MTUoY3J0Yy0+YmFzZS5kZXYpOwpAQCAtNTUyOCw3ICs1NTE0LDcgQEAgc3RhdGljIHZvaWQg aXJvbmxha2VfY3J0Y19lbmFibGUoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKnBpcGVfY29uZmln LAogCWludGVsX2VuYWJsZV9waXBlKHBpcGVfY29uZmlnKTsKIAogCWlmIChpbnRlbF9jcnRjLT5j b25maWctPmhhc19wY2hfZW5jb2RlcikKLQkJaXJvbmxha2VfcGNoX2VuYWJsZShwaXBlX2NvbmZp Zyk7CisJCWlyb25sYWtlX3BjaF9lbmFibGUob2xkX2ludGVsX3N0YXRlLCBwaXBlX2NvbmZpZyk7 CiAKIAlhc3NlcnRfdmJsYW5rX2Rpc2FibGVkKGNydGMpOwogCWRybV9jcnRjX3ZibGFua19vbihj cnRjKTsKQEAgLTU2NjcsNyArNTY1Myw3IEBAIHN0YXRpYyB2b2lkIGhhc3dlbGxfY3J0Y19lbmFi bGUoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKnBpcGVfY29uZmlnLAogCQlpbnRlbF9lbmFibGVf cGlwZShwaXBlX2NvbmZpZyk7CiAKIAlpZiAoaW50ZWxfY3J0Yy0+Y29uZmlnLT5oYXNfcGNoX2Vu Y29kZXIpCi0JCWxwdF9wY2hfZW5hYmxlKHBpcGVfY29uZmlnKTsKKwkJbHB0X3BjaF9lbmFibGUo b2xkX2ludGVsX3N0YXRlLCBwaXBlX2NvbmZpZyk7CiAKIAlpZiAoaW50ZWxfY3J0Y19oYXNfdHlw ZShpbnRlbF9jcnRjLT5jb25maWcsIElOVEVMX09VVFBVVF9EUF9NU1QpKQogCQlpbnRlbF9kZGlf c2V0X3ZjX3BheWxvYWRfYWxsb2MocGlwZV9jb25maWcsIHRydWUpOwpAQCAtOTEyMSw5ICs5MTA3 LDEyIEBAIHZvaWQgaHN3X2Rpc2FibGVfcGM4KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdikKIHN0YXRpYyBpbnQgaGFzd2VsbF9jcnRjX2NvbXB1dGVfY2xvY2soc3RydWN0IGludGVs X2NydGMgKmNydGMsCiAJCQkJICAgICAgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3Rh dGUpCiB7CisJc3RydWN0IGludGVsX2F0b21pY19zdGF0ZSAqc3RhdGUgPQorCQl0b19pbnRlbF9h dG9taWNfc3RhdGUoY3J0Y19zdGF0ZS0+YmFzZS5zdGF0ZSk7CisKIAlpZiAoIWludGVsX2NydGNf aGFzX3R5cGUoY3J0Y19zdGF0ZSwgSU5URUxfT1VUUFVUX0RTSSkpIHsKIAkJc3RydWN0IGludGVs X2VuY29kZXIgKmVuY29kZXIgPQotCQkJaW50ZWxfZ2V0X2NydGNfbmV3X2VuY29kZXIoY3J0Y19z dGF0ZSk7CisJCQlpbnRlbF9nZXRfY3J0Y19uZXdfZW5jb2RlcihzdGF0ZSwgY3J0Y19zdGF0ZSk7 CiAKIAkJaWYgKCFpbnRlbF9nZXRfc2hhcmVkX2RwbGwoY3J0YywgY3J0Y19zdGF0ZSwgZW5jb2Rl cikpIHsKIAkJCURSTV9ERUJVR19EUklWRVIoImZhaWxlZCB0byBmaW5kIFBMTCBmb3IgcGlwZSAl Y1xuIiwKLS0gCjIuMTYuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50 ZWwtZ2Z4Cg==