Commit bd58904a authored by Tomas Winkler's avatar Tomas Winkler Committed by Daniele Ceraolo Spurio
Browse files

mei: pxp: support matching with a gfx discrete card 



With on-boards graphics card, both i915 and MEI
are in the same device hierarchy with the same parent,
while for discrete gfx card the MEI is its child device.
Adjust the match function for that scenario
by matching MEI parent device with i915.

Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarDaniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Vitaly Lubart <vitaly.lubart@intel.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: default avatarAlan Previn <alan.previn.teres.alexis@intel.com>
Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20220928004145.745803-7-daniele.ceraolospurio@intel.com
parent c7289125

drivers/misc/mei/pxp/mei_pxp.c

+10 −3
Original line number Diff line number Diff line
@@ -156,17 +156,24 @@ static int mei_pxp_component_match(struct device *dev, int subcomponent, 
{

	struct device *base = data;



	if (!dev)

		return 0;



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

	    subcomponent != I915_COMPONENT_PXP)

		return 0;



	base = base->parent;

	if (!base)

	if (!base) /* mei device */

		return 0;



	base = base->parent;

	dev = dev->parent;

	base = base->parent; /* pci device */

	/* for dgfx */

	if (base && dev == base)

		return 1;



	/* for pch */

	dev = dev->parent;

	return (base && dev && dev == base);

}