From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH v3 05/11] drm/i915/gen9+: Do not initialise active_crtcs for !modeset Date: Tue, 8 Nov 2016 13:55:36 +0100 Message-ID: <1478609742-13603-6-git-send-email-maarten.lankhorst@linux.intel.com> References: <1478609742-13603-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 ESMTPS id 22EF76E506 for ; Tue, 8 Nov 2016 12:55:52 +0000 (UTC) In-Reply-To: <1478609742-13603-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 VGhpcyBpcyBhIGhhY2sgYW5kIG5vdCBuZWVkZWQuIFVzZSB0aGUgcmlnaHQgbWFzayBieSBjaGVj a2luZwppbnRlbF9zdGF0ZS0+bW9kZXNldC4gVGhpcyB3b3JrcyBmb3Igd2F0ZXJtYXJrIHNhbml0 aXphdGlvbiB0b28uCgpTaWduZWQtb2ZmLWJ5OiBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5s YW5raG9yc3RAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3BtLmMgfCAzOCArKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxl IGNoYW5nZWQsIDE1IGluc2VydGlvbnMoKyksIDIzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9wbS5jCmluZGV4IDAyZjUyYjUyYTAzZC4uZDM4YTQ2ZWZjZmVkIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3BtLmMKQEAgLTMwODksMjYgKzMwODksMjIgQEAgc2tsX2RkYl9nZXRfcGlwZV9hbGxv Y2F0aW9uX2xpbWl0cyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCXN0cnVjdCBpbnRlbF9hdG9t aWNfc3RhdGUgKmludGVsX3N0YXRlID0gdG9faW50ZWxfYXRvbWljX3N0YXRlKHN0YXRlKTsKIAlz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CiAJc3RydWN0 IGRybV9jcnRjICpmb3JfY3J0YyA9IGNzdGF0ZS0+YmFzZS5jcnRjOwotCXVuc2lnbmVkIGludCBw aXBlX3NpemUsIGRkYl9zaXplOworCXVuc2lnbmVkIGludCBwaXBlX3NpemUsIGRkYl9zaXplLCBh Y3RpdmVfY3J0Y3M7CiAJaW50IG50aF9hY3RpdmVfcGlwZTsKIAorCWlmIChpbnRlbF9zdGF0ZS0+ bW9kZXNldCkKKwkJYWN0aXZlX2NydGNzID0gaW50ZWxfc3RhdGUtPmFjdGl2ZV9jcnRjczsKKwll bHNlCisJCWFjdGl2ZV9jcnRjcyA9IGRldl9wcml2LT5hY3RpdmVfY3J0Y3M7CisKKwkqbnVtX2Fj dGl2ZSA9IGh3ZWlnaHQzMihhY3RpdmVfY3J0Y3MpOworCiAJaWYgKFdBUk5fT04oIXN0YXRlKSB8 fCAhY3N0YXRlLT5iYXNlLmFjdGl2ZSkgewogCQlhbGxvYy0+c3RhcnQgPSAwOwogCQlhbGxvYy0+ ZW5kID0gMDsKLQkJKm51bV9hY3RpdmUgPSBod2VpZ2h0MzIoZGV2X3ByaXYtPmFjdGl2ZV9jcnRj cyk7CiAJCXJldHVybjsKIAl9CiAKLQlpZiAoaW50ZWxfc3RhdGUtPmFjdGl2ZV9waXBlX2NoYW5n ZXMpCi0JCSpudW1fYWN0aXZlID0gaHdlaWdodDMyKGludGVsX3N0YXRlLT5hY3RpdmVfY3J0Y3Mp OwotCWVsc2UKLQkJKm51bV9hY3RpdmUgPSBod2VpZ2h0MzIoZGV2X3ByaXYtPmFjdGl2ZV9jcnRj cyk7Ci0KLQlkZGJfc2l6ZSA9IElOVEVMX0lORk8oZGV2X3ByaXYpLT5kZGJfc2l6ZTsKLQlXQVJO X09OKGRkYl9zaXplID09IDApOwotCi0JZGRiX3NpemUgLT0gNDsgLyogNCBibG9ja3MgZm9yIGJ5 cGFzcyBwYXRoIGFsbG9jYXRpb24gKi8KLQogCS8qCiAJICogSWYgdGhlIHN0YXRlIGRvZXNuJ3Qg Y2hhbmdlIHRoZSBhY3RpdmUgQ1JUQydzLCB0aGVuIHRoZXJlJ3MKIAkgKiBubyBuZWVkIHRvIHJl Y2FsY3VsYXRlOyB0aGUgZXhpc3RpbmcgcGlwZSBhbGxvY2F0aW9uIGxpbWl0cwpAQCAtMzEyNiw5 ICszMTIyLDE0IEBAIHNrbF9kZGJfZ2V0X3BpcGVfYWxsb2NhdGlvbl9saW1pdHMoc3RydWN0IGRy bV9kZXZpY2UgKmRldiwKIAkJcmV0dXJuOwogCX0KIAotCW50aF9hY3RpdmVfcGlwZSA9IGh3ZWln aHQzMihpbnRlbF9zdGF0ZS0+YWN0aXZlX2NydGNzICYKKwlkZGJfc2l6ZSA9IElOVEVMX0lORk8o ZGV2X3ByaXYpLT5kZGJfc2l6ZTsKKwlXQVJOX09OKGRkYl9zaXplID09IDApOworCisJZGRiX3Np emUgLT0gNDsgLyogNCBibG9ja3MgZm9yIGJ5cGFzcyBwYXRoIGFsbG9jYXRpb24gKi8KKworCW50 aF9hY3RpdmVfcGlwZSA9IGh3ZWlnaHQzMihhY3RpdmVfY3J0Y3MgJgogCQkJCSAgICAoZHJtX2Ny dGNfbWFzayhmb3JfY3J0YykgLSAxKSk7Ci0JcGlwZV9zaXplID0gZGRiX3NpemUgLyBod2VpZ2h0 MzIoaW50ZWxfc3RhdGUtPmFjdGl2ZV9jcnRjcyk7CisJcGlwZV9zaXplID0gZGRiX3NpemUgLyAq bnVtX2FjdGl2ZTsKIAlhbGxvYy0+c3RhcnQgPSBudGhfYWN0aXZlX3BpcGUgKiBkZGJfc2l6ZSAv ICpudW1fYWN0aXZlOwogCWFsbG9jLT5lbmQgPSBhbGxvYy0+c3RhcnQgKyBwaXBlX3NpemU7CiB9 CkBAIC00MDIxLDE1ICs0MDIyLDYgQEAgc2tsX2NvbXB1dGVfZGRiKHN0cnVjdCBkcm1fYXRvbWlj X3N0YXRlICpzdGF0ZSkKIAkJCXJldHVybiByZXQ7CiAKIAkJaW50ZWxfc3RhdGUtPmFjdGl2ZV9w aXBlX2NoYW5nZXMgPSB+MDsKLQotCQkvKgotCQkgKiBXZSB1c3VhbGx5IG9ubHkgaW5pdGlhbGl6 ZSBpbnRlbF9zdGF0ZS0+YWN0aXZlX2NydGNzIGlmIHdlCi0JCSAqIHdlJ3JlIGRvaW5nIGEgbW9k ZXNldDsgbWFrZSBzdXJlIHRoaXMgZmllbGQgaXMgYWx3YXlzCi0JCSAqIGluaXRpYWxpemVkIGR1 cmluZyB0aGUgc2FuaXRpemF0aW9uIHByb2Nlc3MgdGhhdCBoYXBwZW5zCi0JCSAqIG9uIHRoZSBm aXJzdCBjb21taXQgdG9vLgotCQkgKi8KLQkJaWYgKCFpbnRlbF9zdGF0ZS0+bW9kZXNldCkKLQkJ CWludGVsX3N0YXRlLT5hY3RpdmVfY3J0Y3MgPSBkZXZfcHJpdi0+YWN0aXZlX2NydGNzOwogCX0K IAogCS8qCi0tIAoyLjcuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50 ZWwtZ2Z4Cg==