From: Suraj Kandpal <suraj.kandpal@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>,
Tomas Winkler <tomas.winkler@intel.com>
Subject: [Intel-gfx] [PATCH v10 3/6] i915/hdcp: HDCP2.x Refactoring to agnostic hdcp
Date: Wed, 1 Feb 2023 14:38:03 +0530 [thread overview]
Message-ID: <20230201090806.3008619-4-suraj.kandpal@intel.com> (raw)
In-Reply-To: <20230201090806.3008619-1-suraj.kandpal@intel.com>
As now we have more then one type of content protection
secrity firmware. Let change the i915_hdcp_interface.h
header naming convention to suit generic f/w type.
%s/MEI_/HDCP_
%s/mei_dev/hdcp_dev
As interface to CP FW can be either a non i915 component or
i915 intergral component, change structure name Accordingly.
%s/i915_hdcp_comp_master/i915_hdcp_master
%s/i915_hdcp_component_ops/i915_hdcp_ops
--v3
-Changing names to drop cp_fw to make naming more agnostic[Jani]
Cc: Tomas Winkler <tomas.winkler@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Uma Shankar <uma.shankar@intel.com>
Cc: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com>
Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com>
Reviewed-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
---
drivers/gpu/drm/i915/display/intel_display_core.h | 1 +
drivers/gpu/drm/i915/display/intel_hdcp.c | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display_core.h b/drivers/gpu/drm/i915/display/intel_display_core.h
index 8e7a68339876..139100fe2383 100644
--- a/drivers/gpu/drm/i915/display/intel_display_core.h
+++ b/drivers/gpu/drm/i915/display/intel_display_core.h
@@ -15,6 +15,7 @@
#include <drm/drm_connector.h>
#include <drm/drm_modeset_lock.h>
+#include <drm/i915_hdcp_interface.h>
#include "intel_cdclk.h"
#include "intel_display_limits.h"
diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
index 262c76f21801..0d6aed1eb171 100644
--- a/drivers/gpu/drm/i915/display/intel_hdcp.c
+++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
@@ -1409,7 +1409,7 @@ static int hdcp2_authenticate_port(struct intel_connector *connector)
return ret;
}
-static int hdcp2_close_mei_session(struct intel_connector *connector)
+static int hdcp2_close_session(struct intel_connector *connector)
{
struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
@@ -1433,7 +1433,7 @@ static int hdcp2_close_mei_session(struct intel_connector *connector)
static int hdcp2_deauthenticate_port(struct intel_connector *connector)
{
- return hdcp2_close_mei_session(connector);
+ return hdcp2_close_session(connector);
}
/* Authentication flow starts from here */
--
2.25.1
next prev parent reply other threads:[~2023-02-01 9:09 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-01 9:08 [Intel-gfx] [PATCH v10 0/6] Enable HDCP2.x via GSC CS Suraj Kandpal
2023-02-01 9:08 ` [Intel-gfx] [PATCH v10 1/6] drm/i915/gsc: Create GSC request submission mechanism Suraj Kandpal
2023-03-06 11:17 ` Shankar, Uma
2023-03-06 12:39 ` Kandpal, Suraj
2023-02-01 9:08 ` [Intel-gfx] [PATCH v10 2/6] drm/i915/hdcp: Keep hdcp agonstic naming convention Suraj Kandpal
2023-03-06 11:38 ` Shankar, Uma
2023-03-06 12:50 ` Kandpal, Suraj
2023-03-07 6:40 ` Shankar, Uma
2023-03-07 6:48 ` Kandpal, Suraj
2023-02-01 9:08 ` Suraj Kandpal [this message]
2023-03-06 12:00 ` [Intel-gfx] [PATCH v10 3/6] i915/hdcp: HDCP2.x Refactoring to agnostic hdcp Shankar, Uma
2023-03-06 12:51 ` Kandpal, Suraj
2023-02-01 9:08 ` [Intel-gfx] [PATCH v10 4/6] drm/i915/hdcp: Refactor HDCP API structures Suraj Kandpal
2023-03-06 12:01 ` Shankar, Uma
2023-02-01 9:08 ` [Intel-gfx] [PATCH v10 5/6] drm/i915/mtl: Add function to send command to GSC CS Suraj Kandpal
2023-03-06 12:32 ` Shankar, Uma
2023-03-06 12:54 ` Kandpal, Suraj
2023-02-01 9:08 ` [Intel-gfx] [PATCH v10 6/6] drm/i915/mtl: Add HDCP GSC interface Suraj Kandpal
2023-03-06 12:34 ` Shankar, Uma
2023-03-07 6:45 ` Shankar, Uma
2023-03-07 6:50 ` Kandpal, Suraj
2023-03-09 7:52 ` Kandpal, Suraj
2023-03-16 8:12 ` Shankar, Uma
2023-03-20 12:09 ` Kandpal, Suraj
2023-03-20 14:10 ` Shankar, Uma
2023-02-01 9:45 ` [Intel-gfx] ✓ Fi.CI.BAT: success for Enable HDCP2.x via GSC CS (rev10) Patchwork
2023-02-01 10:51 ` [Intel-gfx] ✓ Fi.CI.IGT: " 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=20230201090806.3008619-4-suraj.kandpal@intel.com \
--to=suraj.kandpal@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=rodrigo.vivi@intel.com \
--cc=tomas.winkler@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