From: Maarten Lankhorst Subject: [PATCH 05/13] drm/i915: Make skl_detach_scalers take crtc_state Date: Wed, 3 Oct 2018 15:37:07 +0200 Message-ID: <20181003133715.3713-6-maarten.lankhorst@linux.intel.com> References: <20181003133715.3713-1-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 [IPv6:2a02:2308::216:3eff:fe92:dfa3]) by gabe.freedesktop.org (Postfix) with ESMTPS id 47CE76E4AB for ; Wed, 3 Oct 2018 13:37:19 +0000 (UTC) In-Reply-To: <20181003133715.3713-1-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 U2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4 LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAx MiArKysrKystLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA2IGluc2VydGlvbnMoKyksIDYgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IDkxNTc0YWJhZmI2 NS4uNTY3ODRhZTI2MzY5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k aXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0z NTAyLDEzICszNTAyLDEzIEBAIHN0YXRpYyB2b2lkIHNrbF9kZXRhY2hfc2NhbGVyKHN0cnVjdCBp bnRlbF9jcnRjICppbnRlbF9jcnRjLCBpbnQgaWQpCiAvKgogICogVGhpcyBmdW5jdGlvbiBkZXRh Y2hlcyAoYWthLiB1bmJpbmRzKSB1bnVzZWQgc2NhbGVycyBpbiBoYXJkd2FyZQogICovCi1zdGF0 aWMgdm9pZCBza2xfZGV0YWNoX3NjYWxlcnMoc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMp CitzdGF0aWMgdm9pZCBza2xfZGV0YWNoX3NjYWxlcnMoY29uc3Qgc3RydWN0IGludGVsX2NydGNf c3RhdGUgKmNydGNfc3RhdGUpCiB7Ci0Jc3RydWN0IGludGVsX2NydGNfc2NhbGVyX3N0YXRlICpz Y2FsZXJfc3RhdGU7CisJc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9j cnRjKGNydGNfc3RhdGUtPmJhc2UuY3J0Yyk7CisJY29uc3Qgc3RydWN0IGludGVsX2NydGNfc2Nh bGVyX3N0YXRlICpzY2FsZXJfc3RhdGUgPQorCQkmY3J0Y19zdGF0ZS0+c2NhbGVyX3N0YXRlOwog CWludCBpOwogCi0Jc2NhbGVyX3N0YXRlID0gJmludGVsX2NydGMtPmNvbmZpZy0+c2NhbGVyX3N0 YXRlOwotCiAJLyogbG9vcCB0aHJvdWdoIGFuZCBkaXNhYmxlIHNjYWxlcnMgdGhhdCBhcmVuJ3Qg aW4gdXNlICovCiAJZm9yIChpID0gMDsgaSA8IGludGVsX2NydGMtPm51bV9zY2FsZXJzOyBpKysp IHsKIAkJaWYgKCFzY2FsZXJfc3RhdGUtPnNjYWxlcnNbaV0uaW5fdXNlKQpAQCAtMzkxNiw3ICsz OTE2LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfdXBkYXRlX3BpcGVfY29uZmlnKGNvbnN0IHN0cnVj dCBpbnRlbF9jcnRjX3N0YXRlICpvbGRfY3J0Y19zdGEKIAogCS8qIG9uIHNreWxha2UgdGhpcyBp cyBkb25lIGJ5IGRldGFjaGluZyBzY2FsZXJzICovCiAJaWYgKElOVEVMX0dFTihkZXZfcHJpdikg Pj0gOSkgewotCQlza2xfZGV0YWNoX3NjYWxlcnMoY3J0Yyk7CisJCXNrbF9kZXRhY2hfc2NhbGVy cyhuZXdfY3J0Y19zdGF0ZSk7CiAKIAkJaWYgKG5ld19jcnRjX3N0YXRlLT5wY2hfcGZpdC5lbmFi bGVkKQogCQkJc2t5bGFrZV9wZml0X2VuYWJsZShuZXdfY3J0Y19zdGF0ZSk7CkBAIC0xMzMzNSw3 ICsxMzMzNSw3IEBAIHN0YXRpYyB2b2lkIGludGVsX2JlZ2luX2NydGNfY29tbWl0KHN0cnVjdCBk cm1fY3J0YyAqY3J0YywKIAlpZiAoaW50ZWxfY3N0YXRlLT51cGRhdGVfcGlwZSkKIAkJaW50ZWxf dXBkYXRlX3BpcGVfY29uZmlnKG9sZF9pbnRlbF9jc3RhdGUsIGludGVsX2NzdGF0ZSk7CiAJZWxz ZSBpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA5KQotCQlza2xfZGV0YWNoX3NjYWxlcnMoaW50 ZWxfY3J0Yyk7CisJCXNrbF9kZXRhY2hfc2NhbGVycyhpbnRlbF9jc3RhdGUpOwogCiBvdXQ6CiAJ aWYgKGRldl9wcml2LT5kaXNwbGF5LmF0b21pY191cGRhdGVfd2F0ZXJtYXJrcykKLS0gCjIuMTku MAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwt Z2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8v bGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==