Merge tag 'drm-intel-next-2018-02-21' of git://anongit.freedesktop.org/drm/drm-intel...

[linux-2.6-block.git] / drivers / gpu / drm / i915 / intel_atomic.c

diff --git a/drivers/gpu/drm/i915/intel_atomic.c b/drivers/gpu/drm/i915/intel_atomic.c
index bb5df2b4e3493d20bbbedc44c5ce2ec907f02b28..e9fb692076d75b86109ec57dfb7590b94a4b1562 100644 (file)
--- a/drivers/gpu/drm/i915/intel_atomic.c
+++ b/drivers/gpu/drm/i915/intel_atomic.c
@@ -110,6 +110,8 @@ int intel_digital_connector_atomic_check(struct drm_connector *conn,
                to_intel_digital_connector_state(old_state);
        struct drm_crtc_state *crtc_state;
 
+       intel_hdcp_atomic_check(conn, old_state, new_state);
+
        if (!new_state->crtc)
                return 0;