[v11,3/6] drm: Extend I915 mei interface for transcoder info
diff mbox series

Message ID 20190828072823.4832-4-ramalingam.c@intel.com
State New
Headers show
Series
  • drm/i915: Enable HDCP 1.4 and 2.2 on Gen12+
Related show

Commit Message

Ramalingam C Aug. 28, 2019, 7:28 a.m. UTC
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]
v3:
  kdoc is added for mei_fw_tc [Tomas]
  s/MEI_TC_x/MEI_TRANSCODER_x

Signed-off-by: Ramalingam C <ramalingam.c@intel.com>
Acked-by: Jani Nikula <jani.nikula@intel.com>
---
 include/drm/i915_mei_hdcp_interface.h | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

Comments

Winkler, Tomas Aug. 28, 2019, 7:58 a.m. UTC | #1
> 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]
> v3:
>   kdoc is added for mei_fw_tc [Tomas]
>   s/MEI_TC_x/MEI_TRANSCODER_x
> 
> Signed-off-by: Ramalingam C <ramalingam.c@intel.com>
> Acked-by: Jani Nikula <jani.nikula@intel.com>

LGTM, just need to updated the copyright year.

> ---
>  include/drm/i915_mei_hdcp_interface.h | 24 ++++++++++++++++++++++++
>  1 file changed, 24 insertions(+)
> 
> diff --git a/include/drm/i915_mei_hdcp_interface.h
> b/include/drm/i915_mei_hdcp_interface.h
> index 08670aa650d4..4d48de8890ca 100644
> --- a/include/drm/i915_mei_hdcp_interface.h
> +++ b/include/drm/i915_mei_hdcp_interface.h
> @@ -54,9 +54,32 @@ enum mei_fw_ddi {
>  	MEI_DDI_RANGE_END = MEI_DDI_A,
>  };
> 
> +/**
> + * enum mei_fw_tc - ME Firmware defined index for transcoders
> + * @MEI_INVALID_TRANSCODER: Index for Invalid transcoder
> + * @MEI_TRANSCODER_EDP: Index for EDP Transcoder
> + * @MEI_TRANSCODER_DSI0: Index for DSI0 Transcoder
> + * @MEI_TRANSCODER_DSI1: Index for DSI1 Transcoder
> + * @MEI_TRANSCODER_A: Index for Transcoder A
> + * @MEI_TRANSCODER_B: Index for Transcoder B
> + * @MEI_TRANSCODER_C: Index for Transcoder C
> + * @MEI_TRANSCODER_D: Index for Transcoder D  */ enum mei_fw_tc {
> +	MEI_INVALID_TRANSCODER = 0x00,
> +	MEI_TRANSCODER_EDP,
> +	MEI_TRANSCODER_DSI0,
> +	MEI_TRANSCODER_DSI1,
> +	MEI_TRANSCODER_A = 0x10,
> +	MEI_TRANSCODER_B,
> +	MEI_TRANSCODER_C,
> +	MEI_TRANSCODER_D
> +};
> +
>  /**
>   * 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 +92,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
Ramalingam C Aug. 28, 2019, 8:17 a.m. UTC | #2
On 2019-08-28 at 13:28:06 +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]
> > v3:
> >   kdoc is added for mei_fw_tc [Tomas]
> >   s/MEI_TC_x/MEI_TRANSCODER_x
> > 
> > Signed-off-by: Ramalingam C <ramalingam.c@intel.com>
> > Acked-by: Jani Nikula <jani.nikula@intel.com>
> 
> LGTM, just need to updated the copyright year.
Tomas,

Copyright year for this i915_mei_hdcp_interface.h is updated in the 1st patch itself.

-Ram
> 
> > ---
> >  include/drm/i915_mei_hdcp_interface.h | 24 ++++++++++++++++++++++++
> >  1 file changed, 24 insertions(+)
> > 
> > diff --git a/include/drm/i915_mei_hdcp_interface.h
> > b/include/drm/i915_mei_hdcp_interface.h
> > index 08670aa650d4..4d48de8890ca 100644
> > --- a/include/drm/i915_mei_hdcp_interface.h
> > +++ b/include/drm/i915_mei_hdcp_interface.h
> > @@ -54,9 +54,32 @@ enum mei_fw_ddi {
> >  	MEI_DDI_RANGE_END = MEI_DDI_A,
> >  };
> > 
> > +/**
> > + * enum mei_fw_tc - ME Firmware defined index for transcoders
> > + * @MEI_INVALID_TRANSCODER: Index for Invalid transcoder
> > + * @MEI_TRANSCODER_EDP: Index for EDP Transcoder
> > + * @MEI_TRANSCODER_DSI0: Index for DSI0 Transcoder
> > + * @MEI_TRANSCODER_DSI1: Index for DSI1 Transcoder
> > + * @MEI_TRANSCODER_A: Index for Transcoder A
> > + * @MEI_TRANSCODER_B: Index for Transcoder B
> > + * @MEI_TRANSCODER_C: Index for Transcoder C
> > + * @MEI_TRANSCODER_D: Index for Transcoder D  */ enum mei_fw_tc {
> > +	MEI_INVALID_TRANSCODER = 0x00,
> > +	MEI_TRANSCODER_EDP,
> > +	MEI_TRANSCODER_DSI0,
> > +	MEI_TRANSCODER_DSI1,
> > +	MEI_TRANSCODER_A = 0x10,
> > +	MEI_TRANSCODER_B,
> > +	MEI_TRANSCODER_C,
> > +	MEI_TRANSCODER_D
> > +};
> > +
> >  /**
> >   * 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 +92,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
>
Winkler, Tomas Aug. 28, 2019, 8:18 a.m. UTC | #3
> 
> On 2019-08-28 at 13:28:06 +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]
> > > v3:
> > >   kdoc is added for mei_fw_tc [Tomas]
> > >   s/MEI_TC_x/MEI_TRANSCODER_x
> > >
> > > Signed-off-by: Ramalingam C <ramalingam.c@intel.com>
> > > Acked-by: Jani Nikula <jani.nikula@intel.com>
> >
> > LGTM, just need to updated the copyright year.
> Tomas,
> 
> Copyright year for this i915_mei_hdcp_interface.h is updated in the 1st patch
> itself.

Okay.
> 
> -Ram
> >
> > > ---
> > >  include/drm/i915_mei_hdcp_interface.h | 24
> ++++++++++++++++++++++++
> > >  1 file changed, 24 insertions(+)
> > >
> > > diff --git a/include/drm/i915_mei_hdcp_interface.h
> > > b/include/drm/i915_mei_hdcp_interface.h
> > > index 08670aa650d4..4d48de8890ca 100644
> > > --- a/include/drm/i915_mei_hdcp_interface.h
> > > +++ b/include/drm/i915_mei_hdcp_interface.h
> > > @@ -54,9 +54,32 @@ enum mei_fw_ddi {
> > >  	MEI_DDI_RANGE_END = MEI_DDI_A,
> > >  };
> > >
> > > +/**
> > > + * enum mei_fw_tc - ME Firmware defined index for transcoders
> > > + * @MEI_INVALID_TRANSCODER: Index for Invalid transcoder
> > > + * @MEI_TRANSCODER_EDP: Index for EDP Transcoder
> > > + * @MEI_TRANSCODER_DSI0: Index for DSI0 Transcoder
> > > + * @MEI_TRANSCODER_DSI1: Index for DSI1 Transcoder
> > > + * @MEI_TRANSCODER_A: Index for Transcoder A
> > > + * @MEI_TRANSCODER_B: Index for Transcoder B
> > > + * @MEI_TRANSCODER_C: Index for Transcoder C
> > > + * @MEI_TRANSCODER_D: Index for Transcoder D  */ enum mei_fw_tc {
> > > +	MEI_INVALID_TRANSCODER = 0x00,
> > > +	MEI_TRANSCODER_EDP,
> > > +	MEI_TRANSCODER_DSI0,
> > > +	MEI_TRANSCODER_DSI1,
> > > +	MEI_TRANSCODER_A = 0x10,
> > > +	MEI_TRANSCODER_B,
> > > +	MEI_TRANSCODER_C,
> > > +	MEI_TRANSCODER_D
> > > +};
> > > +
> > >  /**
> > >   * 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 +92,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
> >
Sharma, Shashank Aug. 28, 2019, 1:47 p.m. UTC | #4
Looks good to me,
From display side, Please feel free to use Reviewed-by: Shashank Sharma <shashank.sharma@intel.com>

Regards
Shashank
> -----Original Message-----
> From: Winkler, Tomas
> Sent: Wednesday, August 28, 2019 1:49 PM
> To: C, Ramalingam <ramalingam.c@intel.com>
> Cc: intel-gfx <intel-gfx@lists.freedesktop.org>; dri-devel <dri-
> devel@lists.freedesktop.org>; Sharma, Shashank <shashank.sharma@intel.com>;
> Daniel Vetter <daniel@ffwll.ch>; Nikula, Jani <jani.nikula@intel.com>
> Subject: RE: [PATCH v11 3/6] drm: Extend I915 mei interface for transcoder info
> 
> 
> 
> >
> > On 2019-08-28 at 13:28:06 +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]
> > > > v3:
> > > >   kdoc is added for mei_fw_tc [Tomas]
> > > >   s/MEI_TC_x/MEI_TRANSCODER_x
> > > >
> > > > Signed-off-by: Ramalingam C <ramalingam.c@intel.com>
> > > > Acked-by: Jani Nikula <jani.nikula@intel.com>
> > >
> > > LGTM, just need to updated the copyright year.
> > Tomas,
> >
> > Copyright year for this i915_mei_hdcp_interface.h is updated in the
> > 1st patch itself.
> 
> Okay.
> >
> > -Ram
> > >
> > > > ---
> > > >  include/drm/i915_mei_hdcp_interface.h | 24
> > ++++++++++++++++++++++++
> > > >  1 file changed, 24 insertions(+)
> > > >
> > > > diff --git a/include/drm/i915_mei_hdcp_interface.h
> > > > b/include/drm/i915_mei_hdcp_interface.h
> > > > index 08670aa650d4..4d48de8890ca 100644
> > > > --- a/include/drm/i915_mei_hdcp_interface.h
> > > > +++ b/include/drm/i915_mei_hdcp_interface.h
> > > > @@ -54,9 +54,32 @@ enum mei_fw_ddi {
> > > >  	MEI_DDI_RANGE_END = MEI_DDI_A,
> > > >  };
> > > >
> > > > +/**
> > > > + * enum mei_fw_tc - ME Firmware defined index for transcoders
> > > > + * @MEI_INVALID_TRANSCODER: Index for Invalid transcoder
> > > > + * @MEI_TRANSCODER_EDP: Index for EDP Transcoder
> > > > + * @MEI_TRANSCODER_DSI0: Index for DSI0 Transcoder
> > > > + * @MEI_TRANSCODER_DSI1: Index for DSI1 Transcoder
> > > > + * @MEI_TRANSCODER_A: Index for Transcoder A
> > > > + * @MEI_TRANSCODER_B: Index for Transcoder B
> > > > + * @MEI_TRANSCODER_C: Index for Transcoder C
> > > > + * @MEI_TRANSCODER_D: Index for Transcoder D  */ enum mei_fw_tc {
> > > > +	MEI_INVALID_TRANSCODER = 0x00,
> > > > +	MEI_TRANSCODER_EDP,
> > > > +	MEI_TRANSCODER_DSI0,
> > > > +	MEI_TRANSCODER_DSI1,
> > > > +	MEI_TRANSCODER_A = 0x10,
> > > > +	MEI_TRANSCODER_B,
> > > > +	MEI_TRANSCODER_C,
> > > > +	MEI_TRANSCODER_D
> > > > +};
> > > > +
> > > >  /**
> > > >   * 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 +92,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
> > >

Patch
diff mbox series

diff --git a/include/drm/i915_mei_hdcp_interface.h b/include/drm/i915_mei_hdcp_interface.h
index 08670aa650d4..4d48de8890ca 100644
--- a/include/drm/i915_mei_hdcp_interface.h
+++ b/include/drm/i915_mei_hdcp_interface.h
@@ -54,9 +54,32 @@  enum mei_fw_ddi {
 	MEI_DDI_RANGE_END = MEI_DDI_A,
 };
 
+/**
+ * enum mei_fw_tc - ME Firmware defined index for transcoders
+ * @MEI_INVALID_TRANSCODER: Index for Invalid transcoder
+ * @MEI_TRANSCODER_EDP: Index for EDP Transcoder
+ * @MEI_TRANSCODER_DSI0: Index for DSI0 Transcoder
+ * @MEI_TRANSCODER_DSI1: Index for DSI1 Transcoder
+ * @MEI_TRANSCODER_A: Index for Transcoder A
+ * @MEI_TRANSCODER_B: Index for Transcoder B
+ * @MEI_TRANSCODER_C: Index for Transcoder C
+ * @MEI_TRANSCODER_D: Index for Transcoder D
+ */
+enum mei_fw_tc {
+	MEI_INVALID_TRANSCODER = 0x00,
+	MEI_TRANSCODER_EDP,
+	MEI_TRANSCODER_DSI0,
+	MEI_TRANSCODER_DSI1,
+	MEI_TRANSCODER_A = 0x10,
+	MEI_TRANSCODER_B,
+	MEI_TRANSCODER_C,
+	MEI_TRANSCODER_D
+};
+
 /**
  * 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 +92,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;