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 X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E734FC433DB for ; Thu, 21 Jan 2021 20:31:03 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 7776423A54 for ; Thu, 21 Jan 2021 20:31:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7776423A54 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 91AFF6E160; Thu, 21 Jan 2021 20:31:02 +0000 (UTC) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id E32236E160 for ; Thu, 21 Jan 2021 20:31:00 +0000 (UTC) IronPort-SDR: 1B7DE24AFmVkM/047XKJ5EBzLzFx3ZAdDBEb375aMmuS3Ci8ObqAZrQPMyAm1SNR1v0jL1W18p PAlSq6uzIzfQ== X-IronPort-AV: E=McAfee;i="6000,8403,9871"; a="179491146" X-IronPort-AV: E=Sophos;i="5.79,365,1602572400"; d="scan'208";a="179491146" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Jan 2021 12:30:54 -0800 IronPort-SDR: ZQ+xi4ZCt04hwOfrDwz6kVBHWhpVSSim0GipoUcvqFATYl/M+/nC5DtRIpmhuu3Hc/Sz4IVMAX h+MApWj0+6Mg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.79,365,1602572400"; d="scan'208";a="367046989" Received: from stinkbox.fi.intel.com (HELO stinkbox) ([10.237.72.174]) by orsmga002.jf.intel.com with SMTP; 21 Jan 2021 12:30:50 -0800 Received: by stinkbox (sSMTP sendmail emulation); Thu, 21 Jan 2021 22:30:50 +0200 Date: Thu, 21 Jan 2021 22:30:50 +0200 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: "Gupta, Anshuman" Message-ID: References: <20210119074320.28768-1-sean.z.huang@intel.com> <20210119074320.28768-14-sean.z.huang@intel.com> <9babc226536544f7aa7ec98e80de4b21@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <9babc226536544f7aa7ec98e80de4b21@intel.com> X-Patchwork-Hint: comment Subject: Re: [Intel-gfx] [RFC-v23 13/13] drm/i915/pxp: Add plane decryption support 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: , Cc: "Nikula, Jani" , "Gaurav, Kumar" , "Intel-gfx@lists.freedesktop.org" , "Huang, Sean Z" , "Bommu, Krishnaiah" , "Vetter, Daniel" Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Tue, Jan 19, 2021 at 09:35:18AM +0000, Gupta, Anshuman wrote: > Jani/Ville > I had received an offline comment form Gaurav on this patch, > See below, > > -----Original Message----- > > From: Huang, Sean Z > > Sent: Tuesday, January 19, 2021 1:13 PM > > To: Intel-gfx@lists.freedesktop.org > > Cc: Gaurav, Kumar ; Gupta, Anshuman > > ; Bommu, Krishnaiah > > ; Huang, Sean Z > > Subject: [RFC-v23 13/13] drm/i915/pxp: Add plane decryption support > > = > > From: Anshuman Gupta > > = > > Add support to enable/disable PLANE_SURF Decryption Request bit. > > It requires only to enable plane decryption support when following > > condition met. > > 1. PXP session is enabled. > > 2. Buffer object is protected. > > = > > v2: > > - Rebased to libva_cp-drm-tip_tgl_cp tree. > > - Used gen fb obj user_flags instead gem_object_metadata. [Krishna] > > = > > v3: > > - intel_pxp_gem_object_status() API changes. > > = > > Cc: Bommu Krishnaiah > > Cc: Huang Sean Z > > Cc: Gaurav Kumar > > Signed-off-by: Anshuman Gupta > > --- > > drivers/gpu/drm/i915/display/intel_sprite.c | 21 ++++++++++++++++++--- > > drivers/gpu/drm/i915/i915_reg.h | 1 + > > 2 files changed, 19 insertions(+), 3 deletions(-) > > = > > diff --git a/drivers/gpu/drm/i915/display/intel_sprite.c > > b/drivers/gpu/drm/i915/display/intel_sprite.c > > index cf3589fd0ddb..39f8c922ce66 100644 > > --- a/drivers/gpu/drm/i915/display/intel_sprite.c > > +++ b/drivers/gpu/drm/i915/display/intel_sprite.c > > @@ -39,6 +39,8 @@ > > #include > > #include > > = > > +#include "pxp/intel_pxp.h" > > + > > #include "i915_drv.h" > > #include "i915_trace.h" > > #include "i915_vgpu.h" > > @@ -768,6 +770,11 @@ icl_program_input_csc(struct intel_plane *plane, > > PLANE_INPUT_CSC_POSTOFF(pipe, plane_id, 2), > > 0x0); } > > = > > +static bool intel_fb_obj_protected(const struct drm_i915_gem_object > > +*obj) { > > + return obj->user_flags & I915_BO_PROTECTED ? true : false; } > > + > > static void > > skl_plane_async_flip(struct intel_plane *plane, > > const struct intel_crtc_state *crtc_state, @@ -804,6 > > +811,7 @@ skl_program_plane(struct intel_plane *plane, > > u32 surf_addr =3D plane_state->color_plane[color_plane].offset; > > u32 stride =3D skl_plane_stride(plane_state, color_plane); > > const struct drm_framebuffer *fb =3D plane_state->hw.fb; > > + const struct drm_i915_gem_object *obj =3D intel_fb_obj(fb); > > int aux_plane =3D intel_main_to_aux_plane(fb, color_plane); > > int crtc_x =3D plane_state->uapi.dst.x1; > > int crtc_y =3D plane_state->uapi.dst.y1; @@ -814,7 +822,7 @@ > > skl_program_plane(struct intel_plane *plane, > > u8 alpha =3D plane_state->hw.alpha >> 8; > > u32 plane_color_ctl =3D 0, aux_dist =3D 0; > > unsigned long irqflags; > > - u32 keymsk, keymax; > > + u32 keymsk, keymax, plane_surf; > > u32 plane_ctl =3D plane_state->ctl; > > = > > plane_ctl |=3D skl_plane_ctl_crtc(crtc_state); @@ -890,8 +898,15 > > @@ skl_program_plane(struct intel_plane *plane, > > * the control register just before the surface register. > > */ > > intel_de_write_fw(dev_priv, PLANE_CTL(pipe, plane_id), plane_ctl); > > - intel_de_write_fw(dev_priv, PLANE_SURF(pipe, plane_id), > > - intel_plane_ggtt_offset(plane_state) + surf_addr); > > + plane_surf =3D intel_plane_ggtt_offset(plane_state) + surf_addr; > > + > > + if (intel_pxp_gem_object_status(dev_priv) && > > + intel_fb_obj_protected(obj)) > > + plane_surf |=3D PLANE_SURF_DECRYPTION_ENABLED; > Here in case of if fb obj is protected but pxp session is not enabled i.e= intel_pxp_gem_object_status() returns false, request to show the black fra= me buffer on display instead of corrupted data. > plane_surf =3D 0xXXX; //Pointer to black fram= ebuffer > But above approach would be a hack. = > @Jani and @Ville could you please guide with the general way of handling = this as pxp session keys can be invalidated at any time. Would need such a black buffer to be always pinned into the gtt, which is seems a bit wasteful. We could perhaps just force the plane to output black eg. by using the plane gamma. I think we should always have the per-plane gamma available on skl+ universal planes. Cursor may be a different story. -- = Ville Syrj=E4l=E4 Intel _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx