From: Maarten Lankhorst Subject: [PATCH] drm/atomic: add drm_atomic_get_existing_*_state helpers Date: Wed, 13 May 2015 10:37:25 +0200 Message-ID: <1431506245-30920-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: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org VGhlcmUgYXJlIGNhc2VzIHdoZXJlIHdlIHdhbnQgdG8gdGVzdCBpZiBhIGdpdmVuIG9iamVjdCBp cwpwYXJ0IG9mIHRoZSBzdGF0ZSwgYnV0IGRvbid0IHdhbnQgdG8gYWRkIHRoZW0gaWYgdGhleSdy ZSBub3QuCgpTaWduZWQtb2ZmLWJ5OiBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5sYW5raG9y c3RAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljLmMgfCAx OCArKysrKysrLS0tLS0tLS0tCiBpbmNsdWRlL2RybS9kcm1fYXRvbWljLmggICAgIHwgNTAgKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysKIDIgZmlsZXMgY2hhbmdl ZCwgNTggaW5zZXJ0aW9ucygrKSwgMTAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2RybV9hdG9taWMuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljLmMKaW5k ZXggODgyNTkwNTdmODdiLi40NzM2NGYyNDRkYzAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9kcm1fYXRvbWljLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWMuYwpAQCAtMjYz LDEzICsyNjMsMTIgQEAgc3RydWN0IGRybV9jcnRjX3N0YXRlICoKIGRybV9hdG9taWNfZ2V0X2Ny dGNfc3RhdGUoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlLAogCQkJICBzdHJ1Y3QgZHJt X2NydGMgKmNydGMpCiB7Ci0JaW50IHJldCwgaW5kZXg7CisJaW50IHJldCwgaW5kZXggPSBkcm1f Y3J0Y19pbmRleChjcnRjKTsKIAlzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGU7CiAK LQlpbmRleCA9IGRybV9jcnRjX2luZGV4KGNydGMpOwotCi0JaWYgKHN0YXRlLT5jcnRjX3N0YXRl c1tpbmRleF0pCi0JCXJldHVybiBzdGF0ZS0+Y3J0Y19zdGF0ZXNbaW5kZXhdOworCWNydGNfc3Rh dGUgPSBkcm1fYXRvbWljX2dldF9leGlzdGluZ19jcnRjX3N0YXRlKHN0YXRlLCBjcnRjKTsKKwlp ZiAoY3J0Y19zdGF0ZSkKKwkJcmV0dXJuIGNydGNfc3RhdGU7CiAKIAlyZXQgPSBkcm1fbW9kZXNl dF9sb2NrKCZjcnRjLT5tdXRleCwgc3RhdGUtPmFjcXVpcmVfY3R4KTsKIAlpZiAocmV0KQpAQCAt Mzk3LDEzICszOTYsMTIgQEAgc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqCiBkcm1fYXRvbWljX2dl dF9wbGFuZV9zdGF0ZShzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUsCiAJCQkgIHN0cnVj dCBkcm1fcGxhbmUgKnBsYW5lKQogewotCWludCByZXQsIGluZGV4OworCWludCByZXQsIGluZGV4 ID0gZHJtX3BsYW5lX2luZGV4KHBsYW5lKTsKIAlzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpwbGFu ZV9zdGF0ZTsKIAotCWluZGV4ID0gZHJtX3BsYW5lX2luZGV4KHBsYW5lKTsKLQotCWlmIChzdGF0 ZS0+cGxhbmVfc3RhdGVzW2luZGV4XSkKLQkJcmV0dXJuIHN0YXRlLT5wbGFuZV9zdGF0ZXNbaW5k ZXhdOworCXBsYW5lX3N0YXRlID0gZHJtX2F0b21pY19nZXRfZXhpc3RpbmdfcGxhbmVfc3RhdGUo c3RhdGUsIHBsYW5lKTsKKwlpZiAocGxhbmVfc3RhdGUpCisJCXJldHVybiBwbGFuZV9zdGF0ZTsK IAogCXJldCA9IGRybV9tb2Rlc2V0X2xvY2soJnBsYW5lLT5tdXRleCwgc3RhdGUtPmFjcXVpcmVf Y3R4KTsKIAlpZiAocmV0KQpkaWZmIC0tZ2l0IGEvaW5jbHVkZS9kcm0vZHJtX2F0b21pYy5oIGIv aW5jbHVkZS9kcm0vZHJtX2F0b21pYy5oCmluZGV4IDk1M2FmNmJkNzQzMC4uNjQ0NTk3MDUzNWVj IDEwMDY0NAotLS0gYS9pbmNsdWRlL2RybS9kcm1fYXRvbWljLmgKKysrIGIvaW5jbHVkZS9kcm0v ZHJtX2F0b21pYy5oCkBAIC01OSw2ICs1OSw1NiBAQCBpbnQgZHJtX2F0b21pY19jb25uZWN0b3Jf c2V0X3Byb3BlcnR5KHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IsCiAJCXN0cnVjdCBk cm1fY29ubmVjdG9yX3N0YXRlICpzdGF0ZSwgc3RydWN0IGRybV9wcm9wZXJ0eSAqcHJvcGVydHks CiAJCXVpbnQ2NF90IHZhbCk7CiAKKy8qKgorICogZHJtX2F0b21pY19nZXRfZXhpc3RpbmdfY3J0 Y19zdGF0ZSAtIGdldCBjcnRjIHN0YXRlLCBpZiBpdCBleGlzdHMKKyAqIEBzdGF0ZTogZ2xvYmFs IGF0b21pYyBzdGF0ZSBvYmplY3QKKyAqIEBjcnRjOiBjcnRjIHRvIGdyYWIKKyAqCisgKiBUaGlz IGZ1bmN0aW9uIHJldHVybnMgdGhlIGNydGMgc3RhdGUgZm9yIHRoZSBnaXZlbiBjcnRjLCBvciBO VUxMCisgKiBpZiB0aGUgY3J0YyBpcyBub3QgcGFydCBvZiB0aGUgZ2xvYmFsIGF0b21pYyBzdGF0 ZS4KKyAqLworc3RhdGljIGlubGluZSBzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKgorZHJtX2F0b21p Y19nZXRfZXhpc3RpbmdfY3J0Y19zdGF0ZShzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUs CisJCQkJICAgc3RydWN0IGRybV9jcnRjICpjcnRjKQoreworCXJldHVybiBzdGF0ZS0+Y3J0Y19z dGF0ZXNbZHJtX2NydGNfaW5kZXgoY3J0YyldOworfQorCisvKioKKyAqIGRybV9hdG9taWNfZ2V0 X2V4aXN0aW5nX3BsYW5lX3N0YXRlIC0gZ2V0IHBsYW5lIHN0YXRlLCBpZiBpdCBleGlzdHMKKyAq IEBzdGF0ZTogZ2xvYmFsIGF0b21pYyBzdGF0ZSBvYmplY3QKKyAqIEBwbGFuZTogcGxhbmUgdG8g Z3JhYgorICoKKyAqIFRoaXMgZnVuY3Rpb24gcmV0dXJucyB0aGUgcGxhbmUgc3RhdGUgZm9yIHRo ZSBnaXZlbiBwbGFuZSwgb3IgTlVMTAorICogaWYgdGhlIHBsYW5lIGlzIG5vdCBwYXJ0IG9mIHRo ZSBnbG9iYWwgYXRvbWljIHN0YXRlLgorICovCitzdGF0aWMgaW5saW5lIHN0cnVjdCBkcm1fcGxh bmVfc3RhdGUgKgorZHJtX2F0b21pY19nZXRfZXhpc3RpbmdfcGxhbmVfc3RhdGUoc3RydWN0IGRy bV9hdG9taWNfc3RhdGUgKnN0YXRlLAorCQkJCSAgICBzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSkK K3sKKwlyZXR1cm4gc3RhdGUtPnBsYW5lX3N0YXRlc1tkcm1fcGxhbmVfaW5kZXgocGxhbmUpXTsK K30KKworLyoqCisgKiBkcm1fYXRvbWljX2dldF9leGlzdGluZ19jb25uZWN0b3Jfc3RhdGUgLSBn ZXQgY29ubmVjdG9yIHN0YXRlLCBpZiBpdCBleGlzdHMKKyAqIEBzdGF0ZTogZ2xvYmFsIGF0b21p YyBzdGF0ZSBvYmplY3QKKyAqIEBjb25uZWN0b3I6IGNvbm5lY3RvciB0byBncmFiCisgKgorICog VGhpcyBmdW5jdGlvbiByZXR1cm5zIHRoZSBjb25uZWN0b3Igc3RhdGUgZm9yIHRoZSBnaXZlbiBj b25uZWN0b3IsCisgKiBvciBOVUxMIGlmIHRoZSBjb25uZWN0b3IgaXMgbm90IHBhcnQgb2YgdGhl IGdsb2JhbCBhdG9taWMgc3RhdGUuCisgKi8KK3N0YXRpYyBpbmxpbmUgc3RydWN0IGRybV9jb25u ZWN0b3Jfc3RhdGUgKgorZHJtX2F0b21pY19nZXRfZXhpc3RpbmdfY29ubmVjdG9yX3N0YXRlKHN0 cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSwKKwkJCQkJc3RydWN0IGRybV9jb25uZWN0b3Ig KmNvbm5lY3RvcikKK3sKKwlpbnQgaW5kZXggPSBkcm1fY29ubmVjdG9yX2luZGV4KGNvbm5lY3Rv cik7CisKKwlpZiAoaW5kZXggPj0gc3RhdGUtPm51bV9jb25uZWN0b3IpCisJCXJldHVybiBOVUxM OworCisJcmV0dXJuIHN0YXRlLT5jb25uZWN0b3Jfc3RhdGVzW2luZGV4XTsKK30KKwogaW50IF9f bXVzdF9jaGVjawogZHJtX2F0b21pY19zZXRfY3J0Y19mb3JfcGxhbmUoc3RydWN0IGRybV9wbGFu ZV9zdGF0ZSAqcGxhbmVfc3RhdGUsCiAJCQkgICAgICBzdHJ1Y3QgZHJtX2NydGMgKmNydGMpOwot LSAKMi4xLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo dHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==