Merge drm/drm-next into drm-intel-next-queued

We need a backmerge to get DP_DPCD_REV_14 before we push other
i915 changes to dinq that could break compilation.

Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

1 files changed, 1 insertions, 0 deletions

diff --git a/drivers/gpu/drm/i915/intel_atomic.c b/drivers/gpu/drm/i915/intel_atomic.c
index fee026ca449b..b04952bacf77 100644
--- a/drivers/gpu/drm/i915/intel_atomic.c
+++ b/drivers/gpu/drm/i915/intel_atomic.c
@@ -126,6 +126,7 @@ int intel_digital_connector_atomic_check(struct drm_connector *conn,
         if (new_conn_state->force_audio != old_conn_state->force_audio ||
             new_conn_state->broadcast_rgb != old_conn_state->broadcast_rgb ||
             new_conn_state->base.picture_aspect_ratio != old_conn_state->base.picture_aspect_ratio ||
+            new_conn_state->base.content_type != old_conn_state->base.content_type ||
             new_conn_state->base.scaling_mode != old_conn_state->base.scaling_mode)
                 crtc_state->mode_changed = true;