From: Maarten Lankhorst Subject: [PATCH v3 11/19] drm/i915: move detaching scalers to begin_crtc_commit, v2. Date: Mon, 15 Jun 2015 12:33:48 +0200 Message-ID: <1434364436-6366-12-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 7ECC36E737 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 VGhpcyBpcyBwcm9iYWJseSBpbnRlbmRlZCB0byBiZSBiZSBkb25lIGR1cmluZyB2YmxhbmsgZXZh c2lvbi4KClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3Jz dEBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWlj LmMgIHwgMyAtLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDggKysr Ky0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oICAgICB8IDEgLQogMyBmaWxl cyBjaGFuZ2VkLCA0IGluc2VydGlvbnMoKyksIDggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9hdG9taWMuYwppbmRleCBkNWFmYzJhYTRhYzcuLmMxMjYzYmU4Yzk4YiAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljLmMKQEAgLTE0NCw5ICsxNDQsNiBAQCBpbnQgaW50ZWxf YXRvbWljX2NvbW1pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCWZvcl9lYWNoX2NydGNfaW5f c3RhdGUoc3RhdGUsIGNydGMsIGNydGNfc3RhdGUsIGkpIHsKIAkJdG9faW50ZWxfY3J0YyhjcnRj KS0+Y29uZmlnID0gdG9faW50ZWxfY3J0Y19zdGF0ZShjcnRjLT5zdGF0ZSk7CiAKLQkJaWYgKElO VEVMX0lORk8oZGV2KS0+Z2VuID49IDkpCi0JCQlza2xfZGV0YWNoX3NjYWxlcnModG9faW50ZWxf Y3J0YyhjcnRjKSk7Ci0KIAkJZHJtX2F0b21pY19oZWxwZXJfY29tbWl0X3BsYW5lc19vbl9jcnRj KGNydGNfc3RhdGUpOwogCX0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4 IGE2NWMxMDY1ZGVjZi4uNWU3N2MyOTc0Mjg4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz cGxheS5jCkBAIC0yOTE1LDE2ICsyOTE1LDEzIEBAIHVuc2lnbmVkIGxvbmcgaW50ZWxfcGxhbmVf b2JqX29mZnNldChzdHJ1Y3QgaW50ZWxfcGxhbmUgKmludGVsX3BsYW5lLAogLyoKICAqIFRoaXMg ZnVuY3Rpb24gZGV0YWNoZXMgKGFrYS4gdW5iaW5kcykgdW51c2VkIHNjYWxlcnMgaW4gaGFyZHdh cmUKICAqLwotdm9pZCBza2xfZGV0YWNoX3NjYWxlcnMoc3RydWN0IGludGVsX2NydGMgKmludGVs X2NydGMpCitzdGF0aWMgdm9pZCBza2xfZGV0YWNoX3NjYWxlcnMoc3RydWN0IGludGVsX2NydGMg KmludGVsX2NydGMpCiB7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldjsKIAlzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXY7CiAJc3RydWN0IGludGVsX2NydGNfc2NhbGVyX3N0YXRlICpz Y2FsZXJfc3RhdGU7CiAJaW50IGk7CiAKLQlpZiAoIWludGVsX2NydGMgfHwgIWludGVsX2NydGMt PmNvbmZpZykKLQkJcmV0dXJuOwotCiAJZGV2ID0gaW50ZWxfY3J0Yy0+YmFzZS5kZXY7CiAJZGV2 X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCXNjYWxlcl9zdGF0ZSA9ICZpbnRlbF9jcnRjLT5j b25maWctPnNjYWxlcl9zdGF0ZTsKQEAgLTEzODE5LDYgKzEzODE2LDkgQEAgc3RhdGljIHZvaWQg aW50ZWxfYmVnaW5fY3J0Y19jb21taXQoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCQlpbnRlbF9j cnRjLT5hdG9taWMuZXZhZGUgPQogCQkJaW50ZWxfcGlwZV91cGRhdGVfc3RhcnQoaW50ZWxfY3J0 YywKIAkJCQkJCSZpbnRlbF9jcnRjLT5hdG9taWMuc3RhcnRfdmJsX2NvdW50KTsKKworCWlmICgh bmVlZHNfbW9kZXNldChjcnRjLT5zdGF0ZSkgJiYgSU5URUxfSU5GTyhkZXYpLT5nZW4gPj0gOSkK KwkJc2tsX2RldGFjaF9zY2FsZXJzKGludGVsX2NydGMpOwogfQogCiBzdGF0aWMgdm9pZCBpbnRl bF9maW5pc2hfY3J0Y19jb21taXQoc3RydWN0IGRybV9jcnRjICpjcnRjLApkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kcnYuaAppbmRleCBiYWY1N2IzYjEzNmYuLjgxMzk4ZTI3OWJmYiAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZHJ2LmgKQEAgLTExNDYsNyArMTE0Niw2IEBAIHZvaWQgaW50ZWxfbW9kZV9mcm9t X3BpcGVfY29uZmlnKHN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICptb2RlLAogCQkJCSBzdHJ1Y3Qg aW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9jb25maWcpOwogdm9pZCBpbnRlbF9jcnRjX3dhaXRfZm9y X3BlbmRpbmdfZmxpcHMoc3RydWN0IGRybV9jcnRjICpjcnRjKTsKIHZvaWQgaW50ZWxfbW9kZXNl dF9wcmVjbG9zZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUp Owotdm9pZCBza2xfZGV0YWNoX3NjYWxlcnMoc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMp OwogCiBpbnQgc2tsX3VwZGF0ZV9zY2FsZXJfY3J0YyhzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAq Y3J0Y19zdGF0ZSwgaW50IGZvcmNlX2RldGFjaCk7CiBpbnQgc2tsX21heF9zY2FsZShzdHJ1Y3Qg aW50ZWxfY3J0YyAqY3J0Yywgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpOwot LSAKMi4xLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo dHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==