Commit 722a257a authored Sep 24, 2024 by Jani Nikula Committed by Wen Zhiwei Nov 08, 2024

drm/i915/hdcp: fix connector refcounting

stable inclusion
from stable-v6.6.57
commit 55f2bd90b9fba95e929d4c407ffc422597152323
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IB2M97

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=55f2bd90b9fba95e929d4c407ffc422597152323



--------------------------------

commit 4cc2718f621a6a57a02581125bb6d914ce74d23b upstream.

We acquire a connector reference before scheduling an HDCP prop work,
and expect the work function to release the reference.

However, if the work was already queued, it won't be queued multiple
times, and the reference is not dropped.

Release the reference immediately if the work was already queued.

Fixes: a6597faa ("drm/i915: Protect workers against disappearing connectors")
Cc: Sean Paul <seanpaul@chromium.org>
Cc: Suraj Kandpal <suraj.kandpal@intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: stable@vger.kernel.org # v5.10+
Reviewed-by: Suraj Kandpal <suraj.kandpal@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240924153022.2255299-1-jani.nikula@intel.com


Signed-off-by: Jani Nikula <jani.nikula@intel.com>
(cherry picked from commit abc0742c79bdb3b164eacab24aea0916d2ec1cb5)
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Wen Zhiwei <wenzhiwei@kylinos.cn>

parent fde1f801

drivers/gpu/drm/i915/display/intel_hdcp.c

+7 −3

Original line number	Diff line number	Diff line
		@@ -1005,7 +1005,8 @@ static void intel_hdcp_update_value(struct intel_connector *connector,
		hdcp->value = value;
		if (update_property) {
		drm_connector_get(&connector->base);
		queue_work(i915->unordered_wq, &hdcp->prop_work);
		if (!queue_work(i915->unordered_wq, &hdcp->prop_work))
		drm_connector_put(&connector->base);
		}
		}

		@@ -2480,7 +2481,8 @@ void intel_hdcp_update_pipe(struct intel_atomic_state *state,
		mutex_lock(&hdcp->mutex);
		hdcp->value = DRM_MODE_CONTENT_PROTECTION_DESIRED;
		drm_connector_get(&connector->base);
		queue_work(i915->unordered_wq, &hdcp->prop_work);
		if (!queue_work(i915->unordered_wq, &hdcp->prop_work))
		drm_connector_put(&connector->base);
		mutex_unlock(&hdcp->mutex);
		}

		@@ -2497,7 +2499,9 @@ void intel_hdcp_update_pipe(struct intel_atomic_state *state,
		*/
		if (!desired_and_not_enabled && !content_protection_type_changed) {
		drm_connector_get(&connector->base);
		queue_work(i915->unordered_wq, &hdcp->prop_work);
		if (!queue_work(i915->unordered_wq, &hdcp->prop_work))
		drm_connector_put(&connector->base);

		}
		}