drm/i915/hdcp: Rename hdcp capable functions

Rename hdcp_capable and hdcp_2_2_capable to hdcp_get_capability
and hdcp_2_2_get_capability to properly reflect what these functions
are doing.

Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com>
Reviewed-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
Signed-off-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240223081453.1576918-7-suraj.kandpal@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
index a962b48bcf1358b67e436f05c393f6ad37748197..d8f1a23ac2b1268cf9d4a9972434928c58697ad1 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
+++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
@@ -197,8 +197,8 @@ static void intel_hdcp_info(struct seq_file *m,
                goto out;
        }
 
-       hdcp_cap = intel_hdcp_capable(intel_connector);
-       hdcp2_cap = intel_hdcp2_capable(intel_connector);
+       hdcp_cap = intel_hdcp_get_capability(intel_connector);
+       hdcp2_cap = intel_hdcp2_get_capability(intel_connector);
 
        if (hdcp_cap)
                seq_puts(m, "HDCP1.4 ");

diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
index 578763e202c0118bb1adde7b73d447fde83e6c46..b6f86129c0bc64767bed595ba9978a8ee5f9638c 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_types.h
+++ b/drivers/gpu/drm/i915/display/intel_display_types.h
@@ -498,15 +498,15 @@ struct intel_hdcp_shim {
                           struct intel_connector *connector);
 
        /* Detects panel's hdcp capability. This is optional for HDMI. */
-       int (*hdcp_capable)(struct intel_digital_port *dig_port,
-                           bool *hdcp_capable);
+       int (*hdcp_get_capability)(struct intel_digital_port *dig_port,
+                                  bool *hdcp_capable);
 
        /* HDCP adaptation(DP/HDMI) required on the port */
        enum hdcp_wired_protocol protocol;
 
        /* Detects whether sink is HDCP2.2 capable */
