From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: [PATCH 2/2] drm/i915: ignore bios output config if not all outputs are on Date: Tue, 4 Mar 2014 21:08:42 +0100 Message-ID: <1393963722-5617-2-git-send-email-daniel.vetter@ffwll.ch> References: <1393963722-5617-1-git-send-email-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-ea0-f176.google.com (mail-ea0-f176.google.com [209.85.215.176]) by gabe.freedesktop.org (Postfix) with ESMTP id 0E523105841 for ; Tue, 4 Mar 2014 12:08:54 -0800 (PST) Received: by mail-ea0-f176.google.com with SMTP id o10so575996eaj.35 for ; Tue, 04 Mar 2014 12:08:54 -0800 (PST) In-Reply-To: <1393963722-5617-1-git-send-email-daniel.vetter@ffwll.ch> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org To: Intel Graphics Development Cc: Daniel Vetter List-Id: intel-gfx@lists.freedesktop.org Qm90aCBWaWxsZSBhbmQgUUEgcmF0aGVyIGltbWVkaWF0ZWx5IGNvbXBsYWluZWQgdGhhdCB3aXRo IHRoZSBuZXcKaW5pdGlhbF9jb25maWcgbG9naWMgZnJvbSBKZXNzZSBub3QgYWxsIG91dHB1dHMg Z2V0IGVuYWJsZWQuIFNpbmNlIHRoZQpmYmRldiBlbXVsYXRpb24gcHJldHR5IG11Y2ggdHJpZXMg dG8gYWx3YXlzIGVuYWJsZSBhcyBtYW55IG91dHB1dHMgYXMKcG9zc2libGUgKGl0IGV2ZW4gaGFz IGhvdHBsdWcgaGFuZGxpbmcgYW5kIGFsbCB0aGF0KSBmYWxsIGJhY2sgaWYgbW9yZQpvdXRwdXRz IGNvdWxkIGhhdmUgYmVlbiBlbmFibGVkLgoKdjI6IEZpeCB1cCBteSBjb25mdXNpb24gYWJvdXQg d2hhdCBlbmFibGVkIG1lYW5zIC0gaXQncyBwYXNzZWQgZnJvbQp0aGUgZmJkZXYgaGVscGVyLCB3 ZSBuZWVkIHRvIGNoZWNrIGZvciBhIG5vbi16ZXJvIGNvbm5lY3Rvci0+ZW5jb2RlcgpsaW5rLiBT cG90dGVkIGJ5IFZpbGxlLgoKQ2M6IEplc3NlIEJhcm5lcyA8amJhcm5lc0B2aXJ0dW91c2dlZWsu b3JnPgpDYzogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4K QnVnemlsbGE6IGh0dHBzOi8vYnVncy5mcmVlZGVza3RvcC5vcmcvc2hvd19idWcuY2dpP2lkPTc1 NTUyClRlc3RlZC1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVs LmNvbT4KU2lnbmVkLW9mZi1ieTogRGFuaWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBmZndsbC5j aD4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmRldi5jIHwgMTcgKysrKysrKysr KysrKysrKysKIDEgZmlsZSBjaGFuZ2VkLCAxNyBpbnNlcnRpb25zKCspCgpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZmJkZXYuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2ZiZGV2LmMKaW5kZXggZGYwMGU2YjAxZjBkLi5jMWEyMGMzYmFiZGUgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiZGV2LmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZmJkZXYuYwpAQCAtMjkwLDYgKzI5MCw4IEBAIHN0YXRpYyBib29sIGlu dGVsX2ZiX2luaXRpYWxfY29uZmlnKHN0cnVjdCBkcm1fZmJfaGVscGVyICpmYl9oZWxwZXIsCiAJ aW50IGksIGo7CiAJYm9vbCAqc2F2ZV9lbmFibGVkOwogCWJvb2wgZmFsbGJhY2sgPSB0cnVlOwor CWludCBudW1fY29ubmVjdG9yc19lbmFibGVkID0gMDsKKwlpbnQgbnVtX2Nvbm5lY3RvcnNfZGV0 ZWN0ZWQgPSAwOwogCiAJLyoKIAkgKiBJZiB0aGUgdXNlciBzcGVjaWZpZWQgYW55IGZvcmNlIG9w dGlvbnMsIGp1c3QgYmFpbCBoZXJlCkBAIC0zMjQsNiArMzI2LDEwIEBAIHN0YXRpYyBib29sIGlu dGVsX2ZiX2luaXRpYWxfY29uZmlnKHN0cnVjdCBkcm1fZmJfaGVscGVyICpmYl9oZWxwZXIsCiAK IAkJZmJfY29ubiA9IGZiX2hlbHBlci0+Y29ubmVjdG9yX2luZm9baV07CiAJCWNvbm5lY3RvciA9 IGZiX2Nvbm4tPmNvbm5lY3RvcjsKKworCQlpZiAoY29ubmVjdG9yLT5zdGF0dXMgPT0gY29ubmVj dG9yX3N0YXR1c19jb25uZWN0ZWQpCisJCQludW1fY29ubmVjdG9yc19kZXRlY3RlZCsrOworCiAJ CWlmICghZW5hYmxlZFtpXSkgewogCQkJRFJNX0RFQlVHX0tNUygiY29ubmVjdG9yICVkIG5vdCBl bmFibGVkLCBza2lwcGluZ1xuIiwKIAkJCQkgICAgICBjb25uZWN0b3ItPmJhc2UuaWQpOwpAQCAt MzM4LDYgKzM0NCw4IEBAIHN0YXRpYyBib29sIGludGVsX2ZiX2luaXRpYWxfY29uZmlnKHN0cnVj dCBkcm1fZmJfaGVscGVyICpmYl9oZWxwZXIsCiAJCQljb250aW51ZTsKIAkJfQogCisJCW51bV9j b25uZWN0b3JzX2VuYWJsZWQrKzsKKwogCQluZXdfY3J0YyA9IGludGVsX2ZiX2hlbHBlcl9jcnRj KGZiX2hlbHBlciwgZW5jb2Rlci0+Y3J0Yyk7CiAKIAkJLyoKQEAgLTM5Myw2ICs0MDEsMTUgQEAg c3RhdGljIGJvb2wgaW50ZWxfZmJfaW5pdGlhbF9jb25maWcoc3RydWN0IGRybV9mYl9oZWxwZXIg KmZiX2hlbHBlciwKIAkJZmFsbGJhY2sgPSBmYWxzZTsKIAl9CiAKKwkvKgorCSAqIElmIHRoZSBC SU9TIGRpZG4ndCBlbmFibGUgZXZlcnl0aGluZyBpdCBjb3VsZCwgZmFsbCBiYWNrIHRvIGhhdmUg dGhlCisJICogc2FtZSB1c2VyIGV4cGVyaWVuY2luZyBvZiBsaWdodGluZyB1cCBhcyBtdWNoIGFz IHBvc3NpYmxlIGxpa2UgdGhlCisJICogZmJkZXYgaGVscGVyIGxpYnJhcnkuCisJICovCisJaWYg KG51bV9jb25uZWN0b3JzX2VuYWJsZWQgIT0gbnVtX2Nvbm5lY3RvcnNfZGV0ZWN0ZWQgJiYKKwkg ICAgbnVtX2Nvbm5lY3RvcnNfZW5hYmxlZCA8IElOVEVMX0lORk8oZGV2KS0+bnVtX3BpcGVzKQor CQlmYWxsYmFjayA9IHRydWU7CisKIG91dDoKIAlpZiAoZmFsbGJhY2spIHsKIAkJbWVtY3B5KGVu YWJsZWQsIHNhdmVfZW5hYmxlZCwgZGV2LT5tb2RlX2NvbmZpZy5udW1fY29ubmVjdG9yKTsKLS0g CjEuOC41LjIKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo dHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==