From: Suraj Kandpal <suraj.kandpal@intel.com>
Date: Fri, 25 Oct 2024 16:08:35 +0000 (+0530)
Subject: drm/xe/hdcp: Fix gsc structure check in fw check status
X-Git-Tag: v6.13-rc1~122^2~7^2~66
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=182a32bcc223203c57761889fac7fa2dbb34684b;p=thirdparty%2Flinux.git

drm/xe/hdcp: Fix gsc structure check in fw check status

Fix the condition for gsc structure validity in
gsc_cs_status_check(). It needs to be an OR and not an AND
condition

Fixes: b4224f6bae38 ("drm/xe/hdcp: Check GSC structure validity")
Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241025160834.8785-1-suraj.kandpal@intel.com
---

diff --git a/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c b/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
index 231677129a35b..219e0b0dd07ee 100644
--- a/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
+++ b/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
@@ -43,7 +43,7 @@ bool intel_hdcp_gsc_check_status(struct intel_display *display)
 	struct xe_gsc *gsc = &gt->uc.gsc;
 	bool ret = true;
 
-	if (!gsc && !xe_uc_fw_is_enabled(&gsc->fw)) {
+	if (!gsc || !xe_uc_fw_is_enabled(&gsc->fw)) {
 		drm_dbg_kms(&xe->drm,
 			    "GSC Components not ready for HDCP2.x\n");
 		return false;