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.

diff --cc drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c
Simple merge

diff --cc drivers/gpu/drm/drm_dp_mst_topology.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_bios.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_dp.c
index 016e7bc6af0abe33dcec4dd5d37b04420a042a0f,1df0e1fe235f112830a0e82a1004b0e949613c78..d0f4eb793cf56c1a52157d96ef98f3a8dfaebe8c
--- 1/drivers/gpu/drm/i915/intel_dp.c
--- 2/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;

diff --cc drivers/gpu/drm/i915/intel_lrc.c
Simple merge

diff --cc include/drm/drm_crtc.h
Simple merge