Revert "drm/i915: Allow parsing of variable size child device entries from VBT"
authorJani Nikula <jani.nikula@intel.com>
Tue, 18 Aug 2015 09:33:36 +0000 (12:33 +0300)
committerJani Nikula <jani.nikula@intel.com>
Wed, 19 Aug 2015 06:33:17 +0000 (09:33 +0300)
commitbf1a5fd2eccf20b19941b8461ce9c90899054bd5
treef3911faec2185c76cbdb881819add1c4ba3c14de
parent903ecd0bb970438c3a60c2c33ec9032d6443bf67
Revert "drm/i915: Allow parsing of variable size child device entries from VBT"

This reverts

commit 047fe6e6db9161e69271f56daaafdaf2add023b1
Author: David Weinehall <david.weinehall@linux.intel.com>
Date:   Tue Aug 4 16:55:52 2015 +0300

    drm/i915: Allow parsing of variable size child device entries from VBT

That commit is not valid for v4.2, however it will be valid for v4.3. It
was simply queued too early.

The referenced regressing commit is just fine until the size of struct
common_child_dev_config changes, and that won't happen until
v4.3. Indeed, the expected size checks here rely on the increased size
of the struct, breaking new platforms.

Fixes: 047fe6e6db91 ("drm/i915: Allow parsing of variable size child device entries from VBT")
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: David Weinehall <david.weinehall@linux.intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/intel_bios.c