diff options
| author | Jani Nikula | 2017-08-24 20:54:04 +0200 |
|---|---|---|
| committer | Jani Nikula | 2017-08-25 15:18:28 +0200 |
| commit | 21907e722b1dcec6fa6ec4c2a65bdc108b5f4b9c (patch) | |
| tree | 6fd8f3d3a7ba0cdb67c0664209e41050d0e92cdf /drivers/gpu/drm/i915/intel_bios.c | |
| parent | drm/i915/bios: throw away high level child device union (diff) | |
| download | kernel-qcow2-linux-21907e722b1dcec6fa6ec4c2a65bdc108b5f4b9c.tar.gz kernel-qcow2-linux-21907e722b1dcec6fa6ec4c2a65bdc108b5f4b9c.tar.xz kernel-qcow2-linux-21907e722b1dcec6fa6ec4c2a65bdc108b5f4b9c.zip | |
drm/i915/bios: throw away struct old_child_dev_config
The old_child_dev_config struct is no longer needed except for its size;
replace with a macro. No functional change.
Cc: Animesh Manna <animesh.manna@intel.com>
Cc: Paulo Zanoni <paulo.r.zanoni@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>
Link: https://patchwork.freedesktop.org/patch/msgid/4bfa6e45fecd33af797ec218635504ec8a09f788.1503600621.git.jani.nikula@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_bios.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_bios.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c index a0c1a7deb2a9..dd732a5f9361 100644 --- a/drivers/gpu/drm/i915/intel_bios.c +++ b/drivers/gpu/drm/i915/intel_bios.c @@ -479,7 +479,7 @@ parse_sdvo_device_mapping(struct drm_i915_private *dev_priv, * device size matches that of the *legacy* child device config * struct. Thus, SDVO mapping will be skipped for newer VBT. */ - if (p_defs->child_dev_size != sizeof(struct old_child_dev_config)) { + if (p_defs->child_dev_size != LEGACY_CHILD_DEVICE_CONFIG_SIZE) { DRM_DEBUG_KMS("Unsupported child device size for SDVO mapping.\n"); return; } @@ -1267,8 +1267,7 @@ parse_device_mapping(struct drm_i915_private *dev_priv, } else if (bdb->version < 111) { expected_size = 27; } else if (bdb->version < 195) { - BUILD_BUG_ON(sizeof(struct old_child_dev_config) != 33); - expected_size = sizeof(struct old_child_dev_config); + expected_size = LEGACY_CHILD_DEVICE_CONFIG_SIZE; } else if (bdb->version == 195) { expected_size = 37; } else if (bdb->version <= 197) { @@ -1286,7 +1285,7 @@ parse_device_mapping(struct drm_i915_private *dev_priv, p_defs->child_dev_size, expected_size, bdb->version); /* The legacy sized child device config is the minimum we need. */ - if (p_defs->child_dev_size < sizeof(struct old_child_dev_config)) { + if (p_defs->child_dev_size < LEGACY_CHILD_DEVICE_CONFIG_SIZE) { DRM_DEBUG_KMS("Child device config size %u is too small.\n", p_defs->child_dev_size); return; |