diff mbox series

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

Message ID 20231114100843.1923977-2-alexander.usyskin@intel.com
State New
Headers
Series mei: hdcp/pxp: adapt for Xe driver |

Commit Message

Usyskin, Alexander Nov. 14, 2023, 10:08 a.m. UTC 
  This reverts commit 62db7d00efe48c614b006086f306d5addedf8f83.

It will be replaced by match without driver name.

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(-)

Comments

Greg KH Nov. 14, 2023, 12:12 p.m. UTC | #1 
On Tue, Nov 14, 2023 at 12:08:39PM +0200, Alexander Usyskin wrote:
> This reverts commit 62db7d00efe48c614b006086f306d5addedf8f83.
> 
> It will be replaced by match without driver name.

Again, you are saying _what_ you are doing, but not _why_ you are doing
this.  I have no clue why this current matching is not acceptable.

And did you just break the existing code if only this patch is applied?

> Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>

As I asked this same question last review cycle, I'm now going to be
very picky and say "You are not following the documented Intel procedure
for Linux kernel patches that Greg has to review."  Please work with
your internal Intel kernel developers to fix this, otherwise we can not
take them at all, sorry.

thanks,

greg k-h
diff mbox series

Patch

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;