Intel-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Suraj Kandpal <suraj.kandpal@intel.com>
To: intel-xe@lists.freedesktop.org, intel-gfx@lists.freedesktop.org
Cc: Suraj Kandpal <suraj.kandpal@intel.com>
Subject: [PATCH] drm/xe/hdcp: Add check to remove hdcp2 compatibilty
Date: Tue, 22 Oct 2024 11:26:56 +0530	[thread overview]
Message-ID: <20241022055655.1902-1-suraj.kandpal@intel.com> (raw)

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 <suraj.kandpal@intel.com>
---
 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)
-- 
2.34.1


             reply	other threads:[~2024-10-22  5:57 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-10-22  5:56 Suraj Kandpal [this message]
2024-10-22  6:03 ` [PATCH] drm/xe/hdcp: Add check to remove hdcp2 compatibilty Nautiyal, Ankit K
2024-10-22  6:09 ` Ghimiray, Himal Prasad
2024-10-22  6:26 ` Nilawar, Badal
2024-10-22  7:44   ` Jani Nikula
2024-10-22  8:26     ` Nilawar, Badal
2024-10-22  6:33 ` ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
2024-10-22  6:33 ` ✗ Fi.CI.SPARSE: " Patchwork
2024-10-22  7:20 ` ✓ Fi.CI.BAT: success " Patchwork
2024-10-22  7:29 ` [PATCH] drm/xe/hdcp: Add check to remove hdcp2 compatibility Suraj Kandpal
2024-10-22  7:46   ` Jani Nikula
2024-10-22  8:53     ` Kandpal, Suraj
2024-10-24  7:58       ` Jani Nikula
2024-10-22  8:22   ` Ghimiray, Himal Prasad
2024-10-23 19:45   ` Matt Roper
2024-10-24  2:42     ` Kandpal, Suraj
2024-10-24 15:33   ` Daniele Ceraolo Spurio
2024-10-25  1:21     ` Kandpal, Suraj
2024-10-25 15:04       ` Daniele Ceraolo Spurio
2024-10-25 15:59         ` Kandpal, Suraj
2024-10-25 16:08   ` [PATCH] drm/xe/hdcp: Fix gsc structure check in fw check status Suraj Kandpal
2024-10-25 16:12     ` Matt Roper
2024-10-28 12:03     ` Jani Nikula
2024-10-22  8:18 ` ✗ Fi.CI.IGT: failure for drm/xe/hdcp: Add check to remove hdcp2 compatibilty Patchwork
2024-10-22  9:00 ` ✓ Fi.CI.BAT: success for drm/xe/hdcp: Add check to remove hdcp2 compatibilty (rev2) Patchwork
2024-10-22 10:36 ` ✗ Fi.CI.IGT: failure " Patchwork
2024-10-22 22:04 ` [PATCH] drm/xe/hdcp: Add check to remove hdcp2 compatibilty kernel test robot
2024-10-25 17:25 ` ✓ Fi.CI.BAT: success for drm/xe/hdcp: Add check to remove hdcp2 compatibilty (rev3) Patchwork
2024-10-25 22:56 ` ✗ Fi.CI.IGT: failure " Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20241022055655.1902-1-suraj.kandpal@intel.com \
    --to=suraj.kandpal@intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=intel-xe@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox