From: Jani Nikula Subject: [PATCH for v4.2] Revert "drm/i915: Allow parsing of variable size child device entries from VBT" Date: Tue, 18 Aug 2015 12:33:36 +0300 Message-ID: <1439890416-16826-1-git-send-email-jani.nikula@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 406B16E141 for ; Tue, 18 Aug 2015 02:30:38 -0700 (PDT) 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 Cc: jani.nikula@intel.com List-Id: intel-gfx@lists.freedesktop.org VGhpcyByZXZlcnRzCgpjb21taXQgMDQ3ZmU2ZTZkYjkxNjFlNjkyNzFmNTZkYWFhZmRhZjJhZGQw MjNiMQpBdXRob3I6IERhdmlkIFdlaW5laGFsbCA8ZGF2aWQud2VpbmVoYWxsQGxpbnV4LmludGVs LmNvbT4KRGF0ZTogICBUdWUgQXVnIDQgMTY6NTU6NTIgMjAxNSArMDMwMAoKICAgIGRybS9pOTE1 OiBBbGxvdyBwYXJzaW5nIG9mIHZhcmlhYmxlIHNpemUgY2hpbGQgZGV2aWNlIGVudHJpZXMgZnJv bSBWQlQKClRoYXQgY29tbWl0IGlzIG5vdCB2YWxpZCBmb3IgdjQuMiwgaG93ZXZlciBpdCB3aWxs IGJlIHZhbGlkIGZvciB2NC4zLiBJdAp3YXMgc2ltcGx5IHF1ZXVlZCB0b28gZWFybHkuCgpUaGUg cmVmZXJlbmNlZCByZWdyZXNzaW5nIGNvbW1pdCBpcyBqdXN0IGZpbmUgdW50aWwgdGhlIHNpemUg b2Ygc3RydWN0CmNvbW1vbl9jaGlsZF9kZXZfY29uZmlnIGNoYW5nZXMsIGFuZCB0aGF0IHdvbid0 IGhhcHBlbiB1bnRpbAp2NC4zLiBJbmRlZWQsIHRoZSBleHBlY3RlZCBzaXplIGNoZWNrcyBoZXJl IHJlbHkgb24gdGhlIGluY3JlYXNlZCBzaXplCm9mIHRoZSBzdHJ1Y3QsIGJyZWFraW5nIG5ldyBw bGF0Zm9ybXMuCgpGaXhlczogMDQ3ZmU2ZTZkYjkxICgiZHJtL2k5MTU6IEFsbG93IHBhcnNpbmcg b2YgdmFyaWFibGUgc2l6ZSBjaGlsZCBkZXZpY2UgZW50cmllcyBmcm9tIFZCVCIpCkNjOiBEYW5p ZWwgVmV0dGVyIDxkYW5pZWxAZmZ3bGwuY2g+CkNjOiBEYXZpZCBXZWluZWhhbGwgPGRhdmlkLndl aW5laGFsbEBsaW51eC5pbnRlbC5jb20+CkNjOiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmph bGFAbGludXguaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBKYW5pIE5pa3VsYSA8amFuaS5uaWt1 bGFAaW50ZWwuY29tPgoKLS0tCgpUaGVyZSB3YXMgYW5vdGhlciBwYXRjaCBmcm9tIERhdmlkIGlu Y3JlYXNpbmcgdGhlIHNpemUgb2YgdGhlIHN0cnVjdApbMV0sIGJ1dCB0aGF0IHRoZW4gcmVncmVz c2VzIHNkdm8gbWFwcGluZyBwYXJzaW5nLiBJdCdzIHRoZSBzaW1wbGVzdCB0bwpqdXN0IHJldmVy dCBhbmQgZml4IHRoaXMgdXAgcHJvcGVybHkgZm9yIHY0LjMuCgpbMV0gaHR0cDovL21pZC5nbWFu ZS5vcmcvMjAxNTA4MTMxMzE0MTUuR082MTUwQGJvb20KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9iaW9zLmMgfCAyNyArKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBj aGFuZ2VkLCA0IGluc2VydGlvbnMoKyksIDIzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Jpb3MuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Jpb3MuYwppbmRleCAzZGNkNTllNjk0ZGIuLjE5OGZjM2MzMjkxYiAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYmlvcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Jpb3MuYwpAQCAtMTA3NSwzNCArMTA3NSwxNSBAQCBwYXJzZV9kZXZpY2VfbWFw cGluZyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJY29uc3QgdW5pb24gY2hp bGRfZGV2aWNlX2NvbmZpZyAqcF9jaGlsZDsKIAl1bmlvbiBjaGlsZF9kZXZpY2VfY29uZmlnICpj aGlsZF9kZXZfcHRyOwogCWludCBpLCBjaGlsZF9kZXZpY2VfbnVtLCBjb3VudDsKLQl1OCBleHBl Y3RlZF9zaXplOwotCXUxNiBibG9ja19zaXplOworCXUxNglibG9ja19zaXplOwogCiAJcF9kZWZz ID0gZmluZF9zZWN0aW9uKGJkYiwgQkRCX0dFTkVSQUxfREVGSU5JVElPTlMpOwogCWlmICghcF9k ZWZzKSB7CiAJCURSTV9ERUJVR19LTVMoIk5vIGdlbmVyYWwgZGVmaW5pdGlvbiBibG9jayBpcyBm b3VuZCwgbm8gZGV2aWNlcyBkZWZpbmVkLlxuIik7CiAJCXJldHVybjsKIAl9Ci0JaWYgKGJkYi0+ dmVyc2lvbiA8IDE5NSkgewotCQlleHBlY3RlZF9zaXplID0gMzM7Ci0JfSBlbHNlIGlmIChiZGIt PnZlcnNpb24gPT0gMTk1KSB7Ci0JCWV4cGVjdGVkX3NpemUgPSAzNzsKLQl9IGVsc2UgaWYgKGJk Yi0+dmVyc2lvbiA8PSAxOTcpIHsKLQkJZXhwZWN0ZWRfc2l6ZSA9IDM4OwotCX0gZWxzZSB7Ci0J CWV4cGVjdGVkX3NpemUgPSAzODsKLQkJRFJNX0RFQlVHX0RSSVZFUigiRXhwZWN0ZWQgY2hpbGRf ZGV2aWNlX2NvbmZpZyBzaXplIGZvciBCREIgdmVyc2lvbiAldSBub3Qga25vd247IGFzc3VtaW5n ICV1XG4iLAotCQkJCSBleHBlY3RlZF9zaXplLCBiZGItPnZlcnNpb24pOwotCX0KLQotCWlmIChl eHBlY3RlZF9zaXplID4gc2l6ZW9mKCpwX2NoaWxkKSkgewotCQlEUk1fRVJST1IoImNoaWxkX2Rl dmljZV9jb25maWcgY2Fubm90IGZpdCBpbiBwX2NoaWxkXG4iKTsKLQkJcmV0dXJuOwotCX0KLQot CWlmIChwX2RlZnMtPmNoaWxkX2Rldl9zaXplICE9IGV4cGVjdGVkX3NpemUpIHsKLQkJRFJNX0VS Uk9SKCJTaXplIG1pc21hdGNoOyBjaGlsZF9kZXZpY2VfY29uZmlnIHNpemU9JXUgKGV4cGVjdGVk ICV1KTsgYmRiLT52ZXJzaW9uOiAldVxuIiwKLQkJCSAgcF9kZWZzLT5jaGlsZF9kZXZfc2l6ZSwg ZXhwZWN0ZWRfc2l6ZSwgYmRiLT52ZXJzaW9uKTsKKwlpZiAocF9kZWZzLT5jaGlsZF9kZXZfc2l6 ZSA8IHNpemVvZigqcF9jaGlsZCkpIHsKKwkJRFJNX0VSUk9SKCJHZW5lcmFsIGRlZmluaXRvbiBi bG9jayBjaGlsZCBkZXZpY2Ugc2l6ZSBpcyB0b28gc21hbGwuXG4iKTsKIAkJcmV0dXJuOwogCX0K IAkvKiBnZXQgdGhlIGJsb2NrIHNpemUgb2YgZ2VuZXJhbCBkZWZpbml0aW9ucyAqLwpAQCAtMTE0 OSw3ICsxMTMwLDcgQEAgcGFyc2VfZGV2aWNlX21hcHBpbmcoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2LAogCiAJCWNoaWxkX2Rldl9wdHIgPSBkZXZfcHJpdi0+dmJ0LmNoaWxkX2Rl diArIGNvdW50OwogCQljb3VudCsrOwotCQltZW1jcHkoY2hpbGRfZGV2X3B0ciwgcF9jaGlsZCwg cF9kZWZzLT5jaGlsZF9kZXZfc2l6ZSk7CisJCW1lbWNweShjaGlsZF9kZXZfcHRyLCBwX2NoaWxk LCBzaXplb2YoKnBfY2hpbGQpKTsKIAl9CiAJcmV0dXJuOwogfQotLSAKMi4xLjQKCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5n IGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRl c2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==