Merge tag 'topic/phy-compliance-2020-04-08' of git://anongit.freedesktop.org/drm...

Topic pull request for topic/phy-compliance:
- Standardize DP_PHY_TEST_PATTERN name.
- Add support for setting/getting test pattern from sink.
- Implement DP PHY compliance to i915.

From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/efb3d0d9-2cf7-046b-3a9b-2548d086258e@linux.intel.com
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>

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

diff --cc drivers/gpu/drm/i915/display/intel_display_types.h
Simple merge

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

diff --cc drivers/gpu/drm/i915/display/intel_dp.h
index 9632978e8c248b9cfeda0cca8a87dd5e355a788c,0d22a230b32d2cc5ed0538ed469facfb94fe8b1f..6659ce15a693b7ec458bb83355531e20f071ad9e
--- 1/drivers/gpu/drm/i915/display/intel_dp.h
--- 2/drivers/gpu/drm/i915/display/intel_dp.h
+++ b/drivers/gpu/drm/i915/display/intel_dp.h
@@@ -114,10 -114,8 +114,11 @@@ void intel_dp_vsc_enable(struct intel_d
  void intel_dp_hdr_metadata_enable(struct intel_dp *intel_dp,
                                  const struct intel_crtc_state *crtc_state,
                                  const struct drm_connector_state *conn_state);
 +void intel_dp_set_infoframes(struct intel_encoder *encoder, bool enable,
 +                           const struct intel_crtc_state *crtc_state,
 +                           const struct drm_connector_state *conn_state);
  bool intel_digital_port_connected(struct intel_encoder *encoder);
+ void intel_dp_process_phy_request(struct intel_dp *intel_dp);
  
  static inline unsigned int intel_dp_unused_lane_mask(int lane_count)
  {

diff --cc drivers/gpu/drm/i915/i915_reg.h
Simple merge

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