From: Jonathan Cavitt Date: Fri, 23 Jan 2026 17:09:15 +0000 (+0000) Subject: drm/i915/display: vcpi is always greater than zero X-Git-Tag: v7.1-rc1~167^2~24^2~211 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=671e1cfe5b23384245be5ec094e92906ca585fce;p=thirdparty%2Flinux.git drm/i915/display: vcpi is always greater than zero Static analysis issue: intel_conn_to_vcpi currently checks and asserts vcpi >= 0, as grabbed from payload->vcpi. But payload->vcpi is a u8, so this is always true. Remove this unnecessary check. While we're here, the jump statements in this function are largely defunct now, so remove those as well. Signed-off-by: Jonathan Cavitt Cc: Matt Roper Reviewed-by: Matt Roper Link: https://patch.msgid.link/20260123170914.64548-2-jonathan.cavitt@intel.com Signed-off-by: Matt Roper --- diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c index 8d3137067bf6e..b7479ced78714 100644 --- a/drivers/gpu/drm/i915/display/intel_hdcp.c +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c @@ -75,7 +75,6 @@ static int intel_conn_to_vcpi(struct intel_atomic_state *state, struct drm_dp_mst_topology_mgr *mgr; struct drm_dp_mst_atomic_payload *payload; struct drm_dp_mst_topology_state *mst_state; - int vcpi = 0; /* For HDMI this is forced to be 0x0. For DP SST also this is 0x0. */ if (!connector->mst.port) @@ -86,15 +85,9 @@ static int intel_conn_to_vcpi(struct intel_atomic_state *state, mst_state = to_drm_dp_mst_topology_state(mgr->base.state); payload = drm_atomic_get_mst_payload_state(mst_state, connector->mst.port); if (drm_WARN_ON(mgr->dev, !payload)) - goto out; + return 0; - vcpi = payload->vcpi; - if (drm_WARN_ON(mgr->dev, vcpi < 0)) { - vcpi = 0; - goto out; - } -out: - return vcpi; + return payload->vcpi; } /*