| Message ID | 20201020133906.23710-10-anshuman.gupta@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2,01/15] drm/i915/hdcp: Update CP property in update_pipe | expand |
On Tue, 20 Oct 2020, Anshuman Gupta <anshuman.gupta@intel.com> wrote: > Fix the size of WIRED_REPEATER_AUTH_STREAM_REQ cmd buffer size. > It is based upon the actual number of MST streams and size > of wired_cmd_repeater_auth_stream_req_in. > Excluding the size of hdcp_cmd_header. > > Cc: Tomas Winkler <tomas.winkler@intel.com> > Cc: Ramalingam C <ramalingam.c@intel.com> > Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com> Tomas, ack to merge this via drm-intel? Thanks, Jani. > --- > drivers/misc/mei/hdcp/mei_hdcp.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > 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;
> > On Tue, 20 Oct 2020, Anshuman Gupta <anshuman.gupta@intel.com> wrote: > > Fix the size of WIRED_REPEATER_AUTH_STREAM_REQ cmd buffer size. > > It is based upon the actual number of MST streams and size of > > wired_cmd_repeater_auth_stream_req_in. > > Excluding the size of hdcp_cmd_header. > > > > Cc: Tomas Winkler <tomas.winkler@intel.com> > > Cc: Ramalingam C <ramalingam.c@intel.com> > > Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com> > > Tomas, ack to merge this via drm-intel? I have no problem with merging it via drm-intel, just see a little nitpick bellow: > Thanks, > Jani. > > > --- > > drivers/misc/mei/hdcp/mei_hdcp.c | 3 +-- > > 1 file changed, 1 insertion(+), 2 deletions(-) > > > > 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// > > @@ -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); I believe the following annotation would be preferable: cmd_size - sizeof(verify_mprime_in->header) > > > > verify_mprime_in->port.integrated_port_type = data->port_type; > > verify_mprime_in->port.physical_port = (u8)data->fw_ddi; > > -- > Jani Nikula, Intel Open Source Graphics Center
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;
Fix the size of WIRED_REPEATER_AUTH_STREAM_REQ cmd buffer size. It is based upon the actual number of MST streams and size of wired_cmd_repeater_auth_stream_req_in. Excluding the size of hdcp_cmd_header. Cc: Tomas Winkler <tomas.winkler@intel.com> Cc: Ramalingam C <ramalingam.c@intel.com> Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com> --- drivers/misc/mei/hdcp/mei_hdcp.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)