From: Maarten Lankhorst Subject: [PATCH 1/2] drm/atomic: Add a way to call remove_fb atomically, v2. Date: Mon, 9 May 2016 14:02:00 +0200 Message-ID: <1462795323-4303-1-git-send-email-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: dri-devel@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org VXNlIHRoaXMgaW4gZHJtX2ZyYW1lYnVmZmVyX3JlbW92ZSwgdGhpcyBpcyB0byByZW1vdmUgdGhl IGZiIGluIGFuIGF0b21pYyB3YXkuCgppOTE1IGRvZXNuJ3QgZXhwb3J0IERSSVZFUl9BVE9NSUMg eWV0IGJ5IGRlZmF1bHQgYnV0IGlzIGF0b21pYywgc28gYWRkIGEKZnVuY3Rpb24gcG9pbnRlciB0 byBhbGxvdyBkcml2ZXJzIHRvIHVzZSB0aGUgYXRvbWljIGZyYW1lYnVmZmVyIHJlbW92ZS4KCkNo YW5nZXMgc2luY2UgdjE6Ci0gTW92ZSB0aGUgYXRvbWljIGZyYW1lYnVmZmVyIHJlbW92YWwgZnVu Y3Rpb24gZnJvbSBoZWxwZXJzIHRvIGF0b21pYyBjb3JlLgotIE9ubHkgb3ZlcnJpZGUgcm1mYiBm b3IgaTkxNSwgZm9yIGF0b21pYyBkcml2ZXJzIGl0IGRlZmF1bHRzIHRvIGF0b21pYyBybWZiLgoK U2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4 LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pYy5jICAgIHwgNjcgKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysKIGRyaXZlcnMvZ3B1L2RybS9k cm1fY3J0Yy5jICAgICAgfCA2NSArKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0t LS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMgfCAgMSArCiBpbmNsdWRlL2RybS9k cm1QLmggICAgICAgICAgICAgIHwgIDMgKysKIGluY2x1ZGUvZHJtL2RybV9hdG9taWMuaCAgICAg ICAgfCAgMSArCiA1IGZpbGVzIGNoYW5nZWQsIDExNiBpbnNlcnRpb25zKCspLCAyMSBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pYy5jIGIvZHJpdmVy cy9ncHUvZHJtL2RybV9hdG9taWMuYwppbmRleCA4NmU4OWRiMDJlZDcuLjVhNTRkOWUyZDkzOCAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWMuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vZHJtX2F0b21pYy5jCkBAIC0xNzQxLDMgKzE3NDEsNzAgQEAgb3V0OgogCiAJcmV0dXJu IHJldDsKIH0KKworaW50IGRybV9hdG9taWNfcmVtb3ZlX2ZiKHN0cnVjdCBkcm1fZnJhbWVidWZm ZXIgKmZiKQoreworCXN0cnVjdCBkcm1fbW9kZXNldF9hY3F1aXJlX2N0eCBjdHg7CisJc3RydWN0 IGRybV9kZXZpY2UgKmRldiA9IGZiLT5kZXY7CisJc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0 YXRlOworCXN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lOworCWludCByZXQgPSAwOworCXVuc2lnbmVk IHBsYW5lX21hc2s7CisKKwlzdGF0ZSA9IGRybV9hdG9taWNfc3RhdGVfYWxsb2MoZGV2KTsKKwlp ZiAoIXN0YXRlKQorCQlyZXR1cm4gLUVOT01FTTsKKworCWRybV9tb2Rlc2V0X2FjcXVpcmVfaW5p dCgmY3R4LCAwKTsKKwlzdGF0ZS0+YWNxdWlyZV9jdHggPSAmY3R4OworCityZXRyeToKKwlwbGFu ZV9tYXNrID0gMDsKKwlyZXQgPSBkcm1fbW9kZXNldF9sb2NrX2FsbF9jdHgoZGV2LCAmY3R4KTsK KwlpZiAocmV0KQorCQlnb3RvIHVubG9jazsKKworCWRybV9mb3JfZWFjaF9wbGFuZShwbGFuZSwg ZGV2KSB7CisJCXN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKnBsYW5lX3N0YXRlOworCisJCWlmIChw bGFuZS0+c3RhdGUtPmZiICE9IGZiKQorCQkJY29udGludWU7CisKKwkJcGxhbmVfc3RhdGUgPSBk cm1fYXRvbWljX2dldF9wbGFuZV9zdGF0ZShzdGF0ZSwgcGxhbmUpOworCQlpZiAoSVNfRVJSKHBs YW5lX3N0YXRlKSkgeworCQkJcmV0ID0gUFRSX0VSUihwbGFuZV9zdGF0ZSk7CisJCQlnb3RvIHVu bG9jazsKKwkJfQorCisJCWRybV9hdG9taWNfc2V0X2ZiX2Zvcl9wbGFuZShwbGFuZV9zdGF0ZSwg TlVMTCk7CisJCXJldCA9IGRybV9hdG9taWNfc2V0X2NydGNfZm9yX3BsYW5lKHBsYW5lX3N0YXRl LCBOVUxMKTsKKwkJaWYgKHJldCkKKwkJCWdvdG8gdW5sb2NrOworCisJCXBsYW5lX21hc2sgfD0g QklUKGRybV9wbGFuZV9pbmRleChwbGFuZSkpOworCisJCXBsYW5lLT5vbGRfZmIgPSBwbGFuZS0+ ZmI7CisJCXBsYW5lLT5mYiA9IE5VTEw7CisJfQorCisJaWYgKHBsYW5lX21hc2spCisJCXJldCA9 IGRybV9hdG9taWNfY29tbWl0KHN0YXRlKTsKKwordW5sb2NrOgorCWlmIChwbGFuZV9tYXNrKQor CQlkcm1fYXRvbWljX2NsZWFuX29sZF9mYihkZXYsIHBsYW5lX21hc2ssIHJldCk7CisKKwlpZiAo cmV0ID09IC1FREVBRExLKSB7CisJCWRybV9tb2Rlc2V0X2JhY2tvZmYoJmN0eCk7CisJCWdvdG8g cmV0cnk7CisJfQorCisJaWYgKHJldCB8fCAhcGxhbmVfbWFzaykKKwkJZHJtX2F0b21pY19zdGF0 ZV9mcmVlKHN0YXRlKTsKKworCWRybV9tb2Rlc2V0X2Ryb3BfbG9ja3MoJmN0eCk7CisJZHJtX21v ZGVzZXRfYWNxdWlyZV9maW5pKCZjdHgpOworCisJcmV0dXJuIHJldDsKK30KK0VYUE9SVF9TWU1C T0woZHJtX2F0b21pY19yZW1vdmVfZmIpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2Ry bV9jcnRjLmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2NydGMuYwppbmRleCA3MGY5YzY4MmQxNDQu LmE5YTM1NTdmOWYyYiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2RybV9jcnRjLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2RybV9jcnRjLmMKQEAgLTU1Nyw2ICs1NTcsNDIgQEAgdm9pZCBk cm1fZnJhbWVidWZmZXJfY2xlYW51cChzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYikKIH0KIEVY UE9SVF9TWU1CT0woZHJtX2ZyYW1lYnVmZmVyX2NsZWFudXApOwogCitzdGF0aWMgaW50CitsZWdh Y3lfcmVtb3ZlX2ZiKHN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiKQoreworCXN0cnVjdCBkcm1f ZGV2aWNlICpkZXYgPSBmYi0+ZGV2OworCXN0cnVjdCBkcm1fY3J0YyAqY3J0YzsKKwlzdHJ1Y3Qg ZHJtX3BsYW5lICpwbGFuZTsKKwlzdHJ1Y3QgZHJtX21vZGVfc2V0IHNldDsKKwlpbnQgcmV0ID0g MDsKKworCS8qIGF0b21pYyBkcml2ZXJzIG11c3QgdXNlIGRybV9hdG9taWNfaGVscGVyX3JlbW92 ZV9mYiAqLworCVdBUk5fT04oZHJtX2NvcmVfY2hlY2tfZmVhdHVyZShkZXYsIERSSVZFUl9BVE9N SUMpKTsKKworCWRybV9tb2Rlc2V0X2xvY2tfYWxsKGRldik7CisJLyogcmVtb3ZlIGZyb20gYW55 IENSVEMgKi8KKwlkcm1fZm9yX2VhY2hfY3J0YyhjcnRjLCBkZXYpIHsKKwkJaWYgKGNydGMtPnBy aW1hcnktPmZiID09IGZiKSB7CisJCQkvKiBzaG91bGQgdHVybiBvZmYgdGhlIGNydGMgKi8KKwkJ CW1lbXNldCgmc2V0LCAwLCBzaXplb2Yoc3RydWN0IGRybV9tb2RlX3NldCkpOworCQkJc2V0LmNy dGMgPSBjcnRjOworCQkJc2V0LmZiID0gTlVMTDsKKwkJCXJldCA9IGRybV9tb2RlX3NldF9jb25m aWdfaW50ZXJuYWwoJnNldCk7CisJCQlpZiAocmV0KQorCQkJCWdvdG8gb3V0OworCQl9CisJfQor CisJZHJtX2Zvcl9lYWNoX3BsYW5lKHBsYW5lLCBkZXYpIHsKKwkJaWYgKHBsYW5lLT5mYiA9PSBm YikKKwkJCWRybV9wbGFuZV9mb3JjZV9kaXNhYmxlKHBsYW5lKTsKKwl9CisKK291dDoKKwlkcm1f bW9kZXNldF91bmxvY2tfYWxsKGRldik7CisJcmV0dXJuIHJldDsKK30KKwogLyoqCiAgKiBkcm1f ZnJhbWVidWZmZXJfcmVtb3ZlIC0gcmVtb3ZlIGFuZCB1bnJlZmVyZW5jZSBhIGZyYW1lYnVmZmVy IG9iamVjdAogICogQGZiOiBmcmFtZWJ1ZmZlciB0byByZW1vdmUKQEAgLTU3Miw5ICs2MDgsNiBA QCBFWFBPUlRfU1lNQk9MKGRybV9mcmFtZWJ1ZmZlcl9jbGVhbnVwKTsKIHZvaWQgZHJtX2ZyYW1l YnVmZmVyX3JlbW92ZShzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYikKIHsKIAlzdHJ1Y3QgZHJt X2RldmljZSAqZGV2OwotCXN0cnVjdCBkcm1fY3J0YyAqY3J0YzsKLQlzdHJ1Y3QgZHJtX3BsYW5l ICpwbGFuZTsKLQlzdHJ1Y3QgZHJtX21vZGVfc2V0IHNldDsKIAlpbnQgcmV0OwogCiAJaWYgKCFm YikKQEAgLTYwMCwyNSArNjMzLDE1IEBAIHZvaWQgZHJtX2ZyYW1lYnVmZmVyX3JlbW92ZShzdHJ1 Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYikKIAkgKiBpbiB0aGlzIG1hbm5lci4KIAkgKi8KIAlpZiAo ZHJtX2ZyYW1lYnVmZmVyX3JlYWRfcmVmY291bnQoZmIpID4gMSkgewotCQlkcm1fbW9kZXNldF9s b2NrX2FsbChkZXYpOwotCQkvKiByZW1vdmUgZnJvbSBhbnkgQ1JUQyAqLwotCQlkcm1fZm9yX2Vh Y2hfY3J0YyhjcnRjLCBkZXYpIHsKLQkJCWlmIChjcnRjLT5wcmltYXJ5LT5mYiA9PSBmYikgewot CQkJCS8qIHNob3VsZCB0dXJuIG9mZiB0aGUgY3J0YyAqLwotCQkJCW1lbXNldCgmc2V0LCAwLCBz aXplb2Yoc3RydWN0IGRybV9tb2RlX3NldCkpOwotCQkJCXNldC5jcnRjID0gY3J0YzsKLQkJCQlz ZXQuZmIgPSBOVUxMOwotCQkJCXJldCA9IGRybV9tb2RlX3NldF9jb25maWdfaW50ZXJuYWwoJnNl dCk7Ci0JCQkJaWYgKHJldCkKLQkJCQkJRFJNX0VSUk9SKCJmYWlsZWQgdG8gcmVzZXQgY3J0YyAl cCB3aGVuIGZiIHdhcyBkZWxldGVkXG4iLCBjcnRjKTsKLQkJCX0KLQkJfQorCQlpZiAoZGV2LT5k cml2ZXItPnJlbW92ZV9mYikKKwkJCXJldCA9IGRldi0+ZHJpdmVyLT5yZW1vdmVfZmIoZmIpOwor CQllbHNlIGlmIChkcm1fY29yZV9jaGVja19mZWF0dXJlKGRldiwgRFJJVkVSX0FUT01JQykpCisJ CQlyZXQgPSBkcm1fYXRvbWljX3JlbW92ZV9mYihmYik7CisJCWVsc2UKKwkJCXJldCA9IGxlZ2Fj eV9yZW1vdmVfZmIoZmIpOwogCi0JCWRybV9mb3JfZWFjaF9wbGFuZShwbGFuZSwgZGV2KSB7Ci0J CQlpZiAocGxhbmUtPmZiID09IGZiKQotCQkJCWRybV9wbGFuZV9mb3JjZV9kaXNhYmxlKHBsYW5l KTsKLQkJfQotCQlkcm1fbW9kZXNldF91bmxvY2tfYWxsKGRldik7CisJCWlmIChyZXQpCisJCQlE Uk1fRVJST1IoImZhaWxlZCB0byByZW1vdmUgZmIgJWkvJXAgd2l0aCAlaVxuIiwgZmItPmJhc2Uu aWQsIGZiLCByZXQpOwogCX0KIAogCWRybV9mcmFtZWJ1ZmZlcl91bnJlZmVyZW5jZShmYik7CmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9kcnYuYwppbmRleCA5ZmQyMjFjOTcyNzUuLjg3MzZkMTVlODg0OCAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2Rydi5jCkBAIC0xNzI0LDYgKzE3MjQsNyBAQCBzdGF0aWMgc3RydWN0 IGRybV9kcml2ZXIgZHJpdmVyID0gewogCS5kdW1iX2NyZWF0ZSA9IGk5MTVfZ2VtX2R1bWJfY3Jl YXRlLAogCS5kdW1iX21hcF9vZmZzZXQgPSBpOTE1X2dlbV9tbWFwX2d0dCwKIAkuZHVtYl9kZXN0 cm95ID0gZHJtX2dlbV9kdW1iX2Rlc3Ryb3ksCisJLnJlbW92ZV9mYiA9IGRybV9hdG9taWNfcmVt b3ZlX2ZiLAogCS5pb2N0bHMgPSBpOTE1X2lvY3RscywKIAkuZm9wcyA9ICZpOTE1X2RyaXZlcl9m b3BzLAogCS5uYW1lID0gRFJJVkVSX05BTUUsCmRpZmYgLS1naXQgYS9pbmNsdWRlL2RybS9kcm1Q LmggYi9pbmNsdWRlL2RybS9kcm1QLmgKaW5kZXggMzYwYjJhNzRlMWVmLi5kNjM3OTEwMzkzODcg MTAwNjQ0Ci0tLSBhL2luY2x1ZGUvZHJtL2RybVAuaAorKysgYi9pbmNsdWRlL2RybS9kcm1QLmgK QEAgLTY0Nyw2ICs2NDcsOSBAQCBzdHJ1Y3QgZHJtX2RyaXZlciB7CiAJCQkgICAgc3RydWN0IGRy bV9kZXZpY2UgKmRldiwKIAkJCSAgICB1aW50MzJfdCBoYW5kbGUpOwogCisJLyogcm1mYiBhbmQg ZHJtX2ZyYW1lYnVmZmVyX3JlbW92ZSBob29rICovCisJaW50ICgqcmVtb3ZlX2ZiKShzdHJ1Y3Qg ZHJtX2ZyYW1lYnVmZmVyICpmYik7CisKIAkvKiBEcml2ZXIgcHJpdmF0ZSBvcHMgZm9yIHRoaXMg b2JqZWN0ICovCiAJY29uc3Qgc3RydWN0IHZtX29wZXJhdGlvbnNfc3RydWN0ICpnZW1fdm1fb3Bz OwogCmRpZmYgLS1naXQgYS9pbmNsdWRlL2RybS9kcm1fYXRvbWljLmggYi9pbmNsdWRlL2RybS9k cm1fYXRvbWljLmgKaW5kZXggOTJjODRlOWFiMDlhLi4wYTA0MzE0NTM0YTUgMTAwNjQ0Ci0tLSBh L2luY2x1ZGUvZHJtL2RybV9hdG9taWMuaAorKysgYi9pbmNsdWRlL2RybS9kcm1fYXRvbWljLmgK QEAgLTEzOCw2ICsxMzgsNyBAQCBkcm1fYXRvbWljX2NsZWFuX29sZF9mYihzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2LCB1bnNpZ25lZCBwbGFuZV9tYXNrLCBpbnQgcmV0KTsKIGludCBfX211c3RfY2hl Y2sgZHJtX2F0b21pY19jaGVja19vbmx5KHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSk7 CiBpbnQgX19tdXN0X2NoZWNrIGRybV9hdG9taWNfY29tbWl0KHN0cnVjdCBkcm1fYXRvbWljX3N0 YXRlICpzdGF0ZSk7CiBpbnQgX19tdXN0X2NoZWNrIGRybV9hdG9taWNfbm9uYmxvY2tpbmdfY29t bWl0KHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSk7CitpbnQgX19tdXN0X2NoZWNrIGRy bV9hdG9taWNfcmVtb3ZlX2ZiKHN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiKTsKIAogI2RlZmlu ZSBmb3JfZWFjaF9jb25uZWN0b3JfaW5fc3RhdGUoc3RhdGUsIGNvbm5lY3RvciwgY29ubmVjdG9y X3N0YXRlLCBfX2kpIFwKIAlmb3IgKChfX2kpID0gMDsJCQkJCQkJXAotLSAKMi41LjUKCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWls aW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZy ZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=