From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thierry Reding Subject: [PATCH v3 04/10] drm/fb-helper: Push down modeset lock into FB helpers Date: Tue, 21 Mar 2017 09:13:52 +0100 Message-ID: <20170321081358.27237-5-thierry.reding@gmail.com> References: <20170321081358.27237-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: <20170321081358.27237-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 IFN0dWx0eiA8am9obi5zdHVsdHpAbGluYXJvLm9yZz4KU2lnbmVkLW9mZi1ieTogVGhpZXJyeSBS ZWRpbmcgPHRyZWRpbmdAbnZpZGlhLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vZHJtX2ZiX2hl bHBlci5jICAgICAgICB8IDM5ICsrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0KIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwX21zdC5jICAgIHwgIDMgLS0tCiBkcml2ZXJzL2dw dS9kcm0vcmFkZW9uL3JhZGVvbl9kcF9tc3QuYyB8ICA3IC0tLS0tLQogMyBmaWxlcyBjaGFuZ2Vk LCAzMyBpbnNlcnRpb25zKCspLCAxNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vZHJtX2ZiX2hlbHBlci5jIGIvZHJpdmVycy9ncHUvZHJtL2RybV9mYl9oZWxwZXIu YwppbmRleCAxN2ZkOThmZTRhMWYuLjZhZjgwYWZjNGY0MCAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2RybV9mYl9oZWxwZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2ZiX2hlbHBl ci5jCkBAIC0xMDksOCArMTA5LDggQEAgc3RhdGljIERFRklORV9NVVRFWChrZXJuZWxfZmJfaGVs cGVyX2xvY2spOwogCWZvciAoKHsgbG9ja2RlcF9hc3NlcnRfaGVsZCgmKGZiaCktPmRldi0+bW9k ZV9jb25maWcubXV0ZXgpOyB9KSwgXAogCSAgICAgaV9fID0gMDsgaV9fIDwgKGZiaCktPmNvbm5l Y3Rvcl9jb3VudDsgaV9fKyspCiAKLWludCBkcm1fZmJfaGVscGVyX2FkZF9vbmVfY29ubmVjdG9y KHN0cnVjdCBkcm1fZmJfaGVscGVyICpmYl9oZWxwZXIsCi0JCQkJICAgIHN0cnVjdCBkcm1fY29u bmVjdG9yICpjb25uZWN0b3IpCitzdGF0aWMgaW50IF9fZHJtX2ZiX2hlbHBlcl9hZGRfb25lX2Nv bm5lY3RvcihzdHJ1Y3QgZHJtX2ZiX2hlbHBlciAqZmJfaGVscGVyLAorCQkJCQkgICAgIHN0cnVj dCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IpCiB7CiAJc3RydWN0IGRybV9mYl9oZWxwZXJfY29u bmVjdG9yICoqdGVtcDsKIAlzdHJ1Y3QgZHJtX2ZiX2hlbHBlcl9jb25uZWN0b3IgKmNvbm47CkBA IC0xNDMsNiArMTQzLDIwIEBAIGludCBkcm1fZmJfaGVscGVyX2FkZF9vbmVfY29ubmVjdG9yKHN0 cnVjdCBkcm1fZmJfaGVscGVyICpmYl9oZWxwZXIsCiAJZmJfaGVscGVyLT5jb25uZWN0b3JfaW5m b1tmYl9oZWxwZXItPmNvbm5lY3Rvcl9jb3VudCsrXSA9IGNvbm47CiAJcmV0dXJuIDA7CiB9CisK K2ludCBkcm1fZmJfaGVscGVyX2FkZF9vbmVfY29ubmVjdG9yKHN0cnVjdCBkcm1fZmJfaGVscGVy ICpmYl9oZWxwZXIsCisJCQkJICAgIHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IpCit7 CisJaW50IGVycjsKKworCW11dGV4X2xvY2soJmZiX2hlbHBlci0+ZGV2LT5tb2RlX2NvbmZpZy5t dXRleCk7CisKKwllcnIgPSBfX2RybV9mYl9oZWxwZXJfYWRkX29uZV9jb25uZWN0b3IoZmJfaGVs cGVyLCBjb25uZWN0b3IpOworCisJbXV0ZXhfdW5sb2NrKCZmYl9oZWxwZXItPmRldi0+bW9kZV9j b25maWcubXV0ZXgpOworCisJcmV0dXJuIGVycjsKK30KIEVYUE9SVF9TWU1CT0woZHJtX2ZiX2hl bHBlcl9hZGRfb25lX2Nvbm5lY3Rvcik7CiAKIC8qKgpAQCAtMTcyLDggKzE4Niw3IEBAIGludCBk cm1fZmJfaGVscGVyX3NpbmdsZV9hZGRfYWxsX2Nvbm5lY3RvcnMoc3RydWN0IGRybV9mYl9oZWxw ZXIgKmZiX2hlbHBlcikKIAltdXRleF9sb2NrKCZkZXYtPm1vZGVfY29uZmlnLm11dGV4KTsKIAlk cm1fY29ubmVjdG9yX2xpc3RfaXRlcl9iZWdpbihkZXYsICZjb25uX2l0ZXIpOwogCWRybV9mb3Jf ZWFjaF9jb25uZWN0b3JfaXRlcihjb25uZWN0b3IsICZjb25uX2l0ZXIpIHsKLQkJcmV0ID0gZHJt X2ZiX2hlbHBlcl9hZGRfb25lX2Nvbm5lY3RvcihmYl9oZWxwZXIsIGNvbm5lY3Rvcik7Ci0KKwkJ cmV0ID0gX19kcm1fZmJfaGVscGVyX2FkZF9vbmVfY29ubmVjdG9yKGZiX2hlbHBlciwgY29ubmVj dG9yKTsKIAkJaWYgKHJldCkKIAkJCWdvdG8gZmFpbDsKIAl9CkBAIC0xOTgsOCArMjExLDggQEAg aW50IGRybV9mYl9oZWxwZXJfc2luZ2xlX2FkZF9hbGxfY29ubmVjdG9ycyhzdHJ1Y3QgZHJtX2Zi X2hlbHBlciAqZmJfaGVscGVyKQogfQogRVhQT1JUX1NZTUJPTChkcm1fZmJfaGVscGVyX3Npbmds ZV9hZGRfYWxsX2Nvbm5lY3RvcnMpOwogCi1pbnQgZHJtX2ZiX2hlbHBlcl9yZW1vdmVfb25lX2Nv bm5lY3RvcihzdHJ1Y3QgZHJtX2ZiX2hlbHBlciAqZmJfaGVscGVyLAotCQkJCSAgICAgICBzdHJ1 Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yKQorc3RhdGljIGludCBfX2RybV9mYl9oZWxwZXJf cmVtb3ZlX29uZV9jb25uZWN0b3Ioc3RydWN0IGRybV9mYl9oZWxwZXIgKmZiX2hlbHBlciwKKwkJ CQkJCXN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IpCiB7CiAJc3RydWN0IGRybV9mYl9o ZWxwZXJfY29ubmVjdG9yICpmYl9oZWxwZXJfY29ubmVjdG9yOwogCWludCBpLCBqOwpAQCAtMjI3 LDYgKzI0MCwyMCBAQCBpbnQgZHJtX2ZiX2hlbHBlcl9yZW1vdmVfb25lX2Nvbm5lY3RvcihzdHJ1 Y3QgZHJtX2ZiX2hlbHBlciAqZmJfaGVscGVyLAogCiAJcmV0dXJuIDA7CiB9CisKK2ludCBkcm1f ZmJfaGVscGVyX3JlbW92ZV9vbmVfY29ubmVjdG9yKHN0cnVjdCBkcm1fZmJfaGVscGVyICpmYl9o ZWxwZXIsCisJCQkJICAgICAgIHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IpCit7CisJ aW50IGVycjsKKworCW11dGV4X2xvY2soJmZiX2hlbHBlci0+ZGV2LT5tb2RlX2NvbmZpZy5tdXRl eCk7CisKKwllcnIgPSBfX2RybV9mYl9oZWxwZXJfcmVtb3ZlX29uZV9jb25uZWN0b3IoZmJfaGVs cGVyLCBjb25uZWN0b3IpOworCisJbXV0ZXhfdW5sb2NrKCZmYl9oZWxwZXItPmRldi0+bW9kZV9j b25maWcubXV0ZXgpOworCisJcmV0dXJuIGVycjsKK30KIEVYUE9SVF9TWU1CT0woZHJtX2ZiX2hl bHBlcl9yZW1vdmVfb25lX2Nvbm5lY3Rvcik7CiAKIHN0YXRpYyB2b2lkIGRybV9mYl9oZWxwZXJf c2F2ZV9sdXRfYXRvbWljKHN0cnVjdCBkcm1fY3J0YyAqY3J0Yywgc3RydWN0IGRybV9mYl9oZWxw ZXIgKmhlbHBlcikKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwX21z dC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHBfbXN0LmMKaW5kZXggMDk0Y2JkY2Jj ZDZkLi44MzM2YzVjNmY0NWQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2RwX21zdC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwX21zdC5jCkBAIC00 ODQsMTUgKzQ4NCwxMiBAQCBzdGF0aWMgdm9pZCBpbnRlbF9kcF9kZXN0cm95X21zdF9jb25uZWN0 b3Ioc3RydWN0IGRybV9kcF9tc3RfdG9wb2xvZ3lfbWdyICptZ3IsCiAJCQkJCSAgIHN0cnVjdCBk cm1fY29ubmVjdG9yICpjb25uZWN0b3IpCiB7CiAJc3RydWN0IGludGVsX2Nvbm5lY3RvciAqaW50 ZWxfY29ubmVjdG9yID0gdG9faW50ZWxfY29ubmVjdG9yKGNvbm5lY3Rvcik7Ci0Jc3RydWN0IGRy bV9kZXZpY2UgKmRldiA9IGNvbm5lY3Rvci0+ZGV2OwogCiAJZHJtX2Nvbm5lY3Rvcl91bnJlZ2lz dGVyKGNvbm5lY3Rvcik7CiAKIAkvKiBuZWVkIHRvIG51a2UgdGhlIGNvbm5lY3RvciAqLwotCWRy bV9tb2Rlc2V0X2xvY2tfYWxsKGRldik7CiAJaW50ZWxfY29ubmVjdG9yX3JlbW92ZV9mcm9tX2Zi ZGV2KGludGVsX2Nvbm5lY3Rvcik7CiAJaW50ZWxfY29ubmVjdG9yLT5tc3RfcG9ydCA9IE5VTEw7 Ci0JZHJtX21vZGVzZXRfdW5sb2NrX2FsbChkZXYpOwogCiAJZHJtX2Nvbm5lY3Rvcl91bnJlZmVy ZW5jZSgmaW50ZWxfY29ubmVjdG9yLT5iYXNlKTsKIAlEUk1fREVCVUdfS01TKCJcbiIpOwpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fZHBfbXN0LmMgYi9kcml2ZXJz L2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9kcF9tc3QuYwppbmRleCA3ZDVhZGEzOTgwZGMuLmIxODU1 Y2YwYWU3YSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fZHBfbXN0 LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fZHBfbXN0LmMKQEAgLTMwMCw5 ICszMDAsNyBAQCBzdGF0aWMgdm9pZCByYWRlb25fZHBfcmVnaXN0ZXJfbXN0X2Nvbm5lY3Rvcihz dHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yKQogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYg PSBjb25uZWN0b3ItPmRldjsKIAlzdHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldiA9IGRldi0+ZGV2 X3ByaXZhdGU7CiAKLQlkcm1fbW9kZXNldF9sb2NrX2FsbChkZXYpOwogCXJhZGVvbl9mYl9hZGRf Y29ubmVjdG9yKHJkZXYsIGNvbm5lY3Rvcik7Ci0JZHJtX21vZGVzZXRfdW5sb2NrX2FsbChkZXYp OwogCiAJZHJtX2Nvbm5lY3Rvcl9yZWdpc3Rlcihjb25uZWN0b3IpOwogfQpAQCAtMzE1LDEzICsz MTMsOCBAQCBzdGF0aWMgdm9pZCByYWRlb25fZHBfZGVzdHJveV9tc3RfY29ubmVjdG9yKHN0cnVj dCBkcm1fZHBfbXN0X3RvcG9sb2d5X21nciAqbWdyLAogCXN0cnVjdCByYWRlb25fZGV2aWNlICpy ZGV2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAogCWRybV9jb25uZWN0b3JfdW5yZWdpc3Rlcihjb25u ZWN0b3IpOwotCS8qIG5lZWQgdG8gbnVrZSB0aGUgY29ubmVjdG9yICovCi0JZHJtX21vZGVzZXRf bG9ja19hbGwoZGV2KTsKLQkvKiBkcG1zIG9mZiAqLwogCXJhZGVvbl9mYl9yZW1vdmVfY29ubmVj dG9yKHJkZXYsIGNvbm5lY3Rvcik7Ci0KIAlkcm1fY29ubmVjdG9yX2NsZWFudXAoY29ubmVjdG9y KTsKLQlkcm1fbW9kZXNldF91bmxvY2tfYWxsKGRldik7CiAKIAlrZnJlZShjb25uZWN0b3IpOwog CURSTV9ERUJVR19LTVMoIlxuIik7Ci0tIAoyLjEyLjAKCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4 QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWls bWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=