diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2017-08-24 21:54:03 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2017-08-25 16:18:20 +0300 |
| commit | cc9985893aacc3d9ed10929b0095dfe527a58e5f (patch) | |
| tree | 9a76ff6ff75c588649382de7a27e7fe6cdd1c73d /drivers/gpu/drm/i915/intel_vbt_defs.h | |
| parent | 56f304e9a974cec6f1d1615f0115712cf0ae1420 (diff) | |
| download | linux-cc9985893aacc3d9ed10929b0095dfe527a58e5f.tar.xz | |
drm/i915/bios: throw away high level child device union
All the child device config fields, including legacy, are now available
in the same struct, so use it for everything.
As this change touches plenty of code with "p_child", rename them to
"child" while at it. Also do some simple unification and constification
where not intrusive. This in the name of avoiding extra cleanup churn
for the same lines as here.
No functional changes.
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/103300a9ae8629624619fc8df2c533e745cc5a78.1503600621.git.jani.nikula@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_vbt_defs.h')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_vbt_defs.h | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/gpu/drm/i915/intel_vbt_defs.h b/drivers/gpu/drm/i915/intel_vbt_defs.h index 42d7339f73f9..c8c15e5425e0 100644 --- a/drivers/gpu/drm/i915/intel_vbt_defs.h +++ b/drivers/gpu/drm/i915/intel_vbt_defs.h @@ -275,7 +275,7 @@ struct old_child_dev_config { * a baseline for some of the VBT documentation. When adding new fields, please * include the BDB version when the field was added, if it's above that. */ -struct common_child_dev_config { +struct child_device_config { u16 handle; u16 device_type; @@ -347,17 +347,6 @@ struct common_child_dev_config { u8 iboost_level; } __packed; - -/* This field changes depending on the BDB version, so the most reliable way to - * read it is by checking the BDB version and reading the raw pointer. */ -union child_device_config { - /* This one should only be kept for legacy code. */ - struct old_child_dev_config old; - /* This one should also be safe to use anywhere, even without version - * checks. */ - struct common_child_dev_config common; -} __packed; - struct bdb_general_definitions { /* DDC GPIO */ u8 crt_ddc_gmbus_pin; |