From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ander Conselvan de Oliveira Subject: [PATCH v2 07/10] drm/i915: Undiplicate VLV signal level code Date: Wed, 13 Apr 2016 20:47:50 +0300 Message-ID: <1460569673-13694-8-git-send-email-ander.conselvan.de.oliveira@intel.com> References: <1460569673-13694-1-git-send-email-ander.conselvan.de.oliveira@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 18F346E931 for ; Wed, 13 Apr 2016 17:48:14 +0000 (UTC) In-Reply-To: <1460569673-13694-1-git-send-email-ander.conselvan.de.oliveira@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: Ander Conselvan de Oliveira List-Id: intel-gfx@lists.freedesktop.org VGhlIGxvZ2ljIGZvciBzZXR0aW5nIHNpZ25hbCBsZXZlbHMgaXMgdXNlZCBmb3IgYm90aCBIRE1J IGFuZCBEUCB3aXRoCnNtYWxsIHZhcmlhdGlvbnMuIEJ1dCBpdCBpcyBzaW1pbGFyIGVub3VnaCB0 byBwdXQgYmVoaW5kIGEgZnVuY3Rpb24KY2FsbGVkIGZyb20gdGhlIGVuY29kZXJzLgoKU2lnbmVk LW9mZi1ieTogQW5kZXIgQ29uc2VsdmFuIGRlIE9saXZlaXJhIDxhbmRlci5jb25zZWx2YW4uZGUu b2xpdmVpcmFAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2Lmgg ICAgICAgfCAgNCArKysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jICAgICAgIHwg NDMgKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2RwaW9fcGh5LmMgfCAyNiArKysrKysrKysrKysrKysrKysrKysKIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2hkbWkuYyAgICAgfCAxNCArKysrLS0tLS0tLS0KIDQgZmlsZXMg Y2hhbmdlZCwgNDkgaW5zZXJ0aW9ucygrKSwgMzggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmgKaW5kZXggODVjMDYxMC4uZjI0ODFhMiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5o CkBAIC0zNTY1LDYgKzM1NjUsMTAgQEAgdm9pZCBjaHZfcGh5X3ByZV9lbmNvZGVyX2VuYWJsZShz dHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2Rlcik7CiB2b2lkIGNodl9waHlfcmVsZWFzZV9jbDJf b3ZlcnJpZGUoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIpOwogdm9pZCBjaHZfcGh5X3Bv c3RfZGlzYWJsZShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2Rlcik7CiAKK3ZvaWQgdmx2X3Nl dF9waHlfc2lnbmFsX2xldmVsKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAorCQkJICAg ICAgdTMyIGRlbXBoX3JlZ192YWx1ZSwgdTMyIHByZWVtcGhfcmVnX3ZhbHVlLAorCQkJICAgICAg dTMyIHVuaXF0cmFuc2NhbGVfcmVnX3ZhbHVlLCB1MzIgdHgzX2RlbXBoKTsKKwogaW50IGludGVs X2dwdV9mcmVxKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgaW50IHZhbCk7CiBp bnQgaW50ZWxfZnJlcV9vcGNvZGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCBp bnQgdmFsKTsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMKaW5kZXggY2RhY2Q4Yi4uM2U0MjM1NSAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYworKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jCkBAIC0zMDA5LDE2ICszMDA5LDEwIEBAIGludGVsX2Rw X3ByZV9lbXBoYXNpc19tYXgoc3RydWN0IGludGVsX2RwICppbnRlbF9kcCwgdWludDhfdCB2b2x0 YWdlX3N3aW5nKQogCiBzdGF0aWMgdWludDMyX3Qgdmx2X3NpZ25hbF9sZXZlbHMoc3RydWN0IGlu dGVsX2RwICppbnRlbF9kcCkKIHsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gaW50ZWxfZHBf dG9fZGV2KGludGVsX2RwKTsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBk ZXYtPmRldl9wcml2YXRlOwotCXN0cnVjdCBpbnRlbF9kaWdpdGFsX3BvcnQgKmRwb3J0ID0gZHBf dG9fZGlnX3BvcnQoaW50ZWxfZHApOwotCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0K LQkJdG9faW50ZWxfY3J0YyhkcG9ydC0+YmFzZS5iYXNlLmNydGMpOworCXN0cnVjdCBpbnRlbF9l bmNvZGVyICplbmNvZGVyID0gJmRwX3RvX2RpZ19wb3J0KGludGVsX2RwKS0+YmFzZTsKIAl1bnNp Z25lZCBsb25nIGRlbXBoX3JlZ192YWx1ZSwgcHJlZW1waF9yZWdfdmFsdWUsCiAJCXVuaXF0cmFu c2NhbGVfcmVnX3ZhbHVlOwogCXVpbnQ4X3QgdHJhaW5fc2V0ID0gaW50ZWxfZHAtPnRyYWluX3Nl dFswXTsKLQllbnVtIGRwaW9fY2hhbm5lbCBwb3J0ID0gdmx2X2Rwb3J0X3RvX2NoYW5uZWwoZHBv cnQpOwotCWludCBwaXBlID0gaW50ZWxfY3J0Yy0+cGlwZTsKIAogCXN3aXRjaCAodHJhaW5fc2V0 ICYgRFBfVFJBSU5fUFJFX0VNUEhBU0lTX01BU0spIHsKIAljYXNlIERQX1RSQUlOX1BSRV9FTVBI X0xFVkVMXzA6CkBAIC0zMDkzLDE2ICszMDg3LDggQEAgc3RhdGljIHVpbnQzMl90IHZsdl9zaWdu YWxfbGV2ZWxzKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCiAJCXJldHVybiAwOwogCX0KIAot CW11dGV4X2xvY2soJmRldl9wcml2LT5zYl9sb2NrKTsKLQl2bHZfZHBpb193cml0ZShkZXZfcHJp diwgcGlwZSwgVkxWX1RYX0RXNShwb3J0KSwgMHgwMDAwMDAwMCk7Ci0Jdmx2X2RwaW9fd3JpdGUo ZGV2X3ByaXYsIHBpcGUsIFZMVl9UWF9EVzQocG9ydCksIGRlbXBoX3JlZ192YWx1ZSk7Ci0Jdmx2 X2RwaW9fd3JpdGUoZGV2X3ByaXYsIHBpcGUsIFZMVl9UWF9EVzIocG9ydCksCi0JCQkgdW5pcXRy YW5zY2FsZV9yZWdfdmFsdWUpOwotCXZsdl9kcGlvX3dyaXRlKGRldl9wcml2LCBwaXBlLCBWTFZf VFhfRFczKHBvcnQpLCAweDBDNzgyMDQwKTsKLQl2bHZfZHBpb193cml0ZShkZXZfcHJpdiwgcGlw ZSwgVkxWX1BDU19EVzExKHBvcnQpLCAweDAwMDMwMDAwKTsKLQl2bHZfZHBpb193cml0ZShkZXZf cHJpdiwgcGlwZSwgVkxWX1BDU19EVzkocG9ydCksIHByZWVtcGhfcmVnX3ZhbHVlKTsKLQl2bHZf ZHBpb193cml0ZShkZXZfcHJpdiwgcGlwZSwgVkxWX1RYX0RXNShwb3J0KSwgMHg4MDAwMDAwMCk7 Ci0JbXV0ZXhfdW5sb2NrKCZkZXZfcHJpdi0+c2JfbG9jayk7CisJdmx2X3NldF9waHlfc2lnbmFs X2xldmVsKGVuY29kZXIsIGRlbXBoX3JlZ192YWx1ZSwgcHJlZW1waF9yZWdfdmFsdWUsCisJCQkJ IHVuaXF0cmFuc2NhbGVfcmVnX3ZhbHVlLCAwKTsKIAogCXJldHVybiAwOwogfQpAQCAtNDI4NSwx NyArNDI3MSw2IEBAIGludGVsX2RwX2xvbmdfcHVsc2Uoc3RydWN0IGludGVsX2Nvbm5lY3RvciAq aW50ZWxfY29ubmVjdG9yKQogCQlpbnRlbF9kcC0+Y29tcGxpYW5jZV90ZXN0X3R5cGUgPSAwOwog CQlpbnRlbF9kcC0+Y29tcGxpYW5jZV90ZXN0X2RhdGEgPSAwOwogCi0JCS8qCi0JCSAqIElmIHdl IHdlcmUgaW4gTVNUIG1vZGUsIGFuZCBkZXZpY2UgaXMgbm90IHRoZXJlLAotCQkgKiBnZXQgb3V0 IG9mIE1TVCBtb2RlCi0JCSAqLwotCQlpZiAoaW50ZWxfZHAtPmlzX21zdCkgewotCQkJRFJNX0RF QlVHX0tNUygiTVNUIGRldmljZSBtYXkgaGF2ZSBkaXNhcHBlYXJlZCAlZCB2cyAlZFxuIiwKLQkJ CQkgICAgICBpbnRlbF9kcC0+aXNfbXN0LCBpbnRlbF9kcC0+bXN0X21nci5tc3Rfc3RhdGUpOwot CQkJaW50ZWxfZHAtPmlzX21zdCA9IGZhbHNlOwotCQkJZHJtX2RwX21zdF90b3BvbG9neV9tZ3Jf c2V0X21zdCgmaW50ZWxfZHAtPm1zdF9tZ3IsCi0JCQkJCQkJaW50ZWxfZHAtPmlzX21zdCk7Ci0J CX0KIAkJZ290byBvdXQ7CiAJfQogCkBAIC00MzU1LDYgKzQzMzAsMTggQEAgaW50ZWxfZHBfbG9u Z19wdWxzZShzdHJ1Y3QgaW50ZWxfY29ubmVjdG9yICppbnRlbF9jb25uZWN0b3IpCiBvdXQ6CiAJ aWYgKHN0YXR1cyAhPSBjb25uZWN0b3Jfc3RhdHVzX2Nvbm5lY3RlZCkgewogCQlpbnRlbF9kcF91 bnNldF9lZGlkKGludGVsX2RwKTsKKworCQkvKgorCQkgKiBJZiB3ZSB3ZXJlIGluIE1TVCBtb2Rl LCBhbmQgZGV2aWNlIGlzIG5vdCB0aGVyZSwKKwkJICogZ2V0IG91dCBvZiBNU1QgbW9kZQorCQkg Ki8KKwkJaWYgKGludGVsX2RwLT5pc19tc3QpIHsKKwkJCURSTV9ERUJVR19LTVMoIk1TVCBkZXZp Y2UgbWF5IGhhdmUgZGlzYXBwZWFyZWQgJWQgdnMgJWRcbiIsCisJCQkJICAgICAgaW50ZWxfZHAt PmlzX21zdCwgaW50ZWxfZHAtPm1zdF9tZ3IubXN0X3N0YXRlKTsKKwkJCWludGVsX2RwLT5pc19t c3QgPSBmYWxzZTsKKwkJCWRybV9kcF9tc3RfdG9wb2xvZ3lfbWdyX3NldF9tc3QoJmludGVsX2Rw LT5tc3RfbWdyLAorCQkJCQkJCWludGVsX2RwLT5pc19tc3QpOworCQl9CiAJfQogCiAJaW50ZWxf ZGlzcGxheV9wb3dlcl9wdXQodG9faTkxNShkZXYpLCBwb3dlcl9kb21haW4pOwpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHBpb19waHkuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2RwaW9fcGh5LmMKaW5kZXggMjQwMDU1NC4uZDllNjQ4MiAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHBpb19waHkuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kcGlvX3BoeS5jCkBAIC0zNjksMyArMzY5LDI5IEBAIHZvaWQgY2h2 X3BoeV9wb3N0X2Rpc2FibGUoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIpCiAJICovCiAJ Y2h2X3BoeV9wb3dlcmdhdGVfbGFuZXMoZW5jb2RlciwgZmFsc2UsIDB4MCk7CiB9CisKK3ZvaWQg dmx2X3NldF9waHlfc2lnbmFsX2xldmVsKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAor CQkJICAgICAgdTMyIGRlbXBoX3JlZ192YWx1ZSwgdTMyIHByZWVtcGhfcmVnX3ZhbHVlLAorCQkJ ICAgICAgdTMyIHVuaXF0cmFuc2NhbGVfcmVnX3ZhbHVlLCB1MzIgdHgzX2RlbXBoKQoreworCXN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZW5jb2Rlci0+YmFzZS5k ZXYpOworCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhlbmNv ZGVyLT5iYXNlLmNydGMpOworCXN0cnVjdCBpbnRlbF9kaWdpdGFsX3BvcnQgKmRwb3J0ID0gZW5j X3RvX2RpZ19wb3J0KCZlbmNvZGVyLT5iYXNlKTsKKwllbnVtIGRwaW9fY2hhbm5lbCBwb3J0ID0g dmx2X2Rwb3J0X3RvX2NoYW5uZWwoZHBvcnQpOworCWludCBwaXBlID0gaW50ZWxfY3J0Yy0+cGlw ZTsKKworCW11dGV4X2xvY2soJmRldl9wcml2LT5zYl9sb2NrKTsKKwl2bHZfZHBpb193cml0ZShk ZXZfcHJpdiwgcGlwZSwgVkxWX1RYX0RXNShwb3J0KSwgMHgwMDAwMDAwMCk7CisJdmx2X2RwaW9f d3JpdGUoZGV2X3ByaXYsIHBpcGUsIFZMVl9UWF9EVzQocG9ydCksIGRlbXBoX3JlZ192YWx1ZSk7 CisJdmx2X2RwaW9fd3JpdGUoZGV2X3ByaXYsIHBpcGUsIFZMVl9UWF9EVzIocG9ydCksCisJCQkg dW5pcXRyYW5zY2FsZV9yZWdfdmFsdWUpOworCXZsdl9kcGlvX3dyaXRlKGRldl9wcml2LCBwaXBl LCBWTFZfVFhfRFczKHBvcnQpLCAweDBDNzgyMDQwKTsKKworCWlmICh0eDNfZGVtcGgpCisJCXZs dl9kcGlvX3dyaXRlKGRldl9wcml2LCBwaXBlLCBWTFZfVFgzX0RXNChwb3J0KSwgdHgzX2RlbXBo KTsKKworCXZsdl9kcGlvX3dyaXRlKGRldl9wcml2LCBwaXBlLCBWTFZfUENTX0RXMTEocG9ydCks IDB4MDAwMzAwMDApOworCXZsdl9kcGlvX3dyaXRlKGRldl9wcml2LCBwaXBlLCBWTFZfUENTX0RX OShwb3J0KSwgcHJlZW1waF9yZWdfdmFsdWUpOworCXZsdl9kcGlvX3dyaXRlKGRldl9wcml2LCBw aXBlLCBWTFZfVFhfRFc1KHBvcnQpLCBEUElPX1RYX09DQUxJTklUX0VOKTsKKwltdXRleF91bmxv Y2soJmRldl9wcml2LT5zYl9sb2NrKTsKK30KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2hkbWkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2hkbWkuYwppbmRl eCBmNDI0YWY1Li45Mzg2NzcyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9oZG1pLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaGRtaS5jCkBAIC0xNjAx LDIxICsxNjAxLDE1IEBAIHN0YXRpYyB2b2lkIHZsdl9oZG1pX3ByZV9lbmFibGUoc3RydWN0IGlu dGVsX2VuY29kZXIgKmVuY29kZXIpCiAJdmFsIHw9IDB4MDAxMDAwYzQ7CiAJdmx2X2RwaW9fd3Jp dGUoZGV2X3ByaXYsIHBpcGUsIFZMVl9QQ1NfRFc4KHBvcnQpLCB2YWwpOwogCi0JLyogSERNSSAx LjBWLTJkQiAqLwotCXZsdl9kcGlvX3dyaXRlKGRldl9wcml2LCBwaXBlLCBWTFZfVFhfRFc1KHBv cnQpLCAwKTsKLQl2bHZfZHBpb193cml0ZShkZXZfcHJpdiwgcGlwZSwgVkxWX1RYX0RXNChwb3J0 KSwgMHgyYjI0NWY1Zik7Ci0Jdmx2X2RwaW9fd3JpdGUoZGV2X3ByaXYsIHBpcGUsIFZMVl9UWF9E VzIocG9ydCksIDB4NTU3OGI4M2EpOwotCXZsdl9kcGlvX3dyaXRlKGRldl9wcml2LCBwaXBlLCBW TFZfVFhfRFczKHBvcnQpLCAweDBjNzgyMDQwKTsKLQl2bHZfZHBpb193cml0ZShkZXZfcHJpdiwg cGlwZSwgVkxWX1RYM19EVzQocG9ydCksIDB4MmIyNDc4NzgpOwotCXZsdl9kcGlvX3dyaXRlKGRl dl9wcml2LCBwaXBlLCBWTFZfUENTX0RXMTEocG9ydCksIDB4MDAwMzAwMDApOwotCXZsdl9kcGlv X3dyaXRlKGRldl9wcml2LCBwaXBlLCBWTFZfUENTX0RXOShwb3J0KSwgMHgwMDAwMjAwMCk7Ci0J dmx2X2RwaW9fd3JpdGUoZGV2X3ByaXYsIHBpcGUsIFZMVl9UWF9EVzUocG9ydCksIERQSU9fVFhf T0NBTElOSVRfRU4pOwotCiAJLyogUHJvZ3JhbSBsYW5lIGNsb2NrICovCiAJdmx2X2RwaW9fd3Jp dGUoZGV2X3ByaXYsIHBpcGUsIFZMVl9QQ1NfRFcxNChwb3J0KSwgMHgwMDc2MDAxOCk7CiAJdmx2 X2RwaW9fd3JpdGUoZGV2X3ByaXYsIHBpcGUsIFZMVl9QQ1NfRFcyMyhwb3J0KSwgMHgwMDQwMDg4 OCk7CiAJbXV0ZXhfdW5sb2NrKCZkZXZfcHJpdi0+c2JfbG9jayk7CiAKKwkvKiBIRE1JIDEuMFYt MmRCICovCisJdmx2X3NldF9waHlfc2lnbmFsX2xldmVsKGVuY29kZXIsIDB4MmIyNDVmNWYsIDB4 MDAwMDIwMDAsIDB4NTU3OGI4M2EsCisJCQkJIDB4MmIyNDc4NzgpOworCiAJaW50ZWxfaGRtaS0+ c2V0X2luZm9mcmFtZXMoJmVuY29kZXItPmJhc2UsCiAJCQkJICAgaW50ZWxfY3J0Yy0+Y29uZmln LT5oYXNfaGRtaV9zaW5rLAogCQkJCSAgIGFkanVzdGVkX21vZGUpOwotLSAKMi40LjExCgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFp bGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK