From patchwork Tue Nov 7 13:46:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Usyskin, Alexander" X-Patchwork-Id: 162503 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:aa0b:0:b0:403:3b70:6f57 with SMTP id k11csp246199vqo; Tue, 7 Nov 2023 05:53:04 -0800 (PST) X-Google-Smtp-Source: AGHT+IF8K+9kh1eXq8mHiUXfL9LWpslUpBjQ7lpOhni8G27UBiG7bhKJ5Jr+eylTXIvy8b1yJEfL X-Received: by 2002:a17:90a:208:b0:25e:a8ab:9157 with SMTP id c8-20020a17090a020800b0025ea8ab9157mr27082275pjc.22.1699365183895; Tue, 07 Nov 2023 05:53:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699365183; cv=none; d=google.com; s=arc-20160816; b=aUoS5YDBD5AkOn7AlIGh3TNJIFpBd17iFAywxiQINPa4LPvYtgu3NDxu2mng0V3NKb lwBiwyUCCXwdaAqOksUIHmk+TIVVJK2xfbUJIgfp6oTEz65OS8Y8MPYDVAbUtNyeGmwv 43Dih92iv/IvIczbVHl0xruC1KxL0uzRSKl/LsSxmIBCo+vbCi4rJRQNirYpEr5lujUl wjzNQi4mO08VWZMP8CYMbk6hf58mOPDXAFmr9JO72dR5PSI0uVponrXv6ytA0oeRIXAs +zQ/EsJfCjDCu52NWe+8WVVI01m388d/LIfFZai5JapVFMKbo+am1EnPMQDQGHmHT4fP FwyQ== 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=7Vuh84nUjnd6etkGB74RTsWsRiNoYAbrPWXXeyrkO0o=; fh=7xjKU1xkhmTazBlAQtMk+Chl7JSt/CUyagAgyiLWmTI=; b=0W6h5fPwQuR6X1PUqGd2s7SbMtE5G6RWzJNAnM/WN5ynaWEbx5heofEcwfltrARY59 5w2ioQeSRKHKQcf3EpsgOLi/2/KDC9Fk6yEyd0j91ys8pSyEfNe5U2T5LjPW/QCaEWHZ vcmucGI6/pgyeMggNoPEOaFEf2i9ex7P9KO19DohRSlJ+carXNu838f2rwT9KjeObtmA kj+0EvqQZ8cjh6MQkyi/mqKZxl/8tmsNl8fvD626a3XBR4XOhsfYjvw4VdQPnAVOYJRo p8ONiz0DK4Z8V3bLUlRDuKfUVPdDt5DH1seItRlKJgqu9EyoF/0vBAvVCjtS1DF1aYKH N8nw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=gTZWjEwI; 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 ep7-20020a17090ae64700b0028091c90974si10770827pjb.1.2023.11.07.05.53.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 05:53:03 -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=gTZWjEwI; 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 1E09C81B8035; Tue, 7 Nov 2023 05:53:03 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235106AbjKGNw6 (ORCPT + 32 others); Tue, 7 Nov 2023 08:52:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50902 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234983AbjKGNwn (ORCPT ); Tue, 7 Nov 2023 08:52:43 -0500 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 920D719BE for ; Tue, 7 Nov 2023 05:51:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1699365087; x=1730901087; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=tXkEkdouSGqjpSmp69dGBr2atkMtY9MAl6fJ0kw7+M8=; b=gTZWjEwIQzJjQs/IbATH5rFo56Ow1xlDr++QFDQGAJA86giksrUVCnU5 8LRtqRlEnpLd4piZFX922GuPQmBnbY1E2yKWL3u5jqHHuTE2RDNKdDZ8y GvNzOyrTtHNz0MGd4Kks5aWd/05CfchxUlcOQsc8bbS3VqfavKWA23du2 ttQQXilMzO5vkbutdXd2LK6jh5tQUH6ERRB3TbBCsc9yr2MDGS9W6NgPR o5b0X5SPf9iPcEHPf9P+0hW4tXJ4lNoPCUOAbRGSSnIFV5cWXtZ9Akmjl k0aRZAKtxQLMk3oH9JKAIVnxNa5uOVQPINNvh0MLlVddoRNDaYdY8n0sT g==; X-IronPort-AV: E=McAfee;i="6600,9927,10886"; a="420618972" X-IronPort-AV: E=Sophos;i="6.03,283,1694761200"; d="scan'208";a="420618972" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Nov 2023 05:51:27 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10886"; a="762705092" X-IronPort-AV: E=Sophos;i="6.03,283,1694761200"; d="scan'208";a="762705092" Received: from sannilnx-dsk.jer.intel.com ([10.12.231.107]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Nov 2023 05:51:24 -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 1/5] Revert "mei/hdcp: Also enable for XE" Date: Tue, 7 Nov 2023 15:46:02 +0200 Message-Id: <20231107134606.316651-2-alexander.usyskin@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231107134606.316651-1-alexander.usyskin@intel.com> References: <20231107134606.316651-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,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, 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, 07 Nov 2023 05:53:03 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781913546734878358 X-GMAIL-MSGID: 1781913546734878358 This reverts commit 62db7d00efe48c614b006086f306d5addedf8f83. 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 7 13:46:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Usyskin, Alexander" X-Patchwork-Id: 162504 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:aa0b:0:b0:403:3b70:6f57 with SMTP id k11csp246279vqo; Tue, 7 Nov 2023 05:53:12 -0800 (PST) X-Google-Smtp-Source: AGHT+IE65cE87jWBZmcwGU5h3pW3cCGceny4cou6K6gIkDWwvyK6uuvi4Jh8JJiNd3YzKivKF536 X-Received: by 2002:a17:903:246:b0:1cc:7a8e:606b with SMTP id j6-20020a170903024600b001cc7a8e606bmr15571961plh.43.1699365192479; Tue, 07 Nov 2023 05:53:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699365192; cv=none; d=google.com; s=arc-20160816; b=bLckIwHFLBpEAkPIyj9G05mIqvL2WVhSLnfPFaO0SU7DCzBmauFoZHh1njqxd+5G6R LtAhZpUxllk6LldLS1SL4xMAOxc3zl+G4trg5EXSrMfAEXqUOjysskXcUuAxOkC8oJx1 cD+PjDtaM1zG4KpEe+Ml6k1sSQmGbip0ZO82fdTU3M42N/eWEBiWX7TbLksXkN+EH4CU 7gBvgZTn0h/yRXQT24xZ26uQmrJ8tjQJk+dySgyFeKbN35pUrs7Xjd9jLOrNUu2rhTS4 1bfObXu3iT6bcK4cWst6ClNCxV4posKhVqH5KiEg7Jk6o0WfOOkqOLn7zSNB+ugh08/c myOw== 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=0lezzjJlWK2ZNGTeCBXVbTNVsnv130babYsbg4SFAYLQqKy+ijZV1GGPcONWQHxxjV Tg8O9jdCXHjJ8wbG5s8BbSR5zndE/+MS19Hs46B2q1HlMzPHPJH4IrsGBn7WaGX34fGI EOjt1XtlDoDHWYT2DNU4ResxxvsBn+pzYam81ROqEZfLphtm6xwZfD+FbuqdO3dvjuz4 W6OvH/21i2/wjS3funJN1640SWnTUEvv/yyFnXQTQexHUY6CY0XxZJ9S5N89MRkCKpmX E+/UALvAU0C85S0NZaObN3RuXJ0ywODDkr6+L+efY1/P0npnchzWEqBhJ4WUslmBKZIg eK8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=IMzGqsf0; 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 o18-20020a170902d4d200b001ca3cd7ead6si10897804plg.452.2023.11.07.05.53.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 05:53:12 -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=IMzGqsf0; 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 921E58212A9E; Tue, 7 Nov 2023 05:53:11 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235050AbjKGNxF (ORCPT + 32 others); Tue, 7 Nov 2023 08:53:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50932 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235030AbjKGNwp (ORCPT ); Tue, 7 Nov 2023 08:52:45 -0500 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 679C6D7C for ; Tue, 7 Nov 2023 05:51:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1699365090; x=1730901090; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=vxaiLcGzfNk0ddfcrq6pq99BkBv8gE1W9AOZ6yAzypg=; b=IMzGqsf0TgogrycIHP8SP+g5jbuQ1k83TA1lvUMBTf0L3wv7599dEwqC HN5AISENPR4dU/xp0tjGOyQVyV1WOCgQI5THj35PIEVvV4EhpTPm+oJdb mG1S7uPmemlxsnFmR9fvX+ls4hSBruedpbvtGfCjITqcTHHTpLnGjoM0H sd2j//+FJQLi9IOx2/6GRx+JvlJ+BV6La4AI+4B0QoDZo5NDns4NEVL7g zw6cs5JrISH5lJc1TTZJXy6n0H9CyNWfcz4m+a3sEUjM5Pa6uFS0hnI5n YqsAOtmGLWCcK+0fhj6ve8jLmx616mF+kohATaQ185vQU+nXKqwazQS2B w==; X-IronPort-AV: E=McAfee;i="6600,9927,10886"; a="420618978" X-IronPort-AV: E=Sophos;i="6.03,283,1694761200"; d="scan'208";a="420618978" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Nov 2023 05:51:30 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10886"; a="762705107" X-IronPort-AV: E=Sophos;i="6.03,283,1694761200"; d="scan'208";a="762705107" Received: from sannilnx-dsk.jer.intel.com ([10.12.231.107]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Nov 2023 05:51:27 -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 2/5] mei: hdcp: match without driver name Date: Tue, 7 Nov 2023 15:46:03 +0200 Message-Id: <20231107134606.316651-3-alexander.usyskin@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231107134606.316651-1-alexander.usyskin@intel.com> References: <20231107134606.316651-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,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, 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, 07 Nov 2023 05:53:11 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781913555956029513 X-GMAIL-MSGID: 1781913555956029513 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 7 13:46:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Usyskin, Alexander" X-Patchwork-Id: 162507 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:aa0b:0:b0:403:3b70:6f57 with SMTP id k11csp246625vqo; Tue, 7 Nov 2023 05:53:54 -0800 (PST) X-Google-Smtp-Source: AGHT+IFEVeRT4xfcDqqD2nVOx1rlYNlM321QXErWk44ZnZazZcgr2FadLlMzdAf9VrlzQsQ2R4MV X-Received: by 2002:a05:6a20:1595:b0:17b:3822:e5ea with SMTP id h21-20020a056a20159500b0017b3822e5eamr32426269pzj.19.1699365234357; Tue, 07 Nov 2023 05:53:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699365234; cv=none; d=google.com; s=arc-20160816; b=mTFGuCS7OEVdbuDhwng5GJCxDHQYQ2QNWW3/K5wCJ4EsxHZGjd/bijbSKBrkUmKqnn Q1Xs73ay63orKCR9EWoHGIywHv78Q2ul40De8Kos/ZoPmcUot10qL5Xw3znLJv+L8KCl EdK+VIP4rkP8bUaf2PGXGEJ/9b0M+MZynklK9LTRSxdEjbGtN2VGHRHoQjAVpAvM7Fz1 jlE7Dtmb7o9w7N5j3W3PkcfYyCIUT2OUgepalGN4O7TYg9i5R+Cyy12lltD7Edm7XEXX WzHR80ZCo/qwdNNiYRjD+D1+BbMC1XZFauxuMwWx/KcevvNDNztcUSAgxg8+ZPFsWtdA MGqw== 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=08kO3TqXRrI0feRF9tjTLMw8lSiJYl+i8wMBVxSEE0snD4Kg/aa/jHbBz4A0RoyRh2 3N7WeolGClHzFnjbQOZt/90K4tm1dsZJ3VuSchLIG+nd3TYtrvJ/zlrw7FLqlqqHgCKW 79hhtxvORx/aatAQ1wmJRU/rBqU7bC4iM0i38KugcmfUD2pVjpCfYvm5w+pDLQ7H+kFU rmJ4AyTmaG/Zh5ibmdc/eKbLT42Y4WmyYGBYrZV6PKp65n1FkQy/DpQeydAZWyAt2av3 1yEw3PK0HVFts3ik1G6R+POFy3Wl4jSsx8haXxM7DIb3kmatgFjda2o+bpz7geB0LyHM +Mfg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=UQXXwmHm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 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 fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id x15-20020a170902ec8f00b001cc54873f98si11546351plg.149.2023.11.07.05.53.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 05:53:54 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=UQXXwmHm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 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 fry.vger.email (Postfix) with ESMTP id 6B4CB8074045; Tue, 7 Nov 2023 05:53:35 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234430AbjKGNxA (ORCPT + 32 others); Tue, 7 Nov 2023 08:53:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50244 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234671AbjKGNwq (ORCPT ); Tue, 7 Nov 2023 08:52:46 -0500 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1FE6D30C5 for ; Tue, 7 Nov 2023 05:51:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1699365093; x=1730901093; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ok+C5VgX/V+ECchmrjizFZBWxdoj6QGhMwgM03J/+rE=; b=UQXXwmHm7Ryr8nkYuU+FDYLjDppQbmxhglkZmP69RT3NsGahOuVMnfK2 af+GRzPmM5ir0QzkuWvZkFpM3b4Apv/BBbL7vDI0N5adPjxRYJZuD3uax iACefUcsX2ihpVz4KezwqXf88WhQJardq6hIEVBFOOqcjazy1t75sp2Wz dXgRv5qD6sjkWYzrU30BGA0fqIPBxjijCy4MFwbm8/vIjTXMU6dMgJgAX KNN+ApYI/5psangjbNEb7OiDgnRYrEOkJsgqQw9S6I7G3IiG7xcjNTGZB dATVhYP+1re7PIEUDnUBoR2D6JRuw4InAKjJepbDdgZqvLAmhR7Uwtr/1 Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10886"; a="420618983" X-IronPort-AV: E=Sophos;i="6.03,283,1694761200"; d="scan'208";a="420618983" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Nov 2023 05:51:32 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10886"; a="762705126" X-IronPort-AV: E=Sophos;i="6.03,283,1694761200"; d="scan'208";a="762705126" Received: from sannilnx-dsk.jer.intel.com ([10.12.231.107]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Nov 2023 05:51:30 -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 3/5] mei: pxp: match without driver name Date: Tue, 7 Nov 2023 15:46:04 +0200 Message-Id: <20231107134606.316651-4-alexander.usyskin@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231107134606.316651-1-alexander.usyskin@intel.com> References: <20231107134606.316651-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 fry.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 (fry.vger.email [0.0.0.0]); Tue, 07 Nov 2023 05:53:35 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781913600111017530 X-GMAIL-MSGID: 1781913600111017530 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 7 13:46:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Usyskin, Alexander" X-Patchwork-Id: 162505 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:aa0b:0:b0:403:3b70:6f57 with SMTP id k11csp246337vqo; Tue, 7 Nov 2023 05:53:18 -0800 (PST) X-Google-Smtp-Source: AGHT+IEBqC0pTXDXW6ABJIqTT1quv799Tq8vu878cdfb6NzHl62RkU1XhEggJHQVzEIcfOeqD7RZ X-Received: by 2002:a05:6e02:1a42:b0:359:4f85:b215 with SMTP id u2-20020a056e021a4200b003594f85b215mr2764502ilv.31.1699365198688; Tue, 07 Nov 2023 05:53:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699365198; cv=none; d=google.com; s=arc-20160816; b=jnzcceLjbfg8puxhpPQBlTfRrRDqW5HjmBSb0toKG5YWZzrNEsXjk5QhZ1Kw5UnYCm mSr9MVhoWWwSEAkL8Yes+EcTdhFWOJa0bgY0WE4+Pdou7QFy700YBwJGeTmI3nv3/FpJ qCSn021qiTL4Pb1G8CnzijMwKXaW17+REmxSunFHVHipEonKpcRrn+tc9e97HY82ZFLY tCxsHLQiJb3bvoQ3K97G2424A/JeIWg2rIzlIO4LmxqQT5JehiGo1xoJiOzboRSeHxfX U8NKKiT/6vuhIvTY9SaGNW6QU3vLoK3kXi95m//W+knuC1O5SWKmN/vpdNimMjHT1IZK 0zvA== 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=VM80S6rS+aPZl1WsU+/JlRLjHGCjpTuEFEablHRx7uuczbeEkADEJAZCJPWwPDMdfL 9Q5kQ8GZKTDzVDc06dmrUCPcMXmXT1IhWWcbucxAdxbR0UDD2tqNw2Kf95GKYQ8Nussb BKB+hPvKVRGpy+WhSujU2uAZDXdwvRKAHA5vUkuACcALGu2kXy/gyxnx2XF0UJxzDM1V 1oma6PuomzlUsSmVDXJ/0m1NO/xJDXGHJOO9fY7ZejbnOvDN16OqurLL/D6QKd1e01vF Q8AOf2RGDZIDr4QgLWN49z2+kLil+E0jpy4QdsrUUhS7t/C73rttX7xBJ5jwuUFZhK/Y srFA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=IIN6lSuM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id bz35-20020a056a02062300b005b7e3ee1820si2355776pgb.157.2023.11.07.05.53.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 05:53:18 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=IIN6lSuM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 CF2788212AAF; Tue, 7 Nov 2023 05:53:17 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235117AbjKGNxI (ORCPT + 32 others); Tue, 7 Nov 2023 08:53:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50326 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234244AbjKGNwr (ORCPT ); Tue, 7 Nov 2023 08:52:47 -0500 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E871A1BF2 for ; Tue, 7 Nov 2023 05:51:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1699365095; x=1730901095; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=u05kUvN+yAfDdXI2QKGLoiNXnlaVTRU1zJvK+Z7HCwY=; b=IIN6lSuMyvr3GrA9i2hPP1vv1a/ruTRWzOMZEblLbLWiowlNDdVnrmaX viXw27Yt2nWe9JI8kTJvjGdAYSLrQ5P5vz4XFKhVv9G0PpsB42vKF1fvI PAQiAb5DxXZyT2hvY4QT3uw/R8LDoy2XO3a/bOFynBc5nPm0oZHH9xo4P Ud40p+OSWg8ieb2eyFCbT06+PGcTXgBezy4uGoJziJfrTqlYqqW0yGlBh 4seRSEwYp6RFxrsVDMdBKhFcO6DGtkkEH3wB9D+ZVq1Q0IX4iomxZEdMz ++9sSJyBnGtQz8fl44IeZ/3Cd6QooAJ+Fzb1BprdfsT2bYB9X6AtbT+Ln w==; X-IronPort-AV: E=McAfee;i="6600,9927,10886"; a="420618990" X-IronPort-AV: E=Sophos;i="6.03,283,1694761200"; d="scan'208";a="420618990" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Nov 2023 05:51:35 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10886"; a="762705140" X-IronPort-AV: E=Sophos;i="6.03,283,1694761200"; d="scan'208";a="762705140" Received: from sannilnx-dsk.jer.intel.com ([10.12.231.107]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Nov 2023 05:51:33 -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 4/5] mei: hdcp: add dependency on Xe driver Date: Tue, 7 Nov 2023 15:46:05 +0200 Message-Id: <20231107134606.316651-5-alexander.usyskin@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231107134606.316651-1-alexander.usyskin@intel.com> References: <20231107134606.316651-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,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, 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, 07 Nov 2023 05:53:17 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781913562387167814 X-GMAIL-MSGID: 1781913562387167814 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 7 13:46:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Usyskin, Alexander" X-Patchwork-Id: 162506 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:aa0b:0:b0:403:3b70:6f57 with SMTP id k11csp246378vqo; Tue, 7 Nov 2023 05:53:23 -0800 (PST) X-Google-Smtp-Source: AGHT+IGOKcP53iDGr9b3RJRF6up9ZN35MwxEC5UgvHVihXEb6H5NWOx3R5QSsAPwddI3M0Zi7m27 X-Received: by 2002:a05:6358:5925:b0:168:e4e4:b7c9 with SMTP id g37-20020a056358592500b00168e4e4b7c9mr31391302rwf.2.1699365202914; Tue, 07 Nov 2023 05:53:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699365202; cv=none; d=google.com; s=arc-20160816; b=b5nWPVsJb387MHKYOMeK/4qOH2pQCjF6sHNRwMUI8CbQFOkWlWhEM/lbbYxmQlhHP9 dnkKtTqAw8Dl3gPCO/Hu5VgKdkIGE6EAP1y2u2MURHpa+uR1WbI2b7AlMejCnM5iXf07 GeKN78yX/k2x2M9Y6GIIuoTzG4rY03AARTs7VJiHHvM5JO53x8tIu1QMmbsi4Xh9wmKa oSZ2q6daQWs1Nhx5TNXUuJLQP/NQX2PosF/kSH/ZOmFkPGtPihaz6pkEKF91dUK/nOT6 STKs9rNBhgTC3fKDFmPc251OIGUQl5RFZV8Y2Gk5EnrMU+jGvYMswxnMvBsE2AsJAIwj TLfQ== 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=lbIr/r596K/PfKKdKsnxZylmGEmis8A2EkJ0bm4S2O8=; fh=7xjKU1xkhmTazBlAQtMk+Chl7JSt/CUyagAgyiLWmTI=; b=JQlHIcgx8V/MLPDVkFHrL/CD+FKvnpyhvyWeg4LjApXEh2qvwK3gJian6K1NPaKybL lanCFye1gd/FvEklQo5pZ9EFqtHm21sYQVS7rfHA5kZ7tY6QwOzZl9c0GvyME0VJB+tr Y7U+iRgo10twsdejU3cCwJ3rER7aKLQi79jmPx2TCEqQNE35ejievgpAQ1VKNX/E5Yhr kVwnXVBxuTCQD1fE4FtgrdYiquwGoB3Da51mJRcxxNYYwexkInFzukjVAcct1JTx9629 X87u9TVn2pZbMr7UGgrmI2Sc06NHF1llyB5hnWqH+6E7f5vComkEpAmPMiMEAPfYlZub mfJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=TccKmYCe; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id x64-20020a638643000000b00577680ccf1bsi2155807pgd.709.2023.11.07.05.53.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 05:53:22 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=TccKmYCe; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 85B2D8213F07; Tue, 7 Nov 2023 05:53:21 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235145AbjKGNxQ (ORCPT + 32 others); Tue, 7 Nov 2023 08:53:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36876 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234864AbjKGNwu (ORCPT ); Tue, 7 Nov 2023 08:52:50 -0500 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8F7BE1BEE for ; Tue, 7 Nov 2023 05:51:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1699365098; x=1730901098; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=02x+W128VpIYn+5YfVSOjhxH8di389e/MrFXYQHtvXE=; b=TccKmYCeIpgyynrqiqIgflk/6ElvRxBiGnRPVLZpwAnFzVdtjcmk51rg OiMLOkfUtdYiF9eIqqIm69WPM9BytIRtXRWBy8C/W5Bg3tOf4Rvm5rtk2 Dpdr/PNFi6mxxzrMnZhLSK2XE/RdVAIEVo7xEHXoXcvF2b6JhUJUdaPE0 JwfdUfEzLXCz7OQfdTQrBBI9vqYFI5WcCTV4RucHUmK9cddhjVN8ylaUV RaZ5UpdigQifBkjiexaVMetkPQYFJF8tcYNIpRFMaAGk9WbyblNQjDTOO jmKJi7zWXBDNiCPbxP/vj441Wv5gk7nIL476+SAFaZk4IbTx4nfGr2+Db w==; X-IronPort-AV: E=McAfee;i="6600,9927,10886"; a="420618999" X-IronPort-AV: E=Sophos;i="6.03,283,1694761200"; d="scan'208";a="420618999" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Nov 2023 05:51:38 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10886"; a="762705160" X-IronPort-AV: E=Sophos;i="6.03,283,1694761200"; d="scan'208";a="762705160" Received: from sannilnx-dsk.jer.intel.com ([10.12.231.107]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Nov 2023 05:51:35 -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 5/5] mei: pxp: add dependency on Xe driver Date: Tue, 7 Nov 2023 15:46:06 +0200 Message-Id: <20231107134606.316651-6-alexander.usyskin@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231107134606.316651-1-alexander.usyskin@intel.com> References: <20231107134606.316651-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,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, 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, 07 Nov 2023 05:53:21 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781913566570528718 X-GMAIL-MSGID: 1781913566570528718 Optionally depend on either i915 or Xe drivers. Signed-off-by: Alexander Usyskin --- drivers/misc/mei/pxp/Kconfig | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/misc/mei/pxp/Kconfig b/drivers/misc/mei/pxp/Kconfig index 4029b96afc04..d9ae5483567f 100644 --- a/drivers/misc/mei/pxp/Kconfig +++ b/drivers/misc/mei/pxp/Kconfig @@ -1,11 +1,10 @@ - # SPDX-License-Identifier: GPL-2.0 # Copyright (c) 2020, Intel Corporation. All rights reserved. # 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.