From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A816ED0BB6B for ; Thu, 24 Oct 2024 07:59:05 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 312D410E8CA; Thu, 24 Oct 2024 07:59:05 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="Kfkgpipo"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) by gabe.freedesktop.org (Postfix) with ESMTPS id 64AD210E8AE; Thu, 24 Oct 2024 07:59:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1729756744; x=1761292744; h=from:to:cc:subject:in-reply-to:references:date: message-id:mime-version; bh=G5tfKWi77QuzGi68lJV0Ha1bzx5oG6W+q4fP/Yv3l0w=; b=Kfkgpipo51IW74smhz37Fu5mBYDPRdM8svaHM+vk4bR2a11OwnXg1u1u t78jULadcZlLo/XFsthFcN9M9JOifY6YUwfnXfSL+DCyed6qHdJI6XxxL xfP3PUDSdi+xiJsm6VSatsm9of5do3AETYLiVWXmUYA4t5a3iDIpdB0Ay P6DH2WhdwNTLHT9DskDoxcyJXUuy30hQ2czG2xPz+JDxE6mnNShQOSEFP EldL75Hj2o2MO9HUntPxxk/DBspgN7wgJkjLmozhSNRKHtl0iFZyK8nQc GE9WtP91vh2ISIP0mEu4aOXYJcKNdYYxz82D0/B0BWpqIm37Z9GAz5bE1 g==; X-CSE-ConnectionGUID: jxXyf1X6SKyWw5dpJiGo2A== X-CSE-MsgGUID: dAgOsZddSpepaTXRlGwQ0w== X-IronPort-AV: E=McAfee;i="6700,10204,11234"; a="40764480" X-IronPort-AV: E=Sophos;i="6.11,228,1725346800"; d="scan'208";a="40764480" Received: from orviesa003.jf.intel.com ([10.64.159.143]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Oct 2024 00:59:04 -0700 X-CSE-ConnectionGUID: Y6xZGPyNQX629cWQvdfMqg== X-CSE-MsgGUID: mmAUx8/FSVCW09dG+yw3hQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.11,199,1725346800"; d="scan'208";a="85300744" Received: from kniemiec-mobl1.ger.corp.intel.com (HELO localhost) ([10.245.246.151]) by ORVIESA003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Oct 2024 00:59:02 -0700 From: Jani Nikula To: "Kandpal, Suraj" , "intel-xe@lists.freedesktop.org" , "intel-gfx@lists.freedesktop.org" Cc: "Nautiyal, Ankit K" , "Ghimiray, Himal Prasad" Subject: RE: [PATCH] drm/xe/hdcp: Add check to remove hdcp2 compatibility In-Reply-To: Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20241022055655.1902-1-suraj.kandpal@intel.com> <20241022072920.102033-1-suraj.kandpal@intel.com> <877ca0y3z9.fsf@intel.com> Date: Thu, 24 Oct 2024 10:58:58 +0300 Message-ID: <87ldyeszi5.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Tue, 22 Oct 2024, "Kandpal, Suraj" wrote: >> -----Original Message----- >> From: Jani Nikula >> Sent: Tuesday, October 22, 2024 1:17 PM >> To: Kandpal, Suraj ; intel-xe@lists.freedesktop.org; >> intel-gfx@lists.freedesktop.org >> Cc: Kandpal, Suraj ; Nautiyal, Ankit K >> ; Ghimiray, Himal Prasad >> >> Subject: Re: [PATCH] drm/xe/hdcp: Add check to remove hdcp2 compatibility >> >> On Tue, 22 Oct 2024, 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. >> > >> > Fixes: 89d030804831 ("drm/xe/hdcp: Fix condition for hdcp gsc cs >> > requirement") >> > Fixes: 883631771038 ("drm/i915/mtl: Add HDCP GSC interface") >> > Signed-off-by: Suraj Kandpal >> > Reviewed-by: Ankit Nautiyal >> > Reviewed-by: Himal Prasad Ghimiray >> > --- >> > drivers/gpu/drm/i915/display/intel_hdcp_gsc.c | 3 ++- >> > drivers/gpu/drm/xe/display/xe_hdcp_gsc.c | 4 +++- >> > 2 files changed, 5 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..efa3441c249c 100644 >> > --- a/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c >> > +++ b/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c >> > @@ -8,6 +8,7 @@ >> > #include >> > >> > #include "abi/gsc_command_header_abi.h" >> > +#include "i915_drv.h" >> >> Hrmh, xe code should not include i915_drv.h. > > The issue is without this IP_VER used below ends up throwing an error Yeah, we'll need to fix that. Ack as a temporary measure, but please follow through with Matt's review comments before merging. BR, Jani. > > Regards, > Suraj Kandpal >> >> > #include "intel_hdcp_gsc.h" >> > #include "intel_hdcp_gsc_message.h" >> > #include "xe_bo.h" >> > @@ -32,7 +33,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) >> >> -- >> Jani Nikula, Intel -- Jani Nikula, Intel