From: Jani Nikula <jani.nikula@intel.com>
To: Jani Nikula <jani.nikula@intel.com>,
intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org
Cc: suraj.kandpal@intel.com
Subject: [PATCH 4/3] drm/i915/hdcp: Make some functions static
Date: Fri, 7 Feb 2025 12:58:38 +0200 [thread overview]
Message-ID: <20250207105838.179805-1-jani.nikula@intel.com> (raw)
In-Reply-To: <cover.1738924826.git.jani.nikula@intel.com>
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@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
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
next prev parent reply other threads:[~2025-02-07 10:58 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-07 10:41 [PATCH 0/3] drm/i915/hdcp: move hdcp debugfs to intel_hdcp.c, cleanups Jani Nikula
2025-02-07 10:41 ` [PATCH 1/3] drm/i915/hdcp: Move HDCP debugfs to intel_hdcp.c Jani Nikula
2025-02-07 15:52 ` Kandpal, Suraj
2025-02-07 10:41 ` [PATCH 2/3] drm/i915/hdcp: rename intel_connector to connector Jani Nikula
2025-02-07 15:42 ` Kandpal, Suraj
2025-02-07 10:41 ` [PATCH 3/3] drm/i915/hdcp: Convert platform checks to use display->platform Jani Nikula
2025-02-07 15:55 ` Kandpal, Suraj
2025-02-07 10:58 ` Jani Nikula [this message]
2025-02-07 15:58 ` [PATCH 4/3] drm/i915/hdcp: Make some functions static Kandpal, Suraj
2025-02-10 12:12 ` Jani Nikula
2025-02-07 12:42 ` ✓ CI.Patch_applied: success for drm/i915/hdcp: move hdcp debugfs to intel_hdcp.c, cleanups Patchwork
2025-02-07 12:43 ` ✓ CI.checkpatch: " Patchwork
2025-02-07 12:44 ` ✓ CI.KUnit: " Patchwork
2025-02-07 13:01 ` ✓ CI.Build: " Patchwork
2025-02-07 13:03 ` ✓ CI.Hooks: " Patchwork
2025-02-07 13:04 ` ✓ CI.checksparse: " Patchwork
2025-02-07 13:40 ` ✓ Xe.CI.BAT: " Patchwork
2025-02-07 20:09 ` ✗ Xe.CI.Full: failure " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250207105838.179805-1-jani.nikula@intel.com \
--to=jani.nikula@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=intel-xe@lists.freedesktop.org \
--cc=suraj.kandpal@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox