From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH 6/6] drm/i915: Use atomic state in intel_fb_initial_config. Date: Mon, 1 Feb 2016 14:44:02 +0100 Message-ID: <1454334242-23354-7-git-send-email-maarten.lankhorst@linux.intel.com> References: <1454334242-23354-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 9DD456E408 for ; Mon, 1 Feb 2016 05:44:08 -0800 (PST) In-Reply-To: <1454334242-23354-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 VGhpcyBpcyBhbm90aGVyIHN0ZXAgaW4gcmVtb3ZpbmcgbGVnYWN5IHN0YXRlLgoKU2lnbmVkLW9m Zi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNv bT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmRldi5jIHwgMTcgKysrKysrKysr KystLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxMSBpbnNlcnRpb25zKCspLCA2IGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiZGV2LmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmRldi5jCmluZGV4IDA5ODQwZjQzODBmOS4uOTdhOTFl NjMxOTE1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmRldi5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiZGV2LmMKQEAgLTQwNiw4ICs0MDYsOCBA QCByZXRyeToKIAkJCWNvbnRpbnVlOwogCQl9CiAKLQkJZW5jb2RlciA9IGNvbm5lY3Rvci0+ZW5j b2RlcjsKLQkJaWYgKCFlbmNvZGVyIHx8IFdBUk5fT04oIWVuY29kZXItPmNydGMpKSB7CisJCWVu Y29kZXIgPSBjb25uZWN0b3ItPnN0YXRlLT5iZXN0X2VuY29kZXI7CisJCWlmICghZW5jb2RlciB8 fCBXQVJOX09OKCFjb25uZWN0b3ItPnN0YXRlLT5jcnRjKSkgewogCQkJaWYgKGNvbm5lY3Rvci0+ Zm9yY2UgPiBEUk1fRk9SQ0VfT0ZGKQogCQkJCWdvdG8gYmFpbDsKIApAQCAtNDIwLDcgKzQyMCw3 IEBAIHJldHJ5OgogCiAJCW51bV9jb25uZWN0b3JzX2VuYWJsZWQrKzsKIAotCQluZXdfY3J0YyA9 IGludGVsX2ZiX2hlbHBlcl9jcnRjKGZiX2hlbHBlciwgZW5jb2Rlci0+Y3J0Yyk7CisJCW5ld19j cnRjID0gaW50ZWxfZmJfaGVscGVyX2NydGMoZmJfaGVscGVyLCBjb25uZWN0b3ItPnN0YXRlLT5j cnRjKTsKIAogCQkvKgogCQkgKiBNYWtlIHN1cmUgd2UncmUgbm90IHRyeWluZyB0byBkcml2ZSBt dWx0aXBsZSBjb25uZWN0b3JzCkBAIC00NjYsMTcgKzQ2NiwyMiBAQCByZXRyeToKIAkJCSAqIHVz dWFsbHkgY29udGFpbnMuIEJ1dCBzaW5jZSBvdXIgY3VycmVudAogCQkJICogY29kZSBwdXRzIGEg bW9kZSBkZXJpdmVkIGZyb20gdGhlIHBvc3QtcGZpdCB0aW1pbmdzCiAJCQkgKiBpbnRvIGNydGMt Pm1vZGUgdGhpcyB3b3JrcyBvdXQgY29ycmVjdGx5LgorCQkJICoKKwkJCSAqIFRoaXMgaXMgY3J0 Yy0+bW9kZSBhbmQgbm90IGNydGMtPnN0YXRlLT5tb2RlIGZvciB0aGUKKwkJCSAqIGZhc3Rib290 IGNoZWNrIHRvIHdvcmsgY29ycmVjdGx5LiBjcnRjX3N0YXRlLT5tb2RlIGhhcworCQkJICogSTkx NV9NT0RFX0ZMQUdfSU5IRVJJVEVELCB3aGljaCB3ZSBjbGVhciB0byBmb3JjZSBjaGVjaworCQkJ ICogc3RhdGUuCiAJCQkgKi8KIAkJCURSTV9ERUJVR19LTVMoImxvb2tpbmcgZm9yIGN1cnJlbnQg bW9kZSBvbiBjb25uZWN0b3IgJXNcbiIsCiAJCQkJICAgICAgY29ubmVjdG9yLT5uYW1lKTsKLQkJ CW1vZGVzW2ldID0gJmVuY29kZXItPmNydGMtPm1vZGU7CisJCQltb2Rlc1tpXSA9ICZjb25uZWN0 b3ItPnN0YXRlLT5jcnRjLT5tb2RlOwogCQl9CiAJCWNydGNzW2ldID0gbmV3X2NydGM7CiAKIAkJ RFJNX0RFQlVHX0tNUygiY29ubmVjdG9yICVzIG9uIHBpcGUgJWMgW0NSVEM6JWRdOiAlZHglZCVz XG4iLAogCQkJICAgICAgY29ubmVjdG9yLT5uYW1lLAotCQkJICAgICAgcGlwZV9uYW1lKHRvX2lu dGVsX2NydGMoZW5jb2Rlci0+Y3J0YyktPnBpcGUpLAotCQkJICAgICAgZW5jb2Rlci0+Y3J0Yy0+ YmFzZS5pZCwKKwkJCSAgICAgIHBpcGVfbmFtZSh0b19pbnRlbF9jcnRjKGNvbm5lY3Rvci0+c3Rh dGUtPmNydGMpLT5waXBlKSwKKwkJCSAgICAgIGNvbm5lY3Rvci0+c3RhdGUtPmNydGMtPmJhc2Uu aWQsCiAJCQkgICAgICBtb2Rlc1tpXS0+aGRpc3BsYXksIG1vZGVzW2ldLT52ZGlzcGxheSwKIAkJ CSAgICAgIG1vZGVzW2ldLT5mbGFncyAmIERSTV9NT0RFX0ZMQUdfSU5URVJMQUNFID8gImkiIDoi Iik7CiAKLS0gCjIuMS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVs LWdmeAo=