On 2020-10-20 at 11:31:37 +0300, Jani Nikula wrote: > On Mon, 19 Oct 2020, Anshuman Gupta <anshuman.gupta@xxxxxxxxx> 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 <ramalingam.c@xxxxxxxxx> > > Signed-off-by: Anshuman Gupta <anshuman.gupta@xxxxxxxxx> > > --- > > .../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. Thanks, Anshuman Gupta. > > Cc: Tomas. > > > BR, > Jani. > > > -- > Jani Nikula, Intel Open Source Graphics Center _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel
