On Fri, Jan 23, 2026 at 05:09:15PM +0000, Jonathan Cavitt wrote: > 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 <[email protected]> > Cc: Matt Roper <[email protected]>
Reviewed-by: Matt Roper <[email protected]> > --- > drivers/gpu/drm/i915/display/intel_hdcp.c | 11 ++--------- > 1 file changed, 2 insertions(+), 9 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c > b/drivers/gpu/drm/i915/display/intel_hdcp.c > index 7114fc405c29..3673a70d7ef8 100644 > --- a/drivers/gpu/drm/i915/display/intel_hdcp.c > +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c > @@ -76,7 +76,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) > @@ -87,15 +86,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; > } > > /* > -- > 2.43.0 > -- Matt Roper Graphics Software Engineer Linux GPU Platform Enablement Intel Corporation
