drm: convert crtc and connection_mutex to ww_mutex (v5)

[linux-beck.git] / drivers / gpu / drm / i915 / intel_tv.c

diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
index 25850a86d70c043d614df05d7323fadb93fc675f..67c6c9a2eb1c9f3ed3d0d6979a686b52fdabe9fe 100644 (file)
--- a/drivers/gpu/drm/i915/intel_tv.c
+++ b/drivers/gpu/drm/i915/intel_tv.c
@@ -1321,10 +1321,11 @@ intel_tv_detect(struct drm_connector *connector, bool force)
 
        if (force) {
                struct intel_load_detect_pipe tmp;
+               struct drm_modeset_acquire_ctx ctx;
 
-               if (intel_get_load_detect_pipe(connector, &mode, &tmp)) {
+               if (intel_get_load_detect_pipe(connector, &mode, &tmp, &ctx)) {
                        type = intel_tv_detect_type(intel_tv, connector);
-                       intel_release_load_detect_pipe(connector, &tmp);
+                       intel_release_load_detect_pipe(connector, &tmp, &ctx);
                } else
                        return connector_status_unknown;
        } else