summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJani Nikula <jani.nikula@intel.com>2017-08-25 17:11:20 +0300
committerJani Nikula <jani.nikula@intel.com>2017-08-28 11:01:57 +0300
commitf22bb35856ba1e115dea21b0effb050945838ffb (patch)
tree53c35fd2aebdb939f6283e8fb6585f6ca6c5c081
parent908b6e6e8ab4c1e0c3783be4c4b437ac6fa374ea (diff)
downloadblackbird-obmc-linux-f22bb35856ba1e115dea21b0effb050945838ffb.tar.gz
blackbird-obmc-linux-f22bb35856ba1e115dea21b0effb050945838ffb.zip
drm/i915/bios: split up iboost to hdmi and dp bitfields
This is according to the style all over the place. No functional changes. Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Suggested-by: 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/cf5f0e5d10851db3796e632836d23551f59cc412.1503670197.git.jani.nikula@intel.com
-rw-r--r--drivers/gpu/drm/i915/intel_bios.c4
-rw-r--r--drivers/gpu/drm/i915/intel_vbt_defs.h3
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
index 991e2ab98749..92e484e78ea0 100644
--- a/drivers/gpu/drm/i915/intel_bios.c
+++ b/drivers/gpu/drm/i915/intel_bios.c
@@ -1218,10 +1218,10 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv, enum port port,
/* Parse the I_boost config for SKL and above */
if (bdb->version >= 196 && child->iboost) {
- info->dp_boost_level = translate_iboost(child->iboost_level & 0xF);
+ info->dp_boost_level = translate_iboost(child->dp_iboost_level);
DRM_DEBUG_KMS("VBT (e)DP boost level for port %c: %d\n",
port_name(port), info->dp_boost_level);
- info->hdmi_boost_level = translate_iboost(child->iboost_level >> 4);
+ info->hdmi_boost_level = translate_iboost(child->hdmi_iboost_level);
DRM_DEBUG_KMS("VBT HDMI boost level for port %c: %d\n",
port_name(port), info->hdmi_boost_level);
}
diff --git a/drivers/gpu/drm/i915/intel_vbt_defs.h b/drivers/gpu/drm/i915/intel_vbt_defs.h
index f6cb4825c57c..fd1484113811 100644
--- a/drivers/gpu/drm/i915/intel_vbt_defs.h
+++ b/drivers/gpu/drm/i915/intel_vbt_defs.h
@@ -389,7 +389,8 @@ struct child_device_config {
u8 flags2; /* 195 */
u8 dp_gpio_index; /* 195 */
u16 dp_gpio_pin_num; /* 195 */
- u8 iboost_level;
+ u8 dp_iboost_level:4; /* 196 */
+ u8 hdmi_iboost_level:4; /* 196 */
} __packed;
struct bdb_general_definitions {
OpenPOWER on IntegriCloud