From: Alexander Usyskin <alexander.usyskin@intel.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Lucas De Marchi <lucas.demarchi@intel.com>,
Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>,
Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Tomas Winkler <tomas.winkler@intel.com>,
Alexander Usyskin <alexander.usyskin@intel.com>,
Vitaly Lubart <vitaly.lubart@intel.com>,
intel-xe@lists.freedesktop.org, linux-kernel@vger.kernel.org
Subject: [PATCH 1/5] Revert "mei/hdcp: Also enable for XE"
Date: Tue, 7 Nov 2023 15:46:02 +0200 [thread overview]
Message-ID: <20231107134606.316651-2-alexander.usyskin@intel.com> (raw)
In-Reply-To: <20231107134606.316651-1-alexander.usyskin@intel.com>
This reverts commit 62db7d00efe48c614b006086f306d5addedf8f83.
Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>
---
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
next prev parent reply other threads:[~2023-11-07 13:52 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-07 13:46 [PATCH 0/5] mei: hdcp/pxp: adapt for Xe driver Alexander Usyskin
2023-11-07 13:46 ` Alexander Usyskin [this message]
2023-11-07 14:10 ` [PATCH 1/5] Revert "mei/hdcp: Also enable for XE" Greg Kroah-Hartman
2023-11-07 13:46 ` [PATCH 2/5] mei: hdcp: match without driver name Alexander Usyskin
2023-11-07 13:46 ` [PATCH 3/5] mei: pxp: " Alexander Usyskin
2023-11-07 13:46 ` [PATCH 4/5] mei: hdcp: add dependency on Xe driver Alexander Usyskin
2023-11-07 13:46 ` [PATCH 5/5] mei: pxp: " Alexander Usyskin
2023-11-07 14:11 ` Greg Kroah-Hartman
2023-11-07 14:26 ` Usyskin, Alexander
2023-11-07 14:35 ` Greg Kroah-Hartman
2023-11-27 13:32 ` Greg Kroah-Hartman
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=20231107134606.316651-2-alexander.usyskin@intel.com \
--to=alexander.usyskin@intel.com \
--cc=daniele.ceraolospurio@intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=intel-xe@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lucas.demarchi@intel.com \
--cc=rodrigo.vivi@intel.com \
--cc=tomas.winkler@intel.com \
--cc=vitaly.lubart@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
all inboxes | Powered by JetHome®