From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH v3.6 16/22] drm/i915: Implement intel_crtc_control using atomic state, v4. Date: Tue, 26 May 2015 10:35:22 +0200 Message-ID: <5564304A.8090808@linux.intel.com> References: <1432129094-11765-1-git-send-email-maarten.lankhorst@linux.intel.com> <1432137874-20543-1-git-send-email-maarten.lankhorst@linux.intel.com> <1432137874-20543-7-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 mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 19C4D6E605 for ; Tue, 26 May 2015 01:35:24 -0700 (PDT) In-Reply-To: <1432137874-20543-7-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 Graphics Development List-Id: intel-gfx@lists.freedesktop.org QXNzdW1lIHRoZSBjYWxsZXJzIGxvY2sgZXZlcnl0aGluZyB3aXRoIGRybV9tb2Rlc2V0X2xvY2tf YWxsLgoKVGhpcyBjaGFuZ2UgaGFkIHRvIGJlIGRvbmUgYWZ0ZXIgY29udmVydGluZyBzdXNwZW5k L3Jlc3VtZSB0bwp1c2UgYXRvbWljX3N0YXRlIHNvIHRoZSBhdG9taWMgc3RhdGUgaXMgcHJlc2Vy dmVkLCBvdGhlcndpc2UKYWxsIHRyYW5zaXRpb25hbCBzdGF0ZSBpcyBlcmFzZWQuCgpOb3cgYWxs IGNhbGxlcnMgb2YgLmNydGNfZW5hYmxlIGFuZCAuY3J0Y19kaXNhYmxlIGdvIHRocm91Z2gKYXRv bWljIG1vZGVzZXQhIDotRAoKQ2hhbmdlcyBzaW5jZSB2MToKLSBPbmx5IGNoZWNrIGZvciBjcnRj X3N0YXRlLT5hY3RpdmUgaW4gdmFsbGV5dmlld19tb2Rlc2V0X2dsb2JhbF9waXBlcy4KLSBPbmx5 IGNoZWNrIGZvciBjcnRjX3N0YXRlLT5hY3RpdmUgaW4gbW9kZXNldF91cGRhdGVfY3J0Y19wb3dl cl9kb21haW5zLgpDaGFuZ2VzIHNpbmNlIHYyOgotIFJld29yayBvbiB0b3Agb2YgdGhlIGNoYW5n ZWQgcGF0Y2ggb3JkZXIuCkNoYW5nZXMgc2luY2UgdjM6Ci0gUmVuYW1lIGludGVsX2NydGNfdG9n Z2xlIGluIGRlc2NyaXB0aW9uIHRvICpfY29udHJvbAotIENoYW5nZSByZXR1cm4gdmFsdWUgdG8g aW50LgotIERvIG5vdCBhZGQgcGxhbmUgc3RhdGUsIHNob3VsZCBiZSBkb25lIGltcGxpY2l0bHkg YWxyZWFkeS4KClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmto b3JzdEBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz cGxheS5jIHwgNTMgKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCAgICAgfCAgMiArLQogMiBmaWxlcyBjaGFuZ2VkLCAz MyBpbnNlcnRpb25zKCspLCAyMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k aXNwbGF5LmMKaW5kZXggZTk2ODBlYjg1YmQwLi4zMmJhYjI4NDMyZjcgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTU5NzMsMzggKzU5NzMsNDkgQEAgdm9pZCBpbnRlbF9k aXNwbGF5X3N1c3BlbmQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIH0KIAogLyogTWFzdGVyIGZ1 bmN0aW9uIHRvIGVuYWJsZS9kaXNhYmxlIENSVEMgYW5kIGNvcnJlc3BvbmRpbmcgcG93ZXIgd2Vs bHMgKi8KLXZvaWQgaW50ZWxfY3J0Y19jb250cm9sKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywgYm9v bCBlbmFibGUpCitpbnQgaW50ZWxfY3J0Y19jb250cm9sKHN0cnVjdCBkcm1fY3J0YyAqY3J0Yywg Ym9vbCBlbmFibGUpCiB7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmRldjsKLQlz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOworCXN0 cnVjdCBkcm1fbW9kZV9jb25maWcgKmNvbmZpZyA9ICZkZXYtPm1vZGVfY29uZmlnOworCXN0cnVj dCBkcm1fbW9kZXNldF9hY3F1aXJlX2N0eCAqY3R4ID0gY29uZmlnLT5hY3F1aXJlX2N0eDsKIAlz dHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7Ci0JZW51 bSBpbnRlbF9kaXNwbGF5X3Bvd2VyX2RvbWFpbiBkb21haW47Ci0JdW5zaWduZWQgbG9uZyBkb21h aW5zOworCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpwaXBlX2NvbmZpZzsKKwlzdHJ1Y3QgZHJt X2F0b21pY19zdGF0ZSAqc3RhdGU7CisJaW50IHJldDsKIAogCWlmIChlbmFibGUgPT0gaW50ZWxf Y3J0Yy0+YWN0aXZlKQotCQlyZXR1cm47CisJCXJldHVybiAwOwogCiAJaWYgKGVuYWJsZSAmJiAh Y3J0Yy0+c3RhdGUtPmVuYWJsZSkKLQkJcmV0dXJuOworCQlyZXR1cm4gMDsKIAotCWNydGMtPnN0 YXRlLT5hY3RpdmUgPSBlbmFibGU7Ci0JaWYgKGVuYWJsZSkgewotCQlkb21haW5zID0gZ2V0X2Ny dGNfcG93ZXJfZG9tYWlucyhjcnRjKTsKLQkJZm9yX2VhY2hfcG93ZXJfZG9tYWluKGRvbWFpbiwg ZG9tYWlucykKLQkJCWludGVsX2Rpc3BsYXlfcG93ZXJfZ2V0KGRldl9wcml2LCBkb21haW4pOwot CQlpbnRlbF9jcnRjLT5lbmFibGVkX3Bvd2VyX2RvbWFpbnMgPSBkb21haW5zOworCS8qIHRoaXMg ZnVuY3Rpb24gc2hvdWxkIGJlIGNhbGxlZCB3aXRoIGRybV9tb2Rlc2V0X2xvY2tfYWxsIGZvciBu b3cgKi8KKwlpZiAoV0FSTl9PTighY3R4KSkKKwkJcmV0dXJuIC1FSU87CisJbG9ja2RlcF9hc3Nl cnRfaGVsZCgmY3R4LT53d19jdHgpOwogCi0JCWRldl9wcml2LT5kaXNwbGF5LmNydGNfZW5hYmxl KGNydGMpOwotCQlpbnRlbF9jcnRjX2VuYWJsZV9wbGFuZXMoY3J0Yyk7Ci0JfSBlbHNlIHsKLQkJ aW50ZWxfY3J0Y19kaXNhYmxlX3BsYW5lcyhjcnRjKTsKLQkJZGV2X3ByaXYtPmRpc3BsYXkuY3J0 Y19kaXNhYmxlKGNydGMpOworCXN0YXRlID0gZHJtX2F0b21pY19zdGF0ZV9hbGxvYyhkZXYpOwor CWlmIChXQVJOX09OKCFzdGF0ZSkpCisJCXJldHVybiAtRU5PTUVNOwogCi0JCWRvbWFpbnMgPSBp bnRlbF9jcnRjLT5lbmFibGVkX3Bvd2VyX2RvbWFpbnM7Ci0JCWZvcl9lYWNoX3Bvd2VyX2RvbWFp bihkb21haW4sIGRvbWFpbnMpCi0JCQlpbnRlbF9kaXNwbGF5X3Bvd2VyX3B1dChkZXZfcHJpdiwg ZG9tYWluKTsKLQkJaW50ZWxfY3J0Yy0+ZW5hYmxlZF9wb3dlcl9kb21haW5zID0gMDsKKwlzdGF0 ZS0+YWNxdWlyZV9jdHggPSBjdHg7CisJc3RhdGUtPmFsbG93X21vZGVzZXQgPSB0cnVlOworCisJ cGlwZV9jb25maWcgPSBpbnRlbF9hdG9taWNfZ2V0X2NydGNfc3RhdGUoc3RhdGUsIGludGVsX2Ny dGMpOworCWlmIChJU19FUlIocGlwZV9jb25maWcpKSB7CisJCXJldCA9IFBUUl9FUlIocGlwZV9j b25maWcpOworCQlnb3RvIGVycjsKIAl9CisJcGlwZV9jb25maWctPmJhc2UuYWN0aXZlID0gZW5h YmxlOworCisJcmV0ID0gaW50ZWxfc2V0X21vZGUoc3RhdGUpOworCWlmICghcmV0KQorCQlyZXR1 cm4gcmV0OworCitlcnI6CisJRFJNX0VSUk9SKCJVcGRhdGluZyBjcnRjIGFjdGl2ZSBmYWlsZWQg d2l0aCAlaVxuIiwgcmV0KTsKKwlkcm1fYXRvbWljX3N0YXRlX2ZyZWUoc3RhdGUpOworCXJldHVy biByZXQ7CiB9CiAKIC8qKgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCA2MGEyOWZmNjVm MWYuLmMxMTNmMTg3MDkwZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAgLTk4OSw3ICs5 ODksNyBAQCB2b2lkIGludGVsX21hcmtfYnVzeShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKIHZv aWQgaW50ZWxfbWFya19pZGxlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogdm9pZCBpbnRlbF9j cnRjX3Jlc3RvcmVfbW9kZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpOwogdm9pZCBpbnRlbF9kaXNw bGF5X3N1c3BlbmQoc3RydWN0IGRybV9kZXZpY2UgKmRldik7Ci12b2lkIGludGVsX2NydGNfY29u dHJvbChzdHJ1Y3QgZHJtX2NydGMgKmNydGMsIGJvb2wgZW5hYmxlKTsKK2ludCBpbnRlbF9jcnRj X2NvbnRyb2woc3RydWN0IGRybV9jcnRjICpjcnRjLCBib29sIGVuYWJsZSk7CiB2b2lkIGludGVs X2NydGNfdXBkYXRlX2RwbXMoc3RydWN0IGRybV9jcnRjICpjcnRjKTsKIHZvaWQgaW50ZWxfZW5j b2Rlcl9kZXN0cm95KHN0cnVjdCBkcm1fZW5jb2RlciAqZW5jb2Rlcik7CiBpbnQgaW50ZWxfY29u bmVjdG9yX2luaXQoc3RydWN0IGludGVsX2Nvbm5lY3RvciAqKTsKLS0gCjIuMS4wCgoKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxp bmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK