From mboxrd@z Thu Jan 1 00:00:00 1970 From: ville.syrjala@linux.intel.com Subject: [PATCH v2 40/43] drm/i915: Store aux data reg offsets in intel_dp->aux_ch_data_reg[] Date: Mon, 28 Sep 2015 18:10:39 +0300 Message-ID: <1443453039-26869-1-git-send-email-ville.syrjala@linux.intel.com> References: <1442595836-23981-41-git-send-email-ville.syrjala@linux.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 E3ACA6E9F0 for ; Mon, 28 Sep 2015 08:10:42 -0700 (PDT) In-Reply-To: <1442595836-23981-41-git-send-email-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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClJh dGhlciB0aGFuIGNvbXB1dGluZyBvbiBkZW1hbmQsIHN0b3JlIGFsc28gdGhlIGF1eCBkYXRhIHJl ZwpvZmZzZXRzIHVuZGVyIGludGVsX2RwLgoKdjI6IER1cGxpY2F0ZSBzb21lIGNvZGUgdG8gbWFr ZSB0aGluZ3MgbGVzcyBtYWdpYyAoSmFuaSkKClNpZ25lZC1vZmYtYnk6IFZpbGxlIFN5cmrDpGzD pCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZHAuYyAgfCA5NCArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0t LS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCB8ICAxICsKIDIgZmlsZXMgY2hh bmdlZCwgODUgaW5zZXJ0aW9ucygrKSwgMTAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2RwLmMKaW5kZXggZDI1MmZlYi4uY2ZiMmVmYSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZHAuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jCkBA IC03OTEsNyArNzkxLDYgQEAgaW50ZWxfZHBfYXV4X2NoKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxf ZHAsCiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGludGVsX2RpZ19wb3J0LT5iYXNlLmJhc2Uu ZGV2OwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZh dGU7CiAJdWludDMyX3QgY2hfY3RsID0gaW50ZWxfZHAtPmF1eF9jaF9jdGxfcmVnOwotCXVpbnQz Ml90IGNoX2RhdGEgPSBjaF9jdGwgKyA0OwogCXVpbnQzMl90IGF1eF9jbG9ja19kaXZpZGVyOwog CWludCBpLCByZXQsIHJlY3ZfYnl0ZXM7CiAJdWludDMyX3Qgc3RhdHVzOwpAQCAtODU3LDcgKzg1 Niw3IEBAIGludGVsX2RwX2F1eF9jaChzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwLAogCQlmb3Ig KHRyeSA9IDA7IHRyeSA8IDU7IHRyeSsrKSB7CiAJCQkvKiBMb2FkIHRoZSBzZW5kIGRhdGEgaW50 byB0aGUgYXV4IGNoYW5uZWwgZGF0YSByZWdpc3RlcnMgKi8KIAkJCWZvciAoaSA9IDA7IGkgPCBz ZW5kX2J5dGVzOyBpICs9IDQpCi0JCQkJSTkxNV9XUklURShjaF9kYXRhICsgaSwKKwkJCQlJOTE1 X1dSSVRFKGludGVsX2RwLT5hdXhfY2hfZGF0YV9yZWdbaSA+PiAyXSwKIAkJCQkJICAgaW50ZWxf ZHBfcGFja19hdXgoc2VuZCArIGksCiAJCQkJCQkJICAgICBzZW5kX2J5dGVzIC0gaSkpOwogCkBA IC05MjEsNyArOTIwLDcgQEAgZG9uZToKIAkJcmVjdl9ieXRlcyA9IHJlY3Zfc2l6ZTsKIAogCWZv ciAoaSA9IDA7IGkgPCByZWN2X2J5dGVzOyBpICs9IDQpCi0JCWludGVsX2RwX3VucGFja19hdXgo STkxNV9SRUFEKGNoX2RhdGEgKyBpKSwKKwkJaW50ZWxfZHBfdW5wYWNrX2F1eChJOTE1X1JFQUQo aW50ZWxfZHAtPmF1eF9jaF9kYXRhX3JlZ1tpID4+IDJdKSwKIAkJCQkgICAgcmVjdiArIGksIHJl Y3ZfYnl0ZXMgLSBpKTsKIAogCXJldCA9IHJlY3ZfYnl0ZXM7CkBAIC0xMDIzLDYgKzEwMjIsMjAg QEAgc3RhdGljIHVpbnQzMl90IGc0eF9hdXhfY3RsX3JlZyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYsCiAJfQogfQogCitzdGF0aWMgdWludDMyX3QgZzR4X2F1eF9kYXRhX3JlZyhz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCisJCQkJIGVudW0gcG9ydCBwb3J0LCBp bnQgaW5kZXgpCit7CisJc3dpdGNoIChwb3J0KSB7CisJY2FzZSBQT1JUX0I6CisJY2FzZSBQT1JU X0M6CisJY2FzZSBQT1JUX0Q6CisJCXJldHVybiBEUF9BVVhfQ0hfREFUQShwb3J0LCBpbmRleCk7 CisJZGVmYXVsdDoKKwkJTUlTU0lOR19DQVNFKHBvcnQpOworCQlyZXR1cm4gRFBfQVVYX0NIX0RB VEEoUE9SVF9BLCBpbmRleCk7CisJfQorfQorCiBzdGF0aWMgdWludDMyX3QgaWxrX2F1eF9jdGxf cmVnKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCQllbnVtIHBvcnQgcG9y dCkKIHsKQEAgLTEwMzksNiArMTA1MiwyMiBAQCBzdGF0aWMgdWludDMyX3QgaWxrX2F1eF9jdGxf cmVnKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAl9CiB9CiAKK3N0YXRpYyB1 aW50MzJfdCBpbGtfYXV4X2RhdGFfcmVnKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diwKKwkJCQkgZW51bSBwb3J0IHBvcnQsIGludCBpbmRleCkKK3sKKwlzd2l0Y2ggKHBvcnQpIHsK KwljYXNlIFBPUlRfQToKKwkJcmV0dXJuIERQX0FVWF9DSF9EQVRBKHBvcnQsIGluZGV4KTsKKwlj YXNlIFBPUlRfQjoKKwljYXNlIFBPUlRfQzoKKwljYXNlIFBPUlRfRDoKKwkJcmV0dXJuIFBDSF9E UF9BVVhfQ0hfREFUQShwb3J0LCBpbmRleCk7CisJZGVmYXVsdDoKKwkJTUlTU0lOR19DQVNFKHBv cnQpOworCQlyZXR1cm4gRFBfQVVYX0NIX0RBVEEoUE9SVF9BLCBpbmRleCk7CisJfQorfQorCiAv KgogICogT24gU0tMIHdlIGRvbid0IGhhdmUgQXV4IGZvciBwb3J0IEUgc28gd2UgcmVseQogICog b24gVkJUIHRvIHNldCBhIHByb3BlciBhbHRlcm5hdGUgYXV4IGNoYW5uZWwuCkBAIC0xMDgxLDEx ICsxMTEwLDYxIEBAIHN0YXRpYyB1aW50MzJfdCBza2xfYXV4X2N0bF9yZWcoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2LAogCX0KIH0KIAorc3RhdGljIHVpbnQzMl90IHNrbF9hdXhf ZGF0YV9yZWcoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAorCQkJCSBlbnVtIHBv cnQgcG9ydCwgaW50IGluZGV4KQoreworCWlmIChwb3J0ID09IFBPUlRfRSkKKwkJcG9ydCA9IHNr bF9wb3J0ZV9hdXhfcG9ydChkZXZfcHJpdik7CisKKwlzd2l0Y2ggKHBvcnQpIHsKKwljYXNlIFBP UlRfQToKKwljYXNlIFBPUlRfQjoKKwljYXNlIFBPUlRfQzoKKwljYXNlIFBPUlRfRDoKKwkJcmV0 dXJuIERQX0FVWF9DSF9EQVRBKHBvcnQsIGluZGV4KTsKKwlkZWZhdWx0OgorCQlNSVNTSU5HX0NB U0UocG9ydCk7CisJCXJldHVybiBEUF9BVVhfQ0hfREFUQShQT1JUX0EsIGluZGV4KTsKKwl9Cit9 CisKK3N0YXRpYyB1aW50MzJfdCBpbnRlbF9hdXhfY3RsX3JlZyhzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYsCisJCQkJICBlbnVtIHBvcnQgcG9ydCkKK3sKKwlpZiAoSU5URUxfSU5G TyhkZXZfcHJpdiktPmdlbiA+PSA5KQorCQlyZXR1cm4gc2tsX2F1eF9jdGxfcmVnKGRldl9wcml2 LCBwb3J0KTsKKwllbHNlIGlmIChIQVNfUENIX1NQTElUKGRldl9wcml2KSkKKwkJcmV0dXJuIGls a19hdXhfY3RsX3JlZyhkZXZfcHJpdiwgcG9ydCk7CisJZWxzZQorCQlyZXR1cm4gZzR4X2F1eF9j dGxfcmVnKGRldl9wcml2LCBwb3J0KTsKK30KKworc3RhdGljIHVpbnQzMl90IGludGVsX2F1eF9k YXRhX3JlZyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCisJCQkJICAgZW51bSBw b3J0IHBvcnQsIGludCBpbmRleCkKK3sKKwlpZiAoSU5URUxfSU5GTyhkZXZfcHJpdiktPmdlbiA+ PSA5KQorCQlyZXR1cm4gc2tsX2F1eF9kYXRhX3JlZyhkZXZfcHJpdiwgcG9ydCwgaW5kZXgpOwor CWVsc2UgaWYgKEhBU19QQ0hfU1BMSVQoZGV2X3ByaXYpKQorCQlyZXR1cm4gaWxrX2F1eF9kYXRh X3JlZyhkZXZfcHJpdiwgcG9ydCwgaW5kZXgpOworCWVsc2UKKwkJcmV0dXJuIGc0eF9hdXhfZGF0 YV9yZWcoZGV2X3ByaXYsIHBvcnQsIGluZGV4KTsKK30KKworc3RhdGljIHZvaWQgaW50ZWxfYXV4 X3JlZ19pbml0KHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCit7CisJc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShpbnRlbF9kcF90b19kZXYoaW50ZWxfZHApKTsK KwllbnVtIHBvcnQgcG9ydCA9IGRwX3RvX2RpZ19wb3J0KGludGVsX2RwKS0+cG9ydDsKKwlpbnQg aTsKKworCWludGVsX2RwLT5hdXhfY2hfY3RsX3JlZyA9IGludGVsX2F1eF9jdGxfcmVnKGRldl9w cml2LCBwb3J0KTsKKwlmb3IgKGkgPSAwOyBpIDwgQVJSQVlfU0laRShpbnRlbF9kcC0+YXV4X2No X2RhdGFfcmVnKTsgaSsrKQorCQlpbnRlbF9kcC0+YXV4X2NoX2RhdGFfcmVnW2ldID0gaW50ZWxf YXV4X2RhdGFfcmVnKGRldl9wcml2LCBwb3J0LCBpKTsKK30KKwogc3RhdGljIHZvaWQKIGludGVs X2RwX2F1eF9pbml0KHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHAsIHN0cnVjdCBpbnRlbF9jb25u ZWN0b3IgKmNvbm5lY3RvcikKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gaW50ZWxfZHBf dG9fZGV2KGludGVsX2RwKTsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBk ZXYtPmRldl9wcml2YXRlOwogCXN0cnVjdCBpbnRlbF9kaWdpdGFsX3BvcnQgKmludGVsX2RpZ19w b3J0ID0gZHBfdG9fZGlnX3BvcnQoaW50ZWxfZHApOwogCWVudW0gcG9ydCBwb3J0ID0gaW50ZWxf ZGlnX3BvcnQtPnBvcnQ7CiAJaW50IHJldDsKQEAgLTEwOTcsMTIgKzExNzYsNyBAQCBpbnRlbF9k cF9hdXhfaW5pdChzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwLCBzdHJ1Y3QgaW50ZWxfY29ubmVj dG9yICpjb25uZWN0b3IpCiAJCVtQT1JUX0VdID0gIkRQRERDLUUiLAogCX07CiAKLQlpZiAoSU5U RUxfSU5GTyhkZXZfcHJpdiktPmdlbiA+PSA5KQotCQlpbnRlbF9kcC0+YXV4X2NoX2N0bF9yZWcg PSBza2xfYXV4X2N0bF9yZWcoZGV2X3ByaXYsIHBvcnQpOwotCWVsc2UgaWYgKEhBU19QQ0hfU1BM SVQoZGV2X3ByaXYpKQotCQlpbnRlbF9kcC0+YXV4X2NoX2N0bF9yZWcgPSBpbGtfYXV4X2N0bF9y ZWcoZGV2X3ByaXYsIHBvcnQpOwotCWVsc2UKLQkJaW50ZWxfZHAtPmF1eF9jaF9jdGxfcmVnID0g ZzR4X2F1eF9jdGxfcmVnKGRldl9wcml2LCBwb3J0KTsKKwlpbnRlbF9hdXhfcmVnX2luaXQoaW50 ZWxfZHApOwogCiAJaW50ZWxfZHAtPmF1eC5uYW1lID0gZGRjX25hbWVbcG9ydF07CiAJaW50ZWxf ZHAtPmF1eC5kZXYgPSBkZXYtPmRldjsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXggMWRm NmViZi4uM2ZlYTAzOSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2 LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAgLTcxNyw2ICs3MTcs NyBAQCBzdHJ1Y3Qgc2lua19jcmMgewogc3RydWN0IGludGVsX2RwIHsKIAl1aW50MzJfdCBvdXRw dXRfcmVnOwogCXVpbnQzMl90IGF1eF9jaF9jdGxfcmVnOworCXVpbnQzMl90IGF1eF9jaF9kYXRh X3JlZ1s1XTsKIAl1aW50MzJfdCBEUDsKIAlpbnQgbGlua19yYXRlOwogCXVpbnQ4X3QgbGFuZV9j b3VudDsKLS0gCjIuNC42CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVs LWdmeAo=