From mboxrd@z Thu Jan  1 00:00:00 1970
From: Hans de Goede <hdegoede@redhat.com>
Subject: [PATCH resend 02/15] drm/i915/dsi: Merge
	intel_dsi_disable/enable into their respective callers
Date: Mon, 20 Feb 2017 15:08:32 +0100
Message-ID: <20170220140845.1714-3-hdegoede@redhat.com>
References: <20170220140845.1714-1-hdegoede@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 666236E3F9
 for <intel-gfx@lists.freedesktop.org>; Mon, 20 Feb 2017 14:08:51 +0000 (UTC)
In-Reply-To: <20170220140845.1714-1-hdegoede@redhat.com>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: Daniel Vetter <daniel.vetter@intel.com>, Jani Nikula <jani.nikula@linux.intel.com>, =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com>
Cc: Hans de Goede <hdegoede@redhat.com>, intel-gfx <intel-gfx@lists.freedesktop.org>
List-Id: intel-gfx@lists.freedesktop.org

aW50ZWxfZHNpX2Rpc2FibGUvZW5hYmxlIG9ubHkgaGF2ZSBvbmUgY2FsbGVyLCBtZXJnZSB0aGVt
IGludG8gdGhlaXIKcmVzcGVjdGl2ZSBjYWxsZXJzLgoKQ2hhbmdlIG1zbGVlcCgyKSBpbnRvIHVz
bGVlcF9yYW5nZSgyMDAwLCA1MDAwKSB0byBtYWtlIGNoZWNrcGF0Y2ggaGFwcHksCm90aGVyd2lz
ZSBubyBmdW5jdGlvbmFsIGNoYW5nZXMuCgpUaGUgbWFpbiBhZHZhbnRhZ2Ugb2YgdGhpcyBjaGFu
Z2UgaXMgdGhhdCBpdCBtYWtlcyBpdCBlYXNpZXIgdG8KZm9sbG93IGFsbCB0aGUgc3RlcHMgb2Yg
dGhlIHBhbmVsIGVuYWJsZSAvIGRpc2FibGUgc2VxdWVuY2Ugd2hlbgpyZWFkaW5nIHRoZSBjb2Rl
LgoKU2lnbmVkLW9mZi1ieTogSGFucyBkZSBHb2VkZSA8aGRlZ29lZGVAcmVkaGF0LmNvbT4KQWNr
ZWQtYnk6IEphbmkgTmlrdWxhIDxqYW5pLm5pa3VsYUBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9n
cHUvZHJtL2k5MTUvaW50ZWxfZHNpLmMgfCAxMDggKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNDQgaW5zZXJ0aW9ucygrKSwgNjQgZGVsZXRp
b25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHNpLmMgYi9k
cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kc2kuYwppbmRleCAyZjBhZjk4Li5lODA4ZGNlIDEw
MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kc2kuYworKysgYi9kcml2ZXJz
L2dwdS9kcm0vaTkxNS9pbnRlbF9kc2kuYwpAQCAtNTA1LDMyICs1MDUsNiBAQCBzdGF0aWMgdm9p
ZCBpbnRlbF9kc2lfcG9ydF9kaXNhYmxlKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyKQog
CX0KIH0KIAotc3RhdGljIHZvaWQgaW50ZWxfZHNpX2VuYWJsZShzdHJ1Y3QgaW50ZWxfZW5jb2Rl
ciAqZW5jb2RlcikKLXsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gZW5jb2Rlci0+YmFzZS5k
ZXY7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwot
CXN0cnVjdCBpbnRlbF9kc2kgKmludGVsX2RzaSA9IGVuY190b19pbnRlbF9kc2koJmVuY29kZXIt
PmJhc2UpOwotCWVudW0gcG9ydCBwb3J0OwotCi0JRFJNX0RFQlVHX0tNUygiXG4iKTsKLQotCWlm
IChpc19jbWRfbW9kZShpbnRlbF9kc2kpKSB7Ci0JCWZvcl9lYWNoX2RzaV9wb3J0KHBvcnQsIGlu
dGVsX2RzaS0+cG9ydHMpCi0JCQlJOTE1X1dSSVRFKE1JUElfTUFYX1JFVFVSTl9QS1RfU0laRShw
b3J0KSwgOCAqIDQpOwotCX0gZWxzZSB7Ci0JCW1zbGVlcCgyMCk7IC8qIFhYWCAqLwotCQlmb3Jf
ZWFjaF9kc2lfcG9ydChwb3J0LCBpbnRlbF9kc2ktPnBvcnRzKQotCQkJZHBpX3NlbmRfY21kKGlu
dGVsX2RzaSwgVFVSTl9PTiwgZmFsc2UsIHBvcnQpOwotCQltc2xlZXAoMTAwKTsKLQotCQlkcm1f
cGFuZWxfZW5hYmxlKGludGVsX2RzaS0+cGFuZWwpOwotCi0JCWludGVsX2RzaV9wb3J0X2VuYWJs
ZShlbmNvZGVyKTsKLQl9Ci0KLQlpbnRlbF9wYW5lbF9lbmFibGVfYmFja2xpZ2h0KGludGVsX2Rz
aS0+YXR0YWNoZWRfY29ubmVjdG9yKTsKLX0KLQogc3RhdGljIHZvaWQgaW50ZWxfZHNpX3ByZXBh
cmUoc3RydWN0IGludGVsX2VuY29kZXIgKmludGVsX2VuY29kZXIsCiAJCQkgICAgICBzdHJ1Y3Qg
aW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9jb25maWcpOwogCkBAIC01NDAsNiArNTE0LDcgQEAgc3Rh
dGljIHZvaWQgaW50ZWxfZHNpX3ByZV9lbmFibGUoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29k
ZXIsCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShlbmNv
ZGVyLT5iYXNlLmRldik7CiAJc3RydWN0IGludGVsX2RzaSAqaW50ZWxfZHNpID0gZW5jX3RvX2lu
dGVsX2RzaSgmZW5jb2Rlci0+YmFzZSk7CisJZW51bSBwb3J0IHBvcnQ7CiAJdTMyIHZhbDsKIAog
CURSTV9ERUJVR19LTVMoIlxuIik7CkBAIC01ODYsNyArNTYxLDIxIEBAIHN0YXRpYyB2b2lkIGlu
dGVsX2RzaV9wcmVfZW5hYmxlKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAogCiAJLyog
RW5hYmxlIHBvcnQgaW4gcHJlLWVuYWJsZSBwaGFzZSBpdHNlbGYgYmVjYXVzZSBhcyBwZXIgaHcg
dGVhbQogCSAqIHJlY29tbWVuZGF0aW9uLCBwb3J0IHNob3VsZCBiZSBlbmFibGVkIGJlZm9yIHBs
YW5lICYgcGlwZSAqLwotCWludGVsX2RzaV9lbmFibGUoZW5jb2Rlcik7CisJaWYgKGlzX2NtZF9t
b2RlKGludGVsX2RzaSkpIHsKKwkJZm9yX2VhY2hfZHNpX3BvcnQocG9ydCwgaW50ZWxfZHNpLT5w
b3J0cykKKwkJCUk5MTVfV1JJVEUoTUlQSV9NQVhfUkVUVVJOX1BLVF9TSVpFKHBvcnQpLCA4ICog
NCk7CisJfSBlbHNlIHsKKwkJbXNsZWVwKDIwKTsgLyogWFhYICovCisJCWZvcl9lYWNoX2RzaV9w
b3J0KHBvcnQsIGludGVsX2RzaS0+cG9ydHMpCisJCQlkcGlfc2VuZF9jbWQoaW50ZWxfZHNpLCBU
VVJOX09OLCBmYWxzZSwgcG9ydCk7CisJCW1zbGVlcCgxMDApOworCisJCWRybV9wYW5lbF9lbmFi
bGUoaW50ZWxfZHNpLT5wYW5lbCk7CisKKwkJaW50ZWxfZHNpX3BvcnRfZW5hYmxlKGVuY29kZXIp
OworCX0KKworCWludGVsX3BhbmVsX2VuYWJsZV9iYWNrbGlnaHQoaW50ZWxfZHNpLT5hdHRhY2hl
ZF9jb25uZWN0b3IpOwogfQogCiBzdGF0aWMgdm9pZCBpbnRlbF9kc2lfZW5hYmxlX25vcChzdHJ1
Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwKQEAgLTYzMSw0MiArNjIwLDYgQEAgc3RhdGljIHZv
aWQgaW50ZWxfZHNpX3ByZV9kaXNhYmxlKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAog
CX0KIH0KIAotc3RhdGljIHZvaWQgaW50ZWxfZHNpX2Rpc2FibGUoc3RydWN0IGludGVsX2VuY29k
ZXIgKmVuY29kZXIpCi17Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGVuY29kZXItPmJhc2Uu
ZGV2OwotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsK
LQlzdHJ1Y3QgaW50ZWxfZHNpICppbnRlbF9kc2kgPSBlbmNfdG9faW50ZWxfZHNpKCZlbmNvZGVy
LT5iYXNlKTsKLQllbnVtIHBvcnQgcG9ydDsKLQl1MzIgdGVtcDsKLQotCURSTV9ERUJVR19LTVMo
IlxuIik7Ci0KLQlpZiAoaXNfdmlkX21vZGUoaW50ZWxfZHNpKSkgewotCQlmb3JfZWFjaF9kc2lf
cG9ydChwb3J0LCBpbnRlbF9kc2ktPnBvcnRzKQotCQkJd2FpdF9mb3JfZHNpX2ZpZm9fZW1wdHko
aW50ZWxfZHNpLCBwb3J0KTsKLQotCQlpbnRlbF9kc2lfcG9ydF9kaXNhYmxlKGVuY29kZXIpOwot
CQltc2xlZXAoMik7Ci0JfQotCi0JZm9yX2VhY2hfZHNpX3BvcnQocG9ydCwgaW50ZWxfZHNpLT5w
b3J0cykgewotCQkvKiBQYW5lbCBjb21tYW5kcyBjYW4gYmUgc2VudCB3aGVuIGNsb2NrIGlzIGlu
IExQMTEgKi8KLQkJSTkxNV9XUklURShNSVBJX0RFVklDRV9SRUFEWShwb3J0KSwgMHgwKTsKLQot
CQlpbnRlbF9kc2lfcmVzZXRfY2xvY2tzKGVuY29kZXIsIHBvcnQpOwotCQlJOTE1X1dSSVRFKE1J
UElfRU9UX0RJU0FCTEUocG9ydCksIENMT0NLU1RPUCk7Ci0KLQkJdGVtcCA9IEk5MTVfUkVBRChN
SVBJX0RTSV9GVU5DX1BSRyhwb3J0KSk7Ci0JCXRlbXAgJj0gflZJRF9NT0RFX0ZPUk1BVF9NQVNL
OwotCQlJOTE1X1dSSVRFKE1JUElfRFNJX0ZVTkNfUFJHKHBvcnQpLCB0ZW1wKTsKLQotCQlJOTE1
X1dSSVRFKE1JUElfREVWSUNFX1JFQURZKHBvcnQpLCAweDEpOwotCX0KLQkvKiBpZiBkaXNhYmxl
IHBhY2tldHMgYXJlIHNlbnQgYmVmb3JlIHNlbmRpbmcgc2h1dGRvd24gcGFja2V0IHRoZW4gaW4K
LQkgKiBzb21lIG5leHQgZW5hYmxlIHNlcXVlbmNlIHNlbmQgdHVybiBvbiBwYWNrZXQgZXJyb3Ig
aXMgb2JzZXJ2ZWQgKi8KLQlkcm1fcGFuZWxfZGlzYWJsZShpbnRlbF9kc2ktPnBhbmVsKTsKLX0K
LQogc3RhdGljIHZvaWQgaW50ZWxfZHNpX2NsZWFyX2RldmljZV9yZWFkeShzdHJ1Y3QgaW50ZWxf
ZW5jb2RlciAqZW5jb2RlcikKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYg
PSB0b19pOTE1KGVuY29kZXItPmJhc2UuZGV2KTsKQEAgLTcxNiwxMSArNjY5LDM4IEBAIHN0YXRp
YyB2b2lkIGludGVsX2RzaV9wb3N0X2Rpc2FibGUoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29k
ZXIsCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShlbmNv
ZGVyLT5iYXNlLmRldik7CiAJc3RydWN0IGludGVsX2RzaSAqaW50ZWxfZHNpID0gZW5jX3RvX2lu
dGVsX2RzaSgmZW5jb2Rlci0+YmFzZSk7CisJZW51bSBwb3J0IHBvcnQ7CiAJdTMyIHZhbDsKIAog
CURSTV9ERUJVR19LTVMoIlxuIik7CiAKLQlpbnRlbF9kc2lfZGlzYWJsZShlbmNvZGVyKTsKKwlp
ZiAoaXNfdmlkX21vZGUoaW50ZWxfZHNpKSkgeworCQlmb3JfZWFjaF9kc2lfcG9ydChwb3J0LCBp
bnRlbF9kc2ktPnBvcnRzKQorCQkJd2FpdF9mb3JfZHNpX2ZpZm9fZW1wdHkoaW50ZWxfZHNpLCBw
b3J0KTsKKworCQlpbnRlbF9kc2lfcG9ydF9kaXNhYmxlKGVuY29kZXIpOworCQl1c2xlZXBfcmFu
Z2UoMjAwMCwgNTAwMCk7CisJfQorCisJZm9yX2VhY2hfZHNpX3BvcnQocG9ydCwgaW50ZWxfZHNp
LT5wb3J0cykgeworCQkvKiBQYW5lbCBjb21tYW5kcyBjYW4gYmUgc2VudCB3aGVuIGNsb2NrIGlz
IGluIExQMTEgKi8KKwkJSTkxNV9XUklURShNSVBJX0RFVklDRV9SRUFEWShwb3J0KSwgMHgwKTsK
KworCQlpbnRlbF9kc2lfcmVzZXRfY2xvY2tzKGVuY29kZXIsIHBvcnQpOworCQlJOTE1X1dSSVRF
KE1JUElfRU9UX0RJU0FCTEUocG9ydCksIENMT0NLU1RPUCk7CisKKwkJdmFsID0gSTkxNV9SRUFE
KE1JUElfRFNJX0ZVTkNfUFJHKHBvcnQpKTsKKwkJdmFsICY9IH5WSURfTU9ERV9GT1JNQVRfTUFT
SzsKKwkJSTkxNV9XUklURShNSVBJX0RTSV9GVU5DX1BSRyhwb3J0KSwgdmFsKTsKKworCQlJOTE1
X1dSSVRFKE1JUElfREVWSUNFX1JFQURZKHBvcnQpLCAweDEpOworCX0KKworCS8qCisJICogaWYg
ZGlzYWJsZSBwYWNrZXRzIGFyZSBzZW50IGJlZm9yZSBzZW5kaW5nIHNodXRkb3duIHBhY2tldCB0
aGVuIGluCisJICogc29tZSBuZXh0IGVuYWJsZSBzZXF1ZW5jZSBzZW5kIHR1cm4gb24gcGFja2V0
IGVycm9yIGlzIG9ic2VydmVkCisJICovCisJZHJtX3BhbmVsX2Rpc2FibGUoaW50ZWxfZHNpLT5w
YW5lbCk7CiAKIAlpbnRlbF9kc2lfY2xlYXJfZGV2aWNlX3JlYWR5KGVuY29kZXIpOwogCi0tIAoy
LjkuMwoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50
ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBz
Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==