Skip to content

Commit

Permalink
drm/i915: remove excess functions from plane protection check
Browse files Browse the repository at this point in the history
Reduce the function calls by reusing ->decrypt.

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Suraj Kandpal <suraj.kandpal@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231109160722.3372379-2-jani.nikula@intel.com
  • Loading branch information
Jani Nikula committed Nov 10, 2023
1 parent 88a6e46 commit 9b1c97f
Showing 1 changed file with 4 additions and 14 deletions.
18 changes: 4 additions & 14 deletions drivers/gpu/drm/i915/display/skl_universal_plane.c
Original file line number Diff line number Diff line change
Expand Up @@ -1854,29 +1854,19 @@ static bool skl_fb_scalable(const struct drm_framebuffer *fb)
}
}

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->pxp, obj, false) == 0;
}

static bool pxp_is_borked(struct drm_i915_gem_object *obj)
{
return i915_gem_object_is_protected(obj) && !bo_has_valid_encryption(obj);
}

static void check_protection(struct intel_plane_state *plane_state)
{
struct intel_plane *plane = to_intel_plane(plane_state->uapi.plane);
struct drm_i915_private *i915 = to_i915(plane->base.dev);
const struct drm_framebuffer *fb = plane_state->hw.fb;
struct drm_i915_gem_object *obj = intel_fb_obj(fb);

if (DISPLAY_VER(i915) < 11)
return;

plane_state->decrypt = bo_has_valid_encryption(intel_fb_obj(fb));
plane_state->force_black = pxp_is_borked(intel_fb_obj(fb));
plane_state->decrypt = intel_pxp_key_check(i915->pxp, obj, false) == 0;
plane_state->force_black = i915_gem_object_is_protected(obj) &&
!plane_state->decrypt;
}

static int skl_plane_check(struct intel_crtc_state *crtc_state,
Expand Down

0 comments on commit 9b1c97f

Please sign in to comment.