> -----Original Message-----
> From: dri-devel <dri-devel-boun...@lists.freedesktop.org> On Behalf Of
> 1064094...@qq.com
> Sent: Monday, October 28, 2024 3:13 PM
> To: Jani Nikula <jani.nik...@linux.intel.com>
> Cc: Vivi, Rodrigo <rodrigo.v...@intel.com>; De Marchi, Lucas
> <lucas.demar...@intel.com>; Thomas <thomas.hellst...@linux.intel.com>;
> Maarten Lankhorst <maarten.lankho...@linux.intel.com>; Maxime Ripard
> <mrip...@kernel.org>; Thomas Zimmermann <tzimmerm...@suse.de>;
> David Airlie <airl...@gmail.com>; Simona Vetter <sim...@ffwll.ch>; intel-
> g...@lists.freedesktop.org; intel...@lists.freedesktop.org; dri-
> de...@lists.freedesktop.org; linux-ker...@vger.kernel.org; pengfuyuan
> <pengfuy...@kylinos.cn>
> Subject: [PATCH] drm/xe/hdcp: Fix logic errors
>
> From: pengfuyuan <pengfuy...@kylinos.cn>
>
> Here the gsc struct null pointer check should use '||' instead of '&&'.
>
> Fix the following patches:
> drm/xe/hdcp: Check GSC structure validity
>
This fix has already been sent
https://patchwork.freedesktop.org/series/140291/
Regards,
Suraj Kandpal
> Signed-off-by: pengfuyuan <pengfuy...@kylinos.cn>
> ---
> drivers/gpu/drm/xe/display/xe_hdcp_gsc.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
> b/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
> index 6619a40aed15..f4332f06b6c8 100644
> --- a/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
> +++ b/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
> @@ -42,7 +42,7 @@ bool intel_hdcp_gsc_check_status(struct xe_device *xe)
> struct xe_gsc *gsc = >->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;
> --
> 2.25.1
