[PATCH 1/5] Revert "mei/hdcp: Also enable for XE"

From: Alexander Usyskin
Date: Tue Nov 07 2023 - 08:52:58 EST


This reverts commit 62db7d00efe48c614b006086f306d5addedf8f83.

Signed-off-by: Alexander Usyskin <alexander.usyskin@xxxxxxxxx>
---
drivers/misc/mei/hdcp/Kconfig | 2 +-
drivers/misc/mei/hdcp/mei_hdcp.c | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/misc/mei/hdcp/Kconfig b/drivers/misc/mei/hdcp/Kconfig
index 2ac9148988d4..54e1c9526909 100644
--- a/drivers/misc/mei/hdcp/Kconfig
+++ b/drivers/misc/mei/hdcp/Kconfig
@@ -4,7 +4,7 @@
config INTEL_MEI_HDCP
tristate "Intel HDCP2.2 services of ME Interface"
select INTEL_MEI_ME
- depends on DRM_I915 || DRM_XE
+ depends on DRM_I915
help
MEI Support for HDCP2.2 Services on Intel platforms.

diff --git a/drivers/misc/mei/hdcp/mei_hdcp.c b/drivers/misc/mei/hdcp/mei_hdcp.c
index 94beb5667faa..51359cc5ece9 100644
--- a/drivers/misc/mei/hdcp/mei_hdcp.c
+++ b/drivers/misc/mei/hdcp/mei_hdcp.c
@@ -782,8 +782,7 @@ static int mei_hdcp_component_match(struct device *dev, int subcomponent,
{
struct device *base = data;

- if (!dev->driver ||
- (strcmp(dev->driver->name, "i915") && strcmp(dev->driver->name, "xe")) ||
+ if (!dev->driver || strcmp(dev->driver->name, "i915") ||
subcomponent != I915_COMPONENT_HDCP)
return 0;

--
2.34.1