From: Thierry Reding Subject: [PATCH v4 04/11] drm/fb-helper: Push down modeset lock into FB helpers Date: Wed, 29 Mar 2017 16:43:54 +0200 Message-ID: <20170329144401.1804-5-thierry.reding@gmail.com> References: <20170329144401.1804-1-thierry.reding@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170329144401.1804-1-thierry.reding@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Daniel Vetter Cc: John Stultz , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogVGhpZXJyeSBSZWRpbmcgPHRyZWRpbmdAbnZpZGlhLmNvbT4KCk1vdmUgdGhlIG1vZGVz ZXQgbG9ja2luZyBmcm9tIGRyaXZlcnMgaW50byBGQiBoZWxwZXJzLgoKVGVzdGVkLWJ5OiBKb2hu IFN0dWx0eiA8am9obi5zdHVsdHpAbGluYXJvLm9yZz4KUmV2aWV3ZWQtYnk6IERhbmllbCBWZXR0 ZXIgPGRhbmllbC52ZXR0ZXJAZmZ3bGwuY2g+ClNpZ25lZC1vZmYtYnk6IFRoaWVycnkgUmVkaW5n IDx0cmVkaW5nQG52aWRpYS5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2RybV9mYl9oZWxwZXIu YyAgICAgICAgfCA0MCArKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kcF9tc3QuYyAgICB8ICAzIC0tLQogZHJpdmVycy9ncHUvZHJt L3JhZGVvbi9yYWRlb25fZHBfbXN0LmMgfCAgNyAtLS0tLS0KIDMgZmlsZXMgY2hhbmdlZCwgMzQg aW5zZXJ0aW9ucygrKSwgMTYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2RybV9mYl9oZWxwZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fZmJfaGVscGVyLmMKaW5k ZXggNjczYTQ3NDQ1ZDYxLi4xODEwNWNiZTk4MTAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9kcm1fZmJfaGVscGVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV9mYl9oZWxwZXIuYwpA QCAtMTA5LDggKzEwOSw4IEBAIHN0YXRpYyBERUZJTkVfTVVURVgoa2VybmVsX2ZiX2hlbHBlcl9s b2NrKTsKIAlmb3IgKCh7IGxvY2tkZXBfYXNzZXJ0X2hlbGQoJihmYmgpLT5kZXYtPm1vZGVfY29u ZmlnLm11dGV4KTsgfSksIFwKIAkgICAgIGlfXyA9IDA7IGlfXyA8IChmYmgpLT5jb25uZWN0b3Jf Y291bnQ7IGlfXysrKQogCi1pbnQgZHJtX2ZiX2hlbHBlcl9hZGRfb25lX2Nvbm5lY3RvcihzdHJ1 Y3QgZHJtX2ZiX2hlbHBlciAqZmJfaGVscGVyLAotCQkJCSAgICBzdHJ1Y3QgZHJtX2Nvbm5lY3Rv ciAqY29ubmVjdG9yKQorc3RhdGljIGludCBfX2RybV9mYl9oZWxwZXJfYWRkX29uZV9jb25uZWN0 b3Ioc3RydWN0IGRybV9mYl9oZWxwZXIgKmZiX2hlbHBlciwKKwkJCQkJICAgICBzdHJ1Y3QgZHJt X2Nvbm5lY3RvciAqY29ubmVjdG9yKQogewogCXN0cnVjdCBkcm1fZmJfaGVscGVyX2Nvbm5lY3Rv ciAqZmJfY29ubjsKIAlzdHJ1Y3QgZHJtX2ZiX2hlbHBlcl9jb25uZWN0b3IgKip0ZW1wOwpAQCAt MTQxLDggKzE0MSwyMyBAQCBpbnQgZHJtX2ZiX2hlbHBlcl9hZGRfb25lX2Nvbm5lY3RvcihzdHJ1 Y3QgZHJtX2ZiX2hlbHBlciAqZmJfaGVscGVyLAogCWRybV9jb25uZWN0b3JfZ2V0KGNvbm5lY3Rv cik7CiAJZmJfY29ubi0+Y29ubmVjdG9yID0gY29ubmVjdG9yOwogCWZiX2hlbHBlci0+Y29ubmVj dG9yX2luZm9bZmJfaGVscGVyLT5jb25uZWN0b3JfY291bnQrK10gPSBmYl9jb25uOworCiAJcmV0 dXJuIDA7CiB9CisKK2ludCBkcm1fZmJfaGVscGVyX2FkZF9vbmVfY29ubmVjdG9yKHN0cnVjdCBk cm1fZmJfaGVscGVyICpmYl9oZWxwZXIsCisJCQkJICAgIHN0cnVjdCBkcm1fY29ubmVjdG9yICpj b25uZWN0b3IpCit7CisJaW50IGVycjsKKworCW11dGV4X2xvY2soJmZiX2hlbHBlci0+ZGV2LT5t b2RlX2NvbmZpZy5tdXRleCk7CisKKwllcnIgPSBfX2RybV9mYl9oZWxwZXJfYWRkX29uZV9jb25u ZWN0b3IoZmJfaGVscGVyLCBjb25uZWN0b3IpOworCisJbXV0ZXhfdW5sb2NrKCZmYl9oZWxwZXIt PmRldi0+bW9kZV9jb25maWcubXV0ZXgpOworCisJcmV0dXJuIGVycjsKK30KIEVYUE9SVF9TWU1C T0woZHJtX2ZiX2hlbHBlcl9hZGRfb25lX2Nvbm5lY3Rvcik7CiAKIC8qKgpAQCAtMTcyLDggKzE4 Nyw3IEBAIGludCBkcm1fZmJfaGVscGVyX3NpbmdsZV9hZGRfYWxsX2Nvbm5lY3RvcnMoc3RydWN0 IGRybV9mYl9oZWxwZXIgKmZiX2hlbHBlcikKIAltdXRleF9sb2NrKCZkZXYtPm1vZGVfY29uZmln Lm11dGV4KTsKIAlkcm1fY29ubmVjdG9yX2xpc3RfaXRlcl9iZWdpbihkZXYsICZjb25uX2l0ZXIp OwogCWRybV9mb3JfZWFjaF9jb25uZWN0b3JfaXRlcihjb25uZWN0b3IsICZjb25uX2l0ZXIpIHsK LQkJcmV0ID0gZHJtX2ZiX2hlbHBlcl9hZGRfb25lX2Nvbm5lY3RvcihmYl9oZWxwZXIsIGNvbm5l Y3Rvcik7Ci0KKwkJcmV0ID0gX19kcm1fZmJfaGVscGVyX2FkZF9vbmVfY29ubmVjdG9yKGZiX2hl bHBlciwgY29ubmVjdG9yKTsKIAkJaWYgKHJldCkKIAkJCWdvdG8gZmFpbDsKIAl9CkBAIC0xOTgs OCArMjEyLDggQEAgaW50IGRybV9mYl9oZWxwZXJfc2luZ2xlX2FkZF9hbGxfY29ubmVjdG9ycyhz dHJ1Y3QgZHJtX2ZiX2hlbHBlciAqZmJfaGVscGVyKQogfQogRVhQT1JUX1NZTUJPTChkcm1fZmJf aGVscGVyX3NpbmdsZV9hZGRfYWxsX2Nvbm5lY3RvcnMpOwogCi1pbnQgZHJtX2ZiX2hlbHBlcl9y ZW1vdmVfb25lX2Nvbm5lY3RvcihzdHJ1Y3QgZHJtX2ZiX2hlbHBlciAqZmJfaGVscGVyLAotCQkJ CSAgICAgICBzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yKQorc3RhdGljIGludCBfX2Ry bV9mYl9oZWxwZXJfcmVtb3ZlX29uZV9jb25uZWN0b3Ioc3RydWN0IGRybV9mYl9oZWxwZXIgKmZi X2hlbHBlciwKKwkJCQkJCXN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IpCiB7CiAJc3Ry dWN0IGRybV9mYl9oZWxwZXJfY29ubmVjdG9yICpmYl9oZWxwZXJfY29ubmVjdG9yOwogCWludCBp LCBqOwpAQCAtMjI3LDYgKzI0MSwyMCBAQCBpbnQgZHJtX2ZiX2hlbHBlcl9yZW1vdmVfb25lX2Nv bm5lY3RvcihzdHJ1Y3QgZHJtX2ZiX2hlbHBlciAqZmJfaGVscGVyLAogCiAJcmV0dXJuIDA7CiB9 CisKK2ludCBkcm1fZmJfaGVscGVyX3JlbW92ZV9vbmVfY29ubmVjdG9yKHN0cnVjdCBkcm1fZmJf aGVscGVyICpmYl9oZWxwZXIsCisJCQkJICAgICAgIHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25u ZWN0b3IpCit7CisJaW50IGVycjsKKworCW11dGV4X2xvY2soJmZiX2hlbHBlci0+ZGV2LT5tb2Rl X2NvbmZpZy5tdXRleCk7CisKKwllcnIgPSBfX2RybV9mYl9oZWxwZXJfcmVtb3ZlX29uZV9jb25u ZWN0b3IoZmJfaGVscGVyLCBjb25uZWN0b3IpOworCisJbXV0ZXhfdW5sb2NrKCZmYl9oZWxwZXIt PmRldi0+bW9kZV9jb25maWcubXV0ZXgpOworCisJcmV0dXJuIGVycjsKK30KIEVYUE9SVF9TWU1C T0woZHJtX2ZiX2hlbHBlcl9yZW1vdmVfb25lX2Nvbm5lY3Rvcik7CiAKIHN0YXRpYyB2b2lkIGRy bV9mYl9oZWxwZXJfc2F2ZV9sdXRfYXRvbWljKHN0cnVjdCBkcm1fY3J0YyAqY3J0Yywgc3RydWN0 IGRybV9mYl9oZWxwZXIgKmhlbHBlcikKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2RwX21zdC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHBfbXN0LmMKaW5k ZXggYzFmNjJlYjA3YzA3Li4xZTNlZTMyYTlhY2IgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2RwX21zdC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rw X21zdC5jCkBAIC00ODQsMTUgKzQ4NCwxMiBAQCBzdGF0aWMgdm9pZCBpbnRlbF9kcF9kZXN0cm95 X21zdF9jb25uZWN0b3Ioc3RydWN0IGRybV9kcF9tc3RfdG9wb2xvZ3lfbWdyICptZ3IsCiAJCQkJ CSAgIHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IpCiB7CiAJc3RydWN0IGludGVsX2Nv bm5lY3RvciAqaW50ZWxfY29ubmVjdG9yID0gdG9faW50ZWxfY29ubmVjdG9yKGNvbm5lY3Rvcik7 Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNvbm5lY3Rvci0+ZGV2OwogCiAJZHJtX2Nvbm5l Y3Rvcl91bnJlZ2lzdGVyKGNvbm5lY3Rvcik7CiAKIAkvKiBuZWVkIHRvIG51a2UgdGhlIGNvbm5l Y3RvciAqLwotCWRybV9tb2Rlc2V0X2xvY2tfYWxsKGRldik7CiAJaW50ZWxfY29ubmVjdG9yX3Jl bW92ZV9mcm9tX2ZiZGV2KGludGVsX2Nvbm5lY3Rvcik7CiAJaW50ZWxfY29ubmVjdG9yLT5tc3Rf cG9ydCA9IE5VTEw7Ci0JZHJtX21vZGVzZXRfdW5sb2NrX2FsbChkZXYpOwogCiAJZHJtX2Nvbm5l Y3Rvcl91bnJlZmVyZW5jZSgmaW50ZWxfY29ubmVjdG9yLT5iYXNlKTsKIAlEUk1fREVCVUdfS01T KCJcbiIpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fZHBfbXN0 LmMgYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9kcF9tc3QuYwppbmRleCA2NTk4MzA2 ZGNhOWIuLmViZGYxYjg1OWNiNiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9y YWRlb25fZHBfbXN0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fZHBfbXN0 LmMKQEAgLTMwMCw5ICszMDAsNyBAQCBzdGF0aWMgdm9pZCByYWRlb25fZHBfcmVnaXN0ZXJfbXN0 X2Nvbm5lY3RvcihzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yKQogCXN0cnVjdCBkcm1f ZGV2aWNlICpkZXYgPSBjb25uZWN0b3ItPmRldjsKIAlzdHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRl diA9IGRldi0+ZGV2X3ByaXZhdGU7CiAKLQlkcm1fbW9kZXNldF9sb2NrX2FsbChkZXYpOwogCXJh ZGVvbl9mYl9hZGRfY29ubmVjdG9yKHJkZXYsIGNvbm5lY3Rvcik7Ci0JZHJtX21vZGVzZXRfdW5s b2NrX2FsbChkZXYpOwogCiAJZHJtX2Nvbm5lY3Rvcl9yZWdpc3Rlcihjb25uZWN0b3IpOwogfQpA QCAtMzE1LDEzICszMTMsOCBAQCBzdGF0aWMgdm9pZCByYWRlb25fZHBfZGVzdHJveV9tc3RfY29u bmVjdG9yKHN0cnVjdCBkcm1fZHBfbXN0X3RvcG9sb2d5X21nciAqbWdyLAogCXN0cnVjdCByYWRl b25fZGV2aWNlICpyZGV2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAogCWRybV9jb25uZWN0b3JfdW5y ZWdpc3Rlcihjb25uZWN0b3IpOwotCS8qIG5lZWQgdG8gbnVrZSB0aGUgY29ubmVjdG9yICovCi0J ZHJtX21vZGVzZXRfbG9ja19hbGwoZGV2KTsKLQkvKiBkcG1zIG9mZiAqLwogCXJhZGVvbl9mYl9y ZW1vdmVfY29ubmVjdG9yKHJkZXYsIGNvbm5lY3Rvcik7Ci0KIAlkcm1fY29ubmVjdG9yX2NsZWFu dXAoY29ubmVjdG9yKTsKLQlkcm1fbW9kZXNldF91bmxvY2tfYWxsKGRldik7CiAKIAlrZnJlZShj b25uZWN0b3IpOwogCURSTV9ERUJVR19LTVMoIlxuIik7Ci0tIAoyLjEyLjAKCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxp c3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNr dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=