From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH 14/24] drm/i915: Move crtc commit updates to separate functions. Date: Mon, 1 Jun 2015 15:27:17 +0200 Message-ID: <1433165247-15928-15-git-send-email-maarten.lankhorst@linux.intel.com> References: <1433165247-15928-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 E84716E608 for ; Mon, 1 Jun 2015 06:27:44 -0700 (PDT) In-Reply-To: <1433165247-15928-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 VG8gYWxsb3cgdGhlbSB0byBiZSB1c2VkIGluIGludGVsX3NldF9tb2RlLgoKU2lnbmVkLW9mZi1i eTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4K LS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAxMzAgKysrKysrKysr KysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA3MSBpbnNlcnRpb25z KCspLCA1OSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5k ZXggMzU5M2ExNzJkOWVhLi5kZWYyNjg4OWE1OGYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k aXNwbGF5LmMKQEAgLTQ3NDQsNiArNDc0NCw3NSBAQCBpbnRlbF9wcmVfZGlzYWJsZV9wcmltYXJ5 KHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAloc3dfZGlzYWJsZV9pcHMoaW50ZWxfY3J0Yyk7CiB9 CiAKK3N0YXRpYyB2b2lkIGludGVsX3Bvc3RfcGxhbmVfdXBkYXRlKHN0cnVjdCBpbnRlbF9jcnRj ICpjcnRjKQoreworCXN0cnVjdCBpbnRlbF9jcnRjX2F0b21pY19jb21taXQgKmF0b21pYyA9ICZj cnRjLT5hdG9taWM7CisJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmJhc2UuZGV2Owor CXN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lOworCisJaWYgKGF0b21pYy0+d2FpdF92YmxhbmspCisJ CWludGVsX3dhaXRfZm9yX3ZibGFuayhkZXYsIGNydGMtPnBpcGUpOworCisJaW50ZWxfZnJvbnRi dWZmZXJfZmxpcChkZXYsIGF0b21pYy0+ZmJfYml0cyk7CisKKwlpZiAoYXRvbWljLT51cGRhdGVf ZmJjKSB7CisJCW11dGV4X2xvY2soJmRldi0+c3RydWN0X211dGV4KTsKKwkJaW50ZWxfZmJjX3Vw ZGF0ZShkZXYpOworCQltdXRleF91bmxvY2soJmRldi0+c3RydWN0X211dGV4KTsKKwl9CisKKwlp ZiAoYXRvbWljLT5wb3N0X2VuYWJsZV9wcmltYXJ5KQorCQlpbnRlbF9wb3N0X2VuYWJsZV9wcmlt YXJ5KCZjcnRjLT5iYXNlKTsKKworCWRybV9mb3JfZWFjaF9wbGFuZV9tYXNrKHBsYW5lLCBkZXYs IGF0b21pYy0+dXBkYXRlX3Nwcml0ZV93YXRlcm1hcmtzKQorCQlpbnRlbF91cGRhdGVfc3ByaXRl X3dhdGVybWFya3MocGxhbmUsICZjcnRjLT5iYXNlLAorCQkJCQkgICAgICAgMCwgMCwgMCwgZmFs c2UsIGZhbHNlKTsKKworCW1lbXNldChhdG9taWMsIDAsIHNpemVvZigqYXRvbWljKSk7Cit9CisK K3N0YXRpYyB2b2lkIGludGVsX3ByZV9wbGFuZV91cGRhdGUoc3RydWN0IGludGVsX2NydGMgKmNy dGMpCit7CisJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmJhc2UuZGV2OworCXN0cnVj dCBpbnRlbF9jcnRjX2F0b21pY19jb21taXQgKmF0b21pYyA9ICZjcnRjLT5hdG9taWM7CisJc3Ry dWN0IGRybV9wbGFuZSAqcDsKKworCS8qIFRyYWNrIGZiJ3MgZm9yIGFueSBwbGFuZXMgYmVpbmcg ZGlzYWJsZWQgKi8KKworCWRybV9mb3JfZWFjaF9wbGFuZV9tYXNrKHAsIGRldiwgYXRvbWljLT5k aXNhYmxlZF9wbGFuZXMpIHsKKwkJc3RydWN0IGludGVsX3BsYW5lICpwbGFuZSA9IHRvX2ludGVs X3BsYW5lKHApOworCQl1bnNpZ25lZCBmYl9iaXRzID0gMDsKKworCQlzd2l0Y2ggKHAtPnR5cGUp IHsKKwkJY2FzZSBEUk1fUExBTkVfVFlQRV9QUklNQVJZOgorCQkJZmJfYml0cyA9IElOVEVMX0ZS T05UQlVGRkVSX1BSSU1BUlkocGxhbmUtPnBpcGUpOworCQkJYnJlYWs7CisJCWNhc2UgRFJNX1BM QU5FX1RZUEVfQ1VSU09SOgorCQkJZmJfYml0cyA9IElOVEVMX0ZST05UQlVGRkVSX0NVUlNPUihw bGFuZS0+cGlwZSk7CisJCQlicmVhazsKKwkJY2FzZSBEUk1fUExBTkVfVFlQRV9PVkVSTEFZOgor CQkJZmJfYml0cyA9IElOVEVMX0ZST05UQlVGRkVSX1NQUklURShwbGFuZS0+cGlwZSk7CisJCQli cmVhazsKKwkJfQorCisJCW11dGV4X2xvY2soJmRldi0+c3RydWN0X211dGV4KTsKKwkJaTkxNV9n ZW1fdHJhY2tfZmIoaW50ZWxfZmJfb2JqKHBsYW5lLT5iYXNlLmZiKSwgTlVMTCwgZmJfYml0cyk7 CisJCW11dGV4X3VubG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOworCX0KKworCWlmIChhdG9taWMt PndhaXRfZm9yX2ZsaXBzKQorCQlpbnRlbF9jcnRjX3dhaXRfZm9yX3BlbmRpbmdfZmxpcHMoJmNy dGMtPmJhc2UpOworCisJaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuID49IDkpCisJCXNrbF9kZXRh Y2hfc2NhbGVycyhjcnRjKTsKKworCWlmIChhdG9taWMtPmRpc2FibGVfZmJjKQorCQlpbnRlbF9m YmNfZGlzYWJsZShkZXYpOworCisJaWYgKGF0b21pYy0+cHJlX2Rpc2FibGVfcHJpbWFyeSkKKwkJ aW50ZWxfcHJlX2Rpc2FibGVfcHJpbWFyeSgmY3J0Yy0+YmFzZSk7Cit9CisKIHN0YXRpYyB2b2lk IGludGVsX2NydGNfZW5hYmxlX3BsYW5lcyhzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiB7CiAJc3Ry dWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmRldjsKQEAgLTEzNDUzLDQ1ICsxMzUyMiw4IEBA IHN0YXRpYyB2b2lkIGludGVsX2JlZ2luX2NydGNfY29tbWl0KHN0cnVjdCBkcm1fY3J0YyAqY3J0 YykKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRl OwogCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsK IAlzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGUgPSBpbnRlbF9jcnRjLT5iYXNlLnN0 YXRlOwotCXN0cnVjdCBpbnRlbF9wbGFuZSAqaW50ZWxfcGxhbmU7Ci0Jc3RydWN0IGRybV9wbGFu ZSAqcDsKLQl1bnNpZ25lZCBmYl9iaXRzID0gMDsKLQotCS8qIFRyYWNrIGZiJ3MgZm9yIGFueSBw bGFuZXMgYmVpbmcgZGlzYWJsZWQgKi8KLQlsaXN0X2Zvcl9lYWNoX2VudHJ5KHAsICZkZXYtPm1v ZGVfY29uZmlnLnBsYW5lX2xpc3QsIGhlYWQpIHsKLQkJaW50ZWxfcGxhbmUgPSB0b19pbnRlbF9w bGFuZShwKTsKLQotCQlpZiAoaW50ZWxfY3J0Yy0+YXRvbWljLmRpc2FibGVkX3BsYW5lcyAmCi0J CSAgICAoMSA8PCBkcm1fcGxhbmVfaW5kZXgocCkpKSB7Ci0JCQlzd2l0Y2ggKHAtPnR5cGUpIHsK LQkJCWNhc2UgRFJNX1BMQU5FX1RZUEVfUFJJTUFSWToKLQkJCQlmYl9iaXRzID0gSU5URUxfRlJP TlRCVUZGRVJfUFJJTUFSWShpbnRlbF9wbGFuZS0+cGlwZSk7Ci0JCQkJYnJlYWs7Ci0JCQljYXNl IERSTV9QTEFORV9UWVBFX0NVUlNPUjoKLQkJCQlmYl9iaXRzID0gSU5URUxfRlJPTlRCVUZGRVJf Q1VSU09SKGludGVsX3BsYW5lLT5waXBlKTsKLQkJCQlicmVhazsKLQkJCWNhc2UgRFJNX1BMQU5F X1RZUEVfT1ZFUkxBWToKLQkJCQlmYl9iaXRzID0gSU5URUxfRlJPTlRCVUZGRVJfU1BSSVRFKGlu dGVsX3BsYW5lLT5waXBlKTsKLQkJCQlicmVhazsKLQkJCX0KLQotCQkJbXV0ZXhfbG9jaygmZGV2 LT5zdHJ1Y3RfbXV0ZXgpOwotCQkJaTkxNV9nZW1fdHJhY2tfZmIoaW50ZWxfZmJfb2JqKHAtPmZi KSwgTlVMTCwgZmJfYml0cyk7Ci0JCQltdXRleF91bmxvY2soJmRldi0+c3RydWN0X211dGV4KTsK LQkJfQotCX0KLQotCWlmIChpbnRlbF9jcnRjLT5hdG9taWMud2FpdF9mb3JfZmxpcHMpCi0JCWlu dGVsX2NydGNfd2FpdF9mb3JfcGVuZGluZ19mbGlwcyhjcnRjKTsKLQotCWlmIChJTlRFTF9JTkZP KGRldiktPmdlbiA+PSA5KQotCQlza2xfZGV0YWNoX3NjYWxlcnModG9faW50ZWxfY3J0YyhjcnRj KSk7CiAKLQlpZiAoaW50ZWxfY3J0Yy0+YXRvbWljLmRpc2FibGVfZmJjKQotCQlpbnRlbF9mYmNf ZGlzYWJsZShkZXYpOwotCi0JaWYgKGludGVsX2NydGMtPmF0b21pYy5wcmVfZGlzYWJsZV9wcmlt YXJ5KQotCQlpbnRlbF9wcmVfZGlzYWJsZV9wcmltYXJ5KGNydGMpOworCWludGVsX3ByZV9wbGFu ZV91cGRhdGUoaW50ZWxfY3J0Yyk7CiAKIAlpZiAoaW50ZWxfY3J0Yy0+YXRvbWljLnVwZGF0ZV93 bSkKIAkJaW50ZWxfdXBkYXRlX3dhdGVybWFya3MoY3J0Yyk7CkBAIC0xMzUyMiw3ICsxMzU1NCw2 IEBAIHN0YXRpYyB2b2lkIGludGVsX2ZpbmlzaF9jcnRjX2NvbW1pdChzdHJ1Y3QgZHJtX2NydGMg KmNydGMpCiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmRldjsKIAlzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCXN0cnVjdCBpbnRl bF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKLQlzdHJ1Y3QgZHJtX3Bs YW5lICpwOwogCiAJaWYgKGludGVsX2NydGMtPmF0b21pYy5ldmFkZSkKIAkJaW50ZWxfcGlwZV91 cGRhdGVfZW5kKGludGVsX2NydGMsCkBAIC0xMzUzMCwyNiArMTM1NjEsNyBAQCBzdGF0aWMgdm9p ZCBpbnRlbF9maW5pc2hfY3J0Y19jb21taXQoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCiAJaW50 ZWxfcnVudGltZV9wbV9wdXQoZGV2X3ByaXYpOwogCi0JaWYgKGludGVsX2NydGMtPmF0b21pYy53 YWl0X3ZibGFuayAmJiBpbnRlbF9jcnRjLT5hY3RpdmUpCi0JCWludGVsX3dhaXRfZm9yX3ZibGFu ayhkZXYsIGludGVsX2NydGMtPnBpcGUpOwotCi0JaW50ZWxfZnJvbnRidWZmZXJfZmxpcChkZXYs IGludGVsX2NydGMtPmF0b21pYy5mYl9iaXRzKTsKLQotCWlmIChpbnRlbF9jcnRjLT5hdG9taWMu dXBkYXRlX2ZiYykgewotCQltdXRleF9sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7Ci0JCWludGVs X2ZiY191cGRhdGUoZGV2KTsKLQkJbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7Ci0J fQotCi0JaWYgKGludGVsX2NydGMtPmF0b21pYy5wb3N0X2VuYWJsZV9wcmltYXJ5KQotCQlpbnRl bF9wb3N0X2VuYWJsZV9wcmltYXJ5KGNydGMpOwotCi0JZHJtX2Zvcl9lYWNoX2xlZ2FjeV9wbGFu ZShwLCAmZGV2LT5tb2RlX2NvbmZpZy5wbGFuZV9saXN0KQotCQlpZiAoaW50ZWxfY3J0Yy0+YXRv bWljLnVwZGF0ZV9zcHJpdGVfd2F0ZXJtYXJrcyAmIGRybV9wbGFuZV9pbmRleChwKSkKLQkJCWlu dGVsX3VwZGF0ZV9zcHJpdGVfd2F0ZXJtYXJrcyhwLCBjcnRjLCAwLCAwLCAwLAotCQkJCQkJICAg ICAgIGZhbHNlLCBmYWxzZSk7Ci0KLQltZW1zZXQoJmludGVsX2NydGMtPmF0b21pYywgMCwgc2l6 ZW9mKGludGVsX2NydGMtPmF0b21pYykpOworCWludGVsX3Bvc3RfcGxhbmVfdXBkYXRlKGludGVs X2NydGMpOwogfQogCiAvKioKLS0gCjIuMS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0 cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xp c3RpbmZvL2ludGVsLWdmeAo=