Commit fe4a435b authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2024-10-10' of... 

Merge tag 'drm-intel-fixes-2024-10-10' of https://gitlab.freedesktop.org/drm/i915/kernel

 into drm-fixes

- HDCP refcount fix

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/Zwd78Tnw8t3w9F16@jlahtine-mobl.ger.corp.intel.com
parents fc4d2627 4cc2718f

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

+7 −3
Original line number Diff line number Diff line
@@ -1094,7 +1094,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);

	}

}
@@ -2524,7 +2525,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);

	}
@@ -2541,7 +2543,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);



		}

	}