diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2015-03-12 17:10:29 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-03-20 11:48:04 +0100 |
| commit | 636280ba55fd95aaf14ecbfb2c32cb60a9e74e58 (patch) | |
| tree | b9727f8ae5eabade73bc5fe6a55716329ba3475e | |
| parent | ea2d8a427fa99b70457518c8d3516f46e572b95d (diff) | |
drm/i915: Don't copy the DP source rates arrays
The source rates don't change, so we can just point the caller at the
const arrays.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Sonika Jindal <sonika.jindal@intel.com>
Reviewed-by: Todd Previte <tprevite@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
| -rw-r--r-- | drivers/gpu/drm/i915/intel_dp.c | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index f71ede776f2b..12dd56b99b4d 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -1160,22 +1160,18 @@ intel_read_sink_rates(struct intel_dp *intel_dp, int *sink_rates) } static int -intel_read_source_rates(struct intel_dp *intel_dp, int *source_rates) +intel_dp_source_rates(struct intel_dp *intel_dp, const int **source_rates) { struct drm_device *dev = intel_dp_to_dev(intel_dp); - int i; - int max_default_rate; - if (INTEL_INFO(dev)->gen >= 9 && intel_dp->supported_rates[0]) { - for (i = 0; i < ARRAY_SIZE(gen9_rates); ++i) - source_rates[i] = gen9_rates[i]; - } else { - /* Index of the max_link_bw supported + 1 */ - max_default_rate = (intel_dp_max_link_bw(intel_dp) >> 3) + 1; - for (i = 0; i < max_default_rate; ++i) - source_rates[i] = default_rates[i]; + if (INTEL_INFO(dev)->gen >= 9) { + *source_rates = gen9_rates; + return ARRAY_SIZE(gen9_rates); } - return i; + + *source_rates = default_rates; + + return (intel_dp_max_link_bw(intel_dp) >> 3) + 1; } static void @@ -1272,12 +1268,12 @@ intel_dp_compute_config(struct intel_encoder *encoder, int link_avail, link_clock; int sink_rates[8]; int supported_rates[8] = {0}; - int source_rates[8]; + const int *source_rates; int source_len, sink_len, supported_len; sink_len = intel_read_sink_rates(intel_dp, sink_rates); - source_len = intel_read_source_rates(intel_dp, source_rates); + source_len = intel_dp_source_rates(intel_dp, &source_rates); supported_len = intel_supported_rates(source_rates, source_len, sink_rates, sink_len, supported_rates); |