Merge tag 'v3.9-rc3' into drm-intel-next-queued

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / drm / i915 / intel_dp.c

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 3921d879a9165724dbf61dd0879410fc87f8806b..662a185274e686eb89e735255cdf3b46deb5ad5b 100644 (file)
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -728,7 +728,7 @@ intel_dp_mode_fixup(struct drm_encoder *encoder,
                 * CEA-861-E - 5.1 Default Encoding Parameters
                 * VESA DisplayPort Ver.1.2a - 5.1.1.1 Video Colorimetry
                 */
-               if (bpp != 18 && drm_mode_cea_vic(adjusted_mode) > 1)
+               if (bpp != 18 && drm_match_cea_mode(adjusted_mode) > 1)
                        intel_dp->color_range = DP_COLOR_RANGE_16_235;
                else
                        intel_dp->color_range = 0;
@@ -2529,7 +2529,6 @@ void intel_dp_encoder_destroy(struct drm_encoder *encoder)
 static const struct drm_encoder_helper_funcs intel_dp_helper_funcs = {
        .mode_fixup = intel_dp_mode_fixup,
        .mode_set = intel_dp_mode_set,
-       .disable = intel_encoder_noop,
 };
 
 static const struct drm_connector_funcs intel_dp_connector_funcs = {