From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH v3 09/19] drm/i915: clean up atomic plane check functions, v2. Date: Mon, 15 Jun 2015 12:33:46 +0200 Message-ID: <1434364436-6366-10-git-send-email-maarten.lankhorst@linux.intel.com> References: <1434364436-6366-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: Received: from mblankhorst.nl (mblankhorst.nl [141.105.120.124]) by gabe.freedesktop.org (Postfix) with ESMTP id 5AC696E734 for ; Mon, 15 Jun 2015 03:34:14 -0700 (PDT) In-Reply-To: <1434364436-6366-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: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org QnkgcGFzc2luZyBjcnRjX3N0YXRlIHRvIHRoZSBjaGVja19wbGFuZSBmdW5jdGlvbnMgYSBsb3Qg b2YgZHVwbGljYXRlZApjb2RlIGNhbiBiZSByZW1vdmVkLiBUaGVyZSBhcmUgc3RpbGwgc29tZSB0 cmFuc2l0aW9uYWwgaGVscGVyIGNhbGxzLAp0aGV5IHdpbGwgYmUgcmVtb3ZlZCBsYXRlci4KCkNo YW5nZXMgc2luY2UgdjE6Ci0gUmV2ZXJ0IHN0YXRlLT52aXNpYmxlIGNoYW5nZXMuCi0gVXNlIHBs YW5lLT5zdGF0ZS0+Y3J0YyBpbnN0ZWFkIG9mIHBsYW5lLT5jcnRjLgotIFVzZSBkcm1fYXRvbWlj X2dldF9leGlzdGluZ19jcnRjX3N0YXRlLgoKU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9y c3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9hdG9taWNfcGxhbmUuYyB8IDE2ICsrKysrKystLS0tCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgICAgICB8IDQ4ICsrKysrKysrKystLS0tLS0tLS0t LS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oICAgICAgICAgIHwg IDEgKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMgICAgICAgfCAgOSArKy0t LS0KIDQgZmlsZXMgY2hhbmdlZCwgMjkgaW5zZXJ0aW9ucygrKSwgNDUgZGVsZXRpb25zKC0pCgpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljX3BsYW5lLmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWNfcGxhbmUuYwppbmRleCBhYTIxMjgzNjlh MGEuLjkxZDUzNzY4ZGY5ZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf YXRvbWljX3BsYW5lLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljX3Bs YW5lLmMKQEAgLTExNiw3ICsxMTYsNyBAQCBzdGF0aWMgaW50IGludGVsX3BsYW5lX2F0b21pY19j aGVjayhzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUg KmludGVsX3N0YXRlID0gdG9faW50ZWxfcGxhbmVfc3RhdGUoc3RhdGUpOwogCWludCByZXQ7CiAK LQljcnRjID0gY3J0YyA/IGNydGMgOiBwbGFuZS0+Y3J0YzsKKwljcnRjID0gY3J0YyA/IGNydGMg OiBwbGFuZS0+c3RhdGUtPmNydGM7CiAJaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7 CiAKIAkvKgpAQCAtMTMxLDEwICsxMzEsMTMgQEAgc3RhdGljIGludCBpbnRlbF9wbGFuZV9hdG9t aWNfY2hlY2soc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJLyogRklYTUU6IHRlbXBvcmFyeSBo YWNrIG5lY2Vzc2FyeSB3aGlsZSB3ZSBzdGlsbCB1c2UgdGhlIHBsYW5lIHVwZGF0ZQogCSAqIGhl bHBlci4gKi8KIAlpZiAoc3RhdGUtPnN0YXRlKSB7Ci0JCWNydGNfc3RhdGUgPQotCQkJaW50ZWxf YXRvbWljX2dldF9jcnRjX3N0YXRlKHN0YXRlLT5zdGF0ZSwgaW50ZWxfY3J0Yyk7Ci0JCWlmIChJ U19FUlIoY3J0Y19zdGF0ZSkpCi0JCQlyZXR1cm4gUFRSX0VSUihjcnRjX3N0YXRlKTsKKwkJc3Ry dWN0IGRybV9jcnRjX3N0YXRlICpkcm1fY3J0Y19zdGF0ZSA9CisJCQlkcm1fYXRvbWljX2dldF9l eGlzdGluZ19jcnRjX3N0YXRlKHN0YXRlLT5zdGF0ZSwgY3J0Yyk7CisKKwkJaWYgKFdBUk5fT04o IWRybV9jcnRjX3N0YXRlKSkKKwkJCXJldHVybiAtRUlOVkFMOworCisJCWNydGNfc3RhdGUgPSB0 b19pbnRlbF9jcnRjX3N0YXRlKGRybV9jcnRjX3N0YXRlKTsKIAl9IGVsc2UgewogCQljcnRjX3N0 YXRlID0gaW50ZWxfY3J0Yy0+Y29uZmlnOwogCX0KQEAgLTE4NSw3ICsxODgsOCBAQCBzdGF0aWMg aW50IGludGVsX3BsYW5lX2F0b21pY19jaGVjayhzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAkJ fQogCX0KIAotCXJldCA9IGludGVsX3BsYW5lLT5jaGVja19wbGFuZShwbGFuZSwgaW50ZWxfc3Rh dGUpOworCWludGVsX3N0YXRlLT52aXNpYmxlID0gZmFsc2U7CisJcmV0ID0gaW50ZWxfcGxhbmUt PmNoZWNrX3BsYW5lKHBsYW5lLCBjcnRjX3N0YXRlLCBpbnRlbF9zdGF0ZSk7CiAJaWYgKHJldCB8 fCAhc3RhdGUtPnN0YXRlKQogCQlyZXR1cm4gcmV0OwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k aXNwbGF5LmMKaW5kZXggZWM0OTI0ZWVjZDY4Li42MTY5NzMzNWJmZjIgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTEzNzAzLDM2ICsxMzcwMywyNSBAQCBza2xfbWF4X3Nj YWxlKHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjLCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0 ZSAqY3J0Y19zdGF0ZQogCiBzdGF0aWMgaW50CiBpbnRlbF9jaGVja19wcmltYXJ5X3BsYW5lKHN0 cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAorCQkJICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0 Y19zdGF0ZSwKIAkJCSAgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpzdGF0ZSkKIHsKLQlzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2ID0gcGxhbmUtPmRldjsKIAlzdHJ1Y3QgZHJtX2NydGMgKmNydGMg PSBzdGF0ZS0+YmFzZS5jcnRjOwotCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjOwotCXN0 cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlOwogCXN0cnVjdCBkcm1fZnJhbWVidWZm ZXIgKmZiID0gc3RhdGUtPmJhc2UuZmI7Ci0Jc3RydWN0IGRybV9yZWN0ICpkZXN0ID0gJnN0YXRl LT5kc3Q7Ci0Jc3RydWN0IGRybV9yZWN0ICpzcmMgPSAmc3RhdGUtPnNyYzsKLQljb25zdCBzdHJ1 Y3QgZHJtX3JlY3QgKmNsaXAgPSAmc3RhdGUtPmNsaXA7Ci0JYm9vbCBjYW5fcG9zaXRpb24gPSBm YWxzZTsKLQlpbnQgbWF4X3NjYWxlID0gRFJNX1BMQU5FX0hFTFBFUl9OT19TQ0FMSU5HOwogCWlu dCBtaW5fc2NhbGUgPSBEUk1fUExBTkVfSEVMUEVSX05PX1NDQUxJTkc7CisJaW50IG1heF9zY2Fs ZSA9IERSTV9QTEFORV9IRUxQRVJfTk9fU0NBTElORzsKKwlib29sIGNhbl9wb3NpdGlvbiA9IGZh bHNlOwogCi0JY3J0YyA9IGNydGMgPyBjcnRjIDogcGxhbmUtPmNydGM7Ci0JaW50ZWxfY3J0YyA9 IHRvX2ludGVsX2NydGMoY3J0Yyk7Ci0JY3J0Y19zdGF0ZSA9IHN0YXRlLT5iYXNlLnN0YXRlID8K LQkJaW50ZWxfYXRvbWljX2dldF9jcnRjX3N0YXRlKHN0YXRlLT5iYXNlLnN0YXRlLCBpbnRlbF9j cnRjKSA6IE5VTEw7Ci0KLQlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPj0gOSkgewotCQkvKiB1 c2Ugc2NhbGVyIHdoZW4gY29sb3JrZXkgaXMgbm90IHJlcXVpcmVkICovCi0JCWlmICh0b19pbnRl bF9wbGFuZShwbGFuZSktPmNrZXkuZmxhZ3MgPT0gSTkxNV9TRVRfQ09MT1JLRVlfTk9ORSkgewot CQkJbWluX3NjYWxlID0gMTsKLQkJCW1heF9zY2FsZSA9IHNrbF9tYXhfc2NhbGUoaW50ZWxfY3J0 YywgY3J0Y19zdGF0ZSk7Ci0JCX0KKwkvKiB1c2Ugc2NhbGVyIHdoZW4gY29sb3JrZXkgaXMgbm90 IHJlcXVpcmVkICovCisJaWYgKElOVEVMX0lORk8ocGxhbmUtPmRldiktPmdlbiA+PSA5ICYmCisJ ICAgIHRvX2ludGVsX3BsYW5lKHBsYW5lKS0+Y2tleS5mbGFncyA9PSBJOTE1X1NFVF9DT0xPUktF WV9OT05FKSB7CisJCW1pbl9zY2FsZSA9IDE7CisJCW1heF9zY2FsZSA9IHNrbF9tYXhfc2NhbGUo dG9faW50ZWxfY3J0YyhjcnRjKSwgY3J0Y19zdGF0ZSk7CiAJCWNhbl9wb3NpdGlvbiA9IHRydWU7 CiAJfQogCi0JcmV0dXJuIGRybV9wbGFuZV9oZWxwZXJfY2hlY2tfdXBkYXRlKHBsYW5lLCBjcnRj LCBmYiwKLQkJCQkJICAgICBzcmMsIGRlc3QsIGNsaXAsCisJcmV0dXJuIGRybV9wbGFuZV9oZWxw ZXJfY2hlY2tfdXBkYXRlKHBsYW5lLCBjcnRjLCBmYiwgJnN0YXRlLT5zcmMsCisJCQkJCSAgICAg JnN0YXRlLT5kc3QsICZzdGF0ZS0+Y2xpcCwKIAkJCQkJICAgICBtaW5fc2NhbGUsIG1heF9zY2Fs ZSwKIAkJCQkJICAgICBjYW5fcG9zaXRpb24sIHRydWUsCiAJCQkJCSAgICAgJnN0YXRlLT52aXNp YmxlKTsKQEAgLTEzOTczLDI0ICsxMzk2MiwxNyBAQCB2b2lkIGludGVsX2NyZWF0ZV9yb3RhdGlv bl9wcm9wZXJ0eShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgaW50ZWxfcGxhbmUgKgog CiBzdGF0aWMgaW50CiBpbnRlbF9jaGVja19jdXJzb3JfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAq cGxhbmUsCisJCQkgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCiAJCQkgc3Ry dWN0IGludGVsX3BsYW5lX3N0YXRlICpzdGF0ZSkKIHsKLQlzdHJ1Y3QgZHJtX2NydGMgKmNydGMg PSBzdGF0ZS0+YmFzZS5jcnRjOwotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBwbGFuZS0+ZGV2 OworCXN0cnVjdCBkcm1fY3J0YyAqY3J0YyA9IGNydGNfc3RhdGUtPmJhc2UuY3J0YzsKIAlzdHJ1 Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiA9IHN0YXRlLT5iYXNlLmZiOwotCXN0cnVjdCBkcm1fcmVj dCAqZGVzdCA9ICZzdGF0ZS0+ZHN0OwotCXN0cnVjdCBkcm1fcmVjdCAqc3JjID0gJnN0YXRlLT5z cmM7Ci0JY29uc3Qgc3RydWN0IGRybV9yZWN0ICpjbGlwID0gJnN0YXRlLT5jbGlwOwogCXN0cnVj dCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmogPSBpbnRlbF9mYl9vYmooZmIpOwotCXN0cnVjdCBp bnRlbF9jcnRjICppbnRlbF9jcnRjOwogCXVuc2lnbmVkIHN0cmlkZTsKIAlpbnQgcmV0OwogCi0J Y3J0YyA9IGNydGMgPyBjcnRjIDogcGxhbmUtPmNydGM7Ci0JaW50ZWxfY3J0YyA9IHRvX2ludGVs X2NydGMoY3J0Yyk7Ci0KLQlyZXQgPSBkcm1fcGxhbmVfaGVscGVyX2NoZWNrX3VwZGF0ZShwbGFu ZSwgY3J0YywgZmIsCi0JCQkJCSAgICBzcmMsIGRlc3QsIGNsaXAsCisJcmV0ID0gZHJtX3BsYW5l X2hlbHBlcl9jaGVja191cGRhdGUocGxhbmUsIGNydGMsIGZiLCAmc3RhdGUtPnNyYywKKwkJCQkJ ICAgICZzdGF0ZS0+ZHN0LCAmc3RhdGUtPmNsaXAsCiAJCQkJCSAgICBEUk1fUExBTkVfSEVMUEVS X05PX1NDQUxJTkcsCiAJCQkJCSAgICBEUk1fUExBTkVfSEVMUEVSX05PX1NDQUxJTkcsCiAJCQkJ CSAgICB0cnVlLCB0cnVlLCAmc3RhdGUtPnZpc2libGUpOwpAQCAtMTQwMDIsNyArMTM5ODQsNyBA QCBpbnRlbF9jaGVja19jdXJzb3JfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJCXJl dHVybiAwOwogCiAJLyogQ2hlY2sgZm9yIHdoaWNoIGN1cnNvciB0eXBlcyB3ZSBzdXBwb3J0ICov Ci0JaWYgKCFjdXJzb3Jfc2l6ZV9vayhkZXYsIHN0YXRlLT5iYXNlLmNydGNfdywgc3RhdGUtPmJh c2UuY3J0Y19oKSkgeworCWlmICghY3Vyc29yX3NpemVfb2socGxhbmUtPmRldiwgc3RhdGUtPmJh c2UuY3J0Y193LCBzdGF0ZS0+YmFzZS5jcnRjX2gpKSB7CiAJCURSTV9ERUJVRygiQ3Vyc29yIGRp bWVuc2lvbiAlZHglZCBub3Qgc3VwcG9ydGVkXG4iLAogCQkJICBzdGF0ZS0+YmFzZS5jcnRjX3cs IHN0YXRlLT5iYXNlLmNydGNfaCk7CiAJCXJldHVybiAtRUlOVkFMOwpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kcnYuaAppbmRleCA5ZjU4NjdiZjc0NWUuLjhjMGYxN2U4NGVlZSAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZHJ2LmgKQEAgLTYxMyw2ICs2MTMsNyBAQCBzdHJ1Y3QgaW50ZWxfcGxhbmUgewogCXZv aWQgKCpkaXNhYmxlX3BsYW5lKShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAkJCSAgICAgIHN0 cnVjdCBkcm1fY3J0YyAqY3J0YywgYm9vbCBmb3JjZSk7CiAJaW50ICgqY2hlY2tfcGxhbmUpKHN0 cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAorCQkJICAgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNy dGNfc3RhdGUsCiAJCQkgICBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnN0YXRlKTsKIAl2b2lk ICgqY29tbWl0X3BsYW5lKShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAkJCSAgICAgc3RydWN0 IGludGVsX3BsYW5lX3N0YXRlICpzdGF0ZSk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9zcHJpdGUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5j CmluZGV4IGM5MDliOGI4Y2U4NS4uOTk5YTU3NTNkZGUzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9zcHJpdGUuYwpAQCAtNzM5LDExICs3MzksMTIgQEAgaWxrX2Rpc2FibGVfcGxhbmUoc3RydWN0 IGRybV9wbGFuZSAqcGxhbmUsIHN0cnVjdCBkcm1fY3J0YyAqY3J0YywgYm9vbCBmb3JjZSkKIAog c3RhdGljIGludAogaW50ZWxfY2hlY2tfc3ByaXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBs YW5lLAorCQkJIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAogCQkJIHN0cnVj dCBpbnRlbF9wbGFuZV9zdGF0ZSAqc3RhdGUpCiB7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9 IHBsYW5lLT5kZXY7Ci0Jc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9j cnRjKHN0YXRlLT5iYXNlLmNydGMpOwotCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0 YXRlOworCXN0cnVjdCBkcm1fY3J0YyAqY3J0YyA9IHN0YXRlLT5iYXNlLmNydGM7CisJc3RydWN0 IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOwogCXN0cnVjdCBp bnRlbF9wbGFuZSAqaW50ZWxfcGxhbmUgPSB0b19pbnRlbF9wbGFuZShwbGFuZSk7CiAJc3RydWN0 IGRybV9mcmFtZWJ1ZmZlciAqZmIgPSBzdGF0ZS0+YmFzZS5mYjsKIAlpbnQgY3J0Y194LCBjcnRj X3k7CkBAIC03NTcsMTAgKzc1OCw2IEBAIGludGVsX2NoZWNrX3Nwcml0ZV9wbGFuZShzdHJ1Y3Qg ZHJtX3BsYW5lICpwbGFuZSwKIAlib29sIGNhbl9zY2FsZTsKIAlpbnQgcGl4ZWxfc2l6ZTsKIAot CWludGVsX2NydGMgPSBpbnRlbF9jcnRjID8gaW50ZWxfY3J0YyA6IHRvX2ludGVsX2NydGMocGxh bmUtPmNydGMpOwotCWNydGNfc3RhdGUgPSBzdGF0ZS0+YmFzZS5zdGF0ZSA/Ci0JCWludGVsX2F0 b21pY19nZXRfY3J0Y19zdGF0ZShzdGF0ZS0+YmFzZS5zdGF0ZSwgaW50ZWxfY3J0YykgOiBOVUxM OwotCiAJaWYgKCFmYikgewogCQlzdGF0ZS0+dmlzaWJsZSA9IGZhbHNlOwogCQlyZXR1cm4gMDsK LS0gCjIuMS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=