From: Matt Roper Subject: [PATCH 2/3] drm/plane-helper: Add drm_primary_helper_check_update() Date: Wed, 23 Apr 2014 10:04:00 -0700 Message-ID: <1398272641-4368-2-git-send-email-matthew.d.roper@intel.com> References: <1398272641-4368-1-git-send-email-matthew.d.roper@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1398272641-4368-1-git-send-email-matthew.d.roper@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: intel-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org UHVsbCB0aGUgcGFyYW1ldGVyIGNoZWNraW5nIGZyb20gZHJtX3ByaW1hcnlfaGVscGVyX3VwZGF0 ZSgpIG91dCBpbnRvCml0cyBvd24gZnVuY3Rpb247IGRyaXZlcnMgdGhhdCBwcm92aWRlIHRoZWly IG93biBzZXRwbGFuZSgpCmltcGxlbWVudGF0aW9ucyByYXRoZXIgdGhhbiB1c2luZyB0aGUgaGVs cGVyIG1heSBzdGlsbCB3YW50IHRvIHNoYXJlCnRoaXMgcGFyYW1ldGVyIGNoZWNraW5nIGxvZ2lj LgoKQSBmZXcgb2YgdGhlIGNoZWNrcyBoZXJlIHdlcmUgYWxzbyB1cGRhdGVkIGJhc2VkIG9uIHN1 Z2dlc3Rpb25zIGJ5ClZpbGxlIFN5cmrDpGzDpC4KCkNjOiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxl LnN5cmphbGFAbGludXguaW50ZWwuY29tPgpDYzogZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwpTaWduZWQtb2ZmLWJ5OiBNYXR0IFJvcGVyIDxtYXR0aGV3LmQucm9wZXJAaW50ZWwuY29t PgotLS0KIGRyaXZlcnMvZ3B1L2RybS9kcm1fcGxhbmVfaGVscGVyLmMgfCAxNDggKysrKysrKysr KysrKysrKysrKysrKysrKysrKystLS0tLS0tLQogaW5jbHVkZS9kcm0vZHJtX3BsYW5lX2hlbHBl ci5oICAgICB8ICAgOSArKysKIDIgZmlsZXMgY2hhbmdlZCwgMTI4IGluc2VydGlvbnMoKyksIDI5 IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fcGxhbmVfaGVs cGVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX3BsYW5lX2hlbHBlci5jCmluZGV4IDY1YzRhMDAu LjliYmJkZjIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fcGxhbmVfaGVscGVyLmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV9wbGFuZV9oZWxwZXIuYwpAQCAtNjYsNiArNjYsMTAy IEBAIHN0YXRpYyBpbnQgZ2V0X2Nvbm5lY3RvcnNfZm9yX2NydGMoc3RydWN0IGRybV9jcnRjICpj cnRjLAogfQogCiAvKioKKyAqIGRybV9wcmltYXJ5X2hlbHBlcl9jaGVja191cGRhdGUoKSAtIENo ZWNrIHByaW1hcnkgcGxhbmUgdXBkYXRlIGZvciB2YWxpZGl0eQorICogQHBsYW5lOiBwbGFuZSBv YmplY3QgdG8gdXBkYXRlCisgKiBAY3J0Yzogb3duaW5nIENSVEMgb2Ygb3duaW5nIHBsYW5lCisg KiBAZmI6IGZyYW1lYnVmZmVyIHRvIGZsaXAgb250byBwbGFuZQorICogQGNydGNfeDogeCBvZmZz ZXQgb2YgcHJpbWFyeSBwbGFuZSBvbiBjcnRjCisgKiBAY3J0Y195OiB5IG9mZnNldCBvZiBwcmlt YXJ5IHBsYW5lIG9uIGNydGMKKyAqIEBjcnRjX3c6IHdpZHRoIG9mIHByaW1hcnkgcGxhbmUgcmVj dGFuZ2xlIG9uIGNydGMKKyAqIEBjcnRjX2g6IGhlaWdodCBvZiBwcmltYXJ5IHBsYW5lIHJlY3Rh bmdsZSBvbiBjcnRjCisgKiBAc3JjX3g6IHggb2Zmc2V0IG9mIEBmYiBmb3IgcGFubmluZworICog QHNyY195OiB5IG9mZnNldCBvZiBAZmIgZm9yIHBhbm5pbmcKKyAqIEBzcmNfdzogd2lkdGggb2Yg c291cmNlIHJlY3RhbmdsZSBpbiBAZmIKKyAqIEBzcmNfaDogaGVpZ2h0IG9mIHNvdXJjZSByZWN0 YW5nbGUgaW4gQGZiCisgKiBAY2FuX3NjYWxlOiBpcyBwcmltYXJ5IHBsYW5lIHNjYWxpbmcgbGVn YWw/CisgKiBAY2FuX3Bvc2l0aW9uOiBpcyBpdCBsZWdhbCB0byBwb3NpdGlvbiB0aGUgcHJpbWFy eSBwbGFuZSBzdWNoIHRoYXQgaXQKKyAqICAgICAgICAgICAgICAgIGRvZXNuJ3QgY292ZXIgdGhl IGVudGlyZSBjcnRjPworICoKKyAqIENoZWNrcyB0aGF0IGEgZGVzaXJlZCBwcmltYXJ5IHBsYW5l IHVwZGF0ZSBpcyB2YWxpZC4gIERyaXZlcnMgdGhhdCBwcm92aWRlCisgKiB0aGVpciBvd24gcHJp bWFyeSBwbGFuZSBoYW5kbGluZyBtYXkgc3RpbGwgd2lzaCB0byBjYWxsIHRoaXMgZnVuY3Rpb24g dG8KKyAqIGF2b2lkIGR1cGxpY2F0aW9uIG9mIGVycm9yIGNoZWNraW5nIGNvZGUuCisgKgorICog UkVUVVJOUzoKKyAqIFplcm8gaWYgdXBkYXRlIGFwcGVhcnMgdmFsaWQsIGVycm9yIGNvZGUgb24g ZmFpbHVyZQorICovCitpbnQgZHJtX3ByaW1hcnlfaGVscGVyX2NoZWNrX3VwZGF0ZShzdHJ1Y3Qg ZHJtX3BsYW5lICpwbGFuZSwKKwkJCQkgICAgc3RydWN0IGRybV9jcnRjICpjcnRjLAorCQkJCSAg ICBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiwKKwkJCQkgICAgaW50IGNydGNfeCwgaW50IGNy dGNfeSwKKwkJCQkgICAgdW5zaWduZWQgaW50IGNydGNfdywgdW5zaWduZWQgaW50IGNydGNfaCwK KwkJCQkgICAgdWludDMyX3Qgc3JjX3gsIHVpbnQzMl90IHNyY195LAorCQkJCSAgICB1aW50MzJf dCBzcmNfdywgdWludDMyX3Qgc3JjX2gsCisJCQkJICAgIGJvb2wgY2FuX3NjYWxlLAorCQkJCSAg ICBib29sIGNhbl9wb3NpdGlvbikKK3sKKwlzdHJ1Y3QgZHJtX3JlY3QgZGVzdCA9IHsKKwkJLngx ID0gY3J0Y194LAorCQkueTEgPSBjcnRjX3ksCisJCS54MiA9IGNydGNfeCArIGNydGNfdywKKwkJ LnkyID0gY3J0Y195ICsgY3J0Y19oLAorCX07CisJc3RydWN0IGRybV9yZWN0IHNyYyA9IHsKKwkJ LngxID0gc3JjX3ggPj4gMTYsCisJCS55MSA9IHNyY195ID4+IDE2LAorCQkueDIgPSAoc3JjX3gg KyBzcmNfdykgPj4gMTYsCisJCS55MiA9IChzcmNfeSArIHNyY19oKSA+PiAxNiwKKwl9OworCWNv bnN0IHN0cnVjdCBkcm1fcmVjdCBjbGlwID0geworCQkueDIgPSBjcnRjLT5tb2RlLmhkaXNwbGF5 LAorCQkueTIgPSBjcnRjLT5tb2RlLnZkaXNwbGF5LAorCX07CisJaW50IGhzY2FsZSwgdnNjYWxl OworCWludCB2aXNpYmxlOworCisJaWYgKCFjcnRjLT5lbmFibGVkKSB7CisJCURSTV9ERUJVR19L TVMoIkNhbm5vdCB1cGRhdGUgcHJpbWFyeSBwbGFuZSBvZiBhIGRpc2FibGVkIENSVEMuXG4iKTsK KwkJcmV0dXJuIC1FSU5WQUw7CisJfQorCisJLyogc2V0cGxhbmUgQVBJIHRha2VzIHNoaWZ0ZWQg c291cmNlIHJlY3RhbmdsZSB2YWx1ZXM7IHVuc2hpZnQgdGhlbSAqLworCXNyY194ID4+PSAxNjsK KwlzcmNfeSA+Pj0gMTY7CisJc3JjX3cgPj49IDE2OworCXNyY19oID4+PSAxNjsKKworCS8qIGNo ZWNrIHNjYWxpbmcgKi8KKwlpZiAoIWNhbl9zY2FsZSAmJiAoY3J0Y193ICE9IHNyY193IHx8IGNy dGNfaCAhPSBzcmNfaCkpIHsKKwkJRFJNX0RFQlVHX0tNUygiQ2FuJ3Qgc2NhbGUgcHJpbWFyeSBw bGFuZVxuIik7CisJCXJldHVybiAtRUlOVkFMOworCX0KKworCS8qCisJICogRHJpdmVycyB0aGF0 IGNhbiBzY2FsZSBzaG91bGQgcGVyZm9ybSB0aGVpciBvd24gbWluL21heCBzY2FsZQorCSAqIGZh Y3RvciBjaGVja3MuCisJICovCisJaHNjYWxlID0gZHJtX3JlY3RfY2FsY19oc2NhbGUoJnNyYywg JmRlc3QsIDAsIElOVF9NQVgpOworCXZzY2FsZSA9IGRybV9yZWN0X2NhbGNfdnNjYWxlKCZzcmMs ICZkZXN0LCAwLCBJTlRfTUFYKTsKKwl2aXNpYmxlID0gZHJtX3JlY3RfY2xpcF9zY2FsZWQoJnNy YywgJmRlc3QsICZjbGlwLCBoc2NhbGUsIHZzY2FsZSk7CisJaWYgKCF2aXNpYmxlKQorCQkvKgor CQkgKiBQcmltYXJ5IHBsYW5lIGlzbid0IHZpc2libGU7IHNvbWUgZHJpdmVycyBjYW4gaGFuZGxl IHRoaXMKKwkJICogc28gd2UganVzdCByZXR1cm4gc3VjY2VzcyBoZXJlLiAgRHJpdmVycyB0aGF0 IGNhbid0CisJCSAqIChpbmNsdWRpbmcgdGhvc2UgdGhhdCB1c2UgdGhlIHByaW1hcnkgcGxhbmUg aGVscGVyJ3MKKwkJICogdXBkYXRlIGZ1bmN0aW9uKSB3aWxsIHJldHVybiBhbiBlcnJvciBmcm9t IHRoZWlyCisJCSAqIHVwZGF0ZV9wbGFuZSBoYW5kbGVyLgorCQkgKi8KKwkJcmV0dXJuIDA7CisK KwlpZiAoIWNhbl9wb3NpdGlvbiAmJiAhZHJtX3JlY3RfZXF1YWxzKCZkZXN0LCAmY2xpcCkpIHsK KwkJRFJNX0RFQlVHX0tNUygiUHJpbWFyeSBwbGFuZSBtdXN0IGNvdmVyIGVudGlyZSBDUlRDXG4i KTsKKwkJcmV0dXJuIC1FSU5WQUw7CisJfQorCisJcmV0dXJuIDA7Cit9CitFWFBPUlRfU1lNQk9M KGRybV9wcmltYXJ5X2hlbHBlcl9jaGVja191cGRhdGUpOworCisvKioKICAqIGRybV9wcmltYXJ5 X2hlbHBlcl91cGRhdGUoKSAtIEhlbHBlciBmb3IgcHJpbWFyeSBwbGFuZSB1cGRhdGUKICAqIEBw bGFuZTogcGxhbmUgb2JqZWN0IHRvIHVwZGF0ZQogICogQGNydGM6IG93bmluZyBDUlRDIG9mIG93 bmluZyBwbGFuZQpAQCAtMTEzLDYgKzIwOSwxMiBAQCBpbnQgZHJtX3ByaW1hcnlfaGVscGVyX3Vw ZGF0ZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwgc3RydWN0IGRybV9jcnRjICpjcnRjLAogCQku eCA9IHNyY194ID4+IDE2LAogCQkueSA9IHNyY195ID4+IDE2LAogCX07CisJc3RydWN0IGRybV9y ZWN0IHNyYyA9IHsKKwkJLngxID0gc3JjX3ggPj4gMTYsCisJCS55MSA9IHNyY195ID4+IDE2LAor CQkueDIgPSAoc3JjX3ggKyBzcmNfdykgPj4gMTYsCisJCS55MiA9IChzcmNfeSArIHNyY19oKSA+ PiAxNiwKKwl9OwogCXN0cnVjdCBkcm1fcmVjdCBkZXN0ID0gewogCQkueDEgPSBjcnRjX3gsCiAJ CS55MSA9IGNydGNfeSwKQEAgLTEyNCw0MCArMjI2LDI4IEBAIGludCBkcm1fcHJpbWFyeV9oZWxw ZXJfdXBkYXRlKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLCBzdHJ1Y3QgZHJtX2NydGMgKmNydGMs CiAJCS55MiA9IGNydGMtPm1vZGUudmRpc3BsYXksCiAJfTsKIAlzdHJ1Y3QgZHJtX2Nvbm5lY3Rv ciAqKmNvbm5lY3Rvcl9saXN0OworCWludCB2aXNpYmxlOworCWludCBoc2NhbGUsIHZzY2FsZTsK IAlpbnQgbnVtX2Nvbm5lY3RvcnMsIHJldDsKIAotCWlmICghY3J0Yy0+ZW5hYmxlZCkgewotCQlE Uk1fREVCVUdfS01TKCJDYW5ub3QgdXBkYXRlIHByaW1hcnkgcGxhbmUgb2YgYSBkaXNhYmxlZCBD UlRDLlxuIik7Ci0JCXJldHVybiAtRUlOVkFMOwotCX0KLQotCS8qIERpc2FsbG93IHN1YnBpeGVs IHBvc2l0aW9uaW5nICovCi0JaWYgKChzcmNfeCB8IHNyY195IHwgc3JjX3cgfCBzcmNfaCkgJiBT VUJQSVhFTF9NQVNLKSB7Ci0JCURSTV9ERUJVR19LTVMoIlByaW1hcnkgcGxhbmUgZG9lcyBub3Qg c3VwcG9ydCBzdWJwaXhlbCBwb3NpdGlvbmluZ1xuIik7Ci0JCXJldHVybiAtRUlOVkFMOwotCX0K LQotCS8qIERpc2FsbG93IHNjYWxpbmcgKi8KLQlzcmNfdyA+Pj0gMTY7Ci0Jc3JjX2ggPj49IDE2 OwotCWlmIChjcnRjX3cgIT0gc3JjX3cgfHwgY3J0Y19oICE9IHNyY19oKSB7Ci0JCURSTV9ERUJV R19LTVMoIkNhbid0IHNjYWxlIHByaW1hcnkgcGxhbmVcbiIpOwotCQlyZXR1cm4gLUVJTlZBTDsK LQl9Ci0KLQkvKiBNYWtlIHN1cmUgcHJpbWFyeSBwbGFuZSBjb3ZlcnMgZW50aXJlIENSVEMgKi8K LQlkcm1fcmVjdF9pbnRlcnNlY3QoJmRlc3QsICZjbGlwKTsKLQlpZiAoZGVzdC54MSAhPSAwIHx8 IGRlc3QueTEgIT0gMCB8fAotCSAgICBkZXN0LngyICE9IGNydGMtPm1vZGUuaGRpc3BsYXkgfHwg ZGVzdC55MiAhPSBjcnRjLT5tb2RlLnZkaXNwbGF5KSB7Ci0JCURSTV9ERUJVR19LTVMoIlByaW1h cnkgcGxhbmUgbXVzdCBjb3ZlciBlbnRpcmUgQ1JUQ1xuIik7Ci0JCXJldHVybiAtRUlOVkFMOwot CX0KLQotCS8qIEZyYW1lYnVmZmVyIG11c3QgYmUgYmlnIGVub3VnaCB0byBjb3ZlciBlbnRpcmUg cGxhbmUgKi8KLQlyZXQgPSBkcm1fY3J0Y19jaGVja192aWV3cG9ydChjcnRjLCBjcnRjX3gsIGNy dGNfeSwgJmNydGMtPm1vZGUsIGZiKTsKKwlyZXQgPSBkcm1fcHJpbWFyeV9oZWxwZXJfY2hlY2tf dXBkYXRlKHBsYW5lLCBjcnRjLCBmYiwKKwkJCQkJICAgICAgY3J0Y194LCBjcnRjX3ksIGNydGNf dywgY3J0Y19oLAorCQkJCQkgICAgICBzcmNfeCwgc3JjX3ksIHNyY193LCBzcmNfaCwKKwkJCQkJ ICAgICAgZmFsc2UsIGZhbHNlKTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCisJaHNjYWxl ID0gZHJtX3JlY3RfY2FsY19oc2NhbGUoJnNyYywgJmRlc3QsIDAsIElOVF9NQVgpOworCXZzY2Fs ZSA9IGRybV9yZWN0X2NhbGNfdnNjYWxlKCZzcmMsICZkZXN0LCAwLCBJTlRfTUFYKTsKKwl2aXNp YmxlID0gZHJtX3JlY3RfY2xpcF9zY2FsZWQoJnNyYywgJmRlc3QsICZjbGlwLCBoc2NhbGUsIHZz Y2FsZSk7CisJaWYgKCF2aXNpYmxlKQorCQkvKgorCQkgKiBQcmltYXJ5IHBsYW5lIGlzbid0IHZp c2libGUuICBOb3RlIHRoYXQgdW5sZXNzIGEgZHJpdmVyCisJCSAqIHByb3ZpZGVzIHRoZWlyIG93 biBkaXNhYmxlIGZ1bmN0aW9uLCB0aGlzIHdpbGwganVzdAorCQkgKiB3aW5kIHVwIHJldHVybmlu ZyAtRUlOVkFMIHRvIHVzZXJzcGFjZS4KKwkJICovCisJCXJldHVybiBwbGFuZS0+ZnVuY3MtPmRp c2FibGVfcGxhbmUocGxhbmUpOworCiAJLyogRmluZCBjdXJyZW50IGNvbm5lY3RvcnMgZm9yIENS VEMgKi8KIAludW1fY29ubmVjdG9ycyA9IGdldF9jb25uZWN0b3JzX2Zvcl9jcnRjKGNydGMsIE5V TEwsIDApOwogCUJVR19PTihudW1fY29ubmVjdG9ycyA9PSAwKTsKZGlmZiAtLWdpdCBhL2luY2x1 ZGUvZHJtL2RybV9wbGFuZV9oZWxwZXIuaCBiL2luY2x1ZGUvZHJtL2RybV9wbGFuZV9oZWxwZXIu aAppbmRleCAwOTgyNGJlLi4zNzMyMDFhIDEwMDY0NAotLS0gYS9pbmNsdWRlL2RybS9kcm1fcGxh bmVfaGVscGVyLmgKKysrIGIvaW5jbHVkZS9kcm0vZHJtX3BsYW5lX2hlbHBlci5oCkBAIC0zMSw2 ICszMSwxNSBAQAogICogcGxhbmVzLgogICovCiAKK2V4dGVybiBpbnQgZHJtX3ByaW1hcnlfaGVs cGVyX2NoZWNrX3VwZGF0ZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKKwkJCQkJICAgc3RydWN0 IGRybV9jcnRjICpjcnRjLAorCQkJCQkgICBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiwKKwkJ CQkJICAgaW50IGNydGNfeCwgaW50IGNydGNfeSwKKwkJCQkJICAgdW5zaWduZWQgaW50IGNydGNf dywgdW5zaWduZWQgaW50IGNydGNfaCwKKwkJCQkJICAgdWludDMyX3Qgc3JjX3gsIHVpbnQzMl90 IHNyY195LAorCQkJCQkgICB1aW50MzJfdCBzcmNfdywgdWludDMyX3Qgc3JjX2gsCisJCQkJCSAg IGJvb2wgY2FuX3NjYWxlLAorCQkJCQkgICBib29sIGNhbl9wb3NpdGlvbik7CiBleHRlcm4gaW50 IGRybV9wcmltYXJ5X2hlbHBlcl91cGRhdGUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJCQkJ ICAgICBzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJCQkJICAgICBzdHJ1Y3QgZHJtX2ZyYW1lYnVm ZmVyICpmYiwKLS0gCjEuOC41LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVk ZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8v ZHJpLWRldmVsCg==