Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- -static int cnl_adjusted_max_rate(struct intel_dp *intel_dp, int size)
- +static const int *cnl_adjusted_rate(struct intel_dp *intel_dp, int *n_entries)
- {
- struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);
- struct drm_i915_private *dev_priv = to_i915(dig_port->base.base.dev);
- enum port port = dig_port->base.port;
- u32 voltage = I915_READ(CNL_PORT_COMP_DW3) & VOLTAGE_INFO_MASK;
- + *n_entries = ARRAY_SIZE(cnl_rates);
- /* Low voltage SKUs are limited to max of 5.4G */
- if (voltage == VOLTAGE_INFO_0_85V)
- - return size - 2;
- + *n_entries -= 2;
- /* For this SKU 8.1G is supported in all ports */
- if(IS_CNL_WITH_PORT_F(dev_priv))
- - return size;
- + return cnl_rates;
- /* For other SKUs, max rate on ports A and B is 5.4G */
- if (port == PORT_A || port == PORT_D)
- - return size - 2;
- + *n_entries -= 2;
- - return size;
- + return cnl_rates;
- }
- static void
- @@ -258,8 +259,7 @@ intel_dp_set_source_rates(struct intel_dp *intel_dp)
- source_rates = bxt_rates;
- size = ARRAY_SIZE(bxt_rates);
- } else if (IS_CANNONLAKE(dev_priv)) {
- - source_rates = cnl_rates;
- - size = cnl_adjusted_max_rate(intel_dp, ARRAY_SIZE(cnl_rates));
- + source_rates = cnl_adjusted_rate(intel_dp, &size);
- } else if (IS_GEN9_BC(dev_priv)) {
Advertisement
Add Comment
Please, Sign In to add comment