From mboxrd@z Thu Jan 1 00:00:00 1970 From: Hans de Goede Subject: [PATCH 04/18] drm/i915/dsi: Merge intel_dsi_disable/enable into their respective callers Date: Thu, 1 Dec 2016 21:29:11 +0100 Message-ID: <20161201202925.12220-5-hdegoede@redhat.com> References: <20161201202925.12220-1-hdegoede@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20161201202925.12220-1-hdegoede@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Daniel Vetter , Jani Nikula , =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= Cc: Hans de Goede , intel-gfx , dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org aW50ZWxfZHNpX2Rpc2FibGUvZW5hYmxlIG9ubHkgaGF2ZSBvbmUgY2FsbGVyLCBtZXJnZSB0aGVt IGludG8gdGhlaXIKcmVzcGVjdGl2ZSBjYWxsZXJzLgoKQ2hhbmdlIG1zbGVlcCgyKSBpbnRvIHVz bGVlcF9yYW5nZSgyMDAwLCA1MDAwKSB0byBtYWtlIGNoZWNrcGF0Y2ggaGFwcHksCm90aGVyd2lz ZSBubyBmdW50aW9uYWwgY2hhbmdlcy4KClRoZSBtYWluIGFkdmFudGFnZSBvZiB0aGlzIGNoYW5n ZSBpcyB0aGF0IGl0IG1ha2VzIGl0IGVhc2llciB0bwpmb2xsb3cgYWxsIHRoZSBzdGVwcyBvZiB0 aGUgcGFuZWwgZW5hYmxlIC8gZGlzYWJsZSBzZXF1ZW5jZSB3aGVuCnJlYWRpbmcgdGhlIGNvZGUu CgpTaWduZWQtb2ZmLWJ5OiBIYW5zIGRlIEdvZWRlIDxoZGVnb2VkZUByZWRoYXQuY29tPgotLS0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RzaS5jIHwgMTA5ICsrKysrKysrKysrKysrKyst LS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDQ1IGluc2VydGlvbnMoKyks IDY0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2RzaS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHNpLmMKaW5kZXggNTg3YmEwNy4u YjMzMzgxYSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHNpLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHNpLmMKQEAgLTUwOCwzMiArNTA4LDYgQEAg c3RhdGljIHZvaWQgaW50ZWxfZHNpX3BvcnRfZGlzYWJsZShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAq ZW5jb2RlcikKIAl9CiB9CiAKLXN0YXRpYyB2b2lkIGludGVsX2RzaV9lbmFibGUoc3RydWN0IGlu dGVsX2VuY29kZXIgKmVuY29kZXIpCi17Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGVuY29k ZXItPmJhc2UuZGV2OwotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5 MTUoZGV2KTsKLQlzdHJ1Y3QgaW50ZWxfZHNpICppbnRlbF9kc2kgPSBlbmNfdG9faW50ZWxfZHNp KCZlbmNvZGVyLT5iYXNlKTsKLQllbnVtIHBvcnQgcG9ydDsKLQotCURSTV9ERUJVR19LTVMoIlxu Iik7Ci0KLQlpZiAoaXNfY21kX21vZGUoaW50ZWxfZHNpKSkgewotCQlmb3JfZWFjaF9kc2lfcG9y dChwb3J0LCBpbnRlbF9kc2ktPnBvcnRzKQotCQkJSTkxNV9XUklURShNSVBJX01BWF9SRVRVUk5f UEtUX1NJWkUocG9ydCksIDggKiA0KTsKLQl9IGVsc2UgewotCQltc2xlZXAoMjApOyAvKiBYWFgg Ki8KLQkJZm9yX2VhY2hfZHNpX3BvcnQocG9ydCwgaW50ZWxfZHNpLT5wb3J0cykKLQkJCWRwaV9z ZW5kX2NtZChpbnRlbF9kc2ksIFRVUk5fT04sIGZhbHNlLCBwb3J0KTsKLQkJbXNsZWVwKDEwMCk7 Ci0KLQkJZHJtX3BhbmVsX2VuYWJsZShpbnRlbF9kc2ktPnBhbmVsKTsKLQotCQlpbnRlbF9kc2lf cG9ydF9lbmFibGUoZW5jb2Rlcik7Ci0JfQotCi0JaW50ZWxfcGFuZWxfZW5hYmxlX2JhY2tsaWdo dChpbnRlbF9kc2ktPmF0dGFjaGVkX2Nvbm5lY3Rvcik7Ci19Ci0KIHN0YXRpYyB2b2lkIGludGVs X2RzaV9wcmVwYXJlKHN0cnVjdCBpbnRlbF9lbmNvZGVyICppbnRlbF9lbmNvZGVyLAogCQkJICAg ICAgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKnBpcGVfY29uZmlnKTsKIApAQCAtNTQzLDYgKzUx Nyw3IEBAIHN0YXRpYyB2b2lkIGludGVsX2RzaV9wcmVfZW5hYmxlKHN0cnVjdCBpbnRlbF9lbmNv ZGVyICplbmNvZGVyLAogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRv X2k5MTUoZW5jb2Rlci0+YmFzZS5kZXYpOwogCXN0cnVjdCBpbnRlbF9kc2kgKmludGVsX2RzaSA9 IGVuY190b19pbnRlbF9kc2koJmVuY29kZXItPmJhc2UpOworCWVudW0gcG9ydCBwb3J0OwogCiAJ RFJNX0RFQlVHX0tNUygiXG4iKTsKIApAQCAtNTc3LDcgKzU1MiwyMSBAQCBzdGF0aWMgdm9pZCBp bnRlbF9kc2lfcHJlX2VuYWJsZShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwKIAogCS8q IEVuYWJsZSBwb3J0IGluIHByZS1lbmFibGUgcGhhc2UgaXRzZWxmIGJlY2F1c2UgYXMgcGVyIGh3 IHRlYW0KIAkgKiByZWNvbW1lbmRhdGlvbiwgcG9ydCBzaG91bGQgYmUgZW5hYmxlZCBiZWZvciBw bGFuZSAmIHBpcGUgKi8KLQlpbnRlbF9kc2lfZW5hYmxlKGVuY29kZXIpOworCWlmIChpc19jbWRf bW9kZShpbnRlbF9kc2kpKSB7CisJCWZvcl9lYWNoX2RzaV9wb3J0KHBvcnQsIGludGVsX2RzaS0+ cG9ydHMpCisJCQlJOTE1X1dSSVRFKE1JUElfTUFYX1JFVFVSTl9QS1RfU0laRShwb3J0KSwgOCAq IDQpOworCX0gZWxzZSB7CisJCW1zbGVlcCgyMCk7IC8qIFhYWCAqLworCQlmb3JfZWFjaF9kc2lf cG9ydChwb3J0LCBpbnRlbF9kc2ktPnBvcnRzKQorCQkJZHBpX3NlbmRfY21kKGludGVsX2RzaSwg VFVSTl9PTiwgZmFsc2UsIHBvcnQpOworCQltc2xlZXAoMTAwKTsKKworCQlkcm1fcGFuZWxfZW5h YmxlKGludGVsX2RzaS0+cGFuZWwpOworCisJCWludGVsX2RzaV9wb3J0X2VuYWJsZShlbmNvZGVy KTsKKwl9CisKKwlpbnRlbF9wYW5lbF9lbmFibGVfYmFja2xpZ2h0KGludGVsX2RzaS0+YXR0YWNo ZWRfY29ubmVjdG9yKTsKIH0KIAogc3RhdGljIHZvaWQgaW50ZWxfZHNpX2VuYWJsZV9ub3Aoc3Ry dWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCkBAIC02MTEsNDIgKzYwMCw2IEBAIHN0YXRpYyB2 b2lkIGludGVsX2RzaV9wcmVfZGlzYWJsZShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwK IAl9CiB9CiAKLXN0YXRpYyB2b2lkIGludGVsX2RzaV9kaXNhYmxlKHN0cnVjdCBpbnRlbF9lbmNv ZGVyICplbmNvZGVyKQotewotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBlbmNvZGVyLT5iYXNl LmRldjsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7 Ci0Jc3RydWN0IGludGVsX2RzaSAqaW50ZWxfZHNpID0gZW5jX3RvX2ludGVsX2RzaSgmZW5jb2Rl ci0+YmFzZSk7Ci0JZW51bSBwb3J0IHBvcnQ7Ci0JdTMyIHRlbXA7Ci0KLQlEUk1fREVCVUdfS01T KCJcbiIpOwotCi0JaWYgKGlzX3ZpZF9tb2RlKGludGVsX2RzaSkpIHsKLQkJZm9yX2VhY2hfZHNp X3BvcnQocG9ydCwgaW50ZWxfZHNpLT5wb3J0cykKLQkJCXdhaXRfZm9yX2RzaV9maWZvX2VtcHR5 KGludGVsX2RzaSwgcG9ydCk7Ci0KLQkJaW50ZWxfZHNpX3BvcnRfZGlzYWJsZShlbmNvZGVyKTsK LQkJbXNsZWVwKDIpOwotCX0KLQotCWZvcl9lYWNoX2RzaV9wb3J0KHBvcnQsIGludGVsX2RzaS0+ cG9ydHMpIHsKLQkJLyogUGFuZWwgY29tbWFuZHMgY2FuIGJlIHNlbnQgd2hlbiBjbG9jayBpcyBp biBMUDExICovCi0JCUk5MTVfV1JJVEUoTUlQSV9ERVZJQ0VfUkVBRFkocG9ydCksIDB4MCk7Ci0K LQkJaW50ZWxfZHNpX3Jlc2V0X2Nsb2NrcyhlbmNvZGVyLCBwb3J0KTsKLQkJSTkxNV9XUklURShN SVBJX0VPVF9ESVNBQkxFKHBvcnQpLCBDTE9DS1NUT1ApOwotCi0JCXRlbXAgPSBJOTE1X1JFQUQo TUlQSV9EU0lfRlVOQ19QUkcocG9ydCkpOwotCQl0ZW1wICY9IH5WSURfTU9ERV9GT1JNQVRfTUFT SzsKLQkJSTkxNV9XUklURShNSVBJX0RTSV9GVU5DX1BSRyhwb3J0KSwgdGVtcCk7Ci0KLQkJSTkx NV9XUklURShNSVBJX0RFVklDRV9SRUFEWShwb3J0KSwgMHgxKTsKLQl9Ci0JLyogaWYgZGlzYWJs ZSBwYWNrZXRzIGFyZSBzZW50IGJlZm9yZSBzZW5kaW5nIHNodXRkb3duIHBhY2tldCB0aGVuIGlu Ci0JICogc29tZSBuZXh0IGVuYWJsZSBzZXF1ZW5jZSBzZW5kIHR1cm4gb24gcGFja2V0IGVycm9y IGlzIG9ic2VydmVkICovCi0JZHJtX3BhbmVsX2Rpc2FibGUoaW50ZWxfZHNpLT5wYW5lbCk7Ci19 Ci0KIHN0YXRpYyB2b2lkIGludGVsX2RzaV9jbGVhcl9kZXZpY2VfcmVhZHkoc3RydWN0IGludGVs X2VuY29kZXIgKmVuY29kZXIpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 ID0gdG9faTkxNShlbmNvZGVyLT5iYXNlLmRldik7CkBAIC02OTgsMTAgKzY1MSwzOCBAQCBzdGF0 aWMgdm9pZCBpbnRlbF9kc2lfcG9zdF9kaXNhYmxlKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNv ZGVyLAogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZW5j b2Rlci0+YmFzZS5kZXYpOwogCXN0cnVjdCBpbnRlbF9kc2kgKmludGVsX2RzaSA9IGVuY190b19p bnRlbF9kc2koJmVuY29kZXItPmJhc2UpOworCWVudW0gcG9ydCBwb3J0OworCXUzMiB0ZW1wOwog CiAJRFJNX0RFQlVHX0tNUygiXG4iKTsKIAotCWludGVsX2RzaV9kaXNhYmxlKGVuY29kZXIpOwor CWlmIChpc192aWRfbW9kZShpbnRlbF9kc2kpKSB7CisJCWZvcl9lYWNoX2RzaV9wb3J0KHBvcnQs IGludGVsX2RzaS0+cG9ydHMpCisJCQl3YWl0X2Zvcl9kc2lfZmlmb19lbXB0eShpbnRlbF9kc2ks IHBvcnQpOworCisJCWludGVsX2RzaV9wb3J0X2Rpc2FibGUoZW5jb2Rlcik7CisJCXVzbGVlcF9y YW5nZSgyMDAwLCA1MDAwKTsKKwl9CisKKwlmb3JfZWFjaF9kc2lfcG9ydChwb3J0LCBpbnRlbF9k c2ktPnBvcnRzKSB7CisJCS8qIFBhbmVsIGNvbW1hbmRzIGNhbiBiZSBzZW50IHdoZW4gY2xvY2sg aXMgaW4gTFAxMSAqLworCQlJOTE1X1dSSVRFKE1JUElfREVWSUNFX1JFQURZKHBvcnQpLCAweDAp OworCisJCWludGVsX2RzaV9yZXNldF9jbG9ja3MoZW5jb2RlciwgcG9ydCk7CisJCUk5MTVfV1JJ VEUoTUlQSV9FT1RfRElTQUJMRShwb3J0KSwgQ0xPQ0tTVE9QKTsKKworCQl0ZW1wID0gSTkxNV9S RUFEKE1JUElfRFNJX0ZVTkNfUFJHKHBvcnQpKTsKKwkJdGVtcCAmPSB+VklEX01PREVfRk9STUFU X01BU0s7CisJCUk5MTVfV1JJVEUoTUlQSV9EU0lfRlVOQ19QUkcocG9ydCksIHRlbXApOworCisJ CUk5MTVfV1JJVEUoTUlQSV9ERVZJQ0VfUkVBRFkocG9ydCksIDB4MSk7CisJfQorCisJLyoKKwkg KiBpZiBkaXNhYmxlIHBhY2tldHMgYXJlIHNlbnQgYmVmb3JlIHNlbmRpbmcgc2h1dGRvd24gcGFj a2V0IHRoZW4gaW4KKwkgKiBzb21lIG5leHQgZW5hYmxlIHNlcXVlbmNlIHNlbmQgdHVybiBvbiBw YWNrZXQgZXJyb3IgaXMgb2JzZXJ2ZWQKKwkgKi8KKwlkcm1fcGFuZWxfZGlzYWJsZShpbnRlbF9k c2ktPnBhbmVsKTsKIAogCWludGVsX2RzaV9jbGVhcl9kZXZpY2VfcmVhZHkoZW5jb2Rlcik7CiAK LS0gCjIuOS4zCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK