On 10/22/2024 11:26 AM, Suraj Kandpal wrote:
Add check to remove HDCP2 compatibility from BMG as it does not
have GSC which ends up causing warning when we try to get reference
of GSC FW.

Signed-off-by: Suraj Kandpal <[email protected]>

Reviewed-by: Ankit Nautiyal <[email protected]>


---
  drivers/gpu/drm/i915/display/intel_hdcp_gsc.c | 3 ++-
  drivers/gpu/drm/xe/display/xe_hdcp_gsc.c      | 3 ++-
  2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_hdcp_gsc.c 
b/drivers/gpu/drm/i915/display/intel_hdcp_gsc.c
index 55965844d829..2c1d0ee8cec2 100644
--- a/drivers/gpu/drm/i915/display/intel_hdcp_gsc.c
+++ b/drivers/gpu/drm/i915/display/intel_hdcp_gsc.c
@@ -21,7 +21,8 @@ struct intel_hdcp_gsc_message {
bool intel_hdcp_gsc_cs_required(struct intel_display *display)
  {
-       return DISPLAY_VER(display) >= 14;
+       return DISPLAY_VER(display) >= 14 &&
+               DISPLAY_VER_FULL(display) != IP_VER(14, 1);
  }
bool intel_hdcp_gsc_check_status(struct intel_display *display)
diff --git a/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c 
b/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
index 231677129a35..e3c57f0b79c4 100644
--- a/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
+++ b/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
@@ -32,7 +32,8 @@ struct intel_hdcp_gsc_message {
bool intel_hdcp_gsc_cs_required(struct intel_display *display)
  {
-       return DISPLAY_VER(display) >= 14;
+       return DISPLAY_VER(display) >= 14 &&
+               DISPLAY_VER_FULL(display) != IP_VER(14, 1);
  }
bool intel_hdcp_gsc_check_status(struct intel_display *display)

Reply via email to