* Re: [Intel-gfx] [PATCH 09/13] drm/i915/hdcp: mst streams support in hdcp port_data [not found] ` <20201019102041.26178-1-anshuman.gupta@intel.com> @ 2020-10-20 8:31 ` Jani Nikula 2020-10-20 8:30 ` Anshuman Gupta 0 siblings, 1 reply; 5+ messages in thread From: Jani Nikula @ 2020-10-20 8:31 UTC (permalink / raw) To: Anshuman Gupta, intel-gfx; +Cc: Tomas Winkler, seanpaul, dri-devel On Mon, 19 Oct 2020, Anshuman Gupta <anshuman.gupta@intel.com> 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@intel.com> > Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com> > --- > .../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. Cc: Tomas. BR, Jani. -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Intel-gfx] [PATCH 09/13] drm/i915/hdcp: mst streams support in hdcp port_data 2020-10-20 8:31 ` [Intel-gfx] [PATCH 09/13] drm/i915/hdcp: mst streams support in hdcp port_data Jani Nikula @ 2020-10-20 8:30 ` Anshuman Gupta 2020-10-20 9:39 ` Jani Nikula 0 siblings, 1 reply; 5+ messages in thread From: Anshuman Gupta @ 2020-10-20 8:30 UTC (permalink / raw) To: Jani Nikula; +Cc: intel-gfx, seanpaul, Tomas Winkler, dri-devel On 2020-10-20 at 11:31:37 +0300, Jani Nikula wrote: > On Mon, 19 Oct 2020, Anshuman Gupta <anshuman.gupta@intel.com> 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@intel.com> > > Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com> > > --- > > .../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@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Intel-gfx] [PATCH 09/13] drm/i915/hdcp: mst streams support in hdcp port_data 2020-10-20 8:30 ` Anshuman Gupta @ 2020-10-20 9:39 ` Jani Nikula 2020-10-20 9:38 ` Anshuman Gupta 0 siblings, 1 reply; 5+ messages in thread From: Jani Nikula @ 2020-10-20 9:39 UTC (permalink / raw) To: Anshuman Gupta; +Cc: intel-gfx, seanpaul, Tomas Winkler, dri-devel On Tue, 20 Oct 2020, Anshuman Gupta <anshuman.gupta@intel.com> wrote: > On 2020-10-20 at 11:31:37 +0300, Jani Nikula wrote: >> On Mon, 19 Oct 2020, Anshuman Gupta <anshuman.gupta@intel.com> 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@intel.com> >> > Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com> >> > --- >> > .../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. BR, Jani. > Thanks, > Anshuman Gupta. >> >> Cc: Tomas. >> >> >> BR, >> Jani. >> >> >> -- >> Jani Nikula, Intel Open Source Graphics Center -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Intel-gfx] [PATCH 09/13] drm/i915/hdcp: mst streams support in hdcp port_data 2020-10-20 9:39 ` Jani Nikula @ 2020-10-20 9:38 ` Anshuman Gupta 2020-10-20 10:18 ` Jani Nikula 0 siblings, 1 reply; 5+ messages in thread From: Anshuman Gupta @ 2020-10-20 9:38 UTC (permalink / raw) To: Jani Nikula; +Cc: intel-gfx, seanpaul, Tomas Winkler, dri-devel On 2020-10-20 at 12:39:04 +0300, Jani Nikula wrote: > On Tue, 20 Oct 2020, Anshuman Gupta <anshuman.gupta@intel.com> wrote: > > On 2020-10-20 at 11:31:37 +0300, Jani Nikula wrote: > >> On Mon, 19 Oct 2020, Anshuman Gupta <anshuman.gupta@intel.com> 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@intel.com> > >> > Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com> > >> > --- > >> > .../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. > > BR, > Jani. > > > > Thanks, > > Anshuman Gupta. > >> > >> Cc: Tomas. > >> > >> > >> BR, > >> Jani. > >> > >> > >> -- > >> Jani Nikula, Intel Open Source Graphics Center > > -- > Jani Nikula, Intel Open Source Graphics Center _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Intel-gfx] [PATCH 09/13] drm/i915/hdcp: mst streams support in hdcp port_data 2020-10-20 9:38 ` Anshuman Gupta @ 2020-10-20 10:18 ` Jani Nikula 0 siblings, 0 replies; 5+ messages in thread From: Jani Nikula @ 2020-10-20 10:18 UTC (permalink / raw) To: Anshuman Gupta; +Cc: intel-gfx, seanpaul, Tomas Winkler, dri-devel On Tue, 20 Oct 2020, Anshuman Gupta <anshuman.gupta@intel.com> wrote: > On 2020-10-20 at 12:39:04 +0300, Jani Nikula wrote: >> On Tue, 20 Oct 2020, Anshuman Gupta <anshuman.gupta@intel.com> wrote: >> > On 2020-10-20 at 11:31:37 +0300, Jani Nikula wrote: >> >> On Mon, 19 Oct 2020, Anshuman Gupta <anshuman.gupta@intel.com> 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@intel.com> >> >> > Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com> >> >> > --- >> >> > .../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 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-10-20 10:18 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20201014045252.13608-10-anshuman.gupta@intel.com>
[not found] ` <20201019102041.26178-1-anshuman.gupta@intel.com>
2020-10-20 8:31 ` [Intel-gfx] [PATCH 09/13] drm/i915/hdcp: mst streams support in hdcp port_data Jani Nikula
2020-10-20 8:30 ` Anshuman Gupta
2020-10-20 9:39 ` Jani Nikula
2020-10-20 9:38 ` Anshuman Gupta
2020-10-20 10:18 ` Jani Nikula
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox