Commit 6244a8b6 authored by Alexander Usyskin's avatar Alexander Usyskin Committed by Greg Kroah-Hartman
Browse files

mei: hdcp: match without driver name 



Xe driver uses this component too, but current match function
matches by i915 driver name.
Remove dependency on i915 driver name in component_match function.
Use PCI header information to match Intel graphics device.

Signed-off-by: default avatarAlexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Link: https://lore.kernel.org/r/20240123101625.220365-2-tomas.winkler@intel.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0e59f01d

drivers/misc/mei/hdcp/mei_hdcp.c

+12 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
 */



#include <linux/module.h>

#include <linux/pci.h>

#include <linux/slab.h>

#include <linux/mei.h>

#include <linux/mei_cl_bus.h>
@@ -781,9 +782,18 @@ static int mei_hdcp_component_match(struct device *dev, int subcomponent, 
				    void *data)

{

	struct device *base = data;

	struct pci_dev *pdev;



	if (!dev->driver || strcmp(dev->driver->name, "i915") ||

	    subcomponent != I915_COMPONENT_HDCP)

	if (!dev_is_pci(dev))

		return 0;



	pdev = to_pci_dev(dev);



	if (pdev->class != (PCI_CLASS_DISPLAY_VGA << 8) ||

	    pdev->vendor != PCI_VENDOR_ID_INTEL)

		return 0;



	if (subcomponent != I915_COMPONENT_HDCP)

		return 0;



	base = base->parent;