mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-29 05:44:11 +00:00
drm/i915/pxp: Add plane decryption support
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: - Used gen fb obj user_flags instead gem_object_metadata. [Krishna] v3: - intel_pxp_gem_object_status() API changes. v4: use intel_pxp_is_active (Daniele) v5: rebase and use the new protected object status checker (Daniele) v6: used plane state for plane_decryption to handle async flip as suggested by Ville. v7: check pxp session while plane decrypt state computation. [Ville] removed pointless code. [Ville] v8 (Daniele): update PXP check v9: move decrypt check after icl_check_nv12_planes() when overlays have fb set (Juston) v10 (Daniele): update PXP check again to match rework in earlier patches and don't consider protection valid if the object has not been used in an execbuf beforehand. Cc: Bommu Krishnaiah <krishnaiah.bommu@intel.com> Cc: Huang Sean Z <sean.z.huang@intel.com> Cc: Gaurav Kumar <kumar.gaurav@intel.com> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com> Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> Signed-off-by: Juston Li <juston.li@intel.com> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Reviewed-by: Uma Shankar <uma.shankar@intel.com> #v9 Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20210924191452.1539378-14-alan.previn.teres.alexis@intel.com
This commit is contained in:
parent
0cfab4cb3c
commit
ef6ba31dd3
7 changed files with 54 additions and 9 deletions
|
@ -70,6 +70,8 @@
|
||||||
#include "gt/intel_rps.h"
|
#include "gt/intel_rps.h"
|
||||||
#include "gt/gen8_ppgtt.h"
|
#include "gt/gen8_ppgtt.h"
|
||||||
|
|
||||||
|
#include "pxp/intel_pxp.h"
|
||||||
|
|
||||||
#include "g4x_dp.h"
|
#include "g4x_dp.h"
|
||||||
#include "g4x_hdmi.h"
|
#include "g4x_hdmi.h"
|
||||||
#include "i915_drv.h"
|
#include "i915_drv.h"
|
||||||
|
@ -9627,13 +9629,23 @@ static int intel_bigjoiner_add_affected_planes(struct intel_atomic_state *state)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static bool bo_has_valid_encryption(struct drm_i915_gem_object *obj)
|
||||||
|
{
|
||||||
|
struct drm_i915_private *i915 = to_i915(obj->base.dev);
|
||||||
|
|
||||||
|
return intel_pxp_key_check(&i915->gt.pxp, obj, false) == 0;
|
||||||
|
}
|
||||||
|
|
||||||
static int intel_atomic_check_planes(struct intel_atomic_state *state)
|
static int intel_atomic_check_planes(struct intel_atomic_state *state)
|
||||||
{
|
{
|
||||||
struct drm_i915_private *dev_priv = to_i915(state->base.dev);
|
struct drm_i915_private *dev_priv = to_i915(state->base.dev);
|
||||||
struct intel_crtc_state *old_crtc_state, *new_crtc_state;
|
struct intel_crtc_state *old_crtc_state, *new_crtc_state;
|
||||||
struct intel_plane_state *plane_state;
|
struct intel_plane_state *plane_state;
|
||||||
struct intel_plane *plane;
|
struct intel_plane *plane;
|
||||||
|
struct intel_plane_state *new_plane_state;
|
||||||
|
struct intel_plane_state *old_plane_state;
|
||||||
struct intel_crtc *crtc;
|
struct intel_crtc *crtc;
|
||||||
|
const struct drm_framebuffer *fb;
|
||||||
int i, ret;
|
int i, ret;
|
||||||
|
|
||||||
ret = icl_add_linked_planes(state);
|
ret = icl_add_linked_planes(state);
|
||||||
|
@ -9681,6 +9693,16 @@ static int intel_atomic_check_planes(struct intel_atomic_state *state)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
for_each_new_intel_plane_in_state(state, plane, plane_state, i) {
|
||||||
|
new_plane_state = intel_atomic_get_new_plane_state(state, plane);
|
||||||
|
old_plane_state = intel_atomic_get_old_plane_state(state, plane);
|
||||||
|
fb = new_plane_state->hw.fb;
|
||||||
|
if (fb)
|
||||||
|
new_plane_state->decrypt = bo_has_valid_encryption(intel_fb_obj(fb));
|
||||||
|
else
|
||||||
|
new_plane_state->decrypt = old_plane_state->decrypt;
|
||||||
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -9967,6 +9989,10 @@ static int intel_atomic_check_async(struct intel_atomic_state *state)
|
||||||
drm_dbg_kms(&i915->drm, "Color range cannot be changed in async flip\n");
|
drm_dbg_kms(&i915->drm, "Color range cannot be changed in async flip\n");
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* plane decryption is allow to change only in synchronous flips */
|
||||||
|
if (old_plane_state->decrypt != new_plane_state->decrypt)
|
||||||
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -629,6 +629,9 @@ struct intel_plane_state {
|
||||||
|
|
||||||
struct intel_fb_view view;
|
struct intel_fb_view view;
|
||||||
|
|
||||||
|
/* Plane pxp decryption state */
|
||||||
|
bool decrypt;
|
||||||
|
|
||||||
/* plane control register */
|
/* plane control register */
|
||||||
u32 ctl;
|
u32 ctl;
|
||||||
|
|
||||||
|
|
|
@ -18,6 +18,7 @@
|
||||||
#include "intel_sprite.h"
|
#include "intel_sprite.h"
|
||||||
#include "skl_scaler.h"
|
#include "skl_scaler.h"
|
||||||
#include "skl_universal_plane.h"
|
#include "skl_universal_plane.h"
|
||||||
|
#include "pxp/intel_pxp.h"
|
||||||
|
|
||||||
static const u32 skl_plane_formats[] = {
|
static const u32 skl_plane_formats[] = {
|
||||||
DRM_FORMAT_C8,
|
DRM_FORMAT_C8,
|
||||||
|
@ -1024,7 +1025,7 @@ skl_program_plane(struct intel_plane *plane,
|
||||||
u8 alpha = plane_state->hw.alpha >> 8;
|
u8 alpha = plane_state->hw.alpha >> 8;
|
||||||
u32 plane_color_ctl = 0, aux_dist = 0;
|
u32 plane_color_ctl = 0, aux_dist = 0;
|
||||||
unsigned long irqflags;
|
unsigned long irqflags;
|
||||||
u32 keymsk, keymax;
|
u32 keymsk, keymax, plane_surf;
|
||||||
u32 plane_ctl = plane_state->ctl;
|
u32 plane_ctl = plane_state->ctl;
|
||||||
|
|
||||||
plane_ctl |= skl_plane_ctl_crtc(crtc_state);
|
plane_ctl |= skl_plane_ctl_crtc(crtc_state);
|
||||||
|
@ -1113,8 +1114,16 @@ skl_program_plane(struct intel_plane *plane,
|
||||||
* the control register just before the surface register.
|
* 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_CTL(pipe, plane_id), plane_ctl);
|
||||||
intel_de_write_fw(dev_priv, PLANE_SURF(pipe, plane_id),
|
plane_surf = intel_plane_ggtt_offset(plane_state) + surf_addr;
|
||||||
intel_plane_ggtt_offset(plane_state) + surf_addr);
|
|
||||||
|
/*
|
||||||
|
* FIXME: pxp session invalidation can hit any time even at time of commit
|
||||||
|
* or after the commit, display content will be garbage.
|
||||||
|
*/
|
||||||
|
if (plane_state->decrypt)
|
||||||
|
plane_surf |= PLANE_SURF_DECRYPT;
|
||||||
|
|
||||||
|
intel_de_write_fw(dev_priv, PLANE_SURF(pipe, plane_id), plane_surf);
|
||||||
|
|
||||||
spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags);
|
spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags);
|
||||||
}
|
}
|
||||||
|
|
|
@ -821,7 +821,7 @@ static struct i915_vma *eb_lookup_vma(struct i915_execbuffer *eb, u32 handle)
|
||||||
*/
|
*/
|
||||||
if (i915_gem_context_uses_protected_content(eb->gem_context) &&
|
if (i915_gem_context_uses_protected_content(eb->gem_context) &&
|
||||||
i915_gem_object_is_protected(obj)) {
|
i915_gem_object_is_protected(obj)) {
|
||||||
err = intel_pxp_key_check(&vm->gt->pxp, obj);
|
err = intel_pxp_key_check(&vm->gt->pxp, obj, true);
|
||||||
if (err) {
|
if (err) {
|
||||||
i915_gem_object_put(obj);
|
i915_gem_object_put(obj);
|
||||||
return ERR_PTR(err);
|
return ERR_PTR(err);
|
||||||
|
|
|
@ -7383,6 +7383,7 @@ enum {
|
||||||
#define _PLANE_SURF_3(pipe) _PIPE(pipe, _PLANE_SURF_3_A, _PLANE_SURF_3_B)
|
#define _PLANE_SURF_3(pipe) _PIPE(pipe, _PLANE_SURF_3_A, _PLANE_SURF_3_B)
|
||||||
#define PLANE_SURF(pipe, plane) \
|
#define PLANE_SURF(pipe, plane) \
|
||||||
_MMIO_PLANE(plane, _PLANE_SURF_1(pipe), _PLANE_SURF_2(pipe))
|
_MMIO_PLANE(plane, _PLANE_SURF_1(pipe), _PLANE_SURF_2(pipe))
|
||||||
|
#define PLANE_SURF_DECRYPT REG_BIT(2)
|
||||||
|
|
||||||
#define _PLANE_OFFSET_1_B 0x711a4
|
#define _PLANE_OFFSET_1_B 0x711a4
|
||||||
#define _PLANE_OFFSET_2_B 0x712a4
|
#define _PLANE_OFFSET_2_B 0x712a4
|
||||||
|
|
|
@ -191,7 +191,9 @@ void intel_pxp_fini_hw(struct intel_pxp *pxp)
|
||||||
intel_pxp_irq_disable(pxp);
|
intel_pxp_irq_disable(pxp);
|
||||||
}
|
}
|
||||||
|
|
||||||
int intel_pxp_key_check(struct intel_pxp *pxp, struct drm_i915_gem_object *obj)
|
int intel_pxp_key_check(struct intel_pxp *pxp,
|
||||||
|
struct drm_i915_gem_object *obj,
|
||||||
|
bool assign)
|
||||||
{
|
{
|
||||||
if (!intel_pxp_is_active(pxp))
|
if (!intel_pxp_is_active(pxp))
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
@ -207,9 +209,10 @@ int intel_pxp_key_check(struct intel_pxp *pxp, struct drm_i915_gem_object *obj)
|
||||||
* as such. If the object is already encrypted, check instead if the
|
* as such. If the object is already encrypted, check instead if the
|
||||||
* used key is still valid.
|
* used key is still valid.
|
||||||
*/
|
*/
|
||||||
if (!obj->pxp_key_instance)
|
if (!obj->pxp_key_instance && assign)
|
||||||
obj->pxp_key_instance = pxp->key_instance;
|
obj->pxp_key_instance = pxp->key_instance;
|
||||||
else if (obj->pxp_key_instance != pxp->key_instance)
|
|
||||||
|
if (obj->pxp_key_instance != pxp->key_instance)
|
||||||
return -ENOEXEC;
|
return -ENOEXEC;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -29,7 +29,9 @@ void intel_pxp_mark_termination_in_progress(struct intel_pxp *pxp);
|
||||||
|
|
||||||
int intel_pxp_start(struct intel_pxp *pxp);
|
int intel_pxp_start(struct intel_pxp *pxp);
|
||||||
|
|
||||||
int intel_pxp_key_check(struct intel_pxp *pxp, struct drm_i915_gem_object *obj);
|
int intel_pxp_key_check(struct intel_pxp *pxp,
|
||||||
|
struct drm_i915_gem_object *obj,
|
||||||
|
bool assign);
|
||||||
|
|
||||||
void intel_pxp_invalidate(struct intel_pxp *pxp);
|
void intel_pxp_invalidate(struct intel_pxp *pxp);
|
||||||
#else
|
#else
|
||||||
|
@ -52,7 +54,8 @@ static inline bool intel_pxp_is_active(const struct intel_pxp *pxp)
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline int intel_pxp_key_check(struct intel_pxp *pxp,
|
static inline int intel_pxp_key_check(struct intel_pxp *pxp,
|
||||||
struct drm_i915_gem_object *obj)
|
struct drm_i915_gem_object *obj,
|
||||||
|
bool assign)
|
||||||
{
|
{
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue