]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
drm/i915/hdcp: Remove the encoder check in hdcp enable
authorSuraj Kandpal <suraj.kandpal@intel.com>
Tue, 19 Aug 2025 15:07:29 +0000 (20:37 +0530)
committerSuraj Kandpal <suraj.kandpal@intel.com>
Tue, 2 Sep 2025 05:01:26 +0000 (10:31 +0530)
Remove the intel_encoder NULL check from _intel_hdcp_enable. With
all the changes it has gone through this check has become unnecessary
since at this point the connector is supposed to have the encoder
in it.

Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com>
Reviewed-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
Link: https://lore.kernel.org/r/20250819150729.88561-1-suraj.kandpal@intel.com
drivers/gpu/drm/i915/display/intel_hdcp.c

index 42202c8bb066bcccc6124f58d1ac35377eaa3fd4..e11cf26ed0bfafaa1417a5aca37bda965d98deef 100644 (file)
@@ -2446,12 +2446,6 @@ static int _intel_hdcp_enable(struct intel_atomic_state *state,
        if (!hdcp->shim)
                return -ENOENT;
 
-       if (!connector->encoder) {
-               drm_err(display->drm, "[CONNECTOR:%d:%s] encoder is not initialized\n",
-                       connector->base.base.id, connector->base.name);
-               return -ENODEV;
-       }
-
        mutex_lock(&hdcp->mutex);
        mutex_lock(&dig_port->hdcp.mutex);
        drm_WARN_ON(display->drm,