Intel-XE Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [CI 1/2] Revert "mei/hdcp: Also enable for XE"
@ 2024-01-10 15:56 Thomas Hellström
  2024-01-10 15:56 ` [CI 2/2] Revert "mei: gsc: add support for auxiliary device created by Xe driver" Thomas Hellström
                   ` (7 more replies)
  0 siblings, 8 replies; 9+ messages in thread
From: Thomas Hellström @ 2024-01-10 15:56 UTC (permalink / raw)
  To: intel-xe

This reverts commit 52383b58eb8cf7d6a090928c568dfbe5560f848a.
---
 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.43.0


^ permalink raw reply related	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2024-01-10 17:35 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-01-10 15:56 [CI 1/2] Revert "mei/hdcp: Also enable for XE" Thomas Hellström
2024-01-10 15:56 ` [CI 2/2] Revert "mei: gsc: add support for auxiliary device created by Xe driver" Thomas Hellström
2024-01-10 16:50 ` ✓ CI.Patch_applied: success for series starting with [CI,1/2] Revert "mei/hdcp: Also enable for XE" Patchwork
2024-01-10 16:50 ` ✗ CI.checkpatch: warning " Patchwork
2024-01-10 16:51 ` ✓ CI.KUnit: success " Patchwork
2024-01-10 16:59 ` ✓ CI.Build: " Patchwork
2024-01-10 17:00 ` ✓ CI.Hooks: " Patchwork
2024-01-10 17:01 ` ✓ CI.checksparse: " Patchwork
2024-01-10 17:35 ` ✓ CI.BAT: " Patchwork

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox