From patchwork Tue Nov 14 10:08:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Usyskin, Alexander" X-Patchwork-Id: 164806 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp1760738vqg; Tue, 14 Nov 2023 02:14:09 -0800 (PST) X-Google-Smtp-Source: AGHT+IHyIopdUTzKa1v49cHaac31WnaVqFsGxKhfBBs/51FYz7LH5RWbEc8OdB0zu2fHqoKmJ4pt X-Received: by 2002:a17:903:2101:b0:1cc:f60:28b2 with SMTP id o1-20020a170903210100b001cc0f6028b2mr1680669ple.6.1699956849435; Tue, 14 Nov 2023 02:14:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699956849; cv=none; d=google.com; s=arc-20160816; b=0ZpEGB0Gyh19Tletv9fEQbUzn5d1KFU+brkDAkWTq2DEEj9Wo8718CyVQ8uYc1FImT MsXU0qY9LUdQvUjuc6uPbEF8xijj73BxKh7nu12P+Y04C6JBPP1g0kFW1Qzl70GIho7X V7i+TzR7Dw7ZXOHuZVuLiZ4QpAeD3hvLjh7+Uw4JXF3yMff7aJhxUTSdTunSkCrAqlws +cu0xZ4cJPHkNbuoTjXzjcFzdmgd21rH/f362PA9Uaw3Lbo1AkP0H2aQXL8CwyVBJj0H VBmr5s2Xu2M/mRboLS1jWiUFRdRFAsWMk7T2OLIiHSw2usRPeiJ2l4XkUIKxuh9Miv76 wIXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=YUpsv2LVx9B/W4W/FDbpMu7t8UdgVfLRDO+pqOFGRY8=; fh=7xjKU1xkhmTazBlAQtMk+Chl7JSt/CUyagAgyiLWmTI=; b=l+zjMgTfaSxW4/vwbwSWi4/g0DpmQBiEdgITzYOPfRe9omPegQglSOnrSvIRq9XLJp K2b+xTUiR99GED7M7JGyv3Sut3dUtpkhCdBP/zOS7qBufCxqvSwVq4aXuSVyyIJkxJjs SuY7Q6uncarKYJ6vr/a7dj31BvaqJudAC08D2IuPrpBxNCIJhnDQUtFoZrYbqYR0nA8u cHykRrgqnDmmEMXW6uUsxJGFM2IzLY6DekPkNzbI2TdQyyvKIfKaOhriCGbhUkAALhEB tGDZ7+5LmKaNn5oLgxHIi9UtjmgcZ1HLY33wpO/90p+CDi7kbeIhPBJO5YW3FHPurkbq p21g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=R0SPcMFi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id c10-20020a170902aa4a00b001cc2ef72ab2si7133135plr.68.2023.11.14.02.14.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Nov 2023 02:14:09 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=R0SPcMFi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 8586D803E49A; Tue, 14 Nov 2023 02:14:08 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231945AbjKNKOD (ORCPT + 30 others); Tue, 14 Nov 2023 05:14:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50058 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229697AbjKNKOA (ORCPT ); Tue, 14 Nov 2023 05:14:00 -0500 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EA38E197 for ; Tue, 14 Nov 2023 02:13:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1699956837; x=1731492837; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=4t72hUDTI8sj9BJl8D4JTpmfLJLpVhSB6X4lNquFlUY=; b=R0SPcMFinjecs1qZaNW5miZuwOuyaPWxV+2oT9LxVhZ1QEyaEdJERbNI Bf9QglsxT+mu689PLHlmMDoqUURwThdYZfQW9G/5w4HGMDDpuG4uKz7ku P4cs7W6V7sqNQeFAQaBp967EXG1/K8wd42rtLNoJikNrP7WXfFFmc2K5Z 6D32gyjPmOzJZX8RHus2tLJjf8wBxWmLGnPF6to+TOYJIu/ehL1U5PeGW X6YWLQ13SS86aAtglQOJzczXG55DAfnAvfo5sZZDz0wGZX6TX13JRQEjt uDHb2566853lun8Sy1FAcaAYkCs4nnwCVStOZXOtT3ew0+eSUeXQ/2Cv4 A==; X-IronPort-AV: E=McAfee;i="6600,9927,10893"; a="375669080" X-IronPort-AV: E=Sophos;i="6.03,301,1694761200"; d="scan'208";a="375669080" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Nov 2023 02:13:57 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.03,301,1694761200"; d="scan'208";a="5974145" Received: from sannilnx-dsk.jer.intel.com ([10.12.231.107]) by fmviesa002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Nov 2023 02:13:55 -0800 From: Alexander Usyskin To: Greg Kroah-Hartman , Lucas De Marchi , Daniele Ceraolo Spurio , Rodrigo Vivi Cc: Tomas Winkler , Alexander Usyskin , Vitaly Lubart , intel-xe@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/5] Revert "mei/hdcp: Also enable for XE" Date: Tue, 14 Nov 2023 12:08:39 +0200 Message-Id: <20231114100843.1923977-2-alexander.usyskin@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231114100843.1923977-1-alexander.usyskin@intel.com> References: <20231114100843.1923977-1-alexander.usyskin@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Tue, 14 Nov 2023 02:14:08 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782533953501692761 X-GMAIL-MSGID: 1782533953501692761 This reverts commit 62db7d00efe48c614b006086f306d5addedf8f83. It will be replaced by match without driver name. Signed-off-by: Alexander Usyskin --- 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; From patchwork Tue Nov 14 10:08:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Usyskin, Alexander" X-Patchwork-Id: 164807 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp1760768vqg; Tue, 14 Nov 2023 02:14:13 -0800 (PST) X-Google-Smtp-Source: AGHT+IGSEU1CwX0oUynl+hMzSz9k8Cj+Y79hlZlmgmK/pOU5o6aoprX/SSJ0+8c+2cvxj/+dstou X-Received: by 2002:aa7:939a:0:b0:68e:3bc8:17d1 with SMTP id t26-20020aa7939a000000b0068e3bc817d1mr7144790pfe.29.1699956853318; Tue, 14 Nov 2023 02:14:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699956853; cv=none; d=google.com; s=arc-20160816; b=yUiWeSRDN026Ntwl1uiRnmbHF+6VjGCOay7w0gn2nZs2UF+z7G29FLC5q1tQ0Yj1SB XMjsn3jMKd2WE5mQ3ExJBDbTZihgZ5ksEl5l4DkRk+F899Q6JrPhczD215jLru7D8bff gdiwu0zvWjAwnm/gPROldrVpuzgVENZAu7IK9RLlTpjWwDE9P6RAqTvPk4MaB+Lf8Uis 6qBDXnCniWbH7ymBl+g/ccW2y2a6p9RjhMGC3K0IVigI0+aodLXW1kfWIeO8LLp7cLxL 0WB/wh7FDb7ENT8wpNl534CwiudJIT56TDhJGEwgpfl6sGzVDOQxpVWEWriS8VGiATO1 gDfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=K9FFyL348qF77D3SxVWZzh87kzhWQNZD+lAfykr5DCQ=; fh=7xjKU1xkhmTazBlAQtMk+Chl7JSt/CUyagAgyiLWmTI=; b=su5B2uG+Z9eLbvBiw/zM7iMFTSj2474rxMuqHNf4lDAhGbiOplAa8CvT9bSbKIQUcm fv2wh90fVvblWEEmQ1ICma+9V563Iz5r8SgYp0ScIrg16NidmFZR2JaQwp0FqVdMv20U YyN3/dIezWAhVPbMWQZjhJcqZibOdz6LU2BkLAdrOjo7oYi0XlwRGn9FhkA7E0YJHaYH nhUIo47cCpfjrbaD4pmuAbJs+VTVoxo0AWLeLz8Dea3igIHwahgBuDgEVef3n2NCCYwX D8s0sjQX3SbaUaw8nP0W4g7DiulRS4y6eKsl4UKEbpWbRIH7hwchuIsAtXfp7r1fPuQZ V/ew== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=TxTSKYPB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id d7-20020a056a00244700b006c4d3cd9132si7861910pfj.0.2023.11.14.02.14.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Nov 2023 02:14:13 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=TxTSKYPB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 5F353803E49A; Tue, 14 Nov 2023 02:14:11 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232621AbjKNKOG (ORCPT + 30 others); Tue, 14 Nov 2023 05:14:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43908 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232278AbjKNKOD (ORCPT ); Tue, 14 Nov 2023 05:14:03 -0500 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7542F19F for ; Tue, 14 Nov 2023 02:14:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1699956840; x=1731492840; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=vxaiLcGzfNk0ddfcrq6pq99BkBv8gE1W9AOZ6yAzypg=; b=TxTSKYPBQo0AIJ1FHiQXlix7v/sH0Zwgh6GLahDQq6LGNZj+fzozSap2 sZ8hJj490eJpJ+OsGklxJ86R2ueMAce7RrdJV9LiO3/m8nZQrSAlVfCmF mx6Xd6zXgdb5P9cuUWUSnX8V7Q6cehUejeE0TLXjWJ2FYeYQXQ7mmnUxr YSClDoAqTXUgTepo7mU3r9xT/IB2de1X4EEjDJslPq4fGYYoGS1FKtVzW duA9YGHaoUXaoTUxYvZuQYFZggcI4lH3L+iQwgHWq/YKOFjYPg/zvHasK dIqgifI7G8MQiH9AQk656vJs/KWtq5+YF9OAhAODwUJUhzbpIACEo2vGP w==; X-IronPort-AV: E=McAfee;i="6600,9927,10893"; a="375669087" X-IronPort-AV: E=Sophos;i="6.03,301,1694761200"; d="scan'208";a="375669087" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Nov 2023 02:14:00 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.03,301,1694761200"; d="scan'208";a="5974150" Received: from sannilnx-dsk.jer.intel.com ([10.12.231.107]) by fmviesa002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Nov 2023 02:13:58 -0800 From: Alexander Usyskin To: Greg Kroah-Hartman , Lucas De Marchi , Daniele Ceraolo Spurio , Rodrigo Vivi Cc: Tomas Winkler , Alexander Usyskin , Vitaly Lubart , intel-xe@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/5] mei: hdcp: match without driver name Date: Tue, 14 Nov 2023 12:08:40 +0200 Message-Id: <20231114100843.1923977-3-alexander.usyskin@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231114100843.1923977-1-alexander.usyskin@intel.com> References: <20231114100843.1923977-1-alexander.usyskin@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Tue, 14 Nov 2023 02:14:12 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782533957455109437 X-GMAIL-MSGID: 1782533957455109437 Remove dependency on i915 driver name in component_match function. Use PCI header information to match Intel graphics device. Signed-off-by: Alexander Usyskin --- drivers/misc/mei/hdcp/mei_hdcp.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/drivers/misc/mei/hdcp/mei_hdcp.c b/drivers/misc/mei/hdcp/mei_hdcp.c index 51359cc5ece9..f8759a6c9ed3 100644 --- a/drivers/misc/mei/hdcp/mei_hdcp.c +++ b/drivers/misc/mei/hdcp/mei_hdcp.c @@ -17,6 +17,7 @@ */ #include +#include #include #include #include @@ -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; From patchwork Tue Nov 14 10:08:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Usyskin, Alexander" X-Patchwork-Id: 164809 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp1760869vqg; Tue, 14 Nov 2023 02:14:31 -0800 (PST) X-Google-Smtp-Source: AGHT+IEPT0jsfN3wNb9KxaTEUbeF6gFLT8gfZpfaHPeIfmSKwidgmBMptF00WtJXozmf5PZVFOZa X-Received: by 2002:a17:902:dac6:b0:1cc:56a9:e8d5 with SMTP id q6-20020a170902dac600b001cc56a9e8d5mr1907333plx.15.1699956871458; Tue, 14 Nov 2023 02:14:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699956871; cv=none; d=google.com; s=arc-20160816; b=cvnywZsiiZ3Hx0kTwUp/u2v0uWesZWgOHnM2aMIMJjVowlKrtixPW/RLcFj3g3eBWA grhNUdlBr3H9Il6wGbWEeSZ10gZGGY7tihHil3X+UVki4iFlYACnKHA6OTs502+gQpxt 5kg4eFMIoGlPpN0UHyivT57QGXxn47OjFFjAOv0eCHlwKttbnJcR9fdD8rgTfs6J9IVn /pn8Jxh0wkIspSFFW79Rd6+uTwPgtHtDYActEWFsHnqrOMcyngIQ67xgddfvjO5OCIIP aZ7s98xB7RJeZU8FaQz1p3sKDW6CAo2AMZgLuwnj98Vzi75yclpwU71VFXTN4Sxwh9wd UmoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=RYTm6HF08LlV6rId4huNYiO76a/1tb52QFkOrrboC7M=; fh=7xjKU1xkhmTazBlAQtMk+Chl7JSt/CUyagAgyiLWmTI=; b=Q6n3P4OTJj9pXw9LW8rcXnkH79dXlVu2Tx+5237ZSM4Lv/7BCxH1ExXzGpHJG8hg4L ujOlfRNqFfpzNhvQ86SFg6bwZvJBStvvdtBCUcxmCBhOvq4Ie6fCACI3LqJwUmGVJq9i Z73KepgE5EkcHVE/wkepgKTMjDRZY2Xug3840LsBiR3gqCMes6pC+WxYxTLq1wH0dNwj 4s7OPYIOcox3eiWJf7CAjWoiFDYf2ilxQw7sVDkDfWP3dEOhf3TmczY/6T8lJSs0YTC6 ihZ7jflEDg42YoQoo8jp9sq3GtWBkENv8ofXckLWXYrYzZyQzv+UhhnlFRnGCg5Eq7AF mRUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=SxDk257x; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id u6-20020a170902e5c600b001ca85c6e508si8048187plf.558.2023.11.14.02.14.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Nov 2023 02:14:31 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=SxDk257x; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id A8FEC806047B; Tue, 14 Nov 2023 02:14:27 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232620AbjKNKOM (ORCPT + 30 others); Tue, 14 Nov 2023 05:14:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43968 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232619AbjKNKOG (ORCPT ); Tue, 14 Nov 2023 05:14:06 -0500 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E2BE51AB for ; Tue, 14 Nov 2023 02:14:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1699956842; x=1731492842; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ok+C5VgX/V+ECchmrjizFZBWxdoj6QGhMwgM03J/+rE=; b=SxDk257xd9f2ShiWhSjugob7QztnbfL1padN5vKNEmnYvgA0my2XfwKm 49yYdZl1VBOQP9/3AIlrt4bebcj1YHxoSfRjELHSUuO2GNtUQHei//RJQ +MO6xrj4rPTzvpJYZ81RYbtWn9WK29/VN5TcihIgreCjIenVAkG/zFMFM 6mjKw5KWcWrtzAGY7LbDLUv/8LsRRAVNWzegIOqwPBKzyqfiWXqTskaMf TO0sfb9RPN5qOsPzIEWkAC7S9ufZ9dfmcblWIO01R7d6uRrEcJKXQyDEB IqMVbYJ60EXlZ8FgtTMXwgbhlZU6ysC/uDRfKUGW/EMo9S9szJp4hsD6C g==; X-IronPort-AV: E=McAfee;i="6600,9927,10893"; a="375669095" X-IronPort-AV: E=Sophos;i="6.03,301,1694761200"; d="scan'208";a="375669095" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Nov 2023 02:14:02 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.03,301,1694761200"; d="scan'208";a="5974154" Received: from sannilnx-dsk.jer.intel.com ([10.12.231.107]) by fmviesa002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Nov 2023 02:14:00 -0800 From: Alexander Usyskin To: Greg Kroah-Hartman , Lucas De Marchi , Daniele Ceraolo Spurio , Rodrigo Vivi Cc: Tomas Winkler , Alexander Usyskin , Vitaly Lubart , intel-xe@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/5] mei: pxp: match without driver name Date: Tue, 14 Nov 2023 12:08:41 +0200 Message-Id: <20231114100843.1923977-4-alexander.usyskin@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231114100843.1923977-1-alexander.usyskin@intel.com> References: <20231114100843.1923977-1-alexander.usyskin@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Tue, 14 Nov 2023 02:14:27 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782533976341557658 X-GMAIL-MSGID: 1782533976341557658 Remove dependency on i915 driver name in component_match function. Use PCI header information to match Intel graphics device. Signed-off-by: Alexander Usyskin --- drivers/misc/mei/pxp/mei_pxp.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/drivers/misc/mei/pxp/mei_pxp.c b/drivers/misc/mei/pxp/mei_pxp.c index 2dcb9169e404..e74b2facfdf9 100644 --- a/drivers/misc/mei/pxp/mei_pxp.c +++ b/drivers/misc/mei/pxp/mei_pxp.c @@ -12,6 +12,7 @@ */ #include +#include #include #include #include @@ -154,12 +155,21 @@ static int mei_pxp_component_match(struct device *dev, int subcomponent, void *data) { struct device *base = data; + struct pci_dev *pdev; if (!dev) return 0; - if (!dev->driver || strcmp(dev->driver->name, "i915") || - subcomponent != I915_COMPONENT_PXP) + 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_PXP) return 0; base = base->parent; From patchwork Tue Nov 14 10:08:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Usyskin, Alexander" X-Patchwork-Id: 164808 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp1760838vqg; Tue, 14 Nov 2023 02:14:23 -0800 (PST) X-Google-Smtp-Source: AGHT+IH/Pby9SNqSoCdvafb+VxhvpahSkE+gbzjhYfz1bP9Wd3AFeqfUkkzKJrR6o4Dh0uuKjtXt X-Received: by 2002:aa7:818b:0:b0:68a:6018:a66f with SMTP id g11-20020aa7818b000000b0068a6018a66fmr2599063pfi.2.1699956863627; Tue, 14 Nov 2023 02:14:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699956863; cv=none; d=google.com; s=arc-20160816; b=G/lNu5hEUNY/ZKqoJdizwZ7uNFoh3ewUj5/dmH8MFRIBp6eJc7rJBTgWWq4bv2NKwr YdqrkPIrVV4B+Ns+gwkNPnImr+qTLaMOQGpenytcZhZ4nbk4mszxa1Vh0ehG2iIXJQYz oDapG5JIYX8DjJ/588RSaWvfHsQiHZkU9LttErcXh/Mm1PZ4xef1Kj0F6YfbdHMi7EPl QiXYAs+fvsNOCaFGW/9EMPX8wsI8a2rojfmX6Z3NzHifwX47kGtqVzU2zn4cy/fKnI12 LdLOQbF0iUbEVYYsKH5NL8eviZwo03hXw6yE3y/jnV2wB0DdL92ufmXRhDMfY6EHUgoz 6m8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=R7QqVcVsA456IgQ1VjlzNKFCazRzP+rRPPtauf4sHAI=; fh=7xjKU1xkhmTazBlAQtMk+Chl7JSt/CUyagAgyiLWmTI=; b=mpgUJk9vBTvOUysWUXvwNztZB+h7AiGe/N1lMkHUGqRnNMQW6UQhDrqTiU8XKtnB49 pr06endtCx6Nj7bxOtrsb1hOB/NegKCyiaSkO22h0QUQemugrGmZY24RJU6DawuOxAcj huwSIwOmiJU4inqvRT6Rw58siX9EN4tj65ClFFaTgLdELoOh8V3QweUtSKdPYj8dWggu ZzOiWCxLtgKeqBUyNlw3CGb7fGb618oQ56X4V3l56Z3zWfksW5gP3P9yC9vo5Aw9/5BW wfGh45pmymQlk0sxlaDDsctZ2rlA0gSdoHgfDr7xhy7/a1ujMcqWXITyYCH68ZJuVcQ4 JPag== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=dDFGDJT6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id d8-20020a056a00244800b006c33c8497casi7778626pfj.222.2023.11.14.02.14.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Nov 2023 02:14:23 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=dDFGDJT6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id B4187801B484; Tue, 14 Nov 2023 02:14:22 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232680AbjKNKOS (ORCPT + 30 others); Tue, 14 Nov 2023 05:14:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52496 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232650AbjKNKON (ORCPT ); Tue, 14 Nov 2023 05:14:13 -0500 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 654E5D4E for ; Tue, 14 Nov 2023 02:14:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1699956845; x=1731492845; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=u05kUvN+yAfDdXI2QKGLoiNXnlaVTRU1zJvK+Z7HCwY=; b=dDFGDJT66u9zsgFsAy4/ub2kYzJ2rmV0eK9VQRRF/9xPR6Re0DnUSa1c TOM7GeyDwRqH8+0Qqp+wfIaeVTZ2gU8tu0Ztg5c0tcbA7rEYHb5irlKUM S31qvmtb6ZSpFZxWdor/Ga4RQqjAMLnORcTu4KWFXXEoDz/63/3T819kX gggbx5Qy5z44eN+O4zuu85DJaJ3xYOA9gc+uViDopi+ue1E5Fw4WJOIkb Zk9obABIlxvoeWC7S1viMLM1qTWApccC+aLD+x5S/ISf0O+hFOOksNsib iwqzisRC2a9W+1HZ1L+Lry6sErAz1Tvh5H8VBXw7TTdIIocNbuqQL9a9N Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10893"; a="375669103" X-IronPort-AV: E=Sophos;i="6.03,301,1694761200"; d="scan'208";a="375669103" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Nov 2023 02:14:05 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.03,301,1694761200"; d="scan'208";a="5974164" Received: from sannilnx-dsk.jer.intel.com ([10.12.231.107]) by fmviesa002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Nov 2023 02:14:03 -0800 From: Alexander Usyskin To: Greg Kroah-Hartman , Lucas De Marchi , Daniele Ceraolo Spurio , Rodrigo Vivi Cc: Tomas Winkler , Alexander Usyskin , Vitaly Lubart , intel-xe@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 4/5] mei: hdcp: add dependency on Xe driver Date: Tue, 14 Nov 2023 12:08:42 +0200 Message-Id: <20231114100843.1923977-5-alexander.usyskin@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231114100843.1923977-1-alexander.usyskin@intel.com> References: <20231114100843.1923977-1-alexander.usyskin@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Tue, 14 Nov 2023 02:14:22 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782533968226227308 X-GMAIL-MSGID: 1782533968226227308 Optionally depend on either i915 or Xe drivers. Signed-off-by: Alexander Usyskin --- drivers/misc/mei/hdcp/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/misc/mei/hdcp/Kconfig b/drivers/misc/mei/hdcp/Kconfig index 54e1c9526909..2ac9148988d4 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 + depends on DRM_I915 || DRM_XE help MEI Support for HDCP2.2 Services on Intel platforms. From patchwork Tue Nov 14 10:08:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Usyskin, Alexander" X-Patchwork-Id: 164810 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp1761022vqg; Tue, 14 Nov 2023 02:14:54 -0800 (PST) X-Google-Smtp-Source: AGHT+IEshUriOEtq49ZjMkERk5YFvvlWHWiexye5FtaK54mdnQhNVShmpEe+I5T6l/DE7hBy3iNB X-Received: by 2002:a05:6808:2a04:b0:3b2:e61f:f0a8 with SMTP id ez4-20020a0568082a0400b003b2e61ff0a8mr10909259oib.45.1699956893974; Tue, 14 Nov 2023 02:14:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699956893; cv=none; d=google.com; s=arc-20160816; b=YpnOcL0sGc2uxG/Q8n5+q1Chh9dShGCYsvji1P/JJiaXZ6YwDzA1yx84e8Rj25883f wQ9p1Muatuo7g7Cf4iod5rU4YxZ8+/bsV+9TIKjfylXpzfG4tDzUmVgKzvXKnqcslNUr z+TD8FhOcLyFD+/izut6iJKg8/fBQNLAnXY3RCohoSlw3e80tY1Q1+6xPq+Fths8tLoh brElczdiN9crZ6UX03EVJykvl/zqaAXTSjIHNZIxRFuHQ9CyC7kFDoQtylZ4yOV0z/wa SetiQ8WC1I8FZimuI64Ak8okbLYCKJJB5RKyc4/efZ0gpLt4w/ZLLVvmZV/bwpJ+BBGi za0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=nKqr0vTZ1j/M3bF6XkSwbrK/N7htFvXdkVBlbiNyK/0=; fh=7xjKU1xkhmTazBlAQtMk+Chl7JSt/CUyagAgyiLWmTI=; b=e1FKib20ZkmBAZ5KQJomsMA+3DmL55tWUsj3QnV6ivL93F0N1CUj7tKx/THHxH7D/x UCWZ+yScRZn6VD820Z2cqV111qpXdRRsDpw0XzpEjEd0rth2wvVH/yGx6uvFS0KxpK3U tNpXf2NhYtKMPQ3a38b21OPZTPW7xmAnKz4MvVxvOAq9ckBv2SW8s4NE/JNwr48ToOG+ Sw+7vSUDWH0JnV6MfTFtWkZruR/BsTDY5GXOO43+QPsnfBkgLb9Lg8t7CozDKQIF6Ksg eisR78jAKFnP72lDAtSO2Jc6GvUsHR7VX/ogw0YBWOTdT2szNCJxBVvp1wr6/qTJJ+2b w/wg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=FN7IqoWy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id k64-20020a636f43000000b005b896ecd1efsi7680870pgc.172.2023.11.14.02.14.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Nov 2023 02:14:53 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=FN7IqoWy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id CF21880B131A; Tue, 14 Nov 2023 02:14:51 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232797AbjKNKOc (ORCPT + 30 others); Tue, 14 Nov 2023 05:14:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52234 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232711AbjKNKOW (ORCPT ); Tue, 14 Nov 2023 05:14:22 -0500 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7BF1F10D9 for ; Tue, 14 Nov 2023 02:14:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1699956849; x=1731492849; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=IUPGK6kz6hmMUndrwRz6YNSDW4YneNEIOwSlfnt88xE=; b=FN7IqoWyh4MKySO/tZoTx6MD/72i/qMUgaK+TPaYfAAdahXZW2H0F8f9 HpydE302FkqkeVG99px5xJGS2zPf/ibt6YNEde2qmsSIoY2eRECbFeEYd EWmEyEoADFCXfF1xf8i2v/sc1lLxcZXkQStUX1iq+LOCmyKz7/6P8gvod 0IUpOkhTJiQcDV7qL0mOEpAGEjCjUnm6e8ICcmSF1S83Wu/b9x1x4qVT+ ZV43N/g45hZl/SbtvKc5ySxvyRF1jSqxEKEKDjtcnld0xFJwiXZN6lYsa r1/08tCnWRgu24b1BG1YmQHoA83dettgZT1kO7OFKkOawKXFEF8P6uW/k Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10893"; a="375669112" X-IronPort-AV: E=Sophos;i="6.03,301,1694761200"; d="scan'208";a="375669112" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Nov 2023 02:14:07 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.03,301,1694761200"; d="scan'208";a="5974168" Received: from sannilnx-dsk.jer.intel.com ([10.12.231.107]) by fmviesa002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Nov 2023 02:14:05 -0800 From: Alexander Usyskin To: Greg Kroah-Hartman , Lucas De Marchi , Daniele Ceraolo Spurio , Rodrigo Vivi Cc: Tomas Winkler , Alexander Usyskin , Vitaly Lubart , intel-xe@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 5/5] mei: pxp: add dependency on Xe driver Date: Tue, 14 Nov 2023 12:08:43 +0200 Message-Id: <20231114100843.1923977-6-alexander.usyskin@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231114100843.1923977-1-alexander.usyskin@intel.com> References: <20231114100843.1923977-1-alexander.usyskin@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Tue, 14 Nov 2023 02:14:51 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782534000160893707 X-GMAIL-MSGID: 1782534000160893707 Optionally depend on either i915 or Xe drivers. Signed-off-by: Alexander Usyskin --- drivers/misc/mei/pxp/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/misc/mei/pxp/Kconfig b/drivers/misc/mei/pxp/Kconfig index 4029b96afc04..fb9b278c4016 100644 --- a/drivers/misc/mei/pxp/Kconfig +++ b/drivers/misc/mei/pxp/Kconfig @@ -5,7 +5,7 @@ config INTEL_MEI_PXP tristate "Intel PXP services of ME Interface" select INTEL_MEI_ME - depends on DRM_I915 + depends on DRM_I915 || DRM_XE help MEI Support for PXP Services on Intel platforms.