Enabling the HDCP1.4 and 2.2 on TGL by supporting the HW block movement from DDI into transcoder.
v6: Extending the I915-MEI HDCP interface to include the transcoder. For register programming, transcoder is used instead of PIPE. Just readability improvement pipe and transcoder definition is moved into i915_drm.h Rebased.
Ramalingam C (3): drm/i915: enum transcoder and pipe are moved into i915_drm.h misc/mei_hdcp: Adding the transcoder detail in payload input drm/i915: Enable HDCP 1.4 and 2.2 on Gen12+
drivers/gpu/drm/i915/display/intel_display.h | 44 ------ drivers/gpu/drm/i915/display/intel_dp.c | 3 + drivers/gpu/drm/i915/display/intel_hdcp.c | 158 +++++++++++++------ drivers/gpu/drm/i915/display/intel_hdcp.h | 2 + drivers/gpu/drm/i915/display/intel_hdmi.c | 12 +- drivers/gpu/drm/i915/i915_reg.h | 124 +++++++++++++-- drivers/misc/mei/hdcp/mei_hdcp.c | 27 ++++ drivers/misc/mei/hdcp/mei_hdcp.h | 15 +- include/drm/i915_drm.h | 46 ++++++ include/drm/i915_mei_hdcp_interface.h | 2 + 10 files changed, 324 insertions(+), 109 deletions(-)
For the reusability of the enum transcoder and enum pipe in other driver modules (like mei_hdcp), enum port definition is moved from I915 local header intel_display.h to drm/i915_drm.h
Signed-off-by: Ramalingam C ramalingam.c@intel.com --- drivers/gpu/drm/i915/display/intel_display.h | 44 ------------------- include/drm/i915_drm.h | 46 ++++++++++++++++++++ 2 files changed, 46 insertions(+), 44 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h index e57e6969051d..56f3d9073159 100644 --- a/drivers/gpu/drm/i915/display/intel_display.h +++ b/drivers/gpu/drm/i915/display/intel_display.h @@ -71,50 +71,6 @@ enum i915_gpio { GPIOO, };
-/* - * Keep the pipe enum values fixed: the code assumes that PIPE_A=0, the - * rest have consecutive values and match the enum values of transcoders - * with a 1:1 transcoder -> pipe mapping. - */ -enum pipe { - INVALID_PIPE = -1, - - PIPE_A = 0, - PIPE_B, - PIPE_C, - PIPE_D, - _PIPE_EDP, - - I915_MAX_PIPES = _PIPE_EDP -}; - -#define pipe_name(p) ((p) + 'A') - -enum transcoder { - /* - * The following transcoders have a 1:1 transcoder -> pipe mapping, - * keep their values fixed: the code assumes that TRANSCODER_A=0, the - * rest have consecutive values and match the enum values of the pipes - * they map to. - */ - TRANSCODER_A = PIPE_A, - TRANSCODER_B = PIPE_B, - TRANSCODER_C = PIPE_C, - TRANSCODER_D = PIPE_D, - - /* - * The following transcoders can map to any pipe, their enum value - * doesn't need to stay fixed. - */ - TRANSCODER_EDP, - TRANSCODER_DSI_0, - TRANSCODER_DSI_1, - TRANSCODER_DSI_A = TRANSCODER_DSI_0, /* legacy DSI */ - TRANSCODER_DSI_C = TRANSCODER_DSI_1, /* legacy DSI */ - - I915_MAX_TRANSCODERS -}; - static inline const char *transcoder_name(enum transcoder transcoder) { switch (transcoder) { diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h index 23274cf92712..b0779b8267b9 100644 --- a/include/drm/i915_drm.h +++ b/include/drm/i915_drm.h @@ -118,4 +118,50 @@ enum port {
#define port_name(p) ((p) + 'A')
+/* + * Keep the pipe enum values fixed: the code assumes that PIPE_A=0, the + * rest have consecutive values and match the enum values of transcoders + * with a 1:1 transcoder -> pipe mapping. + */ +enum pipe { + INVALID_PIPE = -1, + + PIPE_A = 0, + PIPE_B, + PIPE_C, + PIPE_D, + _PIPE_EDP, + + I915_MAX_PIPES = _PIPE_EDP +}; + +#define pipe_name(p) ((p) + 'A') + +enum transcoder { + INVALID_TRANSCODER = -1, + + /* + * The following transcoders have a 1:1 transcoder -> pipe mapping, + * keep their values fixed: the code assumes that TRANSCODER_A=0, the + * rest have consecutive values and match the enum values of the pipes + * they map to. + */ + TRANSCODER_A = PIPE_A, + TRANSCODER_B = PIPE_B, + TRANSCODER_C = PIPE_C, + TRANSCODER_D = PIPE_D, + + /* + * The following transcoders can map to any pipe, their enum value + * doesn't need to stay fixed. + */ + TRANSCODER_EDP, + TRANSCODER_DSI_0, + TRANSCODER_DSI_1, + TRANSCODER_DSI_A = TRANSCODER_DSI_0, /* legacy DSI */ + TRANSCODER_DSI_C = TRANSCODER_DSI_1, /* legacy DSI */ + + I915_MAX_TRANSCODERS +}; + #endif /* _I915_DRM_H_ */
For the reusability of the enum transcoder and enum pipe in other driver modules (like mei_hdcp), enum port definition is moved from I915 local header intel_display.h to drm/i915_drm.h
Don't you need to name space those definitions in the global space, I guess there are a lot of 'pipe' variables and definitions you can conflict with. I guess it should be enum i915_pipe, etc.
Thanks Tomas
Signed-off-by: Ramalingam C ramalingam.c@intel.com
drivers/gpu/drm/i915/display/intel_display.h | 44 ------------------- include/drm/i915_drm.h | 46 ++++++++++++++++++++ 2 files changed, 46 insertions(+), 44 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h index e57e6969051d..56f3d9073159 100644 --- a/drivers/gpu/drm/i915/display/intel_display.h +++ b/drivers/gpu/drm/i915/display/intel_display.h @@ -71,50 +71,6 @@ enum i915_gpio { GPIOO, };
-/*
- Keep the pipe enum values fixed: the code assumes that PIPE_A=0, the
- rest have consecutive values and match the enum values of transcoders
- with a 1:1 transcoder -> pipe mapping.
- */
-enum pipe {
- INVALID_PIPE = -1,
- PIPE_A = 0,
- PIPE_B,
- PIPE_C,
- PIPE_D,
- _PIPE_EDP,
- I915_MAX_PIPES = _PIPE_EDP
-};
-#define pipe_name(p) ((p) + 'A')
-enum transcoder {
- /*
* The following transcoders have a 1:1 transcoder -> pipe mapping,* keep their values fixed: the code assumes that TRANSCODER_A=0,the
* rest have consecutive values and match the enum values of the pipes* they map to.*/- TRANSCODER_A = PIPE_A,
- TRANSCODER_B = PIPE_B,
- TRANSCODER_C = PIPE_C,
- TRANSCODER_D = PIPE_D,
- /*
* The following transcoders can map to any pipe, their enum value* doesn't need to stay fixed.*/- TRANSCODER_EDP,
- TRANSCODER_DSI_0,
- TRANSCODER_DSI_1,
- TRANSCODER_DSI_A = TRANSCODER_DSI_0, /* legacy DSI */
- TRANSCODER_DSI_C = TRANSCODER_DSI_1, /* legacy DSI */
- I915_MAX_TRANSCODERS
-};
static inline const char *transcoder_name(enum transcoder transcoder) { switch (transcoder) { diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h index 23274cf92712..b0779b8267b9 100644 --- a/include/drm/i915_drm.h +++ b/include/drm/i915_drm.h @@ -118,4 +118,50 @@ enum port {
#define port_name(p) ((p) + 'A')
+/*
- Keep the pipe enum values fixed: the code assumes that PIPE_A=0, the
- rest have consecutive values and match the enum values of
+transcoders
- with a 1:1 transcoder -> pipe mapping.
- */
+enum pipe {
- INVALID_PIPE = -1,
- PIPE_A = 0,
- PIPE_B,
- PIPE_C,
- PIPE_D,
- _PIPE_EDP,
- I915_MAX_PIPES = _PIPE_EDP
+};
+#define pipe_name(p) ((p) + 'A')
+enum transcoder {
- INVALID_TRANSCODER = -1,
- /*
* The following transcoders have a 1:1 transcoder -> pipe mapping,* keep their values fixed: the code assumes that TRANSCODER_A=0,the
* rest have consecutive values and match the enum values of the pipes* they map to.*/- TRANSCODER_A = PIPE_A,
- TRANSCODER_B = PIPE_B,
- TRANSCODER_C = PIPE_C,
- TRANSCODER_D = PIPE_D,
- /*
* The following transcoders can map to any pipe, their enum value* doesn't need to stay fixed.*/- TRANSCODER_EDP,
- TRANSCODER_DSI_0,
- TRANSCODER_DSI_1,
- TRANSCODER_DSI_A = TRANSCODER_DSI_0, /* legacy DSI */
- TRANSCODER_DSI_C = TRANSCODER_DSI_1, /* legacy DSI */
- I915_MAX_TRANSCODERS
+};
#endif /* _I915_DRM_H_ */
2.20.1
On 2019-08-20 at 14:14:03 +0530, Winkler, Tomas wrote:
For the reusability of the enum transcoder and enum pipe in other driver modules (like mei_hdcp), enum port definition is moved from I915 local header intel_display.h to drm/i915_drm.h
Don't you need to name space those definitions in the global space, I guess there are a lot of 'pipe' variables and definitions you can conflict with. I guess it should be enum i915_pipe, etc.
I am assuming that this header will be used only when you we build for I915 driver(intel). In such case, we wont have a conflict.
Unless until this renaming is needed, we shouldn't get into it, as this will demand i915 wide renaming.
-Ram
Thanks Tomas
Signed-off-by: Ramalingam C ramalingam.c@intel.com
drivers/gpu/drm/i915/display/intel_display.h | 44 ------------------- include/drm/i915_drm.h | 46 ++++++++++++++++++++ 2 files changed, 46 insertions(+), 44 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h index e57e6969051d..56f3d9073159 100644 --- a/drivers/gpu/drm/i915/display/intel_display.h +++ b/drivers/gpu/drm/i915/display/intel_display.h @@ -71,50 +71,6 @@ enum i915_gpio { GPIOO, };
-/*
- Keep the pipe enum values fixed: the code assumes that PIPE_A=0, the
- rest have consecutive values and match the enum values of transcoders
- with a 1:1 transcoder -> pipe mapping.
- */
-enum pipe {
- INVALID_PIPE = -1,
- PIPE_A = 0,
- PIPE_B,
- PIPE_C,
- PIPE_D,
- _PIPE_EDP,
- I915_MAX_PIPES = _PIPE_EDP
-};
-#define pipe_name(p) ((p) + 'A')
-enum transcoder {
- /*
* The following transcoders have a 1:1 transcoder -> pipe mapping,* keep their values fixed: the code assumes that TRANSCODER_A=0,the
* rest have consecutive values and match the enum values of the pipes* they map to.*/- TRANSCODER_A = PIPE_A,
- TRANSCODER_B = PIPE_B,
- TRANSCODER_C = PIPE_C,
- TRANSCODER_D = PIPE_D,
- /*
* The following transcoders can map to any pipe, their enum value* doesn't need to stay fixed.*/- TRANSCODER_EDP,
- TRANSCODER_DSI_0,
- TRANSCODER_DSI_1,
- TRANSCODER_DSI_A = TRANSCODER_DSI_0, /* legacy DSI */
- TRANSCODER_DSI_C = TRANSCODER_DSI_1, /* legacy DSI */
- I915_MAX_TRANSCODERS
-};
static inline const char *transcoder_name(enum transcoder transcoder) { switch (transcoder) { diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h index 23274cf92712..b0779b8267b9 100644 --- a/include/drm/i915_drm.h +++ b/include/drm/i915_drm.h @@ -118,4 +118,50 @@ enum port {
#define port_name(p) ((p) + 'A')
+/*
- Keep the pipe enum values fixed: the code assumes that PIPE_A=0, the
- rest have consecutive values and match the enum values of
+transcoders
- with a 1:1 transcoder -> pipe mapping.
- */
+enum pipe {
- INVALID_PIPE = -1,
- PIPE_A = 0,
- PIPE_B,
- PIPE_C,
- PIPE_D,
- _PIPE_EDP,
- I915_MAX_PIPES = _PIPE_EDP
+};
+#define pipe_name(p) ((p) + 'A')
+enum transcoder {
- INVALID_TRANSCODER = -1,
- /*
* The following transcoders have a 1:1 transcoder -> pipe mapping,* keep their values fixed: the code assumes that TRANSCODER_A=0,the
* rest have consecutive values and match the enum values of the pipes* they map to.*/- TRANSCODER_A = PIPE_A,
- TRANSCODER_B = PIPE_B,
- TRANSCODER_C = PIPE_C,
- TRANSCODER_D = PIPE_D,
- /*
* The following transcoders can map to any pipe, their enum value* doesn't need to stay fixed.*/- TRANSCODER_EDP,
- TRANSCODER_DSI_0,
- TRANSCODER_DSI_1,
- TRANSCODER_DSI_A = TRANSCODER_DSI_0, /* legacy DSI */
- TRANSCODER_DSI_C = TRANSCODER_DSI_1, /* legacy DSI */
- I915_MAX_TRANSCODERS
+};
#endif /* _I915_DRM_H_ */
2.20.1
On Tue, 20 Aug 2019, Ramalingam C ramalingam.c@intel.com wrote:
On 2019-08-20 at 14:14:03 +0530, Winkler, Tomas wrote:
For the reusability of the enum transcoder and enum pipe in other driver modules (like mei_hdcp), enum port definition is moved from I915 local header intel_display.h to drm/i915_drm.h
Don't you need to name space those definitions in the global space, I guess there are a lot of 'pipe' variables and definitions you can conflict with. I guess it should be enum i915_pipe, etc.
I am assuming that this header will be used only when you we build for I915 driver(intel). In such case, we wont have a conflict.
Unless until this renaming is needed, we shouldn't get into it, as this will demand i915 wide renaming.
I think we need to keep enum transcoder and enum pipe internal to i915, as well as pull enum port from i915_drm.h back to i915 internal as well. I don't think they should be exposed outside of i915.
I think it would be better to expose the existing enum mei_fw_ddi and the new enum mei_fw_tc from MEI to i915 instead, and have i915 fill in the relevant physical_port (ddi index) and attached_transcoder (tc type). I don't know what these members should be called in struct hdcp_port_data, but the point is that i915 would do the translation, not mei_hdcp.c. The types of these members should obviously be enum meo_fw_ddi and enum mei_fw_tc.
Thoughts?
BR, Jani.
-Ram
Thanks Tomas
Signed-off-by: Ramalingam C ramalingam.c@intel.com
drivers/gpu/drm/i915/display/intel_display.h | 44 ------------------- include/drm/i915_drm.h | 46 ++++++++++++++++++++ 2 files changed, 46 insertions(+), 44 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h index e57e6969051d..56f3d9073159 100644 --- a/drivers/gpu/drm/i915/display/intel_display.h +++ b/drivers/gpu/drm/i915/display/intel_display.h @@ -71,50 +71,6 @@ enum i915_gpio { GPIOO, };
-/*
- Keep the pipe enum values fixed: the code assumes that PIPE_A=0, the
- rest have consecutive values and match the enum values of transcoders
- with a 1:1 transcoder -> pipe mapping.
- */
-enum pipe {
- INVALID_PIPE = -1,
- PIPE_A = 0,
- PIPE_B,
- PIPE_C,
- PIPE_D,
- _PIPE_EDP,
- I915_MAX_PIPES = _PIPE_EDP
-};
-#define pipe_name(p) ((p) + 'A')
-enum transcoder {
- /*
* The following transcoders have a 1:1 transcoder -> pipe mapping,* keep their values fixed: the code assumes that TRANSCODER_A=0,the
* rest have consecutive values and match the enum values of the pipes* they map to.*/- TRANSCODER_A = PIPE_A,
- TRANSCODER_B = PIPE_B,
- TRANSCODER_C = PIPE_C,
- TRANSCODER_D = PIPE_D,
- /*
* The following transcoders can map to any pipe, their enum value* doesn't need to stay fixed.*/- TRANSCODER_EDP,
- TRANSCODER_DSI_0,
- TRANSCODER_DSI_1,
- TRANSCODER_DSI_A = TRANSCODER_DSI_0, /* legacy DSI */
- TRANSCODER_DSI_C = TRANSCODER_DSI_1, /* legacy DSI */
- I915_MAX_TRANSCODERS
-};
static inline const char *transcoder_name(enum transcoder transcoder) { switch (transcoder) { diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h index 23274cf92712..b0779b8267b9 100644 --- a/include/drm/i915_drm.h +++ b/include/drm/i915_drm.h @@ -118,4 +118,50 @@ enum port {
#define port_name(p) ((p) + 'A')
+/*
- Keep the pipe enum values fixed: the code assumes that PIPE_A=0, the
- rest have consecutive values and match the enum values of
+transcoders
- with a 1:1 transcoder -> pipe mapping.
- */
+enum pipe {
- INVALID_PIPE = -1,
- PIPE_A = 0,
- PIPE_B,
- PIPE_C,
- PIPE_D,
- _PIPE_EDP,
- I915_MAX_PIPES = _PIPE_EDP
+};
+#define pipe_name(p) ((p) + 'A')
+enum transcoder {
- INVALID_TRANSCODER = -1,
- /*
* The following transcoders have a 1:1 transcoder -> pipe mapping,* keep their values fixed: the code assumes that TRANSCODER_A=0,the
* rest have consecutive values and match the enum values of the pipes* they map to.*/- TRANSCODER_A = PIPE_A,
- TRANSCODER_B = PIPE_B,
- TRANSCODER_C = PIPE_C,
- TRANSCODER_D = PIPE_D,
- /*
* The following transcoders can map to any pipe, their enum value* doesn't need to stay fixed.*/- TRANSCODER_EDP,
- TRANSCODER_DSI_0,
- TRANSCODER_DSI_1,
- TRANSCODER_DSI_A = TRANSCODER_DSI_0, /* legacy DSI */
- TRANSCODER_DSI_C = TRANSCODER_DSI_1, /* legacy DSI */
- I915_MAX_TRANSCODERS
+};
#endif /* _I915_DRM_H_ */
2.20.1
Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
On 2019-08-20 at 15:30:53 +0300, Jani Nikula wrote:
On Tue, 20 Aug 2019, Ramalingam C ramalingam.c@intel.com wrote:
On 2019-08-20 at 14:14:03 +0530, Winkler, Tomas wrote:
For the reusability of the enum transcoder and enum pipe in other driver modules (like mei_hdcp), enum port definition is moved from I915 local header intel_display.h to drm/i915_drm.h
Don't you need to name space those definitions in the global space, I guess there are a lot of 'pipe' variables and definitions you can conflict with. I guess it should be enum i915_pipe, etc.
I am assuming that this header will be used only when you we build for I915 driver(intel). In such case, we wont have a conflict.
Unless until this renaming is needed, we shouldn't get into it, as this will demand i915 wide renaming.
I think we need to keep enum transcoder and enum pipe internal to i915, as well as pull enum port from i915_drm.h back to i915 internal as well. I don't think they should be exposed outside of i915.
I think it would be better to expose the existing enum mei_fw_ddi and the new enum mei_fw_tc from MEI to i915 instead, and have i915 fill in the relevant physical_port (ddi index) and attached_transcoder (tc type). I don't know what these members should be called in struct hdcp_port_data, but the point is that i915 would do the translation, not mei_hdcp.c. The types of these members should obviously be enum meo_fw_ddi and enum mei_fw_tc.
Jani,
Yes, If we could move the enum mei_fw_ddi and enum mei_fw_tc into include/drm/i915_mei_hdcp_interface.h along with struct hdcp_port_data, then we could keep the pipe, port and transcoder as local to I915. I915 could implement the conversion from transcoder to mei_fw_tc etc and setup hdcp_port_data.
Tomas, Do you agree with this?
-Ram
Thoughts?
BR, Jani.
-Ram
Thanks Tomas
Signed-off-by: Ramalingam C ramalingam.c@intel.com
drivers/gpu/drm/i915/display/intel_display.h | 44 ------------------- include/drm/i915_drm.h | 46 ++++++++++++++++++++ 2 files changed, 46 insertions(+), 44 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h index e57e6969051d..56f3d9073159 100644 --- a/drivers/gpu/drm/i915/display/intel_display.h +++ b/drivers/gpu/drm/i915/display/intel_display.h @@ -71,50 +71,6 @@ enum i915_gpio { GPIOO, };
-/*
- Keep the pipe enum values fixed: the code assumes that PIPE_A=0, the
- rest have consecutive values and match the enum values of transcoders
- with a 1:1 transcoder -> pipe mapping.
- */
-enum pipe {
- INVALID_PIPE = -1,
- PIPE_A = 0,
- PIPE_B,
- PIPE_C,
- PIPE_D,
- _PIPE_EDP,
- I915_MAX_PIPES = _PIPE_EDP
-};
-#define pipe_name(p) ((p) + 'A')
-enum transcoder {
- /*
* The following transcoders have a 1:1 transcoder -> pipe mapping,* keep their values fixed: the code assumes that TRANSCODER_A=0,the
* rest have consecutive values and match the enum values of the pipes* they map to.*/- TRANSCODER_A = PIPE_A,
- TRANSCODER_B = PIPE_B,
- TRANSCODER_C = PIPE_C,
- TRANSCODER_D = PIPE_D,
- /*
* The following transcoders can map to any pipe, their enum value* doesn't need to stay fixed.*/- TRANSCODER_EDP,
- TRANSCODER_DSI_0,
- TRANSCODER_DSI_1,
- TRANSCODER_DSI_A = TRANSCODER_DSI_0, /* legacy DSI */
- TRANSCODER_DSI_C = TRANSCODER_DSI_1, /* legacy DSI */
- I915_MAX_TRANSCODERS
-};
static inline const char *transcoder_name(enum transcoder transcoder) { switch (transcoder) { diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h index 23274cf92712..b0779b8267b9 100644 --- a/include/drm/i915_drm.h +++ b/include/drm/i915_drm.h @@ -118,4 +118,50 @@ enum port {
#define port_name(p) ((p) + 'A')
+/*
- Keep the pipe enum values fixed: the code assumes that PIPE_A=0, the
- rest have consecutive values and match the enum values of
+transcoders
- with a 1:1 transcoder -> pipe mapping.
- */
+enum pipe {
- INVALID_PIPE = -1,
- PIPE_A = 0,
- PIPE_B,
- PIPE_C,
- PIPE_D,
- _PIPE_EDP,
- I915_MAX_PIPES = _PIPE_EDP
+};
+#define pipe_name(p) ((p) + 'A')
+enum transcoder {
- INVALID_TRANSCODER = -1,
- /*
* The following transcoders have a 1:1 transcoder -> pipe mapping,* keep their values fixed: the code assumes that TRANSCODER_A=0,the
* rest have consecutive values and match the enum values of the pipes* they map to.*/- TRANSCODER_A = PIPE_A,
- TRANSCODER_B = PIPE_B,
- TRANSCODER_C = PIPE_C,
- TRANSCODER_D = PIPE_D,
- /*
* The following transcoders can map to any pipe, their enum value* doesn't need to stay fixed.*/- TRANSCODER_EDP,
- TRANSCODER_DSI_0,
- TRANSCODER_DSI_1,
- TRANSCODER_DSI_A = TRANSCODER_DSI_0, /* legacy DSI */
- TRANSCODER_DSI_C = TRANSCODER_DSI_1, /* legacy DSI */
- I915_MAX_TRANSCODERS
+};
#endif /* _I915_DRM_H_ */
2.20.1
Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
-- Jani Nikula, Intel Open Source Graphics Center
ME FW takes the transcoder details for Gen12+ platforms, as HDCP HW block is moved to transcoders.
hdcp_port_data is extended with enum transcoder. Payload structure is modified and populated from the hdcp_port_data.
Signed-off-by: Ramalingam C ramalingam.c@intel.com --- drivers/misc/mei/hdcp/mei_hdcp.c | 27 +++++++++++++++++++++++++++ drivers/misc/mei/hdcp/mei_hdcp.h | 15 ++++++++++++++- include/drm/i915_mei_hdcp_interface.h | 2 ++ 3 files changed, 43 insertions(+), 1 deletion(-)
diff --git a/drivers/misc/mei/hdcp/mei_hdcp.c b/drivers/misc/mei/hdcp/mei_hdcp.c index c681f6fab342..7efe3b65a986 100644 --- a/drivers/misc/mei/hdcp/mei_hdcp.c +++ b/drivers/misc/mei/hdcp/mei_hdcp.c @@ -39,6 +39,22 @@ static inline u8 mei_get_ddi_index(enum port port) } }
+static inline u8 mei_get_tc_type(enum transcoder tc) +{ + switch (tc) { + case TRANSCODER_A ... TRANSCODER_D: + return (u8)(tc | 0x10); + case TRANSCODER_EDP: + return TC_EDP; + case TRANSCODER_DSI_0: + return TC_DSI0; + case TRANSCODER_DSI_1: + return TC_DSI1; + default: + return MEI_INVALID_TRANSCODER; + } +} + /** * mei_hdcp_initiate_session() - Initiate a Wired HDCP2.2 Tx Session in ME FW * @dev: device corresponding to the mei_cl_device @@ -70,6 +86,7 @@ mei_hdcp_initiate_session(struct device *dev, struct hdcp_port_data *data,
session_init_in.port.integrated_port_type = data->port_type; session_init_in.port.physical_port = mei_get_ddi_index(data->port); + session_init_in.port.attached_transcoder = mei_get_tc_type(data->tc); session_init_in.protocol = data->protocol;
byte = mei_cldev_send(cldev, (u8 *)&session_init_in, @@ -139,6 +156,7 @@ mei_hdcp_verify_receiver_cert_prepare_km(struct device *dev,
verify_rxcert_in.port.integrated_port_type = data->port_type; verify_rxcert_in.port.physical_port = mei_get_ddi_index(data->port); + verify_rxcert_in.port.attached_transcoder = mei_get_tc_type(data->tc);
verify_rxcert_in.cert_rx = rx_cert->cert_rx; memcpy(verify_rxcert_in.r_rx, &rx_cert->r_rx, HDCP_2_2_RRX_LEN); @@ -209,6 +227,7 @@ mei_hdcp_verify_hprime(struct device *dev, struct hdcp_port_data *data,
send_hprime_in.port.integrated_port_type = data->port_type; send_hprime_in.port.physical_port = mei_get_ddi_index(data->port); + send_hprime_in.port.attached_transcoder = mei_get_tc_type(data->tc);
memcpy(send_hprime_in.h_prime, rx_hprime->h_prime, HDCP_2_2_H_PRIME_LEN); @@ -266,6 +285,7 @@ mei_hdcp_store_pairing_info(struct device *dev, struct hdcp_port_data *data,
pairing_info_in.port.integrated_port_type = data->port_type; pairing_info_in.port.physical_port = mei_get_ddi_index(data->port); + pairing_info_in.port.attached_transcoder = mei_get_tc_type(data->tc);
memcpy(pairing_info_in.e_kh_km, pairing_info->e_kh_km, HDCP_2_2_E_KH_KM_LEN); @@ -324,6 +344,7 @@ mei_hdcp_initiate_locality_check(struct device *dev,
lc_init_in.port.integrated_port_type = data->port_type; lc_init_in.port.physical_port = mei_get_ddi_index(data->port); + lc_init_in.port.attached_transcoder = mei_get_tc_type(data->tc);
byte = mei_cldev_send(cldev, (u8 *)&lc_init_in, sizeof(lc_init_in)); if (byte < 0) { @@ -379,6 +400,7 @@ mei_hdcp_verify_lprime(struct device *dev, struct hdcp_port_data *data,
verify_lprime_in.port.integrated_port_type = data->port_type; verify_lprime_in.port.physical_port = mei_get_ddi_index(data->port); + verify_lprime_in.port.attached_transcoder = mei_get_tc_type(data->tc);
memcpy(verify_lprime_in.l_prime, rx_lprime->l_prime, HDCP_2_2_L_PRIME_LEN); @@ -436,6 +458,7 @@ static int mei_hdcp_get_session_key(struct device *dev,
get_skey_in.port.integrated_port_type = data->port_type; get_skey_in.port.physical_port = mei_get_ddi_index(data->port); + get_skey_in.port.attached_transcoder = mei_get_tc_type(data->tc);
byte = mei_cldev_send(cldev, (u8 *)&get_skey_in, sizeof(get_skey_in)); if (byte < 0) { @@ -500,6 +523,7 @@ mei_hdcp_repeater_check_flow_prepare_ack(struct device *dev,
verify_repeater_in.port.integrated_port_type = data->port_type; verify_repeater_in.port.physical_port = mei_get_ddi_index(data->port); + verify_repeater_in.port.attached_transcoder = mei_get_tc_type(data->tc);
memcpy(verify_repeater_in.rx_info, rep_topology->rx_info, HDCP_2_2_RXINFO_LEN); @@ -570,6 +594,7 @@ static int mei_hdcp_verify_mprime(struct device *dev,
verify_mprime_in.port.integrated_port_type = data->port_type; verify_mprime_in.port.physical_port = mei_get_ddi_index(data->port); + verify_mprime_in.port.attached_transcoder = mei_get_tc_type(data->tc);
memcpy(verify_mprime_in.m_prime, stream_ready->m_prime, HDCP_2_2_MPRIME_LEN); @@ -631,6 +656,7 @@ static int mei_hdcp_enable_authentication(struct device *dev,
enable_auth_in.port.integrated_port_type = data->port_type; enable_auth_in.port.physical_port = mei_get_ddi_index(data->port); + enable_auth_in.port.attached_transcoder = mei_get_tc_type(data->tc); enable_auth_in.stream_type = data->streams[0].stream_type;
byte = mei_cldev_send(cldev, (u8 *)&enable_auth_in, @@ -685,6 +711,7 @@ mei_hdcp_close_session(struct device *dev, struct hdcp_port_data *data)
session_close_in.port.integrated_port_type = data->port_type; session_close_in.port.physical_port = mei_get_ddi_index(data->port); + session_close_in.port.attached_transcoder = mei_get_tc_type(data->tc);
byte = mei_cldev_send(cldev, (u8 *)&session_close_in, sizeof(session_close_in)); diff --git a/drivers/misc/mei/hdcp/mei_hdcp.h b/drivers/misc/mei/hdcp/mei_hdcp.h index e4b1cd54c853..89e2f99ff60a 100644 --- a/drivers/misc/mei/hdcp/mei_hdcp.h +++ b/drivers/misc/mei/hdcp/mei_hdcp.h @@ -184,8 +184,10 @@ struct hdcp_cmd_no_data { /* Uniquely identifies the hdcp port being addressed for a given command. */ struct hdcp_port_id { u8 integrated_port_type; + /* Used until Gen11.5. Must be zero for Gen11.5+ */ u8 physical_port; - u16 reserved; + u8 attached_transcoder; + u8 reserved; } __packed;
/* @@ -374,4 +376,15 @@ enum mei_fw_ddi { MEI_DDI_A = 7, MEI_DDI_RANGE_END = MEI_DDI_A, }; + +enum mei_fw_tc { + MEI_INVALID_TRANSCODER = 0x00, // Invalid transcoder type + TC_EDP, // Transcoder for eDP + TC_DSI0, // Transcoder for DSI0 + TC_DSI1, // Transcoder for DSI1 + TC_A = 0x10, // Transcoder TCA + TC_B, // Transcoder TCB + TC_C, // Transcoder TCC + TC_D // Transcoder TCD +}; #endif /* __MEI_HDCP_H__ */ diff --git a/include/drm/i915_mei_hdcp_interface.h b/include/drm/i915_mei_hdcp_interface.h index 8c344255146a..dc0de63ce0cb 100644 --- a/include/drm/i915_mei_hdcp_interface.h +++ b/include/drm/i915_mei_hdcp_interface.h @@ -45,6 +45,7 @@ enum hdcp_wired_protocol { /** * struct hdcp_port_data - intel specific HDCP port data * @port: port index as per I915 + * @tc: transcoder index as per I915 * @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 @@ -57,6 +58,7 @@ enum hdcp_wired_protocol { */ struct hdcp_port_data { enum port port; + enum transcoder tc; u8 port_type; u8 protocol; u16 k;
ME FW takes the transcoder details for Gen12+ platforms, as HDCP HW block is moved to transcoders.
hdcp_port_data is extended with enum transcoder. Payload structure is modified and populated from the hdcp_port_data.
Signed-off-by: Ramalingam C ramalingam.c@intel.com
drivers/misc/mei/hdcp/mei_hdcp.c | 27 +++++++++++++++++++++++++++ drivers/misc/mei/hdcp/mei_hdcp.h | 15 ++++++++++++++- include/drm/i915_mei_hdcp_interface.h | 2 ++ 3 files changed, 43 insertions(+), 1 deletion(-)
diff --git a/drivers/misc/mei/hdcp/mei_hdcp.c b/drivers/misc/mei/hdcp/mei_hdcp.c index c681f6fab342..7efe3b65a986 100644 --- a/drivers/misc/mei/hdcp/mei_hdcp.c +++ b/drivers/misc/mei/hdcp/mei_hdcp.c @@ -39,6 +39,22 @@ static inline u8 mei_get_ddi_index(enum port port) } }
+static inline u8 mei_get_tc_type(enum transcoder tc) {
- switch (tc) {
- case TRANSCODER_A ... TRANSCODER_D:
return (u8)(tc | 0x10);- case TRANSCODER_EDP:
return TC_EDP;- case TRANSCODER_DSI_0:
return TC_DSI0;- case TRANSCODER_DSI_1:
return TC_DSI1;- default:
return MEI_INVALID_TRANSCODER;- }
+}
/**
- mei_hdcp_initiate_session() - Initiate a Wired HDCP2.2 Tx Session in ME FW
- @dev: device corresponding to the mei_cl_device @@ -70,6 +86,7 @@
mei_hdcp_initiate_session(struct device *dev, struct hdcp_port_data *data,
session_init_in.port.integrated_port_type = data->port_type; session_init_in.port.physical_port = mei_get_ddi_index(data->port);
session_init_in.port.attached_transcoder = mei_get_tc_type(data->tc); session_init_in.protocol = data->protocol;
byte = mei_cldev_send(cldev, (u8 *)&session_init_in, @@ -139,6
+156,7 @@ mei_hdcp_verify_receiver_cert_prepare_km(struct device *dev,
verify_rxcert_in.port.integrated_port_type = data->port_type; verify_rxcert_in.port.physical_port = mei_get_ddi_index(data->port);
- verify_rxcert_in.port.attached_transcoder = mei_get_tc_type(data-
tc);
verify_rxcert_in.cert_rx = rx_cert->cert_rx; memcpy(verify_rxcert_in.r_rx, &rx_cert->r_rx, HDCP_2_2_RRX_LEN); @@ -209,6 +227,7 @@ mei_hdcp_verify_hprime(struct device *dev, struct hdcp_port_data *data,
send_hprime_in.port.integrated_port_type = data->port_type; send_hprime_in.port.physical_port = mei_get_ddi_index(data->port);
- send_hprime_in.port.attached_transcoder = mei_get_tc_type(data-
tc);
memcpy(send_hprime_in.h_prime, rx_hprime->h_prime, HDCP_2_2_H_PRIME_LEN); @@ -266,6 +285,7 @@ mei_hdcp_store_pairing_info(struct device *dev, struct hdcp_port_data *data,
pairing_info_in.port.integrated_port_type = data->port_type; pairing_info_in.port.physical_port = mei_get_ddi_index(data->port);
pairing_info_in.port.attached_transcoder = mei_get_tc_type(data->tc);
memcpy(pairing_info_in.e_kh_km, pairing_info->e_kh_km, HDCP_2_2_E_KH_KM_LEN);
@@ -324,6 +344,7 @@ mei_hdcp_initiate_locality_check(struct device *dev,
lc_init_in.port.integrated_port_type = data->port_type; lc_init_in.port.physical_port = mei_get_ddi_index(data->port);
lc_init_in.port.attached_transcoder = mei_get_tc_type(data->tc);
byte = mei_cldev_send(cldev, (u8 *)&lc_init_in, sizeof(lc_init_in)); if (byte < 0) {
@@ -379,6 +400,7 @@ mei_hdcp_verify_lprime(struct device *dev, struct hdcp_port_data *data,
verify_lprime_in.port.integrated_port_type = data->port_type; verify_lprime_in.port.physical_port = mei_get_ddi_index(data->port);
- verify_lprime_in.port.attached_transcoder = mei_get_tc_type(data-
tc);
memcpy(verify_lprime_in.l_prime, rx_lprime->l_prime, HDCP_2_2_L_PRIME_LEN); @@ -436,6 +458,7 @@ static int mei_hdcp_get_session_key(struct device *dev,
get_skey_in.port.integrated_port_type = data->port_type; get_skey_in.port.physical_port = mei_get_ddi_index(data->port);
get_skey_in.port.attached_transcoder = mei_get_tc_type(data->tc);
byte = mei_cldev_send(cldev, (u8 *)&get_skey_in, sizeof(get_skey_in)); if (byte < 0) {
@@ -500,6 +523,7 @@ mei_hdcp_repeater_check_flow_prepare_ack(struct device *dev,
verify_repeater_in.port.integrated_port_type = data->port_type; verify_repeater_in.port.physical_port = mei_get_ddi_index(data-
port);
- verify_repeater_in.port.attached_transcoder =
+mei_get_tc_type(data->tc);
memcpy(verify_repeater_in.rx_info, rep_topology->rx_info, HDCP_2_2_RXINFO_LEN); @@ -570,6 +594,7 @@ static int mei_hdcp_verify_mprime(struct device *dev,
verify_mprime_in.port.integrated_port_type = data->port_type; verify_mprime_in.port.physical_port = mei_get_ddi_index(data->port);
- verify_mprime_in.port.attached_transcoder = mei_get_tc_type(data-
tc);
memcpy(verify_mprime_in.m_prime, stream_ready->m_prime, HDCP_2_2_MPRIME_LEN); @@ -631,6 +656,7 @@ static int mei_hdcp_enable_authentication(struct device *dev,
enable_auth_in.port.integrated_port_type = data->port_type; enable_auth_in.port.physical_port = mei_get_ddi_index(data->port);
enable_auth_in.port.attached_transcoder = mei_get_tc_type(data->tc); enable_auth_in.stream_type = data->streams[0].stream_type;
byte = mei_cldev_send(cldev, (u8 *)&enable_auth_in, @@ -685,6
+711,7 @@ mei_hdcp_close_session(struct device *dev, struct hdcp_port_data *data)
session_close_in.port.integrated_port_type = data->port_type; session_close_in.port.physical_port = mei_get_ddi_index(data->port);
- session_close_in.port.attached_transcoder = mei_get_tc_type(data-
tc);
byte = mei_cldev_send(cldev, (u8 *)&session_close_in, sizeof(session_close_in)); diff --git a/drivers/misc/mei/hdcp/mei_hdcp.h b/drivers/misc/mei/hdcp/mei_hdcp.h index e4b1cd54c853..89e2f99ff60a 100644 --- a/drivers/misc/mei/hdcp/mei_hdcp.h +++ b/drivers/misc/mei/hdcp/mei_hdcp.h @@ -184,8 +184,10 @@ struct hdcp_cmd_no_data { /* Uniquely identifies the hdcp port being addressed for a given command. */ struct hdcp_port_id { u8 integrated_port_type;
- /* Used until Gen11.5. Must be zero for Gen11.5+ */ u8 physical_port;
- u16 reserved;
- u8 attached_transcoder;
- u8 reserved;
} __packed;
/* @@ -374,4 +376,15 @@ enum mei_fw_ddi { MEI_DDI_A = 7, MEI_DDI_RANGE_END = MEI_DDI_A, };
+enum mei_fw_tc {
- MEI_INVALID_TRANSCODER = 0x00, // Invalid transcoder type
- TC_EDP, // Transcoder for eDP
- TC_DSI0, // Transcoder for DSI0
- TC_DSI1, // Transcoder for DSI1
- TC_A = 0x10, // Transcoder TCA
- TC_B, // Transcoder TCB
- TC_C, // Transcoder TCC
- TC_D // Transcoder TCD
+};
Don't use // for comments Ned MEI_ prefix
#endif /* __MEI_HDCP_H__ */ diff --git a/include/drm/i915_mei_hdcp_interface.h b/include/drm/i915_mei_hdcp_interface.h index 8c344255146a..dc0de63ce0cb 100644 --- a/include/drm/i915_mei_hdcp_interface.h +++ b/include/drm/i915_mei_hdcp_interface.h @@ -45,6 +45,7 @@ enum hdcp_wired_protocol { /**
- struct hdcp_port_data - intel specific HDCP port data
- @port: port index as per I915
- @tc: transcoder index as per I915
- @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 @@ -
57,6 +58,7 @@ enum hdcp_wired_protocol { */ struct hdcp_port_data { enum port port;
- enum transcoder tc; u8 port_type; u8 protocol; u16 k;
-- 2.20.1
On 2019-08-20 at 14:15:47 +0530, Winkler, Tomas wrote:
ME FW takes the transcoder details for Gen12+ platforms, as HDCP HW block is moved to transcoders.
hdcp_port_data is extended with enum transcoder. Payload structure is modified and populated from the hdcp_port_data.
Signed-off-by: Ramalingam C ramalingam.c@intel.com
drivers/misc/mei/hdcp/mei_hdcp.c | 27 +++++++++++++++++++++++++++ drivers/misc/mei/hdcp/mei_hdcp.h | 15 ++++++++++++++- include/drm/i915_mei_hdcp_interface.h | 2 ++ 3 files changed, 43 insertions(+), 1 deletion(-)
diff --git a/drivers/misc/mei/hdcp/mei_hdcp.c b/drivers/misc/mei/hdcp/mei_hdcp.c index c681f6fab342..7efe3b65a986 100644 --- a/drivers/misc/mei/hdcp/mei_hdcp.c +++ b/drivers/misc/mei/hdcp/mei_hdcp.c @@ -39,6 +39,22 @@ static inline u8 mei_get_ddi_index(enum port port) } }
+static inline u8 mei_get_tc_type(enum transcoder tc) {
- switch (tc) {
- case TRANSCODER_A ... TRANSCODER_D:
return (u8)(tc | 0x10);- case TRANSCODER_EDP:
return TC_EDP;- case TRANSCODER_DSI_0:
return TC_DSI0;- case TRANSCODER_DSI_1:
return TC_DSI1;- default:
return MEI_INVALID_TRANSCODER;- }
+}
/**
- mei_hdcp_initiate_session() - Initiate a Wired HDCP2.2 Tx Session in ME FW
- @dev: device corresponding to the mei_cl_device @@ -70,6 +86,7 @@
mei_hdcp_initiate_session(struct device *dev, struct hdcp_port_data *data,
session_init_in.port.integrated_port_type = data->port_type; session_init_in.port.physical_port = mei_get_ddi_index(data->port);
session_init_in.port.attached_transcoder = mei_get_tc_type(data->tc); session_init_in.protocol = data->protocol;
byte = mei_cldev_send(cldev, (u8 *)&session_init_in, @@ -139,6
+156,7 @@ mei_hdcp_verify_receiver_cert_prepare_km(struct device *dev,
verify_rxcert_in.port.integrated_port_type = data->port_type; verify_rxcert_in.port.physical_port = mei_get_ddi_index(data->port);
- verify_rxcert_in.port.attached_transcoder = mei_get_tc_type(data-
tc);
verify_rxcert_in.cert_rx = rx_cert->cert_rx; memcpy(verify_rxcert_in.r_rx, &rx_cert->r_rx, HDCP_2_2_RRX_LEN); @@ -209,6 +227,7 @@ mei_hdcp_verify_hprime(struct device *dev, struct hdcp_port_data *data,
send_hprime_in.port.integrated_port_type = data->port_type; send_hprime_in.port.physical_port = mei_get_ddi_index(data->port);
- send_hprime_in.port.attached_transcoder = mei_get_tc_type(data-
tc);
memcpy(send_hprime_in.h_prime, rx_hprime->h_prime, HDCP_2_2_H_PRIME_LEN); @@ -266,6 +285,7 @@ mei_hdcp_store_pairing_info(struct device *dev, struct hdcp_port_data *data,
pairing_info_in.port.integrated_port_type = data->port_type; pairing_info_in.port.physical_port = mei_get_ddi_index(data->port);
pairing_info_in.port.attached_transcoder = mei_get_tc_type(data->tc);
memcpy(pairing_info_in.e_kh_km, pairing_info->e_kh_km, HDCP_2_2_E_KH_KM_LEN);
@@ -324,6 +344,7 @@ mei_hdcp_initiate_locality_check(struct device *dev,
lc_init_in.port.integrated_port_type = data->port_type; lc_init_in.port.physical_port = mei_get_ddi_index(data->port);
lc_init_in.port.attached_transcoder = mei_get_tc_type(data->tc);
byte = mei_cldev_send(cldev, (u8 *)&lc_init_in, sizeof(lc_init_in)); if (byte < 0) {
@@ -379,6 +400,7 @@ mei_hdcp_verify_lprime(struct device *dev, struct hdcp_port_data *data,
verify_lprime_in.port.integrated_port_type = data->port_type; verify_lprime_in.port.physical_port = mei_get_ddi_index(data->port);
- verify_lprime_in.port.attached_transcoder = mei_get_tc_type(data-
tc);
memcpy(verify_lprime_in.l_prime, rx_lprime->l_prime, HDCP_2_2_L_PRIME_LEN); @@ -436,6 +458,7 @@ static int mei_hdcp_get_session_key(struct device *dev,
get_skey_in.port.integrated_port_type = data->port_type; get_skey_in.port.physical_port = mei_get_ddi_index(data->port);
get_skey_in.port.attached_transcoder = mei_get_tc_type(data->tc);
byte = mei_cldev_send(cldev, (u8 *)&get_skey_in, sizeof(get_skey_in)); if (byte < 0) {
@@ -500,6 +523,7 @@ mei_hdcp_repeater_check_flow_prepare_ack(struct device *dev,
verify_repeater_in.port.integrated_port_type = data->port_type; verify_repeater_in.port.physical_port = mei_get_ddi_index(data-
port);
- verify_repeater_in.port.attached_transcoder =
+mei_get_tc_type(data->tc);
memcpy(verify_repeater_in.rx_info, rep_topology->rx_info, HDCP_2_2_RXINFO_LEN); @@ -570,6 +594,7 @@ static int mei_hdcp_verify_mprime(struct device *dev,
verify_mprime_in.port.integrated_port_type = data->port_type; verify_mprime_in.port.physical_port = mei_get_ddi_index(data->port);
- verify_mprime_in.port.attached_transcoder = mei_get_tc_type(data-
tc);
memcpy(verify_mprime_in.m_prime, stream_ready->m_prime, HDCP_2_2_MPRIME_LEN); @@ -631,6 +656,7 @@ static int mei_hdcp_enable_authentication(struct device *dev,
enable_auth_in.port.integrated_port_type = data->port_type; enable_auth_in.port.physical_port = mei_get_ddi_index(data->port);
enable_auth_in.port.attached_transcoder = mei_get_tc_type(data->tc); enable_auth_in.stream_type = data->streams[0].stream_type;
byte = mei_cldev_send(cldev, (u8 *)&enable_auth_in, @@ -685,6
+711,7 @@ mei_hdcp_close_session(struct device *dev, struct hdcp_port_data *data)
session_close_in.port.integrated_port_type = data->port_type; session_close_in.port.physical_port = mei_get_ddi_index(data->port);
- session_close_in.port.attached_transcoder = mei_get_tc_type(data-
tc);
byte = mei_cldev_send(cldev, (u8 *)&session_close_in, sizeof(session_close_in)); diff --git a/drivers/misc/mei/hdcp/mei_hdcp.h b/drivers/misc/mei/hdcp/mei_hdcp.h index e4b1cd54c853..89e2f99ff60a 100644 --- a/drivers/misc/mei/hdcp/mei_hdcp.h +++ b/drivers/misc/mei/hdcp/mei_hdcp.h @@ -184,8 +184,10 @@ struct hdcp_cmd_no_data { /* Uniquely identifies the hdcp port being addressed for a given command. */ struct hdcp_port_id { u8 integrated_port_type;
- /* Used until Gen11.5. Must be zero for Gen11.5+ */ u8 physical_port;
- u16 reserved;
- u8 attached_transcoder;
- u8 reserved;
} __packed;
/* @@ -374,4 +376,15 @@ enum mei_fw_ddi { MEI_DDI_A = 7, MEI_DDI_RANGE_END = MEI_DDI_A, };
+enum mei_fw_tc {
- MEI_INVALID_TRANSCODER = 0x00, // Invalid transcoder type
- TC_EDP, // Transcoder for eDP
- TC_DSI0, // Transcoder for DSI0
- TC_DSI1, // Transcoder for DSI1
- TC_A = 0x10, // Transcoder TCA
- TC_B, // Transcoder TCB
- TC_C, // Transcoder TCC
- TC_D // Transcoder TCD
+};
Don't use // for comments Ned MEI_ prefix
I will fix this.
-Ram
#endif /* __MEI_HDCP_H__ */ diff --git a/include/drm/i915_mei_hdcp_interface.h b/include/drm/i915_mei_hdcp_interface.h index 8c344255146a..dc0de63ce0cb 100644 --- a/include/drm/i915_mei_hdcp_interface.h +++ b/include/drm/i915_mei_hdcp_interface.h @@ -45,6 +45,7 @@ enum hdcp_wired_protocol { /**
- struct hdcp_port_data - intel specific HDCP port data
- @port: port index as per I915
- @tc: transcoder index as per I915
- @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 @@ -
57,6 +58,7 @@ enum hdcp_wired_protocol { */ struct hdcp_port_data { enum port port;
- enum transcoder tc; u8 port_type; u8 protocol; u16 k;
-- 2.20.1
From Gen12 onwards, HDCP HW block is implemented within transcoders.
Till Gen11 HDCP HW block was part of DDI.
Hence required changes in HW programming is handled here.
As ME FW needs the transcoder detail on which HDCP is enabled on Gen12+ platform, we are populating the detail in hdcp_port_data.
v2: _MMIO_TRANS is used [Lucas and Daniel] platform check is moved into the caller [Lucas] v3: platform check is moved into a macro [Shashank] v4: Few optimizations in the coding [Shashank] v5: Fixed alignment in macro definition in i915_reg.h [Shashank] unused variables "reg" is removed. v6: Configuring the transcoder at compute_config. transcoder is used instead of pipe in macros. Rebased.
Signed-off-by: Ramalingam C ramalingam.c@intel.com Reviewed-by: Shashank Sharma shashank.sharma@intel.com [v5] --- drivers/gpu/drm/i915/display/intel_dp.c | 3 + drivers/gpu/drm/i915/display/intel_hdcp.c | 158 +++++++++++++++------- drivers/gpu/drm/i915/display/intel_hdcp.h | 2 + drivers/gpu/drm/i915/display/intel_hdmi.c | 12 +- drivers/gpu/drm/i915/i915_reg.h | 124 +++++++++++++++-- 5 files changed, 235 insertions(+), 64 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index 5c45a3bb102d..5f00ac872816 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -2244,6 +2244,9 @@ intel_dp_compute_config(struct intel_encoder *encoder,
intel_psr_compute_config(intel_dp, pipe_config);
+ intel_hdcp_transcoder_config(intel_connector, + pipe_config->cpu_transcoder); + return 0; }
diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c index 6ec5ceeab601..5604b669e5c7 100644 --- a/drivers/gpu/drm/i915/display/intel_hdcp.c +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c @@ -18,6 +18,7 @@ #include "intel_display_types.h" #include "intel_hdcp.h" #include "intel_sideband.h" +#include "intel_connector.h"
#define KEY_LOAD_TRIES 5 #define ENCRYPT_STATUS_CHANGE_TIMEOUT_MS 50 @@ -105,24 +106,17 @@ bool intel_hdcp2_capable(struct intel_connector *connector) return capable; }
-static inline bool intel_hdcp_in_use(struct intel_connector *connector) +static inline bool intel_hdcp_in_use(struct drm_i915_private *dev_priv, + enum transcoder tc, enum port port) { - struct drm_i915_private *dev_priv = to_i915(connector->base.dev); - enum port port = connector->encoder->port; - u32 reg; - - reg = I915_READ(PORT_HDCP_STATUS(port)); - return reg & HDCP_STATUS_ENC; + return I915_READ(HDCP_STATUS(dev_priv, tc, port)) & HDCP_STATUS_ENC; }
-static inline bool intel_hdcp2_in_use(struct intel_connector *connector) +static inline bool intel_hdcp2_in_use(struct drm_i915_private *dev_priv, + enum transcoder tc, enum port port) { - struct drm_i915_private *dev_priv = to_i915(connector->base.dev); - enum port port = connector->encoder->port; - u32 reg; - - reg = I915_READ(HDCP2_STATUS_DDI(port)); - return reg & LINK_ENCRYPTION_STATUS; + return I915_READ(HDCP2_STATUS(dev_priv, tc, port)) & + LINK_ENCRYPTION_STATUS; }
static int intel_hdcp_poll_ksv_fifo(struct intel_digital_port *intel_dig_port, @@ -253,9 +247,28 @@ static int intel_write_sha_text(struct drm_i915_private *dev_priv, u32 sha_text) }
static -u32 intel_hdcp_get_repeater_ctl(struct intel_digital_port *intel_dig_port) +u32 intel_hdcp_get_repeater_ctl(struct drm_i915_private *dev_priv, + enum transcoder tc, enum port port) { - enum port port = intel_dig_port->base.port; + if (INTEL_GEN(dev_priv) >= 12) { + switch (tc) { + case TRANSCODER_A: + return HDCP_TRANSA_REP_PRESENT | + HDCP_TRANSA_SHA1_M0; + case TRANSCODER_B: + return HDCP_TRANSB_REP_PRESENT | + HDCP_TRANSB_SHA1_M0; + case TRANSCODER_C: + return HDCP_TRANSC_REP_PRESENT | + HDCP_TRANSC_SHA1_M0; + /* FIXME: Add a case for PIPE_D */ + default: + DRM_ERROR("Unknown transcoder %d\n", tc); + break; + } + return -EINVAL; + } + switch (port) { case PORT_A: return HDCP_DDIA_REP_PRESENT | HDCP_DDIA_SHA1_M0; @@ -268,18 +281,21 @@ u32 intel_hdcp_get_repeater_ctl(struct intel_digital_port *intel_dig_port) case PORT_E: return HDCP_DDIE_REP_PRESENT | HDCP_DDIE_SHA1_M0; default: + DRM_ERROR("Unknown port %d\n", port); break; } - DRM_ERROR("Unknown port %d\n", port); return -EINVAL; }
static -int intel_hdcp_validate_v_prime(struct intel_digital_port *intel_dig_port, +int intel_hdcp_validate_v_prime(struct intel_connector *connector, const struct intel_hdcp_shim *shim, u8 *ksv_fifo, u8 num_downstream, u8 *bstatus) { + struct intel_digital_port *intel_dig_port = conn_to_dig_port(connector); struct drm_i915_private *dev_priv; + enum transcoder tc = connector->hdcp.port_data.tc; + enum port port = intel_dig_port->base.port; u32 vprime, sha_text, sha_leftovers, rep_ctl; int ret, i, j, sha_idx;
@@ -306,7 +322,7 @@ int intel_hdcp_validate_v_prime(struct intel_digital_port *intel_dig_port, sha_idx = 0; sha_text = 0; sha_leftovers = 0; - rep_ctl = intel_hdcp_get_repeater_ctl(intel_dig_port); + rep_ctl = intel_hdcp_get_repeater_ctl(dev_priv, tc, port); I915_WRITE(HDCP_REP_CTL, rep_ctl | HDCP_SHA1_TEXT_32); for (i = 0; i < num_downstream; i++) { unsigned int sha_empty; @@ -548,7 +564,7 @@ int intel_hdcp_auth_downstream(struct intel_connector *connector) * V prime atleast twice. */ for (i = 0; i < tries; i++) { - ret = intel_hdcp_validate_v_prime(intel_dig_port, shim, + ret = intel_hdcp_validate_v_prime(connector, shim, ksv_fifo, num_downstream, bstatus); if (!ret) @@ -576,6 +592,7 @@ static int intel_hdcp_auth(struct intel_connector *connector) struct drm_device *dev = connector->base.dev; const struct intel_hdcp_shim *shim = hdcp->shim; struct drm_i915_private *dev_priv; + enum transcoder tc = connector->hdcp.port_data.tc; enum port port; unsigned long r0_prime_gen_start; int ret, i, tries = 2; @@ -615,18 +632,18 @@ static int intel_hdcp_auth(struct intel_connector *connector)
/* Initialize An with 2 random values and acquire it */ for (i = 0; i < 2; i++) - I915_WRITE(PORT_HDCP_ANINIT(port), get_random_u32()); - I915_WRITE(PORT_HDCP_CONF(port), HDCP_CONF_CAPTURE_AN); + I915_WRITE(HDCP_ANINIT(dev_priv, tc, port), get_random_u32()); + I915_WRITE(HDCP_CONF(dev_priv, tc, port), HDCP_CONF_CAPTURE_AN);
/* Wait for An to be acquired */ - if (intel_de_wait_for_set(dev_priv, PORT_HDCP_STATUS(port), + if (intel_de_wait_for_set(dev_priv, HDCP_STATUS(dev_priv, tc, port), HDCP_STATUS_AN_READY, 1)) { DRM_ERROR("Timed out waiting for An\n"); return -ETIMEDOUT; }
- an.reg[0] = I915_READ(PORT_HDCP_ANLO(port)); - an.reg[1] = I915_READ(PORT_HDCP_ANHI(port)); + an.reg[0] = I915_READ(HDCP_ANLO(dev_priv, tc, port)); + an.reg[1] = I915_READ(HDCP_ANHI(dev_priv, tc, port)); ret = shim->write_an_aksv(intel_dig_port, an.shim); if (ret) return ret; @@ -644,24 +661,24 @@ static int intel_hdcp_auth(struct intel_connector *connector) return -EPERM; }
- I915_WRITE(PORT_HDCP_BKSVLO(port), bksv.reg[0]); - I915_WRITE(PORT_HDCP_BKSVHI(port), bksv.reg[1]); + I915_WRITE(HDCP_BKSVLO(dev_priv, tc, port), bksv.reg[0]); + I915_WRITE(HDCP_BKSVHI(dev_priv, tc, port), bksv.reg[1]);
ret = shim->repeater_present(intel_dig_port, &repeater_present); if (ret) return ret; if (repeater_present) I915_WRITE(HDCP_REP_CTL, - intel_hdcp_get_repeater_ctl(intel_dig_port)); + intel_hdcp_get_repeater_ctl(dev_priv, tc, port));
ret = shim->toggle_signalling(intel_dig_port, true); if (ret) return ret;
- I915_WRITE(PORT_HDCP_CONF(port), HDCP_CONF_AUTH_AND_ENC); + I915_WRITE(HDCP_CONF(dev_priv, tc, port), HDCP_CONF_AUTH_AND_ENC);
/* Wait for R0 ready */ - if (wait_for(I915_READ(PORT_HDCP_STATUS(port)) & + if (wait_for(I915_READ(HDCP_STATUS(dev_priv, tc, port)) & (HDCP_STATUS_R0_READY | HDCP_STATUS_ENC), 1)) { DRM_ERROR("Timed out waiting for R0 ready\n"); return -ETIMEDOUT; @@ -689,22 +706,22 @@ static int intel_hdcp_auth(struct intel_connector *connector) ret = shim->read_ri_prime(intel_dig_port, ri.shim); if (ret) return ret; - I915_WRITE(PORT_HDCP_RPRIME(port), ri.reg); + I915_WRITE(HDCP_RPRIME(dev_priv, tc, port), ri.reg);
/* Wait for Ri prime match */ - if (!wait_for(I915_READ(PORT_HDCP_STATUS(port)) & + if (!wait_for(I915_READ(HDCP_STATUS(dev_priv, tc, port)) & (HDCP_STATUS_RI_MATCH | HDCP_STATUS_ENC), 1)) break; }
if (i == tries) { DRM_DEBUG_KMS("Timed out waiting for Ri prime match (%x)\n", - I915_READ(PORT_HDCP_STATUS(port))); + I915_READ(HDCP_STATUS(dev_priv, tc, port))); return -ETIMEDOUT; }
/* Wait for encryption confirmation */ - if (intel_de_wait_for_set(dev_priv, PORT_HDCP_STATUS(port), + if (intel_de_wait_for_set(dev_priv, HDCP_STATUS(dev_priv, tc, port), HDCP_STATUS_ENC, ENCRYPT_STATUS_CHANGE_TIMEOUT_MS)) { DRM_ERROR("Timed out waiting for encryption\n"); @@ -729,15 +746,16 @@ static int _intel_hdcp_disable(struct intel_connector *connector) struct drm_i915_private *dev_priv = connector->base.dev->dev_private; struct intel_digital_port *intel_dig_port = conn_to_dig_port(connector); enum port port = intel_dig_port->base.port; + enum transcoder tc = hdcp->port_data.tc; int ret;
DRM_DEBUG_KMS("[%s:%d] HDCP is being disabled...\n", connector->base.name, connector->base.base.id);
hdcp->hdcp_encrypted = false; - I915_WRITE(PORT_HDCP_CONF(port), 0); - if (intel_de_wait_for_clear(dev_priv, PORT_HDCP_STATUS(port), ~0, - ENCRYPT_STATUS_CHANGE_TIMEOUT_MS)) { + I915_WRITE(HDCP_CONF(dev_priv, tc, port), 0); + if (intel_de_wait_for_clear(dev_priv, HDCP_STATUS(dev_priv, tc, port), + ~0, ENCRYPT_STATUS_CHANGE_TIMEOUT_MS)) { DRM_ERROR("Failed to disable HDCP, timeout clearing status\n"); return -ETIMEDOUT; } @@ -808,9 +826,11 @@ static int intel_hdcp_check_link(struct intel_connector *connector) struct drm_i915_private *dev_priv = connector->base.dev->dev_private; struct intel_digital_port *intel_dig_port = conn_to_dig_port(connector); enum port port = intel_dig_port->base.port; + enum transcoder tc; int ret = 0;
mutex_lock(&hdcp->mutex); + tc = hdcp->port_data.tc;
/* Check_link valid only when HDCP1.4 is enabled */ if (hdcp->value != DRM_MODE_CONTENT_PROTECTION_ENABLED || @@ -819,10 +839,10 @@ static int intel_hdcp_check_link(struct intel_connector *connector) goto out; }
- if (WARN_ON(!intel_hdcp_in_use(connector))) { + if (WARN_ON(!intel_hdcp_in_use(dev_priv, tc, port))) { DRM_ERROR("%s:%d HDCP link stopped encryption,%x\n", connector->base.name, connector->base.base.id, - I915_READ(PORT_HDCP_STATUS(port))); + I915_READ(HDCP_STATUS(dev_priv, tc, port))); ret = -ENXIO; hdcp->value = DRM_MODE_CONTENT_PROTECTION_DESIRED; schedule_work(&hdcp->prop_work); @@ -1493,10 +1513,11 @@ static int hdcp2_enable_encryption(struct intel_connector *connector) struct drm_i915_private *dev_priv = to_i915(connector->base.dev); struct intel_hdcp *hdcp = &connector->hdcp; enum port port = connector->encoder->port; + enum transcoder tc = hdcp->port_data.tc; int ret;
- WARN_ON(I915_READ(HDCP2_STATUS_DDI(port)) & LINK_ENCRYPTION_STATUS); - + WARN_ON(I915_READ(HDCP2_STATUS(dev_priv, tc, port)) & + LINK_ENCRYPTION_STATUS); if (hdcp->shim->toggle_signalling) { ret = hdcp->shim->toggle_signalling(intel_dig_port, true); if (ret) { @@ -1506,14 +1527,14 @@ static int hdcp2_enable_encryption(struct intel_connector *connector) } }
- if (I915_READ(HDCP2_STATUS_DDI(port)) & LINK_AUTH_STATUS) { + if (I915_READ(HDCP2_STATUS(dev_priv, tc, port)) & LINK_AUTH_STATUS) { /* Link is Authenticated. Now set for Encryption */ - I915_WRITE(HDCP2_CTL_DDI(port), - I915_READ(HDCP2_CTL_DDI(port)) | + I915_WRITE(HDCP2_CTL(dev_priv, tc, port), + I915_READ(HDCP2_CTL(dev_priv, tc, port)) | CTL_LINK_ENCRYPTION_REQ); }
- ret = intel_de_wait_for_set(dev_priv, HDCP2_STATUS_DDI(port), + ret = intel_de_wait_for_set(dev_priv, HDCP2_STATUS(dev_priv, tc, port), LINK_ENCRYPTION_STATUS, ENCRYPT_STATUS_CHANGE_TIMEOUT_MS);
@@ -1526,14 +1547,18 @@ static int hdcp2_disable_encryption(struct intel_connector *connector) struct drm_i915_private *dev_priv = to_i915(connector->base.dev); struct intel_hdcp *hdcp = &connector->hdcp; enum port port = connector->encoder->port; + enum transcoder tc = hdcp->port_data.tc; int ret;
- WARN_ON(!(I915_READ(HDCP2_STATUS_DDI(port)) & LINK_ENCRYPTION_STATUS)); + WARN_ON(!(I915_READ(HDCP2_STATUS(dev_priv, tc, port)) & + LINK_ENCRYPTION_STATUS));
- I915_WRITE(HDCP2_CTL_DDI(port), - I915_READ(HDCP2_CTL_DDI(port)) & ~CTL_LINK_ENCRYPTION_REQ); + I915_WRITE(HDCP2_CTL(dev_priv, tc, port), + I915_READ(HDCP2_CTL(dev_priv, tc, port)) & + ~CTL_LINK_ENCRYPTION_REQ);
- ret = intel_de_wait_for_clear(dev_priv, HDCP2_STATUS_DDI(port), + ret = intel_de_wait_for_clear(dev_priv, + HDCP2_STATUS(dev_priv, tc, port), LINK_ENCRYPTION_STATUS, ENCRYPT_STATUS_CHANGE_TIMEOUT_MS); if (ret == -ETIMEDOUT) @@ -1632,9 +1657,11 @@ static int intel_hdcp2_check_link(struct intel_connector *connector) struct drm_i915_private *dev_priv = to_i915(connector->base.dev); struct intel_hdcp *hdcp = &connector->hdcp; enum port port = connector->encoder->port; + enum transcoder tc; int ret = 0;
mutex_lock(&hdcp->mutex); + tc = hdcp->port_data.tc;
/* hdcp2_check_link is expected only when HDCP2.2 is Enabled */ if (hdcp->value != DRM_MODE_CONTENT_PROTECTION_ENABLED || @@ -1643,9 +1670,9 @@ static int intel_hdcp2_check_link(struct intel_connector *connector) goto out; }
- if (WARN_ON(!intel_hdcp2_in_use(connector))) { + if (WARN_ON(!intel_hdcp2_in_use(dev_priv, tc, port))) { DRM_ERROR("HDCP2.2 link stopped the encryption, %x\n", - I915_READ(HDCP2_STATUS_DDI(port))); + I915_READ(HDCP2_STATUS(dev_priv, tc, port))); ret = -ENXIO; hdcp->value = DRM_MODE_CONTENT_PROTECTION_DESIRED; schedule_work(&hdcp->prop_work); @@ -1752,10 +1779,21 @@ static const struct component_ops i915_hdcp_component_ops = { static inline int initialize_hdcp_port_data(struct intel_connector *connector, const struct intel_hdcp_shim *shim) { + struct drm_i915_private *dev_priv = to_i915(connector->base.dev); struct intel_hdcp *hdcp = &connector->hdcp; struct hdcp_port_data *data = &hdcp->port_data; + struct intel_crtc *crtc; + + if (INTEL_GEN(dev_priv) < 12) { + data->port = connector->encoder->port; + data->tc = INVALID_TRANSCODER; + } else { + crtc = to_intel_crtc(connector->base.state->crtc); + if (crtc) + data->tc = crtc->config->cpu_transcoder; + data->port = PORT_NONE; + }
- data->port = connector->encoder->port; data->port_type = (u8)HDCP_PORT_TYPE_INTEGRATED; data->protocol = (u8)shim->protocol;
@@ -1822,6 +1860,22 @@ static void intel_hdcp2_init(struct intel_connector *connector, hdcp->hdcp2_supported = true; }
+void intel_hdcp_transcoder_config(struct intel_connector *connector, + enum transcoder trans) +{ + struct drm_i915_private *dev_priv = to_i915(connector->base.dev); + struct intel_hdcp *hdcp = &connector->hdcp; + + if (!hdcp->shim) + return; + + if (INTEL_GEN(dev_priv) >= 12) { + mutex_lock(&hdcp->mutex); + hdcp->port_data.tc = trans; + mutex_unlock(&hdcp->mutex); + } +} + int intel_hdcp_init(struct intel_connector *connector, const struct intel_hdcp_shim *shim) { diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.h b/drivers/gpu/drm/i915/display/intel_hdcp.h index 13555b054930..1041b2c11fe9 100644 --- a/drivers/gpu/drm/i915/display/intel_hdcp.h +++ b/drivers/gpu/drm/i915/display/intel_hdcp.h @@ -19,6 +19,8 @@ struct intel_hdcp_shim; void intel_hdcp_atomic_check(struct drm_connector *connector, struct drm_connector_state *old_state, struct drm_connector_state *new_state); +void intel_hdcp_transcoder_config(struct intel_connector *connector, + enum transcoder trans); int intel_hdcp_init(struct intel_connector *connector, const struct intel_hdcp_shim *hdcp_shim); int intel_hdcp_enable(struct intel_connector *connector, u8 content_type); diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c index b1ca8e5bdb56..b2eb80fc9ff4 100644 --- a/drivers/gpu/drm/i915/display/intel_hdmi.c +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c @@ -1491,7 +1491,10 @@ bool intel_hdmi_hdcp_check_link(struct intel_digital_port *intel_dig_port) { struct drm_i915_private *dev_priv = intel_dig_port->base.base.dev->dev_private; + struct intel_connector *connector = + intel_dig_port->hdmi.attached_connector; enum port port = intel_dig_port->base.port; + enum transcoder tc = connector->hdcp.port_data.tc; int ret; union { u32 reg; @@ -1502,13 +1505,13 @@ bool intel_hdmi_hdcp_check_link(struct intel_digital_port *intel_dig_port) if (ret) return false;
- I915_WRITE(PORT_HDCP_RPRIME(port), ri.reg); + I915_WRITE(HDCP_RPRIME(dev_priv, tc, port), ri.reg);
/* Wait for Ri prime match */ - if (wait_for(I915_READ(PORT_HDCP_STATUS(port)) & + if (wait_for(I915_READ(HDCP_STATUS(dev_priv, tc, port)) & (HDCP_STATUS_RI_MATCH | HDCP_STATUS_ENC), 1)) { DRM_ERROR("Ri' mismatch detected, link check failed (%x)\n", - I915_READ(PORT_HDCP_STATUS(port))); + I915_READ(HDCP_STATUS(dev_priv, tc, port))); return false; } return true; @@ -2432,6 +2435,9 @@ int intel_hdmi_compute_config(struct intel_encoder *encoder, return -EINVAL; }
+ intel_hdcp_transcoder_config(intel_hdmi->attached_connector, + pipe_config->cpu_transcoder); + return 0; }
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index ea2f0fa2402d..9e5701f6e74d 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -9255,12 +9255,20 @@ enum skl_power_gate {
/* HDCP Repeater Registers */ #define HDCP_REP_CTL _MMIO(0x66d00) +#define HDCP_TRANSA_REP_PRESENT BIT(31) +#define HDCP_TRANSB_REP_PRESENT BIT(30) +#define HDCP_TRANSC_REP_PRESENT BIT(29) +#define HDCP_TRANSD_REP_PRESENT BIT(28) #define HDCP_DDIB_REP_PRESENT BIT(30) #define HDCP_DDIA_REP_PRESENT BIT(29) #define HDCP_DDIC_REP_PRESENT BIT(28) #define HDCP_DDID_REP_PRESENT BIT(27) #define HDCP_DDIF_REP_PRESENT BIT(26) #define HDCP_DDIE_REP_PRESENT BIT(25) +#define HDCP_TRANSA_SHA1_M0 (1 << 20) +#define HDCP_TRANSB_SHA1_M0 (2 << 20) +#define HDCP_TRANSC_SHA1_M0 (3 << 20) +#define HDCP_TRANSD_SHA1_M0 (4 << 20) #define HDCP_DDIB_SHA1_M0 (1 << 20) #define HDCP_DDIA_SHA1_M0 (2 << 20) #define HDCP_DDIC_SHA1_M0 (3 << 20) @@ -9300,15 +9308,92 @@ enum skl_power_gate { _PORTE_HDCP_AUTHENC, \ _PORTF_HDCP_AUTHENC) + (x)) #define PORT_HDCP_CONF(port) _PORT_HDCP_AUTHENC(port, 0x0) +#define _TRANSA_HDCP_CONF 0x66400 +#define _TRANSB_HDCP_CONF 0x66500 +#define TRANS_HDCP_CONF(trans) _MMIO_TRANS(trans, _TRANSA_HDCP_CONF, \ + _TRANSB_HDCP_CONF) +#define HDCP_CONF(dev_priv, trans, port) \ + (INTEL_GEN(dev_priv) >= 12 ? \ + TRANS_HDCP_CONF(trans) : \ + PORT_HDCP_CONF(port)) + #define HDCP_CONF_CAPTURE_AN BIT(0) #define HDCP_CONF_AUTH_AND_ENC (BIT(1) | BIT(0)) #define PORT_HDCP_ANINIT(port) _PORT_HDCP_AUTHENC(port, 0x4) +#define _TRANSA_HDCP_ANINIT 0x66404 +#define _TRANSB_HDCP_ANINIT 0x66504 +#define TRANS_HDCP_ANINIT(trans) _MMIO_TRANS(trans, \ + _TRANSA_HDCP_ANINIT, \ + _TRANSB_HDCP_ANINIT) +#define HDCP_ANINIT(dev_priv, trans, port) \ + (INTEL_GEN(dev_priv) >= 12 ? \ + TRANS_HDCP_ANINIT(trans) : \ + PORT_HDCP_ANINIT(port)) + #define PORT_HDCP_ANLO(port) _PORT_HDCP_AUTHENC(port, 0x8) +#define _TRANSA_HDCP_ANLO 0x66408 +#define _TRANSB_HDCP_ANLO 0x66508 +#define TRANS_HDCP_ANLO(trans) _MMIO_TRANS(trans, _TRANSA_HDCP_ANLO, \ + _TRANSB_HDCP_ANLO) +#define HDCP_ANLO(dev_priv, trans, port) \ + (INTEL_GEN(dev_priv) >= 12 ? \ + TRANS_HDCP_ANLO(trans) : \ + PORT_HDCP_ANLO(port)) + #define PORT_HDCP_ANHI(port) _PORT_HDCP_AUTHENC(port, 0xC) +#define _TRANSA_HDCP_ANHI 0x6640C +#define _TRANSB_HDCP_ANHI 0x6650C +#define TRANS_HDCP_ANHI(trans) _MMIO_TRANS(trans, _TRANSA_HDCP_ANHI, \ + _TRANSB_HDCP_ANHI) +#define HDCP_ANHI(dev_priv, trans, port) \ + (INTEL_GEN(dev_priv) >= 12 ? \ + TRANS_HDCP_ANHI(trans) : \ + PORT_HDCP_ANHI(port)) + #define PORT_HDCP_BKSVLO(port) _PORT_HDCP_AUTHENC(port, 0x10) +#define _TRANSA_HDCP_BKSVLO 0x66410 +#define _TRANSB_HDCP_BKSVLO 0x66510 +#define TRANS_HDCP_BKSVLO(trans) _MMIO_TRANS(trans, \ + _TRANSA_HDCP_BKSVLO, \ + _TRANSB_HDCP_BKSVLO) +#define HDCP_BKSVLO(dev_priv, trans, port) \ + (INTEL_GEN(dev_priv) >= 12 ? \ + TRANS_HDCP_BKSVLO(trans) : \ + PORT_HDCP_BKSVLO(port)) + #define PORT_HDCP_BKSVHI(port) _PORT_HDCP_AUTHENC(port, 0x14) +#define _TRANSA_HDCP_BKSVHI 0x66414 +#define _TRANSB_HDCP_BKSVHI 0x66514 +#define TRANS_HDCP_BKSVHI(trans) _MMIO_TRANS(trans, \ + _TRANSA_HDCP_BKSVHI, \ + _TRANSB_HDCP_BKSVHI) +#define HDCP_BKSVHI(dev_priv, trans, port) \ + (INTEL_GEN(dev_priv) >= 12 ? \ + TRANS_HDCP_BKSVHI(trans) : \ + PORT_HDCP_BKSVHI(port)) + #define PORT_HDCP_RPRIME(port) _PORT_HDCP_AUTHENC(port, 0x18) +#define _TRANSA_HDCP_RPRIME 0x66418 +#define _TRANSB_HDCP_RPRIME 0x66518 +#define TRANS_HDCP_RPRIME(trans) _MMIO_TRANS(trans, \ + _TRANSA_HDCP_RPRIME, \ + _TRANSB_HDCP_RPRIME) +#define HDCP_RPRIME(dev_priv, trans, port) \ + (INTEL_GEN(dev_priv) >= 12 ? \ + TRANS_HDCP_RPRIME(trans) : \ + PORT_HDCP_RPRIME(port)) + #define PORT_HDCP_STATUS(port) _PORT_HDCP_AUTHENC(port, 0x1C) +#define _TRANSA_HDCP_STATUS 0x6641C +#define _TRANSB_HDCP_STATUS 0x6651C +#define TRANS_HDCP_STATUS(trans) _MMIO_TRANS(trans, \ + _TRANSA_HDCP_STATUS, \ + _TRANSB_HDCP_STATUS) +#define HDCP_STATUS(dev_priv, trans, port) \ + (INTEL_GEN(dev_priv) >= 12 ? \ + TRANS_HDCP_STATUS(trans) : \ + PORT_HDCP_STATUS(port)) + #define HDCP_STATUS_STREAM_A_ENC BIT(31) #define HDCP_STATUS_STREAM_B_ENC BIT(30) #define HDCP_STATUS_STREAM_C_ENC BIT(29) @@ -9335,23 +9420,44 @@ enum skl_power_gate { _PORTD_HDCP2_BASE, \ _PORTE_HDCP2_BASE, \ _PORTF_HDCP2_BASE) + (x)) - -#define HDCP2_AUTH_DDI(port) _PORT_HDCP2_BASE(port, 0x98) +#define PORT_HDCP2_AUTH(port) _PORT_HDCP2_BASE(port, 0x98) +#define _TRANSA_HDCP2_AUTH 0x66498 +#define _TRANSB_HDCP2_AUTH 0x66598 +#define TRANS_HDCP2_AUTH(trans) _MMIO_TRANS(trans, _TRANSA_HDCP2_AUTH, \ + _TRANSB_HDCP2_AUTH) #define AUTH_LINK_AUTHENTICATED BIT(31) #define AUTH_LINK_TYPE BIT(30) #define AUTH_FORCE_CLR_INPUTCTR BIT(19) #define AUTH_CLR_KEYS BIT(18) - -#define HDCP2_CTL_DDI(port) _PORT_HDCP2_BASE(port, 0xB0) +#define HDCP2_AUTH(dev_priv, trans, port) \ + (INTEL_GEN(dev_priv) >= 12 ? \ + TRANS_HDCP2_AUTH(trans) : \ + PORT_HDCP2_AUTH(port)) + +#define PORT_HDCP2_CTL(port) _PORT_HDCP2_BASE(port, 0xB0) +#define _TRANSA_HDCP2_CTL 0x664B0 +#define _TRANSB_HDCP2_CTL 0x665B0 +#define TRANS_HDCP2_CTL(trans) _MMIO_TRANS(trans, _TRANSA_HDCP2_CTL, \ + _TRANSB_HDCP2_CTL) #define CTL_LINK_ENCRYPTION_REQ BIT(31) - -#define HDCP2_STATUS_DDI(port) _PORT_HDCP2_BASE(port, 0xB4) -#define STREAM_ENCRYPTION_STATUS_A BIT(31) -#define STREAM_ENCRYPTION_STATUS_B BIT(30) -#define STREAM_ENCRYPTION_STATUS_C BIT(29) +#define HDCP2_CTL(dev_priv, trans, port) \ + (INTEL_GEN(dev_priv) >= 12 ? \ + TRANS_HDCP2_CTL(trans) : \ + PORT_HDCP2_CTL(port)) + +#define PORT_HDCP2_STATUS(port) _PORT_HDCP2_BASE(port, 0xB4) +#define _TRANSA_HDCP2_STATUS 0x664B4 +#define _TRANSB_HDCP2_STATUS 0x665B4 +#define TRANS_HDCP2_STATUS(trans) _MMIO_TRANS(trans, \ + _TRANSA_HDCP2_STATUS, \ + _TRANSB_HDCP2_STATUS) #define LINK_TYPE_STATUS BIT(22) #define LINK_AUTH_STATUS BIT(21) #define LINK_ENCRYPTION_STATUS BIT(20) +#define HDCP2_STATUS(dev_priv, trans, port) \ + (INTEL_GEN(dev_priv) >= 12 ? \ + TRANS_HDCP2_STATUS(trans) : \ + PORT_HDCP2_STATUS(port))
/* Per-pipe DDI Function Control */ #define _TRANS_DDI_FUNC_CTL_A 0x60400
dri-devel@lists.freedesktop.org
-
Jani Nikula -
Ramalingam C -
Winkler, Tomas