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;