From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH 2/3] drm: Convert drm_framebuffer_remove to atomic, v4. Date: Tue, 21 Feb 2017 14:51:41 +0100 Message-ID: <1487685102-31991-3-git-send-email-maarten.lankhorst@linux.intel.com> References: <1487685102-31991-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: In-Reply-To: <1487685102-31991-1-git-send-email-maarten.lankhorst@linux.intel.com> 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: Daniel Vetter , intel-gfx@lists.freedesktop.org, Daniel Vetter List-Id: dri-devel@lists.freedesktop.org SW5zdGVhZCBvZiB0cnlpbmcgdG8gZG8gZXZlcnl0aGluZyBpbiAxIGdvLCBqdXN0IGRvIGEgYmFz aWMgc2FmZQpjb252ZXJzaW9uIGZpcnN0LiBXZSd2ZSBiZWVuIGJpdHRlbiBieSB0b28gbWFueSBy ZWdyZXNzaW9ucyBpbiB0aGUKcGFzdC4KClRoaXMgcGF0Y2ggb25seSBjb252ZXJ0cyBkcm1fZnJh bWVidWZmZXJfcmVtb3ZlIHRvIGF0b21pYy4gVGhlCnJlZ3Jlc3Npb24gc2Vuc2l0aXZlIHBhcnQg aXMgc3BsaXQgb3V0IHRvIGEgc2VwYXJhdGUgcGF0Y2guCgp2MjoKLSBSZW1vdmUgcGxhbmUtPmZi IGFzc2lnbm1lbnQsIGRvbmUgYnkgZHJtX2F0b21pY19jbGVhbl9vbGRfZmIuCi0gQWRkIFdBUk5f T04gd2hlbiBhdG9taWNfcmVtb3ZlX2ZiIGZhaWxzLgotIEFsd2F5cyBjYWxsIGRybV9hdG9taWNf c3RhdGVfcHV0Lgp2MzoKLSBVc2UgZHJtX2Rydl91c2VzX2F0b21pY19tb2Rlc2V0Ci0gSGFuZGxl IHRoZSBjYXNlIHdoZXJlIHRoZSBmaXJzdCBwbGFuZS1kaXNhYmxlLW9ubHkgY29tbWl0IGZhaWxz CiAgd2l0aCAtRUlOVkFMLiBTb21lIGRyaXZlcnMgZG8gbm90IHN1cHBvcnQgdGhpcywgZmFsbCBi YWNrIHRvCiAgZGlzYWJsaW5nIGFsbCBjcnRjJ3MgaW4gdGhpcyBjYXNlLgp2NDoKLSBTb2x2ZSB2 bXdnZnggY29tcGF0aWJpbGl0eSBpc3N1ZSBpbiB0aGVpciBkcml2ZXIsIHdhcyBmaXhlZCBpbiB0 aGlzCiAgcGF0Y2ggYnkgdjMuCi0gTW92ZSBvbmx5IGRpc2FibGluZyBwcmltYXJ5IHRvIGEgc2Vw YXJhdGUgcGF0Y2guCgpTaWduZWQtb2ZmLWJ5OiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVy QGludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogRGFuaWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBm ZndsbC5jaD4KU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hv cnN0QGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pYy5jICAg ICAgICB8IDg4ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysKIGRyaXZlcnMv Z3B1L2RybS9kcm1fY3J0Y19pbnRlcm5hbC5oIHwgIDEgKwogZHJpdmVycy9ncHUvZHJtL2RybV9m cmFtZWJ1ZmZlci5jICAgfCAgNyArKysKIDMgZmlsZXMgY2hhbmdlZCwgOTYgaW5zZXJ0aW9ucygr KQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljLmMgYi9kcml2ZXJzL2dw dS9kcm0vZHJtX2F0b21pYy5jCmluZGV4IGFmZWM1MzgzMjE0NS4uMjg1ZTFjMjNlOGM5IDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9kcm1fYXRvbWljLmMKQEAgLTIwNjEsNiArMjA2MSw5NCBAQCBzdGF0aWMgdm9pZCBjb21wbGV0 ZV9jcnRjX3NpZ25hbGluZyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCWtmcmVlKGZlbmNlX3N0 YXRlKTsKIH0KIAoraW50IGRybV9hdG9taWNfcmVtb3ZlX2ZiKHN0cnVjdCBkcm1fZnJhbWVidWZm ZXIgKmZiKQoreworCXN0cnVjdCBkcm1fbW9kZXNldF9hY3F1aXJlX2N0eCBjdHg7CisJc3RydWN0 IGRybV9kZXZpY2UgKmRldiA9IGZiLT5kZXY7CisJc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0 YXRlOworCXN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lOworCXN0cnVjdCBkcm1fY29ubmVjdG9yICpj b25uOworCXN0cnVjdCBkcm1fY29ubmVjdG9yX3N0YXRlICpjb25uX3N0YXRlOworCWludCBpLCBy ZXQgPSAwOworCXVuc2lnbmVkIHBsYW5lX21hc2s7CisKKwlzdGF0ZSA9IGRybV9hdG9taWNfc3Rh dGVfYWxsb2MoZGV2KTsKKwlpZiAoIXN0YXRlKQorCQlyZXR1cm4gLUVOT01FTTsKKworCWRybV9t b2Rlc2V0X2FjcXVpcmVfaW5pdCgmY3R4LCAwKTsKKwlzdGF0ZS0+YWNxdWlyZV9jdHggPSAmY3R4 OworCityZXRyeToKKwlwbGFuZV9tYXNrID0gMDsKKwlyZXQgPSBkcm1fbW9kZXNldF9sb2NrX2Fs bF9jdHgoZGV2LCAmY3R4KTsKKwlpZiAocmV0KQorCQlnb3RvIHVubG9jazsKKworCWRybV9mb3Jf ZWFjaF9wbGFuZShwbGFuZSwgZGV2KSB7CisJCXN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKnBsYW5l X3N0YXRlOworCisJCWlmIChwbGFuZS0+c3RhdGUtPmZiICE9IGZiKQorCQkJY29udGludWU7CisK KwkJcGxhbmVfc3RhdGUgPSBkcm1fYXRvbWljX2dldF9wbGFuZV9zdGF0ZShzdGF0ZSwgcGxhbmUp OworCQlpZiAoSVNfRVJSKHBsYW5lX3N0YXRlKSkgeworCQkJcmV0ID0gUFRSX0VSUihwbGFuZV9z dGF0ZSk7CisJCQlnb3RvIHVubG9jazsKKwkJfQorCisJCWlmIChwbGFuZV9zdGF0ZS0+Y3J0Yy0+ cHJpbWFyeSA9PSBwbGFuZSkgeworCQkJc3RydWN0IGRybV9jcnRjX3N0YXRlICpjcnRjX3N0YXRl OworCisJCQljcnRjX3N0YXRlID0gZHJtX2F0b21pY19nZXRfZXhpc3RpbmdfY3J0Y19zdGF0ZShz dGF0ZSwgcGxhbmVfc3RhdGUtPmNydGMpOworCisJCQlyZXQgPSBkcm1fYXRvbWljX2FkZF9hZmZl Y3RlZF9jb25uZWN0b3JzKHN0YXRlLCBwbGFuZV9zdGF0ZS0+Y3J0Yyk7CisJCQlpZiAocmV0KQor CQkJCWdvdG8gdW5sb2NrOworCisJCQljcnRjX3N0YXRlLT5hY3RpdmUgPSBmYWxzZTsKKwkJCXJl dCA9IGRybV9hdG9taWNfc2V0X21vZGVfZm9yX2NydGMoY3J0Y19zdGF0ZSwgTlVMTCk7CisJCQlp ZiAocmV0KQorCQkJCWdvdG8gdW5sb2NrOworCQl9CisKKwkJZHJtX2F0b21pY19zZXRfZmJfZm9y X3BsYW5lKHBsYW5lX3N0YXRlLCBOVUxMKTsKKwkJcmV0ID0gZHJtX2F0b21pY19zZXRfY3J0Y19m b3JfcGxhbmUocGxhbmVfc3RhdGUsIE5VTEwpOworCQlpZiAocmV0KQorCQkJZ290byB1bmxvY2s7 CisKKwkJcGxhbmVfbWFzayB8PSBCSVQoZHJtX3BsYW5lX2luZGV4KHBsYW5lKSk7CisKKwkJcGxh bmUtPm9sZF9mYiA9IHBsYW5lLT5mYjsKKwl9CisKKwlmb3JfZWFjaF9jb25uZWN0b3JfaW5fc3Rh dGUoc3RhdGUsIGNvbm4sIGNvbm5fc3RhdGUsIGkpIHsKKwkJcmV0ID0gZHJtX2F0b21pY19zZXRf Y3J0Y19mb3JfY29ubmVjdG9yKGNvbm5fc3RhdGUsIE5VTEwpOworCisJCWlmIChyZXQpCisJCQln b3RvIHVubG9jazsKKwl9CisKKwlpZiAocGxhbmVfbWFzaykKKwkJcmV0ID0gZHJtX2F0b21pY19j b21taXQoc3RhdGUpOworCit1bmxvY2s6CisJaWYgKHBsYW5lX21hc2spCisJCWRybV9hdG9taWNf Y2xlYW5fb2xkX2ZiKGRldiwgcGxhbmVfbWFzaywgcmV0KTsKKworCWlmIChyZXQgPT0gLUVERUFE TEspIHsKKwkJZHJtX21vZGVzZXRfYmFja29mZigmY3R4KTsKKwkJZ290byByZXRyeTsKKwl9CisK Kwlkcm1fYXRvbWljX3N0YXRlX3B1dChzdGF0ZSk7CisKKwlkcm1fbW9kZXNldF9kcm9wX2xvY2tz KCZjdHgpOworCWRybV9tb2Rlc2V0X2FjcXVpcmVfZmluaSgmY3R4KTsKKworCXJldHVybiByZXQ7 Cit9CisKIGludCBkcm1fbW9kZV9hdG9taWNfaW9jdGwoc3RydWN0IGRybV9kZXZpY2UgKmRldiwK IAkJCSAgdm9pZCAqZGF0YSwgc3RydWN0IGRybV9maWxlICpmaWxlX3ByaXYpCiB7CmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2NydGNfaW50ZXJuYWwuaCBiL2RyaXZlcnMvZ3B1L2Ry bS9kcm1fY3J0Y19pbnRlcm5hbC5oCmluZGV4IDk1NWM1NjkwYmY2NC4uZTA2NzhmOGE1MWNmIDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2NydGNfaW50ZXJuYWwuaAorKysgYi9kcml2 ZXJzL2dwdS9kcm0vZHJtX2NydGNfaW50ZXJuYWwuaApAQCAtMTgzLDYgKzE4Myw3IEBAIGludCBk cm1fYXRvbWljX2dldF9wcm9wZXJ0eShzdHJ1Y3QgZHJtX21vZGVfb2JqZWN0ICpvYmosCiAJCQkg ICAgc3RydWN0IGRybV9wcm9wZXJ0eSAqcHJvcGVydHksIHVpbnQ2NF90ICp2YWwpOwogaW50IGRy bV9tb2RlX2F0b21pY19pb2N0bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQkJICB2b2lkICpk YXRhLCBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGVfcHJpdik7CitpbnQgZHJtX2F0b21pY19yZW1vdmVf ZmIoc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIpOwogCiAKIC8qIGRybV9wbGFuZS5jICovCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2ZyYW1lYnVmZmVyLmMgYi9kcml2ZXJzL2dw dS9kcm0vZHJtX2ZyYW1lYnVmZmVyLmMKaW5kZXggMjhhMDEwOGExYWI4Li5jMGU1OTNhN2Y5YjQg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fZnJhbWVidWZmZXIuYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vZHJtX2ZyYW1lYnVmZmVyLmMKQEAgLTc3Myw2ICs3NzMsMTIgQEAgdm9pZCBk cm1fZnJhbWVidWZmZXJfcmVtb3ZlKHN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiKQogCSAqIGlu IHRoaXMgbWFubmVyLgogCSAqLwogCWlmIChkcm1fZnJhbWVidWZmZXJfcmVhZF9yZWZjb3VudChm YikgPiAxKSB7CisJCWlmIChkcm1fZHJ2X3VzZXNfYXRvbWljX21vZGVzZXQoZGV2KSkgeworCQkJ aW50IHJldCA9IGRybV9hdG9taWNfcmVtb3ZlX2ZiKGZiKTsKKwkJCVdBUk4ocmV0LCAiYXRvbWlj IHJlbW92ZV9mYiBmYWlsZWQgd2l0aCAlaVxuIiwgcmV0KTsKKwkJCWdvdG8gb3V0OworCQl9CisK IAkJZHJtX21vZGVzZXRfbG9ja19hbGwoZGV2KTsKIAkJLyogcmVtb3ZlIGZyb20gYW55IENSVEMg Ki8KIAkJZHJtX2Zvcl9lYWNoX2NydGMoY3J0YywgZGV2KSB7CkBAIC03OTAsNiArNzk2LDcgQEAg dm9pZCBkcm1fZnJhbWVidWZmZXJfcmVtb3ZlKHN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiKQog CQlkcm1fbW9kZXNldF91bmxvY2tfYWxsKGRldik7CiAJfQogCitvdXQ6CiAJZHJtX2ZyYW1lYnVm ZmVyX3VucmVmZXJlbmNlKGZiKTsKIH0KIEVYUE9SVF9TWU1CT0woZHJtX2ZyYW1lYnVmZmVyX3Jl bW92ZSk7Ci0tIAoyLjcuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50 ZWwtZ2Z4Cg==