From: Ville Syrjala Subject: [PATCH v4 07/11] drm/i915: Move plane_state->scaler_id initialization into intel_create_plane_state() Date: Fri, 5 Oct 2018 15:58:13 +0300 Message-ID: <20181005125817.22576-8-ville.syrjala@linux.intel.com> References: <20181005125817.22576-1-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id E03956E7FD for ; Fri, 5 Oct 2018 12:58:40 +0000 (UTC) In-Reply-To: <20181005125817.22576-1-ville.syrjala@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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCk5v IHBvaW50IGluIGhhdmluZyBlYWNoIGNhbGxlciBvZiBpbnRlbF9jcmVhdGVfcGxhbmVfc3RhdGUo KSBpbml0aWFsaXplCnRoZSBzY2FsZXJfaWQgdG8gLTEuIEluc3RlYWQganVzdCBkbyBpdCBpbiBp bnRlbF9jcmVhdGVfcGxhbmVfc3RhdGUoKS4KClByZXZpb3VzbHkgd2UgbGVmdCBzY2FsZXJfaWQg YXQgMCBmb3IgcHJlLVNLTCBwbGF0Zm9ybXMsIGJ1dCBJIGNhbid0CnNlZSBob3cgaW5pdGlhbGl6 aW5nIGl0IHRvIC0xIGFsd2F5cyB3b3VsZCBjYXVzZSBhbnkgaGFybS4KClNpZ25lZC1vZmYtYnk6 IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+ClJldmlld2Vk LWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KUmV2aWV3ZWQtYnk6 IFN0YW5pc2xhdiBMaXNvdnNraXkgPHN0YW5pc2xhdi5saXNvdnNraXlAaW50ZWwuY29tPgotLS0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F0b21pY19wbGFuZS5jIHwgMSArCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgICAgICB8IDUgLS0tLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jICAgICAgIHwgMiAtLQogMyBmaWxlcyBjaGFuZ2VkLCAx IGluc2VydGlvbigrKSwgNyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9hdG9taWNfcGxhbmUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2F0b21pY19wbGFuZS5jCmluZGV4IDk4NGJjMWYyNjYyNS4uYjk1N2FkNjNjZDg3IDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWNfcGxhbmUuYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWNfcGxhbmUuYwpAQCAtNTYsNiArNTYsNyBAQCBp bnRlbF9jcmVhdGVfcGxhbmVfc3RhdGUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUpCiAKIAlzdGF0 ZS0+YmFzZS5wbGFuZSA9IHBsYW5lOwogCXN0YXRlLT5iYXNlLnJvdGF0aW9uID0gRFJNX01PREVf Uk9UQVRFXzA7CisJc3RhdGUtPnNjYWxlcl9pZCA9IC0xOwogCiAJcmV0dXJuIHN0YXRlOwogfQpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IGViNjFlYWI1NTA3NC4uNjY3OWFl NzUwOWZjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0xMzc1OCw4ICsx Mzc1OCw2IEBAIGludGVsX3ByaW1hcnlfcGxhbmVfY3JlYXRlKHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiwgZW51bSBwaXBlIHBpcGUpCiAKIAlwcmltYXJ5LT5iYXNlLnN0YXRlID0g JnN0YXRlLT5iYXNlOwogCi0JaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gOSkKLQkJc3RhdGUt PnNjYWxlcl9pZCA9IC0xOwogCXByaW1hcnktPnBpcGUgPSBwaXBlOwogCS8qCiAJICogT24gZ2Vu Mi8zIG9ubHkgcGxhbmUgQSBjYW4gZG8gRkJDLCBidXQgdGhlIHBhbmVsIGZpdHRlciBhbmQgTFZE UwpAQCAtMTM5ODEsOSArMTM5NzksNiBAQCBpbnRlbF9jdXJzb3JfcGxhbmVfY3JlYXRlKHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCQkJCSAgIERSTV9NT0RFX1JPVEFURV8w IHwKIAkJCQkJCSAgIERSTV9NT0RFX1JPVEFURV8xODApOwogCi0JaWYgKElOVEVMX0dFTihkZXZf cHJpdikgPj0gOSkKLQkJc3RhdGUtPnNjYWxlcl9pZCA9IC0xOwotCiAJZHJtX3BsYW5lX2hlbHBl cl9hZGQoJmN1cnNvci0+YmFzZSwgJmludGVsX3BsYW5lX2hlbHBlcl9mdW5jcyk7CiAKIAlyZXR1 cm4gY3Vyc29yOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRl LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwppbmRleCAwNDgxZjgyNDlm ZWUuLjU4NjA1MzAyODliNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf c3ByaXRlLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKQEAgLTE4 MjEsOCArMTgyMSw2IEBAIGludGVsX3Nwcml0ZV9wbGFuZV9jcmVhdGUoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2LAogCWludGVsX3BsYW5lLT5iYXNlLnN0YXRlID0gJnN0YXRlLT5i YXNlOwogCiAJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gOSkgewotCQlzdGF0ZS0+c2NhbGVy X2lkID0gLTE7Ci0KIAkJaW50ZWxfcGxhbmUtPmhhc19jY3MgPSBza2xfcGxhbmVfaGFzX2Njcyhk ZXZfcHJpdiwgcGlwZSwKIAkJCQkJCQkgUExBTkVfU1BSSVRFMCArIHBsYW5lKTsKIAotLSAKMi4x Ni40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRl bC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK