Guest User

Untitled

a guest
Jan 30th, 2018
199
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.49 KB | None | 0 0
  1. -static int cnl_adjusted_max_rate(struct intel_dp *intel_dp, int size)
  2. +static const int *cnl_adjusted_rate(struct intel_dp *intel_dp, int *n_entries)
  3. {
  4. struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);
  5. struct drm_i915_private *dev_priv = to_i915(dig_port->base.base.dev);
  6. enum port port = dig_port->base.port;
  7.  
  8. u32 voltage = I915_READ(CNL_PORT_COMP_DW3) & VOLTAGE_INFO_MASK;
  9. + *n_entries = ARRAY_SIZE(cnl_rates);
  10.  
  11. /* Low voltage SKUs are limited to max of 5.4G */
  12. if (voltage == VOLTAGE_INFO_0_85V)
  13. - return size - 2;
  14. + *n_entries -= 2;
  15.  
  16. /* For this SKU 8.1G is supported in all ports */
  17. if(IS_CNL_WITH_PORT_F(dev_priv))
  18. - return size;
  19. + return cnl_rates;
  20.  
  21. /* For other SKUs, max rate on ports A and B is 5.4G */
  22. if (port == PORT_A || port == PORT_D)
  23. - return size - 2;
  24. + *n_entries -= 2;
  25.  
  26. - return size;
  27. + return cnl_rates;
  28. }
  29.  
  30. static void
  31. @@ -258,8 +259,7 @@ intel_dp_set_source_rates(struct intel_dp *intel_dp)
  32. source_rates = bxt_rates;
  33. size = ARRAY_SIZE(bxt_rates);
  34. } else if (IS_CANNONLAKE(dev_priv)) {
  35. - source_rates = cnl_rates;
  36. - size = cnl_adjusted_max_rate(intel_dp, ARRAY_SIZE(cnl_rates));
  37. + source_rates = cnl_adjusted_rate(intel_dp, &size);
  38. } else if (IS_GEN9_BC(dev_priv)) {
Advertisement
Add Comment
Please, Sign In to add comment