[PATCH 04/12] drm/i915: Extract intel_hdcp_cancel_works()

[Ville Syrjala]

From: Ville Syrjälä <ville.syrj...@linux.intel.com>

Hide the annoying HDCP implementation details better by
providing a intel_hdcp_cancel_works().

Signed-off-by: Ville Syrjälä <ville.syrj...@linux.intel.com>
---
 drivers/gpu/drm/i915/display/intel_display.c | 6 ++----
 drivers/gpu/drm/i915/display/intel_hdcp.c    | 9 +++++++++
 drivers/gpu/drm/i915/display/intel_hdcp.h    | 1 +
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display.c 
b/drivers/gpu/drm/i915/display/intel_display.c
index 93392752b470..d3f8af9c75ef 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -93,6 +93,7 @@
 #include "intel_fdi.h"
 #include "intel_fifo_underrun.h"
 #include "intel_frontbuffer.h"
+#include "intel_hdcp.h"
 #include "intel_hdmi.h"
 #include "intel_hotplug.h"
 #include "intel_link_bw.h"
@@ -8789,10 +8790,7 @@ void intel_hpd_poll_fini(struct drm_i915_private *i915)
        drm_connector_list_iter_begin(&i915->drm, &conn_iter);
        for_each_intel_connector_iter(connector, &conn_iter) {
                intel_connector_cancel_modeset_retry_work(connector);
-               if (connector->hdcp.shim) {
-                       cancel_delayed_work_sync(&connector->hdcp.check_work);
-                       cancel_work_sync(&connector->hdcp.prop_work);
-               }
+               intel_hdcp_cancel_works(connector);
        }
        drm_connector_list_iter_end(&conn_iter);
 }
diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c 
b/drivers/gpu/drm/i915/display/intel_hdcp.c
index 1aa4c0fd216f..591851954114 100644
--- a/drivers/gpu/drm/i915/display/intel_hdcp.c
+++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
@@ -2615,6 +2615,15 @@ void intel_hdcp_update_pipe(struct intel_atomic_state 
*state,
                _intel_hdcp_enable(state, encoder, crtc_state, conn_state);
 }
 
+void intel_hdcp_cancel_works(struct intel_connector *connector)
+{
+       if (!connector->hdcp.shim)
+               return;
+
+       cancel_delayed_work_sync(&connector->hdcp.check_work);
+       cancel_work_sync(&connector->hdcp.prop_work);
+}
+
 void intel_hdcp_component_fini(struct intel_display *display)
 {
        mutex_lock(&display->hdcp.hdcp_mutex);
diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.h 
b/drivers/gpu/drm/i915/display/intel_hdcp.h
index 3a7905551051..efe86808e17e 100644
--- a/drivers/gpu/drm/i915/display/intel_hdcp.h
+++ b/drivers/gpu/drm/i915/display/intel_hdcp.h
@@ -33,6 +33,7 @@ void intel_hdcp_enable(struct intel_atomic_state *state,
                       const struct intel_crtc_state *pipe_config,
                       const struct drm_connector_state *conn_state);
 int intel_hdcp_disable(struct intel_connector *connector);
+void intel_hdcp_cancel_works(struct intel_connector *connector);
 void intel_hdcp_update_pipe(struct intel_atomic_state *state,
                            struct intel_encoder *encoder,
                            const struct intel_crtc_state *crtc_state,
-- 
2.45.3