-       int (*hdcp_2_2_capable)(struct intel_connector *connector,
-                               bool *capable);
+       int (*hdcp_2_2_get_capability)(struct intel_connector *connector,
+                                      bool *capable);
 
        /* Write HDCP2.2 messages */
        int (*write_2_2_msg)(struct intel_connector *connector,

diff --git a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c
index 5394391acbe17639d22f51a598d83dc0055476ef..bf90e9024febe81da7815626e115c1f1d61460c3 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c
@@ -269,8 +269,8 @@ bool intel_dp_hdcp_check_link(struct intel_digital_port *dig_port,
 }
 
 static
-int intel_dp_hdcp_capable(struct intel_digital_port *dig_port,
-                         bool *hdcp_capable)
+int intel_dp_hdcp_get_capability(struct intel_digital_port *dig_port,
+                                bool *hdcp_capable)
 {
        struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev);
        ssize_t ret;
@@ -642,8 +642,8 @@ int intel_dp_hdcp2_check_link(struct intel_digital_port *dig_port,
 }
 
 static
-int _intel_dp_hdcp2_capable(struct drm_dp_aux *aux,
-                           bool *capable)
+int _intel_dp_hdcp2_get_capability(struct drm_dp_aux *aux,
+                                  bool *capable)
 {
        u8 rx_caps[3];
        int ret;
@@ -663,13 +663,13 @@ int _intel_dp_hdcp2_capable(struct drm_dp_aux *aux,
 }
 
 static
-int intel_dp_hdcp2_capable(struct intel_connector *connector,
-                          bool *capable)
+int intel_dp_hdcp2_get_capability(struct intel_connector *connector,
+                                 bool *capable)
 {
        struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
        struct drm_dp_aux *aux = &dig_port->dp.aux;
 
-       return _intel_dp_hdcp2_capable(aux, capable);
+       return _intel_dp_hdcp2_get_capability(aux, capable);
 }
 
 static const struct intel_hdcp_shim intel_dp_hdcp_shim = {
@@ -683,12 +683,12 @@ static const struct intel_hdcp_shim intel_dp_hdcp_shim = {
        .read_v_prime_part = intel_dp_hdcp_read_v_prime_part,
        .toggle_signalling = intel_dp_hdcp_toggle_signalling,
        .check_link = intel_dp_hdcp_check_link,
-       .hdcp_capable = intel_dp_hdcp_capable,
+       .hdcp_get_capability = intel_dp_hdcp_get_capability,
        .write_2_2_msg = intel_dp_hdcp2_write_msg,
        .read_2_2_msg = intel_dp_hdcp2_read_msg,
        .config_stream_type = intel_dp_hdcp2_config_stream_type,
        .check_2_2_link = intel_dp_hdcp2_check_link,
-       .hdcp_2_2_capable = intel_dp_hdcp2_capable,
+       .hdcp_2_2_get_capability = intel_dp_hdcp2_get_capability,
        .protocol = HDCP_PROTOCOL_DP,
 };
 
@@ -813,13 +813,13 @@ static const struct intel_hdcp_shim intel_dp_mst_hdcp_shim = {
        .toggle_signalling = intel_dp_hdcp_toggle_signalling,
        .stream_encryption = intel_dp_mst_hdcp_stream_encryption,
        .check_link = intel_dp_hdcp_check_link,
-       .hdcp_capable = intel_dp_hdcp_capable,
+       .hdcp_get_capability = intel_dp_hdcp_get_capability,
        .write_2_2_msg = intel_dp_hdcp2_write_msg,
        .read_2_2_msg = intel_dp_hdcp2_read_msg,
        .config_stream_type = intel_dp_hdcp2_config_stream_type,
        .stream_2_2_encryption = intel_dp_mst_hdcp2_stream_encryption,
        .check_2_2_link = intel_dp_mst_hdcp2_check_link,
-       .hdcp_2_2_capable = intel_dp_hdcp2_capable,
+       .hdcp_2_2_get_capability = intel_dp_hdcp2_get_capability,
        .protocol = HDCP_PROTOCOL_DP,
 };
 

diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
index 4593ac10e2fae4660732475464ee40f4947ed09d..c1a32f9f119991149539b8ed7cd6d99a21dbf502 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_hdcp.c
+++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
@@ -140,7 +140,7 @@ int intel_hdcp_read_valid_bksv(struct intel_digital_port *dig_port,
 }
 
 /* Is HDCP1.4 capable on Platform and Sink */
-bool intel_hdcp_capable(struct intel_connector *connector)
+bool intel_hdcp_get_capability(struct intel_connector *connector)
 {
        struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
        const struct intel_hdcp_shim *shim = connector->hdcp.shim;
@@ -150,8 +150,8 @@ bool intel_hdcp_capable(struct intel_connector *connector)
        if (!shim)
                return capable;
 
-       if (shim->hdcp_capable) {
-               shim->hdcp_capable(dig_port, &capable);
+       if (shim->hdcp_get_capability) {
+               shim->hdcp_get_capability(dig_port, &capable);
        } else {
                if (!intel_hdcp_read_valid_bksv(dig_port, shim, bksv))
                        capable = true;
@@ -191,7 +191,7 @@ static bool intel_hdcp2_prerequisite(struct intel_connector *connector)
 }
 
 /* Is HDCP2.2 capable on Platform and Sink */
-bool intel_hdcp2_capable(struct intel_connector *connector)
+bool intel_hdcp2_get_capability(struct intel_connector *connector)
 {
        struct intel_hdcp *hdcp = &connector->hdcp;
        bool capable = false;
@@ -200,7 +200,7 @@ bool intel_hdcp2_capable(struct intel_connector *connector)
                return false;
 
        /* Sink's capability for HDCP2.2 */
-       hdcp->shim->hdcp_2_2_capable(connector, &capable);
+       hdcp->shim->hdcp_2_2_get_capability(connector, &capable);
 
        return capable;
 }
@@ -740,8 +740,8 @@ static int intel_hdcp_auth(struct intel_connector *connector)
         * whether the display supports HDCP before we write An. For HDMI
         * displays, this is not necessary.
         */
-       if (shim->hdcp_capable) {
-               ret = shim->hdcp_capable(dig_port, &hdcp_capable);
+       if (shim->hdcp_get_capability) {
+               ret = shim->hdcp_get_capability(dig_port, &hdcp_capable);
                if (ret)
                        return ret;
                if (!hdcp_capable) {
@@ -2388,7 +2388,7 @@ static int _intel_hdcp_enable(struct intel_atomic_state *state,
         * Considering that HDCP2.2 is more secure than HDCP1.4, If the setup
         * is capable of HDCP2.2, it is preferred to use HDCP2.2.
         */
-       if (intel_hdcp2_capable(connector)) {
+       if (intel_hdcp2_get_capability(connector)) {
                ret = intel_hdcp_set_streams(dig_port, state);
                if (!ret) {
                        ret = _intel_hdcp2_enable(connector);
@@ -2406,7 +2406,7 @@ static int _intel_hdcp_enable(struct intel_atomic_state *state,
         * When HDCP2.2 fails and Content Type is not Type1, HDCP1.4 will
         * be attempted.
         */
-       if (ret && intel_hdcp_capable(connector) &&
+       if (ret && intel_hdcp_get_capability(connector) &&
            hdcp->content_type != DRM_MODE_HDCP_CONTENT_TYPE1) {
                ret = intel_hdcp1_enable(connector);
        }

diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.h b/drivers/gpu/drm/i915/display/intel_hdcp.h
index a9c784fd9ba507a57fee5bc42eab0fda07222590..aeefb3c13d2c2221fc7636c9026b147e2e428d9f 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_hdcp.h
+++ b/drivers/gpu/drm/i915/display/intel_hdcp.h
@@ -38,8 +38,8 @@ 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 drm_i915_private *i915, enum port port);
-bool intel_hdcp_capable(struct intel_connector *connector);
-bool intel_hdcp2_capable(struct intel_connector *connector);
+bool intel_hdcp_get_capability(struct intel_connector *connector);
+bool intel_hdcp2_get_capability(struct intel_connector *connector);
 void intel_hdcp_component_init(struct drm_i915_private *i915);
 void intel_hdcp_component_fini(struct drm_i915_private *i915);
 void intel_hdcp_cleanup(struct intel_connector *connector);

diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c
index 7020e58061092bd919af3b53486181b3300afb9a..90d2236fede3ace1e596e515ea33f5f5887cfe12 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
@@ -1732,8 +1732,8 @@ int intel_hdmi_hdcp2_check_link(struct intel_digital_port *dig_port,
 }
 
 static
-int intel_hdmi_hdcp2_capable(struct intel_connector *connector,
-                            bool *capable)
+int intel_hdmi_hdcp2_get_capability(struct intel_connector *connector,
+                                   bool *capable)
 {
        struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
        u8 hdcp2_version;
@@ -1762,7 +1762,7 @@ static const struct intel_hdcp_shim intel_hdmi_hdcp_shim = {
        .write_2_2_msg = intel_hdmi_hdcp2_write_msg,
        .read_2_2_msg = intel_hdmi_hdcp2_read_msg,
        .check_2_2_link = intel_hdmi_hdcp2_check_link,
-       .hdcp_2_2_capable = intel_hdmi_hdcp2_capable,
+       .hdcp_2_2_get_capability = intel_hdmi_hdcp2_get_capability,
        .protocol = HDCP_PROTOCOL_HDMI,
 };