From: Dave Airlie <airlied@redhat.com>
Date: Mon, 24 Aug 2015 06:36:42 +0000 (+1000)
Subject: Merge tag 'v4.2-rc8' into drm-next
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3732ce72b45a2a145803558758821bf198751276;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git

Merge tag 'v4.2-rc8' into drm-next

Linux 4.2-rc8

Backmerge required for Intel so they can fix their -next tree up properly.
---

3732ce72b45a2a145803558758821bf198751276
diff --cc drivers/gpu/drm/i915/intel_dp.c
index 016e7bc6af0a,1df0e1fe235f..d0f4eb793cf5
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@@ -91,13 -91,8 +91,10 @@@ static const struct dp_link_dpll chv_dp
  		{ .p1 = 2, .p2 = 1, .n = 1, .m1 = 2, .m2 = 0x6c00000 } }
  };
  
 +static const int bxt_rates[] = { 162000, 216000, 243000, 270000,
 +				  324000, 432000, 540000 };
  static const int skl_rates[] = { 162000, 216000, 270000,
  				  324000, 432000, 540000 };
- static const int chv_rates[] = { 162000, 202500, 210000, 216000,
- 				 243000, 270000, 324000, 405000,
- 				 420000, 432000, 540000 };
  static const int default_rates[] = { 162000, 270000, 540000 };
  
  /**
@@@ -1213,15 -1182,9 +1223,12 @@@ static bool intel_dp_source_supports_hb
  static int
  intel_dp_source_rates(struct drm_device *dev, const int **source_rates)
  {
 -	if (IS_SKYLAKE(dev)) {
 +	if (IS_BROXTON(dev)) {
 +		*source_rates = bxt_rates;
 +		return ARRAY_SIZE(bxt_rates);
 +	} else if (IS_SKYLAKE(dev)) {
  		*source_rates = skl_rates;
  		return ARRAY_SIZE(skl_rates);
- 	} else if (IS_CHERRYVIEW(dev)) {
- 		*source_rates = chv_rates;
- 		return ARRAY_SIZE(chv_rates);
  	}
  
  	*source_rates = default_rates;