]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/xe/hdcp: Fix gsc structure check in fw check status
authorSuraj Kandpal <suraj.kandpal@intel.com>
Fri, 25 Oct 2024 16:08:35 +0000 (21:38 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 5 Dec 2024 12:53:18 +0000 (13:53 +0100)
[ Upstream commit 182a32bcc223203c57761889fac7fa2dbb34684b ]

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
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpu/drm/xe/display/xe_hdcp_gsc.c

index 0af667ebebf9827ea48d9063842591d711cd9920..09b87d70e34c6d5eebb78feab5e3ccc5c2d8845c 100644 (file)
@@ -43,7 +43,7 @@ bool intel_hdcp_gsc_check_status(struct xe_device *xe)
        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;