> -----Original Message----- > From: Nikula, Jani <jani.nikula@xxxxxxxxx> > Sent: Friday, February 7, 2025 4:29 PM > To: Nikula, Jani <jani.nikula@xxxxxxxxx>; intel-gfx@xxxxxxxxxxxxxxxxxxxxx; > intel-xe@xxxxxxxxxxxxxxxxxxxxx > Cc: Kandpal, Suraj <suraj.kandpal@xxxxxxxxx> > Subject: [PATCH 4/3] drm/i915/hdcp: Make some functions static What happened here wrong serial number the patch itself looks okay maybe a refloat is required otherwise ci may not test it LGTM, Reviewed-by: Suraj Kandpal <suraj.kandpal@xxxxxxxxx> > > With the debugfs implementation moved next to the implementation, we no > longer need to expose some of the functions. Make them static. > > Cc: Suraj Kandpal <suraj.kandpal@xxxxxxxxx> > Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx> > --- > drivers/gpu/drm/i915/display/intel_hdcp.c | 10 +++++----- > drivers/gpu/drm/i915/display/intel_hdcp.h | 6 ------ > 2 files changed, 5 insertions(+), 11 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c > b/drivers/gpu/drm/i915/display/intel_hdcp.c > index 3d83db793baf..1aa4c0fd216f 100644 > --- a/drivers/gpu/drm/i915/display/intel_hdcp.c > +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c > @@ -209,7 +209,7 @@ int intel_hdcp_read_valid_bksv(struct > intel_digital_port *dig_port, } > > /* Is HDCP1.4 capable on Platform and Sink */ -bool > intel_hdcp_get_capability(struct intel_connector *connector) > +static bool intel_hdcp_get_capability(struct intel_connector > +*connector) > { > struct intel_digital_port *dig_port; > const struct intel_hdcp_shim *shim = connector->hdcp.shim; @@ - > 265,7 +265,7 @@ static bool intel_hdcp2_prerequisite(struct > intel_connector *connector) } > > /* Is HDCP2.2 capable on Platform and Sink */ -bool > intel_hdcp2_get_capability(struct intel_connector *connector) > +static bool intel_hdcp2_get_capability(struct intel_connector > +*connector) > { > struct intel_hdcp *hdcp = &connector->hdcp; > bool capable = false; > @@ -279,9 +279,9 @@ bool intel_hdcp2_get_capability(struct > intel_connector *connector) > return capable; > } > > -void intel_hdcp_get_remote_capability(struct intel_connector *connector, > - bool *hdcp_capable, > - bool *hdcp2_capable) > +static void intel_hdcp_get_remote_capability(struct intel_connector > *connector, > + bool *hdcp_capable, > + bool *hdcp2_capable) > { > struct intel_hdcp *hdcp = &connector->hdcp; > > diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.h > b/drivers/gpu/drm/i915/display/intel_hdcp.h > index 76bd3996f636..3a7905551051 100644 > --- a/drivers/gpu/drm/i915/display/intel_hdcp.h > +++ b/drivers/gpu/drm/i915/display/intel_hdcp.h > @@ -21,7 +21,6 @@ struct intel_encoder; > struct intel_hdcp_shim; > struct seq_file; > enum port; > -enum transcoder; > > void intel_hdcp_atomic_check(struct drm_connector *connector, > struct drm_connector_state *old_state, @@ - > 39,11 +38,6 @@ void intel_hdcp_update_pipe(struct intel_atomic_state > *state, > const struct intel_crtc_state *crtc_state, > const struct drm_connector_state *conn_state); > bool is_hdcp_supported(struct intel_display *display, enum port port); - > bool intel_hdcp_get_capability(struct intel_connector *connector); -bool > intel_hdcp2_get_capability(struct intel_connector *connector); -void > intel_hdcp_get_remote_capability(struct intel_connector *connector, > - bool *hdcp_capable, > - bool *hdcp2_capable); > void intel_hdcp_component_init(struct intel_display *display); void > intel_hdcp_component_fini(struct intel_display *display); void > intel_hdcp_cleanup(struct intel_connector *connector); > -- > 2.39.5