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;