| Message ID | 20190827105014.14181-4-ramalingam.c@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915: Enable HDCP 1.4 and 2.2 on Gen12+ | expand |
> > I915 needs to send the index of the transcoder as per ME FW. > > To support this, define enum mei_fw_tc and add as a member into the struct > hdcp_port_data. > > v2: > Typo in commit msg is fixed [Shashank] > > Signed-off-by: Ramalingam C <ramalingam.c@intel.com> > Acked-by: Jani Nikula <jani.nikula@intel.com> > --- > include/drm/i915_mei_hdcp_interface.h | 13 +++++++++++++ > 1 file changed, 13 insertions(+) > > diff --git a/include/drm/i915_mei_hdcp_interface.h > b/include/drm/i915_mei_hdcp_interface.h > index a97acf1c9710..0de629bf2f62 100644 > --- a/include/drm/i915_mei_hdcp_interface.h > +++ b/include/drm/i915_mei_hdcp_interface.h > @@ -54,9 +54,21 @@ enum mei_fw_ddi { > MEI_DDI_RANGE_END = MEI_DDI_A, > }; > > +enum mei_fw_tc { > + MEI_INVALID_TRANSCODER = 0x00, /* Invalid transcoder type */ > + MEI_TC_EDP, /* Transcoder for eDP */ > + MEI_TC_DSI0, /* Transcoder for DSI0 */ > + MEI_TC_DSI1, /* Transcoder for DSI1 */ > + MEI_TC_A = 0x10, /* Transcoder TCA */ > + MEI_TC_B, /* Transcoder TCB */ > + MEI_TC_C, /* Transcoder TCC */ > + MEI_TC_D /* Transcoder TCD */ > +}; You should use kdoc format here, please. https://www.kernel.org/doc/html/v5.2/doc-guide/kernel-doc.html Also TCA just means Transcoder A or TC has other meaning? > + > /** > * struct hdcp_port_data - intel specific HDCP port data > * @fw_ddi: ddi index as per ME FW > + * @fw_tc: transcoder index as per ME FW > * @port_type: HDCP port type as per ME FW classification > * @protocol: HDCP adaptation as per ME FW > * @k: No of streams transmitted on a port. Only on DP MST this is != 1 @@ - > 69,6 +81,7 @@ enum mei_fw_ddi { > */ > struct hdcp_port_data { > enum mei_fw_ddi fw_ddi; > + enum mei_fw_tc fw_tc; > u8 port_type; > u8 protocol; > u16 k; > -- > 2.20.1
On 2019-08-27 at 19:30:23 +0530, Winkler, Tomas wrote: > > > > I915 needs to send the index of the transcoder as per ME FW. > > > > To support this, define enum mei_fw_tc and add as a member into the struct > > hdcp_port_data. > > > > v2: > > Typo in commit msg is fixed [Shashank] > > > > Signed-off-by: Ramalingam C <ramalingam.c@intel.com> > > Acked-by: Jani Nikula <jani.nikula@intel.com> > > --- > > include/drm/i915_mei_hdcp_interface.h | 13 +++++++++++++ > > 1 file changed, 13 insertions(+) > > > > diff --git a/include/drm/i915_mei_hdcp_interface.h > > b/include/drm/i915_mei_hdcp_interface.h > > index a97acf1c9710..0de629bf2f62 100644 > > --- a/include/drm/i915_mei_hdcp_interface.h > > +++ b/include/drm/i915_mei_hdcp_interface.h > > @@ -54,9 +54,21 @@ enum mei_fw_ddi { > > MEI_DDI_RANGE_END = MEI_DDI_A, > > }; > > > > +enum mei_fw_tc { > > + MEI_INVALID_TRANSCODER = 0x00, /* Invalid transcoder type */ > > + MEI_TC_EDP, /* Transcoder for eDP */ > > + MEI_TC_DSI0, /* Transcoder for DSI0 */ > > + MEI_TC_DSI1, /* Transcoder for DSI1 */ > > + MEI_TC_A = 0x10, /* Transcoder TCA */ > > + MEI_TC_B, /* Transcoder TCB */ > > + MEI_TC_C, /* Transcoder TCC */ > > + MEI_TC_D /* Transcoder TCD */ > > +}; > > You should use kdoc format here, please. https://www.kernel.org/doc/html/v5.2/doc-guide/kernel-doc.html > Also TCA just means Transcoder A or TC has other meaning? TCA stands for TRANSCODER A only. Sure I will use kdoc format. -Ram > > > + > > /** > > * struct hdcp_port_data - intel specific HDCP port data > > * @fw_ddi: ddi index as per ME FW > > + * @fw_tc: transcoder index as per ME FW > > * @port_type: HDCP port type as per ME FW classification > > * @protocol: HDCP adaptation as per ME FW > > * @k: No of streams transmitted on a port. Only on DP MST this is != 1 @@ - > > 69,6 +81,7 @@ enum mei_fw_ddi { > > */ > > struct hdcp_port_data { > > enum mei_fw_ddi fw_ddi; > > + enum mei_fw_tc fw_tc; > > u8 port_type; > > u8 protocol; > > u16 k; > > -- > > 2.20.1 >
diff --git a/include/drm/i915_mei_hdcp_interface.h b/include/drm/i915_mei_hdcp_interface.h index a97acf1c9710..0de629bf2f62 100644 --- a/include/drm/i915_mei_hdcp_interface.h +++ b/include/drm/i915_mei_hdcp_interface.h @@ -54,9 +54,21 @@ enum mei_fw_ddi { MEI_DDI_RANGE_END = MEI_DDI_A, }; +enum mei_fw_tc { + MEI_INVALID_TRANSCODER = 0x00, /* Invalid transcoder type */ + MEI_TC_EDP, /* Transcoder for eDP */ + MEI_TC_DSI0, /* Transcoder for DSI0 */ + MEI_TC_DSI1, /* Transcoder for DSI1 */ + MEI_TC_A = 0x10, /* Transcoder TCA */ + MEI_TC_B, /* Transcoder TCB */ + MEI_TC_C, /* Transcoder TCC */ + MEI_TC_D /* Transcoder TCD */ +}; + /** * struct hdcp_port_data - intel specific HDCP port data * @fw_ddi: ddi index as per ME FW + * @fw_tc: transcoder index as per ME FW * @port_type: HDCP port type as per ME FW classification * @protocol: HDCP adaptation as per ME FW * @k: No of streams transmitted on a port. Only on DP MST this is != 1 @@ -69,6 +81,7 @@ enum mei_fw_ddi { */ struct hdcp_port_data { enum mei_fw_ddi fw_ddi; + enum mei_fw_tc fw_tc; u8 port_type; u8 protocol; u16 k;