From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 77E38C43457 for ; Tue, 20 Oct 2020 10:18:34 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 14B562222D for ; Tue, 20 Oct 2020 10:18:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 14B562222D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id F26CA6EC41; Tue, 20 Oct 2020 10:18:32 +0000 (UTC) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id BD4626E14B; Tue, 20 Oct 2020 10:18:30 +0000 (UTC) IronPort-SDR: 8gEkFpfIyCyYU8O26mgL8rSMJmDE4mq01tLQ+wdL2aEolJv9iZl9xKHI35DggL7wcLZ9XXOsmV NvsoGar7436g== X-IronPort-AV: E=McAfee;i="6000,8403,9779"; a="167275362" X-IronPort-AV: E=Sophos;i="5.77,396,1596524400"; d="scan'208";a="167275362" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Oct 2020 03:18:30 -0700 IronPort-SDR: ENW6jSXtBKwfXTQapT1n6QXXj3YDrBdGOGflKL4KeV+6KzAtQ9a8ijxXn2OPLUs+CikV/4L+WC mzRrGi+RuKfQ== X-IronPort-AV: E=Sophos;i="5.77,396,1596524400"; d="scan'208";a="523452124" Received: from bneville-mobl5.ger.corp.intel.com (HELO localhost) ([10.252.6.14]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Oct 2020 03:18:27 -0700 From: Jani Nikula To: Anshuman Gupta In-Reply-To: <20201020093841.GY25390@intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20201014045252.13608-10-anshuman.gupta@intel.com> <20201019102041.26178-1-anshuman.gupta@intel.com> <878sc19u3a.fsf@intel.com> <20201020083059.GW25390@intel.com> <875z759qyv.fsf@intel.com> <20201020093841.GY25390@intel.com> Date: Tue, 20 Oct 2020 13:18:25 +0300 Message-ID: <87wnzl8aku.fsf@intel.com> MIME-Version: 1.0 Subject: Re: [Intel-gfx] [PATCH 09/13] drm/i915/hdcp: mst streams support in hdcp port_data X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: intel-gfx@lists.freedesktop.org, seanpaul@chromium.org, Tomas Winkler , dri-devel@lists.freedesktop.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Tue, 20 Oct 2020, Anshuman Gupta wrote: > On 2020-10-20 at 12:39:04 +0300, Jani Nikula wrote: >> On Tue, 20 Oct 2020, Anshuman Gupta wrote: >> > On 2020-10-20 at 11:31:37 +0300, Jani Nikula wrote: >> >> On Mon, 19 Oct 2020, Anshuman Gupta wrote: >> >> > Add support for multiple mst stream in hdcp port data >> >> > which will be used by RepeaterAuthStreamManage msg and >> >> > HDCP 2.2 security f/w for m' validation. >> >> > >> >> > v2: >> >> > Init the hdcp port data k for HDMI/DP SST strem. >> >> > >> >> > Cc: Ramalingam C >> >> > Signed-off-by: Anshuman Gupta >> >> > --- >> >> > .../drm/i915/display/intel_display_types.h | 4 +- >> >> > drivers/gpu/drm/i915/display/intel_hdcp.c | 92 ++++++++++++++++--- >> >> > drivers/misc/mei/hdcp/mei_hdcp.c | 3 +- >> >> > include/drm/drm_hdcp.h | 8 +- >> >> >> >> ... >> >> >> >> > diff --git a/drivers/misc/mei/hdcp/mei_hdcp.c b/drivers/misc/mei/hdcp/mei_hdcp.c >> >> > index 9ae9669e46ea..b10d266fb60a 100644 >> >> > --- a/drivers/misc/mei/hdcp/mei_hdcp.c >> >> > +++ b/drivers/misc/mei/hdcp/mei_hdcp.c >> >> > @@ -569,8 +569,7 @@ static int mei_hdcp_verify_mprime(struct device *dev, >> >> > verify_mprime_in->header.api_version = HDCP_API_VERSION; >> >> > verify_mprime_in->header.command_id = WIRED_REPEATER_AUTH_STREAM_REQ; >> >> > verify_mprime_in->header.status = ME_HDCP_STATUS_SUCCESS; >> >> > - verify_mprime_in->header.buffer_len = >> >> > - WIRED_CMD_BUF_LEN_REPEATER_AUTH_STREAM_REQ_MIN_IN; >> >> > + verify_mprime_in->header.buffer_len = cmd_size - sizeof(struct hdcp_cmd_header); >> >> > >> >> > verify_mprime_in->port.integrated_port_type = data->port_type; >> >> > verify_mprime_in->port.physical_port = (u8)data->fw_ddi; >> >> > diff --git a/include/drm/drm_hdcp.h b/include/drm/drm_hdcp.h >> >> > index fe58dbb46962..c8a37bb406b2 100644 >> >> > --- a/include/drm/drm_hdcp.h >> >> > +++ b/include/drm/drm_hdcp.h >> >> > @@ -101,11 +101,11 @@ >> >> > >> >> > /* Following Macros take a byte at a time for bit(s) masking */ >> >> > /* >> >> > - * TODO: This has to be changed for DP MST, as multiple stream on >> >> > - * same port is possible. >> >> > - * For HDCP2.2 on HDMI and DP SST this value is always 1. >> >> > + * TODO: This is based upon actual H/W MST streams capacity. >> >> > + * >> >> > + * This is should be moved out to platform specific header. >> >> > */ >> >> > -#define HDCP_2_2_MAX_CONTENT_STREAMS_CNT 1 >> >> > +#define HDCP_2_2_MAX_CONTENT_STREAMS_CNT 4 >> >> > #define HDCP_2_2_TXCAP_MASK_LEN 2 >> >> > #define HDCP_2_2_RXCAPS_LEN 3 >> >> > #define HDCP_2_2_RX_REPEATER(x) ((x) & BIT(0)) >> >> >> >> These two hunk should probably be separate changes... would be easier to >> >> record the changes (as they're not mentioned in the commit message at >> >> all!) and the acks from other maintainers. >> > Thanks Jani for comment, as this need to sens DRI too, so I formatted a >> > separate patch to avoid other related HDCP noise. >> > https://patchwork.freedesktop.org/series/82806/ >> > Based upon ack of maintainers i will rebase my this series. >> >> I see the mei change as more important to be split out to be honest, and >> I'd prefer all of these to be retained in the same *series* albeit as >> separate patches. We'll want to get the acks to merge via drm-intel as >> dependencies, instead of them being merged directly in their trees and >> then waiting for weeks for merges and backmerges. > Sure i will do that this with same series. Please be sure to record the ack we got from Maarten. BR, Jani. >> >> BR, >> Jani. >> >> >> > Thanks, >> > Anshuman Gupta. >> >> >> >> Cc: Tomas. >> >> >> >> >> >> BR, >> >> Jani. >> >> >> >> >> >> -- >> >> Jani Nikula, Intel Open Source Graphics Center >> >> -- >> Jani Nikula, Intel Open Source Graphics Center -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx